Revert: Check in SHOW command that backups in RUNNING status

Artur Zakirov · Artur Zakirov · commit 30681560c0ec · 2017-03-06T12:46:15.000+03:00
diff --git a/backup.c b/backup.c
@@ -432,7 +432,7 @@ do_backup(bool smooth_checkpoint)
 	elog(LOG, "----------------------------------------");
 
 	/* get exclusive lock of backup catalog */
-	catalog_lock(true, NULL);
+	catalog_lock(true);
 
 	/* initialize backup result */
 	current.status = BACKUP_STATUS_RUNNING;
diff --git a/catalog.c b/catalog.c
@@ -43,7 +43,7 @@ unlink_lock_atexit(void)
  * Create a lockfile.
  */
 void
-catalog_lock(bool check_catalog, pid_t *run_pid)
+catalog_lock(bool check_catalog)
 {
 	int			fd;
 	char		buffer[MAXPGPATH * 2 + 256];
@@ -53,9 +53,6 @@ catalog_lock(bool check_catalog, pid_t *run_pid)
 	pid_t		my_pid,
 				my_p_pid;
 
-	if (run_pid)
-		*run_pid = 0;
-
 	join_path_components(lock_file, backup_path, BACKUP_CATALOG_PID);
 
 	/*
@@ -152,16 +149,7 @@ catalog_lock(bool check_catalog, pid_t *run_pid)
 		{
 			if (kill(encoded_pid, 0) == 0 ||
 				(errno != ESRCH && errno != EPERM))
-			{
-				/* If run_pid was specified just return encoded_pid */
-				if (run_pid)
-				{
-					*run_pid = encoded_pid;
-					return;
-				}
-				else
-					elog(ERROR, "lock file \"%s\" already exists", lock_file);
-			}
+				elog(ERROR, "lock file \"%s\" already exists", lock_file);
 		}
 
 		/*
diff --git a/delete.c b/delete.c
@@ -31,7 +31,7 @@ do_delete(time_t backup_id)
 		elog(ERROR, "required backup ID not specified");
 
 	/* Lock backup catalog */
-	catalog_lock(false, NULL);
+	catalog_lock(false);
 
 	/* Get complete list of backups */
 	backup_list = catalog_get_backup_list(0);
@@ -98,7 +98,7 @@ do_deletewal(time_t backup_id, bool strict, bool need_catalog_lock)
 
 	/* Lock backup catalog */
 	if (need_catalog_lock)
-		catalog_lock(false, NULL);
+		catalog_lock(false);
 
 	/* Find oldest LSN, used by backups */
 	backup_list = catalog_get_backup_list(0);
@@ -154,7 +154,7 @@ do_retention_purge(void)
 		elog(ERROR, "retention policy is not set");
 
 	/* Lock backup catalog */
-	catalog_lock(false, NULL);
+	catalog_lock(false);
 
 	/* Get a complete list of backups. */
 	backup_list = catalog_get_backup_list(0);
diff --git a/pg_probackup.h b/pg_probackup.h
@@ -300,7 +300,7 @@ extern parray *catalog_get_backup_list(time_t backup_id);
 extern pgBackup *catalog_get_last_data_backup(parray *backup_list,
 											  TimeLineID tli);
 
-extern void catalog_lock(bool check_catalog, pid_t *run_pid);
+extern void catalog_lock(bool check_catalog);
 
 extern void pgBackupWriteConfigSection(FILE *out, pgBackup *backup);
 extern void pgBackupWriteResultSection(FILE *out, pgBackup *backup);
diff --git a/restore.c b/restore.c
@@ -106,7 +106,7 @@ do_restore(time_t backup_id,
 	elog(LOG, "restore start");
 
 	/* get exclusive lock of backup catalog */
-	catalog_lock(false, NULL);
+	catalog_lock(false);
 
 	/* confirm the PostgreSQL server is not running */
 	if (is_pg_running())
diff --git a/show.c b/show.c
@@ -42,17 +42,6 @@ do_show(time_t backup_id)
 			return 0;
 		}
 
-		/* Fix backup status */
-		if (backup->status == BACKUP_STATUS_RUNNING)
-		{
-			catalog_lock(false, &run_pid);
-			if (run_pid == 0)
-			{
-				backup->status = BACKUP_STATUS_ERROR;
-				pgBackupWriteIni(backup);
-			}
-		}
-
 		show_backup_detail(stdout, backup);
 
 		/* cleanup */
@@ -198,7 +187,6 @@ static void
 show_backup_list(FILE *out, parray *backup_list)
 {
 	int			i;
-	pid_t		run_pid = -1;
 
 	/* show header */
 	fputs("=========================================================================================\n", out);
@@ -214,19 +202,6 @@ show_backup_list(FILE *out, parray *backup_list)
 		char		duration[20] = "----";
 		char		data_bytes_str[10] = "----";
 
-		/* Fix backup status */
-		if (backup->status == BACKUP_STATUS_RUNNING)
-		{
-			if (run_pid == -1)
-				catalog_lock(false, &run_pid);
-
-			if (run_pid == 0 || i + 1 < parray_num(backup_list))
-				backup->status = BACKUP_STATUS_ERROR;
-
-			if (run_pid == 0)
-				pgBackupWriteIni(backup);
-		}
-
 		if (backup->recovery_time != (time_t) 0)
 			time2iso(timestamp, lengthof(timestamp), backup->recovery_time);
 		if (backup->end_time != (time_t) 0)
diff --git a/validate.c b/validate.c
@@ -41,7 +41,7 @@ do_validate(time_t backup_id,
 	bool		success_validate,
 				need_validate_wal = true;
 
-	catalog_lock(false, NULL);
+	catalog_lock(false);
 
 	rt = checkIfCreateRecoveryConf(target_time, target_xid, target_inclusive);
 	if (rt == NULL)
