diff options
| -rw-r--r-- | xlators/mgmt/glusterd/src/glusterd-snapshot.c | 2 | ||||
| -rw-r--r-- | xlators/mgmt/glusterd/src/glusterd-volume-ops.c | 7 | ||||
| -rw-r--r-- | xlators/mgmt/glusterd/src/glusterd.h | 4 |
3 files changed, 8 insertions, 5 deletions
diff --git a/xlators/mgmt/glusterd/src/glusterd-snapshot.c b/xlators/mgmt/glusterd/src/glusterd-snapshot.c index 65b0fb12cd5..c42aac57936 100644 --- a/xlators/mgmt/glusterd/src/glusterd-snapshot.c +++ b/xlators/mgmt/glusterd/src/glusterd-snapshot.c @@ -4422,7 +4422,7 @@ glusterd_snapshot_activate_commit (dict_t *dict, char **op_errstr, goto out; } - ret = glusterd_start_volume (snap_volinfo, flags); + ret = glusterd_start_volume (snap_volinfo, flags, _gf_true); if (ret) { gf_log (this->name, GF_LOG_ERROR, diff --git a/xlators/mgmt/glusterd/src/glusterd-volume-ops.c b/xlators/mgmt/glusterd/src/glusterd-volume-ops.c index 25b87b661e0..6cce4a89f08 100644 --- a/xlators/mgmt/glusterd/src/glusterd-volume-ops.c +++ b/xlators/mgmt/glusterd/src/glusterd-volume-ops.c @@ -1828,7 +1828,8 @@ out: } int -glusterd_start_volume (glusterd_volinfo_t *volinfo, int flags) +glusterd_start_volume (glusterd_volinfo_t *volinfo, int flags, + gf_boolean_t wait) { int ret = 0; @@ -1841,7 +1842,7 @@ glusterd_start_volume (glusterd_volinfo_t *volinfo, int flags) GF_ASSERT (volinfo); list_for_each_entry (brickinfo, &volinfo->bricks, brick_list) { - ret = glusterd_brick_start (volinfo, brickinfo, _gf_true); + ret = glusterd_brick_start (volinfo, brickinfo, wait); /* If 'force' try to start all bricks regardless of success or * failure */ @@ -1917,7 +1918,7 @@ glusterd_op_start_volume (dict_t *dict, char **op_errstr) } } - ret = glusterd_start_volume (volinfo, flags); + ret = glusterd_start_volume (volinfo, flags, _gf_true); if (ret) goto out; diff --git a/xlators/mgmt/glusterd/src/glusterd.h b/xlators/mgmt/glusterd/src/glusterd.h index 2304e75bc5b..bf4a8e283d6 100644 --- a/xlators/mgmt/glusterd/src/glusterd.h +++ b/xlators/mgmt/glusterd/src/glusterd.h @@ -946,7 +946,9 @@ int glusterd_op_statedump_volume_args_get (dict_t *dict, char **volname, int glusterd_op_gsync_args_get (dict_t *dict, char **op_errstr, char **master, char **slave, char **host_uuid); -int glusterd_start_volume (glusterd_volinfo_t *volinfo, int flags); +int glusterd_start_volume (glusterd_volinfo_t *volinfo, int flags, + gf_boolean_t wait); + int glusterd_stop_volume (glusterd_volinfo_t *volinfo); /* Synctask part */ |