From 13061c8006471c87ff92007c8decc5586c600f0f Mon Sep 17 00:00:00 2001 From: Manikandan Selvaganesh Date: Wed, 5 Aug 2015 19:23:01 +0530 Subject: quota : volume-reset shouldn't remove quota-deem-statfs Volume-reset shouldn't remove quota-deem-statfs, unless explicitly specified, when quota is enabled. 1) glusterd_op_stage_reset_volume () 'gluster volume set/reset ' features.quota/ features.inode-quota' should not be allowed as it is deprecated. Setting and resetting quota/inode-quota features should be allowed only through 'gluster volume quota enable/disable'. 2) glusterd_enable_default_options () Option 'features.quota-deem-statfs' should not be turned off with 'gluster volume reset ', since quota features can be set/reset only with 'gluster volume quota enable/disable'. But, 'gluster volume set features.quota-deem-statfs' can be turned on/off when quota is enabled. Backport of http://review.gluster.org/#/c/11839/ Cherry picked from commit 1868be8a5c309da8d516624d4af3b3b97819a9eb > Change-Id: Ib5aa00a4d8c82819c08dfc23e2a86f43ebc436c4 > BUG: 1250582 > Signed-off-by: Manikandan Selvaganesh > Reviewed-on: http://review.gluster.org/11839 > Tested-by: NetBSD Build System > Tested-by: Gluster Build System > Reviewed-by: Vijaikumar Mallikarjuna > Reviewed-by: Atin Mukherjee Change-Id: Ib5aa00a4d8c82819c08dfc23e2a86f43ebc436c4 BUG: 1252297 Signed-off-by: Manikandan Selvaganesh Reviewed-on: http://review.gluster.org/11879 Tested-by: NetBSD Build System Tested-by: Gluster Build System Reviewed-by: Raghavendra G --- xlators/mgmt/glusterd/src/glusterd-volgen.h | 1 + 1 file changed, 1 insertion(+) (limited to 'xlators/mgmt/glusterd/src/glusterd-volgen.h') diff --git a/xlators/mgmt/glusterd/src/glusterd-volgen.h b/xlators/mgmt/glusterd/src/glusterd-volgen.h index 96d4ee88fce..4e2f3164302 100644 --- a/xlators/mgmt/glusterd/src/glusterd-volgen.h +++ b/xlators/mgmt/glusterd/src/glusterd-volgen.h @@ -94,6 +94,7 @@ typedef enum gd_volopt_flags_ { OPT_FLAG_FORCE = 0x01, // option needs force to be reset OPT_FLAG_XLATOR_OPT = 0x02, // option enables/disables xlators OPT_FLAG_CLIENT_OPT = 0x04, // option affects clients + OPT_FLAG_NEVER_RESET = 0x08, /* option which should not be reset */ } gd_volopt_flags_t; typedef enum { -- cgit