Просмотр исходного кода

qdevice: Fix connect heuristics result callback

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>
Jan Friesse 5 лет назад
Родитель
Сommit
6bf5f6c011
1 измененных файлов с 3 добавлено и 1 удалено
  1. 3 1
      qdevices/qdevice-net-heuristics.c

+ 3 - 1
qdevices/qdevice-net-heuristics.c

@@ -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);
 	}