sync restore_command with restore_command_hint if missing #284
+173
−13
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,138 @@ | ||
| # Test for fixing timeline collision when restore_command is not written into | ||
| # the generated recovery.conf during recovery, resulting in the promoting node not seeing | ||
| # a newer timeline ID in the archive. Instead, restore_command is read as a | ||
| # restore_command_hint from postgresql.conf to resolve archive timeline conflicts. | ||
|
|
||
| use strict; | ||
| use warnings; | ||
| use PostgresNode; | ||
| use TestLib; | ||
| use Test::More tests => 6; | ||
| use File::Copy; | ||
| use File::Path qw(rmtree); | ||
|
|
||
| # Initialize master with archiving and streaming | ||
| my $node_master = get_new_node('master'); | ||
| $node_master->init(has_archiving => 1, allows_streaming => 1); | ||
| $node_master->start; | ||
|
|
||
| # Create test data | ||
| $node_master->safe_psql('postgres', "CREATE TABLE test_tbl (id int)"); | ||
| $node_master->safe_psql('postgres', "INSERT INTO test_tbl VALUES (1)"); | ||
|
Comment on lines
+20
to
+21
|
||
|
|
||
| # Take backup for standby | ||
| my $backup_name = 'my_backup'; | ||
| $node_master->backup($backup_name); | ||
|
|
||
| # Initialize standby from backup | ||
| my $node_standby = get_new_node('standby'); | ||
| $node_standby->init_from_backup($node_master, $backup_name, | ||
| has_streaming => 1, | ||
| has_restoring => 1); | ||
|
|
||
| # Enable archiving on standby for timeline history archival | ||
| $node_standby->enable_archiving(); | ||
|
|
||
| # Disable hot standby as it is not supported | ||
| $node_standby->append_conf('postgresql.conf', "hot_standby = off\n"); | ||
|
|
||
| # Start standby and wait for it to catch up | ||
| $node_standby->start; | ||
| my $target_lsn = $node_master->lsn('insert'); | ||
| $node_master->wait_for_catchup($node_standby, 'replay', $target_lsn); | ||
|
|
||
| # First promotion: standby moves to timeline 2 | ||
| $node_standby->promote; | ||
| $node_standby->poll_query_until('postgres', "SELECT NOT pg_is_in_recovery()") | ||
| or die "Timed out waiting for first promotion"; | ||
|
|
||
| # Force checkpoint and wait for timeline history file to be archived | ||
| $node_standby->safe_psql('postgres', "CHECKPOINT"); | ||
|
|
||
| # Verify 00000002.history is archived | ||
| my $standby_archive = $node_standby->archive_dir; | ||
| $node_standby->poll_query_until('postgres', | ||
| "SELECT size IS NOT NULL FROM pg_stat_file('pg_xlog/archive_status/00000002.history.done', true);") | ||
| or die "Timed out waiting for 00000002.history to be archived"; | ||
|
|
||
| ok(-f "$standby_archive/00000002.history", | ||
| 'timeline 2 history file archived after first promotion'); | ||
|
|
||
| # Crash standby | ||
| $node_standby->stop('immediate'); | ||
|
|
||
| # Rebuild standby from master using pg_basebackup | ||
| my $standby_datadir = $node_standby->data_dir; | ||
| File::Path::rmtree($standby_datadir); | ||
|
|
||
| command_ok(['pg_basebackup', | ||
| '-D', $standby_datadir, | ||
| '-h', $node_master->host, | ||
| '-p', $node_master->port, | ||
| '--target-gp-dbid', '123', | ||
| '-x', | ||
| '--write-recovery-conf'], | ||
| 'pg_basebackup standby from master'); | ||
|
|
||
| # Verify recovery.conf does not contain restore_command | ||
| my $recovery_conf = "$standby_datadir/recovery.conf"; | ||
| ok(-f $recovery_conf, 'recovery.conf exists after pg_basebackup'); | ||
|
|
||
| my $recovery_conf_content = slurp_file($recovery_conf); | ||
| unlike($recovery_conf_content, qr/restore_command\s*=/, | ||
| 'recovery.conf does not contain restore_command'); | ||
|
|
||
| # Restore configuration | ||
| $node_standby->append_conf('postgresql.conf', "hot_standby = off\n"); | ||
| $node_standby->enable_archiving(); | ||
|
|
||
| # Append restore_command_hint to postgres.conf | ||
| my $path = TestLib::perl2host($standby_archive); | ||
| $path =~ s{\\}{\\\\}g if ($TestLib::windows_os); | ||
| my $restore_cmd = $TestLib::windows_os | ||
| ? qq{copy "$path\\\\%f" "%p"} | ||
| : qq{cp "$path/%f" "%p"}; | ||
|
|
||
| $node_standby->append_conf('postgresql.conf', | ||
| "restore_command_hint = '$restore_cmd'\n"); | ||
|
|
||
| # Start standby (now back on timeline 1) | ||
| $node_standby->start; | ||
| sleep(2); | ||
|
|
||
| # Kill master and promote standby again | ||
| $node_master->stop('immediate'); | ||
|
|
||
| # Promote using pg_ctl directly since PostgresNode->promote() verification fails in mirror mode | ||
| # (after pg_basebackup we have gp_contentid=0 and it affects connection acceptance). | ||
| # Verify via logs. | ||
| my $pgdata = $node_standby->data_dir; | ||
| my $logfile = $node_standby->logfile; | ||
| print "### Promoting node \"" . $node_standby->name . "\"\n"; | ||
| TestLib::system_or_bail('pg_ctl', '-D', $pgdata, '-l', $logfile, 'promote'); | ||
|
|
||
| # Wait for second promotion to complete | ||
| my $max_wait = 60; | ||
| my $waited = 0; | ||
| my $promotions = 0; | ||
|
|
||
| while ($waited < $max_wait) { | ||
| my $log_content = slurp_file($logfile); | ||
| my @promotion_matches = $log_content =~ /database system is ready to accept connections/g; | ||
| $promotions = scalar @promotion_matches; | ||
|
|
||
| last if $promotions >= 2; | ||
|
|
||
| sleep(1); | ||
| $waited++; | ||
| } | ||
|
|
||
| die "Second promotion did not complete in time (found $promotions ready messages)" if $promotions < 2; | ||
|
|
||
| # Verify timeline 2 was selected only once and currently active timeline is 3 | ||
| my $log_content = slurp_file($logfile); | ||
| my @timeline_2_matches = $log_content =~ /selected new timeline ID: 2/g; | ||
| is(scalar @timeline_2_matches, 1, 'timeline 2 selected once'); | ||
|
|
||
| my @timeline_3_matches = $log_content =~ /selected new timeline ID: 3/g; | ||
| is(scalar @timeline_3_matches, 1, 'timeline 3 selected once'); | ||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
the bracket should be on the next line according to PostgreSQL code style