sync/ports
1
0
Fork 0
mirror of https://git.freebsd.org/ports.git synced 2025-06-07 13:50:38 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions
ports/databases/pgcluster/files/patch-main.c
Jun Kuriyama f18b1ceaea o Fix some bugs reported on ML. 
o Fix more style bugs in debug message.
o Add internal function to postmaster which returns current replication
  server.
o Add new packet handler to pgreplicate which returns cluster node
  status information.
o Add check scripts for nagios.  These scripts may be useful, but not
  intended to officially supported by me.  I'll make them as another
  port when they become stable.
2004-02-25 13:47:27 +00:00

326 lines
9.4 KiB
C
Raw Blame History

--- src/pgcluster/pgrp/main.c.orig Fri Feb 20 11:38:40 2004
+++ src/pgcluster/pgrp/main.c Mon Feb 23 12:45:51 2004
@@ -148,7 +148,7 @@
char * query;
/* set function name */
- set_function("read_packet");
+ set_function("main::read_packet");
if (header == NULL)
{
@@ -171,7 +171,7 @@
}
if (r == 0)
{
- show_debug("connection closed");
+ show_debug("connection closed (sock=%d, header=%d, read=%d)", sock, header_size, read_size);
return NULL;
}
read_size += r;
@@ -258,18 +258,18 @@
/* set function name */
set_function("replicate_packet_send");
- show_debug("cmdSts=%c\n",header->cmdSts);
- show_debug("cmdType=%c\n",header->cmdType);
- show_debug("port=%d\n",header->port);
- show_debug("pid=%d\n",header->pid);
- show_debug("except_host=%s\n",header->except_host);
- show_debug("from_host=%s\n",header->from_host);
- show_debug("dbName=%s\n",header->dbName);
- show_debug("userName=%s\n",header->userName);
- show_debug("recieve sec=%u\n",header->tv.tv_sec);
- show_debug("recieve usec=%u\n",header->tv.tv_usec);
- show_debug("query_size=%d\n",header->query_size);
- show_debug("query=%s\n",query);
+ show_debug("cmdSts=%c",header->cmdSts);
+ show_debug("cmdType=%c",header->cmdType);
+ show_debug("port=%d",header->port);
+ show_debug("pid=%d",header->pid);
+ show_debug("except_host=%s",header->except_host);
+ show_debug("from_host=%s",header->from_host);
+ show_debug("dbName=%s",header->dbName);
+ show_debug("userName=%s",header->userName);
+ show_debug("recieve sec=%u",header->tv.tv_sec);
+ show_debug("recieve usec=%u",header->tv.tv_usec);
+ show_debug("query_size=%d",header->query_size);
+ show_debug("query=%s",query);
/*
* loop while registrated cluster DB exist
@@ -277,7 +277,9 @@
ptr = Host_Tbl_Begin;
while(ptr->useFlag != DB_TBL_END)
{
+ set_function("replicate_packet_send");
sem_num = ptr->hostNum;
+ show_debug("loop: cnt=%d, hostNum=%d, hostName=%s, port=%d, recoveryPort=%d, useFlag=%d", cnt, ptr->hostNum, ptr->hostName, ptr->port, ptr->recoveryPort, ptr->useFlag);
/*
* check the status of the cluster DB
*/
@@ -291,7 +293,7 @@
*/
if (PGRis_master_in_recovery(ptr->hostName, ptr->port) == true)
{
- show_debug("%s skipped\n",ptr->hostName);
+ show_debug("%s skipped",ptr->hostName);
ptr ++;
continue;
}
@@ -368,6 +370,8 @@
if (sem_num > 0)
PGRsem_lock(SemID,sem_num);
rtn = replicate_packet_send_each_server( ptr, cnt,header, query, dest);
+ set_function("replicate_packet_send");
+ show_debug("replicate_packet_send_each_server returns %d (useFlag=%d", rtn, ptr->useFlag);
show_debug("sem_unlock[%d]",sem_num);
if (sem_num > 0)
PGRsem_unlock(SemID,sem_num);
@@ -382,7 +386,8 @@
cnt ++;
}
ptr ++;
- }
+ }
+ show_debug("replicate_packet_send() end");
return STATUS_OK;
}
@@ -412,10 +417,10 @@
set_function("replicate_packet_send_each_server");
host = ptr->hostName;
- show_debug("except:%d@%s host:%d@%s\n",
+ show_debug("except:%d@%s host:%d@%s",
header->port,header->except_host,
ptr->port,ptr->hostName);
- show_debug("send replicate to:%s\n",host);
+ show_debug("send replicate to:%s",host);
/*
* send query to cluster DB
*/
@@ -427,6 +432,8 @@
memset(PGR_Result,0,PGR_MESSAGE_BUFSIZE);
rtn = PGRsend_replicate_packet_to_server( ptr, header,query,PGR_Result);
+ set_function("replicate_packet_send_each_server");
+ show_debug("PGRsend_replicate_packet_to_server() returns %d", rtn);
if ((header->cmdSts == CMD_STS_QUERY ) &&
((header->cmdType == CMD_TYPE_INSERT) ||
(header->cmdType == CMD_TYPE_UPDATE)))
@@ -476,7 +483,7 @@
}
send_ptr = PGR_Result;
buf_size = PGR_MESSAGE_BUFSIZE;
- show_debug("%d[%s]",buf_size,send_ptr);
+ show_debug("buf_size=%d[send_ptr=%s]",buf_size,send_ptr);
if (buf_size < 1)
buf_size = 1;
@@ -491,7 +498,7 @@
rtn = select(dest+1, (fd_set *)NULL, &wmask, (fd_set *)NULL, &timeout);
if (rtn && FD_ISSET(dest, &wmask))
{
- show_debug("return_result[%s]",send_ptr);
+ show_debug("select() and FD_ISSET() [send_ptr=%s]",send_ptr);
for (;;)
{
s = send(dest,send_ptr + send_size,buf_size - send_size ,0);
@@ -513,7 +520,7 @@
send_size += s;
if (send_size == buf_size)
{
- show_debug("%d send",send_size);
+ show_debug("%d bytes sent", send_size);
status = STATUS_OK;
if (wait == PGR_WAIT_ANSWER)
{
@@ -560,7 +567,7 @@
rtn = select(dest+1, &rmask, (fd_set *)NULL, (fd_set *)NULL, &timeout);
if (rtn && FD_ISSET(dest, &rmask))
{
- show_debug("read_answer selected\n");
+ show_debug("read_answer selected (dest=%d)", dest);
answer = NULL;
answer = read_packet(dest,&header);
show_debug("answer[%s]",answer);
@@ -630,6 +637,43 @@
return NULL;
}
+static void
+dump_status(int fd)
+{
+ HostTbl *host = Host_Tbl_Begin;
+ while (host->useFlag != DB_TBL_END) {
+ char buf[256];
+ const char *flag = buf;
+ if (host->useFlag == DB_TBL_FREE) {
+ flag = "FREE";
+ } else if (host->useFlag == DB_TBL_INIT) {
+ flag = "INIT";
+ } else if (host->useFlag == DB_TBL_USE) {
+ flag = "USE";
+ } else if (host->useFlag == DB_TBL_ERROR) {
+ flag = "ERROR";
+ } else {
+ snprintf(buf, sizeof(buf), "UNKNOWN(%d)", host->useFlag);
+ }
+ show_debug("%s:%d flag=%s, recoveryPort=%d",
+ host->hostName, host->port, flag, host->recoveryPort);
+
+ snprintf(buf, sizeof(buf), "hostNum=%d\n", host->hostNum);
+ write(fd, buf, strlen(buf));
+ snprintf(buf, sizeof(buf), "hostName=%s\n", host->hostName);
+ write(fd, buf, strlen(buf));
+ snprintf(buf, sizeof(buf), "port=%d\n", host->port);
+ write(fd, buf, strlen(buf));
+ snprintf(buf, sizeof(buf), "useFlag=%d\n", host->useFlag);
+ write(fd, buf, strlen(buf));
+ snprintf(buf, sizeof(buf), "recoveryPort=%d\n", host->recoveryPort);
+ write(fd, buf, strlen(buf));
+ write(fd, "\n", strlen("\n"));
+
+ host++;
+ }
+}
+
/*--------------------------------------------------------------------
* SYMBOL
* replicate_loop()
@@ -665,11 +709,11 @@
}
if (pid == 0)
{
- signal(SIGHUP, quick_exit);
- signal(SIGINT, quick_exit);
- signal(SIGQUIT, quick_exit);
- signal(SIGTERM, quick_exit);
- signal(SIGALRM, quick_exit);
+ signal(SIGHUP, quick_exit);
+ signal(SIGINT, quick_exit);
+ signal(SIGQUIT, quick_exit);
+ signal(SIGTERM, quick_exit);
+ signal(SIGALRM, quick_exit);
setpgid(0,pgid);
/* child loop */
@@ -687,14 +731,21 @@
FD_ZERO(&rmask);
FD_SET(sock,&rmask);
rtn = select(sock+1, &rmask, (fd_set *)NULL, (fd_set *)NULL, &timeout);
+ if (rtn < 0) {
+ show_debug("select() = %d (%s)", rtn, strerror(errno));
+ }
if (rtn && FD_ISSET(sock, &rmask))
{
- show_debug("replicate_loop selected\n");
+ show_debug("replicate_loop selected (sock=%d)", sock);
query = NULL;
query = read_packet(sock,&header);
- if (query == NULL)
+ if (query == NULL && errno != 0)
{
- show_error("read_packet failed");
+ show_error("read_packet failed (errno=%d)", errno);
+ break;
+ }
+ if (header.cmdType == 'o') {
+ dump_status(sock);
break;
}
if (header.cmdSts == 0)
@@ -708,7 +759,7 @@
}
}
gettimeofday(&(header.tv),NULL);
- show_debug("query :: %s\n",query);
+ show_debug("query :: %s",query);
RecoveryStatus = PGRget_recovery_status();
PGRcheck_recovered_host();
@@ -781,7 +832,7 @@
show_error("fopen failed: (%s)",strerror(errno));
return STATUS_ERROR;
}
- show_debug("%s open ok\n",fname);
+ show_debug("%s open ok",fname);
/*
* read configuration file
@@ -915,10 +966,10 @@
/* set load balance table */
for ( i = 0 ; i <= lb_cnt ; i ++)
{
+ memset((LoadBalanceTbl + i),0,sizeof(RecoveryTbl));
(LoadBalanceTbl + i)->port = -1;
(LoadBalanceTbl + i)->sock = -1;
}
- memset((LoadBalanceTbl + i),0,sizeof(RecoveryTbl));
PGR_Free_Conf_Data();
/* allocate result buffer of query */
@@ -954,13 +1005,13 @@
/* set function name */
set_function("replicate_main");
- show_debug("replicate mail %d port bind\n",Port_Number);
+ show_debug("replicate mail %d port bind",Port_Number);
status = PGR_Create_Socket_Bind(&fd, "", Port_Number);
if (status != STATUS_OK)
{
PGRreplicate_exit(0);
}
- show_debug("replicate mail %d port bind OK \n",Port_Number);
+ show_debug("replicate mail %d port bind OK",Port_Number);
for (;;)
{
@@ -976,11 +1027,14 @@
*/
FD_ZERO(&rmask);
FD_SET(fd,&rmask);
- show_debug("wait replicate\n");
+ show_debug("wait replicate");
rtn = select(fd+1, &rmask, (fd_set *)NULL, (fd_set *)NULL, &timeout);
+ if (rtn < 0) {
+ show_debug("select() = %d (%s)", rtn, strerror(errno));
+ }
if (rtn && FD_ISSET(fd, &rmask))
{
- show_debug("replicate main: selected\n");
+ show_debug("replicate main: selected (fd=%d)", fd);
/*
* get recovery status.
*/
@@ -1315,12 +1369,12 @@
if (init_server_tbl(path) != STATUS_OK)
{
- show_debug("init_server_tbl error\n");
+ show_debug("init_server_tbl error");
PGRreplicate_exit(0);
}
if (PGRinit_recovery() != STATUS_OK)
{
- show_debug("PGRinit_recovery error\n");
+ show_debug("PGRinit_recovery error");
PGRreplicate_exit(0);
}
pgid = getpgid(0);
@@ -1332,10 +1386,10 @@
}
if (pid == 0)
{
- signal(SIGHUP, quick_exit);
- signal(SIGINT, quick_exit);
- signal(SIGQUIT, quick_exit);
- signal(SIGTERM, quick_exit);
+ signal(SIGHUP, quick_exit);
+ signal(SIGINT, quick_exit);
+ signal(SIGQUIT, quick_exit);
+ signal(SIGTERM, quick_exit);
/*
* in child process,
* call recovery module
Reference in a new issue View git blame Copy permalink