Repository: reef Updated Branches: refs/heads/master ca1a9e212 -> 8657733fd
[REEF-1756] Add remaining `System.exit()` calls and mark them with `//TODO`s JIRA: [REEF-1756](https://issues.apache.org/jira/browse/REEF-1756) Pull Request: This closes #1278 Project: http://git-wip-us.apache.org/repos/asf/reef/repo Commit: http://git-wip-us.apache.org/repos/asf/reef/commit/8657733f Tree: http://git-wip-us.apache.org/repos/asf/reef/tree/8657733f Diff: http://git-wip-us.apache.org/repos/asf/reef/diff/8657733f Branch: refs/heads/master Commit: 8657733fd20d370eb83aaba0d49f9c01e04d4112 Parents: ca1a9e2 Author: Sergiy Matusevych <[email protected]> Authored: Tue Mar 28 12:01:34 2017 -0700 Committer: Markus Weimer <[email protected]> Committed: Wed Mar 29 12:17:02 2017 -0700 ---------------------------------------------------------------------- .../main/java/org/apache/reef/runtime/common/REEFLauncher.java | 2 +- .../apache/reef/examples/hello/HelloREEFYarnUnmanagedAM.java | 5 ++--- .../org/apache/reef/examples/reefonreef/ReefOnReefDriver.java | 5 +++-- .../reef/tests/examples/TestHelloREEFYarnUnmanagedAM.java | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/reef/blob/8657733f/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/REEFLauncher.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/REEFLauncher.java b/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/REEFLauncher.java index f763398..c8a124a 100644 --- a/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/REEFLauncher.java +++ b/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/REEFLauncher.java @@ -187,7 +187,7 @@ public final class REEFLauncher { LOG.log(Level.INFO, "Exiting REEFLauncher.main()"); - System.exit(0); + System.exit(0); // TODO[REEF-1715]: Should be able to exit cleanly at the end of main() } /** http://git-wip-us.apache.org/repos/asf/reef/blob/8657733f/lang/java/reef-examples/src/main/java/org/apache/reef/examples/hello/HelloREEFYarnUnmanagedAM.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-examples/src/main/java/org/apache/reef/examples/hello/HelloREEFYarnUnmanagedAM.java b/lang/java/reef-examples/src/main/java/org/apache/reef/examples/hello/HelloREEFYarnUnmanagedAM.java index 7879c29..cfdd81f 100644 --- a/lang/java/reef-examples/src/main/java/org/apache/reef/examples/hello/HelloREEFYarnUnmanagedAM.java +++ b/lang/java/reef-examples/src/main/java/org/apache/reef/examples/hello/HelloREEFYarnUnmanagedAM.java @@ -60,7 +60,7 @@ public final class HelloREEFYarnUnmanagedAM { */ public static void main(final String[] args) throws InjectionException { - LOG.log(Level.FINE, "Launching Unnmanaged AM: {0}", JAR_PATH); + LOG.log(Level.FINE, "Launching Unmanaged AM: {0}", JAR_PATH); try (final DriverLauncher client = DriverLauncher.getLauncher(RUNTIME_CONFIG)) { @@ -80,8 +80,7 @@ public final class HelloREEFYarnUnmanagedAM { } ThreadLogger.logThreads(LOG, Level.FINEST, "Threads running after DriverLauncher.close():"); - - LOG.log(Level.INFO, "Clean exit!"); + System.exit(0); // TODO[REEF-1715]: Should be able to exit cleanly at the end of main() } /** Empty private constructor to prohibit instantiation of utility class. */ http://git-wip-us.apache.org/repos/asf/reef/blob/8657733f/lang/java/reef-examples/src/main/java/org/apache/reef/examples/reefonreef/ReefOnReefDriver.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-examples/src/main/java/org/apache/reef/examples/reefonreef/ReefOnReefDriver.java b/lang/java/reef-examples/src/main/java/org/apache/reef/examples/reefonreef/ReefOnReefDriver.java index 8bb0b63..ae04436 100644 --- a/lang/java/reef-examples/src/main/java/org/apache/reef/examples/reefonreef/ReefOnReefDriver.java +++ b/lang/java/reef-examples/src/main/java/org/apache/reef/examples/reefonreef/ReefOnReefDriver.java @@ -72,7 +72,7 @@ final class ReefOnReefDriver implements EventHandler<StartTime> { public void onNext(final StartTime startTime) { LOG.log(Level.INFO, "Driver started: app {0} :: {1}", new Object[] {this.hostApplicationId, startTime}); - LOG.log(Level.FINE, "Launching Unnmanaged AM: {0}", JAR_PATH); + LOG.log(Level.FINE, "Launching Unmanaged AM: {0}", JAR_PATH); try (final DriverLauncher client = DriverLauncher.getLauncher(RUNTIME_CONFIG)) { @@ -92,7 +92,6 @@ final class ReefOnReefDriver implements EventHandler<StartTime> { new Object[] {innerApplicationId, status.getState()}); } - ThreadLogger.logThreads(LOG, Level.FINEST, "Threads running after DriverLauncher.close():"); LOG.log(Level.INFO, "REEF-on-REEF host job {0} completed: inner app {1} status {2}", new Object[] {this.hostApplicationId, innerApplicationId, client.getStatus()}); @@ -101,5 +100,7 @@ final class ReefOnReefDriver implements EventHandler<StartTime> { LOG.log(Level.SEVERE, "REEF-on-REEF configuration error", ex); throw new RuntimeException("REEF-on-REEF configuration error", ex); } + + ThreadLogger.logThreads(LOG, Level.FINEST, "Threads running after DriverLauncher.close():"); } } http://git-wip-us.apache.org/repos/asf/reef/blob/8657733f/lang/java/reef-tests/src/test/java/org/apache/reef/tests/examples/TestHelloREEFYarnUnmanagedAM.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-tests/src/test/java/org/apache/reef/tests/examples/TestHelloREEFYarnUnmanagedAM.java b/lang/java/reef-tests/src/test/java/org/apache/reef/tests/examples/TestHelloREEFYarnUnmanagedAM.java index 568a480..c1df521 100644 --- a/lang/java/reef-tests/src/test/java/org/apache/reef/tests/examples/TestHelloREEFYarnUnmanagedAM.java +++ b/lang/java/reef-tests/src/test/java/org/apache/reef/tests/examples/TestHelloREEFYarnUnmanagedAM.java @@ -69,7 +69,7 @@ public final class TestHelloREEFYarnUnmanagedAM { "This test requires a YARN Resource Manager to connect to", Boolean.parseBoolean(System.getenv("REEF_TEST_YARN"))); - LOG.log(Level.FINE, "Launching Unnmanaged AM: {0}", JAR_PATH); + LOG.log(Level.FINE, "Launching Unmanaged AM: {0}", JAR_PATH); try (final DriverLauncher client = DriverLauncher.getLauncher(RUNTIME_CONFIG)) {
