Unverified Commit 5c9b080a authored by dailidong's avatar dailidong Committed by GitHub
Browse files

fix #2910 master server will show exception for some time when it restart (#2913) 

* fix worker group config no effect

* remove codehaus janino jar
the license about janino maybe not compatiable with Apache v2

* Merge remote-tracking branch 'upstream/dev-1.3.0' into dev-1.3.0

# Conflicts:
#	dolphinscheduler-server/src/main/resources/config/install_config.conf

* datasource config

* Update datasource.properties

* fix RunConfig bug

* remove param monitor server state

* fix table T_DS_ALERT

* update h2 database

* fix #2910 master server will show exception for some time when it restart
parent 0de8e589

dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/master/dispatch/host/LowerWeightHostManager.java

+1 −1
Original line number Diff line number Diff line
@@ -87,7 +87,7 @@ public class LowerWeightHostManager extends CommonHostManager { 
        this.workerHostWeightsMap = new ConcurrentHashMap<>();

        this.lock = new ReentrantLock();

        this.executorService = Executors.newSingleThreadScheduledExecutor(new NamedThreadFactory("LowerWeightHostManagerExecutor"));

        this.executorService.scheduleWithFixedDelay(new RefreshResourceTask(),35, 40, TimeUnit.SECONDS);

        this.executorService.scheduleWithFixedDelay(new RefreshResourceTask(),0, 40, TimeUnit.SECONDS);

        this.roundRobinHostManager = new RoundRobinHostManager();

        this.roundRobinHostManager.setZookeeperNodeManager(getZookeeperNodeManager());

    }