Guard distributed database open actions.

Wait for distributed databases to be online before allowing access.

Author: timw

core/src/main/java/com/orientechnologies/orient/core/db/OrientDBEmbedded.java

@@ -408,7 +408,7 @@ private long calculateDoubleWriteLogMaxSegSize(Path storagePath) throws IOExcept
   }
 
   @Override
-  public ODatabaseDocumentInternal open(String name, String user, String password) {
+  public final ODatabaseDocumentInternal open(String name, String user, String password) {
     return open(name, user, password, null);
   }
 
@@ -637,12 +637,12 @@ protected String buildName(String name) {
     return basePath + "/" + name;
   }
 
-  public void create(String name, String user, String password, ODatabaseType type) {
+  public final void create(String name, String user, String password, ODatabaseType type) {
     create(name, user, password, type, null);
   }
 
   @Override
-  public void create(
+  public final void create(
       String name, String user, String password, ODatabaseType type, OrientDBConfig config) {
     create(name, user, password, type, config, null);
   }
@@ -920,7 +920,7 @@ public synchronized void loadAllDatabases() {
     }
   }
 
-  public ODatabasePoolInternal openPool(String name, String user, String password) {
+  public final ODatabasePoolInternal openPool(String name, String user, String password) {
     return openPool(name, user, password, null);
   }
 
@@ -935,7 +935,7 @@ public ODatabasePoolInternal openPool(
   }
 
   @Override
-  public ODatabasePoolInternal cachedPool(String database, String user, String password) {
+  public final ODatabasePoolInternal cachedPool(String database, String user, String password) {
     return cachedPool(database, user, password, null);
   }
 

distributed/src/main/java/com/orientechnologies/orient/distributed/db/OrientDBDistributed.java

@@ -25,6 +25,7 @@
 import com.orientechnologies.orient.core.db.OrientDBEmbedded;
 import com.orientechnologies.orient.core.db.document.ODatabaseDocumentEmbedded;
 import com.orientechnologies.orient.core.exception.ODatabaseException;
+import com.orientechnologies.orient.core.metadata.security.auth.OAuthenticationInfo;
 import com.orientechnologies.orient.core.storage.OStorage;
 import com.orientechnologies.orient.core.storage.disk.OLocalPaginatedStorage;
 import com.orientechnologies.orient.core.storage.impl.local.OAbstractPaginatedStorage;
@@ -267,6 +268,7 @@ public OStorage fullSync(String dbName, InputStream backupStream, OrientDBConfig
   @Override
   public ODatabaseDocumentInternal poolOpen(
       String name, String user, String password, ODatabasePoolInternal pool) {
+    checkDbAvailableOpen(name);
     ODatabaseDocumentInternal session = super.poolOpen(name, user, password, pool);
     return session;
   }
@@ -346,47 +348,34 @@ public void drop(String name, String user, String password) {
   }
 
   private boolean checkDbAvailable(String name) {
-    if (getPlugin() == null || !getPlugin().isEnabled()) {
+    if (!isDistributedPluginEnabled() || OSystemDatabase.SYSTEM_DB_NAME.equals(name)) {
       return true;
     }
-    if (OSystemDatabase.SYSTEM_DB_NAME.equals(name)) return true;
+    waitForPluginStartup();
     DB_STATUS dbStatus = plugin.getDatabaseStatus(plugin.getLocalNodeName(), name);
     return dbStatus == DB_STATUS.ONLINE || dbStatus == DB_STATUS.BACKUP;
   }
 
-  private boolean checkDbAvailableOpen(String name) {
-    if (!checkDbAvailable(name)) {
-      long waitTime =
-          getConfigurations()
-              .getConfigurations()
-              .getValueAsLong(OGlobalConfiguration.DISTRIBUTED_DATABASE_ONLINE_GRACE_PERIOD);
-      if (waitTime != 0) {
-        long retry = waitTime / 500;
-        // TODO: when there will be proper node online event this should attach to that with a
-        // notification instead of sleep
-        for (long i = 0; i < retry; i++) {
-          try {
-            Thread.sleep(500);
-          } catch (InterruptedException e) {
-            e.printStackTrace();
-          }
-          if (checkDbAvailable(name)) {
-            return true;
-          }
-        }
-      }
-    }
-    return false;
-  }
+  private void checkDbAvailableOpen(String name) {
+    if (checkDbAvailable(name)) return;
 
-  @Override
-  public ODatabaseDocumentInternal open(String name, String user, String password) {
-    if (checkDbAvailableOpen(name)) {
-      return super.open(name, user, password);
-    } else {
-      if (exists(name, user, password)) {
-        return super.open(name, user, password);
+    long waitTime =
+        getConfigurations()
+            .getConfigurations()
+            .getValueAsLong(OGlobalConfiguration.DISTRIBUTED_DATABASE_ONLINE_GRACE_PERIOD);
+    long endTime = System.currentTimeMillis() + waitTime;
+    boolean dbAvailable = false;
+    do {
+      // TODO: when there will be proper node online event this should attach to that with a
+      //  notification instead of sleep
+      try {
+        Thread.sleep(100);
+      } catch (InterruptedException ignored) {
       }
+      dbAvailable = checkDbAvailable(name);
+    } while (!dbAvailable && (System.currentTimeMillis() < endTime));
+
+    if (!dbAvailable) {
       throw new OOfflineNodeException(
           "database " + name + " not online on " + plugin.getLocalNodeName());
     }
@@ -395,16 +384,45 @@ public ODatabaseDocumentInternal open(String name, String user, String password)
   @Override
   public ODatabaseDocumentInternal open(
       String name, String user, String password, OrientDBConfig config) {
+    checkDbAvailableOpen(name);
+    return super.open(name, user, password, config);
+  }
 
-    if (checkDbAvailableOpen(name)) {
-      return super.open(name, user, password, config);
+  @Override
+  public ODatabaseDocumentInternal open(
+      OAuthenticationInfo authenticationInfo, OrientDBConfig config) {
+    if (authenticationInfo.getDatabase().isPresent()) {
+      checkDbAvailableOpen(authenticationInfo.getDatabase().get());
     } else {
-      if (exists(name, user, password)) {
-        return super.open(name, user, password, config);
-      }
-      throw new OOfflineNodeException(
-          "database " + name + " not online on " + plugin.getLocalNodeName());
+      waitForPluginStartup();
     }
+    return super.open(authenticationInfo, config);
+  }
+
+  @Override
+  public ODatabaseDocumentEmbedded openNoAuthenticate(String name, String user) {
+    checkDbAvailableOpen(name);
+    return super.openNoAuthenticate(name, user);
+  }
+
+  @Override
+  public ODatabaseDocumentEmbedded openNoAuthorization(String name) {
+    // TODO: Some paths might need protection
+    return super.openNoAuthorization(name);
+  }
+
+  @Override
+  public ODatabasePoolInternal openPool(
+      String name, String user, String password, OrientDBConfig config) {
+    checkDbAvailableOpen(name);
+    return super.openPool(name, user, password, config);
+  }
+
+  @Override
+  public ODatabasePoolInternal cachedPool(
+      String database, String user, String password, OrientDBConfig config) {
+    checkDbAvailableOpen(database);
+    return super.cachedPool(database, user, password, config);
   }
 
   @Override
@@ -506,7 +524,7 @@ public ODistributedDatabaseImpl unregisterDatabase(final String iDatabaseName) {
     return db;
   }
 
-  public void registerNewDatabaseIfNeeded(
+  private void registerNewDatabaseIfNeeded(
       ODatabaseDocumentInternal session, OSharedContext context) {
     databases.computeIfAbsent(session.getName(), (n) -> this.newDistributedDatabase(n, session));
   }