LIYV-289. Fix NPE in ContextLauncher when Driver is not successfully …

…started and expose the state of RSCClient (cloudera#268) Change-Id: Iae8b04393c4c52d87e87bd451916d6191007db08
pralabhkumar · Jan 4, 2017 · f5dea60 · f5dea60
1 parent 6077628
commit f5dea60
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 5 deletions.
diff --git a/rsc/src/main/java/com/cloudera/livy/rsc/ContextLauncher.java b/rsc/src/main/java/com/cloudera/livy/rsc/ContextLauncher.java
@@ -105,7 +105,9 @@ private ContextLauncher(RSCClientFactory factory, RSCConf conf) throws IOExcepti
         @Override
         public void onFailure(Throwable error) throws Exception {
           // If promise is cancelled or failed, make sure spark-submit is not leaked.
-          child.kill();
+          if (child != null) {
+            child.kill();
+          }
         }
       });
 
@@ -137,10 +139,12 @@ private void connectTimeout(RegistrationHandler handler) {
   private void dispose(boolean forceKill) {
     factory.getServer().unregisterClient(clientId);
     try {
-      if (forceKill) {
-        child.kill();
-      } else {
-        child.detach();
+      if (child != null) {
+        if (forceKill) {
+          child.kill();
+        } else {
+          child.detach();
+        }
       }
     } finally {
       factory.unref();

diff --git a/rsc/src/main/java/com/cloudera/livy/rsc/RSCClient.java b/rsc/src/main/java/com/cloudera/livy/rsc/RSCClient.java
@@ -94,6 +94,10 @@ public void onFailure(Throwable error) {
     isAlive = true;
   }
 
+  public boolean isAlive() {
+    return isAlive;
+  }
+
   private synchronized void connectToContext(final ContextInfo info) throws Exception {
     this.contextInfo = info;