This is an automated email from the ASF dual-hosted git repository. rong pushed a commit to branch remove-sync-entry in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit c77ca0b6b92352bd39ee59944417b47ffd29ea71 Author: Steve Yurong Su <[email protected]> AuthorDate: Sat Jun 17 03:50:39 2023 +0800 remove sync related config --- .../java/org/apache/iotdb/db/conf/IoTDBConfig.java | 22 ---------------------- .../org/apache/iotdb/db/conf/IoTDBDescriptor.java | 19 ------------------- .../connector/legacy/IoTDBSyncReceiverV1_1.java | 8 -------- 3 files changed, 49 deletions(-) diff --git a/server/src/main/java/org/apache/iotdb/db/conf/IoTDBConfig.java b/server/src/main/java/org/apache/iotdb/db/conf/IoTDBConfig.java index fa34e2da887..1cc7f3c436b 100644 --- a/server/src/main/java/org/apache/iotdb/db/conf/IoTDBConfig.java +++ b/server/src/main/java/org/apache/iotdb/db/conf/IoTDBConfig.java @@ -567,12 +567,6 @@ public class IoTDBConfig { /** Cache size of {@code checkAndGetDataTypeCache}. */ private int mRemoteSchemaCacheSize = 100000; - /** White list for sync */ - private String ipWhiteList = "127.0.0.1/32"; - - /** The maximum number of retries when the sender fails to synchronize files to the receiver. */ - private int maxNumberOfSyncFileRetry = 5; - /** * Set the language version when loading file including error information, default value is "EN" */ @@ -1652,14 +1646,6 @@ public class IoTDBConfig { this.mRemoteSchemaCacheSize = mRemoteSchemaCacheSize; } - public int getMaxNumberOfSyncFileRetry() { - return maxNumberOfSyncFileRetry; - } - - public void setMaxNumberOfSyncFileRetry(int maxNumberOfSyncFileRetry) { - this.maxNumberOfSyncFileRetry = maxNumberOfSyncFileRetry; - } - String getLanguageVersion() { return languageVersion; } @@ -1682,14 +1668,6 @@ public class IoTDBConfig { : version.split("\\.")[0] + "." + version.split("\\.")[1]; } - public String getIpWhiteList() { - return ipWhiteList; - } - - public void setIpWhiteList(String ipWhiteList) { - this.ipWhiteList = ipWhiteList; - } - public long getCacheFileReaderClearPeriod() { return cacheFileReaderClearPeriod; } diff --git a/server/src/main/java/org/apache/iotdb/db/conf/IoTDBDescriptor.java b/server/src/main/java/org/apache/iotdb/db/conf/IoTDBDescriptor.java index 4bb3850afb1..02e7a7a48bd 100644 --- a/server/src/main/java/org/apache/iotdb/db/conf/IoTDBDescriptor.java +++ b/server/src/main/java/org/apache/iotdb/db/conf/IoTDBDescriptor.java @@ -528,15 +528,6 @@ public class IoTDBDescriptor { properties.getProperty( "dn_session_timeout_threshold", Integer.toString(conf.getSessionTimeoutThreshold())))); - conf.setMaxNumberOfSyncFileRetry( - Integer.parseInt( - properties - .getProperty( - "max_number_of_sync_file_retry", - Integer.toString(conf.getMaxNumberOfSyncFileRetry())) - .trim())); - - conf.setIpWhiteList(properties.getProperty("ip_white_list", conf.getIpWhiteList())); conf.setFlushThreadCount( Integer.parseInt( @@ -1533,16 +1524,6 @@ public class IoTDBDescriptor { "select_into_insert_tablet_plan_row_limit", String.valueOf(conf.getSelectIntoInsertTabletPlanRowLimit())))); - // update sync config - conf.setMaxNumberOfSyncFileRetry( - Integer.parseInt( - properties - .getProperty( - "max_number_of_sync_file_retry", - Integer.toString(conf.getMaxNumberOfSyncFileRetry())) - .trim())); - conf.setIpWhiteList(properties.getProperty("ip_white_list", conf.getIpWhiteList())); - // update enable query memory estimation for memory control conf.setEnableQueryMemoryEstimation( Boolean.parseBoolean( diff --git a/server/src/main/java/org/apache/iotdb/db/pipe/connector/legacy/IoTDBSyncReceiverV1_1.java b/server/src/main/java/org/apache/iotdb/db/pipe/connector/legacy/IoTDBSyncReceiverV1_1.java index 2a1c34bbd9c..64b71888643 100644 --- a/server/src/main/java/org/apache/iotdb/db/pipe/connector/legacy/IoTDBSyncReceiverV1_1.java +++ b/server/src/main/java/org/apache/iotdb/db/pipe/connector/legacy/IoTDBSyncReceiverV1_1.java @@ -163,14 +163,6 @@ public class IoTDBSyncReceiverV1_1 { ISchemaFetcher schemaFetcher) { SyncIdentityInfo identityInfo = new SyncIdentityInfo(tIdentityInfo, remoteAddress); logger.info("Invoke handshake method from client ip = {}", identityInfo.getRemoteAddress()); - // check ip address - if (!verifyIPSegment(config.getIpWhiteList(), identityInfo.getRemoteAddress())) { - return RpcUtils.getStatus( - TSStatusCode.PIPESERVER_ERROR, - String.format( - "permission is not allowed: the sender IP <%s>, the white list of receiver <%s>", - identityInfo.getRemoteAddress(), config.getIpWhiteList())); - } // Version check if (!config.getIoTDBMajorVersion(identityInfo.version).equals(config.getIoTDBMajorVersion())) { return RpcUtils.getStatus(
