diff options
author | Mohammed Rafi KC <rkavunga@redhat.com> | 2015-11-09 16:43:21 +0530 |
---|---|---|
committer | Dan Lambright <dlambrig@redhat.com> | 2015-11-16 06:17:50 -0800 |
commit | cc7367bcde55c315a299aa97d521d25424f15e76 (patch) | |
tree | 24f61f3059d87290bfe91a45301f8732a85494cd | |
parent | 3a13092cb001b1a998268a2cdb0056615ece1d54 (diff) |
glusterd: brick failed to start
brick volfiles are generated in post validate, if
it is running version higher than GLUSTER_3_7_5,
else will be running in syncop.
If the code fall back to syncop, and volume is stopped
then we were returning the operation with out generating
volfiles.
back port of >
>Change-Id: I3b16ee29de19c5d34e45d77d6b7e4b665c2a4653
>BUG: 1282322
>Signed-off-by: Mohammed Rafi KC <rkavunga@redhat.com>
>Reviewed-on: http://review.gluster.org/12552
>Tested-by: NetBSD Build System <jenkins@build.gluster.org>
>Tested-by: Gluster Build System <jenkins@build.gluster.com>
>Reviewed-by: Atin Mukherjee <amukherj@redhat.com>
(cherry picked from commit 571cbcf56ef865d64ebdb1621c791fe467501e52)
Change-Id: I3b16ee29de19c5d34e45d77d6b7e4b665c2a4653
BUG: 1279351
Reviewed-on: http://review.gluster.org/12585
Tested-by: NetBSD Build System <jenkins@build.gluster.org>
Tested-by: Gluster Build System <jenkins@build.gluster.com>
Reviewed-by: Dan Lambright <dlambrig@redhat.com>
Tested-by: Dan Lambright <dlambrig@redhat.com>
-rw-r--r-- | xlators/mgmt/glusterd/src/glusterd-brick-ops.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/xlators/mgmt/glusterd/src/glusterd-brick-ops.c b/xlators/mgmt/glusterd/src/glusterd-brick-ops.c index 120c071dbb6..a6dc94af06d 100644 --- a/xlators/mgmt/glusterd/src/glusterd-brick-ops.c +++ b/xlators/mgmt/glusterd/src/glusterd-brick-ops.c @@ -1342,7 +1342,7 @@ glusterd_op_perform_add_bricks (glusterd_volinfo_t *volinfo, int32_t count, ret = 0; if (GLUSTERD_STATUS_STARTED != volinfo->status) - goto out; + goto generate_volfiles; ret = generate_brick_volfiles (volinfo); if (ret) @@ -1418,6 +1418,8 @@ glusterd_op_perform_add_bricks (glusterd_volinfo_t *volinfo, int32_t count, _glusterd_restart_gsync_session, ¶m); } volinfo->caps = caps; + +generate_volfiles: if (conf->op_version <= GD_OP_VERSION_3_7_5) { ret = glusterd_create_volfiles_and_notify_services (volinfo); } else { |