Detect distributed setup early in activate process.

timw · tglman · commit 2ca94ebcafab · 2025-08-04T16:14:10.000+02:00
Split loading of enabled server plugins and starting of plugins to allow presence of a distributed server manager to be detected prior to network listeners being established and storage open.
This allows guarding of constructs that require the distributed plugin to be present (and potentially running), which currently experience a race condition between the network listeners starting and the distributed plugin fully starting.
diff --git a/server/src/main/java/com/orientechnologies/orient/server/OServer.java b/server/src/main/java/com/orientechnologies/orient/server/OServer.java
@@ -89,6 +89,9 @@ public class OServer {
       new ArrayList<OServerLifecycleListener>();
   protected OServerPluginManager pluginManager;
   protected OConfigurableHooksManager hookManager;
+  /** Whether a distributed plugin is registered in the configuration */
+  private volatile boolean distributedPluginEnabled;
+
   protected ODistributedServerManager distributedManager;
   private final Map<String, Object> variables = new HashMap<String, Object>();
   private String serverRootDirectory;
@@ -431,6 +434,15 @@ public OServer activate()
 
       for (OServerLifecycleListener l : lifecycleListeners) l.onBeforeActivate();
 
+      // Load server plugin config and determine if participants in activation
+      // need to be aware if distributed plugin will be part of server
+      final List<ServerPluginConfig> serverPlugins = loadServerPlugins();
+      for (ServerPluginConfig serverPlugin : serverPlugins) {
+        if (ODistributedServerManager.class.isAssignableFrom(serverPlugin.clazz)) {
+          distributedPluginEnabled = true;
+        }
+      }
+
       final OServerConfiguration configuration = serverCfg.getConfiguration();
 
       tokenHandler =
@@ -484,7 +496,7 @@ public OServer activate()
         throw OException.wrapException(new OConfigurationException(message), e);
       }
 
-      registerPlugins();
+      registerPlugins(serverPlugins);
 
       for (OServerLifecycleListener l : lifecycleListeners) l.onAfterActivate();
 
@@ -867,6 +879,10 @@ public ODatabaseDocumentInternal openDatabase(String database) {
     return getDatabases().openNoAuthorization(database);
   }
 
+  public boolean isDistributedPluginEnabled() {
+    return distributedPluginEnabled;
+  }
+
   public ODistributedServerManager getDistributedManager() {
     return distributedManager;
   }
@@ -1082,19 +1098,25 @@ public OServerPluginManager getPluginManager() {
     return pluginManager;
   }
 
-  protected void registerPlugins()
-      throws InstantiationException, IllegalAccessException, ClassNotFoundException {
-    pluginManager = new OServerPluginManager();
-    pluginManager.config(this);
-    pluginManager.startup();
+  private static class ServerPluginConfig {
+    private final Class<?> clazz;
+    private OServerParameterConfiguration[] parameters;
+
+    private ServerPluginConfig(Class<?> clazz, OServerParameterConfiguration[] parameters) {
+      this.clazz = clazz;
+      this.parameters = parameters;
+    }
+  }
+
+  private List<ServerPluginConfig> loadServerPlugins() throws ClassNotFoundException {
+    // PLUGINS CONFIGURED IN XML and enabled
+    List<ServerPluginConfig> plugins = new ArrayList<>();
 
     // PLUGINS CONFIGURED IN XML
     final OServerConfiguration configuration = serverCfg.getConfiguration();
 
     if (configuration.handlers != null) {
       // ACTIVATE PLUGINS
-      final List<OServerPlugin> plugins = new ArrayList<OServerPlugin>();
-
       for (OServerHandlerConfiguration h : configuration.handlers) {
         if (h.parameters != null) {
           // CHECK IF IT'S ENABLED
@@ -1120,28 +1142,41 @@ protected void registerPlugins()
             // SKIP IT
             continue;
         }
+        final Class<?> pluginClass = loadClass(h.clazz);
+        plugins.add(new ServerPluginConfig(pluginClass, h.parameters));
+      }
+    }
+    return plugins;
+  }
 
-        final OServerPlugin plugin = (OServerPlugin) loadClass(h.clazz).newInstance();
+  private void registerPlugins(List<ServerPluginConfig> serverPlugins)
+      throws InstantiationException, IllegalAccessException, ClassNotFoundException {
+    pluginManager = new OServerPluginManager();
+    pluginManager.config(this);
+    pluginManager.startup();
 
-        if (plugin instanceof ODistributedServerManager)
-          distributedManager = (ODistributedServerManager) plugin;
+    final List<OServerPlugin> plugins = new ArrayList<>();
+    for (ServerPluginConfig serverPlugin : serverPlugins) {
+      final OServerPlugin plugin = (OServerPlugin) serverPlugin.clazz.newInstance();
 
-        pluginManager.registerPlugin(
-            new OServerPluginInfo(plugin.getName(), null, null, null, plugin, null, 0, null));
+      if (plugin instanceof ODistributedServerManager)
+        distributedManager = (ODistributedServerManager) plugin;
 
-        pluginManager.callListenerBeforeConfig(plugin, h.parameters);
-        plugin.config(this, h.parameters);
-        pluginManager.callListenerAfterConfig(plugin, h.parameters);
+      pluginManager.registerPlugin(
+          new OServerPluginInfo(plugin.getName(), null, null, null, plugin, null, 0, null));
 
-        plugins.add(plugin);
-      }
+      pluginManager.callListenerBeforeConfig(plugin, serverPlugin.parameters);
+      plugin.config(this, serverPlugin.parameters);
+      pluginManager.callListenerAfterConfig(plugin, serverPlugin.parameters);
 
-      // START ALL THE CONFIGURED PLUGINS
-      for (OServerPlugin plugin : plugins) {
-        pluginManager.callListenerBeforeStartup(plugin);
-        plugin.startup();
-        pluginManager.callListenerAfterStartup(plugin);
-      }
+      plugins.add(plugin);
+    }
+
+    // START ALL THE CONFIGURED PLUGINS
+    for (OServerPlugin plugin : plugins) {
+      pluginManager.callListenerBeforeStartup(plugin);
+      plugin.startup();
+      pluginManager.callListenerAfterStartup(plugin);
     }
   }
 
