Skip to content

Commit aca98e1

Browse files
authored
[fix](mulit-az) fix missing virtual CG to physical CG routing bug (#56678)
1 parent 300dc60 commit aca98e1

File tree

11 files changed

+12
-1
lines changed

11 files changed

+12
-1
lines changed

fe/fe-core/src/main/java/org/apache/doris/cloud/catalog/CloudReplica.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -215,7 +215,8 @@ private String getCurrentClusterId() throws ComputeGroupException {
215215
ConnectContext context = ConnectContext.get();
216216
if (context != null) {
217217
// TODO(wb) rethinking whether should update err status.
218-
cluster = context.getCloudCluster();
218+
cluster = ((CloudSystemInfoService) Env.getCurrentSystemInfo())
219+
.getPhysicalCluster(context.getCloudCluster());
219220

220221
if (LOG.isDebugEnabled()) {
221222
LOG.debug("get compute group by context {}", cluster);

regression-test/suites/cloud_p0/multi_cluster/virtual_compute_group/default_vcg_auto_failover.groovy

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,7 @@ suite('default_vcg_auto_failover', 'multi_cluster,docker') {
7373
cluster.addBackend(2, clusterName2)
7474

7575
// add vcluster
76+
def instance_id = "default_instance_id"
7677
def normalVclusterName = "normalVirtualClusterName"
7778
def normalVclusterId = "normalVirtualClusterId"
7879
def vcgClusterNames = [clusterName1, clusterName2]

regression-test/suites/cloud_p0/multi_cluster/virtual_compute_group/load_trigger_failover.groovy

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,7 @@ suite('load_trigger_failover', 'multi_cluster,docker') {
7171
cluster.addBackend(1, clusterName2)
7272

7373
// add vcluster
74+
def instance_id = "default_instance_id"
7475
def normalVclusterName = "normalVirtualClusterName"
7576
def normalVclusterId = "normalVirtualClusterId"
7677
def vcgClusterNames = [clusterName1, clusterName2]

regression-test/suites/cloud_p0/multi_cluster/virtual_compute_group/standby_disable_compaction.groovy

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,7 @@ suite('standby_disable_compaction', 'multi_cluster,docker') {
6666
cluster.addBackend(2, clusterName2)
6767

6868
// add vcluster
69+
def instance_id = "default_instance_id"
6970
def normalVclusterName = "a_normalVirtualClusterName"
7071
def normalVclusterId = "normalVirtualClusterId"
7172
def vcgClusterNames = [clusterName1, clusterName2]

regression-test/suites/cloud_p0/multi_cluster/virtual_compute_group/use_default_vcg_read_write.groovy

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,7 @@ suite('use_default_vcg_read_write', 'multi_cluster,docker') {
7272
cluster.addBackend(2, clusterName2)
7373

7474
// add vcluster
75+
def instance_id = "default_instance_id"
7576
def normalVclusterName = "normalVirtualClusterName"
7677
def normalVclusterId = "normalVirtualClusterId"
7778
def vcgClusterNames = [clusterName1, clusterName2]

regression-test/suites/cloud_p0/multi_cluster/virtual_compute_group/use_vcg_read_write.groovy

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,7 @@ suite('use_vcg_read_write', 'multi_cluster,docker') {
7272
cluster.addBackend(2, clusterName2)
7373

7474
// add vcluster
75+
def instance_id = "default_instance_id"
7576
def normalVclusterName = "normalVirtualClusterName"
7677
def normalVclusterId = "normalVirtualClusterId"
7778
def vcgClusterNames = [clusterName1, clusterName2]

regression-test/suites/cloud_p0/multi_cluster/virtual_compute_group/use_vcg_read_write_routine_load.groovy

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -157,6 +157,7 @@ suite('use_vcg_read_write_routine_load', 'multi_cluster,docker') {
157157
cluster.addBackend(2, clusterName2)
158158

159159
// add vcluster
160+
def instance_id = "default_instance_id"
160161
def normalVclusterName = "normalVirtualClusterName"
161162
def normalVclusterId = "normalVirtualClusterId"
162163
def vcgClusterNames = [clusterName1, clusterName2]

regression-test/suites/cloud_p0/multi_cluster/virtual_compute_group/use_vcg_read_write_s3_load.groovy

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -130,6 +130,7 @@ suite('use_vcg_read_write_s3_load', 'multi_cluster,docker') {
130130
cluster.addBackend(2, clusterName2)
131131

132132
// add vcluster
133+
def instance_id = "default_instance_id"
133134
def normalVclusterName = "normalVirtualClusterName"
134135
def normalVclusterId = "normalVirtualClusterId"
135136
def vcgClusterNames = [clusterName1, clusterName2]

regression-test/suites/cloud_p0/multi_cluster/virtual_compute_group/use_vcg_read_write_unhealthy_node_50.groovy

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,7 @@ suite('use_vcg_read_write_unhealthy_node_50', 'multi_cluster,docker') {
7272
cluster.addBackend(2, clusterName2)
7373

7474
// add vcluster
75+
def instance_id = "default_instance_id"
7576
def normalVclusterName = "normalVirtualClusterName"
7677
def normalVclusterId = "normalVirtualClusterId"
7778
def vcgClusterNames = [clusterName1, clusterName2]

regression-test/suites/cloud_p0/multi_cluster/virtual_compute_group/vcg_auto_failover.groovy

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,7 @@ suite('vcg_auto_failover', 'multi_cluster,docker') {
7373
cluster.addBackend(2, clusterName2)
7474

7575
// add vcluster
76+
def instance_id = "default_instance_id"
7677
def normalVclusterName = "normalVirtualClusterName"
7778
def normalVclusterId = "normalVirtualClusterId"
7879
def vcgClusterNames = [clusterName1, clusterName2]

0 commit comments

Comments
 (0)