From b9a0a58801a8792e3b78dee209db2253526505d0 Mon Sep 17 00:00:00 2001 From: LINxiansheng Date: Wed, 13 Mar 2024 02:51:02 +0000 Subject: [PATCH] update obshell to 12024031122 --- deps/init/oceanbase.el7.aarch64.deps | 2 +- deps/init/oceanbase.el7.x86_64.deps | 2 +- deps/init/oceanbase.el8.aarch64.deps | 2 +- deps/init/oceanbase.el8.x86_64.deps | 2 +- deps/init/oceanbase.el9.aarch64.deps | 2 +- deps/init/oceanbase.el9.x86_64.deps | 2 +- .../systemd/profile/oceanbase-service.sh.template | 5 +++-- tools/rpm/systemd/profile/oceanbase.cnf | 12 ++++++------ 8 files changed, 15 insertions(+), 14 deletions(-) diff --git a/deps/init/oceanbase.el7.aarch64.deps b/deps/init/oceanbase.el7.aarch64.deps index 93a2a8d81..61e206000 100644 --- a/deps/init/oceanbase.el7.aarch64.deps +++ b/deps/init/oceanbase.el7.aarch64.deps @@ -43,7 +43,7 @@ obdevtools-llvm-11.0.1-312022092921.el7.aarch64.rpm [tools-deps] devdeps-oblogmsg-1.0-182024030421.el7.aarch64.rpm devdeps-rocksdb-6.22.1.1-52022100420.el7.aarch64.rpm -obshell-4.2.2.0-122024022614.el7.aarch64.rpm target=community +obshell-4.2.3.0-52024031220.el7.aarch64.rpm target=community [test-utils] ob-deploy-2.6.2-2.el7.aarch64.rpm target=community diff --git a/deps/init/oceanbase.el7.x86_64.deps b/deps/init/oceanbase.el7.x86_64.deps index d90b75bf5..c6754742c 100644 --- a/deps/init/oceanbase.el7.x86_64.deps +++ b/deps/init/oceanbase.el7.x86_64.deps @@ -46,7 +46,7 @@ obdevtools-llvm-11.0.1-312022092921.el7.x86_64.rpm [tools-deps] devdeps-oblogmsg-1.0-182024030421.el7.x86_64.rpm devdeps-rocksdb-6.22.1.1-52022100420.el7.x86_64.rpm -obshell-4.2.2.0-122024022614.el7.x86_64.rpm target=community +obshell-4.2.3.0-52024031220.el7.x86_64.rpm target=community [test-utils] ob-deploy-2.6.2-2.el7.x86_64.rpm target=community diff --git a/deps/init/oceanbase.el8.aarch64.deps b/deps/init/oceanbase.el8.aarch64.deps index eadab95a7..f78819c3d 100644 --- a/deps/init/oceanbase.el8.aarch64.deps +++ b/deps/init/oceanbase.el8.aarch64.deps @@ -43,7 +43,7 @@ obdevtools-llvm-11.0.1-312022092921.el8.aarch64.rpm [tools-deps] devdeps-oblogmsg-1.0-182024030421.el8.aarch64.rpm devdeps-rocksdb-6.22.1.1-52022100420.el8.aarch64.rpm -obshell-4.2.2.0-122024022614.el8.aarch64.rpm target=community +obshell-4.2.3.0-52024031220.el8.aarch64.rpm target=community [test-utils] ob-deploy-2.6.2-2.el8.aarch64.rpm target=community diff --git a/deps/init/oceanbase.el8.x86_64.deps b/deps/init/oceanbase.el8.x86_64.deps index 40c82ff8a..18201ab73 100644 --- a/deps/init/oceanbase.el8.x86_64.deps +++ b/deps/init/oceanbase.el8.x86_64.deps @@ -45,7 +45,7 @@ obdevtools-llvm-11.0.1-312022092921.el8.x86_64.rpm [tools-deps] devdeps-oblogmsg-1.0-182024030421.el8.x86_64.rpm devdeps-rocksdb-6.22.1.1-52022100420.el8.x86_64.rpm -obshell-4.2.2.0-122024022614.el8.x86_64.rpm target=community +obshell-4.2.3.0-52024031220.el8.x86_64.rpm target=community [test-utils] ob-deploy-2.6.2-2.el8.x86_64.rpm target=community diff --git a/deps/init/oceanbase.el9.aarch64.deps b/deps/init/oceanbase.el9.aarch64.deps index 4237db6db..a594a87e2 100644 --- a/deps/init/oceanbase.el9.aarch64.deps +++ b/deps/init/oceanbase.el9.aarch64.deps @@ -50,7 +50,7 @@ obdevtools-llvm-11.0.1-312022092921.el8.aarch64.rpm [tools-deps] devdeps-oblogmsg-1.0-182024030421.el8.aarch64.rpm devdeps-rocksdb-6.22.1.1-52022100420.el8.aarch64.rpm -obshell-4.2.2.0-122024022614.el8.aarch64.rpm target=community +obshell-4.2.3.0-52024031220.el8.aarch64.rpm target=community [test-utils] ob-deploy-1.6.0-41.el8.aarch64.rpm target=community diff --git a/deps/init/oceanbase.el9.x86_64.deps b/deps/init/oceanbase.el9.x86_64.deps index 857e9f931..dcf28362f 100644 --- a/deps/init/oceanbase.el9.x86_64.deps +++ b/deps/init/oceanbase.el9.x86_64.deps @@ -53,7 +53,7 @@ obdevtools-llvm-11.0.1-312022092921.el8.x86_64.rpm [tools-deps] devdeps-oblogmsg-1.0-182024030421.el8.x86_64.rpm devdeps-rocksdb-6.22.1.1-52022100420.el8.x86_64.rpm -obshell-4.2.2.0-122024022614.el8.x86_64.rpm target=community +obshell-4.2.3.0-52024031220.el8.x86_64.rpm target=community [test-utils] ob-deploy-1.6.0-41.el8.x86_64.rpm target=community diff --git a/tools/rpm/systemd/profile/oceanbase-service.sh.template b/tools/rpm/systemd/profile/oceanbase-service.sh.template index c726e6d01..6905d5458 100644 --- a/tools/rpm/systemd/profile/oceanbase-service.sh.template +++ b/tools/rpm/systemd/profile/oceanbase-service.sh.template @@ -28,9 +28,10 @@ function prepare_config_json { if [[ -n "$key" && ! "$key" =~ ^\; ]]; then if [[ $key == *"ip"* ]]; then ip=$value - elif [[ $key == *"obshellPort"* ]]; then + elif [[ $key == *"obshell_port"* ]]; then port=$value - elif [[ $key == *"rootPwd"* ]]; then + elif [[ $key == *"root_pwd"* ]]; then + key="rootPwd" jq --arg parent "oceanbase_ce" --arg child "cluster" --arg key "$key" --arg value "$value" '.[$parent][$child][$key] = $value' "$json_file" > "$temp_file" mv "$temp_file" "$json_file" else diff --git a/tools/rpm/systemd/profile/oceanbase.cnf b/tools/rpm/systemd/profile/oceanbase.cnf index 0746911b2..d0aa227e1 100644 --- a/tools/rpm/systemd/profile/oceanbase.cnf +++ b/tools/rpm/systemd/profile/oceanbase.cnf @@ -4,12 +4,12 @@ # Afterward, you can reinstall and launch OceanBase with the new IP address. # For instance, to set the observer IP to 127.0.0.1, you would use the line: # ip=127.0.0.1 -mysqlPort=2881 -rpcPort=2882 -obshellPort=2886 -rootPwd="" -redoDir=/var/lib/oceanbase/redo -dataDir=/var/lib/oceanbase/data +mysql_port=2881 +rpc_port=2882 +obshell_port=2886 +root_pwd="" +redo_dir=/var/lib/oceanbase/redo +data_dir=/var/lib/oceanbase/data datafile_size=2G datafile_next=2G datafile_maxsize=20G