| commit | 5204349182e8a52614d88dbdbab148533904a4cf | [log] [tgz] |
|---|---|---|
| author | Jake Biesinger <jake.biesinger@gmail.com> | Wed Nov 06 17:48:22 2013 -0800 |
| committer | Jake Biesinger <jake.biesinger@gmail.com> | Wed Nov 06 17:48:22 2013 -0800 |
| tree | 7514dd9d7b460d3950aa2df47affbe90074fefc2 | |
| parent | aae80a02d2ff841c0ef03cc34d7219b4f9bc3712 [diff] |
NodeControllers clean up appEntryPoints on shutdown (2nd try)
diff --git a/hyracks/hyracks-control/hyracks-control-nc/src/main/java/edu/uci/ics/hyracks/control/nc/NodeControllerService.java b/hyracks/hyracks-control/hyracks-control-nc/src/main/java/edu/uci/ics/hyracks/control/nc/NodeControllerService.java index 6049a3b..ebfc486 100644 --- a/hyracks/hyracks-control/hyracks-control-nc/src/main/java/edu/uci/ics/hyracks/control/nc/NodeControllerService.java +++ b/hyracks/hyracks-control/hyracks-control-nc/src/main/java/edu/uci/ics/hyracks/control/nc/NodeControllerService.java
@@ -303,6 +303,8 @@ netManager.stop(); datasetNetworkManager.stop(); queue.stop(); + if (ncAppEntryPoint != null) + ncAppEntryPoint.stop(); LOGGER.log(Level.INFO, "Stopped NodeControllerService"); }
diff --git a/pregelix/pregelix-runtime/src/main/java/edu/uci/ics/pregelix/runtime/bootstrap/NCApplicationEntryPoint.java b/pregelix/pregelix-runtime/src/main/java/edu/uci/ics/pregelix/runtime/bootstrap/NCApplicationEntryPoint.java index 9607494..fe72d7a 100644 --- a/pregelix/pregelix-runtime/src/main/java/edu/uci/ics/pregelix/runtime/bootstrap/NCApplicationEntryPoint.java +++ b/pregelix/pregelix-runtime/src/main/java/edu/uci/ics/pregelix/runtime/bootstrap/NCApplicationEntryPoint.java
@@ -19,9 +19,11 @@ import edu.uci.ics.pregelix.dataflow.context.RuntimeContext; public class NCApplicationEntryPoint implements INCApplicationEntryPoint { + private RuntimeContext rCtx = null; + @Override public void start(INCApplicationContext ncAppCtx, String[] args) throws Exception { - RuntimeContext rCtx = new RuntimeContext(ncAppCtx); + rCtx = new RuntimeContext(ncAppCtx); ncAppCtx.setApplicationObject(rCtx); } @@ -32,6 +34,6 @@ @Override public void stop() throws Exception { - + rCtx.close(); } } \ No newline at end of file