Trace more information

Author: knizhnik

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, ',');

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)