From 5534b107a0d427ee7406fb5055fcc176ace38514 Mon Sep 17 00:00:00 2001 From: Grigory Smolkin Date: Wed, 22 Nov 2017 17:04:46 +0300 Subject: [PATCH] minor changes to log messages --- src/backup.c | 15 +++++++++++++-- src/data.c | 2 +- src/validate.c | 6 +++--- 3 files changed, 17 insertions(+), 6 deletions(-) diff --git a/src/backup.c b/src/backup.c index a211457c..85fc97ca 100644 --- a/src/backup.c +++ b/src/backup.c @@ -867,8 +867,8 @@ do_backup(void) current.status = BACKUP_STATUS_DONE; pgBackupWriteBackupControlFile(¤t); - elog(LOG, "Backup completed. Total bytes : " INT64_FORMAT "", - current.data_bytes); + //elog(LOG, "Backup completed. Total bytes : " INT64_FORMAT "", + // current.data_bytes); pgBackupValidate(¤t); @@ -1402,6 +1402,11 @@ wait_wal_lsn(XLogRecPtr lsn, bool wait_prev_segment) timeout = archive_timeout; } + if (wait_prev_segment) + elog(LOG, "Looking for segment: %s", wal_segment); + else + elog(LOG, "Looking for LSN: %X/%X in segment: %s", (uint32) (lsn >> 32), (uint32) lsn, wal_segment); + /* Wait until target LSN is archived or streamed */ while (true) { @@ -1409,6 +1414,7 @@ wait_wal_lsn(XLogRecPtr lsn, bool wait_prev_segment) if (file_exists) { + elog(LOG, "Found segment: %s", wal_segment); /* Do not check LSN for previous WAL segment */ if (wait_prev_segment) return; @@ -1419,7 +1425,10 @@ wait_wal_lsn(XLogRecPtr lsn, bool wait_prev_segment) if ((stream_wal && wal_contains_lsn(wal_dir, lsn, tli)) || (!stream_wal && wal_contains_lsn(arclog_path, lsn, tli))) /* Target LSN was found */ + { + elog(LOG, "Found LSN: %X/%X", (uint32) (lsn >> 32), (uint32) lsn); return; + } } sleep(1); @@ -1654,6 +1663,8 @@ pg_stop_backup(pgBackup *backup) } if (!res) elog(ERROR, "pg_stop backup() failed"); + else + elog(INFO, "pg_stop backup() successfully executed"); } backup_in_progress = false; diff --git a/src/data.c b/src/data.c index a4cd55af..5c77c4b5 100644 --- a/src/data.c +++ b/src/data.c @@ -508,7 +508,7 @@ restore_data_file(const char *from_root, if (header.block < blknum) elog(ERROR, "backup is broken at block %u", blknum); - elog(VERBOSE, "file %s, header compressed size %d", file->path, header.compressed_size); + //elog(VERBOSE, "file %s, header compressed size %d", file->path, header.compressed_size); Assert(header.compressed_size <= BLCKSZ); read_len = fread(compressed_page.data, 1, diff --git a/src/validate.c b/src/validate.c index 88919f3e..8f0380d4 100644 --- a/src/validate.c +++ b/src/validate.c @@ -51,12 +51,12 @@ pgBackupValidate(pgBackup *backup) return; } - elog(LOG, "Validate backup %s", backup_id_string); + elog(INFO, "Validating backup %s", backup_id_string); if (backup->backup_mode != BACKUP_MODE_FULL && backup->backup_mode != BACKUP_MODE_DIFF_PAGE && backup->backup_mode != BACKUP_MODE_DIFF_PTRACK) - elog(LOG, "Invalid backup_mode of backup %s", backup_id_string); + elog(INFO, "Invalid backup_mode of backup %s", backup_id_string); pgBackupGetPath(backup, base_path, lengthof(base_path), DATABASE_DIR); pgBackupGetPath(backup, path, lengthof(path), DATABASE_FILE_LIST); @@ -99,7 +99,7 @@ pgBackupValidate(pgBackup *backup) if (corrupted) elog(WARNING, "Backup %s is corrupted", backup_id_string); else - elog(LOG, "Backup %s is valid", backup_id_string); + elog(INFO, "Backup %s is valid", backup_id_string); free(backup_id_string); }