[incubator-doris] branch master updated: [fixbug][metadata] catalog could not load from image (#9364)

[yiguolei]

This is an automated email from the ASF dual-hosted git repository.

yiguolei pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-doris.git


The following commit(s) were added to refs/heads/master by this push:
     new 0604ecba17 [fixbug][metadata] catalog could not load from image (#9364)
0604ecba17 is described below

commit 0604ecba177e3c203821e023c5a0544d73ef01d0
Author: yiguolei <676222...@qq.com>
AuthorDate: Thu May 5 09:58:01 2022 +0800

    [fixbug][metadata] catalog could not load from image (#9364)
    
    * [fixbug][catalog] catalog could not load from image
    
    * fix ut failed
    
    Co-authored-by: yiguolei <yiguo...@gmail.com>
---
 fe/fe-core/src/main/java/org/apache/doris/alter/AlterJobV2.java | 4 +++-
 fe/fe-core/src/main/java/org/apache/doris/catalog/Catalog.java  | 3 +++
 2 files changed, 6 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 764a0b0ae8..1d0f69f704 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 abstract class AlterJobV2 implements Writable {
     }
 
     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")
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 fa7fdc7572..df61e2b18a 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 class Catalog {
             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());
         }


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@doris.apache.org
For additional commands, e-mail: commits-h...@doris.apache.org