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

[nobody at svn.erp5.org]

Author: arnaud.fontaine
Date: Mon Jun 27 11:19:50 2011
New Revision: 45946

URL: http://svn.erp5.org?rev=45946&view=rev
Log:
Fix execution with a range of nodes

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=45946&r1=45945&r2=45946&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 Jun 27 11:19:50 2011
@@ -75,6 +75,9 @@ class NoSQLTesterManager(object):
     self.max_tester = int(params['nb_tester_max'])
     self.node_increment = int(params['node_increment'])
 
+    self.current_max_tester = self.nb_init_tester
+    self.current_max_server = self.nb_init_server
+
     self.software_release_url = params['software_release_url']
     self.server_url = params['server_url']
     self.key_file = params['key_file']
@@ -85,7 +88,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 = 1
+    self.node_count = 0
     self.manager_computer_partition = None
     self.write_pipe = -1
     self.software_release_type = params['plugin_name']
@@ -330,15 +333,19 @@ class NoSQLTesterManager(object):
               self.writeCSV(self.reports, os.path.join(self.log_directory, 'report'+str(self.node_count)+'.csv'))
               self.reports = []
               self.node_count += 1
-              
-              if self.node_count <= getattr(self, "max_%s" % self.node_type):
-                self.add_node()
-                self.todo = self.tester_urls.__len__()
-                os.write(self.write_pipe, "GO")
-              else:
-                os.write(self.write_pipe, "END")
-                os.close(self.write_pipe)
-                self.write_pipe = -1
+
+              if self.node_count >= getattr(self, "current_max_%s" % self.node_type):
+                if getattr(self, "current_max_%s" % self.node_type) < getattr(self, "max_%s" % self.node_type):
+                  self.add_node()
+                  self.todo = self.tester_urls.__len__()
+                  os.write(self.write_pipe, "GO")
+                  self.node_count = 0
+                  setattr(self, 'current_max_%s' % self.node_type,
+                          getattr(self, 'current_max_%s' % self.node_type) + self.node_increment)
+                else:
+                  os.write(self.write_pipe, "END")
+                  os.close(self.write_pipe)
+                  self.write_pipe = -1
           else:
             self.logger.debug("No data: url='%s', filename='%s', "
                               "compress_method='%s'" % (request.form['url'],
@@ -440,7 +447,7 @@ def main(argv=None):
                                     ["address=", "debug", "port=", "report-path=", \
                                      "nb-server-max=", "nb-tester-max=", "node-increment=", \
                                      "nb-server-init=", "nb-tester-init="])
-  except getopt.GetoptError:
+  except getopt.GetoptError, e:
     print >>sys.stderr, "ERROR: Error while parsing arguments: %s" % str(e)
     usage()
     sys.exit(1)