[Erp5-report] r45944 guillaume.bottex - in /slapos/trunk/util: slapos.tool.nosqltester_mana...
nobody at svn.erp5.org
nobody at svn.erp5.org
Mon Jun 27 10:40:27 CEST 2011
Author: guillaume.bottex
Date: Mon Jun 27 10:40:27 2011
New Revision: 45944
URL: http://svn.erp5.org?rev=45944&view=rev
Log:
Modification to match the Kumo manual test.
Modified:
slapos/trunk/util/slapos.tool.nosqltester_manager.kumo/src/slapos/tool/nosqltester_manager/kumo/__init__.py
slapos/trunk/util/slapos.tool.nosqltester_manager/src/slapos/tool/nosqltester_manager/__init__.py
Modified: slapos/trunk/util/slapos.tool.nosqltester_manager.kumo/src/slapos/tool/nosqltester_manager/kumo/__init__.py
URL: http://svn.erp5.org/slapos/trunk/util/slapos.tool.nosqltester_manager.kumo/src/slapos/tool/nosqltester_manager/kumo/__init__.py?rev=45944&r1=45943&r2=45944&view=diff
==============================================================================
--- slapos/trunk/util/slapos.tool.nosqltester_manager.kumo/src/slapos/tool/nosqltester_manager/kumo/__init__.py [utf8] (original)
+++ slapos/trunk/util/slapos.tool.nosqltester_manager.kumo/src/slapos/tool/nosqltester_manager/kumo/__init__.py [utf8] Mon Jun 27 10:40:27 2011
@@ -27,7 +27,8 @@
#
##############################################################################
-import sys, logging, csv, re
+import sys, csv, re
+from logging import Formatter
from slapos.tool.nosqltester_manager import NoSQLTesterManager
class KumoTesterManager(NoSQLTesterManager):
@@ -51,80 +52,147 @@ class KumoTesterManager(NoSQLTesterManag
self.nb_request = argv[1]
self.max_manager = 1
- self.computer_guids = self.computer_partition.getConnectionParameter('computer_guid_list').split(':')
+ self.computer_guid_list = self.computer_partition.getConnectionParameter('computer_guid_list').split(':')
def _kumo_init(self):
try:
self.logger.debug("Kumo manager")
- manager_computer_partition = self.computer_partition.request(self.software_release_url, 'kumo_manager', 'kumo_manager',
- filter_kw={'computer_guid':self.computer_guids[0]})
- self.logger.debug("Kumo manager guid: "+self.computer_guids[0])
+ manager_partition = self.computer_partition.request(self.software_release_url, 'kumo_manager', 'kumo_manager',
+ filter_kw={'computer_guid':self.computer_guid_list[0]})
+ self.logger.debug("Kumo manager guid: "+self.computer_guid_list[0])
+
+ partition_parameter_kw = {
+ 'manager_address':manager_partition.getConnectionParameter('address'),
+ 'manager_port':manager_partition.getConnectionParameter('port')}
self.logger.debug("Kumo server 1")
- self.computer_partition.request(self.software_release_url, 'kumo_server', 'kumo_server'+str(self.node_count),
- partition_parameter_kw={'manager_address':manager_computer_partition.getConnectionParameter('address'),
- 'manager_port':manager_computer_partition.getConnectionParameter('port')},
- filter_kw={'computer_guid':self.computer_guids[self.max_manager+self.node_count-1]})
- self.logger.debug("Kumo server 1 guid: "+self.computer_guids[self.max_manager+self.node_count-1])
+ self.computer_partition.request(
+ self.software_release_url,
+ 'kumo_server',
+ 'kumo_server'+str(self.node_count),
+ partition_parameter_kw=partition_parameter_kw,
+ filter_kw={'computer_guid':self.computer_guid_list[self.max_manager+self.node_count-1]})
+ self.logger.debug("Kumo server 1 guid: "+self.computer_guid_list[self.max_manager+self.node_count-1])
+
+ partition_parameter_kw = {'manager_address':manager_partition.getConnectionParameter('address'),
+ 'manager_port':manager_partition.getConnectionParameter('port')}
+
+ self.logger.debug("Memstrike set gateway")
+ gateway_partition = self.computer_partition.request(
+ self.software_release_url,
+ 'kumo_gateway',
+ 'memstrike_gateway',
+ partition_parameter_kw=partition_parameter_kw,
+ filter_kw={'computer_guid':self.computer_guid_list[self.max_manager+self.node_count-1]})
+ self.logger.debug("Memstrike set gateway guid: "+self.computer_guid_list[self.max_manager+self.node_count-1])
+
+
+ partition_parameter_kw = {
+ 'gateway_address':gateway_partition.getConnectionParameter('address'),
+ 'gateway_port':gateway_partition.getConnectionParameter('port'),
+ 'nb_thread':self.nb_thread,
+ 'nb_request':self.nb_request}
+
+ self.logger.debug("Memstrike setter")
+ memstrike_partition = self.computer_partition.request(
+ self.software_release_url,
+ 'memstrike_set',
+ 'memstrike_set',
+ partition_parameter_kw=partition_parameter_kw,
+ filter_kw={'computer_guid':self.computer_guid_list[self.max_manager+self.node_count-1]})
+ self.logger.debug("Memstrike setter guid: "+self.computer_guid_list[self.max_manager+self.node_count-1])
+ # line made to crash the function call until we call slapgrid
+ memstrike_partition.getConnectionParameter('status')
- tester_computer_partition = []
+ tester_partition_list = []
for i in range(0, self.max_tester):
+
+ partition_parameter_kw = {'manager_address':manager_partition.getConnectionParameter('address'),
+ 'manager_port':manager_partition.getConnectionParameter('port')}
+
self.logger.debug("Kumo gateway "+str(i))
- gateway_computer_partition = self.computer_partition.request(self.software_release_url, 'kumo_gateway', 'kumo_gateway'+str(i),
- partition_parameter_kw={'manager_address':manager_computer_partition.getConnectionParameter('address'),
- 'manager_port':manager_computer_partition.getConnectionParameter('port')},
- filter_kw={'computer_guid':self.computer_guids[self.max_manager+self.max_server+i]})
- self.logger.debug("Kumo gateway "+str(i)+" guid: "+self.computer_guids[self.max_manager+self.max_server+i])
+ gateway_partition = self.computer_partition.request(
+ self.software_release_url,
+ 'kumo_gateway',
+ 'kumo_gateway'+str(i),
+ partition_parameter_kw=partition_parameter_kw,
+ filter_kw={'computer_guid':self.computer_guid_list[self.max_manager+self.max_server+i]})
+ self.logger.debug("Kumo gateway "+str(i)+" guid: "+self.computer_guid_list[self.max_manager+self.max_server+i])
+
+ partition_parameter_kw = {
+ 'gateway_address':gateway_partition.getConnectionParameter('address'),
+ 'gateway_port':gateway_partition.getConnectionParameter('port'),
+ 'host_address':self.host_address,
+ 'nb_thread':self.nb_thread,
+ 'nb_request':self.nb_request}
self.logger.debug("Kumo tester "+str(i))
- tester_computer_partition.append(self.computer_partition.request(self.software_release_url, 'kumo_tester', 'kumo_tester'+str(i),
- partition_parameter_kw={'gateway_address':gateway_computer_partition.getConnectionParameter('address'),
- 'gateway_port':gateway_computer_partition.getConnectionParameter('port'),
- 'host_address':self.host_address,
- 'nb_thread':self.nb_thread,
- 'nb_request':self.nb_request},
- filter_kw={'computer_guid':self.computer_guids[self.max_manager+self.max_server+i]}))
- for partition in tester_computer_partition:
+ partition = self.computer_partition.request(
+ self.software_release_url,
+ 'kumo_tester',
+ 'kumo_tester'+str(i),
+ partition_parameter_kw=partition_parameter_kw,
+ filter_kw={'computer_guid':self.computer_guid_list[self.max_manager+self.max_server+i]})
+
+ tester_partition_list.append(partition)
+
+ for partition in tester_partition_list:
self.logger.debug("Appending Kumo testers' url")
self.tester_urls.append(partition.getConnectionParameter('url'))
+
self.logger.debug("Before remove duplicates: %s" % str(self.tester_urls))
self.tester_urls = list(set(self.tester_urls)) # remove duplicates
self.logger.debug("After remove duplicates: %s" % str(self.tester_urls))
- self.manager_computer_partition = manager_computer_partition
+ self.manager_partition = manager_partition
+
return True
+
except:
self.logger.debug(str(sys.exc_info()))
+ self.logger.debug(Formatter().formatException(sys.exc_info()))
return False
def _add_kumo_server_node(self):
try:
+ partition_parameter_kw = {
+ 'manager_address':self.manager_partition.getConnectionParameter('address'),
+ 'manager_port':self.manager_partition.getConnectionParameter('port')}
+
self.logger.debug("Adding a Kumo server node")
- partition = self.computer_partition.request(self.software_release_url, 'kumo_server', 'kumo_server'+str(self.node_count),
- partition_parameter_kw={'manager_address':self.manager_computer_partition.getConnectionParameter('address'),
- 'manager_port':self.manager_computer_partition.getConnectionParameter('port')},
- filter_kw={'computer_guid':self.computer_guids[self.max_manager+self.node_count-1]})
- self.logger.debug("Kumo server "+str(self.node_count)+" guid: "+self.computer_guids[self.max_manager+self.node_count-1])
+ partition = self.computer_partition.request(
+ self.software_release_url,
+ 'kumo_server',
+ 'kumo_server'+str(self.node_count),
+ partition_parameter_kw=partition_parameter_kw,
+ filter_kw={'computer_guid':self.computer_guid_list[self.max_manager+self.node_count-1]})
+ self.logger.debug("Kumo server "+str(self.node_count)+" guid: "+self.computer_guid_list[self.max_manager+self.node_count-1])
+
# line made to crash the function call until we call slapgrid
partition.getConnectionParameter('address')
+
return True
+
except:
self.logger.debug(str(sys.exc_info()))
+ self.logger.debug(Formatter().formatException(sys.exc_info()))
return False
def writeCSV(self, inputnames, outputname):
output = csv.writer(open(outputname, 'wb'), delimiter=';', quotechar='|', quoting=csv.QUOTE_MINIMAL)
+
# Header
- output.writerow(['set sec', 'set MB', 'set Mbps', 'set req/sec', 'set usec/req',
- 'get sec', 'get MB', 'get Mbps', 'get req/sec', 'get usec/req',
- 'del sec', 'del MB', 'del Mbps', 'del req/sec', 'del usec/req'])
+ output.writerow(['get sec', 'get MB', 'get Mbps', 'get req/sec', 'get usec/req'])
+
for inputname in inputnames:
l = []
f = open(inputname, "r")
lines = f.readlines()
f.close()
+
for i in range(8, lines.__len__()):
if lines[i][0] != '[' and lines[i][0] != '-':
l.append(re.findall(r'\d+\.\d+|\d+',lines[i])[0].replace('.', ','))
+
output.writerow(l)
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=45944&r1=45943&r2=45944&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 10:40:27 2011
@@ -420,6 +420,7 @@ def main(argv=None):
'nb_tester_max':3,
'nb_server_init':1,
'nb_tester_init':3,
+ 'node_increment':1,
'key_file':None,
'cert_file':None,
'computer_id':None,
More information about the Erp5-report
mailing list