fix: avoid global writes for self managed sharding COMPASS-8579 (#6535)

* fix: avoid global writes for self managed sharding COMPASS_8579 * test: add tests
mongodb-js · Nov 28, 2024 · 9fec0b0 · 9fec0b0
1 parent 0fdb9d1
commit 9fec0b0
Show file tree

Hide file tree

Showing 5 changed files with 53 additions and 1 deletion.
diff --git a/packages/compass-connections/src/utils/connection-supports.spec.ts b/packages/compass-connections/src/utils/connection-supports.spec.ts
@@ -92,6 +92,9 @@ const mockConnections: ConnectionInfo[] = [
       instanceSize: 'M10',
       clusterType: 'SHARDED',
       clusterUniqueId: 'clusterUniqueId',
+      geoSharding: {
+        selfManagedSharding: false,
+      },
     },
   },
   {
@@ -111,6 +114,26 @@ const mockConnections: ConnectionInfo[] = [
       clusterUniqueId: 'clusterUniqueId',
     },
   },
+  {
+    id: 'dedicated-geo-sharded-self-managed',
+    connectionOptions: {
+      connectionString: 'mongodb://foo',
+    },
+    atlasMetadata: {
+      orgId: 'orgId',
+      projectId: 'projectId',
+      clusterName: 'clusterName',
+      regionalBaseUrl: 'https://example.com',
+      metricsId: 'metricsId',
+      metricsType: 'cluster',
+      instanceSize: 'M30',
+      clusterType: 'GEOSHARDED',
+      clusterUniqueId: 'clusterUniqueId',
+      geoSharding: {
+        selfManagedSharding: true,
+      },
+    },
+  },
 ];
 
 function connectionInfoById(connectionId: string): ConnectionInfo {
@@ -195,5 +218,14 @@ describe('connectionSupports', function () {
         )
       ).to.be.true;
     });
+
+    it('should return false if the cluster type is geosharded but self managed', function () {
+      expect(
+        connectionSupports(
+          connectionInfoById('dedicated-geo-sharded-self-managed'),
+          'globalWrites'
+        )
+      ).to.be.false;
+    });
   });
 });
diff --git a/packages/compass-connections/src/utils/connection-supports.ts b/packages/compass-connections/src/utils/connection-supports.ts
@@ -30,7 +30,10 @@ function supportsGlobalWrites(connectionInfo: ConnectionInfo) {
     return false;
   }
 
-  return atlasMetadata.clusterType === 'GEOSHARDED';
+  return (
+    atlasMetadata.clusterType === 'GEOSHARDED' &&
+    !atlasMetadata.geoSharding?.selfManagedSharding
+  );
 }
 
 export function connectionSupports(

diff --git a/packages/compass-web/src/connection-storage.spec.ts b/packages/compass-web/src/connection-storage.spec.ts
@@ -68,6 +68,9 @@ describe('buildConnectionInfoFromClusterDescription', function () {
         dataProcessingRegion: {
           regionalUrl: 'https://example.com',
         },
+        geoSharding: {
+          selfManagedSharding: true,
+        },
         replicationSpecList: [
           {
             regionConfigs: [
@@ -162,6 +165,10 @@ describe('buildConnectionInfoFromClusterDescription', function () {
           instanceSize: expectedInstanceSize,
           regionalBaseUrl: 'https://example.com',
           clusterType: clusterDescription.clusterType,
+          geoSharding: {
+            selfManagedSharding:
+              clusterDescription.geoSharding?.selfManagedSharding,
+          },
         });
     });
   }

diff --git a/packages/compass-web/src/connection-storage.tsx b/packages/compass-web/src/connection-storage.tsx
@@ -38,6 +38,9 @@ type ClusterDescription = {
   deploymentItemName: string;
   replicationSpecList?: ReplicationSpec[];
   isPaused?: boolean;
+  geoSharding?: {
+    selfManagedSharding?: boolean;
+  };
 };
 
 export type ClusterDescriptionWithDataProcessingRegion = ClusterDescription & {
@@ -205,6 +208,9 @@ export function buildConnectionInfoFromClusterDescription(
       ...getMetricsIdAndType(description, deploymentItem),
       instanceSize: getInstanceSize(description),
       clusterType: description.clusterType,
+      geoSharding: {
+        selfManagedSharding: description.geoSharding?.selfManagedSharding,
+      },
     },
   };
 }

diff --git a/packages/connection-info/src/connection-info.ts b/packages/connection-info/src/connection-info.ts
@@ -56,6 +56,10 @@ export interface AtlasClusterMetadata {
    *  https://github.com/10gen/mms/blob/9e6bf2d81d4d85b5ac68a15bf471dcddc5922323/client/packages/types/nds/clusterDescription.ts#L12-L16
    */
   clusterType: 'REPLICASET' | 'SHARDED' | 'GEOSHARDED';
+
+  geoSharding?: {
+    selfManagedSharding?: boolean;
+  };
 }
 
 export interface ConnectionInfo {