diff --git a/datasophon-api/src/main/resources/meta/DDP-1.1.3/DORIS/service_ddl.json b/datasophon-api/src/main/resources/meta/DDP-1.1.3/DORIS/service_ddl.json index 08e908e9..7ae06448 100644 --- a/datasophon-api/src/main/resources/meta/DDP-1.1.3/DORIS/service_ddl.json +++ b/datasophon-api/src/main/resources/meta/DDP-1.1.3/DORIS/service_ddl.json @@ -87,6 +87,7 @@ "webserver_port", "brpc_port", "storage_root_path", + "mem_limit", "custom.be.conf" ] }, @@ -96,11 +97,14 @@ "outputDirectory": "fe/conf", "templateName": "doris_fe.ftl", "includeParams": [ + "fe_heap_size", "cluster_id", "meta_dir", "rpc_port", "query_port", "fe_priority_networks", + "lower_case_table_names", + "enable_outfile_to_local", "custom.fe.conf" ] } @@ -162,6 +166,48 @@ "hidden": false, "defaultValue": "0.0.0.0/24" }, + { + "name": "fe_heap_size", + "label": "FE最大堆内存", + "description": "FE最大堆内存,单位为GB", + "required": true, + "configType": "map", + "type": "slider", + "minValue": 0, + "maxValue": 64, + "value": "", + "unit": "GB", + "configurableInWizard": true, + "hidden": false, + "defaultValue": "8" + }, + { + "name": "lower_case_table_names", + "label": "表名大小写是否敏感,只有初始化安装时有效", + "description": "值为 0 时,表名大小写敏感。默认为0。\n值为 1 时,表名大小写不敏感,doris在存储和查询时会将表名转换为小写。\n优点是在一条语句中可以使用表名的任意大小写形式\n缺点是建表后无法获得建表语句中指定的表名,show tables 查看的表名为指定表名的小写。\n值为 2 时,表名大小写不敏感,doris存储建表语句中指定的表名,查询时转换为小写进行比较。\n优点是show tables 查看的表名为建表语句中指定的表名;\n缺点是同一语句中只能使用表名的一种大小写形式。", + "required": true, + "type": "select", + "value": "0", + "configurableInWizard": true, + "selectValue": [ + "0", + "1", + "2" + ], + "hidden": false, + "defaultValue": "0" + }, + { + "name": "enable_outfile_to_local", + "label": "是否允许outfile函数将结果导出到本地磁盘", + "description": "是否允许 outfile 函数将结果导出到本地磁盘", + "required": true, + "type": "switch", + "value": "", + "configurableInWizard": true, + "hidden": false, + "defaultValue": false + }, { "name": "be_priority_networks", "label": "BE优先网段", @@ -236,7 +282,17 @@ "hidden": false, "defaultValue": "/data/be/storage" }, - + { + "name": "mem_limit", + "label": "BE进程使用服务器最大内存百分比", + "description": "限制BE进程使用服务器最大内存百分比。用于防止BE内存挤占太多的机器内存,该参数必须大于0,当百分大于100%之后,该值会默认为100%。", + "required": true, + "type": "input", + "value": "", + "configurableInWizard": true, + "hidden": false, + "defaultValue": "100%" + }, { "name": "custom.fe.conf", "label": "自定义配置fe.conf", diff --git a/datasophon-worker/src/main/resources/templates/doris_fe.ftl b/datasophon-worker/src/main/resources/templates/doris_fe.ftl index 9f23c6b6..9eef5e67 100644 --- a/datasophon-worker/src/main/resources/templates/doris_fe.ftl +++ b/datasophon-worker/src/main/resources/templates/doris_fe.ftl @@ -25,10 +25,10 @@ LOG_DIR = ${r"${DORIS_HOME}/log"} DATE = `date +%Y%m%d-%H%M%S` -JAVA_OPTS="-Xmx8192m -XX:+UseMembar -XX:SurvivorRatio=8 -XX:MaxTenuringThreshold=7 -XX:+PrintGCDateStamps -XX:+PrintGCDetails -XX:+UseConcMarkSweepGC -XX:+UseParNewGC -XX:+CMSClassUnloadingEnabled -XX:-CMSParallelRemarkEnabled -XX:CMSInitiatingOccupancyFraction=80 -XX:SoftRefLRUPolicyMSPerMB=0 -Xloggc:$DORIS_HOME/log/fe.gc.log.$DATE" +JAVA_OPTS="-Xmx${fe_heap_size}G -XX:+UseMembar -XX:SurvivorRatio=8 -XX:MaxTenuringThreshold=7 -XX:+PrintGCDateStamps -XX:+PrintGCDetails -XX:+UseConcMarkSweepGC -XX:+UseParNewGC -XX:+CMSClassUnloadingEnabled -XX:-CMSParallelRemarkEnabled -XX:CMSInitiatingOccupancyFraction=80 -XX:SoftRefLRUPolicyMSPerMB=0 -Xloggc:$DORIS_HOME/log/fe.gc.log.$DATE" # For jdk 9+, this JAVA_OPTS will be used as default JVM options -JAVA_OPTS_FOR_JDK_9="-Xmx8192m -XX:SurvivorRatio=8 -XX:MaxTenuringThreshold=7 -XX:+CMSClassUnloadingEnabled -XX:-CMSParallelRemarkEnabled -XX:CMSInitiatingOccupancyFraction=80 -XX:SoftRefLRUPolicyMSPerMB=0 -Xlog:gc*:$DORIS_HOME/log/fe.gc.log.$DATE:time" +JAVA_OPTS_FOR_JDK_9="-Xmx${fe_heap_size}G -XX:SurvivorRatio=8 -XX:MaxTenuringThreshold=7 -XX:+CMSClassUnloadingEnabled -XX:-CMSParallelRemarkEnabled -XX:CMSInitiatingOccupancyFraction=80 -XX:SoftRefLRUPolicyMSPerMB=0 -Xlog:gc*:$DORIS_HOME/log/fe.gc.log.$DATE:time" ## ## the lowercase properties are read by main program.