diff options
Diffstat (limited to 'xlators/mgmt/glusterd/src')
| -rw-r--r-- | xlators/mgmt/glusterd/src/glusterd-op-sm.c | 9 | 
1 files changed, 6 insertions, 3 deletions
diff --git a/xlators/mgmt/glusterd/src/glusterd-op-sm.c b/xlators/mgmt/glusterd/src/glusterd-op-sm.c index 7c7dcda618e..f7950da530a 100644 --- a/xlators/mgmt/glusterd/src/glusterd-op-sm.c +++ b/xlators/mgmt/glusterd/src/glusterd-op-sm.c @@ -1466,6 +1466,7 @@ glusterd_op_set_volume (dict_t *dict)          char                                     str[50] = {0, };          char                                    *op_errstr = NULL;          gf_boolean_t                             global_opt    = _gf_false; +        gf_boolean_t                             global_opts_set = _gf_false;          glusterd_volinfo_t                      *voliter = NULL;          int32_t                                  dict_count = 0;          gf_boolean_t                             check_op_version = _gf_false; @@ -1526,7 +1527,6 @@ glusterd_op_set_volume (dict_t *dict)          for (count = 1; ret != -1 ; count++) { -                global_opt = _gf_false;                  sprintf (str, "key%d", count);                  ret = dict_get_str (dict, str, &key);                  if (ret) @@ -1574,8 +1574,11 @@ glusterd_op_set_volume (dict_t *dict)                          }                  } -                if (glusterd_check_globaloption (key)) +                global_opt = _gf_false; +                if (glusterd_check_globaloption (key)) {                          global_opt = _gf_true; +                        global_opts_set = _gf_true; +                }                  if (!global_opt)                          value = gf_strdup (value); @@ -1631,7 +1634,7 @@ glusterd_op_set_volume (dict_t *dict)                  }          } -        if (!global_opt) { +        if (!global_opts_set) {                  gd_update_volume_op_versions (volinfo);                  ret = glusterd_create_volfiles_and_notify_services (volinfo);                  if (ret) {  | 
