| Message ID | 1371653913-1697-1-git-send-email-dros@netapp.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On 19/06/13 10:58, Weston Andros Adamson wrote: > 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> Committed! steved. > --- > 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: > -- To unsubscribe from this list: send the line "unsubscribe linux-nfs" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
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:
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> --- tools/nfs-iostat/nfs-iostat.py | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-)