Undo replacement of TransactionIdIsInProgress

knizhnik · knizhnik · commit 99a60ea85cc5 · 2015-09-10T18:41:25.000+03:00
diff --git a/contrib/pg_gtm/dtmd/bin/dtmd b/contrib/pg_gtm/dtmd/bin/dtmd
diff --git a/contrib/pg_gtm/dtmd/src/clog.c b/contrib/pg_gtm/dtmd/src/clog.c
@@ -215,7 +215,9 @@ cid_t clog_advance(clog_t clog) {
 		shout("failed to store the fresh gcid value\n");
 		return INVALID_GCID;
 	}
+	#ifdef SYNC
 	fsync(clog->fresh_fd);
+	#endif
 
 	int oldf = GCID_TO_FILEID(old_gcid);
 	int newf = GCID_TO_FILEID(clog->fresh_gcid);
diff --git a/contrib/pg_gtm/dtmd/src/clogfile.c b/contrib/pg_gtm/dtmd/src/clogfile.c
@@ -99,9 +99,11 @@ bool clogfile_set_status(clogfile_t *clogfile, cid_t gcid, int status) {
 	char *p = ((char*)clogfile->data + offset);
 	*p &= ~(COMMIT_MASK << (BITS_PER_COMMIT * suboffset));   // AND-out the old status
 	*p |= status << (BITS_PER_COMMIT * suboffset); // OR-in the new status
+	#ifdef SYNC
 	if (msync(clogfile->data, BYTES_PER_FILE, MS_SYNC)) {
 		shout("cannot msync clog file '%s': %s\n", clogfile->path, strerror(errno));
 		return false;
 	}
+	#endif
 	return true;
 }
diff --git a/contrib/pg_gtm/dtmd/src/eventwrap.c b/contrib/pg_gtm/dtmd/src/eventwrap.c
@@ -70,6 +70,7 @@ static void on_connect(uv_stream_t *server, int status) {
 		free(client);
 		return;
 	}
+	uv_tcp_nodelay(client, 1);
 	onconnect_cb(&client->data);
 	uv_read_start((uv_stream_t*)client, on_alloc, on_read);
 }
diff --git a/contrib/pg_gtm/dtmd/src/main.c b/contrib/pg_gtm/dtmd/src/main.c
@@ -12,7 +12,7 @@
 #define DEFAULT_LISTENHOST "0.0.0.0"
 #define DEFAULT_LISTENPORT 5431
 
-#define MAX_PREPARES_PER_CLIENT 1024
+#define MAX_PREPARES_PER_CLIENT 1024*100
 
 typedef struct client_data_t {
 	int id;
@@ -83,13 +83,6 @@ static bool client_remove_prepare(void *client, cid_t gcid) {
 }
 
 static char *onprepare(void *client, cmd_t *cmd) {
-	if (CLIENT_PREPARES_NUM(client) >= MAX_PREPARES_PER_CLIENT) {
-		shout(
-			"[%d] cannot prepare any more commits\n",
-			CLIENT_ID(client)
-		);
-		return strdup("-");
-	}
 
 	cid_t gcid = clog_advance(clg);
 	if (gcid == INVALID_GCID) {
@@ -101,48 +94,60 @@ static char *onprepare(void *client, cmd_t *cmd) {
 	char buf[18];
 	sprintf(buf, "+%016llx", gcid);
 
+	#ifdef VERBOSE
 	shout(
 		"[%d] prepare gcid %llx\n",
 		CLIENT_ID(client), gcid
 	);
+	#endif
 
 	return strdup(buf);
 }
 
 static char *oncommit(void *client, cmd_t *cmd) {
+	#ifdef VERBOSE
 	shout(
 		"[%d] commit %016llx\n",
 		CLIENT_ID(client),
 		cmd->arg
 	);
+	#endif
+
 	if (clog_write(clg, cmd->arg, COMMIT_YES)) {
 		if (client_remove_prepare(client, cmd->arg)) {
 			return strdup("+");
 		}
+		#ifdef VERBOSE
 		shout(
 			"[%d] tried to commit an unprepared gcid %llu\n",
 			CLIENT_ID(client),
 			cmd->arg
 		);
+		#endif
 	}
 	return strdup("-");
 }
 
 static char *onabort(void *client, cmd_t *cmd) {
+	#ifdef VERBOSE
 	shout(
 		"[%d] abort %016llx\n",
 		CLIENT_ID(client),
 		cmd->arg
 	);
+	#endif
+
 	if (clog_write(clg, cmd->arg, COMMIT_NO)) {
 		if (client_remove_prepare(client, cmd->arg)) {
 			return strdup("+");
 		}
+		#ifdef VERBOSE
 		shout(
 			"[%d] tried to abort an unprepared gcid %016llx\n",
 			CLIENT_ID(client),
 			cmd->arg
 		);
+		#endif
 	}
 	return strdup("-");
 }
diff --git a/contrib/pg_gtm/libdtm.c b/contrib/pg_gtm/libdtm.c
@@ -5,6 +5,10 @@
 #include <unistd.h>
 #include <stdlib.h>
 
+#ifdef __APPLE__
+#include <netinet/tcp.h>
+#endif
+
 #include "libdtm.h"
 
 typedef struct DTMConnData {
@@ -89,6 +93,9 @@ DTMConn DtmConnect(char *host, int port) {
 			continue;
 		}
 
+		int one = 1;
+		setsockopt(sock, IPPROTO_TCP, TCP_NODELAY, &one, sizeof(one));
+
 		if (connect(sock, a->ai_addr, a->ai_addrlen) == -1) {
 			perror("failed to connect to an address");
 			close(sock);
diff --git a/contrib/pg_gtm/libdtm/Makefile b/contrib/pg_gtm/libdtm/Makefile
@@ -1,17 +1,19 @@
 CC=clang
 CFLAGS=-g -Wall -I"../../../src/include"
 
+all: lib/libdtm.a bin/example bin/perf
 
-all: lib/libdtm.a bin/example
+bin/perf: bindir lib/libdtm.a src/perf.c
+	$(CC) $(CFLAGS) -o bin/perf -Iinclude -Llib src/perf.c -ldtm
 
 bin/example: bindir lib/libdtm.a src/example.c
 	$(CC) $(CFLAGS) -o bin/example -Iinclude -Llib src/example.c -ldtm
 
-lib/libdtm.a: libdir obj/dtm.o
-	ar rcs lib/libdtm.a obj/dtm.o
+lib/libdtm.a: libdir obj/libdtm.o
+	ar rcs lib/libdtm.a obj/libdtm.o
 
-obj/dtm.o: objdir src/dtm.c
-	$(CC) $(CFLAGS) -c -o obj/dtm.o -Iinclude src/dtm.c
+obj/libdtm.o: objdir src/libdtm.c
+	$(CC) $(CFLAGS) -c -o obj/libdtm.o -Iinclude src/libdtm.c
 
 libdir:
 	mkdir -p lib
diff --git a/contrib/pg_gtm/libdtm/src/libdtm.c b/contrib/pg_gtm/libdtm/src/libdtm.c
@@ -0,0 +1 @@
+../../libdtm.c
diff --git a/contrib/pg_gtm/libdtm/src/libdtm.h b/contrib/pg_gtm/libdtm/src/libdtm.h
@@ -0,0 +1 @@
+../../libdtm.h
diff --git a/contrib/pg_gtm/libdtm/src/perf.c b/contrib/pg_gtm/libdtm/src/perf.c
@@ -0,0 +1,41 @@
+#include <stdio.h>
+#include <stdlib.h>
+
+#include "../../libdtm.h"
+
+int main() {
+  cid_t gcid;
+  cid_t horizon;
+  DTMConn conn;
+  int i;
+
+  conn = DtmConnect("localhost", 5431);
+  if (!conn) {
+    fprintf(stderr, "failed to connect to dtmd\n");
+    exit(1);
+  }
+
+
+  for (i=0; i<10000; i++) {
+    horizon = DtmGlobalGetNextCid(conn);
+
+    gcid = DtmGlobalPrepare(conn);
+    if (gcid == INVALID_GCID) {
+      fprintf(stderr, "failed to prepare a commit\n");
+    }
+
+    if (!DtmGlobalCommit(conn, gcid)) {
+      fprintf(stderr, "failed to commit gcid = %llu\n", gcid);
+    }
+
+    if (i%100 == 0){
+      printf("Completed %u txs\n", i);
+    }
+  }
+
+
+  DtmDisconnect(conn);
+
+  return 0;
+}
+
diff --git a/contrib/pg_gtm/pg_dtm.c b/contrib/pg_gtm/pg_dtm.c
@@ -71,7 +71,7 @@ typedef struct
     TransactionId xid;
 } DtmTransId;
               
-//#define DTM_TRACE(x) 
+// #define DTM_TRACE(x) 
 #define DTM_TRACE(x) elog x
 
 static shmem_startup_hook_type prev_shmem_startup_hook;
diff --git a/contrib/pg_gtm/tests/transfers.go b/contrib/pg_gtm/tests/transfers.go
@@ -11,7 +11,7 @@ import (
 const (
     TRANSFER_CONNECTIONS = 4
     INIT_AMOUNT = 10000
-    N_ITERATIONS = 10000
+    N_ITERATIONS = 1000
     N_ACCOUNTS = 1//100000
 )
 
diff --git a/contrib/pg_xtm/dtmd/src/clogfile.c b/contrib/pg_xtm/dtmd/src/clogfile.c
@@ -100,9 +100,11 @@ bool clogfile_set_status(clogfile_t *clogfile, xid_t xid, int status) {
 	char *p = ((char*)clogfile->data + offset);
 	*p &= ~(COMMIT_MASK << (BITS_PER_COMMIT * suboffset));   // AND-out the old status
 	*p |= status << (BITS_PER_COMMIT * suboffset); // OR-in the new status
+	#ifdef SYNC
 	if (msync(clogfile->data, BYTES_PER_FILE, MS_SYNC)) {
 		shout("cannot msync clog file '%s': %s\n", clogfile->path, strerror(errno));
 		return false;
 	}
+	#endif
 	return true;
 }
diff --git a/contrib/pg_xtm/dtmd/src/eventwrap.c b/contrib/pg_xtm/dtmd/src/eventwrap.c
@@ -70,6 +70,7 @@ static void on_connect(uv_stream_t *server, int status) {
 		free(client);
 		return;
 	}
+	uv_tcp_nodelay(client, 1);
 	onconnect_cb(&client->data);
 	uv_read_start((uv_stream_t*)client, on_alloc, on_read);
 }
diff --git a/contrib/pg_xtm/libdtm.c b/contrib/pg_xtm/libdtm.c
@@ -1,4 +1,5 @@
 #include <sys/socket.h>
+#include <netinet/tcp.h>
 #include <netdb.h>
 #include <string.h>
 #include <stdio.h>
@@ -96,6 +97,11 @@ DTMConn DtmConnect(char *host, int port) {
 			continue;
 		}
 
+		#ifdef NODELAY
+		int one = 1;
+		setsockopt(sock, IPPROTO_TCP, TCP_NODELAY, &one, sizeof(one));
+		#endif
+
 		if (connect(sock, a->ai_addr, a->ai_addrlen) == -1) {
 			perror("failed to connect to an address");
 			close(sock);
@@ -161,10 +167,15 @@ bool DtmGlobalStartTransaction(DTMConn dtm, GlobalTransactionId *gtid) {
 	return ok;
 }
 
-void DtmInitSnapshot(Snapshot snapshot)
+void DtmInitSnapshot(Snapshot snapshot) 
 {
-	if (snapshot->xip == NULL)
-	{
+	#ifdef TEST
+	if (snapshot->xip == NULL) {
+		snapshot->xip = malloc(snapshot->xcnt * sizeof(TransactionId));
+		// FIXME: is this enough for tests?
+	}
+	#else
+	if (snapshot->xip == NULL) {
 		/*
 		 * First call for this snapshot. Snapshot is same size whether or not
 		 * we are in recovery, see later comments.
@@ -183,6 +194,7 @@ void DtmInitSnapshot(Snapshot snapshot)
 					(errcode(ERRCODE_OUT_OF_MEMORY),
 					 errmsg("out of memory")));
 	}
+	#endif
 }
 
 // Asks DTM for a fresh snapshot. Returns 'true' on success, or 'false'
@@ -214,6 +226,7 @@ bool DtmGlobalGetSnapshot(DTMConn dtm, NodeId nodeid, TransactionId xid, Snapsho
 	Assert(s->xcnt == number); // the number should definitely fit into xcnt field size
 
 	DtmInitSnapshot(s);
+
 	for (i = 0; i < s->xcnt; i++) {
 		if (!dtm_read_hex16(dtm, &number)) return false;
 		s->xip[i] = number;
diff --git a/contrib/pg_xtm/libdtm/Makefile b/contrib/pg_xtm/libdtm/Makefile
@@ -1,6 +1,5 @@
-CC=clang -DTEST
-CFLAGS=-g -Wall -I"../../../src/include" 
-
+CC=clang -DTEST -DNODELAY
+CFLAGS=-g -Wall -I"../../../src/include"
 
 all: lib/libdtm.a bin/example bin/bench bin/redbench
 
diff --git a/install.sh b/install.sh
@@ -7,7 +7,7 @@ rm -rf install
 
 make install
 
-cd contrib/pg_xtm/
+cd contrib/pg_gtm/
 
 make clean
 make
@@ -20,13 +20,15 @@ cd ../..
 
 sed -i '' 's/#port =.*/port = 5433/' ./install/data2/postgresql.conf
 
+sed -i '' 's/#fsync =.*/fsync = off/' ./install/data1/postgresql.conf
+sed -i' ' 's/#fsync =.*/fsync = off/' ./install/data2/postgresql.conf
 
 
 ./install/bin/pg_ctl -D ./install/data1 -l ./install/data1/log start
 ./install/bin/pg_ctl -D ./install/data2 -l ./install/data2/log start
 
 
-cd contrib/pg_dtm/dtmd
+cd contrib/pg_gtm/dtmd
 make clean
 make
 ./bin/dtmd

Original file line number	Diff line number	Diff line change
`@@ -215,7 +215,9 @@ cid_t clog_advance(clog_t clog) {`
`215`	`215`	`shout("failed to store the fresh gcid value\n");`
`216`	`216`	`return INVALID_GCID;`
`217`	`217`	`}`
	`218`	`+ #ifdef SYNC`
`218`	`219`	`fsync(clog->fresh_fd);`
	`220`	`+ #endif`
`219`	`221`
`220`	`222`	`int oldf = GCID_TO_FILEID(old_gcid);`
`221`	`223`	`int newf = GCID_TO_FILEID(clog->fresh_gcid);`
Original file line number	Diff line number	Diff line change
`@@ -99,9 +99,11 @@ bool clogfile_set_status(clogfile_t *clogfile, cid_t gcid, int status) {`
`99`	`99`	`char p = ((char)clogfile->data + offset);`
`100`	`100`	`p &= ~(COMMIT_MASK << (BITS_PER_COMMIT suboffset)); // AND-out the old status`
`101`	`101`	`p \|= status << (BITS_PER_COMMIT suboffset); // OR-in the new status`
	`102`	`+ #ifdef SYNC`
`102`	`103`	`if (msync(clogfile->data, BYTES_PER_FILE, MS_SYNC)) {`
`103`	`104`	`shout("cannot msync clog file '%s': %s\n", clogfile->path, strerror(errno));`
`104`	`105`	`return false;`
`105`	`106`	`}`
	`107`	`+ #endif`
`106`	`108`	`return true;`
`107`	`109`	`}`
Original file line number	Diff line number	Diff line change
`@@ -70,6 +70,7 @@ static void on_connect(uv_stream_t *server, int status) {`
`70`	`70`	`free(client);`
`71`	`71`	`return;`
`72`	`72`	`}`
	`73`	`+ uv_tcp_nodelay(client, 1);`
`73`	`74`	`onconnect_cb(&client->data);`
`74`	`75`	`uv_read_start((uv_stream_t*)client, on_alloc, on_read);`
`75`	`76`	`}`