Browse Source

Qdevice: Correct API comments

Also after votequorum node list is received and qnetd is connected,
default vote is changed to WAIT_FOR_REPLY. This make much more sense
because it ensures qdevice doesn't vote with new ring id until qnetd
sends reply.

Signed-off-by: Jan Friesse <jfriesse@redhat.com>
Jan Friesse 9 years ago
parent
commit
8516ee8ffd
2 changed files with 4 additions and 4 deletions
  1. 1 1
      qdevices/qdevice-model-net.c
  2. 3 3
      qdevices/qdevice-net-algo-test.c

+ 1 - 1
qdevices/qdevice-model-net.c

@@ -438,7 +438,7 @@ qdevice_model_net_votequorum_node_list_notify(struct qdevice_instance *instance,
 		}
 		}
 	} else {
 	} else {
 		send_node_list = 1;
 		send_node_list = 1;
-		vote = TLV_VOTE_NO_CHANGE;
+		vote = TLV_VOTE_WAIT_FOR_REPLY;
 	}
 	}
 
 
 	if (qdevice_net_algorithm_votequorum_node_list_notify(net_instance, &tlv_rid,
 	if (qdevice_net_algorithm_votequorum_node_list_notify(net_instance, &tlv_rid,

+ 3 - 3
qdevices/qdevice-net-algo-test.c

@@ -86,7 +86,7 @@ qdevice_net_algo_test_connected(struct qdevice_net_instance *instance, int *send
  *     vote = TLV_VOTE_NO_CHANGE
  *     vote = TLV_VOTE_NO_CHANGE
  *   if cast_vote_timer_vote = TLV_VOTE_ACK
  *   if cast_vote_timer_vote = TLV_VOTE_ACK
  *     vote = TLV_VOTE_NACK.
  *     vote = TLV_VOTE_NACK.
- * Otherwise send_node_list = 0 and vote = TLV_VOTE_NO_CHANGE
+ * Otherwise send_node_list = 1 and vote = TLV_VOTE_NO_CHANGE
  * If send_node_list is set to non zero, node list is send to qnetd
  * If send_node_list is set to non zero, node list is send to qnetd
  */
  */
 int
 int
@@ -111,7 +111,7 @@ qdevice_net_algo_test_config_node_list_changed(struct qdevice_net_instance *inst
  *     vote = TLV_VOTE_NO_CHANGE
  *     vote = TLV_VOTE_NO_CHANGE
  *   if cast_vote_timer_vote = TLV_VOTE_ACK
  *   if cast_vote_timer_vote = TLV_VOTE_ACK
  *     vote = TLV_VOTE_NACK.
  *     vote = TLV_VOTE_NACK.
- * Otherwise send_node_list = 0 and vote = TLV_VOTE_NO_CHANGE
+ * Otherwise send_node_list = 1 and vote = TLV_VOTE_WAIT_FOR_REPLY
  * If send_node_list is set to non zero, node list is send to qnetd
  * If send_node_list is set to non zero, node list is send to qnetd
  */
  */
 int
 int
@@ -138,7 +138,7 @@ qdevice_net_algo_test_votequorum_node_list_notify(struct qdevice_net_instance *i
  *     vote = TLV_VOTE_NO_CHANGE
  *     vote = TLV_VOTE_NO_CHANGE
  *   if cast_vote_timer_vote = TLV_VOTE_ACK
  *   if cast_vote_timer_vote = TLV_VOTE_ACK
  *     vote = TLV_VOTE_NACK.
  *     vote = TLV_VOTE_NACK.
- * Otherwise send_node_list = 0 and vote = TLV_VOTE_NO_CHANGE
+ * Otherwise send_node_list = 1 and vote = TLV_VOTE_NO_CHANGE
  *
  *
  * If send_node_list is set to non zero, node list is send to qnetd
  * If send_node_list is set to non zero, node list is send to qnetd
  */
  */