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/doris.git
The following commit(s) were added to refs/heads/master by this push:
new 93918253ba [fix](metric) fix issue that the counter of rejected
transactions does not cover some failed situations for load (#23363)
93918253ba is described below
commit 93918253bad1c5fbadbe398a05abf5100756f584
Author: caiconghui <[email protected]>
AuthorDate: Sat Aug 26 20:06:42 2023 +0800
[fix](metric) fix issue that the counter of rejected transactions does not
cover some failed situations for load (#23363)
Co-authored-by: caiconghui1 <[email protected]>
---
.../doris/transaction/DatabaseTransactionMgr.java | 7 ----
.../doris/transaction/GlobalTransactionMgr.java | 37 ++++++++++++++--------
2 files changed, 23 insertions(+), 21 deletions(-)
diff --git
a/fe/fe-core/src/main/java/org/apache/doris/transaction/DatabaseTransactionMgr.java
b/fe/fe-core/src/main/java/org/apache/doris/transaction/DatabaseTransactionMgr.java
index bd125d1dac..dba5d24855 100644
---
a/fe/fe-core/src/main/java/org/apache/doris/transaction/DatabaseTransactionMgr.java
+++
b/fe/fe-core/src/main/java/org/apache/doris/transaction/DatabaseTransactionMgr.java
@@ -355,13 +355,6 @@ public class DatabaseTransactionMgr {
}
return tid;
- } catch (DuplicatedRequestException e) {
- throw e;
- } catch (Exception e) {
- if (MetricRepo.isInit) {
- MetricRepo.COUNTER_TXN_REJECT.increase(1L);
- }
- throw e;
} finally {
writeUnlock();
}
diff --git
a/fe/fe-core/src/main/java/org/apache/doris/transaction/GlobalTransactionMgr.java
b/fe/fe-core/src/main/java/org/apache/doris/transaction/GlobalTransactionMgr.java
index d08b1a4981..1ad8d2deb8 100644
---
a/fe/fe-core/src/main/java/org/apache/doris/transaction/GlobalTransactionMgr.java
+++
b/fe/fe-core/src/main/java/org/apache/doris/transaction/GlobalTransactionMgr.java
@@ -134,23 +134,32 @@ public class GlobalTransactionMgr implements Writable {
TxnCoordinator coordinator, LoadJobSourceType sourceType, long
listenerId, long timeoutSecond)
throws AnalysisException, LabelAlreadyUsedException,
BeginTransactionException, DuplicatedRequestException,
QuotaExceedException, MetaNotFoundException {
+ try {
+ if (Config.disable_load_job) {
+ throw new AnalysisException("disable_load_job is set to true,
all load jobs are prevented");
+ }
- if (Config.disable_load_job) {
- throw new AnalysisException("disable_load_job is set to true, all
load jobs are prevented");
- }
-
- switch (sourceType) {
- case BACKEND_STREAMING:
- checkValidTimeoutSecond(timeoutSecond,
Config.max_stream_load_timeout_second,
- Config.min_load_timeout_second);
- break;
- default:
- checkValidTimeoutSecond(timeoutSecond,
Config.max_load_timeout_second, Config.min_load_timeout_second);
- }
+ switch (sourceType) {
+ case BACKEND_STREAMING:
+ checkValidTimeoutSecond(timeoutSecond,
Config.max_stream_load_timeout_second,
+ Config.min_load_timeout_second);
+ break;
+ default:
+ checkValidTimeoutSecond(timeoutSecond,
Config.max_load_timeout_second,
+ Config.min_load_timeout_second);
+ }
- DatabaseTransactionMgr dbTransactionMgr =
getDatabaseTransactionMgr(dbId);
- return dbTransactionMgr.beginTransaction(tableIdList, label, requestId,
+ DatabaseTransactionMgr dbTransactionMgr =
getDatabaseTransactionMgr(dbId);
+ return dbTransactionMgr.beginTransaction(tableIdList, label,
requestId,
coordinator, sourceType, listenerId, timeoutSecond);
+ } catch (DuplicatedRequestException e) {
+ throw e;
+ } catch (Exception e) {
+ if (MetricRepo.isInit) {
+ MetricRepo.COUNTER_TXN_REJECT.increase(1L);
+ }
+ throw e;
+ }
}
private void checkValidTimeoutSecond(long timeoutSecond, int
maxLoadTimeoutSecond,
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
