This is an automated email from the ASF dual-hosted git repository. haonan pushed a commit to branch mv_iotdb-env_datanode-env in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit e6254e5463ee6d110f94609ce394156c6c10cb7e Author: HTHou <[email protected]> AuthorDate: Mon Jun 27 10:02:43 2022 +0800 Rename iotdb-env.sh to datanode-env.sh --- README.md | 2 +- README_ZH.md | 2 +- distribution/src/assembly/all.xml | 4 ++-- distribution/src/assembly/server.xml | 4 ++-- docker/src/main/Dockerfile-single | 2 +- docker/src/main/Dockerfile-single-influxdb | 2 +- docker/src/main/Dockerfile-single-tc | 2 +- docs/UserGuide/Maintenance-Tools/JMX-Tool.md | 2 +- docs/UserGuide/QuickStart/QuickStart.md | 6 +++--- docs/UserGuide/QuickStart/ServerFileList.md | 2 +- docs/UserGuide/Reference/Config-Manual.md | 4 ++-- docs/zh/UserGuide/Maintenance-Tools/JMX-Tool.md | 2 +- docs/zh/UserGuide/QuickStart/QuickStart.md | 2 +- docs/zh/UserGuide/QuickStart/ServerFileList.md | 2 +- docs/zh/UserGuide/Reference/Config-Manual.md | 8 ++++---- integration-test/pom.xml | 4 ++-- integration-test/src/assembly/mpp-test.xml | 4 ++-- .../main/java/org/apache/iotdb/it/env/DataNodeWrapper.java | 4 ++-- .../java/org/apache/iotdb/commons/conf/IoTDBConstant.java | 2 +- .../resources/conf/{iotdb-env.bat => datanode-env.bat} | 2 +- .../resources/conf/{iotdb-env.sh => datanode-env.sh} | 2 +- server/src/assembly/resources/sbin/start-datanode.bat | 14 +++++++------- server/src/assembly/resources/sbin/start-datanode.sh | 14 +++++++------- server/src/assembly/resources/sbin/start-new-server.bat | 6 +++--- server/src/assembly/resources/sbin/start-new-server.sh | 8 ++++---- server/src/assembly/resources/sbin/start-server.bat | 6 +++--- server/src/assembly/resources/sbin/start-server.sh | 8 ++++---- server/src/assembly/resources/tools/rocksdb-transfer.bat | 6 +++--- server/src/assembly/resources/tools/rocksdb-transfer.sh | 8 ++++---- server/src/assembly/resources/tools/start-WalChecker.sh | 6 +++--- .../db/exception/metadata/SeriesOverflowException.java | 2 +- .../test/java/org/apache/iotdb/db/script/EnvScriptIT.java | 8 ++++---- 32 files changed, 75 insertions(+), 75 deletions(-) diff --git a/README.md b/README.md index 712c9e907e..3b05b9d6de 100644 --- a/README.md +++ b/README.md @@ -179,7 +179,7 @@ you run `mvn package` successfully.** configuration files are under "conf" folder - * environment config module (`iotdb-env.bat`, `iotdb-env.sh`), + * environment config module (`datanode-env.bat`, `datanode-env.sh`), * system config module (`iotdb-datanode.properties`) * log config module (`logback.xml`). diff --git a/README_ZH.md b/README_ZH.md index ab3adaeb31..de98411dd7 100644 --- a/README_ZH.md +++ b/README_ZH.md @@ -164,7 +164,7 @@ git checkout vx.x.x ### 配置 配置文件在"conf"文件夹下 -* 环境配置模块(`iotdb-env.bat`, `iotdb-env.sh`), +* 环境配置模块(`datanode-env.bat`, `datanode-env.sh`), * 系统配置模块(`iotdb-datanode.properties`) * 日志配置模块(`logback.xml`)。 diff --git a/distribution/src/assembly/all.xml b/distribution/src/assembly/all.xml index a1c156ccce..aa17f03e5d 100644 --- a/distribution/src/assembly/all.xml +++ b/distribution/src/assembly/all.xml @@ -118,8 +118,8 @@ <destName>tools/grafana/application.properties</destName> </file> <file> - <source>${maven.multiModuleProjectDirectory}/server/src/assembly/resources/conf/iotdb-env.sh</source> - <destName>datanode/conf/iotdb-env.sh</destName> + <source>${maven.multiModuleProjectDirectory}/server/src/assembly/resources/conf/datanode-env.sh</source> + <destName>datanode/conf/datanode-env.sh</destName> <fileMode>0755</fileMode> </file> </files> diff --git a/distribution/src/assembly/server.xml b/distribution/src/assembly/server.xml index adbeb5c90f..e774d89711 100644 --- a/distribution/src/assembly/server.xml +++ b/distribution/src/assembly/server.xml @@ -77,8 +77,8 @@ </fileSets> <files> <file> - <source>${maven.multiModuleProjectDirectory}/server/src/assembly/resources/conf/iotdb-env.sh</source> - <destName>conf/iotdb-env.sh</destName> + <source>${maven.multiModuleProjectDirectory}/server/src/assembly/resources/conf/datanode-env.sh</source> + <destName>conf/datanode-env.sh</destName> <fileMode>0755</fileMode> </file> </files> diff --git a/docker/src/main/Dockerfile-single b/docker/src/main/Dockerfile-single index 57f2303976..cb1b7c0db1 100644 --- a/docker/src/main/Dockerfile-single +++ b/docker/src/main/Dockerfile-single @@ -33,7 +33,7 @@ RUN apt update \ && apt purge --auto-remove -y \ && apt clean -y RUN dos2unix /iotdb/sbin/start-server.sh -RUN dos2unix /iotdb/sbin/../conf/iotdb-env.sh +RUN dos2unix /iotdb/sbin/../conf/datanode-env.sh EXPOSE 6667 EXPOSE 31999 EXPOSE 5555 diff --git a/docker/src/main/Dockerfile-single-influxdb b/docker/src/main/Dockerfile-single-influxdb index de18afab47..a0f77d41e2 100644 --- a/docker/src/main/Dockerfile-single-influxdb +++ b/docker/src/main/Dockerfile-single-influxdb @@ -34,7 +34,7 @@ RUN apt update \ && apt purge --auto-remove -y \ && apt clean -y RUN dos2unix /iotdb/sbin/start-server.sh -RUN dos2unix /iotdb/sbin/../conf/iotdb-env.sh +RUN dos2unix /iotdb/sbin/../conf/datanode-env.sh EXPOSE 6667 EXPOSE 31999 EXPOSE 5555 diff --git a/docker/src/main/Dockerfile-single-tc b/docker/src/main/Dockerfile-single-tc index f31c81b8e8..71f785fef9 100644 --- a/docker/src/main/Dockerfile-single-tc +++ b/docker/src/main/Dockerfile-single-tc @@ -33,7 +33,7 @@ RUN apt update \ && apt purge --auto-remove -y \ && apt clean -y RUN dos2unix /iotdb/sbin/start-server.sh -RUN dos2unix /iotdb/sbin/../conf/iotdb-env.sh +RUN dos2unix /iotdb/sbin/../conf/datanode-env.sh EXPOSE 6667 EXPOSE 31999 EXPOSE 5555 diff --git a/docs/UserGuide/Maintenance-Tools/JMX-Tool.md b/docs/UserGuide/Maintenance-Tools/JMX-Tool.md index 3851b4badc..58f41b4489 100644 --- a/docs/UserGuide/Maintenance-Tools/JMX-Tool.md +++ b/docs/UserGuide/Maintenance-Tools/JMX-Tool.md @@ -34,7 +34,7 @@ View `$IOTDB_HOME/conf/jmx.password`, and use default user or add new users here If new users are added, remember to edit `$IOTDB_HOME/conf/jmx.access` and add new users' access * IoTDB is not LOCAL -Edit `$IOTDB_HOME/conf/iotdb-env.sh`, and modify config below: +Edit `$IOTDB_HOME/conf/datanode-env.sh`, and modify config below: ``` JMX_LOCAL="false" JMX_IP="the_real_iotdb_server_ip" # Write the actual IoTDB IP address diff --git a/docs/UserGuide/QuickStart/QuickStart.md b/docs/UserGuide/QuickStart/QuickStart.md index 90e2dbef28..ef06d4721d 100644 --- a/docs/UserGuide/QuickStart/QuickStart.md +++ b/docs/UserGuide/QuickStart/QuickStart.md @@ -48,7 +48,7 @@ You can download the binary file from: configuration files are under "conf" folder - * environment config module (`iotdb-env.bat`, `iotdb-env.sh`), + * environment config module (`datanode-env.bat`, `datanode-env.sh`), * system config module (`iotdb-datanode.properties`) * log config module (`logback.xml`). @@ -82,7 +82,7 @@ if you want to use JMX to connect IOTDB, you may need to add ``` -Dcom.sun.management.jmxremote.rmi.port=PORT -Djava.rmi.server.hostname=IP ``` -to $IOTDB_JMX_OPTS in iotdb-env.sh. or iotdb-env.bat +to $IOTDB_JMX_OPTS in datanode-env.sh. or datanode-env.bat ### Use Cli @@ -234,6 +234,6 @@ The server can be stopped with ctrl-C or the following script: The configuration files is in the `conf` folder, includes: -* environment configuration (`iotdb-env.bat`, `iotdb-env.sh`), +* environment configuration (`datanode-env.bat`, `datanode-env.sh`), * system configuration (`iotdb-datanode.properties`) * log configuration (`logback.xml`). \ No newline at end of file diff --git a/docs/UserGuide/QuickStart/ServerFileList.md b/docs/UserGuide/QuickStart/ServerFileList.md index 1fce7a22b8..3f6e87eb06 100644 --- a/docs/UserGuide/QuickStart/ServerFileList.md +++ b/docs/UserGuide/QuickStart/ServerFileList.md @@ -29,7 +29,7 @@ > under conf directory 1. iotdb-datanode.properties 2. logback.xml -3. iotdb-env.sh +3. datanode-env.sh 4. jmx.access 5. jmx.password 6. iotdb-sync-client.properties diff --git a/docs/UserGuide/Reference/Config-Manual.md b/docs/UserGuide/Reference/Config-Manual.md index b371181c39..764eba562c 100644 --- a/docs/UserGuide/Reference/Config-Manual.md +++ b/docs/UserGuide/Reference/Config-Manual.md @@ -26,7 +26,7 @@ Before starting to use IoTDB, you need to config the configuration files first. In total, we provide users three kinds of configurations module: -* environment configuration file (`iotdb-env.bat`, `iotdb-env.sh`). The default configuration file for the environment configuration item. Users can configure the relevant system configuration items of JAVA-JVM in the file. +* environment configuration file (`datanode-env.bat`, `datanode-env.sh`). The default configuration file for the environment configuration item. Users can configure the relevant system configuration items of JAVA-JVM in the file. * system configuration file (`iotdb-datanode.properties`). * `iotdb-datanode.properties`: The default configuration file for the IoTDB engine layer configuration item. Users can configure the IoTDB engine related parameters in the file, such as JDBC service listening port (`rpc_port`), unsequence data storage directory (`unsequence_data_dir`), etc. What's more, Users can configure the information about the TsFile, such as the data size written to the disk per time(`group_size_in_byte`). @@ -43,7 +43,7 @@ Trigger way: The client sends the command `load configuration` to the IoTDB serv ## IoTDB Environment Configuration File -The environment configuration file is mainly used to configure the Java environment related parameters when IoTDB Server is running, such as JVM related configuration. This part of the configuration is passed to the JVM when the IoTDB Server starts. Users can view the contents of the environment configuration file by viewing the `iotdb-env.sh` (or `iotdb-env.bat`) file. +The environment configuration file is mainly used to configure the Java environment related parameters when IoTDB Server is running, such as JVM related configuration. This part of the configuration is passed to the JVM when the IoTDB Server starts. Users can view the contents of the environment configuration file by viewing the `datanode-env.sh` (or `datanode-env.bat`) file. The detail of each variables are as follows: diff --git a/docs/zh/UserGuide/Maintenance-Tools/JMX-Tool.md b/docs/zh/UserGuide/Maintenance-Tools/JMX-Tool.md index 927a9e139a..b360f6e672 100644 --- a/docs/zh/UserGuide/Maintenance-Tools/JMX-Tool.md +++ b/docs/zh/UserGuide/Maintenance-Tools/JMX-Tool.md @@ -34,7 +34,7 @@ Java VisualVM 提供了一个可视化的界面，用于查看 Java 应用程序 若新增用户，编辑`$IOTDB_HOME/conf/jmx.access`，添加新增用户权限 * IoTDB 不在本地 -编辑`$IOTDB_HOME/conf/iotdb-env.sh` +编辑`$IOTDB_HOME/conf/datanode-env.sh` 修改以下参数： ``` JMX_LOCAL="false" diff --git a/docs/zh/UserGuide/QuickStart/QuickStart.md b/docs/zh/UserGuide/QuickStart/QuickStart.md index bcc156df93..3347419098 100644 --- a/docs/zh/UserGuide/QuickStart/QuickStart.md +++ b/docs/zh/UserGuide/QuickStart/QuickStart.md @@ -258,6 +258,6 @@ Windows 系统停止命令如下： 配置文件在"conf"文件夹下，包括： - * 环境配置模块 (`iotdb-env.bat`, `iotdb-env.sh`), + * 环境配置模块 (`datanode-env.bat`, `datanode-env.sh`), * 系统配置模块 (`iotdb-datanode.properties`) * 日志配置模块 (`logback.xml`). diff --git a/docs/zh/UserGuide/QuickStart/ServerFileList.md b/docs/zh/UserGuide/QuickStart/ServerFileList.md index c3f543f692..214099f2b5 100644 --- a/docs/zh/UserGuide/QuickStart/ServerFileList.md +++ b/docs/zh/UserGuide/QuickStart/ServerFileList.md @@ -29,7 +29,7 @@ > conf 目录下 1. iotdb-datanode.properties 2. logback.xml -3. iotdb-env.sh +3. datanode-env.sh 4. jmx.access 5. jmx.password 6. iotdb-sync-client.properties diff --git a/docs/zh/UserGuide/Reference/Config-Manual.md b/docs/zh/UserGuide/Reference/Config-Manual.md index a68381ee1f..c283408a3e 100644 --- a/docs/zh/UserGuide/Reference/Config-Manual.md +++ b/docs/zh/UserGuide/Reference/Config-Manual.md @@ -23,12 +23,12 @@ 为方便 IoTDB Server 的配置与管理，IoTDB Server 为用户提供三种配置项，使得用户可以在启动服务或服务运行时对其进行配置。 -三种配置项的配置文件均位于 IoTDB 安装目录：`$IOTDB_HOME/conf`文件夹下，其中涉及 server 配置的共有 2 个文件，分别为：`iotdb-env.sh`, `iotdb-datanode.properties` +三种配置项的配置文件均位于 IoTDB 安装目录：`$IOTDB_HOME/conf`文件夹下，其中涉及 server 配置的共有 2 个文件，分别为：`datanode-env.sh`, `iotdb-datanode.properties` 。用户可以通过更改其中的配置项对系统运行的相关配置项进行配置。 配置文件的说明如下： -* `iotdb-env.sh`：环境配置项的默认配置文件。用户可以在文件中配置 JAVA-JVM 的相关系统配置项。 +* `datanode-env.sh`：环境配置项的默认配置文件。用户可以在文件中配置 JAVA-JVM 的相关系统配置项。 * `iotdb-datanode.properties`：IoTDB 引擎层系统配置项的默认配置文件。用户可以在文件中配置 IoTDB 引擎运行时的相关参数，如 JDBC 服务监听端口 (`rpc_port`)、overflow 数据文件存储目录 (`overflow_data_dir`) 等。此外，用户可以在文件中配置 IoTDB 存储时 TsFile 文件的相关信息，如每次将内存中的数据写入到磁盘时的数据大小 (`group_size_in_byte`) @@ -44,8 +44,8 @@ Server，客户端的使用方式详见 [SQL 命令行终端（CLI）](https://i ## 环境配置项 -环境配置项主要用于对 IoTDB Server 运行的 Java 环境相关参数进行配置，如 JVM 相关配置。IoTDB Server 启动时，此部分配置会被传给 JVM。用户可以通过查看 `iotdb-env.sh` -（或`iotdb-env.bat`) 文件查看环境配置项内容。详细配置项说明如下： +环境配置项主要用于对 IoTDB Server 运行的 Java 环境相关参数进行配置，如 JVM 相关配置。IoTDB Server 启动时，此部分配置会被传给 JVM。用户可以通过查看 `datanode-env.sh` +（或`datanode-env.bat`) 文件查看环境配置项内容。详细配置项说明如下： * JMX\_LOCAL diff --git a/integration-test/pom.xml b/integration-test/pom.xml index 5d8bde0d2d..fccb4f5309 100644 --- a/integration-test/pom.xml +++ b/integration-test/pom.xml @@ -161,9 +161,9 @@ <regex>true</regex> <commentsEnabled>false</commentsEnabled> <includes> - <include>datanode/conf/iotdb-env.sh</include> + <include>datanode/conf/datanode-env.sh</include> <include>confignode/conf/confignode-env.sh</include> - <include>datanode/conf/iotdb-env.bat</include> + <include>datanode/conf/datanode-env.bat</include> <include>confignode/conf/confignode-env.bat</include> </includes> <replacements> diff --git a/integration-test/src/assembly/mpp-test.xml b/integration-test/src/assembly/mpp-test.xml index 4e0f21cefc..76f62c4925 100644 --- a/integration-test/src/assembly/mpp-test.xml +++ b/integration-test/src/assembly/mpp-test.xml @@ -66,8 +66,8 @@ </fileSets> <files> <file> - <source>${maven.multiModuleProjectDirectory}/server/src/assembly/resources/conf/iotdb-env.sh</source> - <destName>datanode/conf/iotdb-env.sh</destName> + <source>${maven.multiModuleProjectDirectory}/server/src/assembly/resources/conf/datanode-env.sh</source> + <destName>datanode/conf/datanode-env.sh</destName> <fileMode>0755</fileMode> </file> </files> diff --git a/integration-test/src/main/java/org/apache/iotdb/it/env/DataNodeWrapper.java b/integration-test/src/main/java/org/apache/iotdb/it/env/DataNodeWrapper.java index d9451b4c55..eb2f46380f 100644 --- a/integration-test/src/main/java/org/apache/iotdb/it/env/DataNodeWrapper.java +++ b/integration-test/src/main/java/org/apache/iotdb/it/env/DataNodeWrapper.java @@ -66,9 +66,9 @@ public class DataNodeWrapper extends AbstractNodeWrapper { @Override protected String getEnvConfigPath() { if (SystemUtils.IS_OS_WINDOWS) { - return workDirFilePath("datanode" + File.separator + "conf", "iotdb-env.bat"); + return workDirFilePath("datanode" + File.separator + "conf", "datanode-env.bat"); } - return workDirFilePath("datanode" + File.separator + "conf", "iotdb-env.sh"); + return workDirFilePath("datanode" + File.separator + "conf", "datanode-env.sh"); } @Override diff --git a/node-commons/src/main/java/org/apache/iotdb/commons/conf/IoTDBConstant.java b/node-commons/src/main/java/org/apache/iotdb/commons/conf/IoTDBConstant.java index 169f5c8151..5c29deb183 100644 --- a/node-commons/src/main/java/org/apache/iotdb/commons/conf/IoTDBConstant.java +++ b/node-commons/src/main/java/org/apache/iotdb/commons/conf/IoTDBConstant.java @@ -25,7 +25,7 @@ public class IoTDBConstant { private IoTDBConstant() {} - public static final String ENV_FILE_NAME = "iotdb-env"; + public static final String ENV_FILE_NAME = "datanode-env"; public static final String IOTDB_CONF = "IOTDB_CONF"; public static final String GLOBAL_DB_NAME = "IoTDB"; diff --git a/server/src/assembly/resources/conf/iotdb-env.bat b/server/src/assembly/resources/conf/datanode-env.bat similarity index 98% rename from server/src/assembly/resources/conf/iotdb-env.bat rename to server/src/assembly/resources/conf/datanode-env.bat index f748090f1b..7dce041f5b 100644 --- a/server/src/assembly/resources/conf/iotdb-env.bat +++ b/server/src/assembly/resources/conf/datanode-env.bat @@ -143,4 +143,4 @@ IF "%JAVA_VERSION%" == "8" ( ) echo Maximum memory allocation pool = %MAX_HEAP_SIZE%, initial memory allocation pool = %HEAP_NEWSIZE% -echo If you want to change this configuration, please check conf/iotdb-env.sh(Unix or OS X, if you use Windows, check conf/iotdb-env.bat). +echo If you want to change this configuration, please check conf\datanode-env.bat. diff --git a/server/src/assembly/resources/conf/iotdb-env.sh b/server/src/assembly/resources/conf/datanode-env.sh similarity index 99% rename from server/src/assembly/resources/conf/iotdb-env.sh rename to server/src/assembly/resources/conf/datanode-env.sh index 8b0e016079..8349b80574 100755 --- a/server/src/assembly/resources/conf/iotdb-env.sh +++ b/server/src/assembly/resources/conf/datanode-env.sh @@ -260,5 +260,5 @@ IOTDB_JMX_OPTS="$IOTDB_JMX_OPTS -XX:MaxDirectMemorySize=${MAX_DIRECT_MEMORY_SIZE IOTDB_JMX_OPTS="$IOTDB_JMX_OPTS -Djdk.nio.maxCachedBufferSize=${MAX_CACHED_BUFFER_SIZE}" echo "Maximum memory allocation pool = ${MAX_HEAP_SIZE}B, initial memory allocation pool = ${HEAP_NEWSIZE}B" -echo "If you want to change this configuration, please check conf/iotdb-env.sh(Unix or OS X, if you use Windows, check conf/iotdb-env.bat)." +echo "If you want to change this configuration, please check conf/datanode-env.sh." diff --git a/server/src/assembly/resources/sbin/start-datanode.bat b/server/src/assembly/resources/sbin/start-datanode.bat index 4df45ed56c..25f00f337d 100755 --- a/server/src/assembly/resources/sbin/start-datanode.bat +++ b/server/src/assembly/resources/sbin/start-datanode.bat @@ -73,20 +73,20 @@ IF "%IOTDB_CONF%" == "" ( SET IOTDB_LOGS=%IOTDB_HOME%\logs -IF EXIST "%IOTDB_CONF%\iotdb-env.bat" ( +IF EXIST "%IOTDB_CONF%\datanode-env.bat" ( IF "%enable_printgc%" == "true" ( - CALL "%IOTDB_CONF%\iotdb-env.bat" printgc + CALL "%IOTDB_CONF%\datanode-env.bat" printgc ) ELSE ( - CALL "%IOTDB_CONF%\iotdb-env.bat" + CALL "%IOTDB_CONF%\datanode-env.bat" ) -) ELSE IF EXIST "%IOTDB_HOME%/conf/iotdb-env.bat" ( +) ELSE IF EXIST "%IOTDB_HOME%/conf/datanode-env.bat" ( IF "%enable_printgc%" == "true" ( - CALL "%IOTDB_HOME%/conf/iotdb-env.bat" printgc + CALL "%IOTDB_HOME%/conf/datanode-env.bat" printgc ) ELSE ( - CALL "%IOTDB_HOME%/conf/iotdb-env.bat" + CALL "%IOTDB_HOME%/conf/datanode-env.bat" ) ) ELSE ( - echo "can't find iotdb-env.bat" + echo "can't find datanode-env.bat" ) @setlocal ENABLEDELAYEDEXPANSION ENABLEEXTENSIONS diff --git a/server/src/assembly/resources/sbin/start-datanode.sh b/server/src/assembly/resources/sbin/start-datanode.sh index aab60307bb..327f7af44a 100755 --- a/server/src/assembly/resources/sbin/start-datanode.sh +++ b/server/src/assembly/resources/sbin/start-datanode.sh @@ -38,20 +38,20 @@ if [ -z "${IOTDB_CONF}" ]; then export IOTDB_CONF=${IOTDB_HOME}/conf fi -if [ -f "$IOTDB_CONF/iotdb-env.sh" ]; then +if [ -f "$IOTDB_CONF/datanode-env.sh" ]; then if [ $enable_printgc == "true" ]; then - . "$IOTDB_CONF/iotdb-env.sh" "printgc" + . "$IOTDB_CONF/datanode-env.sh" "printgc" else - . "$IOTDB_CONF/iotdb-env.sh" + . "$IOTDB_CONF/datanode-env.sh" fi -elif [ -f "${IOTDB_HOME}/conf/iotdb-env.sh" ]; then +elif [ -f "${IOTDB_HOME}/conf/datanode-env.sh" ]; then if [ $enable_printgc == "true" ]; then - . "${IOTDB_HOME}/conf/iotdb-env.sh" "printgc" + . "${IOTDB_HOME}/conf/datanode-env.sh" "printgc" else - . "${IOTDB_HOME}/conf/iotdb-env.sh" + . "${IOTDB_HOME}/conf/datanode-env.sh" fi else - echo "can't find $IOTDB_CONF/iotdb-env.sh" + echo "can't find $IOTDB_CONF/datanode-env.sh" fi CONF_PARAMS="-s "$* diff --git a/server/src/assembly/resources/sbin/start-new-server.bat b/server/src/assembly/resources/sbin/start-new-server.bat index 38a842ee5b..759f5dd1e8 100644 --- a/server/src/assembly/resources/sbin/start-new-server.bat +++ b/server/src/assembly/resources/sbin/start-new-server.bat @@ -74,10 +74,10 @@ for %%i in (%*) do ( ) ) -IF EXIST "%IOTDB_CONF%\iotdb-env.bat" ( - CALL "%IOTDB_CONF%\iotdb-env.bat" %1 +IF EXIST "%IOTDB_CONF%\datanode-env.bat" ( + CALL "%IOTDB_CONF%\datanode-env.bat" %1 ) ELSE ( - echo "can't find %IOTDB_CONF%\iotdb-env.bat" + echo "can't find %IOTDB_CONF%\datanode-env.bat" ) if NOT DEFINED MAIN_CLASS set MAIN_CLASS=org.apache.iotdb.db.service.NewIoTDB diff --git a/server/src/assembly/resources/sbin/start-new-server.sh b/server/src/assembly/resources/sbin/start-new-server.sh index 97a78a474d..6a8557e308 100644 --- a/server/src/assembly/resources/sbin/start-new-server.sh +++ b/server/src/assembly/resources/sbin/start-new-server.sh @@ -47,14 +47,14 @@ done CONF_PARAMS=$* -if [ -f "$IOTDB_CONF/iotdb-env.sh" ]; then +if [ -f "$IOTDB_CONF/datanode-env.sh" ]; then if [ "$#" -ge "1" -a "$1" == "printgc" ]; then - . "$IOTDB_CONF/iotdb-env.sh" "printgc" + . "$IOTDB_CONF/datanode-env.sh" "printgc" else - . "$IOTDB_CONF/iotdb-env.sh" + . "$IOTDB_CONF/datanode-env.sh" fi else - echo "can't find $IOTDB_CONF/iotdb-env.sh" + echo "can't find $IOTDB_CONF/datanode-env.sh" fi if [ -d ${IOTDB_HOME}/lib ]; then diff --git a/server/src/assembly/resources/sbin/start-server.bat b/server/src/assembly/resources/sbin/start-server.bat index 0e7c89260a..6fdfba0edb 100755 --- a/server/src/assembly/resources/sbin/start-server.bat +++ b/server/src/assembly/resources/sbin/start-server.bat @@ -74,10 +74,10 @@ for %%i in (%*) do ( ) ) -IF EXIST "%IOTDB_CONF%\iotdb-env.bat" ( - CALL "%IOTDB_CONF%\iotdb-env.bat" %1 +IF EXIST "%IOTDB_CONF%\datanode-env.bat" ( + CALL "%IOTDB_CONF%\datanode-env.bat" %1 ) ELSE ( - echo "can't find %IOTDB_CONF%\iotdb-env.bat" + echo "can't find %IOTDB_CONF%\datanode-env.bat" ) if NOT DEFINED MAIN_CLASS set MAIN_CLASS=org.apache.iotdb.db.service.IoTDB diff --git a/server/src/assembly/resources/sbin/start-server.sh b/server/src/assembly/resources/sbin/start-server.sh index 210ee3ce4f..bf1eb44ce5 100755 --- a/server/src/assembly/resources/sbin/start-server.sh +++ b/server/src/assembly/resources/sbin/start-server.sh @@ -47,14 +47,14 @@ done CONF_PARAMS=$* -if [ -f "$IOTDB_CONF/iotdb-env.sh" ]; then +if [ -f "$IOTDB_CONF/datanode-env.sh" ]; then if [ "$#" -ge "1" -a "$1" == "printgc" ]; then - . "$IOTDB_CONF/iotdb-env.sh" "printgc" + . "$IOTDB_CONF/datanode-env.sh" "printgc" else - . "$IOTDB_CONF/iotdb-env.sh" + . "$IOTDB_CONF/datanode-env.sh" fi else - echo "can't find $IOTDB_CONF/iotdb-env.sh" + echo "can't find $IOTDB_CONF/datanode-env.sh" fi if [ -d ${IOTDB_HOME}/lib ]; then diff --git a/server/src/assembly/resources/tools/rocksdb-transfer.bat b/server/src/assembly/resources/tools/rocksdb-transfer.bat index 89765a7f7e..06cc4c18dd 100644 --- a/server/src/assembly/resources/tools/rocksdb-transfer.bat +++ b/server/src/assembly/resources/tools/rocksdb-transfer.bat @@ -74,10 +74,10 @@ for %%i in (%*) do ( ) ) -IF EXIST "%IOTDB_CONF%\iotdb-env.bat" ( - CALL "%IOTDB_CONF%\iotdb-env.bat" %1 +IF EXIST "%IOTDB_CONF%\datanode-env.bat" ( + CALL "%IOTDB_CONF%\datanode-env.bat" %1 ) ELSE ( - echo "can't find %IOTDB_CONF%\iotdb-env.bat" + echo "can't find %IOTDB_CONF%\datanode-env.bat" ) if NOT DEFINED MAIN_CLASS set MAIN_CLASS=org.apache.iotdb.db.metadata.schemaregion.rocksdb.SchemaDataTransfer diff --git a/server/src/assembly/resources/tools/rocksdb-transfer.sh b/server/src/assembly/resources/tools/rocksdb-transfer.sh index a899d084f7..a4e05212a6 100644 --- a/server/src/assembly/resources/tools/rocksdb-transfer.sh +++ b/server/src/assembly/resources/tools/rocksdb-transfer.sh @@ -47,14 +47,14 @@ done CONF_PARAMS=$* -if [ -f "$IOTDB_CONF/iotdb-env.sh" ]; then +if [ -f "$IOTDB_CONF/datanode-env.sh" ]; then if [ "$#" -ge "1" -a "$1" == "printgc" ]; then - . "$IOTDB_CONF/iotdb-env.sh" "printgc" + . "$IOTDB_CONF/datanode-env.sh" "printgc" else - . "$IOTDB_CONF/iotdb-env.sh" + . "$IOTDB_CONF/datanode-env.sh" fi else - echo "can't find $IOTDB_CONF/iotdb-env.sh" + echo "can't find $IOTDB_CONF/datanode-env.sh" fi CLASSPATH="" diff --git a/server/src/assembly/resources/tools/start-WalChecker.sh b/server/src/assembly/resources/tools/start-WalChecker.sh index a977ff2657..d02b8e49d0 100755 --- a/server/src/assembly/resources/tools/start-WalChecker.sh +++ b/server/src/assembly/resources/tools/start-WalChecker.sh @@ -30,10 +30,10 @@ fi IOTDB_CONF=${IOTDB_HOME}/conf # IOTDB_LOGS=${IOTDB_HOME}/logs -#if [ -f "$IOTDB_CONF/iotdb-env.sh" ]; then -# . "$IOTDB_CONF/iotdb-env.sh" +#if [ -f "$IOTDB_CONF/datanode-env.sh" ]; then +# . "$IOTDB_CONF/datanode-env.sh" #else -# echo "can't find $IOTDB_CONF/iotdb-env.sh" +# echo "can't find $IOTDB_CONF/datanode-env.sh" #fi if [ -n "$JAVA_HOME" ]; then diff --git a/server/src/main/java/org/apache/iotdb/db/exception/metadata/SeriesOverflowException.java b/server/src/main/java/org/apache/iotdb/db/exception/metadata/SeriesOverflowException.java index 9ff926add7..87e61ab5d6 100644 --- a/server/src/main/java/org/apache/iotdb/db/exception/metadata/SeriesOverflowException.java +++ b/server/src/main/java/org/apache/iotdb/db/exception/metadata/SeriesOverflowException.java @@ -28,7 +28,7 @@ public class SeriesOverflowException extends MetadataException { public SeriesOverflowException() { super( "There are too many timeseries in memory, " - + "please increase MAX_HEAP_SIZE in iotdb-env.sh/bat, restart and create timeseries again.", + + "please increase MAX_HEAP_SIZE in datanode-env.sh/bat, restart and create timeseries again.", TSStatusCode.SERIES_OVERFLOW.getStatusCode()); } } diff --git a/server/src/test/java/org/apache/iotdb/db/script/EnvScriptIT.java b/server/src/test/java/org/apache/iotdb/db/script/EnvScriptIT.java index e6d675282d..193922997a 100644 --- a/server/src/test/java/org/apache/iotdb/db/script/EnvScriptIT.java +++ b/server/src/test/java/org/apache/iotdb/db/script/EnvScriptIT.java @@ -56,8 +56,8 @@ public class EnvScriptIT { private void testStartClientOnWindows(String suffix, String os) throws IOException { String dir = getServerPath(); final String output = - "If you want to change this configuration, please check conf/iotdb-env.sh(Unix or OS X, if you use Windows, check conf/iotdb-env.bat)."; - String cmd = dir + File.separator + "conf" + File.separator + "iotdb-env" + suffix; + "If you want to change this configuration, please check conf/datanode-env.bat."; + String cmd = dir + File.separator + "conf" + File.separator + "datanode-env" + suffix; ProcessBuilder startBuilder = new ProcessBuilder("cmd.exe", "/c", cmd); testOutput(dir, suffix, startBuilder, output, os); } @@ -65,8 +65,8 @@ public class EnvScriptIT { private void testStartClientOnUnix(String suffix, String os) throws IOException { String dir = getServerPath(); final String output = - "If you want to change this configuration, please check conf/iotdb-env.sh(Unix or OS X, if you use Windows, check conf/iotdb-env.bat)."; - String cmd = dir + File.separator + "conf" + File.separator + "iotdb-env" + suffix; + "If you want to change this configuration, please check conf/datanode-env.sh."; + String cmd = dir + File.separator + "conf" + File.separator + "datanode-env" + suffix; ProcessBuilder builder = new ProcessBuilder("bash", cmd); testOutput(cmd, suffix, builder, output, os); }
