From fa4ad7290ed9a7d6cb51273c332e5285e8324a24 Mon Sep 17 00:00:00 2001 From: yiguolei Date: Wed, 4 May 2022 20:26:50 +0800 Subject: [PATCH 1/2] [fixbug][catalog] catalog could not load from image --- .../src/main/java/org/apache/doris/alter/AlterJobV2.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/fe/fe-core/src/main/java/org/apache/doris/alter/AlterJobV2.java b/fe/fe-core/src/main/java/org/apache/doris/alter/AlterJobV2.java index 764a0b0ae853bd..1d0f69f7044bd3 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/alter/AlterJobV2.java +++ b/fe/fe-core/src/main/java/org/apache/doris/alter/AlterJobV2.java @@ -58,7 +58,9 @@ public boolean isFinalState() { } public enum JobType { - ROLLUP, SCHEMA_CHANGE + // Must not remove it or change the order, because catalog depend on it to traverse the image + // and load meta data + ROLLUP, SCHEMA_CHANGE, DECOMMISSION_BACKEND } @SerializedName(value = "type") From 58126244089f28bf85f8dd0f5dbb0c961ca93fba Mon Sep 17 00:00:00 2001 From: yiguolei Date: Thu, 5 May 2022 08:35:54 +0800 Subject: [PATCH 2/2] fix ut failed --- fe/fe-core/src/main/java/org/apache/doris/catalog/Catalog.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/fe/fe-core/src/main/java/org/apache/doris/catalog/Catalog.java b/fe/fe-core/src/main/java/org/apache/doris/catalog/Catalog.java index fa7fdc757216ae..df61e2b18af2dc 100755 --- a/fe/fe-core/src/main/java/org/apache/doris/catalog/Catalog.java +++ b/fe/fe-core/src/main/java/org/apache/doris/catalog/Catalog.java @@ -2113,6 +2113,9 @@ public long saveAlterJob(CountingDataOutputStream dos, long checksum, JobType ty alterJobsV2 = this.getMaterializedViewHandler().getAlterJobsV2(); } else if (type == JobType.SCHEMA_CHANGE) { alterJobsV2 = this.getSchemaChangeHandler().getAlterJobsV2(); + } else if (type == JobType.DECOMMISSION_BACKEND) { + // Load alter job need decommission backend type to load image + alterJobsV2 = Maps.newHashMap(); } else { throw new IOException("Invalid alter job type: " + type.name()); }