summaryrefslogtreecommitdiffstats
path: root/xlators/mgmt/glusterd
diff options
context:
space:
mode:
authorMohit Agrawal <moagrawal@redhat.com>2018-07-10 14:21:35 +0530
committerAtin Mukherjee <amukherj@redhat.com>2018-07-13 10:22:00 +0000
commit1718f9c6cb3bc856265ff996babef97119a716bd (patch)
treeeca98443dd1f00d26a7799f4f8e86f023c775b6b /xlators/mgmt/glusterd
parente8cf52f5107af00b5dcbde3bff22a394efba5372 (diff)
glusterd: To find a compatible brick ignore diagnostics.brick-log-level option
Problem: glusterd start a volume as a separate process instead of attaching with the already running process if volume option has different brick-log-level. There is no functionality impact on a brick if the option has different brick-log-level so glusterd should attach a brick with the already running process. Solution: Ignore brick-log-level option in unsafe_option BUG: 1599628 Change-Id: I72638ff2026fcd9332bc38e1144b1ef4a708820b fixes: bz#1599628 Signed-off-by: Mohit Agrawal <moagrawal@redhat.com>
Diffstat (limited to 'xlators/mgmt/glusterd')
-rw-r--r--xlators/mgmt/glusterd/src/glusterd-utils.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/xlators/mgmt/glusterd/src/glusterd-utils.c b/xlators/mgmt/glusterd/src/glusterd-utils.c
index d8a4a75a46e..55b2e735dc3 100644
--- a/xlators/mgmt/glusterd/src/glusterd-utils.c
+++ b/xlators/mgmt/glusterd/src/glusterd-utils.c
@@ -2330,6 +2330,10 @@ unsafe_option (dict_t *this, char *key, data_t *value, void *arg)
return _gf_false;
}
+ if (fnmatch ("*diagnostics.brick-log*", key, 0) == 0) {
+ return _gf_false;
+ }
+
return _gf_true;
}