Skip to content

Commit 5ed469d

Browse files
kulaginmkulaginm
committed
[PBCKP-232] remove depricated options (master-db, master-host, master-port, master-user, replica-timeout) part 1
1 parent ae275dc commit 5ed469d

File tree

6 files changed

+21
-187
lines changed

6 files changed

+21
-187
lines changed

‎src/configure.c‎

Lines changed: 0 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -90,32 +90,6 @@ ConfigOption instance_options[] =
9090
&instance_config.conn_opt.pguser, SOURCE_CMD, 0,
9191
OPTION_CONN_GROUP, 0, option_get_value
9292
},
93-
/* Replica options */
94-
{
95-
's', 202, "master-db",
96-
&instance_config.master_conn_opt.pgdatabase, SOURCE_CMD, 0,
97-
OPTION_REPLICA_GROUP, 0, option_get_value
98-
},
99-
{
100-
's', 203, "master-host",
101-
&instance_config.master_conn_opt.pghost, SOURCE_CMD, 0,
102-
OPTION_REPLICA_GROUP, 0, option_get_value
103-
},
104-
{
105-
's', 204, "master-port",
106-
&instance_config.master_conn_opt.pgport, SOURCE_CMD, 0,
107-
OPTION_REPLICA_GROUP, 0, option_get_value
108-
},
109-
{
110-
's', 205, "master-user",
111-
&instance_config.master_conn_opt.pguser, SOURCE_CMD, 0,
112-
OPTION_REPLICA_GROUP, 0, option_get_value
113-
},
114-
{
115-
'u', 206, "replica-timeout",
116-
&instance_config.replica_timeout, SOURCE_CMD, SOURCE_DEFAULT,
117-
OPTION_REPLICA_GROUP, OPTION_UNIT_S, option_get_value
118-
},
11993
/* Archive options */
12094
{
12195
'u', 207, "archive-timeout",
@@ -362,8 +336,6 @@ init_config(InstanceConfig *config, const char *instance_name)
362336
config->xlog_seg_size = XLOG_SEG_SIZE;
363337
#endif
364338

365-
config->replica_timeout = REPLICA_TIMEOUT_DEFAULT;
366-
367339
config->archive_timeout = ARCHIVE_TIMEOUT_DEFAULT;
368340

369341
/* Copy logger defaults */
@@ -437,32 +409,6 @@ readInstanceConfigFile(InstanceState *instanceState)
437409
&instance->conn_opt.pguser, SOURCE_CMD, 0,
438410
OPTION_CONN_GROUP, 0, option_get_value
439411
},
440-
/* Replica options */
441-
{
442-
's', 202, "master-db",
443-
&instance->master_conn_opt.pgdatabase, SOURCE_CMD, 0,
444-
OPTION_REPLICA_GROUP, 0, option_get_value
445-
},
446-
{
447-
's', 203, "master-host",
448-
&instance->master_conn_opt.pghost, SOURCE_CMD, 0,
449-
OPTION_REPLICA_GROUP, 0, option_get_value
450-
},
451-
{
452-
's', 204, "master-port",
453-
&instance->master_conn_opt.pgport, SOURCE_CMD, 0,
454-
OPTION_REPLICA_GROUP, 0, option_get_value
455-
},
456-
{
457-
's', 205, "master-user",
458-
&instance->master_conn_opt.pguser, SOURCE_CMD, 0,
459-
OPTION_REPLICA_GROUP, 0, option_get_value
460-
},
461-
{
462-
'u', 206, "replica-timeout",
463-
&instance->replica_timeout, SOURCE_CMD, SOURCE_DEFAULT,
464-
OPTION_REPLICA_GROUP, OPTION_UNIT_S, option_get_value
465-
},
466412
/* Archive options */
467413
{
468414
'u', 207, "archive-timeout",

‎src/help.c‎

Lines changed: 1 addition & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
*
33
* help.c
44
*
5-
* Copyright (c) 2017-2021, Postgres Professional
5+
* Copyright (c) 2017-2022, Postgres Professional
66
*
77
*-------------------------------------------------------------------------
88
*/
@@ -416,13 +416,6 @@ help_backup(void)
416416
printf(_(" --remote-user=username user name for ssh connection (default: current user)\n"));
417417
printf(_(" --ssh-options=ssh_options additional ssh options (default: none)\n"));
418418
printf(_(" (example: --ssh-options='-c cipher_spec -F configfile')\n"));
419-
420-
printf(_("\n Replica options:\n"));
421-
printf(_(" --master-user=user_name user name to connect to master (deprecated)\n"));
422-
printf(_(" --master-db=db_name database to connect to master (deprecated)\n"));
423-
printf(_(" --master-host=host_name database server host of master (deprecated)\n"));
424-
printf(_(" --master-port=port database server port of master (deprecated)\n"));
425-
printf(_(" --replica-timeout=timeout wait timeout for WAL segment streaming through replication (deprecated)\n\n"));
426419
}
427420

428421
static void
@@ -878,13 +871,6 @@ help_set_config(void)
878871
printf(_(" --archive-host=destination address or hostname for ssh connection to archive host\n"));
879872
printf(_(" --archive-port=port port for ssh connection to archive host (default: 22)\n"));
880873
printf(_(" --archive-user=username user name for ssh connection to archive host (default: PostgreSQL user)\n"));
881-
882-
printf(_("\n Replica options:\n"));
883-
printf(_(" --master-user=user_name user name to connect to master (deprecated)\n"));
884-
printf(_(" --master-db=db_name database to connect to master (deprecated)\n"));
885-
printf(_(" --master-host=host_name database server host of master (deprecated)\n"));
886-
printf(_(" --master-port=port database server port of master (deprecated)\n"));
887-
printf(_(" --replica-timeout=timeout wait timeout for WAL segment streaming through replication (deprecated)\n\n"));
888874
}
889875

890876
static void

‎src/pg_probackup.h‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -378,9 +378,6 @@ typedef struct InstanceConfig
378378
char *external_dir_str;
379379

380380
ConnectionOptions conn_opt;
381-
ConnectionOptions master_conn_opt;
382-
383-
uint32 replica_timeout; //Deprecated. Not used anywhere
384381

385382
/* Wait timeout for WAL segment archiving */
386383
uint32 archive_timeout;

‎tests/archive.py‎

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -725,9 +725,6 @@ def test_replica_archive(self):
725725
backup_dir, 'replica', replica,
726726
options=[
727727
'--archive-timeout=30',
728-
'--master-host=localhost',
729-
'--master-db=postgres',
730-
'--master-port={0}'.format(master.port),
731728
'--stream'])
732729

733730
self.validate_pb(backup_dir, 'replica')
@@ -764,9 +761,6 @@ def test_replica_archive(self):
764761
replica, backup_type='page',
765762
options=[
766763
'--archive-timeout=60',
767-
'--master-db=postgres',
768-
'--master-host=localhost',
769-
'--master-port={0}'.format(master.port),
770764
'--stream'])
771765

772766
self.validate_pb(backup_dir, 'replica')
@@ -857,9 +851,6 @@ def test_master_and_replica_parallel_archiving(self):
857851
backup_dir, 'replica', replica,
858852
options=[
859853
'--archive-timeout=30',
860-
'--master-host=localhost',
861-
'--master-db=postgres',
862-
'--master-port={0}'.format(master.port),
863854
'--stream'])
864855

865856
self.validate_pb(backup_dir, 'replica')

‎tests/ptrack.py‎

Lines changed: 16 additions & 86 deletions
Original file line numberDiff line numberDiff line change
@@ -1560,13 +1560,7 @@ def test_create_db_on_replica(self):
15601560

15611561
self.backup_node(
15621562
backup_dir, 'replica', replica,
1563-
options=[
1564-
'-j10',
1565-
'--master-host=localhost',
1566-
'--master-db=postgres',
1567-
'--master-port={0}'.format(node.port),
1568-
'--stream'
1569-
]
1563+
options=['-j10', '--stream']
15701564
)
15711565

15721566
# CREATE DATABASE DB1
@@ -1584,13 +1578,7 @@ def test_create_db_on_replica(self):
15841578
backup_id = self.backup_node(
15851579
backup_dir, 'replica',
15861580
replica, backup_type='ptrack',
1587-
options=[
1588-
'-j10',
1589-
'--stream',
1590-
'--master-host=localhost',
1591-
'--master-db=postgres',
1592-
'--master-port={0}'.format(node.port)
1593-
]
1581+
options=['-j10', '--stream']
15941582
)
15951583

15961584
if self.paranoia:
@@ -2304,11 +2292,7 @@ def test_ptrack_clean_replica(self):
23042292
backup_dir,
23052293
'replica',
23062294
replica,
2307-
options=[
2308-
'-j10', '--stream',
2309-
'--master-host=localhost',
2310-
'--master-db=postgres',
2311-
'--master-port={0}'.format(master.port)])
2295+
options=['-j10', '--stream'])
23122296
master.safe_psql('postgres', 'checkpoint')
23132297

23142298
for i in idx_ptrack:
@@ -2335,11 +2319,7 @@ def test_ptrack_clean_replica(self):
23352319
'replica',
23362320
replica,
23372321
backup_type='ptrack',
2338-
options=[
2339-
'-j10', '--stream',
2340-
'--master-host=localhost',
2341-
'--master-db=postgres',
2342-
'--master-port={0}'.format(master.port)])
2322+
options=['-j10', '--stream'])
23432323
master.safe_psql('postgres', 'checkpoint')
23442324

23452325
for i in idx_ptrack:
@@ -2367,11 +2347,7 @@ def test_ptrack_clean_replica(self):
23672347
'replica',
23682348
replica,
23692349
backup_type='page',
2370-
options=[
2371-
'-j10', '--master-host=localhost',
2372-
'--master-db=postgres',
2373-
'--master-port={0}'.format(master.port),
2374-
'--stream'])
2350+
options=['-j10', '--stream'])
23752351
master.safe_psql('postgres', 'checkpoint')
23762352

23772353
for i in idx_ptrack:
@@ -2437,8 +2413,7 @@ def test_ptrack_cluster_on_btree(self):
24372413
idx_ptrack[i]['old_pages'] = self.get_md5_per_page_for_fork(
24382414
idx_ptrack[i]['path'], idx_ptrack[i]['old_size'])
24392415

2440-
self.backup_node(
2441-
backup_dir, 'node', node, options=['-j10', '--stream'])
2416+
self.backup_node(backup_dir, 'node', node, options=['-j10', '--stream'])
24422417

24432418
node.safe_psql('postgres', 'delete from t_heap where id%2 = 1')
24442419
node.safe_psql('postgres', 'cluster t_heap using t_btree')
@@ -2573,11 +2548,7 @@ def test_ptrack_cluster_on_btree_replica(self):
25732548
master.safe_psql('postgres', 'vacuum t_heap')
25742549
master.safe_psql('postgres', 'checkpoint')
25752550

2576-
self.backup_node(
2577-
backup_dir, 'replica', replica, options=[
2578-
'-j10', '--stream', '--master-host=localhost',
2579-
'--master-db=postgres', '--master-port={0}'.format(
2580-
master.port)])
2551+
self.backup_node(backup_dir, 'replica', replica, options=['-j10', '--stream'])
25812552

25822553
for i in idx_ptrack:
25832554
# get size of heap and indexes. size calculated in pages
@@ -2674,9 +2645,7 @@ def test_ptrack_cluster_on_gist_replica(self):
26742645

26752646
self.backup_node(
26762647
backup_dir, 'replica', replica, options=[
2677-
'-j10', '--stream', '--master-host=localhost',
2678-
'--master-db=postgres', '--master-port={0}'.format(
2679-
master.port)])
2648+
'-j10', '--stream'])
26802649

26812650
for i in idx_ptrack:
26822651
# get size of heap and indexes. size calculated in pages
@@ -2844,11 +2813,7 @@ def test_ptrack_empty_replica(self):
28442813
backup_dir,
28452814
'replica',
28462815
replica,
2847-
options=[
2848-
'-j10', '--stream',
2849-
'--master-host=localhost',
2850-
'--master-db=postgres',
2851-
'--master-port={0}'.format(master.port)])
2816+
options=['-j10', '--stream'])
28522817

28532818
# Create indexes
28542819
for i in idx_ptrack:
@@ -2868,11 +2833,7 @@ def test_ptrack_empty_replica(self):
28682833
'replica',
28692834
replica,
28702835
backup_type='ptrack',
2871-
options=[
2872-
'-j1', '--stream',
2873-
'--master-host=localhost',
2874-
'--master-db=postgres',
2875-
'--master-port={0}'.format(master.port)])
2836+
options=['-j1', '--stream'])
28762837

28772838
if self.paranoia:
28782839
pgdata = self.pgdata_content(replica.data_dir)
@@ -3041,12 +3002,7 @@ def test_basic_ptrack_truncate_replica(self):
30413002
# Make backup to clean every ptrack
30423003
self.backup_node(
30433004
backup_dir, 'replica', replica,
3044-
options=[
3045-
'-j10',
3046-
'--stream',
3047-
'--master-host=localhost',
3048-
'--master-db=postgres',
3049-
'--master-port={0}'.format(master.port)])
3005+
options=['-j10', '--stream'])
30503006

30513007
if replica.major_version < 11:
30523008
for i in idx_ptrack:
@@ -3070,12 +3026,7 @@ def test_basic_ptrack_truncate_replica(self):
30703026

30713027
self.backup_node(
30723028
backup_dir, 'replica', replica, backup_type='ptrack',
3073-
options=[
3074-
'-j10',
3075-
'--stream',
3076-
'--master-host=localhost',
3077-
'--master-db=postgres',
3078-
'--master-port={0}'.format(master.port)])
3029+
options=['-j10', '--stream'])
30793030

30803031
pgdata = self.pgdata_content(replica.data_dir)
30813032

@@ -3245,12 +3196,7 @@ def test_ptrack_vacuum_replica(self):
32453196
replica.safe_psql('postgres', 'checkpoint')
32463197

32473198
# Make FULL backup to clean every ptrack
3248-
self.backup_node(
3249-
backup_dir, 'replica', replica, options=[
3250-
'-j10', '--master-host=localhost',
3251-
'--master-db=postgres',
3252-
'--master-port={0}'.format(master.port),
3253-
'--stream'])
3199+
self.backup_node(backup_dir, 'replica', replica, options=['-j10', '--stream'])
32543200

32553201
if replica.major_version < 11:
32563202
for i in idx_ptrack:
@@ -3430,12 +3376,7 @@ def test_ptrack_vacuum_bits_frozen_replica(self):
34303376
# Take backup to clean every ptrack
34313377
self.backup_node(
34323378
backup_dir, 'replica', replica,
3433-
options=[
3434-
'-j10',
3435-
'--master-host=localhost',
3436-
'--master-db=postgres',
3437-
'--master-port={0}'.format(master.port),
3438-
'--stream'])
3379+
options=['-j10', '--stream'])
34393380

34403381
if replica.major_version < 11:
34413382
for i in idx_ptrack:
@@ -3688,12 +3629,7 @@ def test_ptrack_vacuum_full_replica(self):
36883629
# Take FULL backup to clean every ptrack
36893630
self.backup_node(
36903631
backup_dir, 'replica', replica,
3691-
options=[
3692-
'-j10',
3693-
'--master-host=localhost',
3694-
'--master-db=postgres',
3695-
'--master-port={0}'.format(master.port),
3696-
'--stream'])
3632+
options=['-j10', '--stream'])
36973633

36983634
if replica.major_version < 11:
36993635
for i in idx_ptrack:
@@ -3860,13 +3796,7 @@ def test_ptrack_vacuum_truncate_replica(self):
38603796
# Take FULL backup to clean every ptrack
38613797
self.backup_node(
38623798
backup_dir, 'replica', replica,
3863-
options=[
3864-
'-j10',
3865-
'--stream',
3866-
'--master-host=localhost',
3867-
'--master-db=postgres',
3868-
'--master-port={0}'.format(master.port)
3869-
]
3799+
options=['-j10', '--stream']
38703800
)
38713801

38723802
if master.major_version < 11:

0 commit comments

Comments
 (0)