Changeset 3270 for trunk/components/blitz/src/ome/services/blitz/fire/Ring.java

Timestamp:

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

Author:

jmoore

Message:

OmeroClustering : Cleaning sessions in jdbc ring and protecting NPEs

(cherry picked from commit bcafc11e48d911ccb405680477e40d66332241d8)

Files:

• trunk/components/blitz/src/ome/services/blitz/fire/Ring.java (modified) (4 diffs)

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