db/pgbackrest
1
0
Fork 0
mirror of https://github.com/pgbackrest/pgbackrest.git synced 2025-11-06 08:49:29 +02:00
Code Issues Releases Activity

Update 32-bit CI host to Debian 10 from Ubuntu 18.04.

Browse Source 
Ubuntu 18.04 will be EOL before the next release, so update to the oldest available Debian version.

Also fix one incorrect return value type, a test cast, and adjust some test timeouts.
This commit is contained in:
David Steele
2023-04-06 08:22:14 +04:00
parent a9f39857cf
commit ff98636e41
9 changed files with 55 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
.github/workflows/test.yml vendored
View File

@@ -29,13 +29,13 @@ jobs:
matrix: matrix:
include: include:
# All unit tests (without coverage) for 32-bit # All unit tests (without coverage) for 32-bit
- param: test --vm=u18 --param=no-performance --param=c-only - param: test --vm=d10 --param=no-performance --param=c-only
# All integration tests for 32-bit # All integration tests for 32-bit
- param: test --vm=u18 --param=module=mock --param=module=real - param: test --vm=d10 --param=module=mock --param=module=real
# Debian/Ubuntu documentation # Debian/Ubuntu documentation
- param: doc --vm=u18 - param: doc --vm=u20
# All integration tests # All integration tests
- param: test --vm=u22 --param=build-package --param=module=mock --param=module=real - param: test --vm=u22 --param=build-package --param=module=mock --param=module=real

2
doc/release.pl
View File

@@ -248,7 +248,7 @@ eval
} }
# Generate deployment docs for Debian # Generate deployment docs for Debian
if (!defined($strVm) || $strVm eq VM_U18) if (!defined($strVm) || $strVm eq VM_U20)
{ {
&log(INFO, "Generate Debian/Ubuntu documentation"); &log(INFO, "Generate Debian/Ubuntu documentation");

2
src/info/manifest.c
View File

@@ -814,7 +814,7 @@ manifestBuildBlockIncrSize(const ManifestBuildData *const buildData, const Manif
} }
} }
FUNCTION_TEST_RETURN(UINT64, result); FUNCTION_TEST_RETURN(SIZE, result);
} }
// Get checksum size for a block size. Since these checksums are used to determine if a block has changed (not for corruption) they // Get checksum size for a block size. Since these checksums are used to determine if a block has changed (not for corruption) they

5
test/container.yaml
View File

@@ -12,9 +12,12 @@
# - docker login -u pgbackrest # - docker login -u pgbackrest
# - VM=XXX;DATE=YYYYMMDDX;BASE=pgbackrest/test:${VM?}-base;docker tag ${BASE?} ${BASE?}-${DATE?} && docker push ${BASE?}-${DATE?} # - VM=XXX;DATE=YYYYMMDDX;BASE=pgbackrest/test:${VM?}-base;docker tag ${BASE?} ${BASE?}-${DATE?} && docker push ${BASE?}-${DATE?}
# ********************************************************************************************************************************** # **********************************************************************************************************************************
20230405A:
x86_64:
d10: 01a943f8d68ee5bbb2a5ee10cc474925c6cc0cde
20221220A: 20221220A:
x86_64: x86_64:
u18: 4ab629c57c4be9d5e0c3b6a23d878ea01b6c70f9
u20: 2db467d873c0aff06335592c8a22b8441b5c6440 u20: 2db467d873c0aff06335592c8a22b8441b5c6440
u22: 165882634c773173470021ce992a53258a84bbbf u22: 165882634c773173470021ce992a53258a84bbbf

56
test/lib/pgBackRestTest/Common/VmTest.pm
View File

@@ -76,21 +76,21 @@ use constant VM_ALL => 'all';
use constant VM_NONE => 'none'; use constant VM_NONE => 'none';
push @EXPORT, qw(VM_NONE); push @EXPORT, qw(VM_NONE);
use constant VM_D10 => 'd10';
push @EXPORT, qw(VM_D10);
use constant VM_RH7 => 'rh7'; use constant VM_RH7 => 'rh7';
push @EXPORT, qw(VM_RH7); push @EXPORT, qw(VM_RH7);
use constant VM_RH8 => 'rh8'; use constant VM_RH8 => 'rh8';
push @EXPORT, qw(VM_RH8); push @EXPORT, qw(VM_RH8);
use constant VM_F36 => 'f36'; use constant VM_F36 => 'f36';
push @EXPORT, qw(VM_F36); push @EXPORT, qw(VM_F36);
use constant VM_U18 => 'u18';
push @EXPORT, qw(VM_U18);
use constant VM_U20 => 'u20'; use constant VM_U20 => 'u20';
push @EXPORT, qw(VM_U20); push @EXPORT, qw(VM_U20);
use constant VM_U22 => 'u22'; use constant VM_U22 => 'u22';
push @EXPORT, qw(VM_U22); push @EXPORT, qw(VM_U22);
# VM aliases for run matrices (numbered oldest to newest) # VM aliases for run matrices (numbered oldest to newest)
use constant VM2 => VM_U18; use constant VM2 => VM_D10;
push @EXPORT, qw(VM2); push @EXPORT, qw(VM2);
use constant VM3 => VM_RH7; use constant VM3 => VM_RH7;
push @EXPORT, qw(VM3); push @EXPORT, qw(VM3);
@@ -124,6 +124,31 @@ my $oyVm =
], ],
}, },
# Debian 10
&VM_D10 =>
{
&VM_OS_BASE => VM_OS_BASE_DEBIAN,
&VM_IMAGE => 'i386/debian:10',
&VM_ARCH => VM_ARCH_I386,
&VMDEF_PGSQL_BIN => '/usr/lib/postgresql/{[version]}/bin',
&VMDEF_WITH_ZST => true,
&VM_DB =>
[
PG_VERSION_93,
PG_VERSION_94,
PG_VERSION_95,
PG_VERSION_96,
],
&VM_DB_TEST =>
[
PG_VERSION_93,
PG_VERSION_94,
],
},
# RHEL 7 # RHEL 7
&VM_RH7 => &VM_RH7 =>
{ {
@@ -181,31 +206,6 @@ my $oyVm =
], ],
}, },
# Ubuntu 18.04
&VM_U18 =>
{
&VM_OS_BASE => VM_OS_BASE_DEBIAN,
&VM_IMAGE => 'i386/ubuntu:18.04',
&VM_ARCH => VM_ARCH_I386,
&VMDEF_PGSQL_BIN => '/usr/lib/postgresql/{[version]}/bin',
&VMDEF_WITH_ZST => true,
&VM_DB =>
[
PG_VERSION_93,
PG_VERSION_94,
PG_VERSION_95,
PG_VERSION_96,
],
&VM_DB_TEST =>
[
PG_VERSION_93,
PG_VERSION_94,
],
},
# Ubuntu 20.04 # Ubuntu 20.04
&VM_U20 => &VM_U20 =>
{ {

8
test/src/common/harnessProtocol.c
View File

@@ -230,8 +230,8 @@ protocolRemoteExec(
// Run server with provided handlers // Run server with provided handlers
String *name = strNewFmt(PROTOCOL_SERVICE_REMOTE "-shim-%u", processId); String *name = strNewFmt(PROTOCOL_SERVICE_REMOTE "-shim-%u", processId);
ProtocolServer *server = protocolServerNew( ProtocolServer *server = protocolServerNew(
name, PROTOCOL_SERVICE_REMOTE_STR, ioFdReadNewOpen(name, pipeWrite[0], 5000), name, PROTOCOL_SERVICE_REMOTE_STR, ioFdReadNewOpen(name, pipeWrite[0], 10000),
ioFdWriteNewOpen(name, pipeRead[1], 5000)); ioFdWriteNewOpen(name, pipeRead[1], 10000));
protocolServerProcess(server, NULL, hrnProtocolStatic.remoteHandlerList, hrnProtocolStatic.remoteHandlerListSize); protocolServerProcess(server, NULL, hrnProtocolStatic.remoteHandlerList, hrnProtocolStatic.remoteHandlerListSize);
// Put an end message here to sync with the client to ensure that coverage data is written before exiting // Put an end message here to sync with the client to ensure that coverage data is written before exiting
@@ -248,8 +248,8 @@ protocolRemoteExec(
// Create protocol object // Create protocol object
helper->client = protocolClientNew( helper->client = protocolClientNew(
strNewFmt(PROTOCOL_SERVICE_REMOTE "-%u shim protocol", processId), PROTOCOL_SERVICE_REMOTE_STR, strNewFmt(PROTOCOL_SERVICE_REMOTE "-%u shim protocol", processId), PROTOCOL_SERVICE_REMOTE_STR,
ioFdReadNewOpen(strNewFmt(PROTOCOL_SERVICE_REMOTE "-%u shim protocol read", processId), pipeRead[0], 5000), ioFdReadNewOpen(strNewFmt(PROTOCOL_SERVICE_REMOTE "-%u shim protocol read", processId), pipeRead[0], 10000),
ioFdWriteNewOpen(strNewFmt(PROTOCOL_SERVICE_REMOTE "-%u shim protocol write", processId), pipeWrite[1], 5000)); ioFdWriteNewOpen(strNewFmt(PROTOCOL_SERVICE_REMOTE "-%u shim protocol write", processId), pipeWrite[1], 10000));
// Send one noop to catch any errors that might happen after the greeting // Send one noop to catch any errors that might happen after the greeting
protocolClientNoOp(helper->client); protocolClientNoOp(helper->client);

20
test/src/module/command/remoteTest.c
View File

@@ -48,8 +48,8 @@ testRun(void)
{ {
ProtocolClient *client = protocolClientNew( ProtocolClient *client = protocolClientNew(
STRDEF("test"), PROTOCOL_SERVICE_REMOTE_STR, STRDEF("test"), PROTOCOL_SERVICE_REMOTE_STR,
ioFdReadNewOpen(STRDEF("server read"), HRN_FORK_PARENT_READ_FD(0), 2000), ioFdReadNewOpen(STRDEF("server read"), HRN_FORK_PARENT_READ_FD(0), 5000),
ioFdWriteNewOpen(STRDEF("server write"), HRN_FORK_PARENT_WRITE_FD(0), 2000)); ioFdWriteNewOpen(STRDEF("server write"), HRN_FORK_PARENT_WRITE_FD(0), 5000));
protocolClientNoOp(client); protocolClientNoOp(client);
protocolClientFree(client); protocolClientFree(client);
} }
@@ -85,8 +85,8 @@ testRun(void)
client, client,
protocolClientNew( protocolClientNew(
STRDEF("test"), PROTOCOL_SERVICE_REMOTE_STR, STRDEF("test"), PROTOCOL_SERVICE_REMOTE_STR,
ioFdReadNewOpen(STRDEF("server read"), HRN_FORK_PARENT_READ_FD(0), 2000), ioFdReadNewOpen(STRDEF("server read"), HRN_FORK_PARENT_READ_FD(0), 5000),
ioFdWriteNewOpen(STRDEF("server write"), HRN_FORK_PARENT_WRITE_FD(0), 2000)), ioFdWriteNewOpen(STRDEF("server write"), HRN_FORK_PARENT_WRITE_FD(0), 5000)),
"create client"); "create client");
protocolClientNoOp(client); protocolClientNoOp(client);
protocolClientFree(client); protocolClientFree(client);
@@ -122,8 +122,8 @@ testRun(void)
client, client,
protocolClientNew( protocolClientNew(
STRDEF("test"), PROTOCOL_SERVICE_REMOTE_STR, STRDEF("test"), PROTOCOL_SERVICE_REMOTE_STR,
ioFdReadNewOpen(STRDEF("server read"), HRN_FORK_PARENT_READ_FD(0), 2000), ioFdReadNewOpen(STRDEF("server read"), HRN_FORK_PARENT_READ_FD(0), 5000),
ioFdWriteNewOpen(STRDEF("server write"), HRN_FORK_PARENT_WRITE_FD(0), 2000)), "new client"); ioFdWriteNewOpen(STRDEF("server write"), HRN_FORK_PARENT_WRITE_FD(0), 5000)), "new client");
TEST_ERROR( TEST_ERROR(
protocolClientNoOp(client), PathCreateError, protocolClientNoOp(client), PathCreateError,
@@ -164,8 +164,8 @@ testRun(void)
client, client,
protocolClientNew( protocolClientNew(
STRDEF("test"), PROTOCOL_SERVICE_REMOTE_STR, STRDEF("test"), PROTOCOL_SERVICE_REMOTE_STR,
ioFdReadNewOpen(STRDEF("server read"), HRN_FORK_PARENT_READ_FD(0), 2000), ioFdReadNewOpen(STRDEF("server read"), HRN_FORK_PARENT_READ_FD(0), 5000),
ioFdWriteNewOpen(STRDEF("server write"), HRN_FORK_PARENT_WRITE_FD(0), 2000)), ioFdWriteNewOpen(STRDEF("server write"), HRN_FORK_PARENT_WRITE_FD(0), 5000)),
"create client"); "create client");
protocolClientNoOp(client); protocolClientNoOp(client);
@@ -205,8 +205,8 @@ testRun(void)
client, client,
protocolClientNew( protocolClientNew(
STRDEF("test"), PROTOCOL_SERVICE_REMOTE_STR, STRDEF("test"), PROTOCOL_SERVICE_REMOTE_STR,
ioFdReadNewOpen(STRDEF("server read"), HRN_FORK_PARENT_READ_FD(0), 2000), ioFdReadNewOpen(STRDEF("server read"), HRN_FORK_PARENT_READ_FD(0), 5000),
ioFdWriteNewOpen(STRDEF("server write"), HRN_FORK_PARENT_WRITE_FD(0), 2000)), "new client"); ioFdWriteNewOpen(STRDEF("server write"), HRN_FORK_PARENT_WRITE_FD(0), 5000)), "new client");
TEST_ERROR(protocolClientNoOp(client), StopError, "raised from test: stop file exists for all stanzas"); TEST_ERROR(protocolClientNoOp(client), StopError, "raised from test: stop file exists for all stanzas");

2
test/src/module/command/restoreTest.c
View File

@@ -2693,7 +2693,7 @@ testRun(void)
ioWrite(write, fileUnused); ioWrite(write, fileUnused);
ioWriteClose(write); ioWriteClose(write);
size_t fileUnusedMapSize = pckReadU64P(ioFilterGroupResultP(ioWriteFilterGroup(write), BLOCK_INCR_FILTER_TYPE)); size_t fileUnusedMapSize = (size_t)pckReadU64P(ioFilterGroupResultP(ioWriteFilterGroup(write), BLOCK_INCR_FILTER_TYPE));
Buffer *fileUsed = bufDup(fileUnused); Buffer *fileUsed = bufDup(fileUnused);
memset(bufPtr(fileUsed), 3, 8192); memset(bufPtr(fileUsed), 3, 8192);

6
test/src/module/storage/gcsTest.c
View File

@@ -291,20 +291,20 @@ testRun(void)
HRN_FORK_BEGIN() HRN_FORK_BEGIN()
{ {
HRN_FORK_CHILD_BEGIN(.prefix = "gcs server", .timeout = 5000) HRN_FORK_CHILD_BEGIN(.prefix = "gcs server", .timeout = 10000)
{ {
TEST_RESULT_VOID(hrnServerRunP(HRN_FORK_CHILD_READ(), hrnServerProtocolTls, .port = testPort), "gcs server run"); TEST_RESULT_VOID(hrnServerRunP(HRN_FORK_CHILD_READ(), hrnServerProtocolTls, .port = testPort), "gcs server run");
} }
HRN_FORK_CHILD_END(); HRN_FORK_CHILD_END();
HRN_FORK_CHILD_BEGIN(.prefix = "auth server", .timeout = 5000) HRN_FORK_CHILD_BEGIN(.prefix = "auth server", .timeout = 10000)
{ {
TEST_RESULT_VOID( TEST_RESULT_VOID(
hrnServerRunP(HRN_FORK_CHILD_READ(), hrnServerProtocolTls, .port = testPortAuth), "auth server run"); hrnServerRunP(HRN_FORK_CHILD_READ(), hrnServerProtocolTls, .port = testPortAuth), "auth server run");
} }
HRN_FORK_CHILD_END(); HRN_FORK_CHILD_END();
HRN_FORK_CHILD_BEGIN(.prefix = "meta server", .timeout = 15000) HRN_FORK_CHILD_BEGIN(.prefix = "meta server", .timeout = 30000)
{ {
TEST_RESULT_VOID( TEST_RESULT_VOID(
hrnServerRunP(HRN_FORK_CHILD_READ(), hrnServerProtocolSocket, .port = testPortMeta), "meta server run"); hrnServerRunP(HRN_FORK_CHILD_READ(), hrnServerProtocolSocket, .port = testPortMeta), "meta server run");