Split client handlers into 3 parts:

- generic base handler
- client connection handlers
- master connection handlers


git-svn-id: https://svn.erp5.org/repos/neo/branches/prototype3@765 71dcc9de-d417-0410-9af5-da40c76e7ee4

neo/client/app.py

@@ -30,9 +30,10 @@ from neo import protocol
 from neo.protocol import Packet, INVALID_UUID, INVALID_TID, INVALID_PARTITION, \
         INVALID_PTID, CLIENT_NODE_TYPE, UP_TO_DATE_STATE, INVALID_SERIAL, \
         DOWN_STATE, HIDDEN_STATE
-from neo.client.handlers.handler import PrimaryBootstrapHandler, \
-        PrimaryNotificationsHandler, PrimaryAnswersHandler, \
-        StorageBootstrapHandler, StorageAnswersHandler
+from neo.client.handlers.master import PrimaryBootstrapHandler, \
+        PrimaryNotificationsHandler, PrimaryAnswersHandler
+from neo.client.handlers.storage import StorageBootstrapHandler, \
+        StorageAnswersHandler
 from neo.client.exception import NEOStorageError, NEOStorageConflictError, \
      NEOStorageNotFoundError, NEOStorageConnectionFailure
 from neo.exception import NeoException

neo/client/handlers/storage.py

+#
+# Copyright (C) 2006-2009  Nexedi SA
+# 
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+# 
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+
+import logging
+
+from neo.client.handlers.handler import BaseHandler
+from neo.protocol import STORAGE_NODE_TYPE
+from ZODB.TimeStamp import TimeStamp
+
+class StorageBaseHandler(BaseHandler):
+
+    def _dealWithStorageFailure(self, conn, node):
+        app = self.app
+
+        # Remove from pool connection
+        app.cp.removeConnection(node)
+
+        # Put fake packets to task queues.
+        queue_set = set()
+        for key in self.dispatcher.message_table.keys():
+            if id(conn) == key[0]:
+                queue = self.dispatcher.message_table.pop(key)
+                queue_set.add(queue)
+        # Storage failure is notified to the primary master when the fake 
+        # packet if popped by a non-polling thread.
+        for queue in queue_set:
+            queue.put((conn, None))
+
+
+    def connectionClosed(self, conn):
+        node = self.app.nm.getNodeByServer(conn.getAddress())
+        logging.info("connection to storage node %s closed", node.getServer())
+        self._dealWithStorageFailure(conn, node)
+        super(StorageBaseHandler, self).connectionClosed(conn)
+
+    def timeoutExpired(self, conn):
+        node = self.app.nm.getNodeByServer(conn.getAddress())
+        self._dealWithStorageFailure(conn, node)
+        super(StorageBaseHandler, self).timeoutExpired(conn)
+
+    def peerBroken(self, conn):
+        node = self.app.nm.getNodeByServer(conn.getAddress())
+        self._dealWithStorageFailure(conn, node)
+        super(StorageBaseHandler, self).peerBroken(conn)
+
+class StorageBootstrapHandler(StorageBaseHandler):
+    """ Handler used when connecting to a storage node """
+
+    def connectionFailed(self, conn):
+        # Connection to a storage node failed
+        node = self.app.nm.getNodeByServer(conn.getAddress())
+        self._dealWithStorageFailure(conn, node)
+        super(StorageBootstrapHandler, self).connectionFailed(conn)
+
+    def handleNotReady(self, conn, packet, message):
+        app = self.app
+        app.setNodeNotReady()
+        
+    def handleAcceptNodeIdentification(self, conn, packet, node_type,
+           uuid, ip_address, port, num_partitions, num_replicas, your_uuid):
+        app = self.app
+        node = app.nm.getNodeByServer(conn.getAddress())
+        # It can be eiter a master node or a storage node
+        if node_type != STORAGE_NODE_TYPE:
+            conn.close()
+            return
+        if conn.getAddress() != (ip_address, port):
+            # The server address is different! Then why was
+            # the connection successful?
+            logging.error('%s:%d is waiting for %s:%d',
+                  conn.getAddress()[0], conn.getAddress()[1], ip_address, port)
+            app.nm.remove(node)
+            conn.close()
+            return
+
+        conn.setUUID(uuid)
+        node.setUUID(uuid)
+
+class StorageAnswersHandler(StorageBaseHandler):
+    """ Handle all messages related to ZODB operations """
+        
+    def handleAnswerObject(self, conn, packet, oid, start_serial, end_serial, 
+            compression, checksum, data):
+        app = self.app
+        app.local_var.asked_object = (oid, start_serial, end_serial, compression,
+                                      checksum, data)
+
+    def handleAnswerStoreObject(self, conn, packet, conflicting, oid, serial):
+        app = self.app
+        if conflicting:
+            app.local_var.object_stored = -1, serial
+        else:
+            app.local_var.object_stored = oid, serial
+
+    def handleAnswerStoreTransaction(self, conn, packet, tid):
+        app = self.app
+        app.setTransactionVoted()
+
+    def handleAnswerTransactionInformation(self, conn, packet, tid,
+                                           user, desc, ext, oid_list):
+        app = self.app
+        # transaction information are returned as a dict
+        info = {}
+        info['time'] = TimeStamp(tid).timeTime()
+        info['user_name'] = user
+        info['description'] = desc
+        info['id'] = tid
+        info['oids'] = oid_list
+        app.local_var.txn_info = info
+
+    def handleAnswerObjectHistory(self, conn, packet, oid, history_list):
+        app = self.app
+        # history_list is a list of tuple (serial, size)
+        app.local_var.history = oid, history_list
+
+    def handleOidNotFound(self, conn, packet, message):
+        app = self.app
+        # This can happen either when :
+        # - loading an object
+        # - asking for history
+        app.local_var.asked_object = -1
+        app.local_var.history = -1
+
+    def handleTidNotFound(self, conn, packet, message):
+        app = self.app
+        # This can happen when requiring txn informations
+        app.local_var.txn_info = -1
+
+    def handleAnswerTIDs(self, conn, packet, tid_list):
+        app = self.app
+        app.local_var.node_tids[conn.getUUID()] = tid_list
+

neo/client/tests/testClientHandler.py

@@ -28,9 +28,11 @@ from neo.protocol import ERROR, \
      RUNNING_STATE, BROKEN_STATE, TEMPORARILY_DOWN_STATE, DOWN_STATE, \
      UP_TO_DATE_STATE, OUT_OF_DATE_STATE, FEEDING_STATE, DISCARDED_STATE
 from neo.exception import ElectionFailure
-from neo.client.handlers.handler import BaseHandler, PrimaryBootstrapHandler, \
-        PrimaryNotificationsHandler, PrimaryAnswersHandler, \
-        StorageBootstrapHandler, StorageAnswersHandler
+from neo.client.handlers.handler import BaseHandler
+from neo.client.handlers.master import PrimaryBootstrapHandler, \
+        PrimaryNotificationsHandler, PrimaryAnswersHandler
+from neo.client.handlers.storage import StorageBootstrapHandler, \
+        StorageAnswersHandler
 from neo.node import StorageNode
 from neo.util import dump