zeppelin-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jongy...@apache.org
Subject zeppelin git commit: Revert "[ZEPPELIN-1196] Fix for bug ZEPPELIN-1196"
Date Fri, 22 Jul 2016 04:50:18 GMT
Repository: zeppelin
Updated Branches:
  refs/heads/branch-0.6 d74e5d0e3 -> 42f31f0be
Updated Tags:  refs/tags/v0.5.6-rc1 [created] e34579e81
  refs/tags/v0.6.0-rc1 [created] fa2c0ff93


Revert "[ZEPPELIN-1196] Fix for bug ZEPPELIN-1196"

This reverts commit d74e5d0e317fbc200fbf9ebd4ebfb77e39f40b6e.


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

Branch: refs/heads/branch-0.6
Commit: 42f31f0bebdecf1a9d24c5cc31a6a23dbde75989
Parents: d74e5d0
Author: Jongyoul Lee <jongyoul@apache.org>
Authored: Fri Jul 22 13:49:15 2016 +0900
Committer: Jongyoul Lee <jongyoul@apache.org>
Committed: Fri Jul 22 13:49:15 2016 +0900

----------------------------------------------------------------------
 .../remote/RemoteInterpreterProcess.java        |  5 ---
 .../remote/RemoteInterpreterProcessTest.java    | 32 --------------------
 2 files changed, 37 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/zeppelin/blob/42f31f0b/zeppelin-interpreter/src/main/java/org/apache/zeppelin/interpreter/remote/RemoteInterpreterProcess.java
----------------------------------------------------------------------
diff --git a/zeppelin-interpreter/src/main/java/org/apache/zeppelin/interpreter/remote/RemoteInterpreterProcess.java
b/zeppelin-interpreter/src/main/java/org/apache/zeppelin/interpreter/remote/RemoteInterpreterProcess.java
index b4579bc..05baf62 100644
--- a/zeppelin-interpreter/src/main/java/org/apache/zeppelin/interpreter/remote/RemoteInterpreterProcess.java
+++ b/zeppelin-interpreter/src/main/java/org/apache/zeppelin/interpreter/remote/RemoteInterpreterProcess.java
@@ -113,11 +113,6 @@ public class RemoteInterpreterProcess implements ExecuteResultHandler
{
                   + "Please specify the port on which interpreter is listening");
             }
           }
-          executor = new DefaultExecutor();
-
-          watchdog = new ExecuteWatchdog(ExecuteWatchdog.INFINITE_TIMEOUT);
-          executor.setWatchdog(watchdog);
-
           running = true;
         }
 

http://git-wip-us.apache.org/repos/asf/zeppelin/blob/42f31f0b/zeppelin-interpreter/src/test/java/org/apache/zeppelin/interpreter/remote/RemoteInterpreterProcessTest.java
----------------------------------------------------------------------
diff --git a/zeppelin-interpreter/src/test/java/org/apache/zeppelin/interpreter/remote/RemoteInterpreterProcessTest.java
b/zeppelin-interpreter/src/test/java/org/apache/zeppelin/interpreter/remote/RemoteInterpreterProcessTest.java
index 77571a9..f9d7d39 100644
--- a/zeppelin-interpreter/src/test/java/org/apache/zeppelin/interpreter/remote/RemoteInterpreterProcessTest.java
+++ b/zeppelin-interpreter/src/test/java/org/apache/zeppelin/interpreter/remote/RemoteInterpreterProcessTest.java
@@ -103,36 +103,4 @@ public class RemoteInterpreterProcessTest {
     assertEquals(1, rip.reference(intpGroup));
     assertEquals(true, rip.isRunning());
   }
-  
-  
-  @Test
-  public void testRemoteInterpreterWithMultipleInterpreterInGroup() throws TException, InterruptedException
{
-    RemoteInterpreterServer server = new RemoteInterpreterServer(3679);
-    server.start();
-    long startTime = System.currentTimeMillis();
-    /*If RemoteInterpreterServer didn't start within 30 seconds than this test may fail
-     * which might be due to issue in RemoteInterpreterServer
-     */
-    while (System.currentTimeMillis() - startTime < 30 * 1000) {
-      if (server.isRunning()) {
-        break;
-      } else {
-        Thread.sleep(200);
-      }
-    }
-    Properties properties = new Properties();
-    properties.setProperty(Constants.ZEPPELIN_INTERPRETER_PORT, "3679");
-    properties.setProperty(Constants.ZEPPELIN_INTERPRETER_HOST, "localhost");
-    InterpreterGroup intpGroup = mock(InterpreterGroup.class);
-    when(intpGroup.getProperty()).thenReturn(properties);
-    when(intpGroup.containsKey(Constants.EXISTING_PROCESS)).thenReturn(true);
-    RemoteInterpreterProcess rip = new RemoteInterpreterProcess(INTERPRETER_SCRIPT, "nonexists",
-        "fakeRepo", new HashMap<String, String>(), 30 * 1000, null);
-    assertFalse(rip.isRunning());
-    assertEquals(0, rip.referenceCount());
-    assertEquals(1, rip.reference(intpGroup));
-    // Calling reference once again to depict multiple intrepreters in a group
-    assertEquals(2, rip.reference(intpGroup));
-    assertEquals(true, rip.isRunning());
-  }
 }


Mime
View raw message