From 0e65093c86cb561c3eacf4bcedc8d833ea001f59 Mon Sep 17 00:00:00 2001 From: yukai_k <295163447@qq.com> Date: Tue, 2 Feb 2021 11:17:21 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dgs=5Fprobackup=E9=BB=98?= =?UTF-8?q?=E8=AE=A4=E4=BB=A5plain=E6=A0=BC=E5=BC=8F=E6=9F=A5=E7=9C=8B?= =?UTF-8?q?=E5=A4=87=E6=9C=BA=E5=A4=87=E4=BB=BD=E4=BF=A1=E6=81=AF=E6=97=B6?= =?UTF-8?q?=E6=B2=A1=E6=9C=89=E6=98=BE=E7=A4=BArecovery-name=E5=B1=9E?= =?UTF-8?q?=E6=80=A7=E7=9A=84=E9=97=AE=E9=A2=98(I2P85V)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/bin/pg_probackup/backup.cpp | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/src/bin/pg_probackup/backup.cpp b/src/bin/pg_probackup/backup.cpp index d4748d003..a93a0222d 100644 --- a/src/bin/pg_probackup/backup.cpp +++ b/src/bin/pg_probackup/backup.cpp @@ -1572,9 +1572,6 @@ static void create_restore_point(pgBackup *backup, PGconn *conn) nRet = snprintf_s(name, lengthof(name), lengthof(name) - 1,"pg_probackup, backup_id %s", base36enc(backup->start_time)); securec_check_ss_c(nRet, "\0", "\0"); - nRet = snprintf_s(backup->recovery_name, lengthof(backup->recovery_name), lengthof(backup->recovery_name) - 1, - "backup %s", base36enc((unsigned long)backup->start_time)); - securec_check_ss_c(nRet, "\0", "\0"); params[0] = name; res = pgut_execute(conn, "SELECT pg_catalog.pg_create_restore_point($1)", 1, params); @@ -1801,6 +1798,13 @@ pg_stop_backup(pgBackup *backup, PGconn *pg_startbackup_conn, create_restore_point(backup, conn); } + if (backup != nullptr) { + ret = snprintf_s(backup->recovery_name, lengthof(backup->recovery_name), + lengthof(backup->recovery_name) - 1, + "backup %s", base36enc((unsigned long)backup->start_time)); + securec_check_ss_c(ret, "\0", "\0"); + } + /* * send pg_stop_backup asynchronously because we could came * here from backup_cleanup() after some error caused by