Wait for distributed plugin startup.

timw · tglman · commit 857e19ec2914 · 2025-08-04T16:26:45.000+02:00
Guard all usages of plugin/distributed state with a wait for distributed plugin to complete startup.
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
@@ -155,6 +155,7 @@ protected ODatabaseDocumentEmbedded newSessionInstance(
       embedded = new ODatabaseDocumentEmbedded(storage);
       embedded.init(config, sharedContext);
     } else {
+      waitForPluginStartup();
       embedded = new ODatabaseDocumentDistributed(storage, plugin, sharedContext);
       embedded.init(config, sharedContext);
       registerNewDatabaseIfNeeded(embedded, sharedContext);
@@ -170,6 +171,7 @@ protected ODatabaseDocumentEmbedded newCreateSessionInstance(
       embedded = new ODatabaseDocumentEmbedded(storage);
       embedded.internalCreate(config, getOrCreateSharedContext(storage));
     } else {
+      waitForPluginStartup();
       embedded = new ODatabaseDocumentDistributed(storage, plugin, sharedContext);
       embedded.internalCreate(config, getOrCreateSharedContext(storage));
       registerNewDatabaseIfNeeded(embedded, sharedContext);
@@ -184,6 +186,7 @@ protected ODatabaseDocumentEmbedded newPooledSessionInstance(
       embedded = new ODatabaseDocumentEmbeddedPooled(pool, storage);
       embedded.init(pool.getConfig(), getOrCreateSharedContext(storage));
     } else {
+      waitForPluginStartup();
       embedded = new ODatabaseDocumentDistributedPooled(pool, storage, plugin, sharedContext);
       embedded.init(pool.getConfig(), getOrCreateSharedContext(storage));
       registerNewDatabaseIfNeeded(embedded, sharedContext);
@@ -268,8 +271,21 @@ public ODatabaseDocumentInternal poolOpen(
     return session;
   }
 
+  @Override
+  public void create(
+      String name,
+      String user,
+      String password,
+      ODatabaseType type,
+      OrientDBConfig config,
+      ODatabaseTask<Void> createOps) {
+    waitForPluginStartup();
+    super.create(name, user, password, type, config, createOps);
+  }
+
   @Override
   public void internalDrop(String name) {
+    waitForPluginStartup();
     synchronized (this) {
       checkOpen();
       // This is a temporary fix for distributed drop that avoid scheduled view update to re-open
@@ -314,7 +330,8 @@ public void internalDrop(String name) {
 
   @Override
   public void drop(String name, String user, String password) {
-    if (getPlugin() != null && getPlugin().isEnabled()) {
+    if (isDistributedPluginEnabled()) {
+      waitForPluginStartup();
       plugin.executeInDistributedDatabaseLock(
           name,
           20000,
@@ -434,6 +451,7 @@ public ODistributedServerManager getDistributedManager() {
 
   @Override
   public boolean deltaSync(String dbName, InputStream backupStream, OrientDBConfig config) {
+    waitForPluginStartup();
     if (new ONewDeltaSyncImporter()
         .importDelta(server, dbName, backupStream, plugin.getLocalNodeName())) {
       getDatabase(dbName).setOnline();
@@ -444,6 +462,7 @@ public boolean deltaSync(String dbName, InputStream backupStream, OrientDBConfig
   }
 
   private void offlineOnShutdown() {
+    waitForPluginStartup();
     // SET ALL DATABASES TO NOT_AVAILABLE
     for (Entry<String, ODistributedDatabaseImpl> m : databases.entrySet()) {
       if (OSystemDatabase.SYSTEM_DB_NAME.equals(m.getKey())) continue;
@@ -464,12 +483,14 @@ public ODistributedDatabaseImpl getDatabase(final String iDatabaseName) {
 
   private ODistributedDatabaseImpl newDistributedDatabase(
       String key, ODatabaseDocumentInternal session) {
+    waitForPluginStartup();
     ODistributedDatabaseImpl db = new ODistributedDatabaseImpl(this, plugin, key);
     db.initFirstOpen(session);
     return db;
   }
 
   public ODistributedDatabaseImpl unregisterDatabase(final String iDatabaseName) {
+    waitForPluginStartup();
     try {
       plugin.setDatabaseStatus(plugin.getLocalNodeName(), iDatabaseName, DB_STATUS.OFFLINE);
     } catch (Exception t) {
@@ -529,6 +550,7 @@ public ODistributedConfiguration getOrInitDistributedConfiguration(ODatabaseSess
   }
 
   public ODistributedConfigurationManager getOrInitConfigurationManager(String database) {
+    waitForPluginStartup();
     return configurations.computeIfAbsent(
         database,
         (key) -> {
