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

Commit3068156

Browse files
author
Artur Zakirov
committed
Revert: Check in SHOW command that backups in RUNNING status
1 parent6fedb2e commit3068156

File tree

7 files changed

+9
-46
lines changed

7 files changed

+9
-46
lines changed

‎backup.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -432,7 +432,7 @@ do_backup(bool smooth_checkpoint)
432432
elog(LOG,"----------------------------------------");
433433

434434
/* get exclusive lock of backup catalog */
435-
catalog_lock(true,NULL);
435+
catalog_lock(true);
436436

437437
/* initialize backup result */
438438
current.status=BACKUP_STATUS_RUNNING;

‎catalog.c‎

Lines changed: 2 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ unlink_lock_atexit(void)
4343
* Create a lockfile.
4444
*/
4545
void
46-
catalog_lock(boolcheck_catalog,pid_t*run_pid)
46+
catalog_lock(boolcheck_catalog)
4747
{
4848
intfd;
4949
charbuffer[MAXPGPATH*2+256];
@@ -53,9 +53,6 @@ catalog_lock(bool check_catalog, pid_t *run_pid)
5353
pid_tmy_pid,
5454
my_p_pid;
5555

56-
if (run_pid)
57-
*run_pid=0;
58-
5956
join_path_components(lock_file,backup_path,BACKUP_CATALOG_PID);
6057

6158
/*
@@ -152,16 +149,7 @@ catalog_lock(bool check_catalog, pid_t *run_pid)
152149
{
153150
if (kill(encoded_pid,0)==0||
154151
(errno!=ESRCH&&errno!=EPERM))
155-
{
156-
/* If run_pid was specified just return encoded_pid */
157-
if (run_pid)
158-
{
159-
*run_pid=encoded_pid;
160-
return;
161-
}
162-
else
163-
elog(ERROR,"lock file \"%s\" already exists",lock_file);
164-
}
152+
elog(ERROR,"lock file \"%s\" already exists",lock_file);
165153
}
166154

167155
/*

‎delete.c‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ do_delete(time_t backup_id)
3131
elog(ERROR,"required backup ID not specified");
3232

3333
/* Lock backup catalog */
34-
catalog_lock(false,NULL);
34+
catalog_lock(false);
3535

3636
/* Get complete list of backups */
3737
backup_list=catalog_get_backup_list(0);
@@ -98,7 +98,7 @@ do_deletewal(time_t backup_id, bool strict, bool need_catalog_lock)
9898

9999
/* Lock backup catalog */
100100
if (need_catalog_lock)
101-
catalog_lock(false,NULL);
101+
catalog_lock(false);
102102

103103
/* Find oldest LSN, used by backups */
104104
backup_list=catalog_get_backup_list(0);
@@ -154,7 +154,7 @@ do_retention_purge(void)
154154
elog(ERROR,"retention policy is not set");
155155

156156
/* Lock backup catalog */
157-
catalog_lock(false,NULL);
157+
catalog_lock(false);
158158

159159
/* Get a complete list of backups. */
160160
backup_list=catalog_get_backup_list(0);

‎pg_probackup.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -300,7 +300,7 @@ extern parray *catalog_get_backup_list(time_t backup_id);
300300
externpgBackup*catalog_get_last_data_backup(parray*backup_list,
301301
TimeLineIDtli);
302302

303-
externvoidcatalog_lock(boolcheck_catalog,pid_t*run_pid);
303+
externvoidcatalog_lock(boolcheck_catalog);
304304

305305
externvoidpgBackupWriteConfigSection(FILE*out,pgBackup*backup);
306306
externvoidpgBackupWriteResultSection(FILE*out,pgBackup*backup);

‎restore.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ do_restore(time_t backup_id,
106106
elog(LOG,"restore start");
107107

108108
/* get exclusive lock of backup catalog */
109-
catalog_lock(false,NULL);
109+
catalog_lock(false);
110110

111111
/* confirm the PostgreSQL server is not running */
112112
if (is_pg_running())

‎show.c‎

Lines changed: 0 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -42,17 +42,6 @@ do_show(time_t backup_id)
4242
return0;
4343
}
4444

45-
/* Fix backup status */
46-
if (backup->status==BACKUP_STATUS_RUNNING)
47-
{
48-
catalog_lock(false,&run_pid);
49-
if (run_pid==0)
50-
{
51-
backup->status=BACKUP_STATUS_ERROR;
52-
pgBackupWriteIni(backup);
53-
}
54-
}
55-
5645
show_backup_detail(stdout,backup);
5746

5847
/* cleanup */
@@ -198,7 +187,6 @@ static void
198187
show_backup_list(FILE*out,parray*backup_list)
199188
{
200189
inti;
201-
pid_trun_pid=-1;
202190

203191
/* show header */
204192
fputs("=========================================================================================\n",out);
@@ -214,19 +202,6 @@ show_backup_list(FILE *out, parray *backup_list)
214202
charduration[20]="----";
215203
chardata_bytes_str[10]="----";
216204

217-
/* Fix backup status */
218-
if (backup->status==BACKUP_STATUS_RUNNING)
219-
{
220-
if (run_pid==-1)
221-
catalog_lock(false,&run_pid);
222-
223-
if (run_pid==0||i+1<parray_num(backup_list))
224-
backup->status=BACKUP_STATUS_ERROR;
225-
226-
if (run_pid==0)
227-
pgBackupWriteIni(backup);
228-
}
229-
230205
if (backup->recovery_time!= (time_t)0)
231206
time2iso(timestamp,lengthof(timestamp),backup->recovery_time);
232207
if (backup->end_time!= (time_t)0)

‎validate.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ do_validate(time_t backup_id,
4141
boolsuccess_validate,
4242
need_validate_wal= true;
4343

44-
catalog_lock(false,NULL);
44+
catalog_lock(false);
4545

4646
rt=checkIfCreateRecoveryConf(target_time,target_xid,target_inclusive);
4747
if (rt==NULL)

0 commit comments

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