summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorAvra Sengupta <asengupt@redhat.com>2015-10-28 15:18:07 +0530
committerRajesh Joseph <rjoseph@redhat.com>2015-11-02 22:34:37 -0800
commit2e56bde3ea952beabd27cdf8a3a10da563a00bcc (patch)
tree99194a04e1e538f1abd3ec2fe614e8cf21c35a1e /tests
parentaf8b450df8dca2b07bcfc6c32f17bc678697e9f2 (diff)
downloadglusterfs-2e56bde3ea952beabd27cdf8a3a10da563a00bcc.tar.gz
glusterfs-2e56bde3ea952beabd27cdf8a3a10da563a00bcc.tar.xz
glusterfs-2e56bde3ea952beabd27cdf8a3a10da563a00bcc.zip
snapshot: Don't display snapshot's hard-limit and soft-limit in vol info
The snap-max-hard-limit being displayed in the volume info currently is propagated from system's snap-max-hard-limit as that is a global option common for all volumes, and hence ends up showing the system's snap-max-hard-limit. We should not be displaying snap-max-hard-limit and snap-max-soft-limit in the volume info at all, as these are snap config options and should be set and displayed via snap config command. Modified bug-1113476.t to test the same behaviour. Change-Id: I90891f0cf7fb39fd686787297c7f7cd8c1e7daa1 BUG: 1276018 Signed-off-by: Avra Sengupta <asengupt@redhat.com> Reviewed-on: http://review.gluster.org/12443 Tested-by: Gluster Build System <jenkins@build.gluster.com> Reviewed-by: mohammed rafi kc <rkavunga@redhat.com> Reviewed-by: Rajesh Joseph <rjoseph@redhat.com> Tested-by: NetBSD Build System <jenkins@build.gluster.org>
Diffstat (limited to 'tests')
-rw-r--r--tests/bugs/cli/bug-1113476.t11
1 files changed, 6 insertions, 5 deletions
diff --git a/tests/bugs/cli/bug-1113476.t b/tests/bugs/cli/bug-1113476.t
index 119846d4cf..fc7dbca537 100644
--- a/tests/bugs/cli/bug-1113476.t
+++ b/tests/bugs/cli/bug-1113476.t
@@ -25,18 +25,19 @@ EXPECT '' volinfo_validate 'snap-max-soft-limit'
EXPECT '' volinfo_validate 'auto-delete'
TEST $CLI snapshot config snap-max-hard-limit 100
-EXPECT '100' volinfo_validate 'snap-max-hard-limit'
+TEST $CLI snapshot config $V0 snap-max-hard-limit 50
+EXPECT '' volinfo_validate 'snap-max-hard-limit'
EXPECT '' volinfo_validate 'snap-max-soft-limit'
EXPECT '' volinfo_validate 'auto-delete'
TEST $CLI snapshot config snap-max-soft-limit 50
-EXPECT '100' volinfo_validate 'snap-max-hard-limit'
-EXPECT '50' volinfo_validate 'snap-max-soft-limit'
+EXPECT '' volinfo_validate 'snap-max-hard-limit'
+EXPECT '' volinfo_validate 'snap-max-soft-limit'
EXPECT '' volinfo_validate 'auto-delete'
TEST $CLI snapshot config auto-delete enable
-EXPECT '100' volinfo_validate 'snap-max-hard-limit'
-EXPECT '50' volinfo_validate 'snap-max-soft-limit'
+EXPECT '' volinfo_validate 'snap-max-hard-limit'
+EXPECT '' volinfo_validate 'snap-max-soft-limit'
EXPECT 'enable' volinfo_validate 'auto-delete'
cleanup;