Skip to content

Commit 7ca015b

Browse files
committed
Fix issue If the submission user of Azkaban is empty, modify the submission user to a proxy user
close #7
1 parent d013db5 commit 7ca015b

File tree

3 files changed

+8
-9
lines changed

3 files changed

+8
-9
lines changed

plugins/azkaban/linkis-jobtype/src/main/java/com/webank/wedatasphere/dss/plugins/azkaban/linkis/jobtype/job/AzkabanAppJointLinkisJob.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919

2020
import com.webank.wedatasphere.dss.linkis.node.execution.job.AbstractAppJointLinkisJob;
2121
import com.webank.wedatasphere.dss.plugins.azkaban.linkis.jobtype.conf.LinkisJobTypeConf;
22+
import org.apache.commons.lang.StringUtils;
2223

2324

2425
/**
@@ -29,6 +30,9 @@ public class AzkabanAppJointLinkisJob extends AbstractAppJointLinkisJob {
2930

3031
@Override
3132
public String getSubmitUser() {
33+
if (StringUtils.isEmpty(getJobProps().get(LinkisJobTypeConf.FLOW_SUBMIT_USER))){
34+
return getJobProps().get(LinkisJobTypeConf.PROXY_USER);
35+
}
3236
return getJobProps().get(LinkisJobTypeConf.FLOW_SUBMIT_USER);
3337
}
3438

plugins/azkaban/linkis-jobtype/src/main/java/com/webank/wedatasphere/dss/plugins/azkaban/linkis/jobtype/job/AzkabanCommonLinkisJob.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919

2020
import com.webank.wedatasphere.dss.linkis.node.execution.job.AbstractCommonLinkisJob;
2121
import com.webank.wedatasphere.dss.plugins.azkaban.linkis.jobtype.conf.LinkisJobTypeConf;
22+
import org.apache.commons.lang.StringUtils;
2223

2324

2425
/**
@@ -29,6 +30,9 @@ public class AzkabanCommonLinkisJob extends AbstractCommonLinkisJob {
2930

3031
@Override
3132
public String getSubmitUser() {
33+
if (StringUtils.isEmpty(getJobProps().get(LinkisJobTypeConf.FLOW_SUBMIT_USER))){
34+
return getJobProps().get(LinkisJobTypeConf.PROXY_USER);
35+
}
3236
return getJobProps().get(LinkisJobTypeConf.FLOW_SUBMIT_USER);
3337
}
3438

plugins/azkaban/linkis-jobtype/src/main/resources/assembly.xml

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -59,15 +59,6 @@
5959
<lineEnding>unix</lineEnding>
6060
</fileSet>
6161

62-
<fileSet>
63-
<directory>${basedir}/target</directory>
64-
<includes>
65-
<include>*.jar</include>
66-
</includes>
67-
<fileMode>0777</fileMode>
68-
<outputDirectory>/</outputDirectory>
69-
<lineEnding>unix</lineEnding>
70-
</fileSet>
7162
<fileSet>
7263
<directory>${basedir}/bin</directory>
7364
<includes>

0 commit comments

Comments
 (0)