[Erp5-report] r45962 arnaud.fontaine - /slapos/trunk/util/slapos.tool.nosqltester_manager/s...

[nobody at svn.erp5.org]

Author: arnaud.fontaine
Date: Mon Jul  4 15:12:31 2011
New Revision: 45962

URL: http://svn.erp5.org?rev=45962&view=rev
Log:
Fix node_count incorrectly initialized

Modified:
    slapos/trunk/util/slapos.tool.nosqltester_manager/src/slapos/tool/nosqltester_manager/__init__.py

Modified: slapos/trunk/util/slapos.tool.nosqltester_manager/src/slapos/tool/nosqltester_manager/__init__.py
URL: http://svn.erp5.org/slapos/trunk/util/slapos.tool.nosqltester_manager/src/slapos/tool/nosqltester_manager/__init__.py?rev=45962&r1=45961&r2=45962&view=diff
==============================================================================
--- slapos/trunk/util/slapos.tool.nosqltester_manager/src/slapos/tool/nosqltester_manager/__init__.py [utf8] (original)
+++ slapos/trunk/util/slapos.tool.nosqltester_manager/src/slapos/tool/nosqltester_manager/__init__.py [utf8] Mon Jul  4 15:12:31 2011
@@ -90,7 +90,7 @@ class NoSQLTesterManager(object):
     self.slap = slap.slap()
     self.slap.initializeConnection(self.server_url, self.key_file, self.cert_file)
     self.computer_partition = self.slap.registerComputerPartition(self.computer_id, self.computer_partition_id)
-    self.node_count = 0
+    self.node_count = self.nb_init_tester
     self.manager_computer_partition = None
     self.write_pipe = -1
     self.software_release_type = params['plugin_name']
@@ -319,17 +319,19 @@ class NoSQLTesterManager(object):
             
             if not ('partial' in request.form and request.form['partial'] == unicode(True)):
               self.todo -= 1
-            
+
             if self.todo == 0:
               self.writeCSV(self.reports, os.path.join(self.log_directory, 'report'+str(self.node_count)+'.csv'))
               self.reports = []
 
               if self.node_count < getattr(self, "max_%s" % self.node_type):
+                self.logger.debug("Adding %d nodes" % self.node_increment)
                 self.add_node()
                 self.todo = self.tester_urls.__len__()
                 os.write(self.write_pipe, "GO")
                 self.node_count += self.node_increment
               else:
+                self.logger.debug("Stopping")
                 os.write(self.write_pipe, "END")
                 os.close(self.write_pipe)
                 self.write_pipe = -1