You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dolphinscheduler.apache.org by li...@apache.org on 2020/06/06 10:24:36 UTC

[incubator-dolphinscheduler] branch dev-1.3.0 updated: fix #2910 master server will show exception for some time when it restart (#2913)

This is an automated email from the ASF dual-hosted git repository.

lidongdai pushed a commit to branch dev-1.3.0
in repository https://gitbox.apache.org/repos/asf/incubator-dolphinscheduler.git


The following commit(s) were added to refs/heads/dev-1.3.0 by this push:
     new 5c9b080  fix #2910 master server will show exception for some time when it restart (#2913)
5c9b080 is described below

commit 5c9b080ab85ffc458557ebcbb5e8bf30a7c40ed0
Author: dailidong <da...@gmail.com>
AuthorDate: Sat Jun 6 18:24:26 2020 +0800

    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
---
 .../server/master/dispatch/host/LowerWeightHostManager.java             | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/master/dispatch/host/LowerWeightHostManager.java b/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/master/dispatch/host/LowerWeightHostManager.java
index 5989519..8d29eb5 100644
--- a/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/master/dispatch/host/LowerWeightHostManager.java
+++ b/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/master/dispatch/host/LowerWeightHostManager.java
@@ -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());
     }