This is an automated email from the ASF dual-hosted git repository.
wangchao316 pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/iotdb.git
The following commit(s) were added to refs/heads/master by this push:
new f0cbaf7865 [IOTDB-4026] unknown PhysicalPlan type: 51 (#6873)
f0cbaf7865 is described below
commit f0cbaf7865680f580ef2beef638e5cac825e7fc3
Author: QiangShaowei <[email protected]>
AuthorDate: Wed Aug 3 15:57:00 2022 +0800
[IOTDB-4026] unknown PhysicalPlan type: 51 (#6873)
[IOTDB-4026] unknown PhysicalPlan type: 51 (#6873)
---
.../iotdb/confignode/consensus/request/ConfigPhysicalPlan.java | 4 ++++
.../org/apache/iotdb/confignode/manager/ProcedureManager.java | 6 ++++++
.../iotdb/confignode/procedure/impl/RegionMigrateProcedure.java | 3 ++-
.../db/service/thrift/impl/DataNodeInternalRPCServiceImpl.java | 8 ++++----
4 files changed, 16 insertions(+), 5 deletions(-)
diff --git
a/confignode/src/main/java/org/apache/iotdb/confignode/consensus/request/ConfigPhysicalPlan.java
b/confignode/src/main/java/org/apache/iotdb/confignode/consensus/request/ConfigPhysicalPlan.java
index 74a1e258c1..92b03b8f1f 100644
---
a/confignode/src/main/java/org/apache/iotdb/confignode/consensus/request/ConfigPhysicalPlan.java
+++
b/confignode/src/main/java/org/apache/iotdb/confignode/consensus/request/ConfigPhysicalPlan.java
@@ -53,6 +53,7 @@ import
org.apache.iotdb.confignode.consensus.request.write.SetStorageGroupPlan;
import org.apache.iotdb.confignode.consensus.request.write.SetTTLPlan;
import
org.apache.iotdb.confignode.consensus.request.write.SetTimePartitionIntervalPlan;
import org.apache.iotdb.confignode.consensus.request.write.UpdateProcedurePlan;
+import
org.apache.iotdb.confignode.consensus.request.write.UpdateRegionLocationPlan;
import
org.apache.iotdb.confignode.consensus.request.write.template.CreateSchemaTemplatePlan;
import
org.apache.iotdb.confignode.consensus.request.write.template.SetSchemaTemplatePlan;
import org.apache.iotdb.consensus.common.request.IConsensusRequest;
@@ -233,6 +234,9 @@ public abstract class ConfigPhysicalPlan implements
IConsensusRequest {
case GetRegionInfoList:
req = new GetRegionInfoListPlan();
break;
+ case UpdateRegionLocation:
+ req = new UpdateRegionLocationPlan();
+ break;
default:
throw new IOException("unknown PhysicalPlan type: " + typeNum);
}
diff --git
a/confignode/src/main/java/org/apache/iotdb/confignode/manager/ProcedureManager.java
b/confignode/src/main/java/org/apache/iotdb/confignode/manager/ProcedureManager.java
index afcf242b32..4d4a754929 100644
---
a/confignode/src/main/java/org/apache/iotdb/confignode/manager/ProcedureManager.java
+++
b/confignode/src/main/java/org/apache/iotdb/confignode/manager/ProcedureManager.java
@@ -240,6 +240,7 @@ public class ProcedureManager {
}
public void reportRegionMigrateResult(TRegionMigrateResultReportReq req) {
+ LOGGER.info("receive DataNode region:{} migrate result:{}",
req.getRegionId(), req);
this.executor.getProcedures().values().stream()
.forEach(
procedure -> {
@@ -247,6 +248,11 @@ public class ProcedureManager {
RegionMigrateProcedure regionMigrateProcedure =
(RegionMigrateProcedure) procedure;
if
(regionMigrateProcedure.getConsensusGroupId().equals(req.getRegionId())) {
regionMigrateProcedure.notifyTheRegionMigrateFinished(req);
+ } else {
+ LOGGER.warn(
+ "DataNode report region:{} is not equals ConfigNode send
region:{}",
+ req.getRegionId(),
+ regionMigrateProcedure.getConsensusGroupId());
}
}
});
diff --git
a/confignode/src/main/java/org/apache/iotdb/confignode/procedure/impl/RegionMigrateProcedure.java
b/confignode/src/main/java/org/apache/iotdb/confignode/procedure/impl/RegionMigrateProcedure.java
index a2641da308..dac3c1328a 100644
---
a/confignode/src/main/java/org/apache/iotdb/confignode/procedure/impl/RegionMigrateProcedure.java
+++
b/confignode/src/main/java/org/apache/iotdb/confignode/procedure/impl/RegionMigrateProcedure.java
@@ -225,11 +225,12 @@ public class RegionMigrateProcedure
* @param req
*/
public void notifyTheRegionMigrateFinished(TRegionMigrateResultReportReq
req) {
- LOG.info("DataNode reported region {} migrate result:{} ",
req.getRegionId(), req);
// TODO the req is used in roll back
synchronized (regionMigrateLock) {
regionMigrateLock.notify();
}
+ LOG.info(
+ "notified after DataNode reported region {} migrate result:{} ",
req.getRegionId(), req);
}
public TConsensusGroupId getConsensusGroupId() {
diff --git
a/server/src/main/java/org/apache/iotdb/db/service/thrift/impl/DataNodeInternalRPCServiceImpl.java
b/server/src/main/java/org/apache/iotdb/db/service/thrift/impl/DataNodeInternalRPCServiceImpl.java
index b2bdbcc4de..a7c9a06d23 100644
---
a/server/src/main/java/org/apache/iotdb/db/service/thrift/impl/DataNodeInternalRPCServiceImpl.java
+++
b/server/src/main/java/org/apache/iotdb/db/service/thrift/impl/DataNodeInternalRPCServiceImpl.java
@@ -634,7 +634,7 @@ public class DataNodeInternalRPCServiceImpl implements
IDataNodeRPCService.Iface
private TSStatus createNewRegion(ConsensusGroupId regionId, String
storageGroup, long ttl) {
TSStatus status = new
TSStatus(TSStatusCode.SUCCESS_STATUS.getStatusCode());
- LOGGER.debug("start to create new region {}", regionId);
+ LOGGER.info("start to create new region {}", regionId);
try {
if (regionId instanceof DataRegionId) {
storageEngine.createDataRegion((DataRegionId) regionId, storageGroup,
ttl);
@@ -648,7 +648,7 @@ public class DataNodeInternalRPCServiceImpl implements
IDataNodeRPCService.Iface
return status;
}
status.setMessage("create new region " + regionId + " succeed");
- LOGGER.debug("succeed to create new region {}", regionId);
+ LOGGER.info("succeed to create new region {}", regionId);
return status;
}
@@ -723,7 +723,7 @@ public class DataNodeInternalRPCServiceImpl implements
IDataNodeRPCService.Iface
}
private TSStatus addConsensusGroup(ConsensusGroupId regionId, List<Peer>
peers) {
- LOGGER.debug("start to add peers {} to region {} consensus group", peers,
regionId);
+ LOGGER.info("start to add peers {} to region {} consensus group", peers,
regionId);
TSStatus status = new
TSStatus(TSStatusCode.SUCCESS_STATUS.getStatusCode());
ConsensusGenericResponse resp;
if (regionId instanceof DataRegionId) {
@@ -738,7 +738,7 @@ public class DataNodeInternalRPCServiceImpl implements
IDataNodeRPCService.Iface
status.setMessage(resp.getException().getMessage());
return status;
}
- LOGGER.debug("succeed to add peers {} to region {} consensus group",
peers, regionId);
+ LOGGER.info("succeed to add peers {} to region {} consensus group", peers,
regionId);
status.setMessage("add peers to region consensus group " + regionId +
"succeed");
return status;
}
