Trace more information

knizhnik · knizhnik · commit 391daa968c35 · 2015-12-30T13:11:11.000+03:00
diff --git a/contrib/multimaster/multimaster.c b/contrib/multimaster/multimaster.c
@@ -1238,6 +1238,9 @@ static void MMProcessUtility(Node *parsetree, const char *queryString,
 			break;
 	}
 	if (skipCommand || IsTransactionBlock()) { 
+        if (!skipCommand) {
+            elog(WARNING, "Statement '%s' is in transaction block at node %d", queryString, MMNodeId);
+        }
 		if (PreviousProcessUtilityHook != NULL)
 		{
 			PreviousProcessUtilityHook(parsetree, queryString, context,
@@ -1259,6 +1262,8 @@ static void MMProcessUtility(Node *parsetree, const char *queryString,
 		char const* errorMsg = NULL;
 		PGconn **conns;
 		conns = palloc(sizeof(PGconn*)*MMNodes);
+        
+        elog(WARNING, "Broadcast utility statement '%s' at node %d", queryString, MMNodeId);
 
 		while (conn_str < conn_str_end) { 
 			char* p = strchr(conn_str, ',');
diff --git a/contrib/multimaster/sockhub/sockhub.c b/contrib/multimaster/sockhub/sockhub.c
@@ -92,7 +92,6 @@ static int resolve_host_by_name(const char *hostname, unsigned* addrs, unsigned*
 
 static void close_socket(Shub* shub, int fd)
 {
-    close(fd);
 #ifdef USE_EPOLL
     if (epoll_ctl(shub->epollfd, EPOLL_CTL_DEL, fd, NULL) < 0) {
         char buf[ERR_BUF_SIZE];
@@ -102,6 +101,7 @@ static void close_socket(Shub* shub, int fd)
 #else
     FD_CLR(fd, &shub->inset);
 #endif
+    close(fd);
 }
 
 int ShubReadSocketEx(int sd, void* buf, int min_size, int max_size)

Original file line number	Diff line number	Diff line change
`@@ -92,7 +92,6 @@ static int resolve_host_by_name(const char hostname, unsigned addrs, unsigned*`
`92`	`92`
`93`	`93`	`static void close_socket(Shub* shub, int fd)`
`94`	`94`	`{`
`95`		`- close(fd);`
`96`	`95`	`#ifdef USE_EPOLL`
`97`	`96`	`if (epoll_ctl(shub->epollfd, EPOLL_CTL_DEL, fd, NULL) < 0) {`
`98`	`97`	`char buf[ERR_BUF_SIZE];`
`@@ -102,6 +101,7 @@ static void close_socket(Shub* shub, int fd)`
`102`	`101`	`#else`
`103`	`102`	`FD_CLR(fd, &shub->inset);`
`104`	`103`	`#endif`
	`104`	`+ close(fd);`
`105`	`105`	`}`
`106`	`106`
`107`	`107`	`int ShubReadSocketEx(int sd, void* buf, int min_size, int max_size)`