Simplify Container interface (apache#95)

sijie · Mar 4, 2018 · 9abeef2 · 9abeef2
1 parent 72a9804
commit 9abeef2
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 27 deletions.
diff --git a/pulsar-functions/runtime/src/main/java/org/apache/pulsar/admin/cli/CmdFunctions.java b/pulsar-functions/runtime/src/main/java/org/apache/pulsar/admin/cli/CmdFunctions.java
@@ -225,7 +225,11 @@ void runCmd() throws Exception {
                     containerFactory);
 
                 spawner.start();
-                spawner.join();
+                Runtime.getRuntime().addShutdownHook(new Thread() {
+                    public void run() {
+                        spawner.close();
+                    }
+                });
             }
         }
     }

diff --git a/...untime/src/main/java/org/apache/pulsar/functions/runtime/container/FunctionContainer.java b/...untime/src/main/java/org/apache/pulsar/functions/runtime/container/FunctionContainer.java
@@ -29,12 +29,8 @@
  */
 public interface FunctionContainer {
 
-    String getId();
-
     void start() throws Exception;
 
-    void join() throws InterruptedException;
-
     void stop();
 
     CompletableFuture<FunctionStatus> getFunctionStatus();

diff --git a/.../src/main/java/org/apache/pulsar/functions/runtime/container/ThreadFunctionContainer.java b/.../src/main/java/org/apache/pulsar/functions/runtime/container/ThreadFunctionContainer.java
@@ -39,10 +39,7 @@ class ThreadFunctionContainer implements FunctionContainer {
     // The thread that invokes the function
     @Getter
     private final Thread fnThread;
-
-    // The id of the thread
-    private final String id;
-
+
     private JavaInstanceRunnable javaInstanceRunnable;
 
     ThreadFunctionContainer(JavaInstanceConfig instanceConfig,
@@ -53,13 +50,8 @@ class ThreadFunctionContainer implements FunctionContainer {
                             PulsarClient pulsarClient) {
         this.javaInstanceRunnable = new JavaInstanceRunnable(instanceConfig, maxBufferedTuples,
                 fnCache, jarFile, pulsarClient);
-        this.id = instanceConfig.getFunctionConfig().getFullyQualifiedName();
-        this.fnThread = new Thread(threadGroup, javaInstanceRunnable, this.id);
-    }
-
-    @Override
-    public String getId() {
-        return id;
+        this.fnThread = new Thread(threadGroup, javaInstanceRunnable,
+                instanceConfig.getFunctionConfig().getFullyQualifiedName());
     }
 
     /**
@@ -70,11 +62,6 @@ public void start() throws Exception {
         this.fnThread.start();
     }
 
-    @Override
-    public void join() throws InterruptedException {
-        fnThread.join();
-    }
-
     @Override
     public void stop() {
         javaInstanceRunnable.close();

diff --git a/...-functions/runtime/src/main/java/org/apache/pulsar/functions/runtime/spawner/Spawner.java b/...-functions/runtime/src/main/java/org/apache/pulsar/functions/runtime/spawner/Spawner.java
@@ -77,12 +77,6 @@ public void start() throws Exception {
         functionContainer.start();
     }
 
-    public void join() throws Exception {
-        if (null != functionContainer) {
-            functionContainer.join();
-        }
-    }
-
     public CompletableFuture<FunctionStatus> getFunctionStatus() {
         return functionContainer.getFunctionStatus();
     }