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 de38ffe2b24 [Fix](multi-catalog) Fix NPE when replaying hms events
(#26803)
de38ffe2b24 is described below
commit de38ffe2b2480ca646c6ff96aff44867beca7cbb
Author: Xiangyu Wang <[email protected]>
AuthorDate: Tue Nov 14 13:55:25 2023 +0800
[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 <[email protected]>
---
fe/fe-core/src/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 2bd72642fad..a1e557b526b 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());
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
