From 743fb332f0327df8929901559b6c0bb71b2b19d8 Mon Sep 17 00:00:00 2001 From: cmzdandan <1034667543@qq.com> Date: Tue, 25 Feb 2020 23:35:25 +0800 Subject: [PATCH] #565 update docs --- docs/zh-cn/3.x/saturn-console-deployment.md | 2 +- docs/zh-cn/3.x/saturn-executor-deployment.md | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/docs/zh-cn/3.x/saturn-console-deployment.md b/docs/zh-cn/3.x/saturn-console-deployment.md index 6a2d1ddb8..f469fd745 100644 --- a/docs/zh-cn/3.x/saturn-console-deployment.md +++ b/docs/zh-cn/3.x/saturn-console-deployment.md @@ -82,7 +82,7 @@ JDK 1.7: JDK 1.8: ```shell --Xmx2G -Xms2G -MetaspaceSize=256m -MaxMetaspaceSize=512m -XX:+UseConcMarkSweepGC -XX:+UseCMSInitiatingOccupancyOnly -XX:CMSInitiatingOccupancyFraction=75 -XX:+ExplicitGCInvokesConcurrent -Xloggc:${HOME}/gc_zk.log -XX:+PrintGCDetails -XX:+PrintGCDateStamps -XX:ErrorFile=${HOME}/hs_err_%p.log -XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath=${HOME} +-Xmx2G -Xms2G -XX:MetaspaceSize=256m -MaxMetaspaceSize=512m -XX:+UseConcMarkSweepGC -XX:+UseCMSInitiatingOccupancyOnly -XX:CMSInitiatingOccupancyFraction=75 -XX:+ExplicitGCInvokesConcurrent -Xloggc:${HOME}/gc_zk.log -XX:+PrintGCDetails -XX:+PrintGCDateStamps -XX:ErrorFile=${HOME}/hs_err_%p.log -XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath=${HOME} ``` ##### 2.4.2.2 启动参数描述 diff --git a/docs/zh-cn/3.x/saturn-executor-deployment.md b/docs/zh-cn/3.x/saturn-executor-deployment.md index 810955897..e091fdc84 100644 --- a/docs/zh-cn/3.x/saturn-executor-deployment.md +++ b/docs/zh-cn/3.x/saturn-executor-deployment.md @@ -114,10 +114,14 @@ chmod a+x saturn-executor.sh | -env | N | 运行模式,可取值为dev/product。 dev模式下-Xmx为512m,product模式下-Xmx为2G | product | | -d | N | 业务library所在目录 | $TARGET_DIR/app | | -r | N | 运行模式,前台(foreground)或者后台(background),空代表background模式。 | 空 | +| -t | N | 本executor启动的超时时间,单位为秒 | 120 | | -jmx | N | jmx端口 | 24501 | | -sld | N | saturn日志目录 | /apps/logs/saturn/{namespace}/{executorname}-{ip}/ | | jvmArgs | N | 需要添加的JVM参数 | 空 | | VIP_SATURN_INIT_JOB_BY_GROUPS (-D或环境变量) | N | 如果Executor机器设置了这个变量,则该Executor只能启动该域下属于该groups的作业; 否则,可以启动该域下全部作业。
多值用逗号分隔groups1,groups2 | 无 | +| VIP_SATURN_START_TIMEOUT | N | 本executor的启动超时时间,单位为秒 | 120 | +| VIP_SATURN_RUNNING_IP
(-D或环境变量) | N | 本executor的运行ip(在某些mac上没有eth0和bond0时启动会报错,通过配置hosts或者配置该环境变量可以解决此报错问题) | | +| VIP_SATURN_RUNNING_HOSTNAME | N | 本executor的运行主机名 | | 下面展示一个成功启动的console 输出: