Skip to content

[To dev/1.3] Fix async recover TsfileResource error handle #14235

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
HTHou merged 3 commits into from
Nov 29, 2024
Merged

[To dev/1.3] Fix async recover TsfileResource error handle #14235

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7d53f1a
Fix async recover TsfileResource error handle
HTHou Nov 28, 2024
f596439
fix compile
HTHou Nov 28, 2024
64ed830
fix IT
HTHou Nov 28, 2024
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
3 changes: 2 additions & 1 deletion ...-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/DataRegion.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -888,7 +888,8 @@ private Callable<Void> recoverFilesInPartition(
Callable<Void> asyncRecoverTask = null;
for (TsFileResource tsFileResource : resourceList) {
tsFileManager.add(tsFileResource, isSeq);
if (fileTimeIndexMap.containsKey(tsFileResource.getTsFileID())) {
if (fileTimeIndexMap.containsKey(tsFileResource.getTsFileID())
&& tsFileResource.resourceFileExists()) {
tsFileResource.setTimeIndex(fileTimeIndexMap.get(tsFileResource.getTsFileID()));
tsFileResource.setStatus(TsFileResourceStatus.NORMAL);
resourceListForAsyncRecover.add(tsFileResource);
Expand Down
15 changes: 12 additions & 3 deletions ...src/main/java/org/apache/iotdb/db/storageengine/dataregion/utils/TsFileResourceUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,13 @@

package org.apache.iotdb.db.storageengine.dataregion.utils;

import org.apache.iotdb.db.conf.IoTDBConfig;
import org.apache.iotdb.db.conf.IoTDBDescriptor;
import org.apache.iotdb.db.storageengine.dataregion.compaction.execute.utils.CompactionUtils;
import org.apache.iotdb.db.storageengine.dataregion.tsfile.TsFileResource;
import org.apache.iotdb.db.storageengine.dataregion.tsfile.TsFileResourceStatus;
import org.apache.iotdb.db.storageengine.dataregion.tsfile.timeindex.DeviceTimeIndex;
import org.apache.iotdb.db.storageengine.dataregion.tsfile.timeindex.ITimeIndex;

import org.apache.tsfile.common.conf.TSFileConfig;
import org.apache.tsfile.common.conf.TSFileDescriptor;
Expand Down Expand Up @@ -61,6 +64,7 @@

public class TsFileResourceUtils {
private static final Logger logger = LoggerFactory.getLogger(TsFileResourceUtils.class);
private static final IoTDBConfig config = IoTDBDescriptor.getInstance().getConfig();
private static final String VALIDATE_FAILED = "validate failed,";

private TsFileResourceUtils() {
Expand Down Expand Up @@ -425,14 +429,19 @@ public static void updateTsFileResource(

public static void updateTsFileResource(
Map<IDeviceID, List<TimeseriesMetadata>> device2Metadata, TsFileResource tsFileResource) {
// For async recover tsfile, there might be a FileTimeIndex, we need a new newTimeIndex
ITimeIndex newTimeIndex =
tsFileResource.getTimeIndex().getTimeIndexType() == ITimeIndex.FILE_TIME_INDEX_TYPE
? config.getTimeIndexLevel().getTimeIndex()
: tsFileResource.getTimeIndex();
for (Map.Entry<IDeviceID, List<TimeseriesMetadata>> entry : device2Metadata.entrySet()) {
for (TimeseriesMetadata timeseriesMetaData : entry.getValue()) {
tsFileResource.updateStartTime(
newTimeIndex.updateStartTime(
entry.getKey(), timeseriesMetaData.getStatistics().getStartTime());
tsFileResource.updateEndTime(
entry.getKey(), timeseriesMetaData.getStatistics().getEndTime());
newTimeIndex.updateEndTime(entry.getKey(), timeseriesMetaData.getStatistics().getEndTime());
}
}
tsFileResource.setTimeIndex(newTimeIndex);
}

/**
Expand Down