From de38ffe2b2480ca646c6ff96aff44867beca7cbb Mon Sep 17 00:00:00 2001 From: Xiangyu Wang Date: Tue, 14 Nov 2023 13:55:25 +0800 Subject: [PATCH] [Fix](multi-catalog) Fix NPE when replaying hms events (#26803) Invoke ConnectContext.get() at replayer thread of slave FE nodes maybe return null, so a NPE will be thrown and slave nodes will be crashed. Co-authored-by: wangxiangyu --- .../main/java/org/apache/doris/qe/MasterCatalogExecutor.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fe/fe-core/src/main/java/org/apache/doris/qe/MasterCatalogExecutor.java b/fe/fe-core/src/main/java/org/apache/doris/qe/MasterCatalogExecutor.java index 2bd72642fa..a1e557b526 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/qe/MasterCatalogExecutor.java +++ b/fe/fe-core/src/main/java/org/apache/doris/qe/MasterCatalogExecutor.java @@ -66,7 +66,7 @@ public class MasterCatalogExecutor { boolean isReturnToPool = false; try { TInitExternalCtlMetaResult result = client.initExternalCtlMeta(request); - ConnectContext.get().getEnv().getJournalObservable().waitOn(result.maxJournalId, waitTimeoutMs); + Env.getCurrentEnv().getJournalObservable().waitOn(result.maxJournalId, waitTimeoutMs); if (!result.getStatus().equalsIgnoreCase(STATUS_OK)) { throw new UserException(result.getStatus()); }