Skip to content
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.

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

[cherry-pick](branch-2.0)add SessionVariable for enableCooldownReplicaAffinity #42683

Merged
merged 6 commits into from
Nov 8, 2024
Merged
Original file line number Diff line number Diff line change
Expand Up @@ -2501,9 +2501,6 @@ public class Config extends ConfigBase {
@ConfField(mutable = true)
public static boolean fix_tablet_partition_id_eq_0 = false;

@ConfField(mutable = true)
public static boolean enable_cooldown_replica_affinity = true;

@ConfField(mutable = true, description = {
"设置为 true,root 和 admin 将跳过 sql block rule", "Set to true, root and admin will skip SQL block rule"})
public static boolean sql_block_rule_ignore_admin = false;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -797,7 +797,8 @@ private void addScanRangeLocations(Partition partition,
replicas.clear();
replicas.add(replica);
}
if (Config.enable_cooldown_replica_affinity) {

if (isEnableCooldownReplicaAffinity()) {
final long coolDownReplicaId = tablet.getCooldownReplicaId();
// we prefer to query using cooldown replica to make sure the cache is fully utilized
// for example: consider there are 3BEs(A,B,C) and each has one replica for tablet X. and X
Expand Down Expand Up @@ -886,6 +887,14 @@ private void addScanRangeLocations(Partition partition,
}
}

private boolean isEnableCooldownReplicaAffinity() {
ConnectContext connectContext = ConnectContext.get();
if (connectContext != null) {
return connectContext.getSessionVariable().isEnableCooldownReplicaAffinity();
}
return true;
}

private void computePartitionInfo() throws AnalysisException {
long start = System.currentTimeMillis();
// Step1: compute partition ids
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -483,6 +483,8 @@ public class SessionVariable implements Serializable, Writable {

public static final String REQUIRE_SEQUENCE_IN_INSERT = "require_sequence_in_insert";

public static final String ENABLE_COOLDOWN_REPLICA_AFFINITY = "enable_cooldown_replica_affinity";

/**
* If set false, user couldn't submit analyze SQL and FE won't allocate any related resources.
*/
Expand Down Expand Up @@ -1510,6 +1512,9 @@ public void setEnableEsShardScroll(boolean enableESShardScroll) {
})
public boolean requireSequenceInInsert = true;

@VariableMgr.VarAttr(name = ENABLE_COOLDOWN_REPLICA_AFFINITY, needForward = true)
public boolean enableCooldownReplicaAffinity = true;

public boolean isEnableESShardScroll() {
return enableESShardScroll;
}
Expand Down Expand Up @@ -3070,5 +3075,9 @@ public int getMaxMsgSizeOfResultReceiver() {
return this.maxMsgSizeOfResultReceiver;
}

public boolean isEnableCooldownReplicaAffinity() {
return enableCooldownReplicaAffinity;
}

}

38 changes: 38 additions & 0 deletions regression-test/suites/show_p0/test_show_variables.groovy
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
// Licensed to the Apache Software Foundation (ASF) under one
// or more contributor license agreements. See the NOTICE file
// distributed with this work for additional information
// regarding copyright ownership. The ASF licenses this file
// to you under the Apache License, Version 2.0 (the
// "License"); you may not use this file except in compliance
// with the License. You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing,
// software distributed under the License is distributed on an
// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
// KIND, either express or implied. See the License for the
// specific language governing permissions and limitations
// under the License.

import org.apache.doris.regression.util.Http

suite("test_show_variables", "p0") {

def result = sql """show variables like "enable_cooldown_replica_affinity%";"""
assertTrue(result[0][1]=="true")

result = sql """set enable_cooldown_replica_affinity=false;"""
result = sql """show variables like "enable_cooldown_replica_affinity%";"""
assertTrue(result[0][1]=="false")

result = sql """set enable_cooldown_replica_affinity=true;"""
result = sql """show variables like "enable_cooldown_replica_affinity%";"""
assertTrue(result[0][1]=="true")

result = sql """set GLOBAL enable_cooldown_replica_affinity=false;"""
result = sql """show variables like "enable_cooldown_replica_affinity%";"""
assertTrue(result[0][1]=="false")
result = sql """set GLOBAL enable_cooldown_replica_affinity=true;"""

}
Loading