This is an automated email from the ASF dual-hosted git repository.
morningman pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/doris.git
The following commit(s) were added to refs/heads/master by this push:
new 4142cc0e8c [fix](merge conflict) fix FE compile error (#19586)
4142cc0e8c is described below
commit 4142cc0e8cbc32a0e27ad160670d7540bbc3fbb2
Author: Mingyu Chen <[email protected]>
AuthorDate: Fri May 12 18:18:22 2023 +0800
[fix](merge conflict) fix FE compile error (#19586)
---
.../src/main/java/org/apache/doris/system/BeSelectionPolicy.java | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git
a/fe/fe-core/src/main/java/org/apache/doris/system/BeSelectionPolicy.java
b/fe/fe-core/src/main/java/org/apache/doris/system/BeSelectionPolicy.java
index 631adb9843..c7de93adfe 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/system/BeSelectionPolicy.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/system/BeSelectionPolicy.java
@@ -129,7 +129,7 @@ public class BeSelectionPolicy {
// Compute node is only used when preferComputeNode is set.
if (!preferComputeNode && backend.isComputeNode()) {
if (LOG.isDebugEnabled()) {
- LOG.debug("Backend [{}] is not match by ComputeNode rule,
policy: [{}]", backend.getIp(), this);
+ LOG.debug("Backend [{}] is not match by ComputeNode rule,
policy: [{}]", backend.getHost(), this);
}
return false;
}
@@ -139,7 +139,7 @@ public class BeSelectionPolicy {
backend.getLocationTag()) || storageMedium != null &&
!backend.hasSpecifiedStorageMedium(
storageMedium)) {
if (LOG.isDebugEnabled()) {
- LOG.debug("Backend [{}] is not match by Other rules, policy:
[{}]", backend.getIp(), this);
+ LOG.debug("Backend [{}] is not match by Other rules, policy:
[{}]", backend.getHost(), this);
}
return false;
}
@@ -147,14 +147,15 @@ public class BeSelectionPolicy {
if (checkDiskUsage) {
if (storageMedium == null && backend.diskExceedLimit()) {
if (LOG.isDebugEnabled()) {
- LOG.debug("Backend [{}] is not match by diskExceedLimit
rule, policy: [{}]", backend.getIp(), this);
+ LOG.debug("Backend [{}] is not match by diskExceedLimit
rule, policy: [{}]", backend.getHost(),
+ this);
}
return false;
}
if (storageMedium != null &&
backend.diskExceedLimitByStorageMedium(storageMedium)) {
if (LOG.isDebugEnabled()) {
LOG.debug("Backend [{}] is not match by
diskExceedLimitByStorageMedium rule, policy: [{}]",
- backend.getIp(), this);
+ backend.getHost(), this);
}
return false;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
