embulk-executor-remoteserver 0.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c4ea491089752939f80cdb185fbb49c98231bf7b
-  data.tar.gz: d548b330992af638341e655560886af6e9e05703
+  metadata.gz: b18f93356633018febab0d307085bb42dc4a5f79
+  data.tar.gz: f0d31304ca00c26b415c5e7a018179067a98741a
 SHA512:
-  metadata.gz: 6269c634253213e86af20e1803eedf139369704bbcc31e4e86238fa7c1debabe94eac04784267f1074703364a82b746601524d779e4e86fc7898749db0b5d14b
-  data.tar.gz: 6d0fd99dc49c4d1ff750fb4987946b5bfe9cfe2ad8c2bced5f6b95c61c79a94b5e5ef4e61882f7b25a8a6545c8c82b6cb7729e343ae75403965065db1751c125
+  metadata.gz: 076b0b9291241b5195e49d572638d87a7d91a40f4908cc437eb372ce454f171c1cacc2ab481240081d241fea15e2bc93aa52462a56600509a879c92964fa3cbd
+  data.tar.gz: a3f6d984008e5815bfce5780e6e5b017621078ae4e8fb6b38f3de5bd70f2b8626c10c5f8216150fdae7fcc5003313b16fa7356e0f7daa4c9d94a04973e80b1ad

data/Dockerfile

@@ -1,4 +1,4 @@
-FROM openjdk:8
+FROM openjdk:8 as builder
 WORKDIR /usr/src/app
 COPY build.gradle settings.gradle gradlew gradle.properties ./
 COPY ./gradle ./gradle
@@ -9,6 +9,6 @@ RUN ./gradlew --no-daemon executableEmbulkServer
 FROM openjdk:8-jre
 WORKDIR /root/
 COPY ./docker .
-COPY --from=0 /usr/src/app/build/libs/embulk-server-*.jar ./embulk-server.jar
-ENTRYPOINT ["/root/run_embulk_server.sh"]
+COPY --from=builder /usr/src/app/build/libs/embulk-server-*.jar ./embulk-server.jar
+CMD ["/root/run_embulk_server.sh"]
 EXPOSE 30001

data/README.md

@@ -1,6 +1,6 @@
 # Remote server executor plugin for Embulk
 
-Embulk executor plugin to run plugins on remote server.
+Embulk executor plugin to run Embulk tasks on remote servers. 
 
 ## Overview
 
@@ -12,7 +12,7 @@ Embulk executor plugin to run plugins on remote server.
 
 ## Configuration
 
-- **hosts**: List of remote servers. If not specified, the executor runs as local mode, which start Embulk server on its own process (array of string)
+- **hosts**: List of remote servers (`hostname` or `hostname:port`, default port is `30001`). If not specified, the executor runs as local mode, which start Embulk server on its own process (array of string)
 - **timeout_seconds**: Timeout seconds of the whole execution (integer, default: `3600`)
 
 ## Example
@@ -21,13 +21,16 @@ Embulk executor plugin to run plugins on remote server.
 exec:
   type: remoteserver
   hosts:
-    - {name:remote-server1.com, port:30001}
-    - {name:remote-server2.com, port:30001}
+    - embulk-server1.local
+    - embulk-server2.local:30002
   timeout_seconds: 86400
 ```
 
-## Running Embulk server as Docker container
-Its image is hosted by [DockerHub](https://cloud.docker.com/repository/docker/kamatama41/embulk-executor-remoteserver)
+## Embulk server
+The server recieves requests from client (Embulk) and run Embulk tasks, then returns results to client. It communicates with clients via `TCP 30001 port`. 
+
+### Running Embulk server as a Docker container
+The image is hosted by [DockerHub](https://hub.docker.com/r/kamatama41/embulk-executor-remoteserver).  
 You can try running Embulk server by the following command. 
 
 ```sh

data/docker-compose.yml

@@ -7,7 +7,7 @@ services:
     environment:
       LOG_LEVEL: debug
     ports:
-      - "24224:30001"
+      - "30001:30001"
     volumes:
       - ./tmp/output:/output
       - ./src/test/resources/json:/root/src/test/resources/json
@@ -18,7 +18,7 @@ services:
     environment:
       LOG_LEVEL: debug
     ports:
-      - "24225:30001"
+      - "30002:30001"
     volumes:
       - ./tmp/output:/output
       - ./src/test/resources/json:/root/src/test/resources/json

data/gradle.properties

@@ -1 +1 @@
-version=0.1.1
+version=0.2.0

data/src/main/java/org/embulk/executor/remoteserver/{SessionState.java → ClientSession.java}

@@ -15,10 +15,10 @@ import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeoutException;
 import java.util.stream.Collectors;
 
-class SessionState {
-    private static final Logger log = LoggerFactory.getLogger(SessionState.class);
+class ClientSession {
+    private static final Logger log = LoggerFactory.getLogger(ClientSession.class);
 
-    private String sessionId;
+    private final String id;
     private final String systemConfigJson;
     private final String pluginTaskJson;
     private final String processTaskJson;
@@ -32,11 +32,11 @@ class SessionState {
     private volatile boolean isFinished;
     private final Map<Integer, String> errorMessages;
 
-    SessionState(
+    ClientSession(
             String systemConfigJson, String pluginTaskJson, String processTaskJson,
             List<PluginArchive.GemSpec> gemSpecs, byte[] pluginArchiveBytes,
             ProcessState state, int inputTaskCount, ModelManager modelManager) {
-        this.sessionId = UUID.randomUUID().toString();
+        this.id = UUID.randomUUID().toString();
         this.systemConfigJson = systemConfigJson;
         this.pluginTaskJson = pluginTaskJson;
         this.processTaskJson = processTaskJson;
@@ -50,8 +50,8 @@ class SessionState {
         this.errorMessages = new ConcurrentHashMap<>();
     }
 
-    String getSessionId() {
-        return sessionId;
+    String getId() {
+        return id;
     }
 
     String getSystemConfigJson() {
@@ -74,10 +74,6 @@ class SessionState {
         return pluginArchiveBytes;
     }
 
-    ProcessState getState() {
-        return state;
-    }
-
     boolean isFinished() {
         return isFinished;
     }
@@ -110,7 +106,7 @@ class SessionState {
     void waitUntilCompleted(int timeoutSeconds) throws InterruptedException, TimeoutException {
         try {
             if (!timer.await(timeoutSeconds, TimeUnit.SECONDS)) {
-                throw new TimeoutException(String.format("The session (%s) was time-out.", sessionId));
+                throw new TimeoutException(String.format("The session (%s) was time-out.", id));
             }
             if (!errorMessages.isEmpty()) {
                 String message = errorMessages.entrySet().stream()

data/src/main/java/org/embulk/executor/remoteserver/EmbulkClient.java

@@ -18,28 +18,28 @@ import java.util.concurrent.atomic.AtomicInteger;
 class EmbulkClient implements AutoCloseable {
     private final SocketClient client;
     private final List<Host> hosts;
-    private final SessionState sessionState;
+    private final ClientSession session;
     private final AtomicInteger counter = new AtomicInteger(1);
 
-    private EmbulkClient(SocketClient client, List<Host> hosts, SessionState sessionState) {
+    private EmbulkClient(SocketClient client, List<Host> hosts, ClientSession session) {
         this.client = client;
         this.hosts = hosts;
-        this.sessionState = sessionState;
+        this.session = session;
     }
 
     static EmbulkClient open(
-            SessionState sessionState,
+            ClientSession session,
             List<Host> hosts) throws IOException {
         SocketClient client = new SocketClient();
         client.registerSyncCommand(new InitializeSessionCommand(null));
         client.registerSyncCommand(new RemoveSessionCommand(null));
-        client.registerCommand(new NotifyTaskStateCommand(sessionState));
-        client.registerListener(new Reconnector(client, sessionState));
+        client.registerCommand(new UpdateTaskStateCommand(session));
+        client.registerListener(new Reconnector(client, session));
         client.open();
         for (Host host : hosts) {
             client.addNode(host.toAddress());
         }
-        return new EmbulkClient(client, hosts, sessionState);
+        return new EmbulkClient(client, hosts, session);
     }
 
     void createSession() {
@@ -48,7 +48,7 @@ class EmbulkClient implements AutoCloseable {
         for (Host host : hosts) {
             futures.add(es.submit(() -> {
                 Connection connection = client.getConnection(host.toAddress());
-                connection.sendSyncCommand(InitializeSessionCommand.ID, toInitializeSessionData(sessionState));
+                connection.sendSyncCommand(InitializeSessionCommand.ID, toInitializeSessionData(session));
             }));
         }
         try {
@@ -68,44 +68,44 @@ class EmbulkClient implements AutoCloseable {
         // Round robin (more smart logic needed?)
         InetSocketAddress target = hosts.get(counter.getAndIncrement() % hosts.size()).toAddress();
         client.getConnection(target).sendCommand(
-                StartTaskCommand.ID, new StartTaskCommand.Data(sessionState.getSessionId(), taskIndex));
+                StartTaskCommand.ID, new StartTaskCommand.Data(session.getId(), taskIndex));
     }
 
     @Override
     public void close() throws IOException {
         for (Host host : hosts) {
             Connection connection = client.getConnection(host.toAddress());
-            connection.sendSyncCommand(RemoveSessionCommand.ID, sessionState.getSessionId());
+            connection.sendSyncCommand(RemoveSessionCommand.ID, session.getId());
         }
         client.close();
     }
 
     private static class Reconnector implements CommandListener {
         private final SocketClient client;
-        private final SessionState sessionState;
+        private final ClientSession session;
 
-        Reconnector(SocketClient client, SessionState sessionState) {
+        Reconnector(SocketClient client, ClientSession session) {
             this.client = client;
-            this.sessionState = sessionState;
+            this.session = session;
         }
 
         @Override
         public void onDisconnected(Connection connection) {
-            if(!sessionState.isFinished()) {
+            if(!session.isFinished()) {
                 Connection newConnection = client.getConnection((InetSocketAddress) connection.getRemoteSocketAddress());
-                newConnection.sendSyncCommand(InitializeSessionCommand.ID, toInitializeSessionData(sessionState));
+                newConnection.sendSyncCommand(InitializeSessionCommand.ID, toInitializeSessionData(session));
             }
         }
     }
 
-    private static InitializeSessionCommand.Data toInitializeSessionData(SessionState sessionState) {
+    private static InitializeSessionCommand.Data toInitializeSessionData(ClientSession session) {
         return new InitializeSessionCommand.Data(
-                sessionState.getSessionId(),
-                sessionState.getSystemConfigJson(),
-                sessionState.getPluginTaskJson(),
-                sessionState.getProcessTaskJson(),
-                sessionState.getGemSpecs(),
-                sessionState.getPluginArchiveBytes()
+                session.getId(),
+                session.getSystemConfigJson(),
+                session.getPluginTaskJson(),
+                session.getProcessTaskJson(),
+                session.getGemSpecs(),
+                session.getPluginArchiveBytes()
         );
     }
 }

data/src/main/java/org/embulk/executor/remoteserver/EmbulkServer.java

@@ -7,20 +7,20 @@ import java.io.IOException;
 public class EmbulkServer implements AutoCloseable {
     private SocketServer server;
 
-    EmbulkServer(SocketServer  server) {
+    private EmbulkServer(SocketServer  server) {
         this.server = server;
     }
 
     static EmbulkServer start(String host, int port, int numOfWorkers) throws IOException {
         SocketServer server = new SocketServer();
-        SessionManager sessionManager = new SessionManager();
+        ServerSessionRegistry sessionRegistry = new ServerSessionRegistry();
         server.setHost(host);
         server.setPort(port);
         server.setDefaultContentBufferSize(4 * 1024 * 1024); // 4MB
         server.setNumOfWorkers(numOfWorkers);
-        server.registerSyncCommand(new InitializeSessionCommand(sessionManager));
-        server.registerSyncCommand(new RemoveSessionCommand(sessionManager));
-        server.registerCommand(new StartTaskCommand(sessionManager));
+        server.registerSyncCommand(new InitializeSessionCommand(sessionRegistry));
+        server.registerSyncCommand(new RemoveSessionCommand(sessionRegistry));
+        server.registerCommand(new StartTaskCommand(sessionRegistry));
         server.start();
         return new EmbulkServer(server);
     }

data/src/main/java/org/embulk/executor/remoteserver/Host.java

@@ -1,27 +1,20 @@
 package org.embulk.executor.remoteserver;
 
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonProperty;
-
 import java.net.InetSocketAddress;
 
 class Host {
     private String name;
     private int port;
 
-    @JsonCreator
-    Host(@JsonProperty("name") String name,
-         @JsonProperty("port") int port) {
+    Host(String name, int port) {
         this.name = name;
         this.port = port;
     }
 
-    @JsonProperty
     String getName() {
         return name;
     }
 
-    @JsonProperty
     int getPort() {
         return port;
     }
@@ -29,4 +22,16 @@ class Host {
     InetSocketAddress toAddress() {
         return new InetSocketAddress(name, port);
     }
+
+    static Host of(String host) {
+        String[] split = host.split(":");
+        if (split.length > 2) {
+            throw new IllegalArgumentException("Host must be the format 'hostname(:port)' but " + host);
+        }
+        if (split.length == 1) {
+            return new Host(split[0], 30001);
+        } else {
+            return new Host(split[0], Integer.parseInt(split[1]));
+        }
+    }
 }

data/src/main/java/org/embulk/executor/remoteserver/InitializeSessionCommand.java

@@ -9,15 +9,15 @@ import java.util.List;
 
 class InitializeSessionCommand implements SyncCommand<InitializeSessionCommand.Data, Void> {
     static final String ID = "initialize_session";
-    private final SessionManager sessionManager;
+    private final ServerSessionRegistry sessionRegistry;
 
-    InitializeSessionCommand(SessionManager sessionManager) {
-        this.sessionManager = sessionManager;
+    InitializeSessionCommand(ServerSessionRegistry sessionRegistry) {
+        this.sessionRegistry = sessionRegistry;
     }
 
     @Override
     public Void apply(Data data, Connection connection) {
-        sessionManager.registerNewSession(
+        sessionRegistry.register(
                 data.getSessionId(),
                 data.getSystemConfigJson(),
                 data.getPluginTaskJson(),

data/src/main/java/org/embulk/executor/remoteserver/RemoteServerExecutor.java

@@ -25,17 +25,18 @@ import java.nio.file.Files;
 import java.util.Collections;
 import java.util.List;
 import java.util.concurrent.TimeoutException;
+import java.util.stream.Collectors;
 
 public class RemoteServerExecutor implements ExecutorPlugin {
     private static final Logger log = LoggerFactory.getLogger(RemoteServerExecutor.class);
-    private static final Host DEFAULT_HOST = new Host("localhost", 30000);
+    private static final Host DEFAULT_HOST = new Host("localhost", 30001);
     private final ConfigSource systemConfig;
     private final ScriptingContainer jruby;
 
     interface PluginTask extends Task {
         @Config("hosts")
         @ConfigDefault("[]")
-        List<Host> getHosts();
+        List<String> getHosts();
 
         @Config("timeout_seconds")
         @ConfigDefault("3600")
@@ -62,7 +63,10 @@ public class RemoteServerExecutor implements ExecutorPlugin {
                 throw new UncheckedIOException(e);
             }
         } else {
-            control.transaction(outputSchema, inputTaskCount, new ExecutorImpl(inputTaskCount, task, task.getHosts()));
+            control.transaction(
+                    outputSchema,
+                    inputTaskCount,
+                    new ExecutorImpl(inputTaskCount, task, task.getHosts().stream().map(Host::of).collect(Collectors.toList())));
         }
     }
 
@@ -97,9 +101,9 @@ public class RemoteServerExecutor implements ExecutorPlugin {
             String pluginTaskJson = modelManager.writeObject(pluginTask);
             String processTaskJson = modelManager.writeObject(processTask);
 
-            SessionState sessionState = new SessionState(
+            ClientSession session = new ClientSession(
                     systemConfigJson, pluginTaskJson, processTaskJson, gemSpecs, pluginArchiveBytes, state, inputTaskCount, modelManager);
-            try (EmbulkClient client = EmbulkClient.open(sessionState, hosts)) {
+            try (EmbulkClient client = EmbulkClient.open(session, hosts)) {
                 client.createSession();
 
                 state.initialize(inputTaskCount, inputTaskCount);
@@ -110,7 +114,7 @@ public class RemoteServerExecutor implements ExecutorPlugin {
                     }
                     client.startTask(i);
                 }
-                sessionState.waitUntilCompleted(pluginTask.getTimeoutSeconds() + 1); // Add 1 sec to consider network latency
+                session.waitUntilCompleted(pluginTask.getTimeoutSeconds() + 1); // Add 1 sec to consider network latency
             } catch (InterruptedException | TimeoutException e) {
                 throw new IllegalStateException(e);
             } catch (IOException e) {

data/src/main/java/org/embulk/executor/remoteserver/RemoveSessionCommand.java

@@ -5,15 +5,15 @@ import com.github.kamatama41.nsocket.SyncCommand;
 
 public class RemoveSessionCommand implements SyncCommand<String, Void> {
     static final String ID = "remove_session";
-    private final SessionManager sessionManager;
+    private final ServerSessionRegistry sessionRegistry;
 
-    RemoveSessionCommand(SessionManager sessionManager) {
-        this.sessionManager = sessionManager;
+    RemoveSessionCommand(ServerSessionRegistry sessionRegistry) {
+        this.sessionRegistry = sessionRegistry;
     }
 
     @Override
     public Void apply(String sessionId, Connection connection) {
-        sessionManager.removeSession(sessionId);
+        sessionRegistry.remove(sessionId);
         return null;
     }
 

data/src/main/java/org/embulk/executor/remoteserver/{Session.java → ServerSession.java}

@@ -29,8 +29,8 @@ import java.util.concurrent.TimeUnit;
 
 import static java.nio.charset.StandardCharsets.UTF_8;
 
-class Session implements AutoCloseable {
-    private static final Logger log = LoggerFactory.getLogger(Session.class);
+class ServerSession implements AutoCloseable {
+    private static final Logger log = LoggerFactory.getLogger(ServerSession.class);
     private final String id;
     private final EmbulkEmbed embed;
     private final ScriptingContainer jruby;
@@ -44,7 +44,7 @@ class Session implements AutoCloseable {
     private final ExecutorService sessionRunner;
     private volatile Connection connection;
 
-    Session(
+    ServerSession(
             String id,
             String systemConfig,
             String pluginTaskConfig,
@@ -145,7 +145,7 @@ class Session implements AutoCloseable {
         UpdateTaskStateData data;
         Queue<UpdateTaskStateData> buffer = bufferMap.get(taskIndex);
         while ((data = buffer.poll()) != null) {
-            connection.sendCommand(NotifyTaskStateCommand.ID, data);
+            connection.sendCommand(UpdateTaskStateCommand.ID, data);
         }
     }
 

data/src/main/java/org/embulk/executor/remoteserver/ServerSessionRegistry.java

@@ -0,0 +1,37 @@
+package org.embulk.executor.remoteserver;
+
+import com.github.kamatama41.nsocket.Connection;
+
+import java.util.List;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ConcurrentMap;
+
+class ServerSessionRegistry {
+    private final ConcurrentMap<String, ServerSession> sessionMap;
+
+    ServerSessionRegistry() {
+        this.sessionMap = new ConcurrentHashMap<>();
+    }
+
+    void register(String sessionId,
+                  String systemConfig,
+                  String pluginTaskConfig,
+                  String processTaskConfig,
+                  List<PluginArchive.GemSpec> gemSpecs,
+                  byte[] pluginArchive,
+                  Connection connection) {
+        ServerSession session = sessionMap.computeIfAbsent(
+                sessionId, (k) -> new ServerSession(
+                        sessionId, systemConfig, pluginTaskConfig, processTaskConfig, gemSpecs, pluginArchive));
+        session.updateConnection(connection);
+    }
+
+    ServerSession get(String sessionId) {
+        return sessionMap.get(sessionId);
+    }
+
+    void remove(String sessionId) {
+        ServerSession removed = sessionMap.remove(sessionId);
+        removed.close();
+    }
+}

data/src/main/java/org/embulk/executor/remoteserver/StartTaskCommand.java

@@ -7,15 +7,15 @@ import com.github.kamatama41.nsocket.Connection;
 
 class StartTaskCommand implements Command<StartTaskCommand.Data> {
     static final String ID = "start_task";
-    private final SessionManager sessionManager;
+    private final ServerSessionRegistry sessionRegistry;
 
-    StartTaskCommand(SessionManager sessionManager) {
-        this.sessionManager = sessionManager;
+    StartTaskCommand(ServerSessionRegistry sessionRegistry) {
+        this.sessionRegistry = sessionRegistry;
     }
 
     @Override
     public void execute(Data data, Connection connection) {
-        Session session = sessionManager.getSession(data.getSessionId());
+        ServerSession session = sessionRegistry.get(data.getSessionId());
         if (session == null) {
             throw new IllegalStateException("Session is not created.");
         }

data/src/main/java/org/embulk/executor/remoteserver/TaskExecutionException.java

@@ -4,8 +4,4 @@ class TaskExecutionException extends RuntimeException {
     TaskExecutionException(String message) {
         super(message);
     }
-
-    TaskExecutionException(Throwable cause) {
-        super(cause);
-    }
 }

data/src/main/java/org/embulk/executor/remoteserver/{NotifyTaskStateCommand.java → UpdateTaskStateCommand.java}

@@ -3,17 +3,17 @@ package org.embulk.executor.remoteserver;
 import com.github.kamatama41.nsocket.Command;
 import com.github.kamatama41.nsocket.Connection;
 
-class NotifyTaskStateCommand implements Command<UpdateTaskStateData> {
-    static final String ID = "notify_task_state";
-    private final SessionState sessionState;
+class UpdateTaskStateCommand implements Command<UpdateTaskStateData> {
+    static final String ID = "update_task_state";
+    private final ClientSession session;
 
-    NotifyTaskStateCommand(SessionState sessionState) {
-        this.sessionState = sessionState;
+    UpdateTaskStateCommand(ClientSession session) {
+        this.session = session;
     }
 
     @Override
     public void execute(UpdateTaskStateData data, Connection connection) throws Exception {
-        sessionState.update(data);
+        session.update(data);
     }
 
     @Override

data/src/test/java/org/embulk/executor/remoteserver/TestRemoteServerExecutor.java

@@ -22,7 +22,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
 
 @EmbulkTest(value = RemoteServerExecutor.class, name = "remoteserver")
 class TestRemoteServerExecutor extends EmbulkPluginTest {
-    private static final List<Host> HOSTS = Arrays.asList(new Host("localhost", 24224), new Host("localhost", 24225));
+    private static final List<String> HOSTS = Arrays.asList("localhost", "localhost:30002");
     private static final Path OUTPUT_DIR = Paths.get("tmp", "output");
     private static final Path TEST_DIR = Paths.get("test");
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: embulk-executor-remoteserver
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors:
 - Shinichi Ishimura
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-03-31 00:00:00.000000000 Z
+date: 2019-04-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -51,7 +51,7 @@ files:
 - LICENSE
 - README.md
 - build.gradle
-- classpath/embulk-executor-remoteserver-0.1.1.jar
+- classpath/embulk-executor-remoteserver-0.2.0.jar
 - classpath/msgpack-core-0.8.16.jar
 - classpath/nsocket-0.2.10.jar
 - classpath/slf4j-api-1.7.26.jar
@@ -66,21 +66,21 @@ files:
 - gradlew.bat
 - lib/embulk/executor/remoteserver.rb
 - settings.gradle
+- src/main/java/org/embulk/executor/remoteserver/ClientSession.java
 - src/main/java/org/embulk/executor/remoteserver/EmbulkClient.java
 - src/main/java/org/embulk/executor/remoteserver/EmbulkServer.java
 - src/main/java/org/embulk/executor/remoteserver/Host.java
 - src/main/java/org/embulk/executor/remoteserver/InitializeSessionCommand.java
 - src/main/java/org/embulk/executor/remoteserver/Launcher.java
-- src/main/java/org/embulk/executor/remoteserver/NotifyTaskStateCommand.java
 - src/main/java/org/embulk/executor/remoteserver/PluginArchive.java
 - src/main/java/org/embulk/executor/remoteserver/RemoteServerExecutor.java
 - src/main/java/org/embulk/executor/remoteserver/RemoveSessionCommand.java
-- src/main/java/org/embulk/executor/remoteserver/Session.java
-- src/main/java/org/embulk/executor/remoteserver/SessionManager.java
-- src/main/java/org/embulk/executor/remoteserver/SessionState.java
+- src/main/java/org/embulk/executor/remoteserver/ServerSession.java
+- src/main/java/org/embulk/executor/remoteserver/ServerSessionRegistry.java
 - src/main/java/org/embulk/executor/remoteserver/StartTaskCommand.java
 - src/main/java/org/embulk/executor/remoteserver/TaskExecutionException.java
 - src/main/java/org/embulk/executor/remoteserver/TaskState.java
+- src/main/java/org/embulk/executor/remoteserver/UpdateTaskStateCommand.java
 - src/main/java/org/embulk/executor/remoteserver/UpdateTaskStateData.java
 - src/main/resources/logback.xml
 - src/test/java/org/embulk/executor/remoteserver/TestRemoteServerExecutor.java

data/src/main/java/org/embulk/executor/remoteserver/SessionManager.java

@@ -1,37 +0,0 @@
-package org.embulk.executor.remoteserver;
-
-import com.github.kamatama41.nsocket.Connection;
-
-import java.util.List;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.ConcurrentMap;
-
-class SessionManager {
-    private final ConcurrentMap<String, Session> sessionMap;
-
-    SessionManager() {
-        this.sessionMap = new ConcurrentHashMap<>();
-    }
-
-    void registerNewSession(String sessionId,
-                            String systemConfig,
-                            String pluginTaskConfig,
-                            String processTaskConfig,
-                            List<PluginArchive.GemSpec> gemSpecs,
-                            byte[] pluginArchive,
-                            Connection connection) {
-        Session session = sessionMap.computeIfAbsent(
-                sessionId, (k) -> new Session(
-                        sessionId, systemConfig, pluginTaskConfig, processTaskConfig, gemSpecs, pluginArchive));
-        session.updateConnection(connection);
-    }
-
-    Session getSession(String sessionId) {
-        return sessionMap.get(sessionId);
-    }
-
-    void removeSession(String sessionId) {
-        Session removed = sessionMap.remove(sessionId);
-        removed.close();
-    }
-}