[Neo-report] r1768 gregory - /trunk/tools/matrix

[nobody at svn.erp5.org]

Author: gregory
Date: Tue Feb 16 11:26:16 2010
New Revision: 1768

Log:
Handle import errors at lower level.

This ensure the cluster is stop and will not alter next rounds.
Use -1 to indicate a failure instead of 0.

Modified:
    trunk/tools/matrix

Modified: trunk/tools/matrix
==============================================================================
--- trunk/tools/matrix [iso-8859-1] (original)
+++ trunk/tools/matrix [iso-8859-1] Tue Feb 16 11:26:16 2010
@@ -30,10 +30,14 @@
     # Storage.store = store
     neo.start()
     start = time()
-    neo_storage.copyTransactionsFrom(dfs_storage)
-    diff = time() - start
-    neo.stop()
-    return diff
+    try:
+        try:
+            neo_storage.copyTransactionsFrom(dfs_storage)
+            return time() - start
+        except:
+            return -1
+    finally:
+        neo.stop()
 
 def runMatrix(datafs, storages, replicas, verbose):
     stats = {}
@@ -41,12 +45,8 @@
     for s in storages:
         for r in [r for r in replicas if r < s]:
             stats.setdefault(s, {})
-            try:
-                speed = size / run(1, s, r, 100, datafs, verbose)
-                stats[s][r] = speed / 1024
-            except:
-                raise
-                stats[s][r] = 0
+            speed = size / run(1, s, r, 100, datafs, verbose)
+            stats[s][r] = speed / 1024
     return stats
 
 def buildArray(storages, replicas, results):