|
@@ -34,6 +34,7 @@
|
|
|
|
|
|
|
|
#include "qnetd-log.h"
|
|
#include "qnetd-log.h"
|
|
|
#include "qnetd-log-debug.h"
|
|
#include "qnetd-log-debug.h"
|
|
|
|
|
+#include "utils.h"
|
|
|
|
|
|
|
|
void
|
|
void
|
|
|
qnetd_log_debug_dump_cluster(struct qnetd_cluster *cluster)
|
|
qnetd_log_debug_dump_cluster(struct qnetd_cluster *cluster)
|
|
@@ -42,7 +43,7 @@ qnetd_log_debug_dump_cluster(struct qnetd_cluster *cluster)
|
|
|
|
|
|
|
|
qnetd_log(LOG_DEBUG, " cluster dump:");
|
|
qnetd_log(LOG_DEBUG, " cluster dump:");
|
|
|
TAILQ_FOREACH(client, &cluster->client_list, cluster_entries) {
|
|
TAILQ_FOREACH(client, &cluster->client_list, cluster_entries) {
|
|
|
- qnetd_log(LOG_DEBUG, " client = %p, node_id = %"PRIx32,
|
|
|
|
|
|
|
+ qnetd_log(LOG_DEBUG, " client = %p, node_id = "UTILS_PRI_NODE_ID,
|
|
|
client, client->node_id);
|
|
client, client->node_id);
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
@@ -56,7 +57,7 @@ qnetd_log_debug_new_client_connected(struct qnetd_client *client)
|
|
|
qnetd_log(LOG_DEBUG, " tls started = %u", client->tls_started);
|
|
qnetd_log(LOG_DEBUG, " tls started = %u", client->tls_started);
|
|
|
qnetd_log(LOG_DEBUG, " tls peer certificate verified = %u",
|
|
qnetd_log(LOG_DEBUG, " tls peer certificate verified = %u",
|
|
|
client->tls_peer_certificate_verified);
|
|
client->tls_peer_certificate_verified);
|
|
|
- qnetd_log(LOG_DEBUG, " node_id = %"PRIx32, client->node_id);
|
|
|
|
|
|
|
+ qnetd_log(LOG_DEBUG, " node_id = "UTILS_PRI_NODE_ID, client->node_id);
|
|
|
qnetd_log(LOG_DEBUG, " pointer = %p", client);
|
|
qnetd_log(LOG_DEBUG, " pointer = %p", client);
|
|
|
|
|
|
|
|
qnetd_log_debug_dump_cluster(client->cluster);
|
|
qnetd_log_debug_dump_cluster(client->cluster);
|
|
@@ -69,8 +70,8 @@ qnetd_log_debug_dump_node_list(struct qnetd_client *client, const struct node_li
|
|
|
|
|
|
|
|
qnetd_log(LOG_DEBUG, " node list:");
|
|
qnetd_log(LOG_DEBUG, " node list:");
|
|
|
TAILQ_FOREACH(node_info, nodes, entries) {
|
|
TAILQ_FOREACH(node_info, nodes, entries) {
|
|
|
- qnetd_log(LOG_DEBUG, " node_id = %"PRIx32", "
|
|
|
|
|
- "data_center_id = %"PRIx32", "
|
|
|
|
|
|
|
+ qnetd_log(LOG_DEBUG, " node_id = "UTILS_PRI_NODE_ID", "
|
|
|
|
|
+ "data_center_id = "UTILS_PRI_DATACENTER_ID", "
|
|
|
"node_state = %s", node_info->node_id, node_info->data_center_id,
|
|
"node_state = %s", node_info->node_id, node_info->data_center_id,
|
|
|
tlv_node_state_to_str(node_info->node_state));
|
|
tlv_node_state_to_str(node_info->node_state));
|
|
|
}
|
|
}
|
|
@@ -82,14 +83,14 @@ qnetd_log_debug_config_node_list_received(struct qnetd_client *client,
|
|
|
const struct node_list *nodes, int initial)
|
|
const struct node_list *nodes, int initial)
|
|
|
{
|
|
{
|
|
|
|
|
|
|
|
- qnetd_log(LOG_DEBUG, "Client %p (cluster %s, node_id %"PRIx32") "
|
|
|
|
|
|
|
+ qnetd_log(LOG_DEBUG, "Client %p (cluster %s, node_id "UTILS_PRI_NODE_ID") "
|
|
|
"sent %s node list.", client, client->cluster_name, client->node_id,
|
|
"sent %s node list.", client, client->cluster_name, client->node_id,
|
|
|
(initial ? "initial" : "changed"));
|
|
(initial ? "initial" : "changed"));
|
|
|
|
|
|
|
|
- qnetd_log(LOG_DEBUG, " msg seq num %"PRIu32, msg_seq_num);
|
|
|
|
|
|
|
+ qnetd_log(LOG_DEBUG, " msg seq num "UTILS_PRI_MSG_SEQ, msg_seq_num);
|
|
|
|
|
|
|
|
if (config_version_set) {
|
|
if (config_version_set) {
|
|
|
- qnetd_log(LOG_DEBUG, " config version %"PRIu64, config_version);
|
|
|
|
|
|
|
+ qnetd_log(LOG_DEBUG, " config version " UTILS_PRI_CONFIG_VERSION, config_version);
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
qnetd_log_debug_dump_node_list(client, nodes);
|
|
qnetd_log_debug_dump_node_list(client, nodes);
|
|
@@ -100,12 +101,12 @@ qnetd_log_debug_membership_node_list_received(struct qnetd_client *client,
|
|
|
uint32_t msg_seq_num, const struct tlv_ring_id *ring_id,
|
|
uint32_t msg_seq_num, const struct tlv_ring_id *ring_id,
|
|
|
const struct node_list *nodes)
|
|
const struct node_list *nodes)
|
|
|
{
|
|
{
|
|
|
- qnetd_log(LOG_DEBUG, "Client %p (cluster %s, node_id %"PRIx32") "
|
|
|
|
|
|
|
+ qnetd_log(LOG_DEBUG, "Client %p (cluster %s, node_id "UTILS_PRI_NODE_ID") "
|
|
|
"sent membership node list.", client, client->cluster_name, client->node_id);
|
|
"sent membership node list.", client, client->cluster_name, client->node_id);
|
|
|
|
|
|
|
|
- qnetd_log(LOG_DEBUG, " msg seq num %"PRIu32, msg_seq_num);
|
|
|
|
|
|
|
+ qnetd_log(LOG_DEBUG, " msg seq num "UTILS_PRI_MSG_SEQ, msg_seq_num);
|
|
|
|
|
|
|
|
- qnetd_log(LOG_DEBUG, " ring id = (%"PRIx32".%"PRIx64")", ring_id->node_id, ring_id->seq);
|
|
|
|
|
|
|
+ qnetd_log(LOG_DEBUG, " ring id = (" UTILS_PRI_RING_ID ")", ring_id->node_id, ring_id->seq);
|
|
|
|
|
|
|
|
qnetd_log_debug_dump_node_list(client, nodes);
|
|
qnetd_log_debug_dump_node_list(client, nodes);
|
|
|
}
|
|
}
|
|
@@ -115,10 +116,10 @@ qnetd_log_debug_quorum_node_list_received(struct qnetd_client *client,
|
|
|
uint32_t msg_seq_num, enum tlv_quorate quorate, const struct node_list *nodes)
|
|
uint32_t msg_seq_num, enum tlv_quorate quorate, const struct node_list *nodes)
|
|
|
{
|
|
{
|
|
|
|
|
|
|
|
- qnetd_log(LOG_DEBUG, "Client %p (cluster %s, node_id %"PRIx32") "
|
|
|
|
|
|
|
+ qnetd_log(LOG_DEBUG, "Client %p (cluster %s, node_id "UTILS_PRI_NODE_ID") "
|
|
|
"sent quorum node list.", client, client->cluster_name, client->node_id);
|
|
"sent quorum node list.", client, client->cluster_name, client->node_id);
|
|
|
|
|
|
|
|
- qnetd_log(LOG_DEBUG, " msg seq num %"PRIu32, msg_seq_num);
|
|
|
|
|
|
|
+ qnetd_log(LOG_DEBUG, " msg seq num "UTILS_PRI_MSG_SEQ, msg_seq_num);
|
|
|
qnetd_log(LOG_DEBUG, " quorate = %u", quorate);
|
|
qnetd_log(LOG_DEBUG, " quorate = %u", quorate);
|
|
|
|
|
|
|
|
qnetd_log_debug_dump_node_list(client, nodes);
|
|
qnetd_log_debug_dump_node_list(client, nodes);
|
|
@@ -128,35 +129,35 @@ void
|
|
|
qnetd_log_debug_client_disconnect(struct qnetd_client *client, int server_going_down)
|
|
qnetd_log_debug_client_disconnect(struct qnetd_client *client, int server_going_down)
|
|
|
{
|
|
{
|
|
|
|
|
|
|
|
- qnetd_log(LOG_DEBUG, "Client %p (init_received %u, cluster %s, node_id %"PRIx32
|
|
|
|
|
- ") disconnect%s", client, client->init_received, client->cluster_name,
|
|
|
|
|
- client->node_id, (server_going_down ? " (server is going down)" : ""));
|
|
|
|
|
|
|
+ qnetd_log(LOG_DEBUG, "Client %p (init_received %u, cluster %s, node_id "
|
|
|
|
|
+ UTILS_PRI_NODE_ID") disconnect%s", client, client->init_received, client->cluster_name,
|
|
|
|
|
+ client->node_id, (server_going_down ? " (server is going down)" : ""));
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
void
|
|
void
|
|
|
qnetd_log_debug_ask_for_vote_received(struct qnetd_client *client, uint32_t msg_seq_num)
|
|
qnetd_log_debug_ask_for_vote_received(struct qnetd_client *client, uint32_t msg_seq_num)
|
|
|
{
|
|
{
|
|
|
|
|
|
|
|
- qnetd_log(LOG_DEBUG, "Client %p (cluster %s, node_id %"PRIx32") "
|
|
|
|
|
|
|
+ qnetd_log(LOG_DEBUG, "Client %p (cluster %s, node_id "UTILS_PRI_NODE_ID") "
|
|
|
"asked for a vote", client, client->cluster_name, client->node_id);
|
|
"asked for a vote", client, client->cluster_name, client->node_id);
|
|
|
- qnetd_log(LOG_DEBUG, " msg seq num %"PRIu32, msg_seq_num);
|
|
|
|
|
|
|
+ qnetd_log(LOG_DEBUG, " msg seq num "UTILS_PRI_MSG_SEQ, msg_seq_num);
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
void
|
|
void
|
|
|
qnetd_log_debug_vote_info_reply_received(struct qnetd_client *client, uint32_t msg_seq_num)
|
|
qnetd_log_debug_vote_info_reply_received(struct qnetd_client *client, uint32_t msg_seq_num)
|
|
|
{
|
|
{
|
|
|
|
|
|
|
|
- qnetd_log(LOG_DEBUG, "Client %p (cluster %s, node_id %"PRIx32") "
|
|
|
|
|
|
|
+ qnetd_log(LOG_DEBUG, "Client %p (cluster %s, node_id "UTILS_PRI_NODE_ID") "
|
|
|
"replied back to vote info message", client, client->cluster_name, client->node_id);
|
|
"replied back to vote info message", client, client->cluster_name, client->node_id);
|
|
|
- qnetd_log(LOG_DEBUG, " msg seq num %"PRIu32, msg_seq_num);
|
|
|
|
|
|
|
+ qnetd_log(LOG_DEBUG, " msg seq num "UTILS_PRI_MSG_SEQ, msg_seq_num);
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
void
|
|
void
|
|
|
qnetd_log_debug_send_vote_info(struct qnetd_client *client, uint32_t msg_seq_num, enum tlv_vote vote)
|
|
qnetd_log_debug_send_vote_info(struct qnetd_client *client, uint32_t msg_seq_num, enum tlv_vote vote)
|
|
|
{
|
|
{
|
|
|
|
|
|
|
|
- qnetd_log(LOG_DEBUG, "Sending vote info to client %p (cluster %s, node_id %"PRIx32") ",
|
|
|
|
|
|
|
+ qnetd_log(LOG_DEBUG, "Sending vote info to client %p (cluster %s, node_id "UTILS_PRI_NODE_ID") ",
|
|
|
client, client->cluster_name, client->node_id);
|
|
client, client->cluster_name, client->node_id);
|
|
|
- qnetd_log(LOG_DEBUG, " msg seq num %"PRIu32, msg_seq_num);
|
|
|
|
|
|
|
+ qnetd_log(LOG_DEBUG, " msg seq num "UTILS_PRI_MSG_SEQ, msg_seq_num);
|
|
|
qnetd_log(LOG_DEBUG, " vote %s", tlv_vote_to_str(vote));
|
|
qnetd_log(LOG_DEBUG, " vote %s", tlv_vote_to_str(vote));
|
|
|
}
|
|
}
|