Updated Branches: refs/heads/master 92a9665e0 -> 386bb736c
OOZIE-1663 Queuedump to display command type (shwethags via virag) Project: http://git-wip-us.apache.org/repos/asf/oozie/repo Commit: http://git-wip-us.apache.org/repos/asf/oozie/commit/386bb736 Tree: http://git-wip-us.apache.org/repos/asf/oozie/tree/386bb736 Diff: http://git-wip-us.apache.org/repos/asf/oozie/diff/386bb736 Branch: refs/heads/master Commit: 386bb736ca90440786f0638217c1f5a00d58b11e Parents: 92a9665 Author: Virag Kothari <[email protected]> Authored: Fri Jan 17 10:10:15 2014 -0800 Committer: Virag Kothari <[email protected]> Committed: Fri Jan 17 10:10:15 2014 -0800 ---------------------------------------------------------------------- core/src/main/java/org/apache/oozie/command/XCommand.java | 8 ++++++++ .../java/org/apache/oozie/service/CallableQueueService.java | 8 -------- .../command/coord/TestCoordPushDependencyCheckXCommand.java | 4 ++-- release-log.txt | 1 + 4 files changed, 11 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/oozie/blob/386bb736/core/src/main/java/org/apache/oozie/command/XCommand.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/oozie/command/XCommand.java b/core/src/main/java/org/apache/oozie/command/XCommand.java index 0df49a4..d614a2a 100644 --- a/core/src/main/java/org/apache/oozie/command/XCommand.java +++ b/core/src/main/java/org/apache/oozie/command/XCommand.java @@ -521,4 +521,12 @@ public abstract class XCommand<T> implements XCallable<T> { return LOG; } + /** + * String for the command - key + * @return String + */ + @Override + public String toString() { + return getKey(); + } } http://git-wip-us.apache.org/repos/asf/oozie/blob/386bb736/core/src/main/java/org/apache/oozie/service/CallableQueueService.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/oozie/service/CallableQueueService.java b/core/src/main/java/org/apache/oozie/service/CallableQueueService.java index 4533e01..ab81b09 100644 --- a/core/src/main/java/org/apache/oozie/service/CallableQueueService.java +++ b/core/src/main/java/org/apache/oozie/service/CallableQueueService.java @@ -199,14 +199,6 @@ public class CallableQueueService implements Service, Instrumentable { } /** - * @return String the queue dump - */ - @Override - public String toString() { - return "delay=" + getDelay(TimeUnit.MILLISECONDS) + ", elements=" + getElement().toString(); - } - - /** * Filter the duplicate callables from the list before queue this. * <p/> * If it is single callable, checking if key is in unique map or not. http://git-wip-us.apache.org/repos/asf/oozie/blob/386bb736/core/src/test/java/org/apache/oozie/command/coord/TestCoordPushDependencyCheckXCommand.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/oozie/command/coord/TestCoordPushDependencyCheckXCommand.java b/core/src/test/java/org/apache/oozie/command/coord/TestCoordPushDependencyCheckXCommand.java index ddd1899..da09727 100644 --- a/core/src/test/java/org/apache/oozie/command/coord/TestCoordPushDependencyCheckXCommand.java +++ b/core/src/test/java/org/apache/oozie/command/coord/TestCoordPushDependencyCheckXCommand.java @@ -396,10 +396,10 @@ public class TestCoordPushDependencyCheckXCommand extends XDataTestCase { // Should be requeued at the recovery service interval final List<String> queueDump = callableQueueService.getQueueDump(); assertEquals(1, callableQueueService.getQueueDump().size()); - assertTrue(queueDump.get(0).contains(CoordPushDependencyCheckXCommand.class.getName())); + assertTrue(queueDump.get(0).contains("coord_push_dep_check")); log.info("Queue dump is " + queueDump.toString()); // Delay should be something like delay=599999. Ignore last three digits - assertTrue(queueDump.get(0).matches("delay=599[0-9]{3}, .*")); + assertTrue(queueDump.get(0).matches(".* delay=599[0-9]{3}")); } @Test http://git-wip-us.apache.org/repos/asf/oozie/blob/386bb736/release-log.txt ---------------------------------------------------------------------- diff --git a/release-log.txt b/release-log.txt index 5930bcc..fdb271a 100644 --- a/release-log.txt +++ b/release-log.txt @@ -1,5 +1,6 @@ -- Oozie 4.1.0 release (trunk - unreleased) +OOZIE-1663 Queuedump to display command type (shwethags via virag) OOZIE-1672 UI info fetch fails for bundle having large number of coordinators (puru via rohini) OOZIE-1666 Child job link not working in safari and chrome (puru via ryota) OOZIE-1658 Add bundle, coord, wf and action related information to launched M/R jobs (puru via rohini)
