diff options
| -rw-r--r-- | xlators/mgmt/glusterd/src/glusterd-geo-rep.c | 14 | ||||
| -rw-r--r-- | xlators/mgmt/glusterd/src/glusterd-utils.c | 10 |
2 files changed, 12 insertions, 12 deletions
diff --git a/xlators/mgmt/glusterd/src/glusterd-geo-rep.c b/xlators/mgmt/glusterd/src/glusterd-geo-rep.c index a7b56617df0..25193e2a51f 100644 --- a/xlators/mgmt/glusterd/src/glusterd-geo-rep.c +++ b/xlators/mgmt/glusterd/src/glusterd-geo-rep.c @@ -3648,8 +3648,8 @@ glusterd_op_stage_gsync_set (dict_t *dict, char **op_errstr) if (ret) { ret = glusterd_get_local_brickpaths (volinfo, &path_list); - if (path_list) - ret = -1; + if (!path_list && ret == -1) + goto out; } /* Check for geo-rep session is active or not for @@ -3681,10 +3681,8 @@ glusterd_op_stage_gsync_set (dict_t *dict, char **op_errstr) if (ret) { ret = glusterd_get_local_brickpaths (volinfo, &path_list); - if (path_list) { - ret = -1; + if (!path_list && ret == -1) goto out; - } } /* Check for geo-rep session is active or not @@ -3704,10 +3702,8 @@ glusterd_op_stage_gsync_set (dict_t *dict, char **op_errstr) if (ret) { ret = glusterd_get_local_brickpaths (volinfo, &path_list); - if (path_list) { - ret = -1; + if (!path_list && ret == -1) goto out; - } } } break; @@ -5570,6 +5566,8 @@ glusterd_op_gsync_set (dict_t *dict, char **op_errstr, dict_t *rsp_dict) } ret = glusterd_get_local_brickpaths (volinfo, &path_list); + if (!path_list && ret == -1) + goto out; } if (type == GF_GSYNC_OPTION_TYPE_CONFIG) { diff --git a/xlators/mgmt/glusterd/src/glusterd-utils.c b/xlators/mgmt/glusterd/src/glusterd-utils.c index 6437d038cd3..f7b6ffc21af 100644 --- a/xlators/mgmt/glusterd/src/glusterd-utils.c +++ b/xlators/mgmt/glusterd/src/glusterd-utils.c @@ -7835,7 +7835,8 @@ glusterd_get_local_brickpaths (glusterd_volinfo_t *volinfo, char **pathlist) path_tokens = GF_CALLOC (sizeof(char*), volinfo->brick_count, gf_gld_mt_charptr); if (!path_tokens) { - gf_msg_debug ("glusterd", 0, "Could not allocate memory."); + gf_msg ("glusterd", GF_LOG_ERROR, ENOMEM, GD_MSG_NO_MEMORY, + "Could not allocate memory."); ret = -1; goto out; } @@ -7852,8 +7853,8 @@ glusterd_get_local_brickpaths (glusterd_volinfo_t *volinfo, char **pathlist) path[sizeof(path)-1] = '\0'; path_tokens[count] = gf_strdup (path); if (!path_tokens[count]) { - gf_msg_debug ("glusterd", 0, - "Could not allocate memory."); + gf_msg ("glusterd", GF_LOG_ERROR, ENOMEM, + GD_MSG_NO_MEMORY, "Could not allocate memory."); ret = -1; goto out; } @@ -7864,7 +7865,8 @@ glusterd_get_local_brickpaths (glusterd_volinfo_t *volinfo, char **pathlist) tmp_path_list = GF_CALLOC (sizeof(char), total_len + 1, gf_gld_mt_char); if (!tmp_path_list) { - gf_msg_debug ("glusterd", 0, "Could not allocate memory."); + gf_msg ("glusterd", GF_LOG_ERROR, ENOMEM, GD_MSG_NO_MEMORY, + "Could not allocate memory."); ret = -1; goto out; } |