summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--tests/bugs/glusterd/optimized-basic-testcases-in-cluster.t9
-rw-r--r--xlators/mgmt/glusterd/src/glusterd-volume-ops.c2
2 files changed, 11 insertions, 0 deletions
diff --git a/tests/bugs/glusterd/optimized-basic-testcases-in-cluster.t b/tests/bugs/glusterd/optimized-basic-testcases-in-cluster.t
index ce1d9463809..99272e14245 100644
--- a/tests/bugs/glusterd/optimized-basic-testcases-in-cluster.t
+++ b/tests/bugs/glusterd/optimized-basic-testcases-in-cluster.t
@@ -59,6 +59,15 @@ TEST $CLI_1 volume delete $V0
TEST $CLI_1 volume create $V0 $H1:$B1/$V0 $H2:$B2/$V0
TEST $CLI_1 volume create $V1 $H1:$B1/$V1
+# bug - 1635820
+# rebooting a node which doen't host bricks for any one volume
+# peer should not go into rejected state
+TEST kill_glusterd 2
+TEST start_glusterd 2
+
+EXPECT_WITHIN $PROBE_TIMEOUT 1 peer_count 1
+EXPECT_WITHIN $PROBE_TIMEOUT 1 peer_count 2
+
TEST $CLI_1 volume start $V0
EXPECT_WITHIN $PROCESS_UP_TIMEOUT 'Started' volinfo_field_1 $V0 'Status'
diff --git a/xlators/mgmt/glusterd/src/glusterd-volume-ops.c b/xlators/mgmt/glusterd/src/glusterd-volume-ops.c
index e46ef57e441..b72def8e4eb 100644
--- a/xlators/mgmt/glusterd/src/glusterd-volume-ops.c
+++ b/xlators/mgmt/glusterd/src/glusterd-volume-ops.c
@@ -2489,6 +2489,8 @@ glusterd_op_create_volume (dict_t *dict, char **op_errstr)
caps = 0;
}
#endif
+ } else {
+ caps = 0;
}
cds_list_add_tail (&brickinfo->brick_list, &volinfo->bricks);