[Checkins] SVN: gocept.zeoraid/trunk/s - Clean up debugging code.

[Christian Theune]

Log message for revision 94673:
  - Clean up debugging code.
  - Fix recovery issue: we have to use `store` instead of `restore`,
    because for the target storage the recovered transactions are just a
    regular `replay` of what happened in the other storages. Using
    `restore` screwed up the `lastTransaction` state of client storages.
  

Changed:
  U   gocept.zeoraid/trunk/src/gocept/zeoraid/recovery.py
  A   gocept.zeoraid/trunk/src/gocept/zeoraid/scripts/stresstest.py
  U   gocept.zeoraid/trunk/src/gocept/zeoraid/storage.py
  U   gocept.zeoraid/trunk/src/gocept/zeoraid/tests/test_basics.py
  D   gocept.zeoraid/trunk/stresstest.py

-=-
Modified: gocept.zeoraid/trunk/src/gocept/zeoraid/recovery.py
===================================================================
--- gocept.zeoraid/trunk/src/gocept/zeoraid/recovery.py	2009-01-09 07:37:51 UTC (rev 94672)
+++ gocept.zeoraid/trunk/src/gocept/zeoraid/recovery.py	2009-01-09 09:41:02 UTC (rev 94673)
@@ -133,8 +133,7 @@
                             r.oid, r.tid, r.data, temp_file_name, r.version,
                             txn_info)
                         continue
-                self.target.restore(r.oid, r.tid, r.data, r.version,
-                                    r.data_txn, txn_info)
+                self.target.store(r.oid, r.tid, r.data, r.version, txn_info)
 
             self.target.tpc_vote(txn_info)
             self.target.tpc_finish(txn_info)

Copied: gocept.zeoraid/trunk/src/gocept/zeoraid/scripts/stresstest.py (from rev 94672, gocept.zeoraid/trunk/stresstest.py)
===================================================================
--- gocept.zeoraid/trunk/src/gocept/zeoraid/scripts/stresstest.py	                        (rev 0)
+++ gocept.zeoraid/trunk/src/gocept/zeoraid/scripts/stresstest.py	2009-01-09 09:41:02 UTC (rev 94673)
@@ -0,0 +1,30 @@
+import time
+import transaction
+from ZEO.ClientStorage import ClientStorage
+from ZODB import DB
+import ZODB.POSException
+import ZEO.zrpc.error
+import ZEO.Exceptions
+import ZODB.utils
+
+
+storage = ClientStorage([('127.0.0.1', 8100)],#, ('127.0.0.1', 8201)],
+                        storage='1')
+db = DB(storage)
+conn = db.open()
+root = conn.root()
+
+root['x'] = 0
+
+while True:
+    root['x'] += 1
+    try:
+        transaction.commit()
+    except (ZODB.POSException.ConflictError,
+            ZEO.zrpc.error.DisconnectedError,
+            ZEO.Exceptions.ClientDisconnected):
+        transaction.abort()
+        continue
+    print root['x']
+    print ZODB.utils.oid_repr(storage.lastTransaction())
+    time.sleep(1)


Property changes on: gocept.zeoraid/trunk/src/gocept/zeoraid/scripts/stresstest.py
___________________________________________________________________
Added: svn:keywords
   + Id Rev Date
Added: svn:mergeinfo
   + 
Added: svn:eol-style
   + native

Modified: gocept.zeoraid/trunk/src/gocept/zeoraid/storage.py
===================================================================
--- gocept.zeoraid/trunk/src/gocept/zeoraid/storage.py	2009-01-09 07:37:51 UTC (rev 94672)
+++ gocept.zeoraid/trunk/src/gocept/zeoraid/storage.py	2009-01-09 09:41:02 UTC (rev 94673)
@@ -157,7 +157,6 @@
                 continue
             tids.setdefault(tid, [])
             tids[tid].append(name)
-        print tids
 
         if not tids:
             # No storage is working.
@@ -764,7 +763,6 @@
                     consistent = False
                     break
         if not consistent:
-            import pdb; pdb.set_trace() 
             self.close()
             raise gocept.zeoraid.interfaces.RAIDError(
                 "RAID is inconsistent and was closed.")

Modified: gocept.zeoraid/trunk/src/gocept/zeoraid/tests/test_basics.py
===================================================================
--- gocept.zeoraid/trunk/src/gocept/zeoraid/tests/test_basics.py	2009-01-09 07:37:51 UTC (rev 94672)
+++ gocept.zeoraid/trunk/src/gocept/zeoraid/tests/test_basics.py	2009-01-09 09:41:02 UTC (rev 94673)
@@ -49,9 +49,9 @@
 import ZODB.config
 
 # Uncomment this to get helpful logging from the ZEO servers on the console
-import logging
-logging.getLogger().addHandler(logging.StreamHandler())
-logging.getLogger().setLevel(0)
+#import logging
+#logging.getLogger().addHandler(logging.StreamHandler())
+#logging.getLogger().setLevel(0)
 
 
 def fail(obj, name):
@@ -235,7 +235,6 @@
 class FailingStorageTestBase(object):
 
     def _disable_storage(self, index):
-        print self._storage.storages_optimal[index]
         self._storage.raid_disable(self._storage.storages_optimal[index])
 
     def test_apply_storage_disconnect(self):

Deleted: gocept.zeoraid/trunk/stresstest.py
===================================================================
--- gocept.zeoraid/trunk/stresstest.py	2009-01-09 07:37:51 UTC (rev 94672)
+++ gocept.zeoraid/trunk/stresstest.py	2009-01-09 09:41:02 UTC (rev 94673)
@@ -1,30 +0,0 @@
-import time
-import transaction
-from ZEO.ClientStorage import ClientStorage
-from ZODB import DB
-import ZODB.POSException
-import ZEO.zrpc.error
-import ZEO.Exceptions
-import ZODB.utils
-
-
-storage = ClientStorage([('127.0.0.1', 8100)],#, ('127.0.0.1', 8201)],
-                        storage='1')
-db = DB(storage)
-conn = db.open()
-root = conn.root()
-
-root['x'] = 0
-
-while True:
-    root['x'] += 1
-    try:
-        transaction.commit()
-    except (ZODB.POSException.ConflictError,
-            ZEO.zrpc.error.DisconnectedError,
-            ZEO.Exceptions.ClientDisconnected):
-        transaction.abort()
-        continue
-    print root['x']
-    print ZODB.utils.oid_repr(storage.lastTransaction())
-    time.sleep(1)