Commit e0e0696b authored by bao liang's avatar bao liang Committed by qiaozhanwei
Browse files

add out put log when master/worker server start (#1769) 

* merge hadoop.properties into common.properties

* merge hadoop,zookeeper.properties into common.properties
remove combined.properties/master.properties/worker.properties

* change db user/pwd to test/test

* rename .dolphinscheduler_en.sh to dolphinscheduler_env.sh
remove some unused in install.sh

* add out put log when master/worker server start...

* add start log when servers start
parent 7dfa9976

dockerfile/conf/dolphinscheduler/conf/common/common.properties

+1 −1
Original line number Diff line number Diff line
@@ -49,7 +49,7 @@ login.user.keytab.username=hdfs-mycluster@ESZ.COM 
login.user.keytab.path=/opt/hdfs.headless.keytab



# system env path. self configuration, please make sure the directory and file exists and have read write execute permissions

dolphinscheduler.env.path=/opt/dolphinscheduler/conf/env/.dolphinscheduler_env.sh

dolphinscheduler.env.path=/opt/dolphinscheduler/conf/env/dolphinscheduler_env.sh



#resource.view.suffixs

resource.view.suffixs=txt,log,sh,conf,cfg,py,java,sql,hql,xml

dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/Constants.java

+2 −0
Original line number Diff line number Diff line
@@ -471,6 +471,8 @@ public final class Constants { 
    public static final String PASSWORD = "password";

    public static final String XXXXXX = "******";

    public static final String NULL = "NULL";

    public static final String THREAD_NAME_MASTER_SERVER = "Master-Server";

    public static final String THREAD_NAME_WORKER_SERVER = "Worker-Server";



    public static  String TASK_RECORD_TABLE_HIVE_LOG = "eamp_hive_log_hd";

dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/zk/AbstractZKClient.java

+4 −3
Original line number Diff line number Diff line
@@ -412,6 +412,7 @@ public abstract class AbstractZKClient extends ZookeeperCachedOperator{ 
			persist(getWorkerZNodeParentPath(), "");

			persist(getDeadZNodeParentPath(), "");



			logger.info("initialize server nodes success.");

		} catch (Exception e) {

			logger.error("init system znode failed",e);

		}

dolphinscheduler-common/src/main/resources/common.properties

+1 −1
Original line number Diff line number Diff line
@@ -63,7 +63,7 @@ login.user.keytab.username=hdfs-mycluster@ESZ.COM 
login.user.keytab.path=/opt/hdfs.headless.keytab



# system env path. self configuration, please make sure the directory and file exists and have read write execute permissions

dolphinscheduler.env.path=/opt/.dolphinscheduler_env.sh

dolphinscheduler.env.path=/opt/dolphinscheduler_env.sh



#resource.view.suffixs

resource.view.suffixs=txt,log,sh,conf,cfg,py,java,sql,hql,xml,properties

dolphinscheduler-dao/src/main/resources/application.properties

+39 −0
Original line number Diff line number Diff line
@@ -95,6 +95,45 @@ mybatis-plus.configuration.cache-enabled=false 
mybatis-plus.configuration.call-setters-on-nulls=true

mybatis-plus.configuration.jdbc-type-for-null=null



# master settings

# master execute thread num

master.exec.threads=100



# master execute task number in parallel

master.exec.task.num=20



# master heartbeat interval

master.heartbeat.interval=10



# master commit task retry times

master.task.commit.retryTimes=5



# master commit task interval

master.task.commit.interval=1000





# only less than cpu avg load, master server can work. default value : the number of cpu cores * 2

master.max.cpuload.avg=100



# only larger than reserved memory, master server can work. default value : physical memory * 1/10, unit is G.

master.reserved.memory=0.1



# worker settings

# worker execute thread num

worker.exec.threads=100



# worker heartbeat interval

worker.heartbeat.interval=10



# submit the number of tasks at a time

worker.fetch.task.num = 3



# only less than cpu avg load, worker server can work. default value : the number of cpu cores * 2

worker.max.cpuload.avg=100



# only larger than reserved memory, worker server can work. default value : physical memory * 1/6, unit is G.

worker.reserved.memory=0.1



# data quality analysis is not currently in use. please ignore the following configuration

# task record

task.record.flag=false