Skip to content
This repository was archived by the owner on Mar 4, 2026. It is now read-only.

chore: test backups systes tests #2366

Merged
gcf-merge-on-green merged 14 commits into from
Aug 25, 2025
Merged

chore: test backups systes tests #2366

Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
a9532a3
chore: test backups systes tests
surbhigarg92 Jul 30, 2025
cf02fcd
refactor backup tests
surbhigarg92 Aug 4, 2025
318fb56
review comments
surbhigarg92 Aug 19, 2025
e0e19dc
review comments
surbhigarg92 Aug 20, 2025
68776da
review comments
surbhigarg92 Aug 20, 2025
ffda651
chore: add mux env for r/w to enable kokoro pipeline (#2390)
alkatrivedi Aug 20, 2025
26a6023
chore: enable integration test against mux as required (#2391)
alkatrivedi Aug 20, 2025
e86ae24
review comments
surbhigarg92 Aug 21, 2025
5aa496a
Merge branch 'main' into test_backup
surbhigarg92 Aug 21, 2025
d3222bf
Merge branch 'main' into test_backup
surbhigarg92 Aug 25, 2025
6d4710c
Merge branch 'main' into test_backup
surbhigarg92 Aug 25, 2025
8d57224
🦉 Updates from OwlBot post-processor
gcf-owl-bot[bot] Aug 25, 2025
76024b8
review
surbhigarg92 Aug 25, 2025
9cfe5f9
Merge branch 'main' into test_backup
surbhigarg92 Aug 25, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
160 changes: 54 additions & 106 deletions system-test/spanner.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3339,24 +3339,13 @@ describe('Spanner', () => {
const SKIP_POSTGRESQL_BACKUP_TESTS = true;

let googleSqlDatabase1: Database;
let googleSqlDatabase2: Database;
let restoreDatabase: Database;

let googleSqlRestoreDatabase: Database;
let postgreSqlRestoreDatabase: Database;
let postgreSqlDatabase1: Database;
let postgreSqlDatabase2: Database;

let googleSqlBackup1: Backup;
let googleSqlBackup2: Backup;

let postgreSqlBackup1: Backup;
let postgreSqlBackup2: Backup;

const googleSqlBackup1Name = generateName('backup');
const googleSqlBackup2Name = generateName('backup');

const postgreSqlBackup1Name = generateName('pg-backup');
const postgreSqlBackup2Name = generateName('pg-backup');

const backupExpiryDate = futureDateByHours(12);
const backupExpiryPreciseDate = Spanner.timestamp(backupExpiryDate);

Expand All @@ -3375,58 +3364,14 @@ describe('Spanner', () => {
Name: generateName('name'),
});

await postgreSqlDatabase1.table(TABLE_NAME).insert({
SingerId: generateName('id'),
Name: generateName('name'),
});

// Create a second database since only one pending backup can be created
// per database.
const googleSqlDatabase2Id = generateName('database');
await creategSQLDatabase(googleSqlDatabase2Id, null);
googleSqlDatabase2 = instance.database(googleSqlDatabase2Id);
RESOURCES_TO_CLEAN.push(googleSqlDatabase2);

if (!SKIP_POSTGRESQL_BACKUP_TESTS) {
const postgreSqlDatabase2Id = generateName('pg-db');
await createPostgresDatabase(postgreSqlDatabase2Id);
postgreSqlDatabase2 = instance.database(postgreSqlDatabase2Id);
RESOURCES_TO_CLEAN.push(postgreSqlDatabase2);
}

// Create backups.
await createBackup(
googleSqlDatabase1,
googleSqlBackup1Name,
backupExpiryDate,
);
await createBackup(
googleSqlDatabase2,
googleSqlBackup2Name,
backupExpiryDate,
);

googleSqlBackup1 = instance.backup(googleSqlBackup1Name);
googleSqlBackup2 = instance.backup(googleSqlBackup2Name);

RESOURCES_TO_CLEAN.push(...[googleSqlBackup1, googleSqlBackup2]);

if (!SKIP_POSTGRESQL_BACKUP_TESTS) {
await createBackup(
postgreSqlDatabase1,
postgreSqlBackup1Name,
backupExpiryDate,
);
await createBackup(
postgreSqlDatabase2,
postgreSqlBackup2Name,
backupExpiryDate,
);

await postgreSqlDatabase1.table(TABLE_NAME).insert({
SingerId: generateName('id'),
Name: generateName('name'),
});
postgreSqlBackup1 = instance.backup(postgreSqlBackup1Name);
postgreSqlBackup2 = instance.backup(postgreSqlBackup2Name);

RESOURCES_TO_CLEAN.push(...[postgreSqlBackup1, postgreSqlBackup2]);
}
});

Expand Down Expand Up @@ -3463,6 +3408,12 @@ describe('Spanner', () => {
};

it('GOOGLE_STANDARD_SQL should have completed a backup', async () => {
// Create backups.
await createBackup(
Comment thread
surbhigarg92 marked this conversation as resolved.
googleSqlDatabase1,
googleSqlBackup1Name,
backupExpiryDate,
);
await completedBackup(
googleSqlBackup1,
googleSqlBackup1Name,
Expand All @@ -3471,6 +3422,11 @@ describe('Spanner', () => {
});

it.skip('POSTGRESQL should have completed a backup', async () => {
await createBackup(
postgreSqlDatabase1,
postgreSqlBackup1Name,
backupExpiryDate,
);
await completedBackup(
postgreSqlBackup1,
postgreSqlBackup1Name,
Expand Down Expand Up @@ -3525,7 +3481,7 @@ describe('Spanner', () => {
backup => backup.formattedName_ === googleSqlBackup1.formattedName_,
),
);
if (!IS_EMULATOR_ENABLED && !SKIP_POSTGRESQL_BACKUP_TESTS) {
if (!SKIP_POSTGRESQL_BACKUP_TESTS) {
assert.ok(
backups.find(
backup =>
Expand All @@ -3540,47 +3496,29 @@ describe('Spanner', () => {
pageSize: 1,
gaxOptions: {autoPaginate: false},
});
const [page2] = await instance.getBackups({
pageSize: 1,
pageToken: resp1!.nextPageToken!,
gaxOptions: {autoPaginate: false},
});

let page3size = 2;
if (!IS_EMULATOR_ENABLED && !SKIP_POSTGRESQL_BACKUP_TESTS) {
page3size = 4;
let totalPageSize = 1;
if (!SKIP_POSTGRESQL_BACKUP_TESTS) {
totalPageSize = 2;
}
const [page3] = await instance.getBackups({
pageSize: page3size,
const [totalPages] = await instance.getBackups({
pageSize: totalPageSize,
gaxOptions: {autoPaginate: false},
});
assert.strictEqual(page1.length, 1);
assert.strictEqual(page2.length, 1);
assert.strictEqual(page3.length, page3size);
assert.notStrictEqual(page2[0].formattedName_, page1[0].formattedName_);
assert.strictEqual(totalPages.length, totalPageSize);
assert.ok(
page3.find(
totalPages.find(
backup => backup.formattedName_ === googleSqlBackup1.formattedName_,
),
);
Comment thread
surbhigarg92 marked this conversation as resolved.
assert.ok(
page3.find(
backup => backup.formattedName_ === googleSqlBackup2.formattedName_,
),
);
if (!IS_EMULATOR_ENABLED && !SKIP_POSTGRESQL_BACKUP_TESTS) {
if (!SKIP_POSTGRESQL_BACKUP_TESTS) {
assert.ok(
page3.find(
totalPages.find(
backup =>
backup.formattedName_ === postgreSqlBackup1.formattedName_,
),
);
assert.ok(
page3.find(
backup =>
backup.formattedName_ === postgreSqlBackup2.formattedName_,
),
);
}
});

Expand All @@ -3596,9 +3534,7 @@ describe('Spanner', () => {
// Wait for restore to complete.
await restoreOperation.promise();

restoreDatabase = instance.database(restoreDatabaseId);

RESOURCES_TO_CLEAN.push(restoreDatabase);
const restoreDatabase = instance.database(restoreDatabaseId);

const [databaseMetadata] = await restoreDatabase.getMetadata();
assert.ok(
Expand Down Expand Up @@ -3637,11 +3573,13 @@ describe('Spanner', () => {
filter: 'metadata.@type:RestoreDatabaseMetadata',
});
assert.strictEqual(restoreOperations.length, 1);

return restoreDatabase;
};

it('GOOGLE_STANDARD_SQL should restore a backup', async () => {
const googleSqlRestoreDatabaseId = generateName('database');
await restoreBackup(
googleSqlRestoreDatabase = await restoreBackup(
googleSqlRestoreDatabaseId,
googleSqlBackup1,
googleSqlDatabase1,
Expand All @@ -3650,7 +3588,7 @@ describe('Spanner', () => {

it.skip('POSTGRESQL should restore a backup', async () => {
const postgreSqlRestoreDatabaseId = generateName('pg-db');
await restoreBackup(
postgreSqlRestoreDatabase = await restoreBackup(
postgreSqlRestoreDatabaseId,
postgreSqlBackup1,
postgreSqlDatabase1,
Expand All @@ -3672,11 +3610,17 @@ describe('Spanner', () => {
};

it('GOOGLE_STANDARD_SQL should not be able to restore to an existing database', async () => {
await restoreExistingDatabaseFail(restoreDatabase, googleSqlBackup1);
await restoreExistingDatabaseFail(
googleSqlRestoreDatabase,
googleSqlBackup1,
);
});

it.skip('POSTGRESQL should not be able to restore to an existing database', async () => {
await restoreExistingDatabaseFail(restoreDatabase, postgreSqlBackup1);
await restoreExistingDatabaseFail(
postgreSqlRestoreDatabase,
postgreSqlBackup1,
);
});

const updateBackupExpiry = async backup1 => {
Expand Down Expand Up @@ -3746,14 +3690,6 @@ describe('Spanner', () => {
}
};

it('GOOGLE_STANDARD_SQL should delete backup', async () => {
await deleteBackup(googleSqlBackup2);
});

it.skip('POSTGRESQL should delete backup', async () => {
await deleteBackup(postgreSqlBackup2);
});

Comment thread
surbhigarg92 marked this conversation as resolved.
const listBackupOperations = async (backup1, database1) => {
// List operations and ensure operation for current backup exists.
// Without a filter.
Expand Down Expand Up @@ -3789,13 +3725,25 @@ describe('Spanner', () => {
);
};

it('GOOGLE_STANDARD_SQL should delete backup', async () => {
it('GOOGLE_STANDARD_SQL should list backup operations', async () => {
await listBackupOperations(googleSqlBackup1, googleSqlDatabase1);
});

it.skip('POSTGRESQL should delete backup', async () => {
it.skip('POSTGRESQL should list backup operations', async () => {
await listBackupOperations(postgreSqlBackup1, postgreSqlDatabase1);
});

it('GOOGLE_STANDARD_SQL should delete backups', async () => {
// Delete the restored database before deleting the backup, as backup deletion can fail if the restored database remains in the READY_OPTIMIZING state.
await googleSqlRestoreDatabase.delete();
await deleteBackup(googleSqlBackup1);
});

it.skip('POSTGRESQL should delete backups', async () => {
// Delete the restored database before deleting the backup, as backup deletion can fail if the restored database remains in the READY_OPTIMIZING state.
await postgreSqlRestoreDatabase.delete();
await deleteBackup(postgreSqlBackup1);
});
});

describe('Sessions', () => {
Expand Down
Loading