Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

adapt to new obd #8

Merged
merged 1 commit into from
Jun 17, 2024
Merged

adapt to new obd #8

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
oceanbase-ce/boot/
oceanbase-ce/init_store_for_fast_start.py
.DS_Store
.idea
.vscode
Expand Down
8 changes: 4 additions & 4 deletions oceanbase-ce/step_2_boot/_boot
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,7 @@ else # nothing here, bootstrap
if [ "x${MODE}" == "xSLIM" ]; then
cat ob-configserver.yaml >> $TMPFILE
fi

sed -i "s|@OB_SERVER_IP@|${OB_SERVER_IP}|g" $TMPFILE
sed -i "s|@OB_HOME_PATH@|${OB_HOME_PATH}|g" $TMPFILE
sed -i "s|@OB_MYSQL_PORT@|${OB_MYSQL_PORT}|g" $TMPFILE
Expand All @@ -188,7 +188,7 @@ else # nothing here, bootstrap
remove_disk_check_logic_in_obd

if fastboot; then
obd devmode enable && obd cluster deploy "${OB_CLUSTER_NAME}" -c $TMPFILE;
obd devmode enable && obd cluster deploy "${OB_CLUSTER_NAME}" -c $TMPFILE < /dev/null;
if [ $? -ne 0 ]; then
deploy_failed
fi
Expand Down Expand Up @@ -218,7 +218,7 @@ else # nothing here, bootstrap

else
print_start_phase "Ob-deploy autodeploy"
obd devmode enable && obd cluster autodeploy "${OB_CLUSTER_NAME}" -c $TMPFILE;
obd devmode enable && obd cluster autodeploy "${OB_CLUSTER_NAME}" -c $TMPFILE < /dev/null;
print_end_phase

print_start_phase "Ob-deploy Create Tenant"
Expand All @@ -232,7 +232,7 @@ else # nothing here, bootstrap
if ! [ -z "${OB_TENANT_LOG_DISK_SIZE}" ]; then
create_tenant_cmd="${create_tenant_cmd} --log-disk-size=${OB_TENANT_LOG_DISK_SIZE}"
fi;
eval ${create_tenant_cmd}
eval ${create_tenant_cmd} < /dev/null
if [ $? -ne 0 ]; then
deploy_failed
fi
Expand Down