add log file name

apache · Mar 12, 2020 · 7b3d758 · 7b3d758
1 parent 6df3d43
commit 7b3d758
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 4 deletions.
diff --git a/server/src/main/java/org/apache/iotdb/db/engine/merge/task/MergeFileTask.java b/server/src/main/java/org/apache/iotdb/db/engine/merge/task/MergeFileTask.java
@@ -118,14 +118,14 @@ private void moveMergedToOld(TsFileResource seqFile) throws IOException {
       return;
     }
 
+    TsFileIOWriter oldFileWriter = null;
     seqFile.getWriteQueryLock().writeLock().lock();
     try {
       TsFileMetaDataCache.getInstance().remove(seqFile);
       DeviceMetaDataCache.getInstance().remove(seqFile);
       FileReaderManager.getInstance().closeFileAndRemoveReader(seqFile);
 
       resource.removeFileReader(seqFile);
-      TsFileIOWriter oldFileWriter;
       try {
         oldFileWriter = new ForceAppendTsFileWriter(seqFile.getFile());
         mergeLogger.logFileMergeStart(seqFile.getFile(), ((ForceAppendTsFileWriter) oldFileWriter).getTruncatePosition());
@@ -166,7 +166,8 @@ private void moveMergedToOld(TsFileResource seqFile) throws IOException {
               new File(nextMergeVersionFile.getAbsolutePath() + TsFileResource.RESOURCE_SUFFIX));
       seqFile.setFile(nextMergeVersionFile);
     } catch (Exception e) {
-      logger.error(e.getMessage(), e);
+      logger.error("merge broken file: " + oldFileWriter.getFile().getAbsolutePath(), e);
+      throw e;
     } finally {
       seqFile.getWriteQueryLock().writeLock().unlock();
     }

diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/TsFileSequenceReader.java b/tsfile/src/main/java/org/apache/iotdb/tsfile/read/TsFileSequenceReader.java
@@ -18,6 +18,7 @@
  */
 package org.apache.iotdb.tsfile.read;
 
+import java.nio.BufferUnderflowException;
 import org.apache.iotdb.tsfile.common.conf.TSFileConfig;
 import org.apache.iotdb.tsfile.common.conf.TSFileDescriptor;
 import org.apache.iotdb.tsfile.compress.IUnCompressor;
@@ -260,8 +261,13 @@ public EndianType getEndianType() {
    */
   public TsFileMetaData readFileMetadata() throws IOException {
     if (tsFileMetaData == null) {
-      tsFileMetaData = TsFileMetaData
-          .deserializeFrom(readData(fileMetadataPos, fileMetadataSize), isOldVersion);
+      try {
+        tsFileMetaData = TsFileMetaData
+            .deserializeFrom(readData(fileMetadataPos, fileMetadataSize), isOldVersion);
+      } catch (BufferUnderflowException e) {
+        logger.error("file metadata deserialize error: " + file);
+        throw e;
+      }
     }
     if (isOldVersion) {
       tsFileMetaData.setTotalChunkNum(countTotalChunkNum());