commit 0d03d60dfa85b11ce969791aa25090024abaace9
author Madan Jampani <madan@onlab.us> Mon Apr 20 12:03:56 2015 -0700
committer Gerrit Code Review <gerrit@onlab.us> Tue Apr 21 03:50:11 2015 +0000
tree 67f128823b05f698e1b4179ce7e4e07338a0bc04
parent 9b6b97d13a3dfe0042915e9c6fdc4ad3b2ee27df

ONOS-1673: Fail fast when DatabaseManager does not start up cleanly

Change-Id: I9fcc1c85bb4169681b20df08d69ac8fdcc9d5ddc

core/store/dist/src/main/java/org/onosproject/store/consistent/impl/DatabaseManager.java

diff --git a/core/store/dist/src/main/java/org/onosproject/store/consistent/impl/DatabaseManager.java b/core/store/dist/src/main/java/org/onosproject/store/consistent/impl/DatabaseManager.java
index dd8088c..7c4ddb5 100644
--- a/core/store/dist/src/main/java/org/onosproject/store/consistent/impl/DatabaseManager.java
+++ b/core/store/dist/src/main/java/org/onosproject/store/consistent/impl/DatabaseManager.java
@@ -20,6 +20,7 @@
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
 import com.google.common.collect.Sets;
+import com.google.common.util.concurrent.Futures;
 
 import net.kuujo.copycat.CopycatConfig;
 import net.kuujo.copycat.cluster.ClusterConfig;
@@ -68,7 +69,6 @@
 import java.util.Map;
 import java.util.Set;
 import java.util.concurrent.CompletableFuture;
-import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.Executors;
 import java.util.concurrent.TimeUnit;
@@ -90,7 +90,6 @@
     public static final String PARTITION_DEFINITION_FILE = "../config/tablets.json";
     public static final String BASE_PARTITION_NAME = "p0";
 
-    private static final int DATABASE_STARTUP_TIMEOUT_SEC = 60;
     private static final int RAFT_ELECTION_TIMEOUT_MILLIS = 3000;
     private static final int DATABASE_OPERATION_TIMEOUT_MILLIS = 5000;
 
@@ -176,27 +175,18 @@
 
         partitionedDatabase = new PartitionedDatabase("onos-store", partitions);
 
-        CountDownLatch latch = new CountDownLatch(1);
-
-        coordinator.open()
+        CompletableFuture<Void> status = coordinator.open()
             .thenCompose(v -> CompletableFuture.allOf(inMemoryDatabase.open(), partitionedDatabase.open())
             .whenComplete((db, error) -> {
                 if (error != null) {
-                    log.warn("Failed to create databases.", error);
+                    log.error("Failed to initialize database.", error);
                 } else {
-                    latch.countDown();
-                    log.info("Successfully created databases.");
+                    log.info("Successfully initialized database.");
                 }
             }));
 
-        try {
-            if (!latch.await(DATABASE_STARTUP_TIMEOUT_SEC, TimeUnit.SECONDS)) {
-                log.warn("Timed out waiting for database to initialize.");
-            }
-        } catch (InterruptedException e) {
-            Thread.currentThread().interrupt();
-            log.warn("Failed to complete database initialization.");
-        }
+        Futures.getUnchecked(status);
+
         transactionManager = new TransactionManager(partitionedDatabase);
         log.info("Started");
     }