From b96be912d9d67ddc2113fa00aefd126c8917f01a Mon Sep 17 00:00:00 2001 From: Charles Dixon Date: Thu, 14 Sep 2023 16:31:37 +0100 Subject: [PATCH] Pick up bucket management fixes This change contains changes for ING-565, ING-564, ING-562, ING-561 --- contrib/gocbcorex | 2 +- contrib/protostellar | 2 +- gateway/dataimpl/server_v1/helpers.go | 15 +++++++++++---- 3 files changed, 13 insertions(+), 6 deletions(-) diff --git a/contrib/gocbcorex b/contrib/gocbcorex index a4534856..0df0e882 160000 --- a/contrib/gocbcorex +++ b/contrib/gocbcorex @@ -1 +1 @@ -Subproject commit a4534856a17bdd7371d2ff91638666fd0a9d15e8 +Subproject commit 0df0e88256b118b7a0536389a38f2a6ebf208825 diff --git a/contrib/protostellar b/contrib/protostellar index 40b90822..06ba503c 160000 --- a/contrib/protostellar +++ b/contrib/protostellar @@ -1 +1 @@ -Subproject commit 40b90822b38c1a288dae95a5facf9da0a73cc980 +Subproject commit 06ba503c3e30ee6e9e39f5cfa2b3f1a0a72c9211 diff --git a/gateway/dataimpl/server_v1/helpers.go b/gateway/dataimpl/server_v1/helpers.go index e345d996..b8c5604f 100644 --- a/gateway/dataimpl/server_v1/helpers.go +++ b/gateway/dataimpl/server_v1/helpers.go @@ -208,15 +208,22 @@ func compressionModeToCbmgmtx(cm admin_bucket_v1.CompressionMode) (cbmgmtx.Compr return cbmgmtx.CompressionMode(""), status.New(codes.InvalidArgument, "invalid compression mode specified") } -func storageBackendFromCbmgmtx(sb cbmgmtx.StorageBackend) (admin_bucket_v1.StorageBackend, *status.Status) { +func storageBackendFromCbmgmtx(sb cbmgmtx.StorageBackend) (*admin_bucket_v1.StorageBackend, *status.Status) { switch sb { case cbmgmtx.StorageBackendCouchstore: - return admin_bucket_v1.StorageBackend_STORAGE_BACKEND_COUCHSTORE, nil + backend := admin_bucket_v1.StorageBackend_STORAGE_BACKEND_COUCHSTORE + return &backend, nil case cbmgmtx.StorageBackendMagma: - return admin_bucket_v1.StorageBackend_STORAGE_BACKEND_MAGMA, nil + backend := admin_bucket_v1.StorageBackend_STORAGE_BACKEND_MAGMA + return &backend, nil + case cbmgmtx.StorageBackendUnset: + return nil, nil + case "undefined": + // "undefined is returned by some server versions for memcached buckets. + return nil, nil } - return admin_bucket_v1.StorageBackend(0), status.New(codes.Internal, "invalid storage backend received") + return nil, status.New(codes.Internal, "invalid storage backend received") } func storageBackendToCbmgmtx(sb admin_bucket_v1.StorageBackend) (cbmgmtx.StorageBackend, *status.Status) {