JSCBC-1354: Update Bucket Mangement tests to handle new numVBuckets

setting

Changes
=======
* Updated bucket management tests to check for server version and update
  expected BucketSettings values accordingly.
* Updated bucketmanager.ts to fix linting issue.

Change-Id: Iafe59c4746c7b35f0a26499845c9b614e53c5a84
Reviewed-on: https://review.couchbase.org/c/couchnode/+/229390
Reviewed-by: Mateusz <[email protected]>
Tested-by: Jared Casey <[email protected]>

Author: thejcfactor

lib/bucketmanager.ts

@@ -228,7 +228,7 @@ export interface IBucketSettings {
   historyRetentionDuration?: number
 
   /**
-   * Specifies the number of vBuckets in this bucket
+   * Specifies the number of vBuckets in this bucket.
    */
   numVBuckets?: number
 
@@ -342,7 +342,7 @@ export class BucketSettings implements IBucketSettings {
   historyRetentionDuration?: number
 
   /**
-   * Specifies the number of vBuckets in this bucket
+   * Specifies the number of vBuckets in this bucket.
    */
   numVBuckets?: number
 

test/bucketmanager.test.js

@@ -58,6 +58,19 @@ describe('#bucketmanager', function () {
     if (!H.supportsFeature(H.Features.StorageBackend)) {
       expected.storageBackend = undefined
     }
+    if (H.supportsFeature(H.Features.NumVbucketsSetting)) {
+      expected.numVBuckets = 1024
+    } else {
+      expected.numVBuckets = undefined
+    }
+    if (H.isServerVersionAtLeast(8, 0, 0)) {
+      expected.storageBackend = 'magma'
+      expected.historyRetentionCollectionDefault = true
+      expected.historyRetentionBytes = 0
+      expected.historyRetentionDuration = 0
+      expected.replicaIndexes = undefined
+      expected.numVBuckets = 128
+    }
     assert.deepStrictEqual(res, expected)
   })
 
@@ -99,14 +112,31 @@ describe('#bucketmanager', function () {
   it('should return an InvalidArgument error when updating a couchstore bucket with history', async function () {
     H.skipIfMissingFeature(this, H.Features.BucketDedup)
 
+    let bucketName = testBucket
     var bmgr = H.c.buckets()
+    if (H.isServerVersionAtLeast(8, 0, 0)) {
+      bucketName = H.genTestKey()
+      await bmgr.createBucket({
+        name: bucketName,
+        flushEnabled: true,
+        ramQuotaMB: 256,
+        storageBackend: StorageBackend.Couchstore,
+      })
+      await H.consistencyUtils.waitUntilBucketPresent(bucketName)
+    }
+
     await H.throwsHelper(async () => {
       await bmgr.updateBucket({
-        name: testBucket,
+        name: bucketName,
         historyRetentionCollectionDefault: true,
         ramQuotaMB: 1024,
       })
     }, H.lib.InvalidArgumentError)
+
+    if (H.isServerVersionAtLeast(8, 0, 0)) {
+      await bmgr.dropBucket(bucketName)
+      await H.consistencyUtils.waitUntilBucketDropped(bucketName)
+    }
   })
 
   it('should error when trying to flush an unflushable bucket', async function () {
@@ -131,12 +161,16 @@ describe('#bucketmanager', function () {
 
   it('should successfully create a bucket with flush and replicaIndexes disabled', async function () {
     var bmgr = H.c.buckets()
-    await bmgr.createBucket({
+    const settings = {
       name: testBucket,
       flushEnabled: false,
       replicaIndexes: false,
       ramQuotaMB: 256,
-    })
+    }
+    if (H.isServerVersionAtLeast(8, 0, 0)) {
+      settings.storageBackend = StorageBackend.Couchstore
+    }
+    await bmgr.createBucket(settings)
     await H.consistencyUtils.waitUntilBucketPresent(testBucket)
 
     var res = await bmgr.getBucket(testBucket)
@@ -160,6 +194,11 @@ describe('#bucketmanager', function () {
     if (!H.supportsFeature(H.Features.StorageBackend)) {
       expected.storageBackend = undefined
     }
+    if (H.supportsFeature(H.Features.NumVbucketsSetting)) {
+      expected.numVBuckets = 1024
+    } else {
+      expected.numVBuckets = undefined
+    }
     assert.deepStrictEqual(res, expected)
 
     await bmgr.dropBucket(testBucket)
@@ -197,6 +236,11 @@ describe('#bucketmanager', function () {
       historyRetentionBytes: 2147483648,
       historyRetentionDuration: 13000,
     }
+    if (H.supportsFeature(H.Features.NumVbucketsSetting)) {
+      expected.numVBuckets = H.isServerVersionAtLeast(8, 0, 0) ? 128 : 1024
+    } else {
+      expected.numVBuckets = undefined
+    }
 
     assert.deepStrictEqual(res, expected)
   }).timeout(10 * 1000)
@@ -231,6 +275,11 @@ describe('#bucketmanager', function () {
       historyRetentionBytes: 0,
       historyRetentionDuration: 14000,
     }
+    if (H.supportsFeature(H.Features.NumVbucketsSetting)) {
+      expected.numVBuckets = H.isServerVersionAtLeast(8, 0, 0) ? 128 : 1024
+    } else {
+      expected.numVBuckets = undefined
+    }
 
     assert.deepStrictEqual(res, expected)
 

test/harness.js

@@ -48,6 +48,7 @@ const ServerFeatures = {
   ScopeEventingFunctionManagement: 'scope_eventing_function_management',
   BinaryTransactions: 'binary_transactions',
   ServerGroups: 'server_groups',
+  NumVbucketsSetting: 'num_vbuckets_setting',
 }
 
 class ServerVersion {
@@ -409,6 +410,7 @@ class Harness {
         return !this._version.isMock && this._version.isAtLeast(7, 6, 0)
       case ServerFeatures.BinaryTransactions:
       case ServerFeatures.ServerGroups:
+      case ServerFeatures.NumVbucketsSetting:
         return !this._version.isMock && this._version.isAtLeast(7, 6, 2)
     }
 
@@ -421,6 +423,10 @@ class Harness {
     }
   }
 
+  isServerVersionAtLeast(major, minor, patch) {
+    return this._version.isAtLeast(major, minor, patch)
+  }
+
   skipIfMissingFeature(test, feature) {
     if (!this.supportsFeature(feature)) {
       /* eslint-disable-next-line mocha/no-skipped-tests */