You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by ha...@apache.org on 2023/01/04 01:37:19 UTC

[iotdb] branch recover_log_13 created (now 71ccd11bdc)

This is an automated email from the ASF dual-hosted git repository.

haonan pushed a change to branch recover_log_13
in repository https://gitbox.apache.org/repos/asf/iotdb.git


      at 71ccd11bdc [To rel/0.13][IOTDB-5346] Fix log error in MemtableFlushTask when recovering

This branch includes the following new commits:

     new 71ccd11bdc [To rel/0.13][IOTDB-5346] Fix log error in MemtableFlushTask when recovering

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.



[iotdb] 01/01: [To rel/0.13][IOTDB-5346] Fix log error in MemtableFlushTask when recovering

Posted by ha...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

haonan pushed a commit to branch recover_log_13
in repository https://gitbox.apache.org/repos/asf/iotdb.git

commit 71ccd11bdc480392f4375f3bb36ca6003ea2bc20
Author: HTHou <hh...@outlook.com>
AuthorDate: Wed Jan 4 09:33:57 2023 +0800

    [To rel/0.13][IOTDB-5346] Fix log error in MemtableFlushTask when recovering
---
 .../apache/iotdb/db/writelog/recover/TsFileRecoverPerformer.java   | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

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 4d0dbb5f1c..9846acf6de 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
@@ -291,11 +291,16 @@ public class TsFileRecoverPerformer {
     try {
       if (!recoverMemTable.isEmpty() && recoverMemTable.getSeriesNumber() != 0) {
         // flush logs
+        String virtualStorageGroupId =
+            tsFileResource.getTsFile().getParentFile().getParentFile().getName();
+        String logicalStorageGroupName =
+            tsFileResource.getTsFile().getParentFile().getParentFile().getParentFile().getName();
+
         MemTableFlushTask tableFlushTask =
             new MemTableFlushTask(
                 recoverMemTable,
                 restorableTsFileIOWriter,
-                tsFileResource.getTsFile().getParentFile().getParentFile().getName());
+                logicalStorageGroupName + File.separator + virtualStorageGroupId);
         tableFlushTask.syncFlushMemTable();
         tsFileResource.updatePlanIndexes(recoverMemTable.getMinPlanIndex());
         tsFileResource.updatePlanIndexes(recoverMemTable.getMaxPlanIndex());