Browse Source

ProcessDao is null bug fix (#1004)

* add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml

* .escheduler_env.sh to dolphinscheduler_env.sh

* dao yml assembly to conf directory

* table name modify

* entity title table  name modify

* logback log name modify

* running through the big process

* running through the big process error modify

* logback log name modify

* data_source.properties rename

* logback log name modify

* install.sh optimization

* install.sh optimization

* command count modify

* command state update

* countCommandState sql update

* countCommandState sql update

* remove application.yml file

* master.properties modify

* install.sh modify

* install.sh modify

* api server startup modify

* the current user quits and the session is completely emptied. bug fix

* remove pom package resources

* checkQueueNameExist method update

* checkQueueExist

* install.sh error output update

* signOut error update

* ProcessDao is null bug fix
pull/2/head
qiaozhanwei 5 years ago committed by dailidong
parent
commit
370e55fd48
  1. 4
      dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/worker/WorkerServer.java

4
dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/worker/WorkerServer.java

@ -162,7 +162,7 @@ public class WorkerServer extends AbstractServer {
scheduleAtFixedRate(heartBeatThread, 5, heartBeatInterval, TimeUnit.SECONDS); scheduleAtFixedRate(heartBeatThread, 5, heartBeatInterval, TimeUnit.SECONDS);
// kill process thread implement // kill process thread implement
Runnable killProcessThread = getKillProcessThread(); Runnable killProcessThread = getKillProcessThread(processDao);
// submit kill process thread // submit kill process thread
killExecutorService.execute(killProcessThread); killExecutorService.execute(killProcessThread);
@ -288,7 +288,7 @@ public class WorkerServer extends AbstractServer {
* kill process thread implement * kill process thread implement
* @return * @return
*/ */
private Runnable getKillProcessThread(){ private Runnable getKillProcessThread(ProcessDao processDao){
Runnable killProcessThread = new Runnable() { Runnable killProcessThread = new Runnable() {
@Override @Override
public void run() { public void run() {

Loading…
Cancel
Save