[PBCKP-236] final update

Author: Ivan Lazarev

src/utils/remote.c

@@ -249,46 +249,38 @@ bool launch_agent(void)
 	return true;
 }
 
-/* PGPRO 10-13 check to be "(certified)", with exceptional case PGPRO_11 conforming to "(standard certified)" */
+#ifdef PGPRO_EDITION
+/* PGPRO 10-13 checks to be "(certified)", with exceptional case PGPRO_11 conforming to "(standard certified)" */
 static bool check_certified()
 {
-#ifdef PGPRO_VERSION_STR
 	return strstr(PGPRO_VERSION_STR, "(certified)") ||
 		   strstr(PGPRO_VERSION_STR, ("(standard certified)"));
-#endif
-	return false;
 }
+#endif
 
-//TODO REVIEW review coding standard https://jira.postgrespro.ru/browse/PBCKP-251 with @funny_falcon, newlines, braces etc
 static char* extract_pg_edition_str()
 {
+	static char *_1C = "1C";
 	static char *vanilla = "vanilla";
 	static char *std = "standard";
 	static char *ent = "enterprise";
 	static char *std_cert = "standard-certified";
 	static char *ent_cert = "enterprise-certified";
 
 #ifdef PGPRO_EDITION
-    if (strcasecmp(PGPRO_EDITION, "1C") == 0)
+	if (strcmp(PGPRO_EDITION, _1C) == 0)
 		return vanilla;
 
-	/* these "certified" checks are applicable to PGPRO from 9.6 up to 12 versions.
-	 * 13+ certified versions are compatible to non-certified ones */
 	if (PG_VERSION_NUM < 100000)
-	{
-		if (strcmp(PGPRO_EDITION, "standard-certified") == 0)
-			return std_cert;
-		else if (strcmp(PGPRO_EDITION, "enterprise-certified"))
-			return ent_cert;
-		else
-			Assert("Bad #define PGPRO_EDITION value" == 0);
-	}
+		return PGPRO_EDITION;
 
-	if (check_certified())
+	/* these "certified" checks are applicable to PGPRO from 10 up to 12 versions.
+	 * 13+ certified versions are compatible to non-certified ones */
+	if (PG_VERSION_NUM < 130000 && check_certified())
 	{
-		if (strcmp(PGPRO_EDITION, "standard"))
+		if (strcmp(PGPRO_EDITION, std) == 0)
 			return std_cert;
-		else if (strcmp(PGPRO_EDITION, "enterprise") == 0)
+		else if (strcmp(PGPRO_EDITION, ent) == 0)
 			return ent_cert;
 		else
 			Assert("Bad #define PGPRO_EDITION value" == 0);
@@ -374,7 +366,7 @@ void check_remote_agent_compatibility(int agent_version, char *compatibility_str
 		prepare_compatibility_str(buf, sizeof buf);
 		if(strcmp(compatibility_str, buf))
 		{
-			elog(ERROR, "Incompatible remote agent params, expected:\n%s", buf);
+			elog(ERROR, "Incompatible remote agent params, expected:\n%s, actual:\n:%s ", buf, compatibility_str);
 		}
 	}
 }

tests/compatibility.py

@@ -14,7 +14,7 @@ def setUp(self):
         self.fname = self.id().split('.')[3]
 
     # @unittest.expectedFailure
-    # @unittest.skip("skip")
+    @unittest.skip("skip")
     def test_catchup_with_different_remote_major_pg(self):
         """
         Decription in jira issue PBCKP-236
@@ -27,13 +27,13 @@ def test_catchup_with_different_remote_major_pg(self):
 
         calling probackup PGPROEE9_6 agent from PGPROEE11 probackup master for DELTA backup causes the PBCKP-236 problem
 
-        please correct path for agent's pg_path_ee_9_6 = '/home/avaness/postgres/postgres.build.ee.9.6/bin/'
+        please correct path for agent's pg_path_remote_version = '/home/avaness/postgres/postgres.build.ee.9.6/bin/'
         """
 
         self.verbose = True
         self.remote = True
         # please use your own local path
-        pg_path_ee_9_6 = '/home/avaness/postgres/postgres.build.ee.9.6/bin/'
+        pg_path_remote_version = '/home/avaness/postgres/postgres.build.clean/bin'
 
         src_pg = self.make_simple_node(
             base_dir=os.path.join(module_name, self.fname, 'src'),
@@ -70,7 +70,7 @@ def test_catchup_with_different_remote_major_pg(self):
             source_pgdata = src_pg.data_dir,
             destination_node = dst_pg,
             # here's substitution of --remoge-path pg_probackup agent compiled with another postgres version
-            options=['-d', 'postgres', '-p', str(src_pg.port), '--stream', '--remote-path=' + pg_path_ee_9_6]
+            options=['-d', 'postgres', '-p', str(src_pg.port), '--stream', '--remote-path=' + pg_path_remote_version]
             )
 
         # Clean after yourself