diff --git a/fe/fe-core/src/main/java/org/apache/doris/backup/RestoreJob.java b/fe/fe-core/src/main/java/org/apache/doris/backup/RestoreJob.java index 63459e5da5..2e20a9fa22 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/backup/RestoreJob.java +++ b/fe/fe-core/src/main/java/org/apache/doris/backup/RestoreJob.java @@ -1123,6 +1123,7 @@ public class RestoreJob extends AbstractJob { // generate new partition id long newPartId = env.getNextId(); + long oldPartId = remotePart.getId(); remotePart.setIdForRestore(newPartId); // indexes @@ -1142,9 +1143,11 @@ public class RestoreJob extends AbstractJob { // save version info for creating replicas long visibleVersion = remotePart.getVisibleVersion(); + LOG.info("reset partition {} for restore, visible version: {}, old partition id: {}", + newPartId, visibleVersion, oldPartId); // tablets - Map nextIndexs = Maps.newHashMap(); + Map nextIndexes = Maps.newHashMap(); for (MaterializedIndex remoteIdx : remotePart.getMaterializedIndices(IndexExtState.VISIBLE)) { int schemaHash = remoteTbl.getSchemaHashByIndexId(remoteIdx.getId()); int remotetabletSize = remoteIdx.getTablets().size(); @@ -1159,7 +1162,7 @@ public class RestoreJob extends AbstractJob { // replicas try { Pair>, TStorageMedium> beIdsAndMedium = Env.getCurrentSystemInfo() - .selectBackendIdsForReplicaCreation(replicaAlloc, nextIndexs, null, false, false); + .selectBackendIdsForReplicaCreation(replicaAlloc, nextIndexes, null, false, false); Map> beIds = beIdsAndMedium.first; for (Map.Entry> entry : beIds.entrySet()) { for (Long beId : entry.getValue()) { 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 3e21d8824f..e2c791777d 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 @@ -1470,7 +1470,7 @@ public class DatabaseTransactionMgr { protected void unprotectedCommitTransaction2PC(TransactionState transactionState, Database db) { // transaction state is modified during check if the transaction could committed if (transactionState.getTransactionStatus() != TransactionStatus.PRECOMMITTED) { - LOG.warn("Unknow exception. state of transaction [{}] changed, failed to commit transaction", + LOG.warn("Unknown exception. state of transaction [{}] changed, failed to commit transaction", transactionState.getTransactionId()); return; }