You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by ma...@apache.org on 2022/11/28 13:10:09 UTC
[iotdb] branch IOTDB-5074 created (now fa421f7a9b)
This is an automated email from the ASF dual-hosted git repository.
marklau99 pushed a change to branch IOTDB-5074
in repository https://gitbox.apache.org/repos/asf/iotdb.git
at fa421f7a9b try to add storage group name and region id for snapshot taker and loader
This branch includes the following new commits:
new fa421f7a9b try to add storage group name and region id for snapshot taker and loader
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: try to add storage group name and region id for snapshot taker and loader
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
marklau99 pushed a commit to branch IOTDB-5074
in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit fa421f7a9ba0fb70dfd355c9dbd9e7ed56a2b34e
Author: LiuXuxin <li...@outlook.com>
AuthorDate: Mon Nov 28 21:09:53 2022 +0800
try to add storage group name and region id for snapshot taker and loader
---
.../iotdb/db/consensus/statemachine/DataRegionStateMachine.java | 7 ++++++-
.../java/org/apache/iotdb/db/engine/snapshot/SnapshotLoader.java | 4 ++++
.../java/org/apache/iotdb/db/engine/snapshot/SnapshotTaker.java | 4 ++++
3 files changed, 14 insertions(+), 1 deletion(-)
diff --git a/server/src/main/java/org/apache/iotdb/db/consensus/statemachine/DataRegionStateMachine.java b/server/src/main/java/org/apache/iotdb/db/consensus/statemachine/DataRegionStateMachine.java
index bf602a7d5f..b40154288e 100644
--- a/server/src/main/java/org/apache/iotdb/db/consensus/statemachine/DataRegionStateMachine.java
+++ b/server/src/main/java/org/apache/iotdb/db/consensus/statemachine/DataRegionStateMachine.java
@@ -447,7 +447,12 @@ public class DataRegionStateMachine extends BaseStateMachine {
@Override
public File getSnapshotRoot() {
- String snapshotDir = IoTDBDescriptor.getInstance().getConfig().getRatisDataRegionSnapshotDir();
+ String snapshotDir =
+ IoTDBDescriptor.getInstance().getConfig().getRatisDataRegionSnapshotDir()
+ + File.separator
+ + region.getStorageGroupName()
+ + "-"
+ + region.getDataRegionId();
try {
return new File(snapshotDir).getCanonicalFile();
} catch (IOException e) {
diff --git a/server/src/main/java/org/apache/iotdb/db/engine/snapshot/SnapshotLoader.java b/server/src/main/java/org/apache/iotdb/db/engine/snapshot/SnapshotLoader.java
index c70fa8844e..7bdca1fa10 100644
--- a/server/src/main/java/org/apache/iotdb/db/engine/snapshot/SnapshotLoader.java
+++ b/server/src/main/java/org/apache/iotdb/db/engine/snapshot/SnapshotLoader.java
@@ -326,6 +326,10 @@ public class SnapshotLoader {
+ File.separator
+ IoTDBConstant.SNAPSHOT_FOLDER_NAME
+ File.separator
+ + storageGroupName
+ + "-"
+ + dataRegionId
+ + File.separator
+ snapshotId;
fileCnt += takeHardLinksFromSnapshotToDataDir(dataDir, new File(snapshotDir), fileInfoSet);
}
diff --git a/server/src/main/java/org/apache/iotdb/db/engine/snapshot/SnapshotTaker.java b/server/src/main/java/org/apache/iotdb/db/engine/snapshot/SnapshotTaker.java
index 80132d5e60..c01e5a0c25 100644
--- a/server/src/main/java/org/apache/iotdb/db/engine/snapshot/SnapshotTaker.java
+++ b/server/src/main/java/org/apache/iotdb/db/engine/snapshot/SnapshotTaker.java
@@ -226,6 +226,10 @@ public class SnapshotTaker {
}
stringBuilder.append(IoTDBConstant.SNAPSHOT_FOLDER_NAME);
stringBuilder.append(File.separator);
+ stringBuilder.append(dataRegion.getStorageGroupName());
+ stringBuilder.append("-");
+ stringBuilder.append(dataRegion.getDataRegionId());
+ stringBuilder.append(File.separator);
stringBuilder.append(snapshotId);
stringBuilder.append(File.separator);
// the content in here will be