Skip to content

Fix fe restart failed bug when replay erase table log #5221

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
Jan 19, 2021
Merged

Fix fe restart failed bug when replay erase table log #5221

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
9 changes: 5 additions & 4 deletions fe/fe-core/src/main/java/org/apache/doris/catalog/CatalogRecycleBin.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,9 @@

public class CatalogRecycleBin extends MasterDaemon implements Writable {
private static final Logger LOG = LogManager.getLogger(CatalogRecycleBin.class);
// erase meta at least after minEraseLatency milliseconds
// to avoid erase log ahead of drop log
private static final long minEraseLatency = 10 * 60 * 1000; // 10 min

private Map<Long, RecycleDatabaseInfo> idToDatabase;
private Map<Long, RecycleTableInfo> idToTable;
Expand Down Expand Up @@ -130,10 +133,8 @@ public synchronized boolean recyclePartition(long dbId, long tableId, Partition
}

private synchronized boolean isExpire(long id, long currentTimeMs) {
if (currentTimeMs - idToRecycleTime.get(id) > Config.catalog_trash_expire_second * 1000L) {
return true;
}
return false;
long latency = currentTimeMs - idToRecycleTime.get(id);
return latency > minEraseLatency && latency > Config.catalog_trash_expire_second * 1000L;
}

private synchronized void eraseDatabase(long currentTimeMs) {
Expand Down