database/doris
2
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

[improvement](log)enhance log msg of finding be policy failure (#17134)

Browse Source
This commit is contained in:
奕冷
2023-02-26 11:52:25 +08:00
committed by GitHub
parent d3a7cb8bde
commit 605d840231
4 changed files with 7 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
fe/fe-core/src/main/java/org/apache/doris/system/BeSelectionPolicy.java
View File

@ -172,14 +172,7 @@ public class BeSelectionPolicy {
@Override
public String toString() {
StringBuilder sb = new StringBuilder();
sb.append("cluster|query|load|schedule|tags|medium: ");
sb.append(cluster).append("|");
sb.append(needQueryAvailable).append("|");
sb.append(needLoadAvailable).append("|");
sb.append(needScheduleAvailable).append("|");
sb.append(resourceTags).append("|");
sb.append(storageMedium);
return sb.toString();
return String.format("cluster=%s | query=%s | load=%s | schedule=%s | tags=%s | medium=%s",
cluster, needLoadAvailable, needLoadAvailable, needScheduleAvailable, resourceTags, storageMedium);
}
}

2
fe/fe-core/src/main/java/org/apache/doris/system/SystemInfoService.java
View File

@ -865,7 +865,7 @@ public class SystemInfoService {
BeSelectionPolicy policy = builder.build();
List<Long> beIds = selectBackendIdsByPolicy(policy, entry.getValue());
if (beIds.isEmpty()) {
throw new DdlException("Failed to find " + entry.getValue() + " backends for policy: " + policy);
throw new DdlException("Failed to find " + entry.getValue() + " backend(s) for policy: " + policy);
}
chosenBackendIds.put(entry.getKey(), beIds);
totalReplicaNum += beIds.size();

4
fe/fe-core/src/test/java/org/apache/doris/catalog/CreateTableTest.java
View File

@ -266,7 +266,7 @@ public class CreateTableTest {
+ "properties('replication_num' = '1', 'short_key' = '4');"));
ExceptionChecker
.expectThrowsWithMsg(DdlException.class, "Failed to find 3 backends for policy",
.expectThrowsWithMsg(DdlException.class, "Failed to find 3 backend(s) for policy",
() -> createTable("create table test.atbl5\n" + "(k1 int, k2 int, k3 int)\n"
+ "duplicate key(k1, k2, k3)\n" + "distributed by hash(k1) buckets 1\n"
+ "properties('replication_num' = '3');"));
@ -283,7 +283,7 @@ public class CreateTableTest {
ConfigBase.setMutableConfig("disable_storage_medium_check", "false");
ExceptionChecker
.expectThrowsWithMsg(DdlException.class, " Failed to find 1 backends for policy:",
.expectThrowsWithMsg(DdlException.class, " Failed to find 1 backend(s) for policy:",
() -> createTable("create table test.tb7(key1 int, key2 varchar(10)) distributed by hash(key1) \n"
+ "buckets 1 properties('replication_num' = '1', 'storage_medium' = 'ssd');"));

4
fe/fe-core/src/test/java/org/apache/doris/catalog/ModifyBackendTest.java
View File

@ -80,7 +80,7 @@ public class ModifyBackendTest {
String createStr = "create table test.tbl1(\n" + "k1 int\n" + ") distributed by hash(k1)\n"
+ "buckets 3 properties(\n" + "\"replication_num\" = \"1\"\n" + ");";
CreateTableStmt createStmt = (CreateTableStmt) UtFrameUtils.parseAndAnalyzeStmt(createStr, connectContext);
ExceptionChecker.expectThrowsWithMsg(DdlException.class, "Failed to find 1 backends for policy:",
ExceptionChecker.expectThrowsWithMsg(DdlException.class, "Failed to find 1 backend(s) for policy:",
() -> DdlExecutor.execute(Env.getCurrentEnv(), createStmt));
createStr = "create table test.tbl1(\n" + "k1 int\n" + ") distributed by hash(k1)\n" + "buckets 3 properties(\n"
@ -100,7 +100,7 @@ public class ModifyBackendTest {
+ ");";
CreateTableStmt createStmt3 = (CreateTableStmt) UtFrameUtils.parseAndAnalyzeStmt(createStr, connectContext);
//partition create failed, because there is no BE with "default" tag
ExceptionChecker.expectThrowsWithMsg(DdlException.class, "Failed to find 3 backends for policy",
ExceptionChecker.expectThrowsWithMsg(DdlException.class, "Failed to find 3 backend(s) for policy",
() -> DdlExecutor.execute(Env.getCurrentEnv(), createStmt3));
Database db = Env.getCurrentInternalCatalog().getDbNullable("default_cluster:test");