DatabaseClient: fixed to use copycat instance instead

Change-Id: If13ec051f362e0d3bc8311dc30e2c0f70e55c42e

DatabaseClient: fixed to use copycat instance instead
Change-Id: If13ec051f362e0d3bc8311dc30e2c0f70e55c42e
Yuta HIGUCHI
Commit f846844802a7e1952f846e9891f73ad332de8462 f8468448 1 parent 21e03649
Showing 2 changed files with 19 additions and 101 deletions
core/store/dist/src/main/java/org/onlab/onos/store/service/impl/DatabaseClient.java
core/store/dist/src/main/java/org/onlab/onos/store/service/impl/DatabaseManager.java
--- a/core/store/dist/src/main/java/org/onlab/onos/store/service/impl/DatabaseClient.java
View file @f846844
+++ b/core/store/dist/src/main/java/org/onlab/onos/store/service/impl/DatabaseClient.java
View file @f846844
 package org.onlab.onos.store.service.impl;
-import java.util.Arrays;
+import static com.google.common.base.Preconditions.checkNotNull;
+
 import java.util.List;
-import java.util.UUID;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.ExecutionException;
-import net.kuujo.copycat.protocol.Response.Status;
+import net.kuujo.copycat.Copycat;
-import net.kuujo.copycat.protocol.SubmitRequest;
-import net.kuujo.copycat.protocol.SubmitResponse;
-import net.kuujo.copycat.spi.protocol.ProtocolClient;
 import org.onlab.onos.store.service.DatabaseException;
 import org.onlab.onos.store.service.ReadRequest;
@@ -20,31 +17,17 @@ import org.onlab.onos.store.service.WriteRequest;
  */
 public class DatabaseClient {
-    private final ProtocolClient client;
+    private final Copycat copycat;
-
-    public DatabaseClient(ProtocolClient client) {
-        this.client = client;
-    }
-    private static String nextId() {
+    public DatabaseClient(Copycat copycat) {
-        return UUID.randomUUID().toString();
+        this.copycat = checkNotNull(copycat);
     }
     public boolean createTable(String tableName) {
-        SubmitRequest request =
+        CompletableFuture<Boolean> future = copycat.submit("createTable", tableName);
-                new SubmitRequest(
-                        nextId(),
-                        "createTable",
-                        Arrays.asList(tableName));
-        CompletableFuture<SubmitResponse> future = client.submit(request);
         try {
-            final SubmitResponse submitResponse = future.get();
+            return future.get();
-            if (submitResponse.status() == Status.OK) {
-                return (boolean) submitResponse.result();
-            } else {
-                throw new DatabaseException(submitResponse.error());
-            }
         } catch (InterruptedException | ExecutionException e) {
             throw new DatabaseException(e);
         }
@@ -52,17 +35,9 @@ public class DatabaseClient {
     public void dropTable(String tableName) {
-        SubmitRequest request =
+        CompletableFuture<Void> future = copycat.submit("dropTable", tableName);
-                new SubmitRequest(
-                        nextId(),
-                        "dropTable",
-                        Arrays.asList(tableName));
-        CompletableFuture<SubmitResponse> future = client.submit(request);
         try {
-            if (future.get().status() != Status.OK) {
+            future.get();
-                throw new DatabaseException(future.get().toString());
-            }
-
         } catch (InterruptedException | ExecutionException e) {
             throw new DatabaseException(e);
         }
@@ -70,79 +45,39 @@ public class DatabaseClient {
     public void dropAllTables() {
-        SubmitRequest request =
+        CompletableFuture<Void> future = copycat.submit("dropAllTables");
-                new SubmitRequest(
-                        nextId(),
-                        "dropAllTables",
-                        Arrays.asList());
-        CompletableFuture<SubmitResponse> future = client.submit(request);
         try {
-            if (future.get().status() != Status.OK) {
+            future.get();
-                throw new DatabaseException(future.get().toString());
-            }
         } catch (InterruptedException | ExecutionException e) {
             throw new DatabaseException(e);
         }
     }
-    @SuppressWarnings("unchecked")
     public List<String> listTables() {
-        SubmitRequest request =
+        CompletableFuture<List<String>> future = copycat.submit("listTables");
-                new SubmitRequest(
-                        nextId(),
-                        "listTables",
-                        Arrays.asList());
-        CompletableFuture<SubmitResponse> future = client.submit(request);
         try {
-            final SubmitResponse submitResponse = future.get();
+            return future.get();
-            if (submitResponse.status() == Status.OK) {
-                return (List<String>) submitResponse.result();
-            } else {
-                throw new DatabaseException(submitResponse.error());
-            }
         } catch (InterruptedException | ExecutionException e) {
             throw new DatabaseException(e);
         }
     }
-    @SuppressWarnings("unchecked")
     public List<InternalReadResult> batchRead(List<ReadRequest> requests) {
-        SubmitRequest request = new SubmitRequest(
+        CompletableFuture<List<InternalReadResult>> future = copycat.submit("read", requests);
-                        nextId(),
-                        "read",
-                        Arrays.asList(requests));
-
-        CompletableFuture<SubmitResponse> future = client.submit(request);
         try {
-            final SubmitResponse submitResponse = future.get();
+            return future.get();
-            if (submitResponse.status() == Status.OK) {
-                return (List<InternalReadResult>) submitResponse.result();
-            } else {
-                throw new DatabaseException(submitResponse.error());
-            }
         } catch (InterruptedException | ExecutionException e) {
             throw new DatabaseException(e);
         }
     }
-    @SuppressWarnings("unchecked")
     public List<InternalWriteResult> batchWrite(List<WriteRequest> requests) {
-        SubmitRequest request = new SubmitRequest(
+        CompletableFuture<List<InternalWriteResult>> future = copycat.submit("write", requests);
-                        nextId(),
-                        "write",
-                        Arrays.asList(requests));
-
-        CompletableFuture<SubmitResponse> future = client.submit(request);
         try {
-            final SubmitResponse submitResponse = future.get();
+            return future.get();
-            if (submitResponse.status() == Status.OK) {
-                return (List<InternalWriteResult>) submitResponse.result();
-            } else {
-                throw new DatabaseException(submitResponse.error());
-            }
         } catch (InterruptedException | ExecutionException e) {
             throw new DatabaseException(e);
         }
--- a/core/store/dist/src/main/java/org/onlab/onos/store/service/impl/DatabaseManager.java
View file @f846844
+++ b/core/store/dist/src/main/java/org/onlab/onos/store/service/impl/DatabaseManager.java
View file @f846844
@@ -25,7 +25,6 @@ import net.kuujo.copycat.cluster.TcpMember;
 import net.kuujo.copycat.log.InMemoryLog;
 import net.kuujo.copycat.log.Log;
-import org.apache.commons.lang3.RandomUtils;
 import org.apache.felix.scr.annotations.Activate;
 import org.apache.felix.scr.annotations.Component;
 import org.apache.felix.scr.annotations.Deactivate;
@@ -53,7 +52,6 @@ import org.onlab.packet.IpAddress;
 import org.slf4j.Logger;
 import com.google.common.collect.ImmutableList;
-import com.google.common.collect.Iterables;
 /**
  * Strongly consistent and durable state management service based on
@@ -125,30 +123,16 @@ public class DatabaseManager implements DatabaseService, DatabaseAdminService {
         }
         final ControllerNode localNode = clusterService.getLocalNode();
-        TcpMember clientHandler = null;
         for (ControllerNode member : defaultMember) {
             final TcpMember tcpMember = new TcpMember(member.ip().toString(),
                                                       member.tcpPort());
             if (localNode.equals(member)) {
-                clientHandler = tcpMember;
                 clusterConfig.setLocalMember(tcpMember);
             } else {
                 clusterConfig.addRemoteMember(tcpMember);
             }
         }
-        // TODO should be removed after DatabaseClient refactoring
-        if (clientHandler == null) {
-            Set<TcpMember> members = clusterConfig.getMembers();
-            if (members.isEmpty()) {
-                log.error("No member found in [{}] tablet configuration.",
-                          DEFAULT_TABLET);
-                throw new IllegalStateException("No member found in tablet configuration");
-            }
-            int position = RandomUtils.nextInt(0, members.size());
-            clientHandler = Iterables.get(members, position);
-        }
-
         // note: from this point beyond, clusterConfig requires synchronization
         clusterEventLatch = new CountDownLatch(1);
         clusterEventListener = new InternalClusterEventListener();
@@ -182,8 +166,7 @@ public class DatabaseManager implements DatabaseService, DatabaseAdminService {
         copycat = new Copycat(stateMachine, consensusLog, cluster, copycatMessagingProtocol);
         copycat.start();
-        // FIXME Redo DatabaseClient. Needs fall back mechanism etc.
+        client = new DatabaseClient(copycat);
-        client = new DatabaseClient(copycatMessagingProtocol.createClient(clientHandler));
         log.info("Started.");
     }