Skip to contentSkip to conversation

NFSv4: Add lease_time and lease_expired to 'nfs4:' line of mountstats

PATCH In review Dave Wysochanski 2 participants 3 messages May 17, 2019 – Jun 12, 2019

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 NFSv4: Add lease_time and lease_expired to 'nfs4:' line of mountstats

On the NFS client there is no low-impact way to determine the nfs4 lease time or whether the lease is expired, so add these to mountstats with times displayed in seconds.

If the lease is not expired, display lease_expired=0. Otherwise, display lease_expired=seconds_since_expired, similar to 'age:' line in mountstats.

---
 fs/nfs/super.c | 11 +++++++++++
 1 file changed, 11 insertions(+)
fs/nfs/super.c +11 -0
index c27ac96..6e52f0c 100644
@@ -730,6 +730,16 @@ int nfs_show_options(struct seq_file *m, struct dentry *root)
 EXPORT_SYMBOL_GPL(nfs_show_options);
 
 #if IS_ENABLED(CONFIG_NFS_V4)
+static void show_lease(struct seq_file *m, struct nfs_server *server)
+{
+	struct nfs_client *clp = server->nfs_client;
+	unsigned long expire;
+
+	seq_printf(m, ",lease_time=%ld", clp->cl_lease_time / HZ);
+	expire = clp->cl_last_renewal + clp->cl_lease_time;
+	seq_printf(m, ",lease_expired=%ld",
+		   time_after(expire, jiffies) ?  0 : (jiffies - expire) / HZ);
+}
 #ifdef CONFIG_NFS_V4_1
 static void show_sessions(struct seq_file *m, struct nfs_server *server)
 {
@@ -838,6 +848,7 @@ int nfs_show_stats(struct seq_file *m, struct dentry *root)
 		seq_printf(m, ",acl=0x%x", nfss->acl_bitmask);
 		show_sessions(m, nfss);
 		show_pnfs(m, nfss);
+		show_lease(m, nfss);
 	}
 #endif
 
Signature · 1 line
1.8.3.1
#1 lore raw
Quoted 49 lines · Dave Wysochanski

On the NFS client there is no low-impact way to determine the nfs4 lease time or whether the lease is expired, so add these to mountstats with times displayed in seconds.

If the lease is not expired, display lease_expired=0. Otherwise, display lease_expired=seconds_since_expired, similar to 'age:' line in mountstats.

---
fs/nfs/super.c | 11 +++++++++++

1 file changed, 11 insertions(+)
fs/nfs/super.c +11 -0
index c27ac96..6e52f0c 100644
@@ -730,6 +730,16 @@ int nfs_show_options(struct seq_file *m, struct dentry *root)
 EXPORT_SYMBOL_GPL(nfs_show_options);
 
 #if IS_ENABLED(CONFIG_NFS_V4)
+static void show_lease(struct seq_file *m, struct nfs_server *server)
+{
+	struct nfs_client *clp = server->nfs_client;
+	unsigned long expire;
+
+	seq_printf(m, ",lease_time=%ld", clp->cl_lease_time / HZ);
+	expire = clp->cl_last_renewal + clp->cl_lease_time;
+	seq_printf(m, ",lease_expired=%ld",
+		   time_after(expire, jiffies) ?  0 : (jiffies - expire) / HZ);
+}
 #ifdef CONFIG_NFS_V4_1
 static void show_sessions(struct seq_file *m, struct nfs_server *server)
 {
@@ -838,6 +848,7 @@ int nfs_show_stats(struct seq_file *m, struct dentry *root)
 		seq_printf(m, ",acl=0x%x", nfss->acl_bitmask);
 		show_sessions(m, nfss);
 		show_pnfs(m, nfss);
+		show_lease(m, nfss);
 	}
 #endif
 
Signature · 1 line
1.8.3.1

I didn't look closely at the patch content, but IMO this is a good observability enhancement.

--
Chuck Lever

#2 lore raw
Quoted 51 lines · Chuck Lever
Quoted 51 lines

On May 17, 2019, at 5:06 PM, Dave Wysochanski <[email protected]> wrote:

On the NFS client there is no low-impact way to determine the nfs4 lease time or whether the lease is expired, so add these to mountstats
with times displayed in seconds.

If the lease is not expired, display lease_expired=0. Otherwise, display lease_expired=seconds_since_expired, similar to 'age:' line in mountstats.

---
fs/nfs/super.c | 11 +++++++++++

1 file changed, 11 insertions(+)
fs/nfs/super.c +10 -0
index c27ac96..6e52f0c 100644
@@ -730,6 +730,16 @@ int nfs_show_options(struct seq_file *m,
 struct dentry *root)
 EXPORT_SYMBOL_GPL(nfs_show_options);
 
 #if IS_ENABLED(CONFIG_NFS_V4)
+static void show_lease(struct seq_file *m, struct nfs_server
 *server)
+{
+	struct nfs_client *clp = server->nfs_client;
+	unsigned long expire;
+
+	seq_printf(m, ",lease_time=%ld", clp->cl_lease_time / HZ);
+	expire = clp->cl_last_renewal + clp->cl_lease_time;
+	seq_printf(m, ",lease_expired=%ld",
+		   time_after(expire, jiffies) ?  0 : (jiffies -
 expire) / HZ);
+}

#ifdef CONFIG_NFS_V4_1
static void show_sessions(struct seq_file *m, struct nfs_server *server)
{

fs/nfs/super.c +1 -0
@@ -838,6 +848,7 @@ int nfs_show_stats(struct seq_file *m, struct
 dentry *root)
 		seq_printf(m, ",acl=0x%x", nfss->acl_bitmask);
 		show_sessions(m, nfss);
 		show_pnfs(m, nfss);
+		show_lease(m, nfss);
 	}
 #endif
Quoted 9 lines
Quoted 3 lines
Signature · 1 line
1.8.3.1

I didn't look closely at the patch content, but IMO this is a good observability enhancement.

Thanks Chuck. Trond or Anna do you have any concerns about this patch?

I didn't bump NFS_IOSTAT_VERS as I understand that only covers the counts not the other lines in nfs_show_stats, correct?

Thanks.