You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@doris.apache.org by GitBox <gi...@apache.org> on 2020/04/24 14:06:09 UTC
[GitHub] [incubator-doris] morningman commented on a change in pull request #3369: Support txn management in db level isolation and use ArrayDeque to improve txn task performance
morningman commented on a change in pull request #3369:
URL: https://github.com/apache/incubator-doris/pull/3369#discussion_r412283934
##########
File path: fe/src/main/java/org/apache/doris/transaction/DatabaseTransactionMgr.java
##########
@@ -0,0 +1,556 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
+
+package org.apache.doris.transaction;
+
+import com.google.common.base.Joiner;
+import com.google.common.base.Preconditions;
+import com.google.common.collect.Lists;
+import com.google.common.collect.Maps;
+import com.google.common.collect.Sets;
+import org.apache.commons.lang3.tuple.ImmutablePair;
+import org.apache.commons.lang3.tuple.Pair;
+import org.apache.doris.catalog.Catalog;
+import org.apache.doris.catalog.Database;
+import org.apache.doris.catalog.OlapTable;
+import org.apache.doris.catalog.Partition;
+import org.apache.doris.catalog.Table;
+import org.apache.doris.common.AnalysisException;
+import org.apache.doris.common.ErrorCode;
+import org.apache.doris.common.ErrorReport;
+import org.apache.doris.common.util.TimeUtils;
+import org.apache.doris.common.UserException;
+import org.apache.doris.mysql.privilege.PrivPredicate;
+import org.apache.doris.persist.EditLog;
+import org.apache.doris.qe.ConnectContext;
+import org.apache.doris.task.AgentBatchTask;
+import org.apache.doris.task.AgentTaskExecutor;
+import org.apache.doris.task.AgentTaskQueue;
+import org.apache.doris.task.ClearTransactionTask;
+import org.apache.doris.task.PublishVersionTask;
+import org.apache.doris.thrift.TTaskType;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+
+import java.util.ArrayDeque;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.concurrent.atomic.AtomicInteger;
+import java.util.concurrent.locks.ReentrantReadWriteLock;
+import java.util.stream.Collectors;
+
+public class DatabaseTransactionMgr {
Review comment:
Please add some comment for this class
##########
File path: fe/src/main/java/org/apache/doris/transaction/GlobalTransactionMgr.java
##########
@@ -216,11 +206,11 @@ public long beginTransaction(long dbId, List<Long> tableIdList, String label, TU
}
throw e;
} finally {
- writeUnlock();
+ dbTransactionMgr.writeUnlock();
}
}
- private void checkRunningTxnExceedLimit(long dbId, LoadJobSourceType sourceType) throws BeginTransactionException {
+ private void checkRunningTxnExceedLimit(DatabaseTransactionMgr dbTransactionMgr, Long dbId, LoadJobSourceType sourceType) throws BeginTransactionException {
Review comment:
Parameter `dbTransactionMgr` and `dbId` are redundant, I think we can get dbTransactionMgr from dbId, and we can also get dbId from dbTransactionMgr.
So only one of them is needed.
##########
File path: fe/src/main/java/org/apache/doris/transaction/GlobalTransactionMgr.java
##########
@@ -500,8 +485,15 @@ public boolean commitAndPublishTransaction(Database db, long transactionId,
} finally {
db.writeUnlock();
}
-
- TransactionState transactionState = idToTransactionState.get(transactionId);
+ DatabaseTransactionMgr dbTransactionMgr = getDatabaseTransactioMgr(db.getId());
+ TransactionState transactionState = null;
+ dbTransactionMgr.readLock();
Review comment:
How about not expose the dbTransactionMgr's lock outside?
##########
File path: fe/src/main/java/org/apache/doris/transaction/DatabaseTransactionMgr.java
##########
@@ -0,0 +1,556 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
+
+package org.apache.doris.transaction;
+
+import com.google.common.base.Joiner;
+import com.google.common.base.Preconditions;
+import com.google.common.collect.Lists;
+import com.google.common.collect.Maps;
+import com.google.common.collect.Sets;
+import org.apache.commons.lang3.tuple.ImmutablePair;
+import org.apache.commons.lang3.tuple.Pair;
+import org.apache.doris.catalog.Catalog;
+import org.apache.doris.catalog.Database;
+import org.apache.doris.catalog.OlapTable;
+import org.apache.doris.catalog.Partition;
+import org.apache.doris.catalog.Table;
+import org.apache.doris.common.AnalysisException;
+import org.apache.doris.common.ErrorCode;
+import org.apache.doris.common.ErrorReport;
+import org.apache.doris.common.util.TimeUtils;
+import org.apache.doris.common.UserException;
+import org.apache.doris.mysql.privilege.PrivPredicate;
+import org.apache.doris.persist.EditLog;
+import org.apache.doris.qe.ConnectContext;
+import org.apache.doris.task.AgentBatchTask;
+import org.apache.doris.task.AgentTaskExecutor;
+import org.apache.doris.task.AgentTaskQueue;
+import org.apache.doris.task.ClearTransactionTask;
+import org.apache.doris.task.PublishVersionTask;
+import org.apache.doris.thrift.TTaskType;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+
+import java.util.ArrayDeque;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.concurrent.atomic.AtomicInteger;
+import java.util.concurrent.locks.ReentrantReadWriteLock;
+import java.util.stream.Collectors;
+
+public class DatabaseTransactionMgr {
+
+ private static final Logger LOG = LogManager.getLogger(DatabaseTransactionMgr.class);
+
+ // the lock is used to control the access to transaction states
+ // no other locks should be inside this lock
+ private ReentrantReadWriteLock transactionLock = new ReentrantReadWriteLock(true);
+
+ // transactionId -> running TransactionState
+ private Map<Long, TransactionState> idToRunningTransactionState = Maps.newHashMap();
+
+ // transactionId -> final status TransactionState
+ private Map<Long, TransactionState> idToFinalStatusTransactionState = Maps.newHashMap();
+
+
+ // to store transtactionStates with final status
+ private ArrayDeque<TransactionState> finalStatusTransactionStateDeque = new ArrayDeque<>();
+
+ // label -> txn ids
+ // this is used for checking if label already used. a label may correspond to multiple txns,
+ // and only one is success.
+ // this member should be consistent with idToTransactionState,
+ // which means if a txn exist in idToRunningTransactionState or idToFinalStatusTransactionState
+ // it must exists in dbIdToTxnLabels, and vice versa
+ private Map<String, Set<Long>> labelToTxnIds = Maps.newConcurrentMap();
+
+
+ // count the number of running txns of database, except for the routine load txn
+ private AtomicInteger runningTxnNums = new AtomicInteger(0);
+
+ // count only the number of running routine load txns of database
+ private AtomicInteger runningRoutineLoadTxnNums = new AtomicInteger(0);
+
+ private EditLog editLog;
+
+ private List<ClearTransactionTask> clearTransactionTasks = Lists.newArrayList();
+
+ protected void readLock() {
+ this.transactionLock.readLock().lock();
+ }
+
+ protected void readUnlock() {
+ this.transactionLock.readLock().unlock();
+ }
+
+ protected void writeLock() {
+ this.transactionLock.writeLock().lock();
+ }
+
+ protected void writeUnlock() {
+ this.transactionLock.writeLock().unlock();
+ }
+
+ public DatabaseTransactionMgr(EditLog editLog) {
+ this.editLog = editLog;
+ }
+
+ public TransactionState getTransactionState(Long transactionId) {
+ TransactionState transactionState = idToRunningTransactionState.get(transactionId);
+ if (transactionState != null) {
+ return transactionState;
+ } else {
+ return idToFinalStatusTransactionState.get(transactionId);
+ }
+ }
+
+ public Set<Long> getTxnIdsByLabel(String label) {
+ return labelToTxnIds.get(label);
+ }
+
+ public int getRunningTxnNums() {
+ return runningTxnNums.get();
+ }
+
+ public int getRunningRoutineLoadTxnNums() {
+ return runningRoutineLoadTxnNums.get();
+ }
+
+ public int getFinishedTxnNums() {
+ return finalStatusTransactionStateDeque.size();
+ }
+
+ public List<List<String>> getTxnStateInfoList(boolean running, int limit) {
+ List<List<String>> infos = Lists.newArrayList();
+ Collection<TransactionState> transactionStateCollection = null;
+ readLock();
+ try {
+ if (running) {
+ transactionStateCollection = idToRunningTransactionState.values();
+ } else {
+ transactionStateCollection = finalStatusTransactionStateDeque;
+ }
+ // get transaction order by txn id desc limit 'limit'
+ transactionStateCollection.stream()
+ .sorted(TransactionState.TXN_ID_COMPARATOR)
+ .limit(limit)
+ .forEach(t -> {
+ List<String> info = Lists.newArrayList();
+ getTxnStateInfo(t, info);
+ infos.add(info);
+ });
+ } finally {
+ readUnlock();
+ }
+ return infos;
+ }
+
+ private void getTxnStateInfo(TransactionState txnState, List<String> info) {
+ info.add(String.valueOf(txnState.getTransactionId()));
+ info.add(txnState.getLabel());
+ info.add(txnState.getCoordinator().toString());
+ info.add(txnState.getTransactionStatus().name());
+ info.add(txnState.getSourceType().name());
+ info.add(TimeUtils.longToTimeString(txnState.getPrepareTime()));
+ info.add(TimeUtils.longToTimeString(txnState.getCommitTime()));
+ info.add(TimeUtils.longToTimeString(txnState.getFinishTime()));
+ info.add(txnState.getReason());
+ info.add(String.valueOf(txnState.getErrorReplicas().size()));
+ info.add(String.valueOf(txnState.getCallbackId()));
+ info.add(String.valueOf(txnState.getTimeoutMs()));
+ }
+
+ public void deleteTransaction(TransactionState transactionState) {
+ writeLock();
+ try {
+ // here we only delete the oldest element, so if element exist in finalStatusTransactionStateDeque,
+ // it must at the front of the finalStatusTransactionStateDeque
+ if (!finalStatusTransactionStateDeque.isEmpty() &&
+ transactionState.getTransactionId() == finalStatusTransactionStateDeque.getFirst().getTransactionId()) {
+ finalStatusTransactionStateDeque.pop();
+ idToFinalStatusTransactionState.remove(transactionState.getTransactionId());
+ Set<Long> txnIds = labelToTxnIds.get(transactionState.getLabel());
+ txnIds.remove(transactionState.getTransactionId());
+ if (txnIds.isEmpty()) {
+ labelToTxnIds.remove(transactionState.getLabel());
+ }
+ }
+ } finally {
+ writeUnlock();
+ }
+ }
+
+ public Map<Long, TransactionState> getIdToRunningTransactionState() {
+ return idToRunningTransactionState;
+ }
+
+ public ArrayDeque<TransactionState> getFinalStatusTransactionStateDeque() {
+ return finalStatusTransactionStateDeque;
+ }
+
+ protected void unprotectedCommitTransaction(TransactionState transactionState, Set<Long> errorReplicaIds,
+ Map<Long, Set<Long>> tableToPartition, Set<Long> totalInvolvedBackends,
+ Database db) {
+ // transaction state is modified during check if the transaction could committed
+ if (transactionState.getTransactionStatus() != TransactionStatus.PREPARE) {
+ return;
+ }
+ // update transaction state version
+ transactionState.setCommitTime(System.currentTimeMillis());
+ transactionState.setTransactionStatus(TransactionStatus.COMMITTED);
+ transactionState.setErrorReplicas(errorReplicaIds);
+ for (long tableId : tableToPartition.keySet()) {
+ TableCommitInfo tableCommitInfo = new TableCommitInfo(tableId);
+ for (long partitionId : tableToPartition.get(tableId)) {
+ OlapTable table = (OlapTable) db.getTable(tableId);
+ Partition partition = table.getPartition(partitionId);
+ PartitionCommitInfo partitionCommitInfo = new PartitionCommitInfo(partitionId,
+ partition.getNextVersion(),
+ partition.getNextVersionHash());
+ tableCommitInfo.addPartitionCommitInfo(partitionCommitInfo);
+ }
+ transactionState.putIdToTableCommitInfo(tableId, tableCommitInfo);
+ }
+ // persist transactionState
+ unprotectUpsertTransactionState(transactionState, false);
+
+ // add publish version tasks. set task to null as a placeholder.
+ // tasks will be created when publishing version.
+ for (long backendId : totalInvolvedBackends) {
+ transactionState.addPublishVersionTask(backendId, null);
+ }
+ }
+
+ // for add/update/delete TransactionState
+ protected void unprotectUpsertTransactionState(TransactionState transactionState, boolean isReplay) {
+ // if this is a replay operation, we should not log it
+ if (!isReplay) {
+ if (transactionState.getTransactionStatus() != TransactionStatus.PREPARE
+ || transactionState.getSourceType() == TransactionState.LoadJobSourceType.FRONTEND) {
+ // if this is a prepare txn, and load source type is not FRONTEND
+ // no need to persist it. if prepare txn lost, the following commit will just be failed.
+ // user only need to retry this txn.
+ // The FRONTEND type txn is committed and running asynchronously, so we have to persist it.
+ editLog.logInsertTransactionState(transactionState);
+ }
+ }
+
+ if (transactionState.isRunning()) {
+ idToRunningTransactionState.put(transactionState.getTransactionId(), transactionState);
+ } else {
+ idToRunningTransactionState.remove(transactionState.getTransactionId());
+ idToFinalStatusTransactionState.put(transactionState.getTransactionId(), transactionState);
+ finalStatusTransactionStateDeque.add(transactionState);
+ }
+
+ updateTxnLabels(transactionState);
+ updateDbRunningTxnNum(transactionState.getPreStatus(), transactionState);
+ }
+
+ private void updateTxnLabels(TransactionState transactionState) {
+ Set<Long> txnIds = labelToTxnIds.get(transactionState.getLabel());
+ if (txnIds == null) {
+ txnIds = Sets.newHashSet();
+ labelToTxnIds.put(transactionState.getLabel(), txnIds);
+ }
+ txnIds.add(transactionState.getTransactionId());
+ }
+
+ private void updateDbRunningTxnNum(TransactionStatus preStatus, TransactionState curTxnState) {
+ AtomicInteger txnNum = null;
+ if (curTxnState.getSourceType() == TransactionState.LoadJobSourceType.ROUTINE_LOAD_TASK) {
+ txnNum = runningRoutineLoadTxnNums;
+ } else {
+ txnNum = runningTxnNums;
+ }
+
+ if (preStatus == null
+ && (curTxnState.getTransactionStatus() == TransactionStatus.PREPARE
+ || curTxnState.getTransactionStatus() == TransactionStatus.COMMITTED)) {
+ txnNum.incrementAndGet();
+ } else if ((preStatus == TransactionStatus.PREPARE
+ || preStatus == TransactionStatus.COMMITTED)
+ && (curTxnState.getTransactionStatus() == TransactionStatus.VISIBLE
+ || curTxnState.getTransactionStatus() == TransactionStatus.ABORTED)) {
+ txnNum.decrementAndGet();
+ }
+ }
+
+ public void abortTransaction(long transactionId, String reason, TxnCommitAttachment txnCommitAttachment) throws UserException {
+ if (transactionId < 0) {
+ LOG.info("transaction id is {}, less than 0, maybe this is an old type load job, ignore abort operation", transactionId);
+ return;
+ }
+ TransactionState transactionState = idToRunningTransactionState.get(transactionId);
+ if (transactionState == null) {
+ throw new UserException("transaction not found");
+ }
+
+ // update transaction state extra if exists
+ if (txnCommitAttachment != null) {
+ transactionState.setTxnCommitAttachment(txnCommitAttachment);
+ }
+
+ // before state transform
+ transactionState.beforeStateTransform(TransactionStatus.ABORTED);
+ boolean txnOperated = false;
+ writeLock();
+ try {
+ txnOperated = unprotectAbortTransaction(transactionId, reason);
+ } finally {
+ writeUnlock();
+ transactionState.afterStateTransform(TransactionStatus.ABORTED, txnOperated, reason);
+ }
+
+ // send clear txn task to BE to clear the transactions on BE.
+ // This is because parts of a txn may succeed in some BE, and these parts of txn should be cleared
+ // explicitly, or it will be remained on BE forever
+ // (However the report process will do the diff and send clear txn tasks to BE, but that is our
+ // last defense)
+ if (txnOperated && transactionState.getTransactionStatus() == TransactionStatus.ABORTED) {
+ clearBackendTransactions(transactionState);
+ }
+ }
+
+ private boolean unprotectAbortTransaction(long transactionId, String reason)
+ throws UserException {
+ TransactionState transactionState = getTransactionState(transactionId);
+ if (transactionState == null) {
+ throw new UserException("transaction not found");
+ }
+ if (transactionState.getTransactionStatus() == TransactionStatus.ABORTED) {
+ return false;
+ }
+ if (transactionState.getTransactionStatus() == TransactionStatus.COMMITTED
+ || transactionState.getTransactionStatus() == TransactionStatus.VISIBLE) {
+ throw new UserException("transaction's state is already "
+ + transactionState.getTransactionStatus() + ", could not abort");
+ }
+ transactionState.setFinishTime(System.currentTimeMillis());
+ transactionState.setReason(reason);
+ transactionState.setTransactionStatus(TransactionStatus.ABORTED);
+ unprotectUpsertTransactionState(transactionState, false);
+ for (PublishVersionTask task : transactionState.getPublishVersionTasks().values()) {
+ AgentTaskQueue.removeTask(task.getBackendId(), TTaskType.PUBLISH_VERSION, task.getSignature());
+ }
+ return true;
+ }
+
+ private void clearBackendTransactions(TransactionState transactionState) {
+ Preconditions.checkState(transactionState.getTransactionStatus() == TransactionStatus.ABORTED);
+ // for aborted transaction, we don't know which backends are involved, so we have to send clear task
+ // to all backends.
+ List<Long> allBeIds = Catalog.getCurrentSystemInfo().getBackendIds(false);
+ AgentBatchTask batchTask = null;
+ synchronized (clearTransactionTasks) {
+ for (Long beId : allBeIds) {
+ ClearTransactionTask task = new ClearTransactionTask(beId, transactionState.getTransactionId(), Lists.newArrayList());
+ clearTransactionTasks.add(task);
+ }
+
+ // try to group send tasks, not sending every time a txn is aborted. to avoid too many task rpc.
+ if (clearTransactionTasks.size() > allBeIds.size() * 2) {
+ batchTask = new AgentBatchTask();
+ for (ClearTransactionTask clearTransactionTask : clearTransactionTasks) {
+ batchTask.addTask(clearTransactionTask);
+ }
+ clearTransactionTasks.clear();
+ }
+ }
+
+ if (batchTask != null) {
+ AgentTaskExecutor.submit(batchTask);
+ }
+ }
+
+
+ protected List<List<Comparable>> getTableTransInfo(long txnId) throws AnalysisException {
+ List<List<Comparable>> tableInfos = new ArrayList<>();
+ readLock();
+ try {
+ TransactionState transactionState = getTransactionState(txnId);
+ if (null == transactionState) {
+ throw new AnalysisException("Transaction[" + txnId + "] does not exist.");
+ }
+
+ for (Map.Entry<Long, TableCommitInfo> entry : transactionState.getIdToTableCommitInfos().entrySet()) {
+ List<Comparable> tableInfo = new ArrayList<>();
+ tableInfo.add(entry.getKey());
+ tableInfo.add(Joiner.on(", ").join(entry.getValue().getIdToPartitionCommitInfo().values().stream().map(
+ PartitionCommitInfo::getPartitionId).collect(Collectors.toList())));
+ tableInfos.add(tableInfo);
+ }
+ } finally {
+ readUnlock();
+ }
+ return tableInfos;
+ }
+
+ protected List<List<Comparable>> getPartitionTransInfo(long txnId, long tableId) throws AnalysisException {
+ List<List<Comparable>> partitionInfos = new ArrayList<List<Comparable>>();
+ readLock();
+ try {
+ TransactionState transactionState = getTransactionState(txnId);
+ if (null == transactionState) {
+ throw new AnalysisException("Transaction[" + txnId + "] does not exist.");
+ }
+
+ TableCommitInfo tableCommitInfo = transactionState.getIdToTableCommitInfos().get(tableId);
+ Map<Long, PartitionCommitInfo> idToPartitionCommitInfo = tableCommitInfo.getIdToPartitionCommitInfo();
+ for (Map.Entry<Long, PartitionCommitInfo> entry : idToPartitionCommitInfo.entrySet()) {
+ List<Comparable> partitionInfo = new ArrayList<Comparable>();
+ partitionInfo.add(entry.getKey());
+ partitionInfo.add(entry.getValue().getVersion());
+ partitionInfo.add(entry.getValue().getVersionHash());
+ partitionInfos.add(partitionInfo);
+ }
+ } finally {
+ readUnlock();
+ }
+ return partitionInfos;
+ }
+
+ public void removeExpiredTxns() {
+ long currentMillis = System.currentTimeMillis();
+ writeLock();
+ try {
+ while (!finalStatusTransactionStateDeque.isEmpty()) {
+ TransactionState transactionState = finalStatusTransactionStateDeque.getFirst();
+ if (transactionState.isExpired(currentMillis)) {
+ finalStatusTransactionStateDeque.pop();
+ Set<Long> txnIds = labelToTxnIds.get(transactionState.getLabel());
+ txnIds.remove(transactionState.getTransactionId());
+ if (txnIds.isEmpty()) {
+ labelToTxnIds.remove(transactionState.getLabel());
+ }
+ editLog.logDeleteTransactionState(transactionState);
+ LOG.info("transaction [" + transactionState.getTransactionId() + "] is expired, remove it from transaction manager");
+ } else {
+ break;
+ }
+
+ }
+ } finally {
+ writeUnlock();
+ }
+ }
+
+ public int getTransactionNum() {
+ return idToRunningTransactionState.size() + finalStatusTransactionStateDeque.size();
Review comment:
finalStatusTransactionStateDeque is not thread safe. So does it matter to call this without ReadLock?
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@doris.apache.org
For additional commands, e-mail: commits-help@doris.apache.org