You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dolphinscheduler.apache.org by le...@apache.org on 2020/06/08 09:26:21 UTC
[incubator-dolphinscheduler] branch 1.3.0-release updated (4891493
-> 8ce9705)
This is an automated email from the ASF dual-hosted git repository.
leonbao pushed a change to branch 1.3.0-release
in repository https://gitbox.apache.org/repos/asf/incubator-dolphinscheduler.git.
from 4891493 revert
new 5626c54 fix create table sql exception (#2912)
new 8ce9705 fix #2910 master server will show exception for some time when it restart (#2913)
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../master/dispatch/host/LowerWeightHostManager.java | 2 +-
sql/h2.mv.db | Bin 110592 -> 0 bytes
2 files changed, 1 insertion(+), 1 deletion(-)
delete mode 100644 sql/h2.mv.db
[incubator-dolphinscheduler] 02/02: fix #2910 master server will
show exception for some time when it restart (#2913)
Posted by le...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
leonbao pushed a commit to branch 1.3.0-release
in repository https://gitbox.apache.org/repos/asf/incubator-dolphinscheduler.git
commit 8ce97055a8900f3d99e1f9c391e242295304ca39
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());
}
[incubator-dolphinscheduler] 01/02: fix create table sql exception
(#2912)
Posted by le...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
leonbao pushed a commit to branch 1.3.0-release
in repository https://gitbox.apache.org/repos/asf/incubator-dolphinscheduler.git
commit 5626c54e75627db177589c662b2178cee1a09f37
Author: dailidong <da...@gmail.com>
AuthorDate: Sat Jun 6 16:38:40 2020 +0800
fix create table sql exception (#2912)
fix create table sql exception
---
sql/h2.mv.db | Bin 110592 -> 0 bytes
1 file changed, 0 insertions(+), 0 deletions(-)
diff --git a/sql/h2.mv.db b/sql/h2.mv.db
deleted file mode 100644
index 42ea540..0000000
Binary files a/sql/h2.mv.db and /dev/null differ