You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by ha...@apache.org on 2021/09/23 08:15:51 UTC
[iotdb] branch master updated: [IOTDB-1636]change sync version
check to major version (#3984)
This is an automated email from the ASF dual-hosted git repository.
haonan 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 84a018d [IOTDB-1636]change sync version check to major version (#3984)
84a018d is described below
commit 84a018d17f242dbd949dd5d27cab111744948000
Author: yschengzi <87...@users.noreply.github.com>
AuthorDate: Thu Sep 23 16:15:27 2021 +0800
[IOTDB-1636]change sync version check to major version (#3984)
---
server/src/main/java/org/apache/iotdb/db/conf/IoTDBConstant.java | 4 ++++
.../org/apache/iotdb/db/sync/receiver/transfer/SyncServiceImpl.java | 4 ++--
.../java/org/apache/iotdb/db/sync/sender/transfer/SyncClient.java | 2 +-
3 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/server/src/main/java/org/apache/iotdb/db/conf/IoTDBConstant.java b/server/src/main/java/org/apache/iotdb/db/conf/IoTDBConstant.java
index ef68816..a943896 100644
--- a/server/src/main/java/org/apache/iotdb/db/conf/IoTDBConstant.java
+++ b/server/src/main/java/org/apache/iotdb/db/conf/IoTDBConstant.java
@@ -31,6 +31,10 @@ public class IoTDBConstant {
IoTDBConstant.class.getPackage().getImplementationVersion() != null
? IoTDBConstant.class.getPackage().getImplementationVersion()
: "UNKNOWN";
+ public static final String MAJOR_VERSION =
+ VERSION.equals("UNKNOWN")
+ ? "UNKNOWN"
+ : VERSION.split("\\.")[0] + "." + VERSION.split("\\.")[1];
public static final String AUDIT_LOGGER_NAME = "IoTDB_AUDIT_LOGGER";
diff --git a/server/src/main/java/org/apache/iotdb/db/sync/receiver/transfer/SyncServiceImpl.java b/server/src/main/java/org/apache/iotdb/db/sync/receiver/transfer/SyncServiceImpl.java
index 38cd717..a03da4d 100644
--- a/server/src/main/java/org/apache/iotdb/db/sync/receiver/transfer/SyncServiceImpl.java
+++ b/server/src/main/java/org/apache/iotdb/db/sync/receiver/transfer/SyncServiceImpl.java
@@ -78,11 +78,11 @@ public class SyncServiceImpl implements SyncService.Iface {
public SyncStatus check(ConfirmInfo info) {
String ipAddress = info.address, uuid = info.uuid;
Thread.currentThread().setName(ThreadName.SYNC_SERVER.getName());
- if (!info.version.equals(IoTDBConstant.VERSION)) {
+ if (!info.version.equals(IoTDBConstant.MAJOR_VERSION)) {
return getErrorResult(
String.format(
"Version mismatch: the sender <%s>, the receiver <%s>",
- info.version, IoTDBConstant.VERSION));
+ info.version, IoTDBConstant.MAJOR_VERSION));
}
if (info.partitionInterval
!= IoTDBDescriptor.getInstance().getConfig().getPartitionInterval()) {
diff --git a/server/src/main/java/org/apache/iotdb/db/sync/sender/transfer/SyncClient.java b/server/src/main/java/org/apache/iotdb/db/sync/sender/transfer/SyncClient.java
index 8acd63e..b7f0540 100644
--- a/server/src/main/java/org/apache/iotdb/db/sync/sender/transfer/SyncClient.java
+++ b/server/src/main/java/org/apache/iotdb/db/sync/sender/transfer/SyncClient.java
@@ -325,7 +325,7 @@ public class SyncClient implements ISyncClient {
socket.getLocalAddress().getHostAddress(),
getOrCreateUUID(getUuidFile()),
ioTDBConfig.getPartitionInterval(),
- IoTDBConstant.VERSION);
+ IoTDBConstant.MAJOR_VERSION);
SyncStatus status = serviceClient.check(info);
if (status.code != SUCCESS_CODE) {
throw new SyncConnectionException(