Skip to content

branch-4.0: [fix](mulit-az) fix missing virtual CG to physical CG routing bug #56678 #56712

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
yiguolei merged 1 commit into from
Oct 22, 2025
Merged

branch-4.0: [fix](mulit-az) fix missing virtual CG to physical CG routing bug #56678 #56712

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion fe/fe-core/src/main/java/org/apache/doris/cloud/catalog/CloudReplica.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
1 change: 1 addition & 0 deletions ...test/suites/cloud_p0/multi_cluster/virtual_compute_group/default_vcg_auto_failover.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand Down
1 change: 1 addition & 0 deletions ...ion-test/suites/cloud_p0/multi_cluster/virtual_compute_group/load_trigger_failover.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand Down
1 change: 1 addition & 0 deletions ...est/suites/cloud_p0/multi_cluster/virtual_compute_group/standby_disable_compaction.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand Down
1 change: 1 addition & 0 deletions ...est/suites/cloud_p0/multi_cluster/virtual_compute_group/use_default_vcg_read_write.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand Down
1 change: 1 addition & 0 deletions ...ession-test/suites/cloud_p0/multi_cluster/virtual_compute_group/use_vcg_read_write.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand Down
1 change: 1 addition & 0 deletions ...uites/cloud_p0/multi_cluster/virtual_compute_group/use_vcg_read_write_routine_load.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand Down
1 change: 1 addition & 0 deletions ...est/suites/cloud_p0/multi_cluster/virtual_compute_group/use_vcg_read_write_s3_load.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand Down
1 change: 1 addition & 0 deletions .../cloud_p0/multi_cluster/virtual_compute_group/use_vcg_read_write_unhealthy_node_50.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand Down
1 change: 1 addition & 0 deletions regression-test/suites/cloud_p0/multi_cluster/virtual_compute_group/vcg_auto_failover.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand Down
1 change: 1 addition & 0 deletions ...tes/cloud_p0/multi_cluster/virtual_compute_group/vcg_auto_failover_manual_failback.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand Down
Loading