File 0004-nfsiostat-restore-output-format.patch of Package nfs-utils

Overview Repositories Revisions Requests Users Attributes Meta

File 0004-nfsiostat-restore-output-format.patch of Package nfs-utils (Revision 9644970b6580e8d8a8bc6cf910de50e1)

Currently displaying revision 9644970b6580e8d8a8bc6cf910de50e1 , Show latest

From 94642a397d27ea0cfc6d798bc505482023eb5ec1 Mon Sep 17 00:00:00 2001
From: Weston Andros Adamson <dros@netapp.com>
Date: Mon, 1 Jul 2013 12:00:51 -0400
Subject: [PATCH] nfsiostat: restore output format

Recent changes to support python 3 changed the output of nfsiostat from:

read:             ops/s            kB/s           kB/op         retrans
avg RTT (ms)    avg exe (ms)
                 48.094         2889.133         60.072        0 (0.0%)
177.160         184.833
...

to:

read:
  ops/s		   kB/s		  kB/op		retrans		avg RTT (ms)	avg exe
(ms)
		  0.000
	  0.000
	  0.000
       0 (0.0%)
	  0.000
	  0.000
...

Signed-off-by: Weston Andros Adamson <dros@netapp.com>
Signed-off-by: Steve Dickson <steved@redhat.com>
---
 tools/nfs-iostat/nfs-iostat.py | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/tools/nfs-iostat/nfs-iostat.py b/tools/nfs-iostat/nfs-iostat.py
index dfbef87..c035537 100644
--- a/tools/nfs-iostat/nfs-iostat.py
+++ b/tools/nfs-iostat/nfs-iostat.py
@@ -353,14 +353,14 @@ class DeviceData:
             exe_per_op = 0.0
 
         op += ':'
-        print('%s' % op.lower().ljust(15))
+        print('%s' % op.lower().ljust(15), end='')
         print('  ops/s\t\t   kB/s\t\t  kB/op\t\tretrans\t\tavg RTT (ms)\tavg exe (ms)')
 
-        print('\t\t%7.3f' % (ops / sample_time))
-        print('\t%7.3f' % (kilobytes / sample_time))
-        print('\t%7.3f' % kb_per_op)
-        print(' %7d (%3.1f%%)' % (retrans, retrans_percent))
-        print('\t%7.3f' % rtt_per_op)
+        print('\t\t%7.3f' % (ops / sample_time), end='')
+        print('\t%7.3f' % (kilobytes / sample_time), end='')
+        print('\t%7.3f' % kb_per_op, end='')
+        print(' %7d (%3.1f%%)' % (retrans, retrans_percent), end='')
+        print('\t%7.3f' % rtt_per_op, end='')
         print('\t%7.3f' % exe_per_op)
 
     def ops(self, sample_time):
@@ -392,7 +392,7 @@ class DeviceData:
         print()
 
         print('   op/s\t\trpc bklog')
-        print('%7.2f' % (sends / sample_time))
+        print('%7.2f' % (sends / sample_time), end='')
         print('\t%7.2f' % backlog)
 
         if which == 0:
-- 
1.8.3.1.487.g3e7a5b4

Places

File 0004-nfsiostat-restore-output-format.patch of Package nfs-utils (Revision 9644970b6580e8d8a8bc6cf910de50e1)

Places