PGPRO-1918: Add more informative messages

Author: za-arthur

src/backup.c

@@ -978,7 +978,8 @@ do_backup(time_t start_time)
 	if (pgBackupCreateDir(&current))
 		elog(ERROR, "Cannot create backup directory");
 	if (!lock_backup(&current))
-		elog(ERROR, "Cannot lock backup directory");
+		elog(ERROR, "Cannot lock backup %s directory",
+			 base36enc(current.start_time));
 	write_backup(&current);
 
 	elog(LOG, "Backup destination is initialized");

src/catalog.c

@@ -433,8 +433,12 @@ catalog_lock_backup_list(parray *backup_list, int from_idx, int to_idx)
 	end_idx = Min(from_idx, to_idx);
 
 	for (i = start_idx; i >= end_idx; i--)
-		if (!lock_backup((pgBackup *) parray_get(backup_list, i)))
-			elog(ERROR, "Cannot lock backup directory");
+	{
+		pgBackup   *backup = (pgBackup *) parray_get(backup_list, i);
+		if (!lock_backup(backup))
+			elog(ERROR, "Cannot lock backup %s directory",
+				 base36enc(backup->start_time));
+	}
 }
 
 /*

src/delete.c

@@ -207,7 +207,11 @@ do_retention_purge(void)
 			 * backup.
 			 */
 			if (!lock_backup(backup))
+			{
+				elog(WARNING, "Cannot lock backup %s directory, skip purging",
+					 base36enc(backup->start_time));
 				continue;
+			}
 
 			/* Delete backup and update status to DELETED */
 			delete_backup_files(backup);

src/restore.c

@@ -318,7 +318,17 @@ do_restore_or_validate(time_t target_backup_id, pgRecoveryTarget *rt,
 
 			/* Do not interrupt, validate the next backup */
 			if (!lock_backup(tmp_backup))
-				continue;
+			{
+				if (is_restore)
+					elog(ERROR, "Cannot lock backup %s directory",
+						 base36enc(tmp_backup->start_time));
+				else
+				{
+					elog(WARNING, "Cannot lock backup %s directory, skip validation",
+						 base36enc(tmp_backup->start_time));
+					continue;
+				}
+			}
 
 			pgBackupValidate(tmp_backup);
 			/* After pgBackupValidate() only following backup

src/validate.c

@@ -444,7 +444,11 @@ do_validate_instance(void)
 
 		/* Do not interrupt, validate the next backup */
 		if (!lock_backup(current_backup))
+		{
+			elog(WARNING, "Cannot lock backup %s directory, skip validation",
+				 base36enc(current_backup->start_time));
 			continue;
+		}
 		/* Valiate backup files*/
 		pgBackupValidate(current_backup);
 
@@ -532,7 +536,11 @@ do_validate_instance(void)
 						{
 							/* Do not interrupt, validate the next backup */
 							if (!lock_backup(backup))
+							{
+								elog(WARNING, "Cannot lock backup %s directory, skip validation",
+									 base36enc(backup->start_time));
 								continue;
+							}
 							/* Revaliate backup files*/
 							pgBackupValidate(backup);
 

tests/locking.py

@@ -327,7 +327,7 @@ def test_locking_restore_locked(self):
         node.slow_start()
 
         # FULL
-        self.backup_node(backup_dir, 'node', node)
+        full_id = self.backup_node(backup_dir, 'node', node)
 
         # PAGE1
         backup_id = self.backup_node(backup_dir, 'node', node, backup_type='page')
@@ -353,7 +353,7 @@ def test_locking_restore_locked(self):
                     repr(self.output), self.cmd))
         except ProbackupException as e:
             self.assertTrue(
-                "Insert expected error message" in e.message,
+                "ERROR: Cannot lock backup {0} directory\n".format(full_id) in e.message,
                 '\n Unexpected Error Message: {0}\n CMD: {1}'.format(
                     repr(e.message), self.cmd))