From 32d15f6911ac5aa8f0280cb3c23fc7d97e8b000f Mon Sep 17 00:00:00 2001 From: Shreyas Siravara Date: Sat, 2 Sep 2017 21:26:33 -0700 Subject: debug/io-stats: Fix multi-volume support for nfsd Summary: - Adds iamshd (iamnfsd already there due to fop throttling) options to io-stats xlator. - Leverages these options to correctly write multi-volume NFSd stats - This is a port of D2714648 to 3.8 Test Plan: - Tested on local dev server, verified multiple files are generated for multiple vols Change-Id: Id2014a135fe52045da462eaaa91f336f45cdf167 Reviewed-on: https://review.gluster.org/18195 Reviewed-by: Shreyas Siravara CentOS-regression: Gluster Build System Smoke: Gluster Build System --- tests/basic/fop-sampling.t | 2 +- tests/basic/stats-dump.t | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'tests/basic') diff --git a/tests/basic/fop-sampling.t b/tests/basic/fop-sampling.t index 713c7e27579..d22826c4224 100644 --- a/tests/basic/fop-sampling.t +++ b/tests/basic/fop-sampling.t @@ -6,7 +6,7 @@ . $(dirname $0)/../volume.rc BRICK_SAMPLES="$(gluster --print-logdir)/samples/glusterfsd__d_backends_${V0}0.samp" -NFS_SAMPLES="$(gluster --print-logdir)/samples/glusterfs_nfsd.samp" +NFS_SAMPLES="$(gluster --print-logdir)/samples/glusterfs_nfsd_${V0}.samp" function check_path { op=$1 diff --git a/tests/basic/stats-dump.t b/tests/basic/stats-dump.t index 2840498218b..ceed7571a62 100644 --- a/tests/basic/stats-dump.t +++ b/tests/basic/stats-dump.t @@ -32,13 +32,13 @@ sleep 2 # and the FUSE mount BRICK_OUTPUT="$(grep 'aggr.fop.write.count": "0"' ${GLUSTERD_WORKDIR}/stats/glusterfsd__d_backends_patchy?.dump)" BRICK_RET="$?" -NFSD_OUTPUT="$(grep 'aggr.fop.write.count": "0"' ${GLUSTERD_WORKDIR}/stats/glusterfs_nfsd.dump)" +NFSD_OUTPUT="$(grep 'aggr.fop.write.count": "0"' ${GLUSTERD_WORKDIR}/stats/glusterfs_nfsd_$V0.dump)" NFSD_RET="$?" -FUSE_OUTPUT="$(grep 'aggr.fop.write.count": "0"' ${GLUSTERD_WORKDIR}/stats/glusterfs_patchy.dump)" +FUSE_OUTPUT="$(grep 'aggr.fop.write.count": "0"' ${GLUSTERD_WORKDIR}/stats/glusterfs_$V0.dump)" FUSE_RET="$?" # Test that io-stats is getting queue sizes from io-threads -TEST grep 'queue_size' ${GLUSTERD_WORKDIR}/stats/glusterfs_nfsd.dump +TEST grep 'queue_size' ${GLUSTERD_WORKDIR}/stats/glusterfs_nfsd_$V0.dump TEST grep 'queue_size' ${GLUSTERD_WORKDIR}/stats/glusterfsd__d_backends_patchy?.dump TEST [ 0 -ne "$BRICK_RET" ] -- cgit