proxmox-mirrors/mirror_corosync
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_corosync synced 2026-02-01 19:59:04 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Qnetd lms: Use UTILS_PRI_RING_ID printf format str

Browse Source 
Signed-off-by: Jan Friesse <jfriesse@redhat.com>
Reviewed-by: Jan Friesse <jfriesse@redhat.com>
This commit is contained in:
Bin Liu 2017-04-20 08:42:11 +02:00 committed by Jan Friesse
parent c144dba622
commit 28f40c7fe0
2 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
qdevices/qnetd-algo-lms.c
View File

@ -79,7 +79,7 @@ static enum tlv_reply_error_code do_lms_algorithm(struct qnetd_client *client, c
qnetd_client_algo_timer_abort(client);
if (qnetd_algo_all_ring_ids_match(client, ring_id) == -1) {
qnetd_log(LOG_DEBUG, "algo-lms: nodeid %d: ring ID %d/%ld not unique in this membership, waiting",
qnetd_log(LOG_DEBUG, "algo-lms: nodeid %d: ring ID (" UTILS_PRI_RING_ID ") not unique in this membership, waiting",
client->node_id, ring_id->node_id, ring_id->seq);
qnetd_client_algo_timer_schedule(client);
@ -140,7 +140,7 @@ static enum tlv_reply_error_code do_lms_algorithm(struct qnetd_client *client, c
}
}
qnetd_log(LOG_DEBUG, "algo-lms: largest partition is %d/%ld with %d nodes",
qnetd_log(LOG_DEBUG, "algo-lms: largest partition is (" UTILS_PRI_RING_ID ") with %d nodes",
largest_partition->ring_id.node_id, largest_partition->ring_id.seq, largest_partition->num_nodes);
/* Now check if it's really the largest, and not just the joint-largest */
@ -191,7 +191,7 @@ static enum tlv_reply_error_code do_lms_algorithm(struct qnetd_client *client, c
if (other_client->node_id < tb_node_id) {
tb_node_id = other_client->node_id;
memcpy(&tb_node_ring_id, &other_client->last_ring_id, sizeof(struct tlv_ring_id));
qnetd_log(LOG_DEBUG, "algo-lms: Looking for low node ID. found %d (%d/%ld)",
qnetd_log(LOG_DEBUG, "algo-lms: Looking for low node ID. found %d (" UTILS_PRI_RING_ID ")",
tb_node_id, tb_node_ring_id.node_id, tb_node_ring_id.seq);
}
break;
@ -200,14 +200,14 @@ static enum tlv_reply_error_code do_lms_algorithm(struct qnetd_client *client, c
if (other_client->node_id > tb_node_id) {
tb_node_id = other_client->node_id;
memcpy(&tb_node_ring_id, &other_client->last_ring_id, sizeof(struct tlv_ring_id));
qnetd_log(LOG_DEBUG, "algo-lms: Looking for high node ID. found %d (%d/%ld)",
qnetd_log(LOG_DEBUG, "algo-lms: Looking for high node ID. found %d (" UTILS_PRI_RING_ID ")",
tb_node_id, tb_node_ring_id.node_id, tb_node_ring_id.seq);
}
break;
case TLV_TIE_BREAKER_MODE_NODE_ID:
if (client->tie_breaker.node_id == client->node_id) {
memcpy(&tb_node_ring_id, &other_client->last_ring_id, sizeof(struct tlv_ring_id));
qnetd_log(LOG_DEBUG, "algo-lms: Looking for nominated node ID. found %d (%d/%ld)",
qnetd_log(LOG_DEBUG, "algo-lms: Looking for nominated node ID. found %d (" UTILS_PRI_RING_ID ")",
tb_node_id, tb_node_ring_id.node_id, tb_node_ring_id.seq);
}
@ -220,12 +220,12 @@ static enum tlv_reply_error_code do_lms_algorithm(struct qnetd_client *client, c
}
if (client->node_id == tb_node_id || tlv_ring_id_eq(&tb_node_ring_id, ring_id)) {
qnetd_log(LOG_DEBUG, "algo-lms: We are in the same partition (%d/%ld) as tie-breaker node id %d. ACK",
qnetd_log(LOG_DEBUG, "algo-lms: We are in the same partition (" UTILS_PRI_RING_ID ") as tie-breaker node id %d. ACK",
tb_node_ring_id.node_id, tb_node_ring_id.seq, tb_node_id);
*result_vote = info->last_result = TLV_VOTE_ACK;
}
else {
qnetd_log(LOG_DEBUG, "algo-lms: We are NOT in the same partition (%d/%ld) as tie-breaker node id %d. NACK",
qnetd_log(LOG_DEBUG, "algo-lms: We are NOT in the same partition (" UTILS_PRI_RING_ID ") as tie-breaker node id %d. NACK",
tb_node_ring_id.node_id, tb_node_ring_id.seq, tb_node_id);
*result_vote = info->last_result = TLV_VOTE_NACK;
}
@ -286,7 +286,7 @@ qnetd_algo_lms_membership_node_list_received(struct qnetd_client *client,
const struct node_list *nodes, enum tlv_vote *result_vote)
{
qnetd_log(LOG_DEBUG, " ");
qnetd_log(LOG_DEBUG, "algo-lms: membership list from node %d partition %d/%ld", client->node_id, ring_id->node_id, ring_id->seq);
qnetd_log(LOG_DEBUG, "algo-lms: membership list from node %d partition (" UTILS_PRI_RING_ID ")", client->node_id, ring_id->node_id, ring_id->seq);
return do_lms_algorithm(client, ring_id, result_vote);
}
@ -302,7 +302,7 @@ qnetd_algo_lms_quorum_node_list_received(struct qnetd_client *client,
uint32_t msg_seq_num, enum tlv_quorate quorate, const struct node_list *nodes, enum tlv_vote *result_vote)
{
qnetd_log(LOG_DEBUG, " ");
qnetd_log(LOG_DEBUG, "algo-lms: quorum node list from node %d partition %d/%ld", client->node_id, client->last_ring_id.node_id, client->last_ring_id.seq);
qnetd_log(LOG_DEBUG, "algo-lms: quorum node list from node %d partition (" UTILS_PRI_RING_ID ")", client->node_id, client->last_ring_id.node_id, client->last_ring_id.seq);
return do_lms_algorithm(client, &client->last_ring_id, result_vote);
}

7
qdevices/qnetd-algo-utils.c
View File

@ -37,6 +37,7 @@
#include "qnetd-log.h"
#include "qnetd-cluster-list.h"
#include "qnetd-algo-utils.h"
#include "utils.h"
/*
* Returns -1 if any node that is supposedly in the same cluster partition
@ -56,7 +57,7 @@ qnetd_algo_all_ring_ids_match(struct qnetd_client *client, const struct tlv_ring
if (other_client == client) {
continue; /* We've seen our membership list */
}
qnetd_log(LOG_DEBUG, "algo-util: all_ring_ids_match: seen nodeid %d (client %p) ring_id (%d/%ld)", other_client->node_id, other_client, other_client->last_ring_id.node_id, other_client->last_ring_id.seq);
qnetd_log(LOG_DEBUG, "algo-util: all_ring_ids_match: seen nodeid %d (client %p) ring_id (" UTILS_PRI_RING_ID ")", other_client->node_id, other_client, other_client->last_ring_id.node_id, other_client->last_ring_id.seq);
/* Look down our node list and see if this client is known to us */
TAILQ_FOREACH(node_info, &client->last_membership_node_list, entries) {
@ -83,7 +84,7 @@ qnetd_algo_all_ring_ids_match(struct qnetd_client *client, const struct tlv_ring
* we need to wait until they have all caught up before making a decision
*/
if (in_our_partition && !tlv_ring_id_eq(ring_id, &other_client->last_ring_id)) {
qnetd_log(LOG_DEBUG, "algo-util: nodeid %d in our partition has different ring_id (%d/%ld) to us (%d/%ld)", other_client->node_id, other_client->last_ring_id.node_id, other_client->last_ring_id.seq, ring_id->node_id, ring_id->seq);
qnetd_log(LOG_DEBUG, "algo-util: nodeid %d in our partition has different ring_id (" UTILS_PRI_RING_ID ") to us (" UTILS_PRI_RING_ID ")", other_client->node_id, other_client->last_ring_id.node_id, other_client->last_ring_id.seq, ring_id->node_id, ring_id->seq);
return (-1); /* ring IDs don't match */
}
}
@ -161,7 +162,7 @@ qnetd_algo_dump_partitions(partitions_list_t *partitions_list)
struct qnetd_algo_partition *partition;
TAILQ_FOREACH(partition, partitions_list, entries) {
qnetd_log(LOG_DEBUG, "algo-util: partition %d/%ld (%p) has %d nodes",
qnetd_log(LOG_DEBUG, "algo-util: partition (" UTILS_PRI_RING_ID ") (%p) has %d nodes",
partition->ring_id.node_id, partition->ring_id.seq, partition, partition->num_nodes);
}
}