hcq/oceanbase
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Merge branch 'pr_1677'

Browse Source
This commit is contained in:
ob-robot
2023-11-23 14:08:38 +00:00
parent cca0b81d8b b4167ae293
commit 49ff319c6c
4 changed files with 17 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
tools/docker/standalone/README-CN.md
View File

@ -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 <oceanbase_rpm_version>` 例如：`./fast_boot_docker_build.sh 4.2.1.0-100000102023092807`
等待构建完毕后，可使用前述相同的方式启动、测试实例。
等待构建完毕后，可使用前述相同的方式启动、测试实例。

5
tools/docker/standalone/boot/_env
View File

@ -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}
OB_SYSTEM_MEMORY=${OB_SYSTEM_MEMORY:-1G}
OB_TENANT_LOWER_CASE_TABLE_NAMES=${OB_TENANT_LOWER_CASE_TABLE_NAMES:-1}

16
tools/docker/standalone/fast_boot_docker_build.sh
View File

@ -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
fi

5
tools/docker/standalone/init_store_for_fast_start.tmp.py
View File

@ -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()