postgrespro
diff --git a/‎contrib/pg_dtm/README
Lines changed: 4 additions & 0 deletions b/‎contrib/pg_dtm/README
Lines changed: 4 additions & 0 deletions
diff --git a/‎contrib/pg_dtm/libdtm.c
Lines changed: 9 additions & 2 deletions b/‎contrib/pg_dtm/libdtm.c
Lines changed: 9 additions & 2 deletions
diff --git a/‎contrib/pg_dtm/libdtm.h
Lines changed: 3 additions & 2 deletions b/‎contrib/pg_dtm/libdtm.h
Lines changed: 3 additions & 2 deletions
diff --git a/‎contrib/pg_dtm/pg_dtm.c
Lines changed: 20 additions & 14 deletions b/‎contrib/pg_dtm/pg_dtm.c
Lines changed: 20 additions & 14 deletions
diff --git a/‎contrib/pg_dtm/tests/daemons.go
Lines changed: 3 additions & 1 deletion b/‎contrib/pg_dtm/tests/daemons.go
Lines changed: 3 additions & 1 deletion
@@ -36,6 +36,10 @@ dtm_get_snapshot() RETURNS void
 libdtm api
 ----------
 
+// Sets up the host and port for DTM connection.
+// The defaults are "127.0.0.1" and 5431.
+void TuneToDtm(char *host, int port);
+
 void DtmInitSnapshot(Snapshot snapshot);
 
 // Starts a new global transaction of nParticipants size. Returns the
 
@@ -235,13 +235,20 @@ static bool dtm_query(DTMConn dtm, char cmd, int argc, ...)
 	return true;
 }
 
+static char *dtmhost = "127.0.0.1";
+static int dtmport = 5431;
+
+void TuneToDtm(char *host, int port) {
+	dtmhost = host;
+	dtmport = port;
+}
+
 static DTMConn GetConnection()
 {
 	static DTMConn dtm = NULL;
 	if (dtm == NULL)
 	{
-		// FIXME: add API for setting the host and port for dtm connection
-		dtm = DtmConnect(DtmdHost, DtmdPort);
+		dtm = DtmConnect(dtmhost, dtmport);
         if (dtm == NULL) { 
             elog(ERROR, "Failed to connect to DTMD");
         }
 
@@ -8,8 +8,9 @@
 
 #define INVALID_XID 0
 
-extern int DtmdPort;
-extern char* DtmdHost;
+// Sets up the host and port for DTM connection.
+// The defaults are "127.0.0.1" and 5431.
+void TuneToDtm(char *host, int port);
 
 void DtmInitSnapshot(Snapshot snapshot);
 
 
@@ -89,6 +89,9 @@ static int DtmCurcid;
 static Snapshot DtmLastSnapshot;
 static TransactionManager DtmTM = { DtmGetTransactionStatus, DtmSetTransactionStatus, DtmGetSnapshot, DtmGetNewTransactionId, DtmGetOldestXmin, PgTransactionIdIsInProgress, DtmGetGlobalTransactionId, PgXidInMVCCSnapshot };
 
+static char *DtmHost;
+static int DtmPort;
+
 
 #define XTM_TRACE(fmt, ...)
 //#define XTM_INFO(fmt, ...) fprintf(stderr, fmt, ## __VA_ARGS__)
@@ -713,11 +716,24 @@ _PG_init(void)
 		NULL
 	);
 
+	DefineCustomStringVariable(
+		"dtm.host",
+		"The host where DTM daemon resides",
+		NULL,
+		&DtmHost,
+		"127.0.0.1",
+		PGC_BACKEND, // context
+		0, // flags,
+		NULL, // GucStringCheckHook check_hook,
+		NULL, // GucStringAssignHook assign_hook,
+		NULL // GucShowHook show_hook
+	);
+
 	DefineCustomIntVariable(
-		"dtm.dtmd_port",
-		"DTMD port",
+		"dtm.port",
+		"The port DTM daemon is listening",
 		NULL,
-		&DtmdPort,
+		&DtmPort,
 		5431,
 		1,
 		INT_MAX,
@@ -728,17 +744,7 @@ _PG_init(void)
 		NULL
 	);
 
-	DefineCustomStringVariable(
-        "dtm.dtmd_host",
-        "DTMD host name",
-        NULL,
-        &DtmdHost,
-        "localhost",
-        PGC_BACKEND,
-        0,
-        NULL,
-        NULL,
-        NULL);
+	TuneToDtm(DtmHost, DtmPort);
 
 	/*
 	 * Install hooks.
 
@@ -92,6 +92,8 @@ func postgres(bin string, datadir string, port int, nodeid int, wg *sync.WaitGro
 		"-D", datadir,
 		"-p", strconv.Itoa(port),
 		"-c", "dtm.node_id=" + strconv.Itoa(nodeid),
+		"-c", "dtm.host=127.0.0.2",
+		"-c", "dtm.port=" + strconv.Itoa(5431),
 		"-c", "autovacuum=off",
 		"-c", "fsync=off",
 		"-c", "synchronous_commit=off",
@@ -146,7 +148,7 @@ func main() {
 		"postgres": prefix + "/bin/postgres",
 	}
 
-	datadirs := []string{"/tmp/data1", "/tmp/data2"}
+	datadirs := []string{"/tmp/data1", "/tmp/data2", "/tmp/data3"}
 
 	check_bin(&bin);
Original file line number	Diff line number	Diff line change
`@@ -235,13 +235,20 @@ static bool dtm_query(DTMConn dtm, char cmd, int argc, ...)`
`235`	`235`	`return true;`
`236`	`236`	`}`
`237`	`237`
	`238`	`+static char *dtmhost = "127.0.0.1";`
	`239`	`+static int dtmport = 5431;`
	`240`	`+`
	`241`	`+void TuneToDtm(char *host, int port) {`
	`242`	`+ dtmhost = host;`
	`243`	`+ dtmport = port;`
	`244`	`+}`
	`245`	`+`
`238`	`246`	`static DTMConn GetConnection()`
`239`	`247`	`{`
`240`	`248`	`static DTMConn dtm = NULL;`
`241`	`249`	`if (dtm == NULL)`
`242`	`250`	`{`
`243`		`- // FIXME: add API for setting the host and port for dtm connection`
`244`		`- dtm = DtmConnect(DtmdHost, DtmdPort);`
	`251`	`+ dtm = DtmConnect(dtmhost, dtmport);`
`245`	`252`	`if (dtm == NULL) {`
`246`	`253`	`elog(ERROR, "Failed to connect to DTMD");`
`247`	`254`	`}`