diff --git a/tools/docker/standalone/README-CN.md b/tools/docker/standalone/README-CN.md index 1183dfc87f..51fa7fc91b 100644 --- a/tools/docker/standalone/README-CN.md +++ b/tools/docker/standalone/README-CN.md @@ -86,6 +86,7 @@ mysql -uroot -h127.1 -P2881 | OB_TENANT_MINI_CPU | | oceanbase租户mini_cpu参数配置 | | OB_TENANT_MEMORY_SIZE | | oceanbase租户memory_size参数配置 | | OB_TENANT_LOG_DISK_SIZE | | oceanbase租户log_disk_size参数配置 | +| OB_TENANT_LOWER_CASE_TABLE_NAMES | 1 | oceanbase 租户 表名是否区分大小写 | ## 运行 Sysbench 脚本 @@ -121,4 +122,4 @@ docker -v 参数的详细说明可以参考 [docker volumn](https://docs.docker. - `./fast_boot_docker_build.sh ` 例如:`./fast_boot_docker_build.sh 4.2.1.0-100000102023092807` -等待构建完毕后,可使用前述相同的方式启动、测试实例。 \ No newline at end of file +等待构建完毕后,可使用前述相同的方式启动、测试实例。 diff --git a/tools/docker/standalone/boot/_env b/tools/docker/standalone/boot/_env index f31d4d4385..185b4df595 100755 --- a/tools/docker/standalone/boot/_env +++ b/tools/docker/standalone/boot/_env @@ -1,4 +1,4 @@ -MODE=${MODE:-MINI} +$MODE=${MODE:-MINI} EXIT_WHILE_ERROR=${EXIT_WHILE_ERROR:-true} OB_HOME_PATH="/root/ob" OB_MYSQL_PORT="2881" @@ -9,4 +9,5 @@ OB_MEMORY_LIMIT=${OB_MEMORY_LIMIT:-6G} OB_DATAFILE_SIZE=${OB_DATAFILE_SIZE:-5G} OB_LOG_DISK_SIZE=${OB_LOG_DISK_SIZE:-5G} OB_ROOT_PASSWORD=${OB_ROOT_PASSWORD:-} -OB_SYSTEM_MEMORY=${OB_SYSTEM_MEMORY:-1G} \ No newline at end of file +OB_SYSTEM_MEMORY=${OB_SYSTEM_MEMORY:-1G} +OB_TENANT_LOWER_CASE_TABLE_NAMES=${OB_TENANT_LOWER_CASE_TABLE_NAMES:-1} diff --git a/tools/docker/standalone/fast_boot_docker_build.sh b/tools/docker/standalone/fast_boot_docker_build.sh index 253ec4a25e..ee6ed636a0 100755 --- a/tools/docker/standalone/fast_boot_docker_build.sh +++ b/tools/docker/standalone/fast_boot_docker_build.sh @@ -45,18 +45,20 @@ if [ "x${MODE}" != "xSTANDALONE" ]; then fi OS=`uname` cp ${TMP_INIT_STORE_PY_SCRIPT} ${ACTUAL_INIT_STORE_PY_SCRIPT} + if [ "$OS" == 'Darwin' ]; then - sed -i '' -e "s/@OB_MYSQL_PORT@/${OB_MYSQL_PORT}/g" ${ACTUAL_INIT_STORE_PY_SCRIPT} - sed -i '' -e "s/@OB_RPC_PORT@/${OB_RPC_PORT}/g" ${ACTUAL_INIT_STORE_PY_SCRIPT} - sed -i '' -e "s/@OB_TENANT_NAME@/${OB_TENANT_NAME}/g" ${ACTUAL_INIT_STORE_PY_SCRIPT} + alias sedi="sed -i '' -e" else - sed -i'' -e "s/@OB_MYSQL_PORT@/${OB_MYSQL_PORT}/g" ${ACTUAL_INIT_STORE_PY_SCRIPT} - sed -i'' -e "s/@OB_RPC_PORT@/${OB_RPC_PORT}/g" ${ACTUAL_INIT_STORE_PY_SCRIPT} - sed -i'' -e "s/@OB_TENANT_NAME@/${OB_TENANT_NAME}/g" ${ACTUAL_INIT_STORE_PY_SCRIPT} + alias sedi="sed -i'' -e" fi +sedi "s/@OB_MYSQL_PORT@/${OB_MYSQL_PORT}/g" ${ACTUAL_INIT_STORE_PY_SCRIPT} +sedi "s/@OB_RPC_PORT@/${OB_RPC_PORT}/g" ${ACTUAL_INIT_STORE_PY_SCRIPT} +sedi "s/@OB_TENANT_NAME@/${OB_TENANT_NAME}/g" ${ACTUAL_INIT_STORE_PY_SCRIPT} +sedi "s/@OB_TENANT_LOWER_CASE_TABLE_NAMES@/${OB_TENANT_LOWER_CASE_TABLE_NAMES}/g" ${ACTUAL_INIT_STORE_PY_SCRIPT} + fast_boot_docker_build if [ $? != 0 ]; then echo "use local rpm build docker failed" exit -1 -fi \ No newline at end of file +fi diff --git a/tools/docker/standalone/init_store_for_fast_start.tmp.py b/tools/docker/standalone/init_store_for_fast_start.tmp.py index b6dc43a76c..1d19bf1e47 100644 --- a/tools/docker/standalone/init_store_for_fast_start.tmp.py +++ b/tools/docker/standalone/init_store_for_fast_start.tmp.py @@ -53,6 +53,7 @@ if __name__ == "__main__": parser.add_argument("-o", dest="opt_str", type=str, default="__min_full_resource_pool_memory=2147483648,memory_limit=6G,system_memory=1G,datafile_size=256M,log_disk_size=5G,cpu_count=16") parser.add_argument("-N", dest="daemon", type=str, default="1") parser.add_argument("--tenant_name", type=str, default="@OB_TENANT_NAME@") + parser.add_argument("--tenant_lower_case_table_names", type=int, default="@OB_TENANT_LOWER_CASE_TABLE_NAMES@") parser.add_argument("--max_cpu", type=float, default=14.0) parser.add_argument("--min_cpu", type=float, default=14.0) parser.add_argument("--memory_size", type=int, default=3221225472) @@ -116,8 +117,8 @@ if __name__ == "__main__": args.tenant_name, args.tenant_name, args.zone)) logging.info("waiting for create tenant...") create_tenant_begin = datetime.datetime.now() - cursor.execute("create tenant %s replica_num=1,zone_list=('%s'),primary_zone='RANDOM',resource_pool_list=('%s_pool') set ob_tcp_invited_nodes='%%', ob_compatibility_mode = 'mysql'" % ( \ - args.tenant_name, args.zone, args.tenant_name)) + cursor.execute("create tenant %s replica_num=1,zone_list=('%s'),primary_zone='RANDOM',resource_pool_list=('%s_pool') set ob_tcp_invited_nodes='%%', ob_compatibility_mode = 'mysql', lower_case_table_names=%d" % ( \ + args.tenant_name, args.zone, args.tenant_name, args.tenant_lower_case_table_names)) create_tenant_end = datetime.datetime.now() logging.info('create tenant success: %s ms' % ((create_tenant_end - create_tenant_begin).total_seconds() * 1000)) db.close()