aa4184eba9
Copy from network:ha-clustering:Factory/corosync based on submit request 42251 from user tserong OBS-URL: https://build.opensuse.org/request/show/42251 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/corosync?expand=0&rev=1
34 lines
1.2 KiB
Diff
34 lines
1.2 KiB
Diff
Index: trunk/exec/totemsrp.c
|
|
===================================================================
|
|
--- trunk/exec/totemsrp.c (revision 2791)
|
|
+++ trunk/exec/totemsrp.c (revision 2792)
|
|
@@ -1390,6 +1390,8 @@
|
|
{
|
|
if (instance->old_ring_state_saved == 0) {
|
|
instance->old_ring_state_saved = 1;
|
|
+ memcpy (&instance->my_old_ring_id, &instance->my_ring_id,
|
|
+ sizeof (struct memb_ring_id));
|
|
instance->old_ring_state_aru = instance->my_aru;
|
|
instance->old_ring_state_high_seq_received = instance->my_high_seq_received;
|
|
log_printf (instance->totemsrp_log_level_debug,
|
|
@@ -1401,7 +1403,9 @@
|
|
static void ring_state_restore (struct totemsrp_instance *instance)
|
|
{
|
|
if (instance->old_ring_state_saved) {
|
|
- totemip_zero_set(&instance->my_ring_id.rep);
|
|
+ memcpy (&instance->my_ring_id, &instance->my_old_ring_id,
|
|
+ sizeof (struct memb_ring_id));
|
|
+
|
|
instance->my_aru = instance->old_ring_state_aru;
|
|
instance->my_high_seq_received = instance->old_ring_state_high_seq_received;
|
|
log_printf (instance->totemsrp_log_level_debug,
|
|
@@ -1412,6 +1416,8 @@
|
|
|
|
static void old_ring_state_reset (struct totemsrp_instance *instance)
|
|
{
|
|
+ log_printf (instance->totemsrp_log_level_debug,
|
|
+ "Resetting old ring state\n");
|
|
instance->old_ring_state_saved = 0;
|
|
}
|
|
|