Make sockhub working again.

kvap · kvap · commit 517d80630caa · 2015-12-04T16:06:11.000+03:00
diff --git a/contrib/pg_dtm/dtmd/src/clog.c b/contrib/pg_dtm/dtmd/src/clog.c
@@ -207,5 +207,8 @@ xid_t clog_find_last_used(clog_t clog) {
 			last_used = xid;
 		}
 	}
+	if (last_used < MIN_XID) {
+		last_used = MIN_XID;
+	}
 	return last_used;
 }
diff --git a/contrib/pg_dtm/libdtm.c b/contrib/pg_dtm/libdtm.c
@@ -310,7 +310,7 @@ static DTMConn GetConnection()
 			}
 			else
 			{
-				elog(WARNING, "Failed to connect to DTMD at unix %d", c->port);
+				elog(WARNING, "Failed to connect to DTMD at unix socket");
 			}
 		}
 	}
diff --git a/contrib/pg_dtm/pg_dtm.c b/contrib/pg_dtm/pg_dtm.c
@@ -120,6 +120,7 @@ static TransactionManager DtmTM = {
 };
 
 static char *DtmServers;
+static char *DtmServersCopy;
 static int DtmBufferSize;
 
 static BackgroundWorker DtmWorker = {
@@ -836,7 +837,7 @@ _PG_init(void)
 
 	DefineCustomStringVariable(
 		"dtm.servers",
-		"The space separated host:port pairs where DTM daemons reside",
+		"The comma separated host:port pairs where DTM daemons reside",
 		NULL,
 		&DtmServers,
 		"127.0.0.1:5431",
@@ -847,6 +848,7 @@ _PG_init(void)
 		NULL // GucShowHook show_hook
 	);
 
+	DtmServersCopy = strdup(DtmServers);
 	if (DtmBufferSize != 0)
 	{
 		DtmGlobalConfig(DtmServers, Unix_socket_directories);
@@ -956,7 +958,7 @@ void DtmBackgroundWorker(Datum arg)
 
 	ShubInitParams(&params);
 
-	params.hosts = DtmServers;
+	ShubParamsSetHosts(&params, DtmServersCopy);
 	params.file = unix_sock_path;
 	params.buffer_size = DtmBufferSize;
 
diff --git a/contrib/pg_dtm/sockhub/sockhub.c b/contrib/pg_dtm/sockhub/sockhub.c
@@ -35,8 +35,58 @@ void ShubInitParams(ShubParams* params)
     params->queue_size = 100;
     params->max_attempts = 10;
     params->error_handler = default_error_handler;
+    params->leader = NULL;
 }
 
+void ShubParamsSetHosts(ShubParams* params, char* hoststring)
+{
+    char *hstate, *pstate;
+    char *hostport, *host, *portstr;
+    int port;
+
+    char *hosts = strdup(hoststring);
+    fprintf(stderr, "sockhub parsing hosts = '%s'\n", hosts);
+    hostport = strtok_r(hosts, ",", &hstate);
+
+    while (hostport) {
+        fprintf(stderr, "hostport = '%s'\n", hostport);
+        host = strtok_r(hostport, ":", &pstate);
+        if (!host) {
+            fprintf(stderr, "wrong host in host list\n");
+            break;
+        }
+
+        portstr = strtok_r(NULL, ":", &pstate);
+        if (portstr) {
+            port = atoi(portstr);
+        } else {
+            port = 5431;
+        }
+
+        fprintf(stderr, "adding host %s:%d\n", host, port);
+        host_t *h = malloc(sizeof(host_t));
+        h->host = strdup(host);
+        h->port = port;
+        if (params->leader) {
+            // update pointers from
+            h->prev = params->leader->prev;
+            h->next = params->leader;
+
+            // update pointers to
+            h->prev->next = h;
+            h->next->prev = h;
+        } else {
+            // the list is empty
+            params->leader = h;
+            h->prev = h;
+            h->next = h;
+        }
+
+        hostport = strtok_r(NULL, ",", &hstate);
+    }
+
+    free(hosts);
+}
 
 static int resolve_host_by_name(const char *hostname, unsigned* addrs, unsigned* n_addrs)
 {
@@ -103,57 +153,37 @@ int ShubWriteSocket(int sd, void const* buf, int size)
     return 1;
 }
 
-
 static void reconnect(Shub* shub)
 {
-    static int skip_hosts = 0;
-    printf("will connect to host #%d\n", skip_hosts);
-
     struct sockaddr_in sock_inet;
     unsigned addrs[128];
     unsigned i, n_addrs = sizeof(addrs) / sizeof(addrs[0]);
     int max_attempts = shub->params->max_attempts;
-    char *hosts = strdup(shub->params->hosts);
     if (shub->output >= 0) {
         close_socket(shub, shub->output);
     }
 
     sock_inet.sin_family = AF_INET;
 
-    char *hstate, *pstate;
-    char *hostport, *host, *portstr;
-    int port;
-    hostport = strtok_r(hosts, ",", &hstate);
-    int hosti = 0;
-    while (hostport) {
-        ShubErrorSeverity severity = SHUB_RECOVERABLE_ERROR;
+    while (shub->params->leader) {
+        char *host = shub->params->leader->host;
+        int port = shub->params->leader->port;
 
-        if (hosti < skip_hosts) {
-            goto trynext;
-        }
+        fprintf(stderr, "shub leader = %s:%d\n", host, port);
 
-        host = strtok_r(hostport, ":", &pstate);
-        if (!host) {
-            severity = SHUB_FATAL_ERROR;
-            break;
-        }
+        shub->params->leader = shub->params->leader->next;
 
-        portstr = strtok_r(NULL, ":", &pstate);
-        if (portstr) {
-            port = atoi(portstr);
-        } else {
-            port = 5431;
-        }
+        ShubErrorSeverity severity = SHUB_RECOVERABLE_ERROR;
         sock_inet.sin_port = htons(port);
 
         if (!resolve_host_by_name(host, addrs, &n_addrs)) {
             shub->params->error_handler("Failed to resolve host by name", severity);
-            goto trynext;
+            continue;
         }
         shub->output = socket(AF_INET, SOCK_STREAM, 0);
         if (shub->output < 0) {
             shub->params->error_handler("Failed to create inet socket", severity);
-            goto trynext;
+            continue;
         }
         while (1) {
             int rc = -1;
@@ -170,32 +200,22 @@ static void reconnect(Shub* shub)
             if (rc < 0) {
                 if (errno != ENOENT && errno != ECONNREFUSED && errno != EINPROGRESS) {
                     shub->params->error_handler("Connection can not be establish", severity);
-                    goto trynext;
+                    continue;
                 }
                 if (max_attempts-- != 0) {
                     sleep(1);
                 } else {
                     shub->params->error_handler("Failed to connect to host", severity);
-                    goto trynext;
+                    continue;
                 }
             } else {
                 int optval = 1;
                 setsockopt(shub->output, IPPROTO_TCP, TCP_NODELAY, (char const*)&optval, sizeof(optval));
                 FD_SET(shub->output, &shub->inset);
-                goto finish;
+                return;
             }
         }
-    trynext:
-        hostport = strtok_r(NULL, ",", &hstate);
-        hosti++;
-    }
-finish:
-    if (hosti < skip_hosts) {
-        skip_hosts = 0;
-    } else {
-        skip_hosts++;
     }
-    free(hosts);
 }
 
 static void notify_disconnect(Shub* shub, int chan)
diff --git a/contrib/pg_dtm/sockhub/sockhub.h b/contrib/pg_dtm/sockhub/sockhub.h
@@ -24,14 +24,22 @@ typedef enum
 
 typedef void(*ShubErrorHandler)(char const* msg, ShubErrorSeverity severity);
 
+typedef struct host_t
+{
+    char *host;
+    int port;
+    struct host_t *next;
+    struct host_t *prev;
+} host_t;
+
 typedef struct 
 {
     int buffer_size;
     int delay;
     int queue_size;
     int max_attempts;
     char const* file;
-    char const* hosts;
+    host_t *leader;
     ShubErrorHandler error_handler;
 } ShubParams;
    
@@ -53,7 +61,10 @@ int ShubReadSocket(int sd, void* buf, int size);
 int ShubWriteSocket(int sd, void const* buf, int size);
 
 void ShubInitParams(ShubParams* params);
+void ShubParamsSetHosts(ShubParams* params, char* hoststring);
 void ShubInitialize(Shub* shub, ShubParams* params);
 void ShubLoop(Shub* shub);
 
 #endif
+
+// vim: sts=4 ts=4 sw=4 expandtab

Original file line number	Diff line number	Diff line change
`@@ -207,5 +207,8 @@ xid_t clog_find_last_used(clog_t clog) {`
`207`	`207`	`last_used = xid;`
`208`	`208`	`}`
`209`	`209`	`}`
	`210`	`+ if (last_used < MIN_XID) {`
	`211`	`+ last_used = MIN_XID;`
	`212`	`+ }`
`210`	`213`	`return last_used;`
`211`	`214`	`}`
Original file line number	Diff line number	Diff line change
`@@ -310,7 +310,7 @@ static DTMConn GetConnection()`
`310`	`310`	`}`
`311`	`311`	`else`
`312`	`312`	`{`
`313`		`- elog(WARNING, "Failed to connect to DTMD at unix %d", c->port);`
	`313`	`+ elog(WARNING, "Failed to connect to DTMD at unix socket");`
`314`	`314`	`}`
`315`	`315`	`}`
`316`	`316`	`}`