[PBCKP-232] remove deprecated options (master-db, master-host, master-port, master-user, replica-timeout) part 2

Author: kulaginm

src/configure.c

@@ -34,13 +34,15 @@ static void show_configure_json(ConfigOption *opt);
 
 #define OPTION_INSTANCE_GROUP	"Backup instance information"
 #define OPTION_CONN_GROUP		"Connection parameters"
-#define OPTION_REPLICA_GROUP	"Replica parameters"
 #define OPTION_ARCHIVE_GROUP	"Archive parameters"
 #define OPTION_LOG_GROUP		"Logging parameters"
 #define OPTION_RETENTION_GROUP	"Retention parameters"
 #define OPTION_COMPRESS_GROUP	"Compression parameters"
 #define OPTION_REMOTE_GROUP		"Remote access parameters"
 
+/* dummy placeholder for obsolete options to store in following instance_options[] */
+static char	*obsolete_option_placeholder = NULL;
+
 /*
  * Short name should be non-printable ASCII character.
  */
@@ -90,6 +92,27 @@ ConfigOption instance_options[] =
 		&instance_config.conn_opt.pguser, SOURCE_CMD, 0,
 		OPTION_CONN_GROUP, 0, option_get_value
 	},
+	/* Obsolete options */
+	{
+		's', 202, "master-db",
+		&obsolete_option_placeholder, SOURCE_FILE_STRICT, SOURCE_CONST, "", 0, option_get_value
+	},
+	{
+		's', 203, "master-host",
+		&obsolete_option_placeholder, SOURCE_FILE_STRICT, SOURCE_CONST, "", 0, option_get_value
+	},
+	{
+		's', 204, "master-port",
+		&obsolete_option_placeholder, SOURCE_FILE_STRICT, SOURCE_CONST, "", 0, option_get_value
+	},
+	{
+		's', 205, "master-user",
+		&obsolete_option_placeholder, SOURCE_FILE_STRICT, SOURCE_CONST, "", 0, option_get_value
+	},
+	{
+		's', 206, "replica-timeout",
+		&obsolete_option_placeholder, SOURCE_FILE_STRICT, SOURCE_CONST, "", 0, option_get_value
+	},
 	/* Archive options */
 	{
 		'u', 207, "archive-timeout",

tests/compatibility.py

@@ -1482,3 +1482,51 @@ def test_compatibility_tablespace(self):
 
         # Clean after yourself
         self.del_test_dir(module_name, fname)
+
+    # @unittest.skip("skip")
+    def test_compatibility_master_options(self):
+        """
+        Test correctness of handling of removed master-db, master-host, master-port,
+        master-user and replica-timeout options
+        """
+        self.assertTrue(
+            self.version_to_num(self.old_probackup_version) <= self.version_to_num('2.6.0'),
+            'You need pg_probackup old_binary =< 2.6.0 for this test')
+
+        fname = self.id().split('.')[3]
+        node = self.make_simple_node(base_dir=os.path.join(module_name, fname, 'node'))
+        backup_dir = os.path.join(self.tmp_path, module_name, fname, 'backup')
+
+        self.init_pb(backup_dir, old_binary=True)
+        self.add_instance(backup_dir, 'node', node, old_binary=True)
+
+        # add deprecated options (using probackup< 2.6) into pg_probackup.conf
+        # don't care about option values, we can use random values here
+        self.set_config(
+            backup_dir, 'node',
+            options=[
+                '--master-db=postgres',
+                '--master-host=localhost',
+                '--master-port=5432',
+                '--master-user={0}'.format(self.user),
+                '--replica-timeout=100500'],
+            old_binary=True)
+
+        # and try to show config with new binary (those options must be silently skipped)
+        self.show_config(backup_dir, 'node', old_binary=False)
+
+        # store config with new version (those options must disappear from config)
+        self.set_config(
+            backup_dir, 'node',
+            options=[],
+            old_binary=False)
+
+        # and check absence
+        config_options = self.show_config(backup_dir, 'node', old_binary=False)
+        self.assertFalse(
+            ['master-db', 'master-host', 'master-port', 'master-user', 'replica-timeout'] & config_options.keys(),
+            'Obsolete options found in new config')
+
+        # Clean after yourself
+        self.del_test_dir(module_name, fname)
+