diff --git a/fe/fe-core/src/main/java/org/apache/doris/cloud/catalog/CloudReplica.java b/fe/fe-core/src/main/java/org/apache/doris/cloud/catalog/CloudReplica.java index 0cfb82892e1e0e..7bd487e42c4aad 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/cloud/catalog/CloudReplica.java +++ b/fe/fe-core/src/main/java/org/apache/doris/cloud/catalog/CloudReplica.java @@ -215,7 +215,8 @@ private String getCurrentClusterId() throws ComputeGroupException { ConnectContext context = ConnectContext.get(); if (context != null) { // TODO(wb) rethinking whether should update err status. - cluster = context.getCloudCluster(); + cluster = ((CloudSystemInfoService) Env.getCurrentSystemInfo()) + .getPhysicalCluster(context.getCloudCluster()); if (LOG.isDebugEnabled()) { LOG.debug("get compute group by context {}", cluster); diff --git a/regression-test/suites/cloud_p0/multi_cluster/virtual_compute_group/default_vcg_auto_failover.groovy b/regression-test/suites/cloud_p0/multi_cluster/virtual_compute_group/default_vcg_auto_failover.groovy index 06a52a31b8bd5f..f1107d2a58e919 100644 --- a/regression-test/suites/cloud_p0/multi_cluster/virtual_compute_group/default_vcg_auto_failover.groovy +++ b/regression-test/suites/cloud_p0/multi_cluster/virtual_compute_group/default_vcg_auto_failover.groovy @@ -73,6 +73,7 @@ suite('default_vcg_auto_failover', 'multi_cluster,docker') { cluster.addBackend(2, clusterName2) // add vcluster + def instance_id = "default_instance_id" def normalVclusterName = "normalVirtualClusterName" def normalVclusterId = "normalVirtualClusterId" def vcgClusterNames = [clusterName1, clusterName2] diff --git a/regression-test/suites/cloud_p0/multi_cluster/virtual_compute_group/load_trigger_failover.groovy b/regression-test/suites/cloud_p0/multi_cluster/virtual_compute_group/load_trigger_failover.groovy index 5e05ce3f0b1cfd..3cf7c1b995ea68 100644 --- a/regression-test/suites/cloud_p0/multi_cluster/virtual_compute_group/load_trigger_failover.groovy +++ b/regression-test/suites/cloud_p0/multi_cluster/virtual_compute_group/load_trigger_failover.groovy @@ -71,6 +71,7 @@ suite('load_trigger_failover', 'multi_cluster,docker') { cluster.addBackend(1, clusterName2) // add vcluster + def instance_id = "default_instance_id" def normalVclusterName = "normalVirtualClusterName" def normalVclusterId = "normalVirtualClusterId" def vcgClusterNames = [clusterName1, clusterName2] diff --git a/regression-test/suites/cloud_p0/multi_cluster/virtual_compute_group/standby_disable_compaction.groovy b/regression-test/suites/cloud_p0/multi_cluster/virtual_compute_group/standby_disable_compaction.groovy index 2393e27ef0e8de..b22e4ed9980261 100644 --- a/regression-test/suites/cloud_p0/multi_cluster/virtual_compute_group/standby_disable_compaction.groovy +++ b/regression-test/suites/cloud_p0/multi_cluster/virtual_compute_group/standby_disable_compaction.groovy @@ -66,6 +66,7 @@ suite('standby_disable_compaction', 'multi_cluster,docker') { cluster.addBackend(2, clusterName2) // add vcluster + def instance_id = "default_instance_id" def normalVclusterName = "a_normalVirtualClusterName" def normalVclusterId = "normalVirtualClusterId" def vcgClusterNames = [clusterName1, clusterName2] diff --git a/regression-test/suites/cloud_p0/multi_cluster/virtual_compute_group/use_default_vcg_read_write.groovy b/regression-test/suites/cloud_p0/multi_cluster/virtual_compute_group/use_default_vcg_read_write.groovy index 77080ee3711916..f111dc790fdd22 100644 --- a/regression-test/suites/cloud_p0/multi_cluster/virtual_compute_group/use_default_vcg_read_write.groovy +++ b/regression-test/suites/cloud_p0/multi_cluster/virtual_compute_group/use_default_vcg_read_write.groovy @@ -72,6 +72,7 @@ suite('use_default_vcg_read_write', 'multi_cluster,docker') { cluster.addBackend(2, clusterName2) // add vcluster + def instance_id = "default_instance_id" def normalVclusterName = "normalVirtualClusterName" def normalVclusterId = "normalVirtualClusterId" def vcgClusterNames = [clusterName1, clusterName2] diff --git a/regression-test/suites/cloud_p0/multi_cluster/virtual_compute_group/use_vcg_read_write.groovy b/regression-test/suites/cloud_p0/multi_cluster/virtual_compute_group/use_vcg_read_write.groovy index 01f19162ea1bd8..0d9404537e17b5 100644 --- a/regression-test/suites/cloud_p0/multi_cluster/virtual_compute_group/use_vcg_read_write.groovy +++ b/regression-test/suites/cloud_p0/multi_cluster/virtual_compute_group/use_vcg_read_write.groovy @@ -72,6 +72,7 @@ suite('use_vcg_read_write', 'multi_cluster,docker') { cluster.addBackend(2, clusterName2) // add vcluster + def instance_id = "default_instance_id" def normalVclusterName = "normalVirtualClusterName" def normalVclusterId = "normalVirtualClusterId" def vcgClusterNames = [clusterName1, clusterName2] diff --git a/regression-test/suites/cloud_p0/multi_cluster/virtual_compute_group/use_vcg_read_write_routine_load.groovy b/regression-test/suites/cloud_p0/multi_cluster/virtual_compute_group/use_vcg_read_write_routine_load.groovy index d11a2d0cc0cc91..5f0035952cface 100644 --- a/regression-test/suites/cloud_p0/multi_cluster/virtual_compute_group/use_vcg_read_write_routine_load.groovy +++ b/regression-test/suites/cloud_p0/multi_cluster/virtual_compute_group/use_vcg_read_write_routine_load.groovy @@ -157,6 +157,7 @@ suite('use_vcg_read_write_routine_load', 'multi_cluster,docker') { cluster.addBackend(2, clusterName2) // add vcluster + def instance_id = "default_instance_id" def normalVclusterName = "normalVirtualClusterName" def normalVclusterId = "normalVirtualClusterId" def vcgClusterNames = [clusterName1, clusterName2] diff --git a/regression-test/suites/cloud_p0/multi_cluster/virtual_compute_group/use_vcg_read_write_s3_load.groovy b/regression-test/suites/cloud_p0/multi_cluster/virtual_compute_group/use_vcg_read_write_s3_load.groovy index 4d31245086acf6..d16730f435a031 100644 --- a/regression-test/suites/cloud_p0/multi_cluster/virtual_compute_group/use_vcg_read_write_s3_load.groovy +++ b/regression-test/suites/cloud_p0/multi_cluster/virtual_compute_group/use_vcg_read_write_s3_load.groovy @@ -130,6 +130,7 @@ suite('use_vcg_read_write_s3_load', 'multi_cluster,docker') { cluster.addBackend(2, clusterName2) // add vcluster + def instance_id = "default_instance_id" def normalVclusterName = "normalVirtualClusterName" def normalVclusterId = "normalVirtualClusterId" def vcgClusterNames = [clusterName1, clusterName2] diff --git a/regression-test/suites/cloud_p0/multi_cluster/virtual_compute_group/use_vcg_read_write_unhealthy_node_50.groovy b/regression-test/suites/cloud_p0/multi_cluster/virtual_compute_group/use_vcg_read_write_unhealthy_node_50.groovy index 78b510b1857e9c..510c169c8c05ac 100644 --- a/regression-test/suites/cloud_p0/multi_cluster/virtual_compute_group/use_vcg_read_write_unhealthy_node_50.groovy +++ b/regression-test/suites/cloud_p0/multi_cluster/virtual_compute_group/use_vcg_read_write_unhealthy_node_50.groovy @@ -72,6 +72,7 @@ suite('use_vcg_read_write_unhealthy_node_50', 'multi_cluster,docker') { cluster.addBackend(2, clusterName2) // add vcluster + def instance_id = "default_instance_id" def normalVclusterName = "normalVirtualClusterName" def normalVclusterId = "normalVirtualClusterId" def vcgClusterNames = [clusterName1, clusterName2] diff --git a/regression-test/suites/cloud_p0/multi_cluster/virtual_compute_group/vcg_auto_failover.groovy b/regression-test/suites/cloud_p0/multi_cluster/virtual_compute_group/vcg_auto_failover.groovy index 05e78333923fbd..e01e8a461689a0 100644 --- a/regression-test/suites/cloud_p0/multi_cluster/virtual_compute_group/vcg_auto_failover.groovy +++ b/regression-test/suites/cloud_p0/multi_cluster/virtual_compute_group/vcg_auto_failover.groovy @@ -73,6 +73,7 @@ suite('vcg_auto_failover', 'multi_cluster,docker') { cluster.addBackend(2, clusterName2) // add vcluster + def instance_id = "default_instance_id" def normalVclusterName = "normalVirtualClusterName" def normalVclusterId = "normalVirtualClusterId" def vcgClusterNames = [clusterName1, clusterName2] diff --git a/regression-test/suites/cloud_p0/multi_cluster/virtual_compute_group/vcg_auto_failover_manual_failback.groovy b/regression-test/suites/cloud_p0/multi_cluster/virtual_compute_group/vcg_auto_failover_manual_failback.groovy index f0a40fa79455f9..243a8afb6a6a7f 100644 --- a/regression-test/suites/cloud_p0/multi_cluster/virtual_compute_group/vcg_auto_failover_manual_failback.groovy +++ b/regression-test/suites/cloud_p0/multi_cluster/virtual_compute_group/vcg_auto_failover_manual_failback.groovy @@ -73,6 +73,7 @@ suite('vcg_auto_failover_manual_failback', 'multi_cluster,docker') { cluster.addBackend(2, clusterName2) // add vcluster + def instance_id = "default_instance_id" def normalVclusterName = "normalVirtualClusterName" def normalVclusterId = "normalVirtualClusterId" def vcgClusterNames = [clusterName1, clusterName2]