Move sockhub background worker registering code from shmem hook (postgres warns about this).

kvap · kvap · commit 819f38b8c21a · 2015-10-14T14:16:51.000+03:00
diff --git a/contrib/pg_dtm/libdtm.c b/contrib/pg_dtm/libdtm.c
@@ -39,8 +39,9 @@ static DTMConn DtmConnect(char *host, int port)
 	DTMConn dtm;
 	int sd;
 
-	if (strcmp(host, "localhost") == 0)
+	if (host == NULL)
 	{
+		// use a UNIX socket
 		struct sockaddr sock;
 		int len = offsetof(struct sockaddr, sa_data) + snprintf(sock.sa_data, sizeof(sock.sa_data), "%s/p%u", dtm_unix_sock_dir, port);
 		sock.sa_family = AF_UNIX;
@@ -62,6 +63,7 @@ static DTMConn DtmConnect(char *host, int port)
 	}
 	else
 	{
+		// use an IP socket
 		struct addrinfo *addrs = NULL;
 		struct addrinfo hint;
 		char portstr[6];
@@ -207,7 +209,9 @@ void DtmGlobalConfig(char *host, int port, char* sock_dir) {
 		free(dtmhost);
 		dtmhost = NULL;
 	}
-	dtmhost = strdup(host);
+	if (host) {
+		dtmhost = strdup(host);
+	}
 	dtmport = port;
 	dtm_unix_sock_dir = sock_dir;
 }
@@ -217,14 +221,14 @@ static DTMConn GetConnection()
 	static DTMConn dtm = NULL;
 	if (dtm == NULL)
 	{
-		if (dtmhost) {
-			dtm = DtmConnect(dtmhost, dtmport);
-			if (dtm == NULL)
-			{
-				elog(ERROR, "Failed to connect to DTMD %s:%d", dtmhost, dtmport);
+		dtm = DtmConnect(dtmhost, dtmport);
+		if (dtm == NULL)
+		{
+			if (dtmhost) {
+				elog(ERROR, "Failed to connect to DTMD at tcp %s:%d", dtmhost, dtmport);
+			} else {
+				elog(ERROR, "Failed to connect to DTMD at unix %d", dtmport);
 			}
-		} else {
-			/* elog(ERROR, "DTMD address not specified"); */
 		}
 	}
 	return dtm;
diff --git a/contrib/pg_dtm/pg_dtm.c b/contrib/pg_dtm/pg_dtm.c
@@ -654,9 +654,6 @@ static void DtmInitialize()
 		dtm->nReservedXids = 0;
         dtm->minXid = InvalidTransactionId;
         RegisterXactCallback(DtmXactCallback, NULL);
-        if (DtmBufferSize != 0) { 
-            RegisterBackgroundWorker(&DtmWorker);
-        }
 	}
 	LWLockRelease(AddinShmemInitLock);
 
@@ -793,7 +790,13 @@ _PG_init(void)
 		NULL
 	);
 
-	DtmGlobalConfig(DtmHost, DtmPort, Unix_socket_directories);
+
+	if (DtmBufferSize != 0) { 
+		DtmGlobalConfig(NULL, DtmPort, Unix_socket_directories);
+		RegisterBackgroundWorker(&DtmWorker);
+	} else {
+		DtmGlobalConfig(DtmHost, DtmPort, Unix_socket_directories);
+	}
 
 	/*
 	 * Install hooks.
@@ -899,9 +902,6 @@ void DtmBackgroundWorker(Datum arg)
     params.file = unix_sock_path;
     params.buffer_size = DtmBufferSize;
     
-	DtmGlobalConfig("localhost", DtmPort, Unix_socket_directories);
-
     ShubInitialize(&shub, &params);
-    
     ShubLoop(&shub);
 }
diff --git a/contrib/pg_dtm/tests/daemons.go b/contrib/pg_dtm/tests/daemons.go
@@ -91,6 +91,7 @@ func postgres(bin string, datadir string, port int, nodeid int, wg *sync.WaitGro
 		bin,
 		"-D", datadir,
 		"-p", strconv.Itoa(port),
+		"-c", "dtm.buffer_size=65536",
 		"-c", "dtm.host=127.0.0.1",
 		"-c", "dtm.port=" + strconv.Itoa(5431),
 		"-c", "autovacuum=off",

Original file line number	Diff line number	Diff line change
`@@ -39,8 +39,9 @@ static DTMConn DtmConnect(char *host, int port)`
`39`	`39`	`DTMConn dtm;`
`40`	`40`	`int sd;`
`41`	`41`
`42`		`- if (strcmp(host, "localhost") == 0)`
	`42`	`+ if (host == NULL)`
`43`	`43`	`{`
	`44`	`+ // use a UNIX socket`
`44`	`45`	`struct sockaddr sock;`
`45`	`46`	`int len = offsetof(struct sockaddr, sa_data) + snprintf(sock.sa_data, sizeof(sock.sa_data), "%s/p%u", dtm_unix_sock_dir, port);`
`46`	`47`	`sock.sa_family = AF_UNIX;`
`@@ -62,6 +63,7 @@ static DTMConn DtmConnect(char *host, int port)`
`62`	`63`	`}`
`63`	`64`	`else`
`64`	`65`	`{`
	`66`	`+ // use an IP socket`
`65`	`67`	`struct addrinfo *addrs = NULL;`
`66`	`68`	`struct addrinfo hint;`
`67`	`69`	`char portstr[6];`
`@@ -207,7 +209,9 @@ void DtmGlobalConfig(char host, int port, char sock_dir) {`
`207`	`209`	`free(dtmhost);`
`208`	`210`	`dtmhost = NULL;`
`209`	`211`	`}`
`210`		`- dtmhost = strdup(host);`
	`212`	`+ if (host) {`
	`213`	`+ dtmhost = strdup(host);`
	`214`	`+ }`
`211`	`215`	`dtmport = port;`
`212`	`216`	`dtm_unix_sock_dir = sock_dir;`
`213`	`217`	`}`
`@@ -217,14 +221,14 @@ static DTMConn GetConnection()`
`217`	`221`	`static DTMConn dtm = NULL;`
`218`	`222`	`if (dtm == NULL)`
`219`	`223`	`{`
`220`		`- if (dtmhost) {`
`221`		`- dtm = DtmConnect(dtmhost, dtmport);`
`222`		`- if (dtm == NULL)`
`223`		`- {`
`224`		`- elog(ERROR, "Failed to connect to DTMD %s:%d", dtmhost, dtmport);`
	`224`	`+ dtm = DtmConnect(dtmhost, dtmport);`
	`225`	`+ if (dtm == NULL)`
	`226`	`+ {`
	`227`	`+ if (dtmhost) {`
	`228`	`+ elog(ERROR, "Failed to connect to DTMD at tcp %s:%d", dtmhost, dtmport);`
	`229`	`+ } else {`
	`230`	`+ elog(ERROR, "Failed to connect to DTMD at unix %d", dtmport);`
`225`	`231`	`}`
`226`		`- } else {`
`227`		`- /* elog(ERROR, "DTMD address not specified"); */`
`228`	`232`	`}`
`229`	`233`	`}`
`230`	`234`	`return dtm;`