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

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


The following commit(s) were added to refs/heads/dev-1.1.2 by this push:
     new 3b4f675772 [improvement](log) Avoid too many 'not found query' warn 
log (#11048)
3b4f675772 is described below

commit 3b4f67577237acddf7c4db48cee12a2a88128174
Author: meiyi <myime...@gmail.com>
AuthorDate: Thu Jul 28 09:12:25 2022 +0800

    [improvement](log) Avoid too many 'not found query' warn log (#11048)
---
 fe/fe-core/src/main/java/org/apache/doris/qe/QeProcessorImpl.java    | 5 ++++-
 fe/fe-core/src/main/java/org/apache/doris/qe/StmtExecutor.java       | 4 ++--
 .../src/main/java/org/apache/doris/transaction/TransactionState.java | 2 +-
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/fe/fe-core/src/main/java/org/apache/doris/qe/QeProcessorImpl.java 
b/fe/fe-core/src/main/java/org/apache/doris/qe/QeProcessorImpl.java
index 5baefab254..36c82c11fb 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/qe/QeProcessorImpl.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/qe/QeProcessorImpl.java
@@ -90,6 +90,7 @@ public final class QeProcessorImpl implements QeProcessor {
         }
     }
 
+    @Override
     public void registerInstances(TUniqueId queryId, Integer instancesNum) 
throws UserException {
         if (!coordinatorMap.containsKey(queryId)) {
             throw new UserException("query not exists in coordinatorMap:" + 
DebugUtil.printId(queryId));
@@ -143,7 +144,9 @@ public final class QeProcessorImpl implements QeProcessor {
                 }
             }
         } else {
-            LOG.warn("not found query {} when unregisterQuery", 
DebugUtil.printId(queryId));
+            if (LOG.isDebugEnabled()) {
+                LOG.debug("not found query {} when unregisterQuery", 
DebugUtil.printId(queryId));
+            }
         }
     }
 
diff --git a/fe/fe-core/src/main/java/org/apache/doris/qe/StmtExecutor.java 
b/fe/fe-core/src/main/java/org/apache/doris/qe/StmtExecutor.java
index 8180c52a55..191dd2da89 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/qe/StmtExecutor.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/qe/StmtExecutor.java
@@ -429,8 +429,6 @@ public class StmtExecutor implements ProfileWriter {
                     LOG.warn("handle insert stmt fail", t);
                     // the transaction of this insert may already begun, we 
will abort it at outer finally block.
                     throw t;
-                } finally {
-                    
QeProcessorImpl.INSTANCE.unregisterQuery(context.queryId());
                 }
             } else if (parsedStmt instanceof DdlStmt) {
                 handleDdlStmt();
@@ -1353,6 +1351,8 @@ public class StmtExecutor implements ProfileWriter {
                  * which exactly like the old insert stmt usage pattern.
                  */
                 throwable = t;
+            } finally {
+                QeProcessorImpl.INSTANCE.unregisterQuery(context.queryId());
             }
 
             // Go here, which means:
diff --git 
a/fe/fe-core/src/main/java/org/apache/doris/transaction/TransactionState.java 
b/fe/fe-core/src/main/java/org/apache/doris/transaction/TransactionState.java
index d18727fba6..719db31b1e 100644
--- 
a/fe/fe-core/src/main/java/org/apache/doris/transaction/TransactionState.java
+++ 
b/fe/fe-core/src/main/java/org/apache/doris/transaction/TransactionState.java
@@ -208,7 +208,7 @@ public class TransactionState implements Writable {
     // 2. callback object has been removed from CallbackFactory
     // 3. in afterStateTransform(), callback object can not be found, so the 
write lock can not be released.
     private TxnStateChangeCallback callback = null;
-    private long timeoutMs = Config.stream_load_default_timeout_second;
+    private long timeoutMs = Config.stream_load_default_timeout_second * 1000;
     private long preCommittedTimeoutMs = 
Config.stream_load_default_precommit_timeout_second * 1000;
     private String authCode = "";
 


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

Reply via email to