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

[iotdb] branch rel/0.13 updated: [To rel/0.13][IOTDB-5346] Fix log error in MemtableFlushTask when recovering (#8725)

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

qiaojialin 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 37aee820f7 [To rel/0.13][IOTDB-5346] Fix log error in MemtableFlushTask when recovering (#8725)
37aee820f7 is described below

commit 37aee820f7bf469267150bcb09ffef433ba57918
Author: Haonan <hh...@outlook.com>
AuthorDate: Wed Jan 4 11:26:25 2023 +0800

    [To rel/0.13][IOTDB-5346] Fix log error in MemtableFlushTask when recovering (#8725)
---
 .../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());