Merge pull request #1559 from citusdata/fix_deamon_upgrade

Add version check to the maintenance daemon
2017-08-15 19:24:18 +03:00 · 2017-08-15 19:24:18 +03:00 · dcabbc4a8e
parent 0d71fcd8af 205501532a
commit dcabbc4a8e
1 changed files with 10 additions and 1 deletions
--- a/src/backend/distributed/utils/maintenanced.c
+++ b/src/backend/distributed/utils/maintenanced.c
@ -266,7 +266,16 @@ CitusMaintenanceDaemonMain(Datum main_arg)
 		if (DistributedDeadlockDetectionTimeoutFactor != -1.0)
 		{
 			StartTransactionCommand();
-			foundDeadlock = CheckForDistributedDeadlocks();
+
+			/*
+			 * We don't want to run the deadlock checks if there exists
+			 * any version mistmatch.
+			 */
+			if (CheckCitusVersion(DEBUG1))
+			{
+				foundDeadlock = CheckForDistributedDeadlocks();
+			}
+
 			CommitTransactionCommand();

 			/*