zeppelin-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From m...@apache.org
Subject zeppelin git commit: [HOTFIX] Fix CI
Date Sun, 19 Mar 2017 04:10:35 GMT
Repository: zeppelin
Updated Branches:
  refs/heads/master 7f6dc8624 -> 00e6aed0c


[HOTFIX] Fix CI

### What is this PR for?
CI is failing since https://github.com/apache/zeppelin/commit/970b8117a48a31a9375bf7f76142117fd9b3bd86

This PR tries to make CI green

### What type of PR is it?
Hot Fix

### How should this be tested?
CI Green

### Questions:
* Does the licenses files need update? no
* Is there breaking changes for older versions? no
* Does this needs documentation? no

Author: Lee moon soo <moon@apache.org>

Closes #2157 from Leemoonsoo/hofix_ci2 and squashes the following commits:

16881c6 [Lee moon soo] prevent deadlock
2d9c182 [Lee moon soo] update test


Project: http://git-wip-us.apache.org/repos/asf/zeppelin/repo
Commit: http://git-wip-us.apache.org/repos/asf/zeppelin/commit/00e6aed0
Tree: http://git-wip-us.apache.org/repos/asf/zeppelin/tree/00e6aed0
Diff: http://git-wip-us.apache.org/repos/asf/zeppelin/diff/00e6aed0

Branch: refs/heads/master
Commit: 00e6aed0c7bc514bc270703b188b841b6835defd
Parents: 7f6dc86
Author: Lee moon soo <moon@apache.org>
Authored: Sat Mar 18 16:33:48 2017 -0700
Committer: Lee moon soo <moon@apache.org>
Committed: Sat Mar 18 21:10:31 2017 -0700

----------------------------------------------------------------------
 .../remote/RemoteInterpreterServer.java         | 21 ++++++++++----------
 .../apache/zeppelin/notebook/NotebookTest.java  |  6 ++++--
 2 files changed, 15 insertions(+), 12 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/zeppelin/blob/00e6aed0/zeppelin-interpreter/src/main/java/org/apache/zeppelin/interpreter/remote/RemoteInterpreterServer.java
----------------------------------------------------------------------
diff --git a/zeppelin-interpreter/src/main/java/org/apache/zeppelin/interpreter/remote/RemoteInterpreterServer.java
b/zeppelin-interpreter/src/main/java/org/apache/zeppelin/interpreter/remote/RemoteInterpreterServer.java
index 8624b57..effaf85 100644
--- a/zeppelin-interpreter/src/main/java/org/apache/zeppelin/interpreter/remote/RemoteInterpreterServer.java
+++ b/zeppelin-interpreter/src/main/java/org/apache/zeppelin/interpreter/remote/RemoteInterpreterServer.java
@@ -276,17 +276,18 @@ public class RemoteInterpreterServer
     }
 
     // close interpreters
+    List<Interpreter> interpreters;
     synchronized (interpreterGroup) {
-      List<Interpreter> interpreters = interpreterGroup.get(sessionKey);
-      if (interpreters != null) {
-        Iterator<Interpreter> it = interpreters.iterator();
-        while (it.hasNext()) {
-          Interpreter inp = it.next();
-          if (inp.getClassName().equals(className)) {
-            inp.close();
-            it.remove();
-            break;
-          }
+      interpreters = interpreterGroup.get(sessionKey);
+    }
+    if (interpreters != null) {
+      Iterator<Interpreter> it = interpreters.iterator();
+      while (it.hasNext()) {
+        Interpreter inp = it.next();
+        if (inp.getClassName().equals(className)) {
+          inp.close();
+          it.remove();
+          break;
         }
       }
     }

http://git-wip-us.apache.org/repos/asf/zeppelin/blob/00e6aed0/zeppelin-zengine/src/test/java/org/apache/zeppelin/notebook/NotebookTest.java
----------------------------------------------------------------------
diff --git a/zeppelin-zengine/src/test/java/org/apache/zeppelin/notebook/NotebookTest.java
b/zeppelin-zengine/src/test/java/org/apache/zeppelin/notebook/NotebookTest.java
index 9b1a370..f6d5708 100644
--- a/zeppelin-zengine/src/test/java/org/apache/zeppelin/notebook/NotebookTest.java
+++ b/zeppelin-zengine/src/test/java/org/apache/zeppelin/notebook/NotebookTest.java
@@ -696,8 +696,10 @@ public class NotebookTest implements JobListenerFactory{
     .getAngularObjectRegistry();
 
     // local and global scope object should be removed
-    assertNull(registry.get("o1", note.getId(), null));
-    assertNull(registry.get("o2", null, null));
+    // But InterpreterGroup does not implement angularObjectRegistry per session (scoped,
isolated)
+    // So for now, does not have good way to remove all objects in particular session on
restart.
+    assertNotNull(registry.get("o1", note.getId(), null));
+    assertNotNull(registry.get("o2", null, null));
     notebook.removeNote(note.getId(), anonymous);
   }
 


Mime
View raw message