You are viewing a plain text version of this content. The canonical link for it is here.
Posted to reviews@iotdb.apache.org by "MarcosZyk (via GitHub)" <gi...@apache.org> on 2023/02/22 10:26:55 UTC
[GitHub] [iotdb] MarcosZyk opened a new pull request, #9120: [IOTDB-5516] Accelerate async delete DataRegion during dropping database
MarcosZyk opened a new pull request, #9120:
URL: https://github.com/apache/iotdb/pull/9120
## Description
### Content1 ...
### Content2 ...
### Content3 ...
<!--
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] CRZbulabula commented on a diff in pull request #9120: [IOTDB-5516] Accelerate async delete DataRegion during dropping database
Posted by "CRZbulabula (via GitHub)" <gi...@apache.org>.
CRZbulabula commented on code in PR #9120:
URL: https://github.com/apache/iotdb/pull/9120#discussion_r1115209447
##########
confignode/src/main/java/org/apache/iotdb/confignode/manager/partition/PartitionManager.java:
##########
@@ -754,69 +760,181 @@ public void maintainRegionReplicas() {
List<RegionMaintainTask> regionMaintainTaskList =
partitionInfo.getRegionMaintainEntryList();
- if (!regionMaintainTaskList.isEmpty()) {
- for (RegionMaintainTask entry : regionMaintainTaskList) {
- TSStatus status;
- switch (entry.getType()) {
- case CREATE:
- RegionCreateTask createEntry = (RegionCreateTask) entry;
- LOGGER.info(
- "Start to create Region: {} on DataNode: {}",
- createEntry.getRegionReplicaSet().getRegionId(),
- createEntry.getTargetDataNode());
- switch (createEntry.getRegionReplicaSet().getRegionId().getType()) {
- case SchemaRegion:
- // Create SchemaRegion
- status =
- SyncDataNodeClientPool.getInstance()
- .sendSyncRequestToDataNodeWithRetry(
- createEntry.getTargetDataNode().getInternalEndPoint(),
- new TCreateSchemaRegionReq(
- createEntry.getRegionReplicaSet(),
- createEntry.getStorageGroup()),
- DataNodeRequestType.CREATE_SCHEMA_REGION);
- break;
-
- case DataRegion:
- default:
- // Create DataRegion
- status =
- SyncDataNodeClientPool.getInstance()
- .sendSyncRequestToDataNodeWithRetry(
- createEntry.getTargetDataNode().getInternalEndPoint(),
- new TCreateDataRegionReq(
- createEntry.getRegionReplicaSet(),
- createEntry.getStorageGroup())
- .setTtl(createEntry.getTTL()),
- DataNodeRequestType.CREATE_DATA_REGION);
- }
- break;
+ if (regionMaintainTaskList.isEmpty()) {
+ return;
+ }
- case DELETE:
- default:
- // Delete Region
- RegionDeleteTask deleteEntry = (RegionDeleteTask) entry;
- LOGGER.info(
- "Start to delete Region: {} on DataNode: {}",
- deleteEntry.getRegionId(),
- deleteEntry.getTargetDataNode());
- status =
- SyncDataNodeClientPool.getInstance()
- .sendSyncRequestToDataNodeWithRetry(
- deleteEntry.getTargetDataNode().getInternalEndPoint(),
- deleteEntry.getRegionId(),
- DataNodeRequestType.DELETE_REGION);
+ // group tasks by region id
+ Map<TConsensusGroupId, Queue<RegionMaintainTask>> regionMaintainTaskMap =
+ new HashMap<>();
+ for (RegionMaintainTask regionMaintainTask : regionMaintainTaskList) {
+ regionMaintainTaskMap
+ .computeIfAbsent(regionMaintainTask.getRegionId(), k -> new LinkedList<>())
+ .add(regionMaintainTask);
+ }
+
+ while (!regionMaintainTaskMap.isEmpty()) {
+
+ // select same type task from each region group
+ List<RegionMaintainTask> selectedRegionMaintainTask = new ArrayList<>();
+ RegionMaintainType currentType = null;
+ for (Map.Entry<TConsensusGroupId, Queue<RegionMaintainTask>> entry :
+ regionMaintainTaskMap.entrySet()) {
+ RegionMaintainTask regionMaintainTask = entry.getValue().peek();
+ if (regionMaintainTask != null) {
+ if (currentType == null
+ || regionMaintainTask.getType().equals(RegionMaintainType.DELETE)
Review Comment:
Awesome! the division logic is correct~ By the way, could you please add more annotations for these division codes? Because they might be difficult for others to understand~
--
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 #9120: [IOTDB-5516] Accelerate async delete DataRegion during dropping database
Posted by "CRZbulabula (via GitHub)" <gi...@apache.org>.
CRZbulabula commented on code in PR #9120:
URL: https://github.com/apache/iotdb/pull/9120#discussion_r1115190073
##########
confignode/src/main/java/org/apache/iotdb/confignode/consensus/request/write/region/PollSpecificRegionMaintainTaskPlan.java:
##########
@@ -0,0 +1,70 @@
+/*
+ * 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.common.rpc.thrift.TConsensusGroupId;
+import org.apache.iotdb.common.rpc.thrift.TConsensusGroupType;
+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;
+import java.util.HashSet;
+import java.util.Set;
+
+public class PollSpecificRegionMaintainTaskPlan extends ConfigPhysicalPlan {
Review Comment:
Add serialize and deserialize tests for PollSpecificRegionMaintainTaskPlan in ConfigPhysicalPlanSerDeTest
##########
confignode/src/main/java/org/apache/iotdb/confignode/manager/partition/PartitionManager.java:
##########
@@ -754,69 +760,181 @@ public void maintainRegionReplicas() {
List<RegionMaintainTask> regionMaintainTaskList =
partitionInfo.getRegionMaintainEntryList();
- if (!regionMaintainTaskList.isEmpty()) {
- for (RegionMaintainTask entry : regionMaintainTaskList) {
- TSStatus status;
- switch (entry.getType()) {
- case CREATE:
- RegionCreateTask createEntry = (RegionCreateTask) entry;
- LOGGER.info(
- "Start to create Region: {} on DataNode: {}",
- createEntry.getRegionReplicaSet().getRegionId(),
- createEntry.getTargetDataNode());
- switch (createEntry.getRegionReplicaSet().getRegionId().getType()) {
- case SchemaRegion:
- // Create SchemaRegion
- status =
- SyncDataNodeClientPool.getInstance()
- .sendSyncRequestToDataNodeWithRetry(
- createEntry.getTargetDataNode().getInternalEndPoint(),
- new TCreateSchemaRegionReq(
- createEntry.getRegionReplicaSet(),
- createEntry.getStorageGroup()),
- DataNodeRequestType.CREATE_SCHEMA_REGION);
- break;
-
- case DataRegion:
- default:
- // Create DataRegion
- status =
- SyncDataNodeClientPool.getInstance()
- .sendSyncRequestToDataNodeWithRetry(
- createEntry.getTargetDataNode().getInternalEndPoint(),
- new TCreateDataRegionReq(
- createEntry.getRegionReplicaSet(),
- createEntry.getStorageGroup())
- .setTtl(createEntry.getTTL()),
- DataNodeRequestType.CREATE_DATA_REGION);
- }
- break;
+ if (regionMaintainTaskList.isEmpty()) {
+ return;
+ }
- case DELETE:
- default:
- // Delete Region
- RegionDeleteTask deleteEntry = (RegionDeleteTask) entry;
- LOGGER.info(
- "Start to delete Region: {} on DataNode: {}",
- deleteEntry.getRegionId(),
- deleteEntry.getTargetDataNode());
- status =
- SyncDataNodeClientPool.getInstance()
- .sendSyncRequestToDataNodeWithRetry(
- deleteEntry.getTargetDataNode().getInternalEndPoint(),
- deleteEntry.getRegionId(),
- DataNodeRequestType.DELETE_REGION);
+ // group tasks by region id
+ Map<TConsensusGroupId, Queue<RegionMaintainTask>> regionMaintainTaskMap =
+ new HashMap<>();
+ for (RegionMaintainTask regionMaintainTask : regionMaintainTaskList) {
+ regionMaintainTaskMap
+ .computeIfAbsent(regionMaintainTask.getRegionId(), k -> new LinkedList<>())
+ .add(regionMaintainTask);
+ }
+
+ while (!regionMaintainTaskMap.isEmpty()) {
+
+ // select same type task from each region group
+ List<RegionMaintainTask> selectedRegionMaintainTask = new ArrayList<>();
+ RegionMaintainType currentType = null;
+ for (Map.Entry<TConsensusGroupId, Queue<RegionMaintainTask>> entry :
+ regionMaintainTaskMap.entrySet()) {
+ RegionMaintainTask regionMaintainTask = entry.getValue().peek();
+ if (regionMaintainTask != null) {
+ if (currentType == null
+ || regionMaintainTask.getType().equals(RegionMaintainType.DELETE)
+ || entry
+ .getKey()
+ .getType()
+ .equals(selectedRegionMaintainTask.get(0).getRegionId().getType())) {
+ selectedRegionMaintainTask.add(entry.getValue().peek());
+ currentType = regionMaintainTask.getType();
+ }
}
+ }
- if (status.getCode() == TSStatusCode.SUCCESS_STATUS.getStatusCode()) {
- // Poll the head entry if success
- getConsensusManager().write(new PollRegionMaintainTaskPlan());
- } else {
- // Here we just break and wait until next schedule task
- // due to all the RegionMaintainEntry should be executed by
- // the order of they were offered
+ if (selectedRegionMaintainTask.isEmpty()) {
+ break;
+ }
+
+ Set<TConsensusGroupId> successfulTask = new HashSet<>();
+ switch (currentType) {
+ case CREATE:
Review Comment:
Add annotation for this branch~
##########
confignode/src/main/java/org/apache/iotdb/confignode/manager/partition/PartitionManager.java:
##########
@@ -754,69 +760,181 @@ public void maintainRegionReplicas() {
List<RegionMaintainTask> regionMaintainTaskList =
partitionInfo.getRegionMaintainEntryList();
- if (!regionMaintainTaskList.isEmpty()) {
- for (RegionMaintainTask entry : regionMaintainTaskList) {
- TSStatus status;
- switch (entry.getType()) {
- case CREATE:
- RegionCreateTask createEntry = (RegionCreateTask) entry;
- LOGGER.info(
- "Start to create Region: {} on DataNode: {}",
- createEntry.getRegionReplicaSet().getRegionId(),
- createEntry.getTargetDataNode());
- switch (createEntry.getRegionReplicaSet().getRegionId().getType()) {
- case SchemaRegion:
- // Create SchemaRegion
- status =
- SyncDataNodeClientPool.getInstance()
- .sendSyncRequestToDataNodeWithRetry(
- createEntry.getTargetDataNode().getInternalEndPoint(),
- new TCreateSchemaRegionReq(
- createEntry.getRegionReplicaSet(),
- createEntry.getStorageGroup()),
- DataNodeRequestType.CREATE_SCHEMA_REGION);
- break;
-
- case DataRegion:
- default:
- // Create DataRegion
- status =
- SyncDataNodeClientPool.getInstance()
- .sendSyncRequestToDataNodeWithRetry(
- createEntry.getTargetDataNode().getInternalEndPoint(),
- new TCreateDataRegionReq(
- createEntry.getRegionReplicaSet(),
- createEntry.getStorageGroup())
- .setTtl(createEntry.getTTL()),
- DataNodeRequestType.CREATE_DATA_REGION);
- }
- break;
+ if (regionMaintainTaskList.isEmpty()) {
+ return;
+ }
- case DELETE:
- default:
- // Delete Region
- RegionDeleteTask deleteEntry = (RegionDeleteTask) entry;
- LOGGER.info(
- "Start to delete Region: {} on DataNode: {}",
- deleteEntry.getRegionId(),
- deleteEntry.getTargetDataNode());
- status =
- SyncDataNodeClientPool.getInstance()
- .sendSyncRequestToDataNodeWithRetry(
- deleteEntry.getTargetDataNode().getInternalEndPoint(),
- deleteEntry.getRegionId(),
- DataNodeRequestType.DELETE_REGION);
+ // group tasks by region id
+ Map<TConsensusGroupId, Queue<RegionMaintainTask>> regionMaintainTaskMap =
+ new HashMap<>();
+ for (RegionMaintainTask regionMaintainTask : regionMaintainTaskList) {
+ regionMaintainTaskMap
+ .computeIfAbsent(regionMaintainTask.getRegionId(), k -> new LinkedList<>())
+ .add(regionMaintainTask);
+ }
+
+ while (!regionMaintainTaskMap.isEmpty()) {
+
+ // select same type task from each region group
+ List<RegionMaintainTask> selectedRegionMaintainTask = new ArrayList<>();
+ RegionMaintainType currentType = null;
+ for (Map.Entry<TConsensusGroupId, Queue<RegionMaintainTask>> entry :
+ regionMaintainTaskMap.entrySet()) {
+ RegionMaintainTask regionMaintainTask = entry.getValue().peek();
+ if (regionMaintainTask != null) {
+ if (currentType == null
+ || regionMaintainTask.getType().equals(RegionMaintainType.DELETE)
+ || entry
+ .getKey()
+ .getType()
+ .equals(selectedRegionMaintainTask.get(0).getRegionId().getType())) {
+ selectedRegionMaintainTask.add(entry.getValue().peek());
+ currentType = regionMaintainTask.getType();
+ }
}
+ }
- if (status.getCode() == TSStatusCode.SUCCESS_STATUS.getStatusCode()) {
- // Poll the head entry if success
- getConsensusManager().write(new PollRegionMaintainTaskPlan());
- } else {
- // Here we just break and wait until next schedule task
- // due to all the RegionMaintainEntry should be executed by
- // the order of they were offered
+ if (selectedRegionMaintainTask.isEmpty()) {
+ break;
+ }
+
+ Set<TConsensusGroupId> successfulTask = new HashSet<>();
+ switch (currentType) {
+ case CREATE:
+ switch (selectedRegionMaintainTask.get(0).getRegionId().getType()) {
+ case SchemaRegion:
+ AsyncClientHandler<TCreateSchemaRegionReq, TSStatus>
+ createSchemaRegionHandler =
+ new AsyncClientHandler<>(
+ DataNodeRequestType.CREATE_SCHEMA_REGION);
+ for (RegionMaintainTask regionMaintainTask : selectedRegionMaintainTask) {
+ RegionCreateTask schemaRegionCreateTask =
+ (RegionCreateTask) regionMaintainTask;
+ LOGGER.info(
+ "Start to create Region: {} on DataNode: {}",
+ schemaRegionCreateTask.getRegionReplicaSet().getRegionId(),
+ schemaRegionCreateTask.getTargetDataNode());
+ createSchemaRegionHandler.putRequest(
+ schemaRegionCreateTask.getRegionId().getId(),
+ new TCreateSchemaRegionReq(
+ schemaRegionCreateTask.getRegionReplicaSet(),
+ schemaRegionCreateTask.getStorageGroup()));
+ createSchemaRegionHandler.putDataNodeLocation(
+ schemaRegionCreateTask.getRegionId().getId(),
+ schemaRegionCreateTask.getTargetDataNode());
+ }
+
+ AsyncDataNodeClientPool.getInstance()
+ .sendAsyncRequestToDataNodeWithRetry(createSchemaRegionHandler);
+
+ for (Map.Entry<Integer, TSStatus> entry :
+ createSchemaRegionHandler.getResponseMap().entrySet()) {
+ if (entry.getValue().getCode()
+ == TSStatusCode.SUCCESS_STATUS.getStatusCode()) {
+ successfulTask.add(
+ new TConsensusGroupId(
+ TConsensusGroupType.SchemaRegion, entry.getKey()));
+ }
+ }
+ break;
+ case DataRegion:
Review Comment:
Add annotation for this branch~
##########
confignode/src/main/java/org/apache/iotdb/confignode/manager/partition/PartitionManager.java:
##########
@@ -754,69 +760,181 @@ public void maintainRegionReplicas() {
List<RegionMaintainTask> regionMaintainTaskList =
partitionInfo.getRegionMaintainEntryList();
- if (!regionMaintainTaskList.isEmpty()) {
- for (RegionMaintainTask entry : regionMaintainTaskList) {
- TSStatus status;
- switch (entry.getType()) {
- case CREATE:
- RegionCreateTask createEntry = (RegionCreateTask) entry;
- LOGGER.info(
- "Start to create Region: {} on DataNode: {}",
- createEntry.getRegionReplicaSet().getRegionId(),
- createEntry.getTargetDataNode());
- switch (createEntry.getRegionReplicaSet().getRegionId().getType()) {
- case SchemaRegion:
- // Create SchemaRegion
- status =
- SyncDataNodeClientPool.getInstance()
- .sendSyncRequestToDataNodeWithRetry(
- createEntry.getTargetDataNode().getInternalEndPoint(),
- new TCreateSchemaRegionReq(
- createEntry.getRegionReplicaSet(),
- createEntry.getStorageGroup()),
- DataNodeRequestType.CREATE_SCHEMA_REGION);
- break;
-
- case DataRegion:
- default:
- // Create DataRegion
- status =
- SyncDataNodeClientPool.getInstance()
- .sendSyncRequestToDataNodeWithRetry(
- createEntry.getTargetDataNode().getInternalEndPoint(),
- new TCreateDataRegionReq(
- createEntry.getRegionReplicaSet(),
- createEntry.getStorageGroup())
- .setTtl(createEntry.getTTL()),
- DataNodeRequestType.CREATE_DATA_REGION);
- }
- break;
+ if (regionMaintainTaskList.isEmpty()) {
+ return;
+ }
- case DELETE:
- default:
- // Delete Region
- RegionDeleteTask deleteEntry = (RegionDeleteTask) entry;
- LOGGER.info(
- "Start to delete Region: {} on DataNode: {}",
- deleteEntry.getRegionId(),
- deleteEntry.getTargetDataNode());
- status =
- SyncDataNodeClientPool.getInstance()
- .sendSyncRequestToDataNodeWithRetry(
- deleteEntry.getTargetDataNode().getInternalEndPoint(),
- deleteEntry.getRegionId(),
- DataNodeRequestType.DELETE_REGION);
+ // group tasks by region id
+ Map<TConsensusGroupId, Queue<RegionMaintainTask>> regionMaintainTaskMap =
+ new HashMap<>();
+ for (RegionMaintainTask regionMaintainTask : regionMaintainTaskList) {
+ regionMaintainTaskMap
+ .computeIfAbsent(regionMaintainTask.getRegionId(), k -> new LinkedList<>())
+ .add(regionMaintainTask);
+ }
+
+ while (!regionMaintainTaskMap.isEmpty()) {
+
+ // select same type task from each region group
+ List<RegionMaintainTask> selectedRegionMaintainTask = new ArrayList<>();
+ RegionMaintainType currentType = null;
+ for (Map.Entry<TConsensusGroupId, Queue<RegionMaintainTask>> entry :
+ regionMaintainTaskMap.entrySet()) {
+ RegionMaintainTask regionMaintainTask = entry.getValue().peek();
+ if (regionMaintainTask != null) {
+ if (currentType == null
+ || regionMaintainTask.getType().equals(RegionMaintainType.DELETE)
+ || entry
+ .getKey()
+ .getType()
+ .equals(selectedRegionMaintainTask.get(0).getRegionId().getType())) {
+ selectedRegionMaintainTask.add(entry.getValue().peek());
+ currentType = regionMaintainTask.getType();
+ }
}
+ }
- if (status.getCode() == TSStatusCode.SUCCESS_STATUS.getStatusCode()) {
- // Poll the head entry if success
- getConsensusManager().write(new PollRegionMaintainTaskPlan());
- } else {
- // Here we just break and wait until next schedule task
- // due to all the RegionMaintainEntry should be executed by
- // the order of they were offered
+ if (selectedRegionMaintainTask.isEmpty()) {
+ break;
+ }
+
+ Set<TConsensusGroupId> successfulTask = new HashSet<>();
+ switch (currentType) {
+ case CREATE:
+ switch (selectedRegionMaintainTask.get(0).getRegionId().getType()) {
+ case SchemaRegion:
+ AsyncClientHandler<TCreateSchemaRegionReq, TSStatus>
+ createSchemaRegionHandler =
+ new AsyncClientHandler<>(
+ DataNodeRequestType.CREATE_SCHEMA_REGION);
+ for (RegionMaintainTask regionMaintainTask : selectedRegionMaintainTask) {
+ RegionCreateTask schemaRegionCreateTask =
+ (RegionCreateTask) regionMaintainTask;
+ LOGGER.info(
+ "Start to create Region: {} on DataNode: {}",
+ schemaRegionCreateTask.getRegionReplicaSet().getRegionId(),
+ schemaRegionCreateTask.getTargetDataNode());
+ createSchemaRegionHandler.putRequest(
+ schemaRegionCreateTask.getRegionId().getId(),
+ new TCreateSchemaRegionReq(
+ schemaRegionCreateTask.getRegionReplicaSet(),
+ schemaRegionCreateTask.getStorageGroup()));
+ createSchemaRegionHandler.putDataNodeLocation(
+ schemaRegionCreateTask.getRegionId().getId(),
+ schemaRegionCreateTask.getTargetDataNode());
+ }
+
+ AsyncDataNodeClientPool.getInstance()
+ .sendAsyncRequestToDataNodeWithRetry(createSchemaRegionHandler);
+
+ for (Map.Entry<Integer, TSStatus> entry :
+ createSchemaRegionHandler.getResponseMap().entrySet()) {
+ if (entry.getValue().getCode()
+ == TSStatusCode.SUCCESS_STATUS.getStatusCode()) {
+ successfulTask.add(
+ new TConsensusGroupId(
+ TConsensusGroupType.SchemaRegion, entry.getKey()));
+ }
+ }
+ break;
+ case DataRegion:
+ AsyncClientHandler<TCreateDataRegionReq, TSStatus>
+ createDataRegionHandler =
+ new AsyncClientHandler<>(DataNodeRequestType.CREATE_DATA_REGION);
+ for (RegionMaintainTask regionMaintainTask : selectedRegionMaintainTask) {
+ RegionCreateTask dataRegionCreateTask =
+ (RegionCreateTask) regionMaintainTask;
+ LOGGER.info(
+ "Start to create Region: {} on DataNode: {}",
+ dataRegionCreateTask.getRegionReplicaSet().getRegionId(),
+ dataRegionCreateTask.getTargetDataNode());
+ createDataRegionHandler.putRequest(
+ dataRegionCreateTask.getRegionId().getId(),
+ new TCreateDataRegionReq(
+ dataRegionCreateTask.getRegionReplicaSet(),
+ dataRegionCreateTask.getStorageGroup())
+ .setTtl(dataRegionCreateTask.getTTL()));
+ createDataRegionHandler.putDataNodeLocation(
+ dataRegionCreateTask.getRegionId().getId(),
+ dataRegionCreateTask.getTargetDataNode());
+ }
+
+ AsyncDataNodeClientPool.getInstance()
+ .sendAsyncRequestToDataNodeWithRetry(createDataRegionHandler);
+
+ for (Map.Entry<Integer, TSStatus> entry :
+ createDataRegionHandler.getResponseMap().entrySet()) {
+ if (entry.getValue().getCode()
+ == TSStatusCode.SUCCESS_STATUS.getStatusCode()) {
+ successfulTask.add(
+ new TConsensusGroupId(
+ TConsensusGroupType.DataRegion, entry.getKey()));
+ }
+ }
+ break;
+ }
break;
- }
+ case DELETE:
Review Comment:
Add annotation for this branch~
##########
confignode/src/main/java/org/apache/iotdb/confignode/manager/partition/PartitionManager.java:
##########
@@ -754,69 +760,181 @@ public void maintainRegionReplicas() {
List<RegionMaintainTask> regionMaintainTaskList =
partitionInfo.getRegionMaintainEntryList();
- if (!regionMaintainTaskList.isEmpty()) {
- for (RegionMaintainTask entry : regionMaintainTaskList) {
- TSStatus status;
- switch (entry.getType()) {
- case CREATE:
- RegionCreateTask createEntry = (RegionCreateTask) entry;
- LOGGER.info(
- "Start to create Region: {} on DataNode: {}",
- createEntry.getRegionReplicaSet().getRegionId(),
- createEntry.getTargetDataNode());
- switch (createEntry.getRegionReplicaSet().getRegionId().getType()) {
- case SchemaRegion:
- // Create SchemaRegion
- status =
- SyncDataNodeClientPool.getInstance()
- .sendSyncRequestToDataNodeWithRetry(
- createEntry.getTargetDataNode().getInternalEndPoint(),
- new TCreateSchemaRegionReq(
- createEntry.getRegionReplicaSet(),
- createEntry.getStorageGroup()),
- DataNodeRequestType.CREATE_SCHEMA_REGION);
- break;
-
- case DataRegion:
- default:
- // Create DataRegion
- status =
- SyncDataNodeClientPool.getInstance()
- .sendSyncRequestToDataNodeWithRetry(
- createEntry.getTargetDataNode().getInternalEndPoint(),
- new TCreateDataRegionReq(
- createEntry.getRegionReplicaSet(),
- createEntry.getStorageGroup())
- .setTtl(createEntry.getTTL()),
- DataNodeRequestType.CREATE_DATA_REGION);
- }
- break;
+ if (regionMaintainTaskList.isEmpty()) {
+ return;
+ }
- case DELETE:
- default:
- // Delete Region
- RegionDeleteTask deleteEntry = (RegionDeleteTask) entry;
- LOGGER.info(
- "Start to delete Region: {} on DataNode: {}",
- deleteEntry.getRegionId(),
- deleteEntry.getTargetDataNode());
- status =
- SyncDataNodeClientPool.getInstance()
- .sendSyncRequestToDataNodeWithRetry(
- deleteEntry.getTargetDataNode().getInternalEndPoint(),
- deleteEntry.getRegionId(),
- DataNodeRequestType.DELETE_REGION);
+ // group tasks by region id
+ Map<TConsensusGroupId, Queue<RegionMaintainTask>> regionMaintainTaskMap =
+ new HashMap<>();
+ for (RegionMaintainTask regionMaintainTask : regionMaintainTaskList) {
+ regionMaintainTaskMap
+ .computeIfAbsent(regionMaintainTask.getRegionId(), k -> new LinkedList<>())
+ .add(regionMaintainTask);
+ }
+
+ while (!regionMaintainTaskMap.isEmpty()) {
+
+ // select same type task from each region group
+ List<RegionMaintainTask> selectedRegionMaintainTask = new ArrayList<>();
+ RegionMaintainType currentType = null;
+ for (Map.Entry<TConsensusGroupId, Queue<RegionMaintainTask>> entry :
+ regionMaintainTaskMap.entrySet()) {
+ RegionMaintainTask regionMaintainTask = entry.getValue().peek();
+ if (regionMaintainTask != null) {
+ if (currentType == null
+ || regionMaintainTask.getType().equals(RegionMaintainType.DELETE)
+ || entry
+ .getKey()
+ .getType()
+ .equals(selectedRegionMaintainTask.get(0).getRegionId().getType())) {
+ selectedRegionMaintainTask.add(entry.getValue().peek());
+ currentType = regionMaintainTask.getType();
+ }
}
+ }
- if (status.getCode() == TSStatusCode.SUCCESS_STATUS.getStatusCode()) {
- // Poll the head entry if success
- getConsensusManager().write(new PollRegionMaintainTaskPlan());
- } else {
- // Here we just break and wait until next schedule task
- // due to all the RegionMaintainEntry should be executed by
- // the order of they were offered
+ if (selectedRegionMaintainTask.isEmpty()) {
+ break;
+ }
+
+ Set<TConsensusGroupId> successfulTask = new HashSet<>();
+ switch (currentType) {
+ case CREATE:
+ switch (selectedRegionMaintainTask.get(0).getRegionId().getType()) {
+ case SchemaRegion:
Review Comment:
Add annotation for this branch~
##########
confignode/src/main/java/org/apache/iotdb/confignode/persistence/partition/PartitionInfo.java:
##########
@@ -203,6 +204,22 @@ public TSStatus pollRegionMaintainTask() {
}
}
+ public TSStatus pollSpecificRegionMaintainTask(PollSpecificRegionMaintainTaskPlan plan) {
+ synchronized (regionMaintainTaskList) {
+ Set<TConsensusGroupId> remainingRegionIdSet = new HashSet<>(plan.getRegionIdSet());
Review Comment:
removingRegionIdSet?
##########
confignode/src/main/java/org/apache/iotdb/confignode/manager/partition/PartitionManager.java:
##########
@@ -754,69 +760,181 @@ public void maintainRegionReplicas() {
List<RegionMaintainTask> regionMaintainTaskList =
partitionInfo.getRegionMaintainEntryList();
- if (!regionMaintainTaskList.isEmpty()) {
- for (RegionMaintainTask entry : regionMaintainTaskList) {
- TSStatus status;
- switch (entry.getType()) {
- case CREATE:
- RegionCreateTask createEntry = (RegionCreateTask) entry;
- LOGGER.info(
- "Start to create Region: {} on DataNode: {}",
- createEntry.getRegionReplicaSet().getRegionId(),
- createEntry.getTargetDataNode());
- switch (createEntry.getRegionReplicaSet().getRegionId().getType()) {
- case SchemaRegion:
- // Create SchemaRegion
- status =
- SyncDataNodeClientPool.getInstance()
- .sendSyncRequestToDataNodeWithRetry(
- createEntry.getTargetDataNode().getInternalEndPoint(),
- new TCreateSchemaRegionReq(
- createEntry.getRegionReplicaSet(),
- createEntry.getStorageGroup()),
- DataNodeRequestType.CREATE_SCHEMA_REGION);
- break;
-
- case DataRegion:
- default:
- // Create DataRegion
- status =
- SyncDataNodeClientPool.getInstance()
- .sendSyncRequestToDataNodeWithRetry(
- createEntry.getTargetDataNode().getInternalEndPoint(),
- new TCreateDataRegionReq(
- createEntry.getRegionReplicaSet(),
- createEntry.getStorageGroup())
- .setTtl(createEntry.getTTL()),
- DataNodeRequestType.CREATE_DATA_REGION);
- }
- break;
+ if (regionMaintainTaskList.isEmpty()) {
+ return;
+ }
- case DELETE:
- default:
- // Delete Region
- RegionDeleteTask deleteEntry = (RegionDeleteTask) entry;
- LOGGER.info(
- "Start to delete Region: {} on DataNode: {}",
- deleteEntry.getRegionId(),
- deleteEntry.getTargetDataNode());
- status =
- SyncDataNodeClientPool.getInstance()
- .sendSyncRequestToDataNodeWithRetry(
- deleteEntry.getTargetDataNode().getInternalEndPoint(),
- deleteEntry.getRegionId(),
- DataNodeRequestType.DELETE_REGION);
+ // group tasks by region id
+ Map<TConsensusGroupId, Queue<RegionMaintainTask>> regionMaintainTaskMap =
+ new HashMap<>();
+ for (RegionMaintainTask regionMaintainTask : regionMaintainTaskList) {
+ regionMaintainTaskMap
+ .computeIfAbsent(regionMaintainTask.getRegionId(), k -> new LinkedList<>())
+ .add(regionMaintainTask);
+ }
+
+ while (!regionMaintainTaskMap.isEmpty()) {
+
+ // select same type task from each region group
+ List<RegionMaintainTask> selectedRegionMaintainTask = new ArrayList<>();
+ RegionMaintainType currentType = null;
+ for (Map.Entry<TConsensusGroupId, Queue<RegionMaintainTask>> entry :
+ regionMaintainTaskMap.entrySet()) {
+ RegionMaintainTask regionMaintainTask = entry.getValue().peek();
+ if (regionMaintainTask != null) {
+ if (currentType == null
+ || regionMaintainTask.getType().equals(RegionMaintainType.DELETE)
Review Comment:
Why type DELETE can always pass if? Therefore the delete tasks will always be added to selectedRegionMaintainTask?
--
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] MarcosZyk merged pull request #9120: [IOTDB-5516] Accelerate async delete DataRegion during dropping database
Posted by "MarcosZyk (via GitHub)" <gi...@apache.org>.
MarcosZyk merged PR #9120:
URL: https://github.com/apache/iotdb/pull/9120
--
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] MarcosZyk commented on a diff in pull request #9120: [IOTDB-5516] Accelerate async delete DataRegion during dropping database
Posted by "MarcosZyk (via GitHub)" <gi...@apache.org>.
MarcosZyk commented on code in PR #9120:
URL: https://github.com/apache/iotdb/pull/9120#discussion_r1115204818
##########
confignode/src/main/java/org/apache/iotdb/confignode/consensus/request/write/region/PollSpecificRegionMaintainTaskPlan.java:
##########
@@ -0,0 +1,70 @@
+/*
+ * 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.common.rpc.thrift.TConsensusGroupId;
+import org.apache.iotdb.common.rpc.thrift.TConsensusGroupType;
+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;
+import java.util.HashSet;
+import java.util.Set;
+
+public class PollSpecificRegionMaintainTaskPlan extends ConfigPhysicalPlan {
Review Comment:
Added.
##########
confignode/src/main/java/org/apache/iotdb/confignode/persistence/partition/PartitionInfo.java:
##########
@@ -203,6 +204,22 @@ public TSStatus pollRegionMaintainTask() {
}
}
+ public TSStatus pollSpecificRegionMaintainTask(PollSpecificRegionMaintainTaskPlan plan) {
+ synchronized (regionMaintainTaskList) {
+ Set<TConsensusGroupId> remainingRegionIdSet = new HashSet<>(plan.getRegionIdSet());
Review Comment:
Fixed.
##########
confignode/src/main/java/org/apache/iotdb/confignode/manager/partition/PartitionManager.java:
##########
@@ -754,69 +760,181 @@ public void maintainRegionReplicas() {
List<RegionMaintainTask> regionMaintainTaskList =
partitionInfo.getRegionMaintainEntryList();
- if (!regionMaintainTaskList.isEmpty()) {
- for (RegionMaintainTask entry : regionMaintainTaskList) {
- TSStatus status;
- switch (entry.getType()) {
- case CREATE:
- RegionCreateTask createEntry = (RegionCreateTask) entry;
- LOGGER.info(
- "Start to create Region: {} on DataNode: {}",
- createEntry.getRegionReplicaSet().getRegionId(),
- createEntry.getTargetDataNode());
- switch (createEntry.getRegionReplicaSet().getRegionId().getType()) {
- case SchemaRegion:
- // Create SchemaRegion
- status =
- SyncDataNodeClientPool.getInstance()
- .sendSyncRequestToDataNodeWithRetry(
- createEntry.getTargetDataNode().getInternalEndPoint(),
- new TCreateSchemaRegionReq(
- createEntry.getRegionReplicaSet(),
- createEntry.getStorageGroup()),
- DataNodeRequestType.CREATE_SCHEMA_REGION);
- break;
-
- case DataRegion:
- default:
- // Create DataRegion
- status =
- SyncDataNodeClientPool.getInstance()
- .sendSyncRequestToDataNodeWithRetry(
- createEntry.getTargetDataNode().getInternalEndPoint(),
- new TCreateDataRegionReq(
- createEntry.getRegionReplicaSet(),
- createEntry.getStorageGroup())
- .setTtl(createEntry.getTTL()),
- DataNodeRequestType.CREATE_DATA_REGION);
- }
- break;
+ if (regionMaintainTaskList.isEmpty()) {
+ return;
+ }
- case DELETE:
- default:
- // Delete Region
- RegionDeleteTask deleteEntry = (RegionDeleteTask) entry;
- LOGGER.info(
- "Start to delete Region: {} on DataNode: {}",
- deleteEntry.getRegionId(),
- deleteEntry.getTargetDataNode());
- status =
- SyncDataNodeClientPool.getInstance()
- .sendSyncRequestToDataNodeWithRetry(
- deleteEntry.getTargetDataNode().getInternalEndPoint(),
- deleteEntry.getRegionId(),
- DataNodeRequestType.DELETE_REGION);
+ // group tasks by region id
+ Map<TConsensusGroupId, Queue<RegionMaintainTask>> regionMaintainTaskMap =
+ new HashMap<>();
+ for (RegionMaintainTask regionMaintainTask : regionMaintainTaskList) {
+ regionMaintainTaskMap
+ .computeIfAbsent(regionMaintainTask.getRegionId(), k -> new LinkedList<>())
+ .add(regionMaintainTask);
+ }
+
+ while (!regionMaintainTaskMap.isEmpty()) {
+
+ // select same type task from each region group
+ List<RegionMaintainTask> selectedRegionMaintainTask = new ArrayList<>();
+ RegionMaintainType currentType = null;
+ for (Map.Entry<TConsensusGroupId, Queue<RegionMaintainTask>> entry :
+ regionMaintainTaskMap.entrySet()) {
+ RegionMaintainTask regionMaintainTask = entry.getValue().peek();
+ if (regionMaintainTask != null) {
+ if (currentType == null
+ || regionMaintainTask.getType().equals(RegionMaintainType.DELETE)
Review Comment:
Fixed.
--
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] MarcosZyk commented on a diff in pull request #9120: [IOTDB-5516] Accelerate async delete DataRegion during dropping database
Posted by "MarcosZyk (via GitHub)" <gi...@apache.org>.
MarcosZyk commented on code in PR #9120:
URL: https://github.com/apache/iotdb/pull/9120#discussion_r1115205033
##########
confignode/src/main/java/org/apache/iotdb/confignode/manager/partition/PartitionManager.java:
##########
@@ -754,69 +760,181 @@ public void maintainRegionReplicas() {
List<RegionMaintainTask> regionMaintainTaskList =
partitionInfo.getRegionMaintainEntryList();
- if (!regionMaintainTaskList.isEmpty()) {
- for (RegionMaintainTask entry : regionMaintainTaskList) {
- TSStatus status;
- switch (entry.getType()) {
- case CREATE:
- RegionCreateTask createEntry = (RegionCreateTask) entry;
- LOGGER.info(
- "Start to create Region: {} on DataNode: {}",
- createEntry.getRegionReplicaSet().getRegionId(),
- createEntry.getTargetDataNode());
- switch (createEntry.getRegionReplicaSet().getRegionId().getType()) {
- case SchemaRegion:
- // Create SchemaRegion
- status =
- SyncDataNodeClientPool.getInstance()
- .sendSyncRequestToDataNodeWithRetry(
- createEntry.getTargetDataNode().getInternalEndPoint(),
- new TCreateSchemaRegionReq(
- createEntry.getRegionReplicaSet(),
- createEntry.getStorageGroup()),
- DataNodeRequestType.CREATE_SCHEMA_REGION);
- break;
-
- case DataRegion:
- default:
- // Create DataRegion
- status =
- SyncDataNodeClientPool.getInstance()
- .sendSyncRequestToDataNodeWithRetry(
- createEntry.getTargetDataNode().getInternalEndPoint(),
- new TCreateDataRegionReq(
- createEntry.getRegionReplicaSet(),
- createEntry.getStorageGroup())
- .setTtl(createEntry.getTTL()),
- DataNodeRequestType.CREATE_DATA_REGION);
- }
- break;
+ if (regionMaintainTaskList.isEmpty()) {
+ return;
+ }
- case DELETE:
- default:
- // Delete Region
- RegionDeleteTask deleteEntry = (RegionDeleteTask) entry;
- LOGGER.info(
- "Start to delete Region: {} on DataNode: {}",
- deleteEntry.getRegionId(),
- deleteEntry.getTargetDataNode());
- status =
- SyncDataNodeClientPool.getInstance()
- .sendSyncRequestToDataNodeWithRetry(
- deleteEntry.getTargetDataNode().getInternalEndPoint(),
- deleteEntry.getRegionId(),
- DataNodeRequestType.DELETE_REGION);
+ // group tasks by region id
+ Map<TConsensusGroupId, Queue<RegionMaintainTask>> regionMaintainTaskMap =
+ new HashMap<>();
+ for (RegionMaintainTask regionMaintainTask : regionMaintainTaskList) {
+ regionMaintainTaskMap
+ .computeIfAbsent(regionMaintainTask.getRegionId(), k -> new LinkedList<>())
+ .add(regionMaintainTask);
+ }
+
+ while (!regionMaintainTaskMap.isEmpty()) {
+
+ // select same type task from each region group
+ List<RegionMaintainTask> selectedRegionMaintainTask = new ArrayList<>();
+ RegionMaintainType currentType = null;
+ for (Map.Entry<TConsensusGroupId, Queue<RegionMaintainTask>> entry :
+ regionMaintainTaskMap.entrySet()) {
+ RegionMaintainTask regionMaintainTask = entry.getValue().peek();
+ if (regionMaintainTask != null) {
+ if (currentType == null
+ || regionMaintainTask.getType().equals(RegionMaintainType.DELETE)
+ || entry
+ .getKey()
+ .getType()
+ .equals(selectedRegionMaintainTask.get(0).getRegionId().getType())) {
+ selectedRegionMaintainTask.add(entry.getValue().peek());
+ currentType = regionMaintainTask.getType();
+ }
}
+ }
- if (status.getCode() == TSStatusCode.SUCCESS_STATUS.getStatusCode()) {
- // Poll the head entry if success
- getConsensusManager().write(new PollRegionMaintainTaskPlan());
- } else {
- // Here we just break and wait until next schedule task
- // due to all the RegionMaintainEntry should be executed by
- // the order of they were offered
+ if (selectedRegionMaintainTask.isEmpty()) {
+ break;
+ }
+
+ Set<TConsensusGroupId> successfulTask = new HashSet<>();
+ switch (currentType) {
+ case CREATE:
+ switch (selectedRegionMaintainTask.get(0).getRegionId().getType()) {
+ case SchemaRegion:
+ AsyncClientHandler<TCreateSchemaRegionReq, TSStatus>
+ createSchemaRegionHandler =
+ new AsyncClientHandler<>(
+ DataNodeRequestType.CREATE_SCHEMA_REGION);
+ for (RegionMaintainTask regionMaintainTask : selectedRegionMaintainTask) {
+ RegionCreateTask schemaRegionCreateTask =
+ (RegionCreateTask) regionMaintainTask;
+ LOGGER.info(
+ "Start to create Region: {} on DataNode: {}",
+ schemaRegionCreateTask.getRegionReplicaSet().getRegionId(),
+ schemaRegionCreateTask.getTargetDataNode());
+ createSchemaRegionHandler.putRequest(
+ schemaRegionCreateTask.getRegionId().getId(),
+ new TCreateSchemaRegionReq(
+ schemaRegionCreateTask.getRegionReplicaSet(),
+ schemaRegionCreateTask.getStorageGroup()));
+ createSchemaRegionHandler.putDataNodeLocation(
+ schemaRegionCreateTask.getRegionId().getId(),
+ schemaRegionCreateTask.getTargetDataNode());
+ }
+
+ AsyncDataNodeClientPool.getInstance()
+ .sendAsyncRequestToDataNodeWithRetry(createSchemaRegionHandler);
+
+ for (Map.Entry<Integer, TSStatus> entry :
+ createSchemaRegionHandler.getResponseMap().entrySet()) {
+ if (entry.getValue().getCode()
+ == TSStatusCode.SUCCESS_STATUS.getStatusCode()) {
+ successfulTask.add(
+ new TConsensusGroupId(
+ TConsensusGroupType.SchemaRegion, entry.getKey()));
+ }
+ }
+ break;
+ case DataRegion:
+ AsyncClientHandler<TCreateDataRegionReq, TSStatus>
+ createDataRegionHandler =
+ new AsyncClientHandler<>(DataNodeRequestType.CREATE_DATA_REGION);
+ for (RegionMaintainTask regionMaintainTask : selectedRegionMaintainTask) {
+ RegionCreateTask dataRegionCreateTask =
+ (RegionCreateTask) regionMaintainTask;
+ LOGGER.info(
+ "Start to create Region: {} on DataNode: {}",
+ dataRegionCreateTask.getRegionReplicaSet().getRegionId(),
+ dataRegionCreateTask.getTargetDataNode());
+ createDataRegionHandler.putRequest(
+ dataRegionCreateTask.getRegionId().getId(),
+ new TCreateDataRegionReq(
+ dataRegionCreateTask.getRegionReplicaSet(),
+ dataRegionCreateTask.getStorageGroup())
+ .setTtl(dataRegionCreateTask.getTTL()));
+ createDataRegionHandler.putDataNodeLocation(
+ dataRegionCreateTask.getRegionId().getId(),
+ dataRegionCreateTask.getTargetDataNode());
+ }
+
+ AsyncDataNodeClientPool.getInstance()
+ .sendAsyncRequestToDataNodeWithRetry(createDataRegionHandler);
+
+ for (Map.Entry<Integer, TSStatus> entry :
+ createDataRegionHandler.getResponseMap().entrySet()) {
+ if (entry.getValue().getCode()
+ == TSStatusCode.SUCCESS_STATUS.getStatusCode()) {
+ successfulTask.add(
+ new TConsensusGroupId(
+ TConsensusGroupType.DataRegion, entry.getKey()));
+ }
+ }
+ break;
+ }
break;
- }
+ case DELETE:
Review Comment:
Added.
--
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] MarcosZyk commented on a diff in pull request #9120: [IOTDB-5516] Accelerate async delete DataRegion during dropping database
Posted by "MarcosZyk (via GitHub)" <gi...@apache.org>.
MarcosZyk commented on code in PR #9120:
URL: https://github.com/apache/iotdb/pull/9120#discussion_r1115204923
##########
confignode/src/main/java/org/apache/iotdb/confignode/manager/partition/PartitionManager.java:
##########
@@ -754,69 +760,181 @@ public void maintainRegionReplicas() {
List<RegionMaintainTask> regionMaintainTaskList =
partitionInfo.getRegionMaintainEntryList();
- if (!regionMaintainTaskList.isEmpty()) {
- for (RegionMaintainTask entry : regionMaintainTaskList) {
- TSStatus status;
- switch (entry.getType()) {
- case CREATE:
- RegionCreateTask createEntry = (RegionCreateTask) entry;
- LOGGER.info(
- "Start to create Region: {} on DataNode: {}",
- createEntry.getRegionReplicaSet().getRegionId(),
- createEntry.getTargetDataNode());
- switch (createEntry.getRegionReplicaSet().getRegionId().getType()) {
- case SchemaRegion:
- // Create SchemaRegion
- status =
- SyncDataNodeClientPool.getInstance()
- .sendSyncRequestToDataNodeWithRetry(
- createEntry.getTargetDataNode().getInternalEndPoint(),
- new TCreateSchemaRegionReq(
- createEntry.getRegionReplicaSet(),
- createEntry.getStorageGroup()),
- DataNodeRequestType.CREATE_SCHEMA_REGION);
- break;
-
- case DataRegion:
- default:
- // Create DataRegion
- status =
- SyncDataNodeClientPool.getInstance()
- .sendSyncRequestToDataNodeWithRetry(
- createEntry.getTargetDataNode().getInternalEndPoint(),
- new TCreateDataRegionReq(
- createEntry.getRegionReplicaSet(),
- createEntry.getStorageGroup())
- .setTtl(createEntry.getTTL()),
- DataNodeRequestType.CREATE_DATA_REGION);
- }
- break;
+ if (regionMaintainTaskList.isEmpty()) {
+ return;
+ }
- case DELETE:
- default:
- // Delete Region
- RegionDeleteTask deleteEntry = (RegionDeleteTask) entry;
- LOGGER.info(
- "Start to delete Region: {} on DataNode: {}",
- deleteEntry.getRegionId(),
- deleteEntry.getTargetDataNode());
- status =
- SyncDataNodeClientPool.getInstance()
- .sendSyncRequestToDataNodeWithRetry(
- deleteEntry.getTargetDataNode().getInternalEndPoint(),
- deleteEntry.getRegionId(),
- DataNodeRequestType.DELETE_REGION);
+ // group tasks by region id
+ Map<TConsensusGroupId, Queue<RegionMaintainTask>> regionMaintainTaskMap =
+ new HashMap<>();
+ for (RegionMaintainTask regionMaintainTask : regionMaintainTaskList) {
+ regionMaintainTaskMap
+ .computeIfAbsent(regionMaintainTask.getRegionId(), k -> new LinkedList<>())
+ .add(regionMaintainTask);
+ }
+
+ while (!regionMaintainTaskMap.isEmpty()) {
+
+ // select same type task from each region group
+ List<RegionMaintainTask> selectedRegionMaintainTask = new ArrayList<>();
+ RegionMaintainType currentType = null;
+ for (Map.Entry<TConsensusGroupId, Queue<RegionMaintainTask>> entry :
+ regionMaintainTaskMap.entrySet()) {
+ RegionMaintainTask regionMaintainTask = entry.getValue().peek();
+ if (regionMaintainTask != null) {
+ if (currentType == null
+ || regionMaintainTask.getType().equals(RegionMaintainType.DELETE)
+ || entry
+ .getKey()
+ .getType()
+ .equals(selectedRegionMaintainTask.get(0).getRegionId().getType())) {
+ selectedRegionMaintainTask.add(entry.getValue().peek());
+ currentType = regionMaintainTask.getType();
+ }
}
+ }
- if (status.getCode() == TSStatusCode.SUCCESS_STATUS.getStatusCode()) {
- // Poll the head entry if success
- getConsensusManager().write(new PollRegionMaintainTaskPlan());
- } else {
- // Here we just break and wait until next schedule task
- // due to all the RegionMaintainEntry should be executed by
- // the order of they were offered
+ if (selectedRegionMaintainTask.isEmpty()) {
+ break;
+ }
+
+ Set<TConsensusGroupId> successfulTask = new HashSet<>();
+ switch (currentType) {
+ case CREATE:
Review Comment:
Added.
##########
confignode/src/main/java/org/apache/iotdb/confignode/manager/partition/PartitionManager.java:
##########
@@ -754,69 +760,181 @@ public void maintainRegionReplicas() {
List<RegionMaintainTask> regionMaintainTaskList =
partitionInfo.getRegionMaintainEntryList();
- if (!regionMaintainTaskList.isEmpty()) {
- for (RegionMaintainTask entry : regionMaintainTaskList) {
- TSStatus status;
- switch (entry.getType()) {
- case CREATE:
- RegionCreateTask createEntry = (RegionCreateTask) entry;
- LOGGER.info(
- "Start to create Region: {} on DataNode: {}",
- createEntry.getRegionReplicaSet().getRegionId(),
- createEntry.getTargetDataNode());
- switch (createEntry.getRegionReplicaSet().getRegionId().getType()) {
- case SchemaRegion:
- // Create SchemaRegion
- status =
- SyncDataNodeClientPool.getInstance()
- .sendSyncRequestToDataNodeWithRetry(
- createEntry.getTargetDataNode().getInternalEndPoint(),
- new TCreateSchemaRegionReq(
- createEntry.getRegionReplicaSet(),
- createEntry.getStorageGroup()),
- DataNodeRequestType.CREATE_SCHEMA_REGION);
- break;
-
- case DataRegion:
- default:
- // Create DataRegion
- status =
- SyncDataNodeClientPool.getInstance()
- .sendSyncRequestToDataNodeWithRetry(
- createEntry.getTargetDataNode().getInternalEndPoint(),
- new TCreateDataRegionReq(
- createEntry.getRegionReplicaSet(),
- createEntry.getStorageGroup())
- .setTtl(createEntry.getTTL()),
- DataNodeRequestType.CREATE_DATA_REGION);
- }
- break;
+ if (regionMaintainTaskList.isEmpty()) {
+ return;
+ }
- case DELETE:
- default:
- // Delete Region
- RegionDeleteTask deleteEntry = (RegionDeleteTask) entry;
- LOGGER.info(
- "Start to delete Region: {} on DataNode: {}",
- deleteEntry.getRegionId(),
- deleteEntry.getTargetDataNode());
- status =
- SyncDataNodeClientPool.getInstance()
- .sendSyncRequestToDataNodeWithRetry(
- deleteEntry.getTargetDataNode().getInternalEndPoint(),
- deleteEntry.getRegionId(),
- DataNodeRequestType.DELETE_REGION);
+ // group tasks by region id
+ Map<TConsensusGroupId, Queue<RegionMaintainTask>> regionMaintainTaskMap =
+ new HashMap<>();
+ for (RegionMaintainTask regionMaintainTask : regionMaintainTaskList) {
+ regionMaintainTaskMap
+ .computeIfAbsent(regionMaintainTask.getRegionId(), k -> new LinkedList<>())
+ .add(regionMaintainTask);
+ }
+
+ while (!regionMaintainTaskMap.isEmpty()) {
+
+ // select same type task from each region group
+ List<RegionMaintainTask> selectedRegionMaintainTask = new ArrayList<>();
+ RegionMaintainType currentType = null;
+ for (Map.Entry<TConsensusGroupId, Queue<RegionMaintainTask>> entry :
+ regionMaintainTaskMap.entrySet()) {
+ RegionMaintainTask regionMaintainTask = entry.getValue().peek();
+ if (regionMaintainTask != null) {
+ if (currentType == null
+ || regionMaintainTask.getType().equals(RegionMaintainType.DELETE)
+ || entry
+ .getKey()
+ .getType()
+ .equals(selectedRegionMaintainTask.get(0).getRegionId().getType())) {
+ selectedRegionMaintainTask.add(entry.getValue().peek());
+ currentType = regionMaintainTask.getType();
+ }
}
+ }
- if (status.getCode() == TSStatusCode.SUCCESS_STATUS.getStatusCode()) {
- // Poll the head entry if success
- getConsensusManager().write(new PollRegionMaintainTaskPlan());
- } else {
- // Here we just break and wait until next schedule task
- // due to all the RegionMaintainEntry should be executed by
- // the order of they were offered
+ if (selectedRegionMaintainTask.isEmpty()) {
+ break;
+ }
+
+ Set<TConsensusGroupId> successfulTask = new HashSet<>();
+ switch (currentType) {
+ case CREATE:
+ switch (selectedRegionMaintainTask.get(0).getRegionId().getType()) {
+ case SchemaRegion:
Review Comment:
Added.
##########
confignode/src/main/java/org/apache/iotdb/confignode/manager/partition/PartitionManager.java:
##########
@@ -754,69 +760,181 @@ public void maintainRegionReplicas() {
List<RegionMaintainTask> regionMaintainTaskList =
partitionInfo.getRegionMaintainEntryList();
- if (!regionMaintainTaskList.isEmpty()) {
- for (RegionMaintainTask entry : regionMaintainTaskList) {
- TSStatus status;
- switch (entry.getType()) {
- case CREATE:
- RegionCreateTask createEntry = (RegionCreateTask) entry;
- LOGGER.info(
- "Start to create Region: {} on DataNode: {}",
- createEntry.getRegionReplicaSet().getRegionId(),
- createEntry.getTargetDataNode());
- switch (createEntry.getRegionReplicaSet().getRegionId().getType()) {
- case SchemaRegion:
- // Create SchemaRegion
- status =
- SyncDataNodeClientPool.getInstance()
- .sendSyncRequestToDataNodeWithRetry(
- createEntry.getTargetDataNode().getInternalEndPoint(),
- new TCreateSchemaRegionReq(
- createEntry.getRegionReplicaSet(),
- createEntry.getStorageGroup()),
- DataNodeRequestType.CREATE_SCHEMA_REGION);
- break;
-
- case DataRegion:
- default:
- // Create DataRegion
- status =
- SyncDataNodeClientPool.getInstance()
- .sendSyncRequestToDataNodeWithRetry(
- createEntry.getTargetDataNode().getInternalEndPoint(),
- new TCreateDataRegionReq(
- createEntry.getRegionReplicaSet(),
- createEntry.getStorageGroup())
- .setTtl(createEntry.getTTL()),
- DataNodeRequestType.CREATE_DATA_REGION);
- }
- break;
+ if (regionMaintainTaskList.isEmpty()) {
+ return;
+ }
- case DELETE:
- default:
- // Delete Region
- RegionDeleteTask deleteEntry = (RegionDeleteTask) entry;
- LOGGER.info(
- "Start to delete Region: {} on DataNode: {}",
- deleteEntry.getRegionId(),
- deleteEntry.getTargetDataNode());
- status =
- SyncDataNodeClientPool.getInstance()
- .sendSyncRequestToDataNodeWithRetry(
- deleteEntry.getTargetDataNode().getInternalEndPoint(),
- deleteEntry.getRegionId(),
- DataNodeRequestType.DELETE_REGION);
+ // group tasks by region id
+ Map<TConsensusGroupId, Queue<RegionMaintainTask>> regionMaintainTaskMap =
+ new HashMap<>();
+ for (RegionMaintainTask regionMaintainTask : regionMaintainTaskList) {
+ regionMaintainTaskMap
+ .computeIfAbsent(regionMaintainTask.getRegionId(), k -> new LinkedList<>())
+ .add(regionMaintainTask);
+ }
+
+ while (!regionMaintainTaskMap.isEmpty()) {
+
+ // select same type task from each region group
+ List<RegionMaintainTask> selectedRegionMaintainTask = new ArrayList<>();
+ RegionMaintainType currentType = null;
+ for (Map.Entry<TConsensusGroupId, Queue<RegionMaintainTask>> entry :
+ regionMaintainTaskMap.entrySet()) {
+ RegionMaintainTask regionMaintainTask = entry.getValue().peek();
+ if (regionMaintainTask != null) {
+ if (currentType == null
+ || regionMaintainTask.getType().equals(RegionMaintainType.DELETE)
+ || entry
+ .getKey()
+ .getType()
+ .equals(selectedRegionMaintainTask.get(0).getRegionId().getType())) {
+ selectedRegionMaintainTask.add(entry.getValue().peek());
+ currentType = regionMaintainTask.getType();
+ }
}
+ }
- if (status.getCode() == TSStatusCode.SUCCESS_STATUS.getStatusCode()) {
- // Poll the head entry if success
- getConsensusManager().write(new PollRegionMaintainTaskPlan());
- } else {
- // Here we just break and wait until next schedule task
- // due to all the RegionMaintainEntry should be executed by
- // the order of they were offered
+ if (selectedRegionMaintainTask.isEmpty()) {
+ break;
+ }
+
+ Set<TConsensusGroupId> successfulTask = new HashSet<>();
+ switch (currentType) {
+ case CREATE:
+ switch (selectedRegionMaintainTask.get(0).getRegionId().getType()) {
+ case SchemaRegion:
+ AsyncClientHandler<TCreateSchemaRegionReq, TSStatus>
+ createSchemaRegionHandler =
+ new AsyncClientHandler<>(
+ DataNodeRequestType.CREATE_SCHEMA_REGION);
+ for (RegionMaintainTask regionMaintainTask : selectedRegionMaintainTask) {
+ RegionCreateTask schemaRegionCreateTask =
+ (RegionCreateTask) regionMaintainTask;
+ LOGGER.info(
+ "Start to create Region: {} on DataNode: {}",
+ schemaRegionCreateTask.getRegionReplicaSet().getRegionId(),
+ schemaRegionCreateTask.getTargetDataNode());
+ createSchemaRegionHandler.putRequest(
+ schemaRegionCreateTask.getRegionId().getId(),
+ new TCreateSchemaRegionReq(
+ schemaRegionCreateTask.getRegionReplicaSet(),
+ schemaRegionCreateTask.getStorageGroup()));
+ createSchemaRegionHandler.putDataNodeLocation(
+ schemaRegionCreateTask.getRegionId().getId(),
+ schemaRegionCreateTask.getTargetDataNode());
+ }
+
+ AsyncDataNodeClientPool.getInstance()
+ .sendAsyncRequestToDataNodeWithRetry(createSchemaRegionHandler);
+
+ for (Map.Entry<Integer, TSStatus> entry :
+ createSchemaRegionHandler.getResponseMap().entrySet()) {
+ if (entry.getValue().getCode()
+ == TSStatusCode.SUCCESS_STATUS.getStatusCode()) {
+ successfulTask.add(
+ new TConsensusGroupId(
+ TConsensusGroupType.SchemaRegion, entry.getKey()));
+ }
+ }
+ break;
+ case DataRegion:
Review Comment:
Added.
--
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] MarcosZyk commented on a diff in pull request #9120: [IOTDB-5516] Accelerate async delete DataRegion during dropping database
Posted by "MarcosZyk (via GitHub)" <gi...@apache.org>.
MarcosZyk commented on code in PR #9120:
URL: https://github.com/apache/iotdb/pull/9120#discussion_r1115205512
##########
confignode/src/main/java/org/apache/iotdb/confignode/manager/partition/PartitionManager.java:
##########
@@ -754,69 +760,181 @@ public void maintainRegionReplicas() {
List<RegionMaintainTask> regionMaintainTaskList =
partitionInfo.getRegionMaintainEntryList();
- if (!regionMaintainTaskList.isEmpty()) {
- for (RegionMaintainTask entry : regionMaintainTaskList) {
- TSStatus status;
- switch (entry.getType()) {
- case CREATE:
- RegionCreateTask createEntry = (RegionCreateTask) entry;
- LOGGER.info(
- "Start to create Region: {} on DataNode: {}",
- createEntry.getRegionReplicaSet().getRegionId(),
- createEntry.getTargetDataNode());
- switch (createEntry.getRegionReplicaSet().getRegionId().getType()) {
- case SchemaRegion:
- // Create SchemaRegion
- status =
- SyncDataNodeClientPool.getInstance()
- .sendSyncRequestToDataNodeWithRetry(
- createEntry.getTargetDataNode().getInternalEndPoint(),
- new TCreateSchemaRegionReq(
- createEntry.getRegionReplicaSet(),
- createEntry.getStorageGroup()),
- DataNodeRequestType.CREATE_SCHEMA_REGION);
- break;
-
- case DataRegion:
- default:
- // Create DataRegion
- status =
- SyncDataNodeClientPool.getInstance()
- .sendSyncRequestToDataNodeWithRetry(
- createEntry.getTargetDataNode().getInternalEndPoint(),
- new TCreateDataRegionReq(
- createEntry.getRegionReplicaSet(),
- createEntry.getStorageGroup())
- .setTtl(createEntry.getTTL()),
- DataNodeRequestType.CREATE_DATA_REGION);
- }
- break;
+ if (regionMaintainTaskList.isEmpty()) {
+ return;
+ }
- case DELETE:
- default:
- // Delete Region
- RegionDeleteTask deleteEntry = (RegionDeleteTask) entry;
- LOGGER.info(
- "Start to delete Region: {} on DataNode: {}",
- deleteEntry.getRegionId(),
- deleteEntry.getTargetDataNode());
- status =
- SyncDataNodeClientPool.getInstance()
- .sendSyncRequestToDataNodeWithRetry(
- deleteEntry.getTargetDataNode().getInternalEndPoint(),
- deleteEntry.getRegionId(),
- DataNodeRequestType.DELETE_REGION);
+ // group tasks by region id
+ Map<TConsensusGroupId, Queue<RegionMaintainTask>> regionMaintainTaskMap =
+ new HashMap<>();
+ for (RegionMaintainTask regionMaintainTask : regionMaintainTaskList) {
+ regionMaintainTaskMap
+ .computeIfAbsent(regionMaintainTask.getRegionId(), k -> new LinkedList<>())
+ .add(regionMaintainTask);
+ }
+
+ while (!regionMaintainTaskMap.isEmpty()) {
+
+ // select same type task from each region group
+ List<RegionMaintainTask> selectedRegionMaintainTask = new ArrayList<>();
+ RegionMaintainType currentType = null;
+ for (Map.Entry<TConsensusGroupId, Queue<RegionMaintainTask>> entry :
+ regionMaintainTaskMap.entrySet()) {
+ RegionMaintainTask regionMaintainTask = entry.getValue().peek();
+ if (regionMaintainTask != null) {
+ if (currentType == null
+ || regionMaintainTask.getType().equals(RegionMaintainType.DELETE)
+ || entry
+ .getKey()
+ .getType()
+ .equals(selectedRegionMaintainTask.get(0).getRegionId().getType())) {
+ selectedRegionMaintainTask.add(entry.getValue().peek());
+ currentType = regionMaintainTask.getType();
+ }
}
+ }
- if (status.getCode() == TSStatusCode.SUCCESS_STATUS.getStatusCode()) {
- // Poll the head entry if success
- getConsensusManager().write(new PollRegionMaintainTaskPlan());
- } else {
- // Here we just break and wait until next schedule task
- // due to all the RegionMaintainEntry should be executed by
- // the order of they were offered
+ if (selectedRegionMaintainTask.isEmpty()) {
+ break;
+ }
+
+ Set<TConsensusGroupId> successfulTask = new HashSet<>();
+ switch (currentType) {
+ case CREATE:
+ switch (selectedRegionMaintainTask.get(0).getRegionId().getType()) {
+ case SchemaRegion:
Review Comment:
Added.
--
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