Skip to content

Commit e90527d

Browse files
committed
Merge branch 'master' into stable. Version 2.0.6.
2 parents ed8f9be + 9813471 commit e90527d

31 files changed

+1947
-1074
lines changed

src/archive.c

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -54,11 +54,6 @@ do_archive_push(char *wal_file_path, char *wal_file_name)
5454
"Instance '%s' should have SYSTEM_ID = %ld instead of %ld",
5555
wal_file_name, instance_name, config->system_identifier, system_id);
5656

57-
if (strcmp(current_dir, config->pgdata) != 0)
58-
elog(ERROR, "Refuse to push WAL segment %s into archive. Instance parameters mismatch."
59-
"Instance '%s' should have PGDATA = %s instead of %s",
60-
wal_file_name, instance_name, config->pgdata, current_dir);
61-
6257
/* Create 'archlog_path' directory. Do nothing if it already exists. */
6358
dir_create_dir(arclog_path, DIR_PERMISSION);
6459

@@ -106,4 +101,4 @@ do_archive_get(char *wal_file_path, char *wal_file_name)
106101
elog(INFO, "pg_probackup archive-get completed successfully");
107102

108103
return 0;
109-
}
104+
}

0 commit comments

Comments
 (0)