|
@@ -4049,7 +4049,7 @@ static void memb_join_process (
|
|
|
|
|
|
|
|
memb_state_commit_enter (instance);
|
|
memb_state_commit_enter (instance);
|
|
|
} else {
|
|
} else {
|
|
|
- return;
|
|
|
|
|
|
|
+ goto out;
|
|
|
}
|
|
}
|
|
|
} else
|
|
} else
|
|
|
if (memb_set_subset (proc_list,
|
|
if (memb_set_subset (proc_list,
|
|
@@ -4062,12 +4062,12 @@ static void memb_join_process (
|
|
|
instance->my_failed_list,
|
|
instance->my_failed_list,
|
|
|
instance->my_failed_list_entries)) {
|
|
instance->my_failed_list_entries)) {
|
|
|
|
|
|
|
|
- return;
|
|
|
|
|
|
|
+ goto out;
|
|
|
} else
|
|
} else
|
|
|
if (memb_set_subset (&memb_join->system_from, 1,
|
|
if (memb_set_subset (&memb_join->system_from, 1,
|
|
|
instance->my_failed_list, instance->my_failed_list_entries)) {
|
|
instance->my_failed_list, instance->my_failed_list_entries)) {
|
|
|
|
|
|
|
|
- return;
|
|
|
|
|
|
|
+ goto out;
|
|
|
} else {
|
|
} else {
|
|
|
memb_set_merge (proc_list,
|
|
memb_set_merge (proc_list,
|
|
|
memb_join->proc_list_entries,
|
|
memb_join->proc_list_entries,
|
|
@@ -4112,6 +4112,8 @@ static void memb_join_process (
|
|
|
memb_state_gather_enter (instance, 11);
|
|
memb_state_gather_enter (instance, 11);
|
|
|
gather_entered = 1;
|
|
gather_entered = 1;
|
|
|
}
|
|
}
|
|
|
|
|
+
|
|
|
|
|
+out:
|
|
|
if (gather_entered == 0 &&
|
|
if (gather_entered == 0 &&
|
|
|
instance->memb_state == MEMB_STATE_OPERATIONAL) {
|
|
instance->memb_state == MEMB_STATE_OPERATIONAL) {
|
|
|
|
|
|