Skip to content

Commit bdf39d8

Browse files
committed
1. fix config
1 parent aba21eb commit bdf39d8

File tree

3 files changed

+3
-3
lines changed
  • streamis-jobmanager
    • streamis-job-launcher/streamis-job-launcher-base/src/main/scala/com/webank/wedatasphere/streamis/jobmanager/launcher/job/conf
    • streamis-job-manager/streamis-job-manager-base/src/main/java/com/webank/wedatasphere/streamis/jobmanager/manager/conf
    • streamis-jobmanager-server/src/main/java/com/webank/wedatasphere/streamis/jobmanager/service/impl

3 files changed

+3
-3
lines changed

streamis-jobmanager/streamis-job-launcher/streamis-job-launcher-base/src/main/scala/com/webank/wedatasphere/streamis/jobmanager/launcher/job/conf/JobConf.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,7 @@ object JobConf {
162162

163163
val HIGHAVAILABLE_TOKEN: CommonVars[String] = CommonVars("wds.streamis.app.highavailable.token", "streamis0.3.8")
164164

165-
val STANDARD_AUTHENTICATION_KEY: CommonVars[Boolean] = CommonVars("wds.streamis.standard.authentication.key", true)
165+
val STANDARD_AUTHENTICATION_KEY: CommonVars[Boolean] = CommonVars("wds.streamis.standard.authentication.key", false)
166166

167167
val JOB_CONTENT_EDIT_ENABLE: CommonVars[Boolean] = CommonVars("wds.streamis.job.content.edit.enable", true)
168168

streamis-jobmanager/streamis-job-manager/streamis-job-manager-base/src/main/java/com/webank/wedatasphere/streamis/jobmanager/manager/conf/JobManagerConf.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ public class JobManagerConf {
1414

1515
private static Map<String, List<String>> hookProjectMap = null;
1616

17-
public static final CommonVars<Boolean> ENABLE_JOB_SHUTDOWN_HOOKS = CommonVars.apply("wds.streamis.job.shutdown.hook.enable", true);
17+
public static final CommonVars<Boolean> ENABLE_JOB_SHUTDOWN_HOOKS = CommonVars.apply("wds.streamis.job.shutdown.hook.enable", false);
1818

1919

2020
/*

streamis-jobmanager/streamis-jobmanager-server/src/main/java/com/webank/wedatasphere/streamis/jobmanager/service/impl/HighAvailableServiceImpl.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ public JobHighAvailableVo getJobHighAvailableVo(long jobId){
4444
inspectVo = SourceUtils.manageJobProjectFile(highAvailablePolicy, source);
4545
} else {
4646
LOG.warn("this job source is null");
47-
if (highAvailablePolicy.equals(JobConf.HIGHAVAILABLE_DEFAULT_POLICY().getValue()) || highAvailablePolicy.equals(JobConf.HIGHAVAILABLE_POLICY_SINGLE_BAK().getValue())){
47+
if (null == highAvailablePolicy || highAvailablePolicy.equals(JobConf.HIGHAVAILABLE_DEFAULT_POLICY().getValue()) || highAvailablePolicy.equals(JobConf.HIGHAVAILABLE_POLICY_SINGLE_BAK().getValue())){
4848
inspectVo.setHighAvailable(true);
4949
inspectVo.setMsg("job为单活,跳过高可用检查");
5050
}else {

0 commit comments

Comments
 (0)