Move referee to a separate extension

kelvich · kelvich · commit 83054dcd9351 · 2017-11-13T02:23:41.000+03:00
diff --git a/Dockerfile b/Dockerfile
@@ -6,6 +6,9 @@ COPY ./ /pg/mmts/
 RUN export USE_PGXS=1 && \
     cd /pg/mmts && make clean && make install
 
+RUN export USE_PGXS=1 && \
+    cd /pg/src/contrib/referee && make clean && make install
+
 # pg_regress client assumes such dir exists on server
 RUN cp /pg/src/src/test/regress/*.so /pg/install/lib/postgresql/
 USER postgres
diff --git a/multimaster--1.0.sql b/multimaster--1.0.sql
@@ -151,30 +151,3 @@ $$
 LANGUAGE plpgsql;
 
 -- select mtm.alter_sequences();
-
--- referee stuff
-CREATE TABLE IF NOT EXISTS mtm.referee_decision(key text primary key not null, node_id int);
-
-CREATE OR REPLACE FUNCTION mtm.referee_get_winner(applicant_id int) RETURNS int AS
-$$
-DECLARE
-    winner_id int;
-BEGIN
-    insert into mtm.referee_decision values ('winner', applicant_id);
-    select node_id into winner_id from mtm.referee_decision where key = 'winner';
-    return winner_id;
-EXCEPTION WHEN others THEN
-    select node_id into winner_id from mtm.referee_decision where key = 'winner';
-    return winner_id;
-END
-$$
-LANGUAGE plpgsql;
-
-CREATE OR REPLACE FUNCTION mtm.referee_clean() RETURNS bool AS
-$$
-BEGIN
-    delete from mtm.referee_decision where key = 'winner';
-    return 'true';
-END
-$$
-LANGUAGE plpgsql;
diff --git a/state.c b/state.c
@@ -417,7 +417,7 @@ MtmRefreshClusterStatus()
 	}
 
 	/*
-	 * Clear winner if we again have all nodes are online.
+	 * Clear winner if we again have all nodes online.
 	 */
 	if (MtmRefereeConnStr && *MtmRefereeConnStr && Mtm->refereeWinnerId &&
 		countZeroBits(SELF_CONNECTIVITY_MASK, Mtm->nAllNodes) == Mtm->nAllNodes)
@@ -511,13 +511,13 @@ MtmRefereeGetWinner(void)
 		return -1;
 	}
 
-	sprintf(sql, "select mtm.referee_get_winner(%d)", MtmNodeId);
+	sprintf(sql, "select referee.get_winner(%d)", MtmNodeId);
 	res = PQexec(conn, sql);
 	if (PQresultStatus(res) != PGRES_TUPLES_OK ||
 		PQntuples(res) != 1 ||
 		PQnfields(res) != 1)
 	{
-		MTM_ELOG(WARNING, "Refusing unexpected result (r=%d, n=%d, w=%d, k=%s) from referee.",
+		MTM_ELOG(WARNING, "Refusing unexpected result (r=%d, n=%d, w=%d, k=%s) from referee.get_winner()",
 			PQresultStatus(res), PQntuples(res), PQnfields(res), PQgetvalue(res, 0, 0));
 		PQclear(res);
 		PQfinish(conn);
@@ -558,12 +558,12 @@ MtmRefereeClearWinner(void)
 		return false;
 	}
 
-	res = PQexec(conn, "select mtm.referee_clean()");
+	res = PQexec(conn, "select referee.clean()");
 	if (PQresultStatus(res) != PGRES_TUPLES_OK ||
 		PQntuples(res) != 1 ||
 		PQnfields(res) != 1)
 	{
-		MTM_ELOG(WARNING, "Refusing unexpected result (r=%d, n=%d, w=%d, k=%s) from referee_clean().",
+		MTM_ELOG(WARNING, "Refusing unexpected result (r=%d, n=%d, w=%d, k=%s) from referee.clean().",
 			PQresultStatus(res), PQntuples(res), PQnfields(res), PQgetvalue(res, 0, 0));
 		PQclear(res);
 		PQfinish(conn);
@@ -574,7 +574,7 @@ MtmRefereeClearWinner(void)
 
 	if (strncmp(response, "t", 1) != 0)
 	{
-		MTM_ELOG(WARNING, "Wrong response from referee_clean(): '%s'", response);
+		MTM_ELOG(WARNING, "Wrong response from referee.clean(): '%s'", response);
 		PQclear(res);
 		PQfinish(conn);
 		return false;
diff --git a/tests2/test_referee.py b/tests2/test_referee.py
@@ -35,7 +35,7 @@ def setUpClass(cls):
         cls.client.bgrun()
 
         # create extension on referee
-        cls.nodeExecute("dbname=regression user=postgres host=127.0.0.1 port=15435", ['create extension multimaster'])
+        cls.nodeExecute("dbname=regression user=postgres host=127.0.0.1 port=15435", ['create extension referee'])
 
     @classmethod
     def tearDownClass(cls):
