Detect when distributed plugin startup is complete.

timw · tglman · commit fc5235a882f3 · 2025-08-04T16:26:45.000+02:00
diff --git a/distributed/src/main/java/com/orientechnologies/orient/distributed/db/OrientDBDistributed.java b/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;
@@ -58,12 +59,15 @@
 import java.util.Map.Entry;
 import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeUnit;
 
 /** Created by tglman on 08/08/17. */
 public class OrientDBDistributed extends OrientDBEmbedded implements OServerAware {
 
   private volatile OServer server;
   private volatile ODistributedPlugin plugin;
+  private final CountDownLatch pluginStartupLatch = new CountDownLatch(1);
   protected final ConcurrentHashMap<String, ODistributedDatabaseImpl> databases =
       new ConcurrentHashMap<String, ODistributedDatabaseImpl>();
   protected final ConcurrentHashMap<String, ODistributedConfigurationManager> configurations =
@@ -103,10 +107,33 @@ public void loadAllDatabases() {
     }
   }
 
-  public synchronized ODistributedPlugin getPlugin() {
-    if (plugin == null) {
-      if (server != null && server.isActive()) plugin = server.getPlugin("cluster");
+  private void waitForPluginStartup() {
+    if (isDistributedPluginEnabled() && plugin == null) {
+      try {
+        OLogManager.instance().info(this, "Waiting for plugin startup");
+        if (!pluginStartupLatch.await(10, TimeUnit.SECONDS)) {
+          throw new OOfflineNodeException("Distributed manager is offline on " + server.getServerId());
+        }
+        OLogManager.instance().info(this, "Plugin startup complete");
+      } catch (InterruptedException ignored) {
+      }
+    }
+  }
+
+  public void setPlugin(ODistributedPlugin plugin) {
+    OLogManager.instance().info(this, "Setting plugin");
+    this.plugin = plugin;
+    this.pluginStartupLatch.countDown();
     }
+
+  public ODistributedPlugin getPlugin() {
+    OLogManager.instance()
+        .info(
+            this,
+            "Getting plugin, server?=%s, server.active?=%s",
+            server != null,
+            server.isActive());
+    waitForPluginStartup();
     return plugin;
   }
 
@@ -164,10 +191,6 @@ protected ODatabaseDocumentEmbedded newPooledSessionInstance(
     return embedded;
   }
 
-  public void setPlugin(ODistributedPlugin plugin) {
-    this.plugin = plugin;
-  }
-
   public OStorage fullSync(String dbName, InputStream backupStream, OrientDBConfig config) {
     OAbstractPaginatedStorage storage = null;
     ODatabaseDocumentEmbedded embedded;
diff --git a/distributed/src/main/java/com/orientechnologies/orient/server/distributed/impl/ODistributedPlugin.java b/distributed/src/main/java/com/orientechnologies/orient/server/distributed/impl/ODistributedPlugin.java
@@ -285,8 +285,6 @@ public void setDefaultDatabaseConfigFile(final String iFile) {
   @Override
   public void startup() {
     if (!enabled) return;
-    if (serverInstance.getDatabases() instanceof OrientDBDistributed)
-      ((OrientDBDistributed) serverInstance.getDatabases()).setPlugin(this);
 
     // REGISTER TEMPORARY USER FOR REPLICATION PURPOSE
     serverInstance.addTemporaryUser(REPLICATOR_USER, "" + new SecureRandom().nextLong(), "*");
@@ -342,6 +340,10 @@ public void onSignal(final Signal signal) {
           new ODistributedStartupException("Error on starting distributed plugin"), e);
     }
 
+    // TODO: Might need to separate plugin setting and plugin startup completed flag...
+    if (serverInstance.getDatabases() instanceof OrientDBDistributed)
+      ((OrientDBDistributed) serverInstance.getDatabases()).setPlugin(this);
+
     dumpServersStatus();
   }
 
