Commit2ec3827

committed

2 parentsb8bd65f +85d8e72 commit2ec3827Copy full SHA for 2ec3827

File tree

+20

-3

lines changed

+20

-3

lines changed

Lines changed: 1 addition & 0 deletions

Lines changed: 4 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -81,6 +81,10 @@ static int create_listening_socket(const char *host, int port) {`
`81`	`81`	`intoptval=1;`
`82`	`82`	`setsockopt(s,IPPROTO_TCP,TCP_NODELAY, (charconst*)&optval,sizeof(optval));`
`83`	`83`	`setsockopt(s,SOL_SOCKET,SO_REUSEADDR, (charconst*)&optval,sizeof(optval));`
	`84`	`+optval=SOCKET_BUFFER_SIZE;`
	`85`	`+setsockopt(s,SOL_SOCKET,SO_SNDBUF, (constchar*)&optval,sizeof(int));`
	`86`	`+optval=SOCKET_BUFFER_SIZE;`
	`87`	`+setsockopt(s,SOL_SOCKET,SO_RCVBUF, (constchar*)&optval,sizeof(int));`
`84`	`88`
`85`	`89`	`structsockaddr_inaddr;`
`86`	`90`	`addr.sin_family=AF_INET;`

Lines changed: 7 additions & 1 deletion

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`	`+#if0/* We do not need to wait until transaction locks are released, do we? */`
`214`	`215`	`if (!inDoubt)`
`215`	`216`	`{`
`216`	`217`	`XLogRecPtrlsn;`
`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`	`staticboolMMRunUtilityStmt(PGconnconn,charconstsql)`
`1201`	`1203`	`{`
`1202`	`1204`	`PGresult*result=PQexec(conn,sql);`
`1203`		`-boolret=PQresultStatus(result)==PGRES_COMMAND_OK;`
	`1205`	`+intstatus=PQresultStatus(result);`
	`1206`	`+boolret=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`	`returnret;`
`1206`	`1212`	`}`

Lines changed: 6 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -19,6 +19,8 @@`
`19`	`19`
`20`	`20`	`#include"sockhub.h"`
`21`	`21`
	`22`	`+#defineSOCKHUB_BUFFER_SIZE (1024*1024)`
	`23`	`+`
`22`	`24`	`voidShubAddSocket(Shub*shub,intfd);`
`23`	`25`
`24`	`26`	`inlinevoidShubAddSocket(Shub*shub,intfd)`
`@@ -189,6 +191,10 @@ static void reconnect(Shub* shub)`
`189`	`191`	`}else {`
`190`	`192`	`intoptval=1;`
`191`	`193`	`setsockopt(shub->output,IPPROTO_TCP,TCP_NODELAY, (charconst*)&optval,sizeof(optval));`
	`194`	`+optval=SOCKHUB_BUFFER_SIZE;`
	`195`	`+setsockopt(shub->output,SOL_SOCKET,SO_SNDBUF, (constchar*)&optval,sizeof(int));`
	`196`	`+optval=SOCKHUB_BUFFER_SIZE;`
	`197`	`+setsockopt(shub->output,SOL_SOCKET,SO_RCVBUF, (constchar*)&optval,sizeof(int));`
`192`	`198`
`193`	`199`	`ShubAddSocket(shub,shub->output);`
`194`	`200`	`if (sep!=NULL) {`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -60,11 +60,11 @@`
`60`	`60`	`when:(pg_copydist is undefined) and pg_sources.changed`
`61`	`61`
`62`	`62`	`-name:build and install`
`63`		`-shell:./configure --prefix={{pg_dst}} --without-zlib && make clean && make -j {{makejobs}} && make install`
	`63`	`+shell:./configure --prefix={{pg_dst}} --enable-debug --without-zlib && make clean && make -j {{makejobs}} && make install`
`64`	`64`	`args:`
`65`	`65`	`chdir:"{{pg_src}}"`
`66`	`66`	`creates:"{{pg_dst}}/bin/postgres"`
`67`		`-when:pg_copydist is undefined`
	`67`	`+#when: pg_copydist is undefined`
`68`	`68`
`69`	`69`	`#############################################################################`
`70`	`70`

Comments

(0)