You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@gobblin.apache.org by su...@apache.org on 2019/06/19 23:24:49 UTC
[incubator-gobblin] branch master updated: [GOBBLIN-805] Fix dag
being cleaned twice
This is an automated email from the ASF dual-hosted git repository.
suvasude pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-gobblin.git
The following commit(s) were added to refs/heads/master by this push:
new e96f0c6 [GOBBLIN-805] Fix dag being cleaned twice
e96f0c6 is described below
commit e96f0c672fc251b41b8e91b532b05089905d60a6
Author: Jack Moseley <jm...@linkedin.com>
AuthorDate: Wed Jun 19 16:24:43 2019 -0700
[GOBBLIN-805] Fix dag being cleaned twice
Closes #2671 from jack-moseley/dag-clean-fix
---
.../org/apache/gobblin/service/modules/orchestration/DagManager.java | 2 +-
.../apache/gobblin/service/modules/orchestration/DagManagerTest.java | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/gobblin-service/src/main/java/org/apache/gobblin/service/modules/orchestration/DagManager.java b/gobblin-service/src/main/java/org/apache/gobblin/service/modules/orchestration/DagManager.java
index 27da869..43f1ee8 100644
--- a/gobblin-service/src/main/java/org/apache/gobblin/service/modules/orchestration/DagManager.java
+++ b/gobblin-service/src/main/java/org/apache/gobblin/service/modules/orchestration/DagManager.java
@@ -565,7 +565,7 @@ public class DagManager extends AbstractIdleService {
//Clean up completed dags
for (String dagId : this.dags.keySet()) {
- if (!hasRunningJobs(dagId)) {
+ if (!hasRunningJobs(dagId) && !this.failedDagIdsFinishRunning.contains(dagId)) {
String status = "COMPLETE";
if (this.failedDagIdsFinishAllPossible.contains(dagId)) {
status = "FAILED";
diff --git a/gobblin-service/src/test/java/org/apache/gobblin/service/modules/orchestration/DagManagerTest.java b/gobblin-service/src/test/java/org/apache/gobblin/service/modules/orchestration/DagManagerTest.java
index 562f8d8..0165bb2 100644
--- a/gobblin-service/src/test/java/org/apache/gobblin/service/modules/orchestration/DagManagerTest.java
+++ b/gobblin-service/src/test/java/org/apache/gobblin/service/modules/orchestration/DagManagerTest.java
@@ -317,7 +317,7 @@ public class DagManagerTest {
}
}
- @Test
+ @Test (dependsOnMethods = "testFailedDag")
public void testSucceedAfterRetry() throws Exception {
long flowExecutionId = System.currentTimeMillis();
String flowGroupId = "0";
@@ -398,7 +398,7 @@ public class DagManagerTest {
Assert.assertEquals(this._dagStateStore.getDags().size(), 0);
}
- @Test
+ @Test (dependsOnMethods = "testSucceedAfterRetry")
public void testFailAfterRetry() throws Exception {
long flowExecutionId = System.currentTimeMillis();
String flowGroupId = "0";