You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by xi...@apache.org on 2023/02/09 03:16:34 UTC
[iotdb] branch rel/0.13 updated: Skip broken tsfile when recovering system (#9000)
This is an automated email from the ASF dual-hosted git repository.
xingtanzjr pushed a commit to branch rel/0.13
in repository https://gitbox.apache.org/repos/asf/iotdb.git
The following commit(s) were added to refs/heads/rel/0.13 by this push:
new b5d32113e6 Skip broken tsfile when recovering system (#9000)
b5d32113e6 is described below
commit b5d32113e67aff94a0a62901467cde9badec74d0
Author: Alan Choo <43...@users.noreply.github.com>
AuthorDate: Thu Feb 9 11:16:28 2023 +0800
Skip broken tsfile when recovering system (#9000)
---
.../iotdb/db/engine/storagegroup/VirtualStorageGroupProcessor.java | 2 +-
.../org/apache/iotdb/db/writelog/recover/TsFileRecoverPerformer.java | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/server/src/main/java/org/apache/iotdb/db/engine/storagegroup/VirtualStorageGroupProcessor.java b/server/src/main/java/org/apache/iotdb/db/engine/storagegroup/VirtualStorageGroupProcessor.java
index 481506caf7..6ebde45053 100755
--- a/server/src/main/java/org/apache/iotdb/db/engine/storagegroup/VirtualStorageGroupProcessor.java
+++ b/server/src/main/java/org/apache/iotdb/db/engine/storagegroup/VirtualStorageGroupProcessor.java
@@ -843,7 +843,7 @@ public class VirtualStorageGroupProcessor {
tsFileManager.add(tsFileResource, isSeq);
updateLastFlushTime(tsFileResource, isSeq);
}
- } catch (StorageGroupProcessorException | IOException e) {
+ } catch (Throwable e) {
logger.warn(
"Skip TsFile: {} because of error in recover: ", tsFileResource.getTsFilePath(), e);
} finally {
diff --git a/server/src/main/java/org/apache/iotdb/db/writelog/recover/TsFileRecoverPerformer.java b/server/src/main/java/org/apache/iotdb/db/writelog/recover/TsFileRecoverPerformer.java
index 9846acf6de..83d892ec8c 100644
--- a/server/src/main/java/org/apache/iotdb/db/writelog/recover/TsFileRecoverPerformer.java
+++ b/server/src/main/java/org/apache/iotdb/db/writelog/recover/TsFileRecoverPerformer.java
@@ -167,7 +167,7 @@ public class TsFileRecoverPerformer {
private void recoverResourceFromFile() throws IOException {
try {
tsFileResource.deserialize();
- } catch (IOException e) {
+ } catch (Throwable e) {
logger.warn(
"Cannot deserialize TsFileResource {}, construct it using " + "TsFileSequenceReader",
tsFileResource.getTsFile(),