Support adding new node

knizhnik · knizhnik · commit c5776fba5d23 · 2016-09-23T18:16:01.000+03:00
diff --git a/contrib/mmts/multimaster--1.0.sql b/contrib/mmts/multimaster--1.0.sql
@@ -13,10 +13,9 @@ CREATE FUNCTION mtm.drop_node(node integer, drop_slot bool default false) RETURN
 AS 'MODULE_PATHNAME','mtm_drop_node'
 LANGUAGE C;
 
--- -- XXX: cstring as an argument breaks sanity check
--- CREATE FUNCTION mtm.add_node(conn_str cstring) RETURNS void
--- AS 'MODULE_PATHNAME','mtm_add_node'
--- LANGUAGE C;
+CREATE FUNCTION mtm.add_node(conn_str cstring) RETURNS void
+AS 'MODULE_PATHNAME','mtm_add_node'
+LANGUAGE C;
 
 -- Create replication slot for the node which was previously dropped together with it's slot 
 CREATE FUNCTION mtm.recover_node(node integer) RETURNS void
diff --git a/contrib/mmts/multimaster.c b/contrib/mmts/multimaster.c
@@ -1933,7 +1933,7 @@ static void MtmCheckControlFile(void)
 		if (f == NULL) { 
 			elog(FATAL, "Failed to create mmts_control file: %m");
 		}
-		Mtm->donorNodeId = -1;
+		Mtm->donorNodeId = MtmNodeId;
 		fprintf(f, "%s:%d\n", MtmClusterName, Mtm->donorNodeId);
 		fclose(f);
 	}
@@ -2707,7 +2707,7 @@ MtmReplicationMode MtmGetReplicationMode(int nodeId, sig_atomic_t volatile* shut
 		MtmLock(LW_EXCLUSIVE);
 		if (Mtm->status == MTM_RECOVERY) { 
 			recovery = true;
-			if ((Mtm->recoverySlot == 0 && (Mtm->donorNodeId < 0 || Mtm->donorNodeId == nodeId))
+			if ((Mtm->recoverySlot == 0 && (Mtm->donorNodeId == MtmNodeId || Mtm->donorNodeId == nodeId))
 				|| Mtm->recoverySlot == nodeId) 
 			{ 
 				/* Choose for recovery first available slot or slot of donor node (if any) */
@@ -2820,7 +2820,7 @@ MtmReplicationStartupHook(struct PGLogicalStartupHookArgs* args)
 			}				
 		} else if (strcmp("mtm_restart_pos", elem->defname) == 0) { 
 			if (elem->arg != NULL && strVal(elem->arg) != NULL) {
-				recoveryStartPos = intVal(elem->arg);
+				sscanf(strVal(elem->arg), "%lx", &recoveryStartPos);
 			} else { 
 				elog(ERROR, "Restart position is not specified");
 			}

Original file line number	Diff line number	Diff line change
`@@ -1933,7 +1933,7 @@ static void MtmCheckControlFile(void)`
`1933`	`1933`	`if (f == NULL) {`
`1934`	`1934`	`elog(FATAL, "Failed to create mmts_control file: %m");`
`1935`	`1935`	`}`
`1936`		`- Mtm->donorNodeId = -1;`
	`1936`	`+ Mtm->donorNodeId = MtmNodeId;`
`1937`	`1937`	`fprintf(f, "%s:%d\n", MtmClusterName, Mtm->donorNodeId);`
`1938`	`1938`	`fclose(f);`
`1939`	`1939`	`}`
`@@ -2707,7 +2707,7 @@ MtmReplicationMode MtmGetReplicationMode(int nodeId, sig_atomic_t volatile* shut`
`2707`	`2707`	`MtmLock(LW_EXCLUSIVE);`
`2708`	`2708`	`if (Mtm->status == MTM_RECOVERY) {`
`2709`	`2709`	`recovery = true;`
`2710`		`- if ((Mtm->recoverySlot == 0 && (Mtm->donorNodeId < 0 \|\| Mtm->donorNodeId == nodeId))`
	`2710`	`+ if ((Mtm->recoverySlot == 0 && (Mtm->donorNodeId == MtmNodeId \|\| Mtm->donorNodeId == nodeId))`
`2711`	`2711`	`\|\| Mtm->recoverySlot == nodeId)`
`2712`	`2712`	`{`
`2713`	`2713`	`/* Choose for recovery first available slot or slot of donor node (if any) */`
`@@ -2820,7 +2820,7 @@ MtmReplicationStartupHook(struct PGLogicalStartupHookArgs* args)`
`2820`	`2820`	`}`
`2821`	`2821`	`} else if (strcmp("mtm_restart_pos", elem->defname) == 0) {`
`2822`	`2822`	`if (elem->arg != NULL && strVal(elem->arg) != NULL) {`
`2823`		`- recoveryStartPos = intVal(elem->arg);`
	`2823`	`+ sscanf(strVal(elem->arg), "%lx", &recoveryStartPos);`
`2824`	`2824`	`} else {`
`2825`	`2825`	`elog(ERROR, "Restart position is not specified");`
`2826`	`2826`	`}`