Skip to content

[branch-2.0](load) fix commit txn timeout when loading to table with many tablet (#40031) #40140

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
xiaokang merged 1 commit into from
Sep 11, 2024
Merged

[branch-2.0](load) fix commit txn timeout when loading to table with many tablet (#40031) #40140

Show file tree
Hide file tree
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
17 changes: 10 additions & 7 deletions fe/fe-core/src/main/java/org/apache/doris/load/BrokerFileGroup.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -191,13 +191,16 @@ public void parse(Database db, DataDescription dataDescription) throws DdlExcept
}
}

boolean isPartitionRestoring = olapTable.getPartitions().stream().anyMatch(
partition -> partition.getState() == PartitionState.RESTORE
);

// restore table
if (!isPartitionRestoring && olapTable.getState() == OlapTableState.RESTORE) {
throw new DdlException("Table [" + olapTable.getName() + "] is under restore");
// only do check when here's restore on this table now
if (olapTable.getState() == OlapTableState.RESTORE) {
boolean hasPartitionRestoring = olapTable.getPartitions().stream()
.anyMatch(partition -> partition.getState() == PartitionState.RESTORE);
// tbl RESTORE && all partition NOT RESTORE -> whole table restore
// tbl RESTORE && some partition RESTORE -> just partitions restore, NOT WHOLE TABLE
// so check wether the whole table restore here
if (!hasPartitionRestoring) {
throw new DdlException("Table [" + olapTable.getName() + "] is under restore");
}
}

if (olapTable.getKeysType() != KeysType.AGG_KEYS && dataDescription.isNegative()) {
Expand Down
50 changes: 33 additions & 17 deletions fe/fe-core/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 @@ -462,7 +462,9 @@ private void checkCommitStatus(List<Table> tableList, TransactionState transacti
List<Long> tabletIds = tabletCommitInfos.stream()
.map(TabletCommitInfo::getTabletId).collect(Collectors.toList());
List<TabletMeta> tabletMetaList = tabletInvertedIndex.getTabletMetaList(tabletIds);
HashMap<Long, Boolean> tableIdtoRestoring = new HashMap<>();
for (int i = 0; i < tabletMetaList.size(); i++) {
// get partition and table of this tablet
TabletMeta tabletMeta = tabletMetaList.get(i);
if (tabletMeta == TabletInvertedIndex.NOT_EXIST_TABLET_META) {
continue;
Expand All @@ -471,29 +473,43 @@ private void checkCommitStatus(List<Table> tableList, TransactionState transacti
long tableId = tabletMeta.getTableId();
OlapTable tbl = (OlapTable) idToTable.get(tableId);
if (tbl == null) {
// this can happen when tableId == -1 (tablet being dropping)
// or table really not exist.
// this can happen when tableId == -1 (tablet being dropping) or table really not exist.
continue;
}

// check relative partition restore here
long partitionId = tabletMeta.getPartitionId();
Partition partition = tbl.getPartition(partitionId);
if (partition == null) {
// this can happen when partitionId == -1 (tablet being dropping)
// or partition really not exist.
if (tbl.getPartition(partitionId) == null) {
// this can happen when partitionId == -1 (tablet being dropping) or partition really not exist.
continue;
} else if (partition.getState() == PartitionState.RESTORE) {
// partition which need load data
}
if (tbl.getPartition(partitionId).getState() == PartitionState.RESTORE) {
// partition in restore process which can not load data
throw new LoadException("Table [" + tbl.getName() + "], Partition ["
+ partition.getName() + "] is in restore process. Can not load into it");
}
boolean isPartitionRestoring = tbl.getPartitions().stream().anyMatch(
curPartition -> curPartition.getState() == PartitionState.RESTORE
);
// restore table
if (!isPartitionRestoring && tbl.getState() == OlapTableState.RESTORE) {
throw new LoadException("Table " + tbl.getName() + " is in restore process. "
+ "Can not load into it");
+ tbl.getPartition(partitionId).getName() + "] is in restore process. Can not load into it");
}

// only do check when here's restore on this table now
if (tbl.getState() == OlapTableState.RESTORE) {
boolean hasPartitionRestoring = false;
if (tableIdtoRestoring.containsKey(tableId)) {
hasPartitionRestoring = tableIdtoRestoring.get(tableId);
} else {
for (Partition partition : tbl.getPartitions()) {
if (partition.getState() == PartitionState.RESTORE) {
hasPartitionRestoring = true;
break;
}
}
tableIdtoRestoring.put(tableId, hasPartitionRestoring);
}
// tbl RESTORE && all partition NOT RESTORE -> whole table restore
// tbl RESTORE && some partition RESTORE -> just partitions restore, NOT WHOLE TABLE
// so check wether the whole table restore here
if (!hasPartitionRestoring) {
throw new LoadException(
"Table " + tbl.getName() + " is in restore process. " + "Can not load into it");
}
}

if (!tableToPartition.containsKey(tableId)) {
Expand Down