fanhualta commented on a change in pull request #3191:
URL: https://github.com/apache/iotdb/pull/3191#discussion_r639874870
##########
File path:
server/src/main/java/org/apache/iotdb/db/engine/storagegroup/StorageGroupProcessor.java
##########
@@ -2605,39 +2605,61 @@ private boolean loadTsFileByType(
targetFile.getParentFile().mkdirs();
}
try {
- FileUtils.moveFile(syncedTsFile, targetFile);
+ FileUtils.moveFile(tsFileToLoad, targetFile);
} catch (IOException e) {
logger.error(
"File renaming failed when loading tsfile. Origin: {}, Target: {}",
- syncedTsFile.getAbsolutePath(),
+ tsFileToLoad.getAbsolutePath(),
targetFile.getAbsolutePath(),
e);
throw new LoadFileException(
String.format(
"File renaming failed when loading tsfile. Origin: %s, Target:
%s, because %s",
- syncedTsFile.getAbsolutePath(), targetFile.getAbsolutePath(),
e.getMessage()));
+ tsFileToLoad.getAbsolutePath(), targetFile.getAbsolutePath(),
e.getMessage()));
}
- File syncedResourceFile =
- fsFactory.getFile(syncedTsFile.getAbsolutePath() +
TsFileResource.RESOURCE_SUFFIX);
+ File resourceFileToLoad =
+ fsFactory.getFile(tsFileToLoad.getAbsolutePath() +
TsFileResource.RESOURCE_SUFFIX);
File targetResourceFile =
fsFactory.getFile(targetFile.getAbsolutePath() +
TsFileResource.RESOURCE_SUFFIX);
try {
- FileUtils.moveFile(syncedResourceFile, targetResourceFile);
+ FileUtils.moveFile(resourceFileToLoad, targetResourceFile);
} catch (IOException e) {
logger.error(
"File renaming failed when loading .resource file. Origin: {},
Target: {}",
- syncedResourceFile.getAbsolutePath(),
+ resourceFileToLoad.getAbsolutePath(),
targetResourceFile.getAbsolutePath(),
e);
throw new LoadFileException(
String.format(
"File renaming failed when loading .resource file. Origin: %s,
Target: %s, because %s",
- syncedResourceFile.getAbsolutePath(),
+ resourceFileToLoad.getAbsolutePath(),
targetResourceFile.getAbsolutePath(),
e.getMessage()));
}
+ File modFileToLoad =
+ fsFactory.getFile(tsFileToLoad.getAbsolutePath() +
TsFileResource.RESOURCE_SUFFIX);
+ if (modFileToLoad.exists()) {
+ File targetModFile =
+ fsFactory.getFile(targetFile.getAbsolutePath() +
TsFileResource.RESOURCE_SUFFIX);
Review comment:
fixed.
--
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:
[email protected]
