db/pgbackrest
1
0
Fork 0
mirror of https://github.com/pgbackrest/pgbackrest.git synced 2025-07-17 01:12:23 +02:00
Code Issues Releases Activity

Make archive-get info messages consistent between C and Perl implementations.

Browse Source 
The info messages were spread around and logged differently based on the execution path and in some cases logged nothing at all.

Temporarily track the async server status with a flag so that info messages are not output in the async process.  The async process will be refactored as a separate command to be exec'd in a future commit.
This commit is contained in:
David Steele
2018-09-11 12:30:48 -04:00
parent 6c1d48b018
commit 9e574a37dc
10 changed files with 44 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
test/src/module/archive/getTest.c
View File

@ -166,18 +166,7 @@ testRun(void)
harnessCfgLoad(strLstSize(argList), strLstPtr(argList));
TEST_RESULT_INT(cmdArchiveGet(), 1, "timeout getting WAL segment");
// Write out a bogus .error file to make sure it is ignored on the first loop
// -------------------------------------------------------------------------------------------------------------------------
// String *errorFile = storagePathNP(storageSpool(), strNew(STORAGE_SPOOL_ARCHIVE_IN "/000000010000000100000001.error"));
// storagePutNP(storageNewWriteNP(storageSpool(), errorFile), bufNewStr(strNew("25\n" BOGUS_STR)));
//
// TEST_ERROR(cmdArchiveGet(), AssertError, BOGUS_STR);
// unlink(strPtr(errorFile));
//
// // Wait for the lock to be released
// lockAcquire(cfgOptionStr(cfgOptLockPath), cfgOptionStr(cfgOptStanza), cfgLockType(), 30, true);
// lockRelease(true);
harnessLogResult("P00 INFO: unable to find 000000010000000100000001 in the archive");
// Check for missing WAL
// -------------------------------------------------------------------------------------------------------------------------
@ -188,7 +177,7 @@ testRun(void)
storageNewWriteNP(storageSpool(), strNewFmt(STORAGE_SPOOL_ARCHIVE_IN "/%s.ok", strPtr(walSegment))), NULL);
TEST_RESULT_VOID(cmdArchiveGet(), "successful get of missing WAL");
harnessLogResult("P00 INFO: unable to find WAL segment 000000010000000100000001");
harnessLogResult("P00 INFO: unable to find 000000010000000100000001 in the archive");
TEST_RESULT_BOOL(
storageExistsNP(storageSpool(), strNewFmt(STORAGE_SPOOL_ARCHIVE_IN "/%s.ok", strPtr(walSegment))), false,
@ -205,7 +194,7 @@ testRun(void)
bufNewStr(strNew("SHOULD-BE-A-REAL-WAL-FILE")));
TEST_RESULT_VOID(cmdArchiveGet(), "successful get");
harnessLogResult("P00 INFO: got WAL segment 000000010000000100000001 asynchronously");
harnessLogResult("P00 INFO: found 000000010000000100000001 in the archive");
TEST_RESULT_BOOL(storageExistsNP(storageTest, walFile), true, "check WAL segment was moved");
storageRemoveP(storageTest, walFile, .errorOnMissing = true);
@ -229,7 +218,7 @@ testRun(void)
bufNewStr(strNew("SHOULD-BE-A-REAL-WAL-FILE")));
TEST_RESULT_VOID(cmdArchiveGet(), "successful get");
harnessLogResult("P00 INFO: got WAL segment 000000010000000100000001 asynchronously");
harnessLogResult("P00 INFO: found 000000010000000100000001 in the archive");
TEST_RESULT_BOOL(storageExistsNP(storageTest, walFile), true, "check WAL segment was moved");
@ -244,6 +233,7 @@ testRun(void)
TEST_RESULT_VOID(lockClear(true), "clear lock");
TEST_RESULT_INT(cmdArchiveGet(), 1, "timeout waiting for lock");
harnessLogResult("P00 INFO: unable to find 000000010000000100000001 in the archive");
// -------------------------------------------------------------------------------------------------------------------------
strLstAddZ(argList, BOGUS_STR);