You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@oozie.apache.org by mo...@apache.org on 2014/01/31 00:00:23 UTC
git commit: OOZIE-1668 incremental fix
Updated Branches:
refs/heads/master cf2492213 -> 1eaf7b9eb
OOZIE-1668 incremental fix
Project: http://git-wip-us.apache.org/repos/asf/oozie/repo
Commit: http://git-wip-us.apache.org/repos/asf/oozie/commit/1eaf7b9e
Tree: http://git-wip-us.apache.org/repos/asf/oozie/tree/1eaf7b9e
Diff: http://git-wip-us.apache.org/repos/asf/oozie/diff/1eaf7b9e
Branch: refs/heads/master
Commit: 1eaf7b9eb5d616a23fd754c2fa74de6bc2ff1b52
Parents: cf24922
Author: Mona Chitnis <ch...@yahoo-inc.com>
Authored: Thu Jan 30 15:00:17 2014 -0800
Committer: Mona Chitnis <ch...@yahoo-inc.com>
Committed: Thu Jan 30 15:00:17 2014 -0800
----------------------------------------------------------------------
core/src/main/java/org/apache/oozie/BundleEngine.java | 4 ++--
core/src/main/java/org/apache/oozie/CoordinatorEngine.java | 2 +-
.../java/org/apache/oozie/TestCoordinatorEngineStreamLog.java | 7 ++++++-
3 files changed, 9 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/oozie/blob/1eaf7b9e/core/src/main/java/org/apache/oozie/BundleEngine.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/oozie/BundleEngine.java b/core/src/main/java/org/apache/oozie/BundleEngine.java
index 7f879be..ce7c9c4 100644
--- a/core/src/main/java/org/apache/oozie/BundleEngine.java
+++ b/core/src/main/java/org/apache/oozie/BundleEngine.java
@@ -253,8 +253,8 @@ public class BundleEngine extends BaseEngine {
throw new BundleEngineException(ex);
}
- Date endTime = job.getEndTime() == null ? new Date() : job.getEndTime();
- Services.get().get(XLogStreamingService.class).streamLog(filter, job.getCreatedTime(), endTime, writer, params);
+ Services.get().get(XLogStreamingService.class)
+ .streamLog(filter, job.getCreatedTime(), new Date(), writer, params);
}
/* (non-Javadoc)
http://git-wip-us.apache.org/repos/asf/oozie/blob/1eaf7b9e/core/src/main/java/org/apache/oozie/CoordinatorEngine.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/oozie/CoordinatorEngine.java b/core/src/main/java/org/apache/oozie/CoordinatorEngine.java
index 8c5e80c..e7384f1 100644
--- a/core/src/main/java/org/apache/oozie/CoordinatorEngine.java
+++ b/core/src/main/java/org/apache/oozie/CoordinatorEngine.java
@@ -419,7 +419,7 @@ public class CoordinatorEngine extends BaseEngine {
startTime = job.getCreatedTime();
}
if (endTime == null) {
- endTime = job.getEndTime() == null ? new Date() : job.getEndTime();
+ endTime = new Date();
}
}
//job.getActions()
http://git-wip-us.apache.org/repos/asf/oozie/blob/1eaf7b9e/core/src/test/java/org/apache/oozie/TestCoordinatorEngineStreamLog.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/oozie/TestCoordinatorEngineStreamLog.java b/core/src/test/java/org/apache/oozie/TestCoordinatorEngineStreamLog.java
index 6f7403d..dff46ef 100644
--- a/core/src/test/java/org/apache/oozie/TestCoordinatorEngineStreamLog.java
+++ b/core/src/test/java/org/apache/oozie/TestCoordinatorEngineStreamLog.java
@@ -113,12 +113,17 @@ public class TestCoordinatorEngineStreamLog extends XFsTestCase {
return a.getId().compareTo(b.getId());
}
});
-
+
+ endDate = new Date();
+
+ Thread.sleep(2000);
// Test 1.to test if fields are injected
ce.streamLog(jobId, new StringWriter(), new HashMap<String, String[]>());
DummyXLogStreamingService service = (DummyXLogStreamingService) services.get(XLogStreamingService.class);
Filter filter = service.filter;
assertEquals(filter.getFilterParams().get(DagXLogInfoService.JOB), jobId);
+ assertTrue(endDate.before(service.endTime));
+
// Test2
// * Test method org.apache.oozie.CoordinatorEngine.streamLog(String,