* pgpool: a language independent connection pool server for PostgreSQL
* written by Tatsuo Ishii
*
- * Copyright (c) 2003-2017 PgPool Global Development Group
+ * Copyright (c) 2003-2019 PgPool Global Development Group
*
* Permission to use, copy, modify, and distribute this software and
* its documentation for any purpose and without fee is hereby
#define WD_TIME_DIFF_SEC(a,b) (int)(((a).tv_sec - (b).tv_sec) + \
((a).tv_usec - (b).tv_usec) / 1000000.0)
+/*
+* Data version number of watchdog messages
+* The version number is in major.minor format
+* The major versions are always kept compatible.
+*
+* Increment the minor version whenever a minor change is
+* made to message data, where the older versions can still
+* work even when that change is not present in it.
+*
+* while incrementing the major version would mean that
+* the watchdog node with older major version will not be
+* allowed to join the cluster
+*
+* Since the message data version was not present from the
+* beginning, so the default version is considered to be 1.0
+* meaning if the data version number is not present in the
+* watchdog node info then it will be considered as version 1.0
+*/
+
+#define WD_MESSAGE_DATA_VERSION_MAJOR "1"
+#define WD_MESSAGE_DATA_VERSION_MINOR "1"
+#define WD_MESSAGE_DATA_VERSION WD_MESSAGE_DATA_VERSION_MAJOR "." WD_MESSAGE_DATA_VERSION_MINOR
+#define MAX_VERSION_STR_LEN 10
+
/*
* watchdog state
*/
WD_EVENT_NODE_CON_LOST,
WD_EVENT_NODE_CON_FOUND,
- WD_EVENT_CLUSTER_QUORUM_CHANGED
-
-} WD_EVENTS;
+ WD_EVENT_CLUSTER_QUORUM_CHANGED,
+ WD_EVENT_WD_STATE_REQUIRE_RELOAD
+} WD_EVENTS;
typedef struct SocketConnection
{
struct timeval last_sent_time; /* timestamp when last packet
* was sent on the node
*/
+ char pgp_version[MAX_VERSION_STR_LEN]; /* Pgpool-II version */
+ int wd_data_major_version; /* watchdog messaging version major*/
+ int wd_data_minor_version; /* watchdog messaging version minor*/
+
char nodeName[WD_MAX_HOST_NAMELEN]; /* name of this node */
char hostname[WD_MAX_HOST_NAMELEN]; /* host name */
int wd_port; /* watchdog port */
#define CLUSTER_IAM_NOT_TRUE_MASTER 'X'
#define CLUSTER_IAM_RESIGNING_FROM_MASTER 'R'
#define CLUSTER_NODE_INVALID_VERSION 'V'
+#define CLUSTER_NODE_REQUIRE_TO_RELOAD 'I'
#define WD_MASTER_NODE getMasterWatchdogNode()
"THIS NODE FOUND",
"NODE CONNECTION LOST",
"NODE CONNECTION FOUND",
- "CLUSTER QUORUM STATUS CHANGED"
+ "CLUSTER QUORUM STATUS CHANGED",
+ "NODE REQUIRE TO RELOAD STATE"
};
char *wd_state_names[] = {
close_socket_connection(&wdNode->server_socket);
strlcpy(wdNode->delegate_ip, tempNode->delegate_ip, WD_MAX_HOST_NAMELEN);
strlcpy(wdNode->nodeName, tempNode->nodeName, WD_MAX_HOST_NAMELEN);
+ strlcpy(wdNode->pgp_version, tempNode->pgp_version, MAX_VERSION_STR_LEN);
wdNode->state = tempNode->state;
+ wdNode->wd_data_major_version = tempNode->wd_data_major_version;
+ wdNode->wd_data_minor_version = tempNode->wd_data_minor_version;
wdNode->startup_time.tv_sec = tempNode->startup_time.tv_sec;
wdNode->wd_priority = tempNode->wd_priority;
wdNode->server_socket = *conn;
{
/* reply with node info message */
ereport(LOG,
- (errmsg("new node joined the cluster hostname:\"%s\" port:%d pgpool_port:%d",tempNode->hostname,tempNode->wd_port,tempNode->pgpool_port)));
+ (errmsg("new node joined the cluster hostname:\"%s\" port:%d pgpool_port:%d", wdNode->hostname,
+ wdNode->wd_port,
+ wdNode->pgpool_port),
+ errdetail("Pgpool-II version:\"%s\" watchdog messaging version: %d.%d",
+ wdNode->pgp_version,
+ wdNode->wd_data_major_version,
+ wdNode->wd_data_minor_version)));
watchdog_state_machine(WD_EVENT_PACKET_RCV, wdNode, pkt, NULL);
}
static IPC_CMD_PREOCESS_RES process_IPC_nodeStatusChange_command(WDCommandData* ipcCommand)
{
- int nodeStatus;
- int nodeID;
- char *message;
- bool ret;
+ int nodeStatus;
+ int nodeID;
+ char *message = NULL;
+ bool ret;
if (ipcCommand->sourcePacket.len <= 0 || ipcCommand->sourcePacket.data == NULL)
return IPC_CMD_ERROR;
}
if (message)
+ {
ereport(LOG,
(errmsg("received node status change ipc message"),
- errdetail("%s",message)));
- pfree(message);
-
- if (fire_node_status_event(nodeID,nodeStatus) == false)
+ errdetail("%s", message)));
+ pfree(message);
+ }
+ if (fire_node_status_event(nodeID, nodeStatus) == false)
return IPC_CMD_ERROR;
return IPC_CMD_COMPLETE;
break;
case CLUSTER_NEEDS_ELECTION:
- {
- ereport(LOG,
- (errmsg("remote node \"%s\" detected the split-brain and wants to re-initialize the cluster",wdNode->nodeName)));
+ {
+ ereport(LOG,
+ (errmsg("remote node \"%s\" detected the problem and asking us to rejoin the cluster", wdNode->nodeName)));
set_state(WD_JOINING);
}
}
break;
+ case CLUSTER_NODE_REQUIRE_TO_RELOAD:
+ {
+ watchdog_state_machine(WD_EVENT_WD_STATE_REQUIRE_RELOAD, NULL, NULL, NULL);
+ }
+ break;
+
case CLUSTER_NODE_INVALID_VERSION:
{
/* this should never happen
}
break;
+ case WD_EVENT_REMOTE_NODE_FOUND:
+ {
+ ereport(LOG,
+ (errmsg("remote node \"%s\" is reachable again", wdNode->nodeName),
+ errdetail("trying to add it back as a standby")));
+ /* If I am the cluster master. Ask for the node info and to re-send the join message */
+ send_message_of_type(wdNode, WD_REQ_INFO_MESSAGE, NULL);
+ if (wdNode->wd_data_major_version >= 1 && wdNode->wd_data_minor_version >= 1)
+ {
+ /*
+ * Since data version 1.1 we support CLUSTER_NODE_REQUIRE_TO_RELOAD
+ * which makes the standby nodes to re-send the join master node
+ */
+ ereport(DEBUG1,
+ (errmsg("asking remote node \"%s\" to rejoin master", wdNode->nodeName),
+ errdetail("watchdog data version %s",WD_MESSAGE_DATA_VERSION)));
+
+ send_cluster_service_message(wdNode, pkt, CLUSTER_NODE_REQUIRE_TO_RELOAD);
+ }
+ else
+ {
+ /*
+ * The node is on older version
+ * So ask it to re-join the cluster
+ */
+ ereport(DEBUG1,
+ (errmsg("asking remote node \"%s\" to rejoin cluster", wdNode->nodeName),
+ errdetail("watchdog data version %s",WD_MESSAGE_DATA_VERSION)));
+ send_cluster_service_message(wdNode, pkt, CLUSTER_NEEDS_ELECTION);
+ }
+ break;
+ }
+
case WD_EVENT_PACKET_RCV:
{
switch (pkt->type)
set_timeout(5);
break;
+ case WD_EVENT_WD_STATE_REQUIRE_RELOAD:
+
+ ereport(LOG,
+ (errmsg("re-sending join coordinator message to master node: \"%s\"", WD_MASTER_NODE->nodeName)));
+
+ send_cluster_command(WD_MASTER_NODE, WD_JOIN_COORDINATOR_MESSAGE, 5);
+ break;
+
case WD_EVENT_COMMAND_FINISHED:
{
if (clusterCommand->commandPacket.type == WD_JOIN_COORDINATOR_MESSAGE)
JsonNode* jNode = jw_create_with_object(true);
+ jw_put_string(jNode, "PGPOOL_VERSION", VERSION);
+ jw_put_string(jNode, "DATA_VERSION_MAJOR", WD_MESSAGE_DATA_VERSION_MAJOR);
+ jw_put_string(jNode, "DATA_VERSION_MINOR", WD_MESSAGE_DATA_VERSION_MINOR);
+
jw_put_int(jNode, "State", wdNode->state);
jw_put_int(jNode, "WdPort", wdNode->wd_port);
jw_put_int(jNode, "PgpoolPort", wdNode->pgpool_port);
goto ERROR_EXIT;
strncpy(wdNode->delegate_ip, ptr, sizeof(wdNode->delegate_ip) -1);
+ ptr = json_get_string_value_for_key(root, "DATA_VERSION_MAJOR");
+ if (ptr == NULL)
+ wdNode->wd_data_major_version = 1;
+ else
+ wdNode->wd_data_major_version = atoi(ptr);
+
+ ptr = json_get_string_value_for_key(root, "DATA_VERSION_MINOR");
+ if (ptr == NULL)
+ wdNode->wd_data_minor_version = 0;
+ else
+ wdNode->wd_data_minor_version = atoi(ptr);
+
+ ptr = json_get_string_value_for_key(root, "PGPOOL_VERSION");
+ if (ptr != NULL)
+ strncpy(wdNode->pgp_version, ptr, sizeof(wdNode->pgp_version) - 1);
+ else
+ wdNode->pgp_version[0] = '0';
+
if (authkey)
{
ptr = json_get_string_value_for_key(root, "authkey");
else
*authkey = NULL;
}
+
return wdNode;
ERROR_EXIT:
projects / pgpool2.git / commitdiff