Skip to content

[Bug] Fix bug that runningTxnNum does not equal to the real running txn num #3674

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
morningman merged 1 commit into from
May 25, 2020
Merged

[Bug] Fix bug that runningTxnNum does not equal to the real running txn num #3674

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
45 changes: 16 additions & 29 deletions fe/src/main/java/org/apache/doris/transaction/DatabaseTransactionMgr.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -814,16 +814,26 @@ protected void unprotectUpsertTransactionState(TransactionState transactionState
editLog.logInsertTransactionState(transactionState);
}
}
// for commit transaction, there is nothing to do
if (transactionState.getTransactionStatus() == TransactionStatus.PREPARE) {
idToRunningTransactionState.put(transactionState.getTransactionId(), transactionState);
} else if (transactionState.getTransactionStatus().isFinalStatus()) {
idToRunningTransactionState.remove(transactionState.getTransactionId());
if (!transactionState.getTransactionStatus().isFinalStatus()) {
if (idToRunningTransactionState.put(transactionState.getTransactionId(), transactionState) == null) {
if (transactionState.getSourceType() == TransactionState.LoadJobSourceType.ROUTINE_LOAD_TASK) {
runningRoutineLoadTxnNums++;
} else {
runningTxnNums++;
}
}
} else {
if (idToRunningTransactionState.remove(transactionState.getTransactionId()) != null) {
if (transactionState.getSourceType() == TransactionState.LoadJobSourceType.ROUTINE_LOAD_TASK) {
runningRoutineLoadTxnNums--;
} else {
runningTxnNums--;
}
}
idToFinalStatusTransactionState.put(transactionState.getTransactionId(), transactionState);
finalStatusTransactionStateDeque.add(transactionState);
}
updateTxnLabels(transactionState);
updateDbRunningTxnNum(transactionState.getPreStatus(), transactionState);
}

private void updateTxnLabels(TransactionState transactionState) {
Expand All @@ -835,27 +845,6 @@ private void updateTxnLabels(TransactionState transactionState) {
txnIds.add(transactionState.getTransactionId());
}

private void updateDbRunningTxnNum(TransactionStatus preStatus, TransactionState curTxnState) {
if (preStatus == null
&& (curTxnState.getTransactionStatus() == TransactionStatus.PREPARE
|| curTxnState.getTransactionStatus() == TransactionStatus.COMMITTED)) {
if (curTxnState.getSourceType() == TransactionState.LoadJobSourceType.ROUTINE_LOAD_TASK) {
runningRoutineLoadTxnNums++;
} else {
runningTxnNums++;
}
} else if ((preStatus == TransactionStatus.PREPARE
|| preStatus == TransactionStatus.COMMITTED)
&& (curTxnState.getTransactionStatus() == TransactionStatus.VISIBLE
|| curTxnState.getTransactionStatus() == TransactionStatus.ABORTED)) {
if (curTxnState.getSourceType() == TransactionState.LoadJobSourceType.ROUTINE_LOAD_TASK) {
runningRoutineLoadTxnNums--;
} else {
runningTxnNums--;
}
}
}

public void abortTransaction(String label, String reason) throws UserException {
Preconditions.checkNotNull(label);
long transactionId = -1;
Expand Down Expand Up @@ -1362,8 +1351,6 @@ public void replayUpsertTransactionState(TransactionState transactionState) {
}
}



public List<List<String>> getDbTransStateInfo() {
List<List<String>> infos = Lists.newArrayList();
readLock();
Expand Down