You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@helix.apache.org by hu...@apache.org on 2019/05/22 23:41:29 UTC
[helix] 04/14: TASK: Make isJobQueue backward compatible
This is an automated email from the ASF dual-hosted git repository.
hulee pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/helix.git
commit 5e6a9fff8457c6c58816be39ee4479b0da3a045d
Author: Hunter Lee <hu...@linkedin.com>
AuthorDate: Tue Apr 2 18:23:17 2019 -0700
TASK: Make isJobQueue backward compatible
Making isJobQueue backward compatible by adding isTerminable() check.
RB=1617516
G=helix-reviewers
A=jxue
Signed-off-by: Hunter Lee <hu...@linkedin.com>
---
helix-core/src/main/java/org/apache/helix/task/WorkflowConfig.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/helix-core/src/main/java/org/apache/helix/task/WorkflowConfig.java b/helix-core/src/main/java/org/apache/helix/task/WorkflowConfig.java
index 9f98f6b..aae0c01 100644
--- a/helix-core/src/main/java/org/apache/helix/task/WorkflowConfig.java
+++ b/helix-core/src/main/java/org/apache/helix/task/WorkflowConfig.java
@@ -233,7 +233,8 @@ public class WorkflowConfig extends ResourceConfig {
}
public boolean isJobQueue() {
- return _record.getBooleanField(WorkflowConfigProperty.IsJobQueue.name(), DEFAULT_JOB_QUEUE);
+ return _record.getBooleanField(WorkflowConfigProperty.IsJobQueue.name(), DEFAULT_JOB_QUEUE)
+ || !isTerminable();
}
protected void setJobTypes(Map<String, String> jobTypes) {