feat(mongodb): Mongo同业务相同IP支持 #3872

TencentBlueKing · Apr 11, 2024 · 1300d06 · 1300d06
1 parent 9e3321a
commit 1300d06
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/dbm-ui/backend/db_meta/api/cluster/mongocluster/create.py b/dbm-ui/backend/db_meta/api/cluster/mongocluster/create.py
@@ -108,7 +108,9 @@ def create_mongo_cluster(
 
     # 写入shard分片规则
     for primary in primaries:
-        primary_obj = StorageInstance.objects.get(machine__ip=primary["ip"], port=primary["port"])
+        primary_obj = StorageInstance.objects.get(
+            machine__ip=primary["ip"], port=primary["port"], machine__bk_cloud_id=bk_cloud_id, bk_biz_id=bk_biz_id
+        )
         cluster.nosqlstoragesetdtl_set.create(
             instance=primary_obj,
             bk_biz_id=bk_biz_id,

diff --git a/dbm-ui/backend/db_meta/api/cluster/mongorepset/create.py b/dbm-ui/backend/db_meta/api/cluster/mongorepset/create.py
@@ -157,7 +157,12 @@ def create_mongoset(
                 cluster=cluster, cluster_entry_type=ClusterEntryType.DNS, entry=storage["domain"], creator=creator
             )
             cluster_entry.storageinstance_set.add(
-                StorageInstance.objects.get(machine__ip=storage["ip"], port=storage["port"])
+                StorageInstance.objects.get(
+                    machine__ip=storage["ip"],
+                    port=storage["port"],
+                    machine__bk_cloud_id=bk_cloud_id,
+                    bk_biz_id=bk_biz_id,
+                )
             )
             cluster_entry.save()
     except Exception as e:  # NOCC:broad-except(检查工具误报)