Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
apache
DolphinScheduler
提交
837197c6
DolphinScheduler
项目概览
apache
/
DolphinScheduler
上一次同步 1 年多
通知
707
Star
9572
Fork
3514
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
DolphinScheduler
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
837197c6
编写于
5月 15, 2020
作者:
B
break60
浏览文件
操作
浏览文件
下载
差异文件
Merge branch 'dev-1.3.0' of
https://github.com/apache/incubator-dolphinscheduler
into dev-1.3.0
上级
e765d074
f26d2a7c
变更
9
隐藏空白更改
内联
并排
Showing
9 changed file
with
124 addition
and
10 deletion
+124
-10
dolphinscheduler-remote/src/test/java/org/apache/dolphinscheduler/remote/RemoveTaskLogRequestCommandTest.java
...phinscheduler/remote/RemoveTaskLogRequestCommandTest.java
+35
-0
dolphinscheduler-remote/src/test/java/org/apache/dolphinscheduler/remote/RemoveTaskLogResponseCommandTest.java
...hinscheduler/remote/RemoveTaskLogResponseCommandTest.java
+34
-0
dolphinscheduler-server/src/main/resources/config/install_config.conf
...uler-server/src/main/resources/config/install_config.conf
+3
-2
dolphinscheduler-server/src/test/java/org/apache/dolphinscheduler/server/log/LoggerServerTest.java
.../apache/dolphinscheduler/server/log/LoggerServerTest.java
+23
-1
dolphinscheduler-service/pom.xml
dolphinscheduler-service/pom.xml
+22
-0
pom.xml
pom.xml
+2
-0
script/scp-hosts.sh
script/scp-hosts.sh
+3
-3
script/start-all.sh
script/start-all.sh
+1
-2
script/stop-all.sh
script/stop-all.sh
+1
-2
未找到文件。
dolphinscheduler-remote/src/test/java/org/apache/dolphinscheduler/remote/RemoveTaskLogRequestCommandTest.java
0 → 100644
浏览文件 @
837197c6
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package
org.apache.dolphinscheduler.remote
;
import
junit.framework.Assert
;
import
org.apache.dolphinscheduler.remote.command.Command
;
import
org.apache.dolphinscheduler.remote.command.log.RemoveTaskLogRequestCommand
;
import
org.apache.dolphinscheduler.remote.command.log.RemoveTaskLogResponseCommand
;
import
org.junit.Test
;
public
class
RemoveTaskLogRequestCommandTest
{
@Test
public
void
testConvert2Command
(){
RemoveTaskLogResponseCommand
removeTaskLogResponseCommand
=
new
RemoveTaskLogResponseCommand
();
removeTaskLogResponseCommand
.
setStatus
(
true
);
Command
command
=
removeTaskLogResponseCommand
.
convert2Command
(
122
);
Assert
.
assertNotNull
(
command
);
}
}
dolphinscheduler-remote/src/test/java/org/apache/dolphinscheduler/remote/RemoveTaskLogResponseCommandTest.java
0 → 100644
浏览文件 @
837197c6
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package
org.apache.dolphinscheduler.remote
;
import
junit.framework.Assert
;
import
org.apache.dolphinscheduler.remote.command.Command
;
import
org.apache.dolphinscheduler.remote.command.log.RemoveTaskLogRequestCommand
;
import
org.junit.Test
;
public
class
RemoveTaskLogResponseCommandTest
{
@Test
public
void
testConvert2Command
(){
RemoveTaskLogRequestCommand
removeTaskLogRequestCommand
=
new
RemoveTaskLogRequestCommand
();
removeTaskLogRequestCommand
.
setPath
(
"/opt/zhangsan"
);
Command
command
=
removeTaskLogRequestCommand
.
convert2Command
();
Assert
.
assertNotNull
(
command
);
}
}
dolphinscheduler-server/src/main/resources/config/install_config.conf
浏览文件 @
837197c6
...
...
@@ -130,7 +130,8 @@ masters="ds1,ds2"
# run worker machine
# note: need to write the worker group name of each worker, the default value is "default"
workersGroup
=([
"ds1"
]=
"default"
[
"ds2"
]=
"default"
[
"ds3"
]=
"default"
[
"ds4"
]=
"default"
[
"ds5"
]=
"default"
)
declare
-
A
workersGroup
=([
"ds1"
]=
"default"
[
"ds2"
]=
"default"
[
"ds3"
]=
"default"
[
"ds4"
]=
"default"
[
"ds5"
]=
"default"
)
# run alert machine
# note: list of machine hostnames for deploying alert server
...
...
@@ -141,4 +142,4 @@ alertServer="ds3"
apiServers
=
"ds1"
# whether to start monitoring self-starting scripts
monitorServerState
=
"false"
monitorServerState
=
"false"
\ No newline at end of file
dolphinscheduler-server/src/test/java/org/apache/dolphinscheduler/server/log/LoggerServerTest.java
浏览文件 @
837197c6
...
...
@@ -23,8 +23,27 @@ import org.junit.Test;
public
class
LoggerServerTest
{
@Test
public
void
testRollViewLog
(){
LoggerServer
loggerServer
=
new
LoggerServer
();
loggerServer
.
start
();
LogClientService
logClientService
=
new
LogClientService
();
logClientService
.
rollViewLog
(
"localhost"
,
Constants
.
RPC_PORT
,
"/opt/demo.txt"
,
0
,
1000
);
try
{
Thread
.
sleep
(
5000
);
}
catch
(
InterruptedException
e
)
{
}
loggerServer
.
stop
();
logClientService
.
close
();
}
@Test
public
void
test
LoggerServer
(){
public
void
test
RemoveTaskLog
(){
LoggerServer
loggerServer
=
new
LoggerServer
();
loggerServer
.
start
();
...
...
@@ -36,5 +55,8 @@ public class LoggerServerTest {
}
catch
(
InterruptedException
e
)
{
}
loggerServer
.
stop
();
logClientService
.
close
();
}
}
dolphinscheduler-service/pom.xml
浏览文件 @
837197c6
...
...
@@ -72,5 +72,27 @@
<groupId>
org.quartz-scheduler
</groupId>
<artifactId>
quartz-jobs
</artifactId>
</dependency>
<dependency>
<groupId>
org.powermock
</groupId>
<artifactId>
powermock-module-junit4
</artifactId>
<scope>
test
</scope>
</dependency>
<dependency>
<groupId>
org.powermock
</groupId>
<artifactId>
powermock-api-mockito2
</artifactId>
<scope>
test
</scope>
<exclusions>
<exclusion>
<groupId>
org.mockito
</groupId>
<artifactId>
mockito-core
</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>
org.mockito
</groupId>
<artifactId>
mockito-core
</artifactId>
<scope>
test
</scope>
</dependency>
</dependencies>
</project>
pom.xml
浏览文件 @
837197c6
...
...
@@ -777,6 +777,8 @@
<include>
**/dao/mapper/CommandMapperTest.java
</include>
<include>
**/dao/mapper/ConnectionFactoryTest.java
</include>
<include>
**/dao/mapper/DataSourceMapperTest.java
</include>
<include>
**/remote/RemoveTaskLogResponseCommandTest.java
</include>
<include>
**/remote/RemoveTaskLogRequestCommandTest.java
</include>
<include>
**/remote/FastJsonSerializerTest.java
</include>
<include>
**/remote/NettyRemotingClientTest.java
</include>
<include>
**/remote/ResponseFutureTest.java
</include>
...
...
script/scp-hosts.sh
浏览文件 @
837197c6
...
...
@@ -40,8 +40,8 @@ do
for
dsDir
in
bin conf lib script sql ui install.sh
do
# if worker in workersGroup
if
[[
"
${
map
[
${
host
}
]
}
"
]]
&&
[[
"
${
dsDir
}
"
-eq
"conf"
]]
;
then
sed
-i
${
txt
}
"s#worker.group.*#worker.group=
${
map
[
${
host
}
]
}
#g"
$workDir
/../conf
/worker.properties
if
[[
"
${
workersGroup
[
${
host
}
]
}
"
]]
&&
[[
"
${
dsDir
}
"
==
"conf"
]]
;
then
sed
-i
${
txt
}
"s#worker.group.*#worker.group=
${
workersGroup
[
${
host
}
]
}
#g"
${
dsDir
}
/worker.properties
fi
echo
"start to scp
$dsDir
to
$host
/
$installPath
"
...
...
@@ -49,4 +49,4 @@ do
done
echo
"scp dirs to
$host
/
$installPath
complete"
done
done
\ No newline at end of file
script/start-all.sh
浏览文件 @
837197c6
...
...
@@ -43,5 +43,4 @@ for apiServer in ${apiServersHost[@]}
do
echo
"
$apiServer
worker server is starting"
ssh
-p
$sshPort
$apiServer
"cd
$installPath
/; sh bin/dolphinscheduler-daemon.sh start api-server;"
done
done
\ No newline at end of file
script/stop-all.sh
浏览文件 @
837197c6
...
...
@@ -43,5 +43,4 @@ for apiServer in ${apiServersHost[@]}
do
echo
"
$apiServer
worker server is stopping"
ssh
-p
$sshPort
$apiServer
"cd
$installPath
/; sh bin/dolphinscheduler-daemon.sh stop api-server;"
done
done
\ No newline at end of file
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录