Merge branch 'ptrack_to_delta'

gsmolk · gsmolk · commit fc74e7dc2f70 · 2020-08-25T13:59:39.000+03:00
diff --git a/src/ptrack.c b/src/ptrack.c
@@ -202,9 +202,21 @@ get_ptrack_version(PGconn *backup_conn, PGNodeInfo *nodeInfo)
 	else if (strcmp(ptrack_version_str, "2.1") == 0)
 		nodeInfo->ptrack_version_num = 21;
 	else
-		elog(WARNING, "Update your ptrack to the version 1.5 or upper. Current version is %s",
+		elog(WARNING, "Update your ptrack to the version 2.1 or upper. Current version is %s",
 			 ptrack_version_str);
 
+	/* ptrack 1.X is buggy, so fall back to DELTA backup strategy for safety */
+	if (nodeInfo->ptrack_version_num >= 15 && nodeInfo->ptrack_version_num < 20)
+	{
+		if (current.backup_mode == BACKUP_MODE_DIFF_PTRACK)
+		{
+			elog(WARNING, "Update your ptrack to the version 2.1 or upper. Current version is %s. "
+						"Fall back to DELTA backup.",
+				ptrack_version_str);
+			current.backup_mode = BACKUP_MODE_DIFF_DELTA;
+		}
+	}
+
 	PQclear(res_db);
 }
 
diff --git a/tests/helpers/ptrack_helpers.py b/tests/helpers/ptrack_helpers.py
@@ -365,7 +365,7 @@ def make_simple_node(
             options['max_wal_senders'] = 10
 
         if ptrack_enable:
-            if node.major_version > 11:
+            if node.major_version >= 11:
                 options['ptrack.map_size'] = '128'
                 options['shared_preload_libraries'] = 'ptrack'
             else:
diff --git a/tests/ptrack.py b/tests/ptrack.py
