diff options
| -rw-r--r-- | tests/bugs/glusterd/bug-1699339.t | 16 | ||||
| -rw-r--r-- | xlators/mgmt/glusterd/src/glusterd-utils.c | 2 |
2 files changed, 11 insertions, 7 deletions
diff --git a/tests/bugs/glusterd/bug-1699339.t b/tests/bugs/glusterd/bug-1699339.t index 3e950f48432..bb8d4f46eb8 100644 --- a/tests/bugs/glusterd/bug-1699339.t +++ b/tests/bugs/glusterd/bug-1699339.t @@ -52,18 +52,22 @@ done TEST kill_glusterd 1 -vol1=$(printf "%s-vol%02d" $V0 1) +TESTS_EXPECTED_IN_LOOP=4 +for i in `seq 1 3 15` +do +vol1=$(printf "%s-vol%02d" $V0 $i) TEST $CLI_2 volume set $vol1 performance.readdir-ahead on -vol2=$(printf "%s-vol%02d" $V0 2) -TEST $CLI_2 volume set $vol2 performance.readdir-ahead on +done # Bring back 1st glusterd TEST $glusterd_1 EXPECT_WITHIN $PROBE_TIMEOUT 2 peer_count +TESTS_EXPECTED_IN_LOOP=4 +for i in `seq 1 3 15` +do +vol1=$(printf "%s-vol%02d" $V0 $i) EXPECT_WITHIN $PROBE_TIMEOUT "on" volinfo_field_1 $vol1 performance.readdir-ahead - -vol_name=$(printf "%s-vol%02d" $V0 2) -EXPECT_WITHIN $PROBE_TIMEOUT "on" volinfo_field_1 $vol2 performance.readdir-ahead +done cleanup diff --git a/xlators/mgmt/glusterd/src/glusterd-utils.c b/xlators/mgmt/glusterd/src/glusterd-utils.c index a1a45e97502..c919be3270b 100644 --- a/xlators/mgmt/glusterd/src/glusterd-utils.c +++ b/xlators/mgmt/glusterd/src/glusterd-utils.c @@ -3281,7 +3281,7 @@ glusterd_add_volumes_to_export_dict(dict_t **peer_data) if ((i + 1) != totthread) { arg->end = ((i + 1) * vol_per_thread_limit); } else { - arg->end = ((i * vol_per_thread_limit) + endindex); + arg->end = (((i + 1) * vol_per_thread_limit) + endindex); } th_ret = gf_thread_create_detached( &th_id, glusterd_add_bulk_volumes_create_thread, arg, |