This is an automated email from the ASF dual-hosted git repository.
yiguolei pushed a commit to branch branch-4.0
in repository https://gitbox.apache.org/repos/asf/doris.git
The following commit(s) were added to refs/heads/branch-4.0 by this push:
new 571bfdf4942 branch-4.0: [fix](mulit-az) fix missing virtual CG to
physical CG routing bug #56678 (#56712)
571bfdf4942 is described below
commit 571bfdf4942e6368e9496f1e364c2d63ca79b00a
Author: github-actions[bot]
<41898282+github-actions[bot]@users.noreply.github.com>
AuthorDate: Wed Oct 22 11:38:59 2025 +0800
branch-4.0: [fix](mulit-az) fix missing virtual CG to physical CG routing
bug #56678 (#56712)
Cherry-picked from #56678
Co-authored-by: Luwei <[email protected]>
---
.../src/main/java/org/apache/doris/cloud/catalog/CloudReplica.java | 3 ++-
.../virtual_compute_group/default_vcg_auto_failover.groovy | 1 +
.../multi_cluster/virtual_compute_group/load_trigger_failover.groovy | 1 +
.../virtual_compute_group/standby_disable_compaction.groovy | 1 +
.../virtual_compute_group/use_default_vcg_read_write.groovy | 1 +
.../multi_cluster/virtual_compute_group/use_vcg_read_write.groovy | 1 +
.../virtual_compute_group/use_vcg_read_write_routine_load.groovy | 1 +
.../virtual_compute_group/use_vcg_read_write_s3_load.groovy | 1 +
.../virtual_compute_group/use_vcg_read_write_unhealthy_node_50.groovy | 1 +
.../multi_cluster/virtual_compute_group/vcg_auto_failover.groovy | 1 +
.../virtual_compute_group/vcg_auto_failover_manual_failback.groovy | 1 +
11 files changed, 12 insertions(+), 1 deletion(-)
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 0cfb82892e1..7bd487e42c4 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 @@ public class CloudReplica extends Replica {
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 06a52a31b8b..f1107d2a58e 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 5e05ce3f0b1..3cf7c1b995e 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 2393e27ef0e..b22e4ed9980 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 77080ee3711..f111dc790fd 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 01f19162ea1..0d9404537e1 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 d11a2d0cc0c..5f0035952cf 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 4d31245086a..d16730f435a 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 78b510b1857..510c169c8c0 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 05e78333923..e01e8a46168 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 f0a40fa7945..243a8afb6a6 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]
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
