Changeset 3270

Timestamp:

01/12/09 08:49:34 (6 months ago)

Author:

jmoore

Message:

OmeroClustering : Cleaning sessions in jdbc ring and protecting NPEs

(cherry picked from commit bcafc11e48d911ccb405680477e40d66332241d8)

Location:

trunk/components/blitz

Files:

• src/ome/services/blitz/fire/Ring.java (modified) (4 diffs)
• src/ome/services/blitz/util/BlitzConfiguration.java (modified) (1 diff)
• test/ome/services/blitz/test/ClusteredRingTest.java (modified) (2 diffs)
• test/ome/services/blitz/test/mock/MockFixture.java (modified) (3 diffs)
• test/omero/test.xml (modified) (1 diff)

trunk/components/blitz/src/ome/services/blitz/fire/Ring.java

@@ -11 +11 @@
 import java.sql.SQLException;
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
+import java.util.Map;
 import java.util.Set;
 import java.util.UUID;
@@ -213 +215 @@
             }
             remove(MANAGERS + uuid);
-            int count = jdbc.update("delete from session_ring where value = ?", uuid);
-            log.info("Removed "+count+" entries for "+uuid);
+            int count = jdbc.update("delete from session_ring where value = ?",
+                    uuid);
+            log.info("Removed " + count + " entries for " + uuid);
             log.info("Disconnected from OMERO.cluster");
         } catch (Exception e) {
@@ -359 +362 @@
             }
         }
+        // Now removing any stale sessions
+        StringBuilder sb = new StringBuilder();
+        sb.append("delete from session_ring ");
+        sb.append("where key like 'session-%' ");
+        sb.append("and (");
+        sb.append(" value != ");
+        sb.append(" '");
+        sb.append(uuid); // Self
+        sb.append("' ");
+        for (String nodeUuid : nodeUuids) {
+            sb.append(" and ");
+            sb.append("value != '");
+            sb.append(nodeUuid);
+            sb.append("' ");
+        }
+        sb.append(")");
+        int count = jdbc.update(sb.toString());
+        if (count != 0) {
+            log.info("Removed " + count + " stale sessions");
+        }
     }
 
     protected void purgeNode(String manager) {
         log.info("Purging node: " + manager);
-        int count = jdbc.update("delete from session_ring where key like '"
-                + SESSIONS + "' and value = ?", manager);
-        log.info("Removed " + count + " sessions with value " + manager);
+        int count = jdbc.update("delete from session_ring where value = ?",
+                manager);
+        log.info("Removed " + count + " entries with value " + manager);
         count = jdbc.update("delete from session_ring where key = ?", MANAGERS
                 + manager);
         log.info("Removed " + MANAGERS + manager);
-        count = jdbc.update(
-                "delete from session_ring where key = ? and value = ?", CONFIG
-                        + "redirect", manager);
-        if (count != 0) {
-            log.info("Removed redirect to " + manager);
-        }
-        putRedirect(uuid);
+        putIfAbsent(CONFIG + "redirect", uuid);
     }
 
@@ -384 +401 @@
         if (arg0 instanceof CreateSessionMessage) {
             String session = ((CreateSessionMessage) arg0).getSessionId();
+            log.info("Adding session " + session + " to manager " + uuid);
             put(SESSIONS + session, uuid); // Use our uuid rather than proxy
         } else if (arg0 instanceof DestroySessionMessage) {
             String session = ((DestroySessionMessage) arg0).getSessionId();
             remove(SESSIONS + session);
+            log.info("Removing session " + session + " from manager " + uuid);
         } else if (arg0 instanceof ContextClosedEvent) {
             // This happens 3 times for each nested context. Perhaps we

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

@@ -120 +120 @@
 
         } catch (RuntimeException e) {
-            destroy();
+            try {
+                destroy();
+            } catch (Exception e2) {
+                logger.error("Error destroying configuration after "
+                        + "initialization exception. "
+                        + "Throwing initialization exception", e2);
+            }
             throw e;
         }

trunk/components/blitz/test/ome/services/blitz/test/ClusteredRingTest.java

@@ -12 +12 @@
 import ome.services.blitz.fire.Ring;
 import ome.services.blitz.test.mock.MockFixture;
+import ome.services.messages.CreateSessionMessage;
 import ome.system.OmeroContext;
 
@@ -123 +124 @@
 
     @Test
+    public void testAddedSessionGetsUuidOfManager() throws Exception {
+        fixture1.ctx.publishEvent(new CreateSessionMessage(this, "test-for-uuid"));
+        assertTrue(fixture1.blitz.getRing().checkPassword("test-for-uuid"));
+        String value = fixture1.jdbc.queryForObject("select value from session_ring where key = ?", String.class, "session-test-for-uuid");
+        assertEquals(fixture1.blitz.getRing().uuid, value);
+    }
+    
+    @Test
     public void testHandlesMissingServers() throws Exception {
         fail();

trunk/components/blitz/test/ome/services/blitz/test/mock/MockFixture.java

@@ -39 +39 @@
 
     public final BlitzConfiguration blitz;
-    public final OmeroContext ctx;
+    public final SimpleJdbcTemplate jdbc;
     public final SessionManagerI sm;
-    public final Executor ex;
     public final SessionManager mgr;
     public final SecuritySystem ss;
-    public final SimpleJdbcTemplate jdbc;
+    public final OmeroContext ctx;
+    public final Executor ex;
+    public final Ring ring;
 
     public static OmeroContext basicContext() {
@@ -71 +72 @@
         this.test = test;
         this.ctx = ctx;
+        this.ring = (Ring) ctx.getBean("ring");
         this.ex = (Executor) ctx.getBean("executor");
         this.ss = (SecuritySystem) ctx.getBean("securitySystem");
@@ -101 +103 @@
         id.properties.setProperty("ClusterProxy","Cluster:udp -h 224.0.0.5 -p 10000");
         
-        
-        Ring ring = new Ring(jdbc);
-        ring.setApplicationEventPublisher(ctx);
-        
         blitz = new BlitzConfiguration(id, ring, mgr, ss, ex);
         this.sm = (SessionManagerI) blitz.getBlitzManager();

trunk/components/blitz/test/omero/test.xml

@@ -110 +110 @@
   </bean>
 
+  <!-- Defined here since it is an application listener. -->
+  <bean id="ring" class="ome.services.blitz.fire.Ring">
+    <constructor-arg ref="simpleJdbcTemplate"/>
+  </bean>
 </beans>