Skip to content

Commit a79a3c6

Browse files
benzekrimahabenzekrimaha
committed
Remove Ceph RadosGW from supported location types and capabilities
Issue: CLDSRV-825
1 parent ccb9542 commit a79a3c6

25 files changed

Lines changed: 103 additions & 89 deletions

File tree

‎lib/Config.js‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1874,7 +1874,12 @@ class Config extends EventEmitter {
18741874

18751875
if (config.capabilities) {
18761876
if (config.capabilities.locationTypes) {
1877-
this.supportedLocationTypes = new Set(config.capabilities.locationTypes);
1877+
// Ceph RadosGW is no longer supported; exclude from reported location types
1878+
const cephRadosGw = 'location-ceph-radosgw-s3-v1';
1879+
const types = Array.from(config.capabilities.locationTypes);
1880+
this.supportedLocationTypes = new Set(
1881+
types.filter(t => t !== cephRadosGw)
1882+
);
18781883
}
18791884
this.capabilities = config.capabilities;
18801885
}

‎lib/utilities/reportHandler.js‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,9 @@ function getCapabilities(cfg = config) {
7474
caps.locationTypeLocal &&= cfg.supportedLocationTypes.has('location-file-v1');
7575
}
7676

77+
// Ceph RadosGW is no longer supported; never report it
78+
caps.locationTypeCephRadosGW = false;
79+
7780
return caps;
7881
}
7982

‎tests/functional/aws-node-sdk/test/multipleBackend/delete/deleteAwsVersioning.js‎

Lines changed: 7 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -205,9 +205,8 @@ describeSkipIfNotMultiple('AWS backend delete object w. versioning: ' +
205205
key, versionId: 'null', resultType: deleteVersion },
206206
err => next(err, awsVerId)),
207207
(awsVerId, next) => {
208-
const wanted = 'NoSuchVersion';
209208
_awsGetAssertDeleted({ key,
210-
versionId: awsVerId, errorCode: wanted }, next);
209+
versionId: awsVerId, errorCode: 'NoSuchVersion' }, next);
211210
},
212211
], done);
213212
});
@@ -242,9 +241,8 @@ describeSkipIfNotMultiple('AWS backend delete object w. versioning: ' +
242241
key, versionId: 'null', resultType: deleteVersion },
243242
err => next(err, awsVerId)),
244243
(awsVerId, next) => {
245-
const wanted = 'NoSuchVersion';
246244
_awsGetAssertDeleted({ key,
247-
versionId: awsVerId, errorCode: wanted }, next);
245+
versionId: awsVerId, errorCode: 'NoSuchVersion' }, next);
248246
},
249247
], done);
250248
});
@@ -262,9 +260,8 @@ describeSkipIfNotMultiple('AWS backend delete object w. versioning: ' +
262260
key, versionId: s3VerId, resultType: deleteVersion },
263261
err => next(err, awsVerId)),
264262
(awsVerId, next) => {
265-
const wanted = 'NoSuchVersion';
266263
_awsGetAssertDeleted({ key,
267-
versionId: awsVerId, errorCode: wanted }, next);
264+
versionId: awsVerId, errorCode: 'NoSuchVersion' }, next);
268265
},
269266
], done);
270267
});
@@ -524,9 +521,8 @@ describeSkipIfNotMultiple('AWS backend delete object w. versioning: ' +
524521
(awsVid, next) => _getAssertDeleted(s3, { key,
525522
errorCode: 'NoSuchKey' }, () => next(null, awsVid)),
526523
(awsVerId, next) => {
527-
const wanted = 'NoSuchVersion';
528524
_awsGetAssertDeleted({ key,
529-
versionId: awsVerId, errorCode: wanted }, next);
525+
versionId: awsVerId, errorCode: 'NoSuchVersion' }, next);
530526
},
531527
], done);
532528
});
@@ -681,9 +677,8 @@ describeSkipIfNotMultiple('AWS backend delete multiple objects w. versioning: '
681677
key, versionId: 'null', resultType: deleteVersion },
682678
err => next(err, awsVerId)),
683679
(awsVerId, next) => {
684-
const wanted = 'NoSuchVersion';
685680
_awsGetAssertDeleted({ key,
686-
versionId: awsVerId, errorCode: wanted }, next);
681+
versionId: awsVerId, errorCode: 'NoSuchVersion' }, next);
687682
},
688683
], done);
689684
});
@@ -699,9 +694,8 @@ describeSkipIfNotMultiple('AWS backend delete multiple objects w. versioning: '
699694
key, versionId: 'null', resultType: deleteVersion },
700695
err => next(err, awsVerId)),
701696
(awsVerId, next) => {
702-
const wanted = 'NoSuchVersion';
703697
_awsGetAssertDeleted({ key,
704-
versionId: awsVerId, errorCode: wanted }, next);
698+
versionId: awsVerId, errorCode: 'NoSuchVersion' }, next);
705699
},
706700
], done);
707701
});
@@ -719,9 +713,8 @@ describeSkipIfNotMultiple('AWS backend delete multiple objects w. versioning: '
719713
key, versionId: s3VerId, resultType: deleteVersion },
720714
err => next(err, awsVerId)),
721715
(awsVerId, next) => {
722-
const wanted = 'NoSuchVersion';
723716
_awsGetAssertDeleted({ key,
724-
versionId: awsVerId, errorCode: wanted }, next);
717+
versionId: awsVerId, errorCode: 'NoSuchVersion' }, next);
725718
},
726719
], done);
727720
});

‎tests/functional/aws-node-sdk/test/multipleBackend/delete/deleteAzure.js‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ const {
1515
getAzureKeys,
1616
azureLocation,
1717
azureLocationMismatch,
18+
describeSkipIfNotMultiple,
1819
} = require('../utils');
1920

2021
const keyObject = 'deleteazure';
@@ -29,7 +30,7 @@ const nonExistingId = process.env.AWS_ON_AIR ?
2930
'MhhyTHhmZ4cxSi4Y9SMe5P7UJAz7HLJ9' :
3031
'3939393939393939393936493939393939393939756e6437';
3132

32-
describe.skip('Multiple backend delete object from Azure',
33+
describeSkipIfNotMultiple('Multiple backend delete object from Azure',
3334
function testSuite() {
3435
this.timeout(250000);
3536
withV4(sigCfg => {

‎tests/functional/aws-node-sdk/test/multipleBackend/delete/deleteGcp.js‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ const {
99
gcpLocation,
1010
gcpLocationMismatch,
1111
genUniqID,
12+
describeSkipIfNotMultiple,
1213
} = require('../utils');
1314

1415
const bucket = `deletegcp${genUniqID()}`;
@@ -19,7 +20,7 @@ const mismatchObject = `mismatchObject-${genUniqID()}`;
1920
const body = Buffer.from('I am a body', 'utf8');
2021
const bigBody = Buffer.alloc(10485760);
2122

22-
describe.skip('Multiple backend delete',
23+
describeSkipIfNotMultiple('Multiple backend delete',
2324
function testSuite() {
2425
this.timeout(120000);
2526
withV4(sigCfg => {

‎tests/functional/aws-node-sdk/test/multipleBackend/get/getAzure.js‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ const {
1212
getAzureContainerName,
1313
getAzureKeys,
1414
azureLocation,
15+
describeSkipIfNotMultiple,
1516
} = require('../utils');
1617

1718
const azureClient = getAzureClient();
@@ -23,7 +24,7 @@ const normalBody = Buffer.from('I am a body', 'utf8');
2324

2425
const azureTimeout = 10000;
2526

26-
describe.skip('Multiple backend get object from Azure',
27+
describeSkipIfNotMultiple('Multiple backend get object from Azure',
2728
function testSuite() {
2829
this.timeout(30000);
2930
withV4(sigCfg => {

‎tests/functional/aws-node-sdk/test/multipleBackend/get/getGcp.js‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ const {
88
gcpLocation,
99
gcpLocationMismatch,
1010
genUniqID,
11+
describeSkipIfNotMultiple,
1112
} = require('../utils');
1213

1314
const bucket = `getgcp${genUniqID()}`;
@@ -52,7 +53,7 @@ describe('Multiple backend get object', function testSuite() {
5253
});
5354
});
5455

55-
describe.skip('with objects in GCP', () => {
56+
describeSkipIfNotMultiple('with objects in GCP', () => {
5657
before(() => {
5758
process.stdout.write('Putting object to GCP\n');
5859
return s3.send(new PutObjectCommand({ Bucket: bucket, Key: gcpObject,
@@ -127,7 +128,7 @@ describe('Multiple backend get object', function testSuite() {
127128
});
128129
});
129130

130-
describe.skip('with bucketMatch set to false', () => {
131+
describeSkipIfNotMultiple('with bucketMatch set to false', () => {
131132
beforeEach(done => {
132133
s3.send(new PutObjectCommand({ Bucket: bucket, Key: mismatchObject, Body: body,
133134
Metadata: { 'scal-location-constraint': gcpLocationMismatch } })).then(() => {

‎tests/functional/aws-node-sdk/test/multipleBackend/initMPU/initMPUAzure.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,15 +10,15 @@ const {
1010
const withV4 = require('../../support/withV4');
1111
const BucketUtility = require('../../../lib/utility/bucket-util');
1212
const { azureLocation, getAzureContainerName,
13-
genUniqID } = require('../utils');
13+
genUniqID, describeSkipIfNotMultiple } = require('../utils');
1414

1515
const keyName = `somekey-${genUniqID()}`;
1616

1717
const azureContainerName = getAzureContainerName(azureLocation);
1818
let s3;
1919
let bucketUtil;
2020

21-
describe.skip('Initiate MPU to AZURE', () => {
21+
describeSkipIfNotMultiple('Initiate MPU to AZURE', () => {
2222
withV4(sigCfg => {
2323
beforeEach(() => {
2424
bucketUtil = new BucketUtility('default', sigCfg);

‎tests/functional/aws-node-sdk/test/multipleBackend/initMPU/initMPUGcp.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ const {
1111
const withV4 = require('../../support/withV4');
1212
const BucketUtility = require('../../../lib/utility/bucket-util');
1313
const { gcpClient, gcpBucketMPU, gcpLocation,
14-
genUniqID } = require('../utils');
14+
genUniqID, describeSkipIfNotMultiple } = require('../utils');
1515
const { createMpuKey } = arsenal.storage.data.external.GcpUtils;
1616

1717
const bucket = `initmpugcp${genUniqID()}`;
@@ -20,7 +20,7 @@ const keyName = `somekey-${genUniqID()}`;
2020
let s3;
2121
let bucketUtil;
2222

23-
describe.skip('Initiate MPU to GCP', () => {
23+
describeSkipIfNotMultiple('Initiate MPU to GCP', () => {
2424
withV4(sigCfg => {
2525
beforeEach(() => {
2626
bucketUtil = new BucketUtility('default', sigCfg);

‎tests/functional/aws-node-sdk/test/multipleBackend/listParts/azureListParts.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ const { CreateBucketCommand,
88
const withV4 = require('../../support/withV4');
99
const BucketUtility = require('../../../lib/utility/bucket-util');
1010
const { azureLocation, getAzureContainerName,
11-
genUniqID } = require('../utils');
11+
genUniqID, describeSkipIfNotMultiple } = require('../utils');
1212

1313
const azureContainerName = getAzureContainerName(azureLocation);
1414
const firstPartSize = 10;
@@ -19,7 +19,7 @@ const bodySecondPart = Buffer.alloc(secondPartSize);
1919
let bucketUtil;
2020
let s3;
2121

22-
describe.skip('List parts of MPU on Azure data backend',
22+
describeSkipIfNotMultiple('List parts of MPU on Azure data backend',
2323
() => {
2424
withV4(sigCfg => {
2525
beforeEach(function beforeEachFn() {

0 commit comments

Comments
 (0)