From 9ce3fd86ed012fe86198de896e7750b79beb911d Mon Sep 17 00:00:00 2001 From: wd0 Date: Thu, 9 Sep 2021 16:12:22 +0800 Subject: [PATCH] disable mixed-zone locality deployment versions to come --- src/rootserver/ob_locality_util.cpp | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/src/rootserver/ob_locality_util.cpp b/src/rootserver/ob_locality_util.cpp index 4c88a5cdf6..afebbc7a4c 100644 --- a/src/rootserver/ob_locality_util.cpp +++ b/src/rootserver/ob_locality_util.cpp @@ -128,16 +128,8 @@ int ObLocalityDistribution::ZoneSetReplicaDist::check_valid_replica_dist( } } } else { - // a single zone can deploy one and only one paxos replica for mixed zone deployment - // and the deployment of readonly replicas on mixed zone is not supported - is_valid = ((full_replica_num >= 0) && (logonly_replica_num >= 0) && - (full_replica_num + logonly_replica_num == zone_set_.count())); - if (!is_valid) { - } else { - for (int64_t i = 0; is_valid && i < all_replica_attr_array_[READONLY_REPLICA].count(); ++i) { - is_valid = all_replica_attr_array_[READONLY_REPLICA].at(i).num_ <= 0; - } - } + // do not support mixed-zone locality deployment versions to come + is_valid = false; } } return ret; -- GitLab