Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit10fbb79

Browse files
committed
Improve log messages related to tablespace_map file
This patch changes the log message which is logged when the serversuccessfully renames backup_label file to *.old but fails to renametablespace_map file during the shutdown. Previously the WARNINGmessage "online backup mode was not canceled" was logged in that case.However this message is confusing because the backup mode is treatedas canceled whenever backup_label is successfully renamed. So thiscommit makes the server log the message "online backup mode canceled"in that case.Also this commit changes errdetail messages so that they follow theerror message style guide.Back-patch to 9.5 where tablespace_map file is introduced.Original patch by Amit Kapila, heavily modified by me.
1 parent0f75928 commit10fbb79

File tree

1 file changed

+20
-16
lines changed
  • src/backend/access/transam

1 file changed

+20
-16
lines changed

‎src/backend/access/transam/xlog.c

Lines changed: 20 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -6160,13 +6160,13 @@ StartupXLOG(void)
61606160
ereport(LOG,
61616161
(errmsg("ignoring \"%s\" file because no \"%s\" file exists",
61626162
TABLESPACE_MAP,BACKUP_LABEL_FILE),
6163-
errdetail("\"%s\" was renamed to \"%s\".",
6163+
errdetail("File\"%s\" was renamed to \"%s\".",
61646164
TABLESPACE_MAP,TABLESPACE_MAP_OLD)));
61656165
else
61666166
ereport(LOG,
61676167
(errmsg("ignoring \"%s\" file because no \"%s\" file exists",
61686168
TABLESPACE_MAP,BACKUP_LABEL_FILE),
6169-
errdetail("Could not rename file\"%s\" to \"%s\": %m.",
6169+
errdetail("File\"%s\" could not be renamed to \"%s\": %m.",
61706170
TABLESPACE_MAP,TABLESPACE_MAP_OLD)));
61716171
}
61726172

@@ -10911,32 +10911,32 @@ CancelBackup(void)
1091110911
{
1091210912
structstatstat_buf;
1091310913

10914-
/* if the file is not there, return */
10914+
/* if thebackup_labelfile is not there, return */
1091510915
if (stat(BACKUP_LABEL_FILE,&stat_buf)<0)
1091610916
return;
1091710917

1091810918
/* remove leftover file from previously canceled backup if it exists */
1091910919
unlink(BACKUP_LABEL_OLD);
1092010920

10921-
if (rename(BACKUP_LABEL_FILE,BACKUP_LABEL_OLD)==0)
10922-
{
10923-
ereport(LOG,
10924-
(errmsg("online backup mode canceled"),
10925-
errdetail("\"%s\" was renamed to \"%s\".",
10926-
BACKUP_LABEL_FILE,BACKUP_LABEL_OLD)));
10927-
}
10928-
else
10921+
if (rename(BACKUP_LABEL_FILE,BACKUP_LABEL_OLD)!=0)
1092910922
{
1093010923
ereport(WARNING,
1093110924
(errcode_for_file_access(),
1093210925
errmsg("online backup mode was not canceled"),
10933-
errdetail("Could not rename\"%s\" to \"%s\": %m.",
10926+
errdetail("File\"%s\" could not be renamed to \"%s\": %m.",
1093410927
BACKUP_LABEL_FILE,BACKUP_LABEL_OLD)));
10928+
return;
1093510929
}
1093610930

1093710931
/* if the tablespace_map file is not there, return */
1093810932
if (stat(TABLESPACE_MAP,&stat_buf)<0)
10933+
{
10934+
ereport(LOG,
10935+
(errmsg("online backup mode canceled"),
10936+
errdetail("File \"%s\" was renamed to \"%s\".",
10937+
BACKUP_LABEL_FILE,BACKUP_LABEL_OLD)));
1093910938
return;
10939+
}
1094010940

1094110941
/* remove leftover file from previously canceled backup if it exists */
1094210942
unlink(TABLESPACE_MAP_OLD);
@@ -10945,15 +10945,19 @@ CancelBackup(void)
1094510945
{
1094610946
ereport(LOG,
1094710947
(errmsg("online backup mode canceled"),
10948-
errdetail("\"%s\" was renamed to \"%s\".",
10949-
TABLESPACE_MAP,TABLESPACE_MAP_OLD)));
10948+
errdetail("Files \"%s\" and \"%s\" were renamed to "
10949+
"\"%s\" and \"%s\", respectively.",
10950+
BACKUP_LABEL_FILE,TABLESPACE_MAP,
10951+
BACKUP_LABEL_OLD,TABLESPACE_MAP_OLD)));
1095010952
}
1095110953
else
1095210954
{
1095310955
ereport(WARNING,
1095410956
(errcode_for_file_access(),
10955-
errmsg("online backup mode was not canceled"),
10956-
errdetail("Could not rename \"%s\" to \"%s\": %m.",
10957+
errmsg("online backup mode canceled"),
10958+
errdetail("File \"%s\" was renamed to \"%s\", but "
10959+
"file \"%s\" could not be renamed to \"%s\": %m.",
10960+
BACKUP_LABEL_FILE,BACKUP_LABEL_OLD,
1095710961
TABLESPACE_MAP,TABLESPACE_MAP_OLD)));
1095810962
}
1095910963
}

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp