Do not check system identifier for PG 9.4 Fix #459

wal-g · Dec 4, 2019 · d372cbd · d372cbd
1 parent d41440c
commit d372cbd
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/internal/backup_push_handler.go b/internal/backup_push_handler.go
@@ -144,7 +144,7 @@ func HandleBackupPush(uploader *Uploader, archiveDirectory string, isPermanent b
 		if *previousBackupSentinelDto.BackupFinishLSN > backupStartLSN {
 			tracelog.ErrorLogger.FatalOnError(NewBackupFromFuture(previousBackupName))
 		}
-		if previousBackupSentinelDto.SystemIdentifier != nil && *systemIdentifier != *previousBackupSentinelDto.SystemIdentifier {
+		if previousBackupSentinelDto.SystemIdentifier != nil && systemIdentifier != nil && *systemIdentifier != *previousBackupSentinelDto.SystemIdentifier {
 
 			tracelog.ErrorLogger.FatalOnError(NewBackupFromOtherBD())
 		}
@@ -273,4 +273,4 @@ func CheckPgVersionAndPgControl(archiveDirectory string) {
 	tracelog.ErrorLogger.FatalfOnError("It looks like you are trying to backup not pg_data. PgControl file not found: %v\n", err)
 	_, err = ioutil.ReadFile(filepath.Join(archiveDirectory, "PG_VERSION"))
 	tracelog.ErrorLogger.FatalfOnError("It looks like you are trying to backup not pg_data. PG_VERSION file not found: %v\n", err)
-}
+}
diff --git a/internal/queryRunner.go b/internal/queryRunner.go
@@ -94,7 +94,7 @@ func NewPgQueryRunner(conn *pgx.Conn) (*PgQueryRunner, error) {
 	}
 	err = r.getSystemIdentifier()
 	if err != nil {
-		return nil, err
+		tracelog.WarningLogger.Printf("Couldn't get system identifier because of error: '%v'\n", err)
 	}
 
 	return r, nil