Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
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
44 changes: 37 additions & 7 deletions .github/workflows/tests.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -242,6 +242,7 @@ jobs:
cache-to: type=gha,mode=max,scope=mongodb

multiple-backend:
if: false # CLDSRV-992 stress: unrelated job
runs-on: ubuntu-24.04
needs: build
env:
Expand Down Expand Up @@ -301,6 +302,7 @@ jobs:
if: always()

mongo-v0-ft-tests:
if: false # CLDSRV-992 stress: unrelated job
runs-on: ubuntu-24.04
needs: build
env:
Expand Down Expand Up @@ -360,6 +362,7 @@ jobs:
if: always()

mongo-v1-ft-tests:
if: false # CLDSRV-992 stress: unrelated job
runs-on: ubuntu-24.04
needs: build
env:
Expand Down Expand Up @@ -424,6 +427,7 @@ jobs:
# All tests use non federation images

file-ft-tests:
if: false # CLDSRV-992 stress: unrelated job
strategy:
matrix:
include:
Expand Down Expand Up @@ -494,17 +498,39 @@ jobs:
# Configure and run as Integration run S3C tests
s3c-ft-tests:
strategy:
fail-fast: false
matrix:
include:
- vformat: v0
- vformat: v1
enable-null-compat: ''
job-name: s3c-ft-tests-v1-1
- vformat: v1
enable-null-compat: ''
job-name: s3c-ft-tests-v1-2
- vformat: v1
enable-null-compat: ''
job-name: s3c-ft-tests-v1-3
- vformat: v1
enable-null-compat: ''
job-name: s3c-ft-tests-v1-4
- vformat: v1
enable-null-compat: ''
job-name: s3c-ft-tests-v1-5
- vformat: v1
enable-null-compat: ''
job-name: s3c-ft-tests-v1-6
- vformat: v1
enable-null-compat: ''
job-name: s3c-ft-tests-v1-7
- vformat: v1
enable-null-compat: ''
job-name: s3c-ft-tests-v1-8
- vformat: v1
enable-null-compat: ''
job-name: s3c-ft-tests-v0
- vformat: v0
enable-null-compat: 'true'
job-name: s3c-ft-tests-v0-null-compat
job-name: s3c-ft-tests-v1-9
- vformat: v1
enable-null-compat: ''
job-name: s3c-ft-tests-v1
job-name: s3c-ft-tests-v1-10
name: ${{ matrix.job-name }}
runs-on: ubuntu-24.04
needs: build
Expand Down Expand Up @@ -624,7 +650,7 @@ jobs:
utapi-v2-tests:
runs-on: ubuntu-24.04
needs: build
if: always()
if: false # CLDSRV-992 stress: unrelated job
env:
ENABLE_UTAPI_V2: t
S3BACKEND: mem
Expand Down Expand Up @@ -668,6 +694,7 @@ jobs:
if: always()

sur-tests:
if: false # CLDSRV-992 stress: unrelated job
runs-on: ubuntu-24.04
needs: build
strategy:
Expand Down Expand Up @@ -726,6 +753,7 @@ jobs:
if: always()

kmip-ft-tests:
if: false # CLDSRV-992 stress: unrelated job
runs-on: ubuntu-24.04
needs: build
env:
Expand Down Expand Up @@ -786,6 +814,7 @@ jobs:
if: always()

kmip-cluster-ft-tests:
if: false # CLDSRV-992 stress: unrelated job
runs-on: ubuntu-latest
needs: build
env:
Expand Down Expand Up @@ -849,6 +878,7 @@ jobs:

# This test with the final yarn run ft_sse_arn covers more code than the kmip tests
sse-kms-migration-tests:
if: false # CLDSRV-992 stress: unrelated job
strategy:
fail-fast: false # prevent cancel if one 1 matrix option fails
matrix:
Expand Down
55 changes: 36 additions & 19 deletions tests/functional/aws-node-sdk/test/object/multiObjectDelete.js
Original file line number Diff line number Diff line change
Expand Up @@ -68,29 +68,37 @@ describe('Multi-Object Delete Success', function success() {
objects.push(`${key}${i}`);
}
const parallel = 20;
const queued = [];
const putObjectWithLimit = async key => {
while (queued.length >= parallel) {
await Promise.race(queued);
queued.splice(0, queued.findIndex(p => p === queued[0]) + 1);
// Fixed pool draining a shared queue. The previous limiter peaked
// at 999 concurrent puts and abandoned the rest on first failure.
const pending = objects.slice();
const putErrors = [];
await Promise.all(Array.from({ length: parallel }, async () => {
while (pending.length > 0) {
const objectKey = pending.shift();
try {
await s3.putObject({
Bucket: bucketName,
Key: objectKey,
Body: 'somebody',
}).promise();
} catch (err) {
putErrors.push(err);
}
}
const result = s3.putObject({
Bucket: bucketName,
Key: key,
Body: 'somebody',
}).promise();
queued.push(result);
return result;
};
const putPromises = objects.map(key => putObjectWithLimit(key));
await Promise.all(putPromises);
}));
if (putErrors.length > 0) {
throw putErrors[0];
}
} catch (err) {
process.stdout.write(`Error creating objects: ${err}\n`);
throw err;
}
});

afterEach(() => s3.deleteBucket({ Bucket: bucketName }).promise());
afterEach(async () => {
await bucketUtil.empty(bucketName);
await s3.deleteBucket({ Bucket: bucketName }).promise();
});

it('should batch delete 1000 objects', done => {
const objects = createObjectsList(1000);
Expand Down Expand Up @@ -150,7 +158,10 @@ describe('Multi-Object Delete Error Responses', () => {
});
});

afterEach(() => s3.deleteBucket({ Bucket: bucketName }).promise());
afterEach(async () => {
await bucketUtil.empty(bucketName);
await s3.deleteBucket({ Bucket: bucketName }).promise();
});

it('should return error if request deletion of more than 1000 objects',
() => {
Expand Down Expand Up @@ -240,7 +251,10 @@ describe('Multi-Object Delete Access', function access() {
});
});

after(() => s3.deleteBucket({ Bucket: bucketName }).promise());
after(async () => {
await bucketUtil.empty(bucketName);
await s3.deleteBucket({ Bucket: bucketName }).promise();
});

it('should return access denied error for each object where no acl ' +
'permission', () => {
Expand Down Expand Up @@ -339,7 +353,10 @@ describeSkipIfCeph('Multi-Object Delete with Object Lock', () => {
});
});

after(() => s3.deleteBucket({ Bucket: bucketName }).promise());
after(async () => {
await bucketUtil.empty(bucketName);
await s3.deleteBucket({ Bucket: bucketName }).promise();
});

it('should not delete locked objects', () => {
const objects = createObjectsList(5, versionIds);
Expand Down
Loading