[Neo-report] r2602 gregory - /trunk/neo/client/pool.py

[nobody at svn.erp5.org]

Author: gregory
Date: Mon Jan 10 18:01:52 2011
New Revision: 2602

Log:
Ignore non-running storage nodes

Modified:
    trunk/neo/client/pool.py

Modified: trunk/neo/client/pool.py
==============================================================================
--- trunk/neo/client/pool.py [iso-8859-1] (original)
+++ trunk/neo/client/pool.py [iso-8859-1] Mon Jan 10 18:01:52 2011
@@ -151,6 +151,7 @@ class ConnectionPool(object):
         getConnForNode = self.getConnForNode
         while cell_list:
             new_cell_list = []
+            cell_list = [c for c in cell_list if c.getNode().isRunning()]
             shuffle(cell_list)
             cell_list.sort(key=self.getCellSortKey)
             for cell in cell_list:
@@ -158,7 +159,7 @@ class ConnectionPool(object):
                 conn = getConnForNode(node)
                 if conn is not None:
                     yield (node, conn)
-                else:
+                elif node.isRunning():
                     new_cell_list.append(cell)
             cell_list = new_cell_list
             if new_cell_list: