]> git.proxmox.com Git - mirror_corosync-qdevice.git/commitdiff
qdevice: Fix connect heuristics result callback
authorJan Friesse <jfriesse@redhat.com>
Fri, 28 Aug 2020 06:53:24 +0000 (08:53 +0200)
committerJan Friesse <jfriesse@redhat.com>
Fri, 28 Aug 2020 06:57:15 +0000 (08:57 +0200)
Previous patch 8dbf1bc8b0f348e468e7c70448705ac92dab68ea was wrong
because it fixed the crash but made qdevice not work at all.

Correct solution is to test, if state is
QDEVICE_NET_INSTANCE_STATE_WAITING_INIT_REPLY.

Signed-off-by: Jan Friesse <jfriesse@redhat.com>
qdevices/qdevice-net-heuristics.c

index 5757faba44fa89f8211e20f23b62b8b03479a619..050821e9561eb6dd46d39cc7afc1a80ba6bcc226 100644 (file)
@@ -207,10 +207,12 @@ qdevice_net_connect_heuristics_exec_result_callback(uint32_t seq_number,
                return (0);
        }
 
-       if (net_instance->state != QDEVICE_NET_INSTANCE_STATE_WAITING_VOTEQUORUM_CMAP_EVENTS) {
+       if (net_instance->state != QDEVICE_NET_INSTANCE_STATE_WAITING_INIT_REPLY) {
                /*
                 * Not connected to qnetd -> heuristics will be called again on new connect
                 */
+               log(LOG_DEBUG, "Received unexpected net connect heuristics in state %u",
+                   net_instance->state);
                return (0);
        }