Merge branch 'master' of https://github.com/postgrespro/postgres_cluster

knizhnik · knizhnik · commit 2ec38278ef15 · 2015-12-29T17:39:10.000+03:00
diff --git a/contrib/multimaster/dtmd/include/limits.h b/contrib/multimaster/dtmd/include/limits.h
@@ -6,5 +6,6 @@
 #define BUFFER_SIZE (256 * 1024)
 #define LISTEN_QUEUE_SIZE 100
 #define MAX_STREAMS 4096
+#define SOCKET_BUFFER_SIZE (1024*1024)
 
 #endif
diff --git a/contrib/multimaster/dtmd/src/server.c b/contrib/multimaster/dtmd/src/server.c
@@ -81,6 +81,10 @@ static int create_listening_socket(const char *host, int port) {
 	int optval = 1;
 	setsockopt(s, IPPROTO_TCP, TCP_NODELAY, (char const*)&optval, sizeof(optval));
 	setsockopt(s, SOL_SOCKET, SO_REUSEADDR, (char const*)&optval, sizeof(optval));
+	optval = SOCKET_BUFFER_SIZE;
+	setsockopt(s, SOL_SOCKET, SO_SNDBUF, (const char*) &optval, sizeof(int));
+	optval = SOCKET_BUFFER_SIZE;
+	setsockopt(s, SOL_SOCKET, SO_RCVBUF, (const char*) &optval, sizeof(int));
 
 	struct sockaddr_in addr;
 	addr.sin_family = AF_INET;
diff --git a/contrib/multimaster/multimaster.c b/contrib/multimaster/multimaster.c
@@ -211,11 +211,13 @@ static bool TransactionIdIsInDoubt(TransactionId xid)
 		LWLockAcquire(dtm->hashLock, LW_SHARED);
 		inDoubt = hash_search(xid_in_doubt, &xid, HASH_FIND, NULL) != NULL;
 		LWLockRelease(dtm->hashLock);
+#if 0 /* We do not need to wait until transaction locks are released, do we? */
 		if (!inDoubt)
 		{
 			XLogRecPtr lsn;
 			inDoubt = DtmGetTransactionStatus(xid, &lsn) != TRANSACTION_STATUS_IN_PROGRESS;
 		}
+#endif
 		if (inDoubt)
 		{
 			XTM_INFO("Wait for transaction %d to complete\n", xid);
@@ -1200,7 +1202,11 @@ mm_stop_replication(PG_FUNCTION_ARGS)
 static bool MMRunUtilityStmt(PGconn* conn, char const* sql)
 {
 	PGresult *result = PQexec(conn, sql);
-	bool ret = PQresultStatus(result) == PGRES_COMMAND_OK;
+	int status = PQresultStatus(result);
+	bool ret = status == PGRES_COMMAND_OK;
+	if (!ret) { 
+		elog(WARNING, "Command '%s' failed with status %d", sql, status);
+	}
 	PQclear(result);
 	return ret;
 }
diff --git a/contrib/multimaster/sockhub/sockhub.c b/contrib/multimaster/sockhub/sockhub.c
@@ -19,6 +19,8 @@
 
 #include "sockhub.h"
 
+#define SOCKHUB_BUFFER_SIZE (1024*1024)
+
 void ShubAddSocket(Shub* shub, int fd);
 
 inline void ShubAddSocket(Shub* shub, int fd)
@@ -189,6 +191,10 @@ static void reconnect(Shub* shub)
             } else { 
                 int optval = 1;
                 setsockopt(shub->output, IPPROTO_TCP, TCP_NODELAY, (char const*)&optval, sizeof(optval));
+				optval = SOCKHUB_BUFFER_SIZE;
+				setsockopt(shub->output, SOL_SOCKET, SO_SNDBUF, (const char*) &optval, sizeof(int));
+				optval = SOCKHUB_BUFFER_SIZE;
+				setsockopt(shub->output, SOL_SOCKET, SO_RCVBUF, (const char*) &optval, sizeof(int));
 
                 ShubAddSocket(shub, shub->output);
                 if (sep != NULL) { 
diff --git a/contrib/multimaster/tests/deploy_layouts/roles/postgres/tasks/main.yml b/contrib/multimaster/tests/deploy_layouts/roles/postgres/tasks/main.yml
@@ -60,11 +60,11 @@
   when: (pg_copydist is undefined) and pg_sources.changed
 
 - name: build and install
-  shell: ./configure --prefix={{pg_dst}} --without-zlib && make clean && make -j {{makejobs}} && make install
+  shell: ./configure --prefix={{pg_dst}} --enable-debug --without-zlib && make clean && make -j {{makejobs}} && make install
   args:
     chdir: "{{pg_src}}"
     creates: "{{pg_dst}}/bin/postgres"
-  when: pg_copydist is undefined
+  # when: pg_copydist is undefined
 
 #############################################################################
 

Original file line number	Diff line number	Diff line change
`@@ -211,11 +211,13 @@ static bool TransactionIdIsInDoubt(TransactionId xid)`
`211`	`211`	`LWLockAcquire(dtm->hashLock, LW_SHARED);`
`212`	`212`	`inDoubt = hash_search(xid_in_doubt, &xid, HASH_FIND, NULL) != NULL;`
`213`	`213`	`LWLockRelease(dtm->hashLock);`
	`214`	`+#if 0 /* We do not need to wait until transaction locks are released, do we? */`
`214`	`215`	`if (!inDoubt)`
`215`	`216`	`{`
`216`	`217`	`XLogRecPtr lsn;`
`217`	`218`	`inDoubt = DtmGetTransactionStatus(xid, &lsn) != TRANSACTION_STATUS_IN_PROGRESS;`
`218`	`219`	`}`
	`220`	`+#endif`
`219`	`221`	`if (inDoubt)`
`220`	`222`	`{`
`221`	`223`	`XTM_INFO("Wait for transaction %d to complete\n", xid);`
`@@ -1200,7 +1202,11 @@ mm_stop_replication(PG_FUNCTION_ARGS)`
`1200`	`1202`	`static bool MMRunUtilityStmt(PGconn* conn, char const* sql)`
`1201`	`1203`	`{`
`1202`	`1204`	`PGresult *result = PQexec(conn, sql);`
`1203`		`- bool ret = PQresultStatus(result) == PGRES_COMMAND_OK;`
	`1205`	`+ int status = PQresultStatus(result);`
	`1206`	`+ bool ret = status == PGRES_COMMAND_OK;`
	`1207`	`+ if (!ret) {`
	`1208`	`+ elog(WARNING, "Command '%s' failed with status %d", sql, status);`
	`1209`	`+ }`
`1204`	`1210`	`PQclear(result);`
`1205`	`1211`	`return ret;`
`1206`	`1212`	`}`