Changeset 3266 for trunk/components/blitz/src/ome/services/blitz/util/BlitzConfiguration.java

Timestamp:

01/12/09 08:49:32 (20 months ago)

Author:

jmoore

Message:

OmeroClustering : Moving away from jgroups to straight multicast/jdbc approach

The ReplicatedHashMap implementation used from the org.jgroups.blocks
package had issues with our usage of the map. Since we are already
guaranteed a share storage (the db) for all blitz instances within
a single cluster, we are now using Ice's multicast support (from 3.3)
as well as simpleJdbcTemplate to manage the same information that was
previously in jgroups.
(cherry-pick from commit e50eed4204c2a1d360c2b261b5e6a7618573ba65)

Files:

• trunk/components/blitz/src/ome/services/blitz/util/BlitzConfiguration.java (modified) (4 diffs)

trunk/components/blitz/src/ome/services/blitz/util/BlitzConfiguration.java

@@ -70 +70 @@
      * should be careful to check for nulls.
      */
-    public BlitzConfiguration(
+    public BlitzConfiguration(Ring ring,
             ome.services.sessions.SessionManager sessionManager,
             SecuritySystem securitySystem, Executor executor)
             throws RuntimeException {
-        this(createId(), sessionManager, securitySystem, executor);
+        this(createId(), ring, sessionManager, securitySystem, executor);
     }
 
@@ -89 +89 @@
      * @throws RuntimeException
      */
-    public BlitzConfiguration(Ice.InitializationData id,
+    public BlitzConfiguration(Ice.InitializationData id, Ring ring,
             ome.services.sessions.SessionManager sessionManager,
             SecuritySystem securitySystem, Executor executor)
@@ -97 +97 @@
 
         this.id = id;
-        this.blitzRing = new Ring();
+        this.blitzRing = ring;
         this.communicator = createCommunicator();
 
@@ -112 +112 @@
             managerDirectProxy = blitzAdapter.createDirectProxy(managerId());
 
-            // Must inject configuration before starting the adapter
-            blitzRing.init(communicator, communicator
+            blitzAdapter.activate();
+
+            // When using adapter methods from within the ring, it is necessary
+            // to start the adapter first.
+            blitzRing.init(blitzAdapter, communicator
                     .proxyToString(getDirectProxy()));
-            blitzAdapter.activate();
+
         } catch (RuntimeException e) {
             destroy();