Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
yanghaoyuan.sh
DolphinScheduler
提交
70d63601
DolphinScheduler
项目概览
yanghaoyuan.sh
/
DolphinScheduler
与 Fork 源项目一致
Fork自
apache / DolphinScheduler
通知
1
Star
0
Fork
0
代码
文件
提交
分支
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,发现更多精彩内容 >>
提交
70d63601
编写于
3月 31, 2020
作者:
Q
qiaozhanwei
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
startup conflict reslove
上级
7cd1f915
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
3 addition
and
48 deletion
+3
-48
dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/service/ProcessInstanceServiceTest.java
...phinscheduler/api/service/ProcessInstanceServiceTest.java
+0
-10
dolphinscheduler-common/src/main/resources/common.properties
dolphinscheduler-common/src/main/resources/common.properties
+2
-4
dolphinscheduler-remote/src/main/java/org/apache/dolphinscheduler/remote/NettyRemotingClient.java
...g/apache/dolphinscheduler/remote/NettyRemotingClient.java
+0
-4
dolphinscheduler-remote/src/main/java/org/apache/dolphinscheduler/remote/handler/NettyClientHandler.java
...e/dolphinscheduler/remote/handler/NettyClientHandler.java
+1
-30
未找到文件。
dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/service/ProcessInstanceServiceTest.java
浏览文件 @
70d63601
...
...
@@ -163,7 +163,6 @@ public class ProcessInstanceServiceTest {
//project auth success
ProcessInstance
processInstance
=
getProcessInstance
();
processInstance
.
setWorkerGroupId
(-
1
);
processInstance
.
setReceivers
(
"xxx@qq.com"
);
processInstance
.
setReceiversCc
(
"xxx@qq.com"
);
processInstance
.
setProcessDefinitionId
(
46
);
...
...
@@ -178,16 +177,11 @@ public class ProcessInstanceServiceTest {
Assert
.
assertEquals
(
Status
.
SUCCESS
,
successRes
.
get
(
Constants
.
STATUS
));
//worker group null
processInstance
.
setWorkerGroupId
(
1
);
when
(
workerGroupMapper
.
selectById
(
processInstance
.
getWorkerGroupId
())).
thenReturn
(
null
);
Map
<
String
,
Object
>
workerNullRes
=
processInstanceService
.
queryProcessInstanceById
(
loginUser
,
projectName
,
1
);
Assert
.
assertEquals
(
Status
.
SUCCESS
,
workerNullRes
.
get
(
Constants
.
STATUS
));
//worker group exist
WorkerGroup
workerGroup
=
getWorkGroup
();
when
(
workerGroupMapper
.
selectById
(
processInstance
.
getWorkerGroupId
())).
thenReturn
(
workerGroup
);
processInstance
.
setWorkerGroupId
(
1
);
when
(
workerGroupMapper
.
selectById
(
processInstance
.
getWorkerGroupId
())).
thenReturn
(
null
);
Map
<
String
,
Object
>
workerExistRes
=
processInstanceService
.
queryProcessInstanceById
(
loginUser
,
projectName
,
1
);
Assert
.
assertEquals
(
Status
.
SUCCESS
,
workerExistRes
.
get
(
Constants
.
STATUS
));
}
...
...
@@ -394,8 +388,6 @@ public class ProcessInstanceServiceTest {
//project auth fail
when
(
projectMapper
.
queryByName
(
projectName
)).
thenReturn
(
null
);
when
(
projectService
.
checkProjectAndAuth
(
loginUser
,
null
,
projectName
)).
thenReturn
(
result
);
Map
<
String
,
Object
>
proejctAuthFailRes
=
processInstanceService
.
deleteProcessInstanceById
(
loginUser
,
projectName
,
1
,
Mockito
.
any
());
Assert
.
assertEquals
(
Status
.
PROJECT_NOT_FOUNT
,
proejctAuthFailRes
.
get
(
Constants
.
STATUS
));
//process instance null
Project
project
=
getProject
(
projectName
);
...
...
@@ -403,8 +395,6 @@ public class ProcessInstanceServiceTest {
when
(
projectMapper
.
queryByName
(
projectName
)).
thenReturn
(
project
);
when
(
projectService
.
checkProjectAndAuth
(
loginUser
,
project
,
projectName
)).
thenReturn
(
result
);
when
(
processService
.
findProcessInstanceDetailById
(
1
)).
thenReturn
(
null
);
Map
<
String
,
Object
>
processInstanceNullRes
=
processInstanceService
.
deleteProcessInstanceById
(
loginUser
,
projectName
,
1
,
Mockito
.
any
());
Assert
.
assertEquals
(
Status
.
PROCESS_INSTANCE_NOT_EXIST
,
processInstanceNullRes
.
get
(
Constants
.
STATUS
));
}
@Test
...
...
dolphinscheduler-common/src/main/resources/common.properties
浏览文件 @
70d63601
...
...
@@ -63,9 +63,7 @@ yarn.resourcemanager.ha.rm.ids=192.168.xx.xx,192.168.xx.xx
# If resourcemanager HA enable or not use resourcemanager, please keep the default value; If resourcemanager is single, you only need to replace ark1 to actual resourcemanager hostname.
yarn.application.status.address
=
http://ark1:8088/ws/v1/cluster/apps/%s
<<<<<<<
HEAD
# system env path. self configuration, please make sure the directory and file exists and have read write execute permissions, TODO
#dolphinscheduler.env.path=env/dolphinscheduler_env.sh
=======
kerberos.expire.time
=
7
>>>>>>>
remotes/upstream/dev
kerberos.expire.time
=
7
\ No newline at end of file
dolphinscheduler-remote/src/main/java/org/apache/dolphinscheduler/remote/NettyRemotingClient.java
浏览文件 @
70d63601
...
...
@@ -349,11 +349,7 @@ public class NettyRemotingClient {
return
channel
;
}
}
catch
(
Exception
ex
)
{
<<<<<<<
HEAD
logger
.
info
(
"connect to {} error {}"
,
host
,
ex
);
=======
logger
.
error
(
"connect to {} error"
,
address
,
ex
);
>>>>>>>
remotes
/
upstream
/
dev
}
return
null
;
}
...
...
dolphinscheduler-remote/src/main/java/org/apache/dolphinscheduler/remote/handler/NettyClientHandler.java
浏览文件 @
70d63601
...
...
@@ -170,38 +170,9 @@ public class NettyClientHandler extends ChannelInboundHandlerAdapter {
*/
@Override
public
void
exceptionCaught
(
ChannelHandlerContext
ctx
,
Throwable
cause
)
throws
Exception
{
logger
.
error
(
"exceptionCaught : {}"
,
cause
.
getMessage
(),
cause
);
logger
.
error
(
"exceptionCaught : {}"
,
cause
);
nettyRemotingClient
.
closeChannel
(
ChannelUtils
.
toAddress
(
ctx
.
channel
()));
ctx
.
channel
().
close
();
}
<<<<<<<
HEAD
=======
/**
* channel write changed
*
* @param ctx channel handler context
* @throws Exception
*/
@Override
public
void
channelWritabilityChanged
(
ChannelHandlerContext
ctx
)
throws
Exception
{
Channel
ch
=
ctx
.
channel
();
ChannelConfig
config
=
ch
.
config
();
if
(!
ch
.
isWritable
())
{
if
(
logger
.
isWarnEnabled
())
{
logger
.
warn
(
"{} is not writable, over high water level : {}"
,
ch
,
config
.
getWriteBufferHighWaterMark
());
}
config
.
setAutoRead
(
false
);
}
else
{
if
(
logger
.
isWarnEnabled
())
{
logger
.
warn
(
"{} is writable, to low water : {}"
,
ch
,
config
.
getWriteBufferLowWaterMark
());
}
config
.
setAutoRead
(
true
);
}
}
>>>>>>>
remotes
/
upstream
/
dev
}
\ No newline at end of file
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录