[IOTDB-470]fix IllegalArgumentException when there exists 0 byte TsFi…

…le (#784) * fix IllegalArgumentException when there exists 0 byte TsFile
apache · Feb 11, 2020 · 1013014 · 1013014
1 parent e3f7437
commit 1013014
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 1 deletion.
diff --git a/server/src/main/java/org/apache/iotdb/db/engine/storagegroup/StorageGroupProcessor.java b/server/src/main/java/org/apache/iotdb/db/engine/storagegroup/StorageGroupProcessor.java
@@ -265,9 +265,17 @@ private void recover() throws StorageGroupProcessorException {
       recoverUnseqFiles(unseqTsFiles);
 
       for (TsFileResource resource : seqTsFiles) {
+        //After recover, case the TsFile's length is equal to 0, delete both the TsFileResource and the file itself
+        if (resource.getFile().length() == 0) {
+          deleteTsfile(resource.getFile());
+        }
         allDirectFileVersions.addAll(resource.getHistoricalVersions());
       }
       for (TsFileResource resource : unseqTsFiles) {
+        //After recover, case the TsFile's length is equal to 0, delete both the TsFileResource and the file itself
+        if (resource.getFile().length() == 0) {
+          deleteTsfile(resource.getFile());
+        }
         allDirectFileVersions.addAll(resource.getHistoricalVersions());
       }
 

diff --git a/server/src/main/java/org/apache/iotdb/db/utils/UpgradeUtils.java b/server/src/main/java/org/apache/iotdb/db/utils/UpgradeUtils.java
@@ -58,12 +58,16 @@ public static ReadWriteLock getUpgradeLogLock() {
    */
   public static boolean isNeedUpgrade(TsFileResource tsFileResource) {
     tsFileResource.getWriteQueryLock().readLock().lock();
+    //case the TsFile's length is equal to 0, the TsFile does not need to be upgraded
+    if (tsFileResource.getFile().length() == 0) {
+      return false;
+    }
     try (TsFileSequenceReader tsFileSequenceReader = new TsFileSequenceReader(
         tsFileResource.getFile().getAbsolutePath())) {
       if (tsFileSequenceReader.readVersionNumber().equals(TSFileConfig.OLD_VERSION)) {
         return true;
       }
-    } catch (IOException e) {
+    } catch (Exception e) {
       logger.error("meet error when judge whether file needs to be upgraded, the file's path:{}",
           tsFileResource.getFile().getAbsolutePath(), e);
     } finally {