You are viewing a plain text version of this content. The canonical link for it is here.
Posted to reviews@iotdb.apache.org by GitBox <gi...@apache.org> on 2022/12/05 22:26:26 UTC
[GitHub] [iotdb] Caideyipi opened a new pull request, #8341: [IOTDB-5108] Added region migration sql
Caideyipi opened a new pull request, #8341:
URL: https://github.com/apache/iotdb/pull/8341
## IOTDB-5108
1. Added region migration sql
2. Fixed some doc
<!--
In each section, please describe design decisions made, including:
- Choice of algorithms
- Behavioral aspects. What configuration values are acceptable? How are corner cases and error
conditions handled, such as when there are insufficient resources?
- Class organization and design (how the logic is split between classes, inheritance, composition,
design patterns)
- Method organization and design (how the logic is split between methods, parameters and return types)
- Naming (class, method, API, configuration, HTTP endpoint, names of emitted metrics)
-->
<!-- It's good to describe an alternative design (or mention an alternative name) for every design
(or naming) decision point and compare the alternatives with the designs that you've implemented
(or the names you've chosen) to highlight the advantages of the chosen designs and names. -->
<!-- If there was a discussion of the design of the feature implemented in this PR elsewhere
(e. g. a "Proposal" issue, any other issue, or a thread in the development mailing list),
link to that discussion from this PR description and explain what have changed in your final design
compared to your original proposal or the consensus version in the end of the discussion.
If something hasn't changed since the original discussion, you can omit a detailed discussion of
those aspects of the design here, perhaps apart from brief mentioning for the sake of readability
of this PR description. -->
<!-- Some of the aspects mentioned above may be omitted for simple and small changes. -->
<hr>
This PR has:
- [ ] been self-reviewed.
- [ ] concurrent read
- [ ] concurrent write
- [ ] concurrent read and write
- [ ] added documentation for new or modified features or behaviors.
- [ ] added Javadocs for most classes and all non-trivial methods.
- [ ] added or updated version, __license__, or notice information
- [ ] added comments explaining the "why" and the intent of the code wherever would not be obvious
for an unfamiliar reader.
- [ ] added unit tests or modified existing tests to cover new code paths, ensuring the threshold
for code coverage.
- [ ] added integration tests.
- [ ] been tested in a test IoTDB cluster.
<!-- Check the items by putting "x" in the brackets for the done things. Not all of these items
apply to every PR. Remove the items which are not done or not relevant to the PR. None of the items
from the checklist above are strictly necessary, but it would be very helpful if you at least
self-review the PR. -->
<hr>
##### Key changed/added classes (or packages if there are too many classes) in this PR
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: reviews-unsubscribe@iotdb.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [iotdb] Beyyes merged pull request #8341: [IOTDB-5108] Added region migration sql
Posted by GitBox <gi...@apache.org>.
Beyyes merged PR #8341:
URL: https://github.com/apache/iotdb/pull/8341
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: reviews-unsubscribe@iotdb.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [iotdb] CRZbulabula commented on a diff in pull request #8341: [IOTDB-5108] Added region migration sql
Posted by GitBox <gi...@apache.org>.
CRZbulabula commented on code in PR #8341:
URL: https://github.com/apache/iotdb/pull/8341#discussion_r1044383246
##########
confignode/src/main/java/org/apache/iotdb/confignode/manager/ProcedureManager.java:
##########
@@ -331,6 +336,94 @@ public boolean removeDataNode(RemoveDataNodePlan removeDataNodePlan) {
return true;
}
+ public TSStatus migrateRegion(TMigrateRegionReq migrateRegionReq) {
+ // TODO: Whether to guarantee the check high consistency, i.e, use consensus read to check
+ Map<TConsensusGroupId, RegionGroupCache> regionReplicaMap =
+ configManager.getPartitionManager().getRegionGroupCacheMap();
+ Optional<TConsensusGroupId> regionId =
+ regionReplicaMap.keySet().stream()
+ .filter(id -> id.getId() == migrateRegionReq.getRegionId())
+ .findAny();
+ TDataNodeLocation originalDataNode =
+ configManager
+ .getNodeManager()
+ .getRegisteredDataNode(migrateRegionReq.getFromId())
+ .getLocation();
+ TDataNodeLocation destDataNode =
+ configManager
+ .getNodeManager()
+ .getRegisteredDataNode(migrateRegionReq.getToId())
+ .getLocation();
+ if (!regionId.isPresent()) {
+ LOGGER.info(
+ "Submit RegionMigrateProcedure failed, because no region Group {}",
+ migrateRegionReq.getRegionId());
+ TSStatus status = new TSStatus(TSStatusCode.MIGRATE_REGION_ERROR.getStatusCode());
+ status.setMessage(
+ "Submit RegionMigrateProcedure failed, because no region Group "
+ + migrateRegionReq.getRegionId());
+ return status;
+ } else if (originalDataNode == null) {
+ LOGGER.info(
+ "Submit RegionMigrateProcedure failed, because no original DataNode {}",
+ migrateRegionReq.getFromId());
+ TSStatus status = new TSStatus(TSStatusCode.MIGRATE_REGION_ERROR.getStatusCode());
+ status.setMessage(
+ "Submit RegionMigrateProcedure failed, because no original DataNode "
+ + migrateRegionReq.getFromId());
+ return status;
+ } else if (destDataNode == null) {
+ LOGGER.info(
+ "Submit RegionMigrateProcedure failed, because no target DataNode {}",
+ migrateRegionReq.getToId());
+ TSStatus status = new TSStatus(TSStatusCode.MIGRATE_REGION_ERROR.getStatusCode());
+ status.setMessage(
+ "Submit RegionMigrateProcedure failed, because no target DataNode "
+ + migrateRegionReq.getToId());
+ return status;
+ } else if (!regionReplicaMap
+ .get(regionId.get())
+ .getStatistics()
+ .getRegionStatisticsMap()
+ .containsKey(migrateRegionReq.getFromId())) {
+ LOGGER.info(
+ "Submit RegionMigrateProcedure failed, because region group {} doesn't contain original DataNode {}",
Review Comment:
```suggestion
LOGGER.info(
"Submit RegionMigrateProcedure failed, because the original DataNode {} doesn't contain Region {}",
```
##########
confignode/src/main/java/org/apache/iotdb/confignode/manager/ProcedureManager.java:
##########
@@ -331,6 +336,94 @@ public boolean removeDataNode(RemoveDataNodePlan removeDataNodePlan) {
return true;
}
+ public TSStatus migrateRegion(TMigrateRegionReq migrateRegionReq) {
+ // TODO: Whether to guarantee the check high consistency, i.e, use consensus read to check
+ Map<TConsensusGroupId, RegionGroupCache> regionReplicaMap =
+ configManager.getPartitionManager().getRegionGroupCacheMap();
+ Optional<TConsensusGroupId> regionId =
+ regionReplicaMap.keySet().stream()
+ .filter(id -> id.getId() == migrateRegionReq.getRegionId())
+ .findAny();
+ TDataNodeLocation originalDataNode =
+ configManager
+ .getNodeManager()
+ .getRegisteredDataNode(migrateRegionReq.getFromId())
+ .getLocation();
+ TDataNodeLocation destDataNode =
+ configManager
+ .getNodeManager()
+ .getRegisteredDataNode(migrateRegionReq.getToId())
+ .getLocation();
+ if (!regionId.isPresent()) {
+ LOGGER.info(
+ "Submit RegionMigrateProcedure failed, because no region Group {}",
+ migrateRegionReq.getRegionId());
+ TSStatus status = new TSStatus(TSStatusCode.MIGRATE_REGION_ERROR.getStatusCode());
+ status.setMessage(
+ "Submit RegionMigrateProcedure failed, because no region Group "
+ + migrateRegionReq.getRegionId());
+ return status;
+ } else if (originalDataNode == null) {
+ LOGGER.info(
Review Comment:
```suggestion
LOGGER.warn(
```
##########
confignode/src/main/java/org/apache/iotdb/confignode/manager/ProcedureManager.java:
##########
@@ -331,6 +336,94 @@ public boolean removeDataNode(RemoveDataNodePlan removeDataNodePlan) {
return true;
}
+ public TSStatus migrateRegion(TMigrateRegionReq migrateRegionReq) {
+ // TODO: Whether to guarantee the check high consistency, i.e, use consensus read to check
+ Map<TConsensusGroupId, RegionGroupCache> regionReplicaMap =
+ configManager.getPartitionManager().getRegionGroupCacheMap();
+ Optional<TConsensusGroupId> regionId =
+ regionReplicaMap.keySet().stream()
+ .filter(id -> id.getId() == migrateRegionReq.getRegionId())
+ .findAny();
+ TDataNodeLocation originalDataNode =
+ configManager
+ .getNodeManager()
+ .getRegisteredDataNode(migrateRegionReq.getFromId())
+ .getLocation();
+ TDataNodeLocation destDataNode =
+ configManager
+ .getNodeManager()
+ .getRegisteredDataNode(migrateRegionReq.getToId())
+ .getLocation();
+ if (!regionId.isPresent()) {
+ LOGGER.info(
+ "Submit RegionMigrateProcedure failed, because no region Group {}",
Review Comment:
```suggestion
LOGGER.warn(
"Submit RegionMigrateProcedure failed, because no Region {}",
```
##########
confignode/src/main/java/org/apache/iotdb/confignode/manager/ProcedureManager.java:
##########
@@ -331,6 +336,94 @@ public boolean removeDataNode(RemoveDataNodePlan removeDataNodePlan) {
return true;
}
+ public TSStatus migrateRegion(TMigrateRegionReq migrateRegionReq) {
+ // TODO: Whether to guarantee the check high consistency, i.e, use consensus read to check
+ Map<TConsensusGroupId, RegionGroupCache> regionReplicaMap =
+ configManager.getPartitionManager().getRegionGroupCacheMap();
+ Optional<TConsensusGroupId> regionId =
+ regionReplicaMap.keySet().stream()
+ .filter(id -> id.getId() == migrateRegionReq.getRegionId())
+ .findAny();
+ TDataNodeLocation originalDataNode =
+ configManager
+ .getNodeManager()
+ .getRegisteredDataNode(migrateRegionReq.getFromId())
+ .getLocation();
+ TDataNodeLocation destDataNode =
+ configManager
+ .getNodeManager()
+ .getRegisteredDataNode(migrateRegionReq.getToId())
+ .getLocation();
+ if (!regionId.isPresent()) {
+ LOGGER.info(
+ "Submit RegionMigrateProcedure failed, because no region Group {}",
+ migrateRegionReq.getRegionId());
+ TSStatus status = new TSStatus(TSStatusCode.MIGRATE_REGION_ERROR.getStatusCode());
+ status.setMessage(
+ "Submit RegionMigrateProcedure failed, because no region Group "
+ + migrateRegionReq.getRegionId());
+ return status;
+ } else if (originalDataNode == null) {
+ LOGGER.info(
+ "Submit RegionMigrateProcedure failed, because no original DataNode {}",
+ migrateRegionReq.getFromId());
+ TSStatus status = new TSStatus(TSStatusCode.MIGRATE_REGION_ERROR.getStatusCode());
+ status.setMessage(
+ "Submit RegionMigrateProcedure failed, because no original DataNode "
+ + migrateRegionReq.getFromId());
+ return status;
+ } else if (destDataNode == null) {
+ LOGGER.info(
Review Comment:
```suggestion
LOGGER.warn(
```
##########
confignode/src/main/java/org/apache/iotdb/confignode/manager/ProcedureManager.java:
##########
@@ -331,6 +336,94 @@ public boolean removeDataNode(RemoveDataNodePlan removeDataNodePlan) {
return true;
}
+ public TSStatus migrateRegion(TMigrateRegionReq migrateRegionReq) {
+ // TODO: Whether to guarantee the check high consistency, i.e, use consensus read to check
+ Map<TConsensusGroupId, RegionGroupCache> regionReplicaMap =
+ configManager.getPartitionManager().getRegionGroupCacheMap();
+ Optional<TConsensusGroupId> regionId =
+ regionReplicaMap.keySet().stream()
+ .filter(id -> id.getId() == migrateRegionReq.getRegionId())
+ .findAny();
+ TDataNodeLocation originalDataNode =
+ configManager
+ .getNodeManager()
+ .getRegisteredDataNode(migrateRegionReq.getFromId())
+ .getLocation();
+ TDataNodeLocation destDataNode =
+ configManager
+ .getNodeManager()
+ .getRegisteredDataNode(migrateRegionReq.getToId())
+ .getLocation();
+ if (!regionId.isPresent()) {
+ LOGGER.info(
+ "Submit RegionMigrateProcedure failed, because no region Group {}",
+ migrateRegionReq.getRegionId());
+ TSStatus status = new TSStatus(TSStatusCode.MIGRATE_REGION_ERROR.getStatusCode());
+ status.setMessage(
+ "Submit RegionMigrateProcedure failed, because no region Group "
+ + migrateRegionReq.getRegionId());
+ return status;
+ } else if (originalDataNode == null) {
+ LOGGER.info(
+ "Submit RegionMigrateProcedure failed, because no original DataNode {}",
+ migrateRegionReq.getFromId());
+ TSStatus status = new TSStatus(TSStatusCode.MIGRATE_REGION_ERROR.getStatusCode());
+ status.setMessage(
+ "Submit RegionMigrateProcedure failed, because no original DataNode "
+ + migrateRegionReq.getFromId());
+ return status;
+ } else if (destDataNode == null) {
+ LOGGER.info(
+ "Submit RegionMigrateProcedure failed, because no target DataNode {}",
+ migrateRegionReq.getToId());
+ TSStatus status = new TSStatus(TSStatusCode.MIGRATE_REGION_ERROR.getStatusCode());
+ status.setMessage(
+ "Submit RegionMigrateProcedure failed, because no target DataNode "
+ + migrateRegionReq.getToId());
+ return status;
+ } else if (!regionReplicaMap
+ .get(regionId.get())
+ .getStatistics()
+ .getRegionStatisticsMap()
+ .containsKey(migrateRegionReq.getFromId())) {
+ LOGGER.info(
+ "Submit RegionMigrateProcedure failed, because region group {} doesn't contain original DataNode {}",
+ migrateRegionReq.getRegionId(),
+ migrateRegionReq.getFromId());
+ TSStatus status = new TSStatus(TSStatusCode.MIGRATE_REGION_ERROR.getStatusCode());
+ status.setMessage(
+ "Submit RegionMigrateProcedure failed, because region group "
+ + migrateRegionReq.getRegionId()
+ + " doesn't contain original DataNode "
+ + migrateRegionReq.getFromId());
+ return status;
+ } else if (regionReplicaMap
+ .get(regionId.get())
+ .getStatistics()
+ .getRegionStatisticsMap()
+ .containsKey(migrateRegionReq.getToId())) {
+ LOGGER.info(
+ "Submit RegionMigrateProcedure failed, because region Group {} already contains target DataNode {}",
Review Comment:
```suggestion
LOGGER.warn(
"Submit RegionMigrateProcedure failed, because the target DataNode {} already contains Region {}",
```
##########
confignode/src/main/java/org/apache/iotdb/confignode/manager/ProcedureManager.java:
##########
@@ -331,6 +336,94 @@ public boolean removeDataNode(RemoveDataNodePlan removeDataNodePlan) {
return true;
}
+ public TSStatus migrateRegion(TMigrateRegionReq migrateRegionReq) {
+ // TODO: Whether to guarantee the check high consistency, i.e, use consensus read to check
+ Map<TConsensusGroupId, RegionGroupCache> regionReplicaMap =
+ configManager.getPartitionManager().getRegionGroupCacheMap();
+ Optional<TConsensusGroupId> regionId =
+ regionReplicaMap.keySet().stream()
+ .filter(id -> id.getId() == migrateRegionReq.getRegionId())
+ .findAny();
+ TDataNodeLocation originalDataNode =
+ configManager
+ .getNodeManager()
+ .getRegisteredDataNode(migrateRegionReq.getFromId())
+ .getLocation();
+ TDataNodeLocation destDataNode =
+ configManager
+ .getNodeManager()
+ .getRegisteredDataNode(migrateRegionReq.getToId())
+ .getLocation();
+ if (!regionId.isPresent()) {
+ LOGGER.info(
+ "Submit RegionMigrateProcedure failed, because no region Group {}",
+ migrateRegionReq.getRegionId());
+ TSStatus status = new TSStatus(TSStatusCode.MIGRATE_REGION_ERROR.getStatusCode());
+ status.setMessage(
+ "Submit RegionMigrateProcedure failed, because no region Group "
+ + migrateRegionReq.getRegionId());
+ return status;
+ } else if (originalDataNode == null) {
+ LOGGER.info(
+ "Submit RegionMigrateProcedure failed, because no original DataNode {}",
+ migrateRegionReq.getFromId());
+ TSStatus status = new TSStatus(TSStatusCode.MIGRATE_REGION_ERROR.getStatusCode());
+ status.setMessage(
+ "Submit RegionMigrateProcedure failed, because no original DataNode "
+ + migrateRegionReq.getFromId());
+ return status;
+ } else if (destDataNode == null) {
+ LOGGER.info(
+ "Submit RegionMigrateProcedure failed, because no target DataNode {}",
+ migrateRegionReq.getToId());
+ TSStatus status = new TSStatus(TSStatusCode.MIGRATE_REGION_ERROR.getStatusCode());
+ status.setMessage(
+ "Submit RegionMigrateProcedure failed, because no target DataNode "
+ + migrateRegionReq.getToId());
+ return status;
+ } else if (!regionReplicaMap
+ .get(regionId.get())
+ .getStatistics()
+ .getRegionStatisticsMap()
+ .containsKey(migrateRegionReq.getFromId())) {
+ LOGGER.info(
+ "Submit RegionMigrateProcedure failed, because region group {} doesn't contain original DataNode {}",
+ migrateRegionReq.getRegionId(),
+ migrateRegionReq.getFromId());
+ TSStatus status = new TSStatus(TSStatusCode.MIGRATE_REGION_ERROR.getStatusCode());
+ status.setMessage(
+ "Submit RegionMigrateProcedure failed, because region group "
+ + migrateRegionReq.getRegionId()
+ + " doesn't contain original DataNode "
+ + migrateRegionReq.getFromId());
+ return status;
+ } else if (regionReplicaMap
+ .get(regionId.get())
+ .getStatistics()
+ .getRegionStatisticsMap()
+ .containsKey(migrateRegionReq.getToId())) {
+ LOGGER.info(
+ "Submit RegionMigrateProcedure failed, because region Group {} already contains target DataNode {}",
+ migrateRegionReq.getRegionId(),
+ migrateRegionReq.getToId());
+ TSStatus status = new TSStatus(TSStatusCode.MIGRATE_REGION_ERROR.getStatusCode());
+ status.setMessage(
+ "Submit RegionMigrateProcedure failed, because region Group "
+ + migrateRegionReq.getRegionId()
+ + " already contains target DataNode "
+ + migrateRegionReq.getToId());
+ return status;
+ }
+ this.executor.submitProcedure(
+ new RegionMigrateProcedure(regionId.get(), originalDataNode, destDataNode));
+ LOGGER.info(
+ "Submit RegionMigrateProcedure successfully, ConsensusGroup: {}, From: {}, To: {}",
Review Comment:
```suggestion
"Submit RegionMigrateProcedure successfully, Region: {}, From: {}, To: {}",
```
##########
confignode/src/main/java/org/apache/iotdb/confignode/consensus/request/write/region/MigrateRegionPlan.java:
##########
@@ -0,0 +1,92 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.iotdb.confignode.consensus.request.write.region;
+
+import org.apache.iotdb.confignode.consensus.request.ConfigPhysicalPlan;
+import org.apache.iotdb.confignode.consensus.request.ConfigPhysicalPlanType;
+
+import java.io.DataOutputStream;
+import java.io.IOException;
+import java.nio.ByteBuffer;
+
+public class MigrateRegionPlan extends ConfigPhysicalPlan {
+
+ private int regionId;
+
+ private int fromId;
+
+ private int toId;
+
+ public MigrateRegionPlan() {
+ super(ConfigPhysicalPlanType.MigrateRegion);
+ }
+
+ public MigrateRegionPlan(int regionId, int fromId, int toId) {
+ this();
+ this.regionId = regionId;
+ this.fromId = fromId;
+ this.toId = toId;
+ }
+
+ public int getRegionId() {
+ return this.regionId;
+ }
+
+ public int getFromId() {
+ return this.fromId;
+ }
+
+ public int getToId() {
+ return this.toId;
+ }
+
+ @Override
+ protected void serializeImpl(DataOutputStream stream) throws IOException {
+ stream.writeShort(getType().getPlanType());
+ stream.writeInt(regionId);
+ stream.writeInt(fromId);
+ stream.writeInt(toId);
+ }
+
+ @Override
+ protected void deserializeImpl(ByteBuffer buffer) throws IOException {
+ this.regionId = buffer.getInt();
+ this.fromId = buffer.getInt();
+ this.toId = buffer.getInt();
+ }
Review Comment:
Don't forget to add serialize and deserialize tests~
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: reviews-unsubscribe@iotdb.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org