Reliably detect distributed plugin enabled.

timw · tglman · commit a93ff93ffcbb · 2025-08-04T16:14:29.000+02:00
Use server metadata to detect if distributed plugin is enabled, avoiding races between database access and distributed plugin 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
@@ -16,6 +16,8 @@
 import com.orientechnologies.orient.core.db.ODatabasePoolInternal;
 import com.orientechnologies.orient.core.db.ODatabaseRecordThreadLocal;
 import com.orientechnologies.orient.core.db.ODatabaseSession;
+import com.orientechnologies.orient.core.db.ODatabaseTask;
+import com.orientechnologies.orient.core.db.ODatabaseType;
 import com.orientechnologies.orient.core.db.OSharedContext;
 import com.orientechnologies.orient.core.db.OSharedContextEmbedded;
 import com.orientechnologies.orient.core.db.OSystemDatabase;
@@ -108,10 +110,12 @@ public synchronized ODistributedPlugin getPlugin() {
     return plugin;
   }
 
+  private boolean isDistributedPluginEnabled() {
+    return server.isDistributedPluginEnabled();
+  }
+
   protected OSharedContext createSharedContext(OAbstractPaginatedStorage storage) {
-    if (OSystemDatabase.SYSTEM_DB_NAME.equals(storage.getName())
-        || plugin == null
-        || !plugin.isEnabled()) {
+    if (!isDistributedPluginEnabled() || OSystemDatabase.SYSTEM_DB_NAME.equals(storage.getName())) {
       return new OSharedContextEmbedded(storage, this);
     }
     return new OSharedContextDistributed(storage, this);
@@ -120,9 +124,7 @@ protected OSharedContext createSharedContext(OAbstractPaginatedStorage storage)
   protected ODatabaseDocumentEmbedded newSessionInstance(
       OAbstractPaginatedStorage storage, OrientDBConfig config, OSharedContext sharedContext) {
     ODatabaseDocumentEmbedded embedded;
-    if (OSystemDatabase.SYSTEM_DB_NAME.equals(storage.getName())
-        || plugin == null
-        || !plugin.isEnabled()) {
+    if (!isDistributedPluginEnabled() || OSystemDatabase.SYSTEM_DB_NAME.equals(storage.getName())) {
       embedded = new ODatabaseDocumentEmbedded(storage);
       embedded.init(config, sharedContext);
     } else {
@@ -137,9 +139,7 @@ protected ODatabaseDocumentEmbedded newSessionInstance(
   protected ODatabaseDocumentEmbedded newCreateSessionInstance(
       OAbstractPaginatedStorage storage, OrientDBConfig config, OSharedContext sharedContext) {
     ODatabaseDocumentEmbedded embedded;
-    if (OSystemDatabase.SYSTEM_DB_NAME.equals(storage.getName())
-        || plugin == null
-        || !plugin.isEnabled()) {
+    if (!isDistributedPluginEnabled() || OSystemDatabase.SYSTEM_DB_NAME.equals(storage.getName())) {
       embedded = new ODatabaseDocumentEmbedded(storage);
       embedded.internalCreate(config, getOrCreateSharedContext(storage));
     } else {
@@ -153,9 +153,7 @@ protected ODatabaseDocumentEmbedded newCreateSessionInstance(
   protected ODatabaseDocumentEmbedded newPooledSessionInstance(
       ODatabasePoolInternal pool, OAbstractPaginatedStorage storage, OSharedContext sharedContext) {
     ODatabaseDocumentEmbedded embedded;
-    if (OSystemDatabase.SYSTEM_DB_NAME.equals(storage.getName())
-        || plugin == null
-        || !plugin.isEnabled()) {
+    if (!isDistributedPluginEnabled() || OSystemDatabase.SYSTEM_DB_NAME.equals(storage.getName())) {
       embedded = new ODatabaseDocumentEmbeddedPooled(pool, storage);
       embedded.init(pool.getConfig(), getOrCreateSharedContext(storage));
     } else {
