Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -708,8 +708,14 @@ protected boolean checkFailedPreviousLoadAndAbort() throws UserException {
if (Config.enable_abort_txn_by_checking_conflict_txn) {
List<TransactionState> failedTxns = GlobalTransactionMgr.checkFailedTxns(unFinishedTxns);
for (TransactionState txn : failedTxns) {
Env.getCurrentGlobalTransactionMgr()
.abortTransaction(txn.getDbId(), txn.getTransactionId(), "Cancel by schema change");
try {
Env.getCurrentGlobalTransactionMgr()
.abortTransaction(txn.getDbId(), txn.getTransactionId(), "Cancel by schema change");
Comment thread
mymeiyi marked this conversation as resolved.
Resolved
} catch (UserException e) {
Comment thread
mymeiyi marked this conversation as resolved.
Resolved
LOG.warn("failed to abort previous load txn {}, wait next round. rollup job: {}",
txn.getTransactionId(), jobId, e);
return false;
}
}
}
return unFinishedTxns.isEmpty();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -515,6 +515,10 @@ public static boolean checkFailedTxnsByCoordinator(TransactionState txn) {
public static List<TransactionState> checkFailedTxns(List<TransactionState> conflictTxns) {
List<TransactionState> failedTxns = new ArrayList<>();
for (TransactionState txn : conflictTxns) {
TransactionStatus status = txn.getTransactionStatus();
if (status == TransactionStatus.COMMITTED || status.isFinalStatus()) {
continue;
}
if (checkFailedTxnsByCoordinator(txn)) {
failedTxns.add(txn);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,13 @@
import org.apache.doris.thrift.TStorageFormat;
import org.apache.doris.thrift.TTaskType;
import org.apache.doris.transaction.FakeTransactionIDGenerator;
import org.apache.doris.transaction.GlobalTransactionMgr;
import org.apache.doris.transaction.GlobalTransactionMgrIface;
import org.apache.doris.transaction.TransactionState;
import org.apache.doris.transaction.TransactionState.LoadJobSourceType;
import org.apache.doris.transaction.TransactionState.TxnCoordinator;
import org.apache.doris.transaction.TransactionState.TxnSourceType;
import org.apache.doris.transaction.TransactionStatus;

import com.google.common.collect.Lists;
import org.junit.jupiter.api.AfterEach;
Expand Down Expand Up @@ -144,6 +150,37 @@ public void tearDown() {
}
}

@Test
public void testCommitWhileAbortingPreviousLoad() throws Exception {
long txnId = masterTransMgr.beginTransaction(CatalogTestUtil.testDbId1,
Lists.newArrayList(CatalogTestUtil.testTableId1), "commit_during_rollup_abort",
new TxnCoordinator(TxnSourceType.FE, 0, "missing", 0), LoadJobSourceType.FRONTEND, 60);
TransactionState txn = masterTransMgr.getTransactionState(CatalogTestUtil.testDbId1, txnId);
Database db = masterEnv.getInternalCatalog().getDbOrDdlException(CatalogTestUtil.testDbId1);
OlapTable table = (OlapTable) db.getTableOrDdlException(CatalogTestUtil.testTableId1);
MaterializedViewHandler handler = masterEnv.getMaterializedViewHandler();
handler.process(Lists.newArrayList(op), db, table);
RollupJobV2 job = (RollupJobV2) handler.getAlterJobsV2().values().iterator().next();
job.jobState = JobState.WAITING_TXN;
job.watershedTxnId = txnId + 1;

try (MockedStatic<GlobalTransactionMgr> mocked = Mockito.mockStatic(
GlobalTransactionMgr.class, Mockito.CALLS_REAL_METHODS)) {
mocked.when(() -> GlobalTransactionMgr.checkFailedTxns(Mockito.anyList())).thenAnswer(invocation -> {
List<TransactionState> failed = (List<TransactionState>) invocation.callRealMethod();
Assertions.assertEquals(List.of(txn), failed);
txn.setTransactionStatus(TransactionStatus.COMMITTED);
return failed;
});
job.runWaitingTxnJob();
Assertions.assertEquals(JobState.WAITING_TXN, job.getJobState());
Assertions.assertEquals(TransactionStatus.COMMITTED, txn.getTransactionStatus());
}
Assertions.assertFalse(job.checkFailedPreviousLoadAndAbort());
txn.setTransactionStatus(TransactionStatus.VISIBLE);
Assertions.assertTrue(job.checkFailedPreviousLoadAndAbort());
}

@Test
public void testRunRollupJobConcurrentLimit() throws UserException {
if (fakeEnv != null) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -126,6 +126,25 @@ public void tearDown() {
}
}

@Test
public void testCheckFailedTxnsWithOfflineCoordinator() {
FakeEnv.setEnv(masterEnv);
for (TxnSourceType source : List.of(TxnSourceType.FE, TxnSourceType.BE)) {
TransactionState txn = new TransactionState(CatalogTestUtil.testDbId1,
Lists.newArrayList(CatalogTestUtil.testTableId1), 1, "offline_coordinator", null,
LoadJobSourceType.FRONTEND, new TxnCoordinator(source, Long.MAX_VALUE, "missing", 0), -1, 60000);
for (TransactionStatus status : List.of(TransactionStatus.PREPARE, TransactionStatus.PRECOMMITTED)) {
txn.setTransactionStatus(status);
Assertions.assertEquals(List.of(txn), GlobalTransactionMgr.checkFailedTxns(List.of(txn)));
}
for (TransactionStatus status : List.of(TransactionStatus.COMMITTED,
TransactionStatus.VISIBLE, TransactionStatus.ABORTED)) {
txn.setTransactionStatus(status);
Assertions.assertTrue(GlobalTransactionMgr.checkFailedTxns(List.of(txn)).isEmpty());
}
}
}

@Test
public void testBeginTransaction() throws LabelAlreadyUsedException, AnalysisException,
BeginTransactionException, DuplicatedRequestException, QuotaExceedException, MetaNotFoundException {
Expand Down
Loading