Commit 1418705c authored by Ivan Tyagov's avatar Ivan Tyagov

Allow scalability runner to test existing instance and with existing frontend.

parent bae290a4
Pipeline #6337 failed with stage
in 0 seconds
...@@ -187,7 +187,8 @@ class ScalabilityTestRunner(): ...@@ -187,7 +187,8 @@ class ScalabilityTestRunner():
file.write(pickle.dumps(dictionary)) file.write(pickle.dumps(dictionary))
def _createInstance(self, software_path, software_configuration, def _createInstance(self, software_path, software_configuration,
test_result, test_suite, frontend_software, frontend_instance_guid=None): test_result, test_suite, frontend_software,
frontend_instance_guid=None, purge_previous_instance = True):
""" """
Create scalability instance. If there is an old instance for this testsuite, it destroys it. Create scalability instance. If there is an old instance for this testsuite, it destroys it.
""" """
...@@ -195,7 +196,7 @@ class ScalabilityTestRunner(): ...@@ -195,7 +196,7 @@ class ScalabilityTestRunner():
slappart_directory = self.testnode.config['srv_directory'].rsplit("srv", 1)[0] slappart_directory = self.testnode.config['srv_directory'].rsplit("srv", 1)[0]
instance_dict_file = slappart_directory + "var/" + INSTANCE_DICT instance_dict_file = slappart_directory + "var/" + INSTANCE_DICT
instance_dict = self.getDictionaryFromFile(instance_dict_file) instance_dict = self.getDictionaryFromFile(instance_dict_file)
if test_suite in instance_dict: if test_suite in instance_dict and purge_previous_instance:
self.slapos_communicator.requestInstanceDestroy(instance_dict[test_suite]) self.slapos_communicator.requestInstanceDestroy(instance_dict[test_suite])
self.updateDictionaryFile(instance_dict_file, instance_dict, test_suite, self.instance_title) self.updateDictionaryFile(instance_dict_file, instance_dict, test_suite, self.instance_title)
logger.info("testnode, request : %s", self.instance_title) logger.info("testnode, request : %s", self.instance_title)
...@@ -391,11 +392,30 @@ Require valid-user ...@@ -391,11 +392,30 @@ Require valid-user
return {'status_code' : 1} return {'status_code' : 1}
configuration_list = test_configuration['configuration_list'] configuration_list = test_configuration['configuration_list']
configuration = configuration_list[0]
self.instance_name = configuration.get('instance-name')
self.frontend_address = configuration.get("frontend-address")
self.instance_software_release = configuration.get('instance-software-release')
self.use_existing_setup = self.instance_name is not None and self.frontend_address is not None
node_test_suite.edit(configuration_list=configuration_list) node_test_suite.edit(configuration_list=configuration_list)
self.launcher_nodes_computer_guid = test_configuration['launcher_nodes_computer_guid'] self.launcher_nodes_computer_guid = test_configuration['launcher_nodes_computer_guid']
if self.instance_name is not None:
# use existing already setup instance
logger.info("Overide instance name: %s" %self.instance_name)
self.instance_title = self.instance_name
else:
self.instance_title = self._generateInstanceTitle(node_test_suite.test_suite_title) self.instance_title = self._generateInstanceTitle(node_test_suite.test_suite_title)
# allow to override the software release
if self.instance_software_release is not None:
logger.info("Overide instance software release: %s" %self.instance_software_release)
self.reachable_profile = self.instance_software_release
else:
# generate a dynamic release for current revisions
self.createSoftwareReachableProfilePath(node_test_suite) self.createSoftwareReachableProfilePath(node_test_suite)
logger.info("Software reachable profile path is: %s", self.reachable_profile) logger.info("Software reachable profile path is: %s", self.reachable_profile)
# Initialize SlapOS Master Communicator # Initialize SlapOS Master Communicator
...@@ -406,6 +426,8 @@ Require valid-user ...@@ -406,6 +426,8 @@ Require valid-user
supply, supply,
self.reachable_profile, self.reachable_profile,
computer_guid=self.launcher_nodes_computer_guid[0]) computer_guid=self.launcher_nodes_computer_guid[0])
if not self.use_existing_setup:
# Ask for SR installation # Ask for SR installation
for computer_guid in self.involved_nodes_computer_guid: for computer_guid in self.involved_nodes_computer_guid:
self._prepareSlapOS(self.reachable_profile, computer_guid) self._prepareSlapOS(self.reachable_profile, computer_guid)
...@@ -426,8 +448,11 @@ Require valid-user ...@@ -426,8 +448,11 @@ Require valid-user
# All softwares are not installed, however maxtime is elapsed, that's a failure. # All softwares are not installed, however maxtime is elapsed, that's a failure.
logger.error("All softwares are not installed.") logger.error("All softwares are not installed.")
return {'status_code' : 1} return {'status_code' : 1}
self.authorize_request = True
logger.debug("All software installed.") logger.debug("All software installed.")
# even if we re-use existing setup we need proper configuration applied
self.authorize_request = True
# Launch instance # Launch instance
try: try:
self._createInstance(self.reachable_profile, self._createInstance(self.reachable_profile,
...@@ -435,7 +460,8 @@ Require valid-user ...@@ -435,7 +460,8 @@ Require valid-user
node_test_suite.test_result, node_test_suite.test_result,
node_test_suite.test_suite, node_test_suite.test_suite,
self.frontend_software, self.frontend_software,
self.frontend_instance_guid) self.frontend_instance_guid,
purge_previous_instance = not self.use_existing_setup)
logger.debug("Scalability instance requested.") logger.debug("Scalability instance requested.")
self._waitInstanceCreation(self.instance_title) self._waitInstanceCreation(self.instance_title)
except Exception as e: except Exception as e:
...@@ -462,23 +488,29 @@ Require valid-user ...@@ -462,23 +488,29 @@ Require valid-user
pass pass
return suite, repo_location return suite, repo_location
def getInstanceInformation(self, suite, count): def getInstanceInformation(self, suite, count, node_test_suite=None):
logger.info("Getting instance information:") logger.info("Getting instance information:")
instance_information_time = time.time() instance_information_time = time.time()
instance_information = self.slapos_communicator.getInstanceUrlDict() instance_information = self.slapos_communicator.getInstanceUrlDict()
while (time.time() - instance_information_time < MAX_FRONTEND_TIME): while (time.time() - instance_information_time < MAX_FRONTEND_TIME):
logger.info("getInstanceInformation=%s" %instance_information)
# loop until frontend is instanciated # loop until frontend is instanciated
if instance_information['frontend-url-list'] and \ if instance_information['frontend-url-list'] and \
instance_information['user'] and \ instance_information['user'] and \
instance_information['password']: instance_information['password']:
break break
logger.info("Wait for frontend instanciation.")
time.sleep(60) time.sleep(60)
instance_information = self.slapos_communicator.getInstanceUrlDict() instance_information = self.slapos_communicator.getInstanceUrlDict()
logger.info(instance_information)
if not instance_information['frontend-url-list']: if not instance_information['frontend-url-list']:
raise ValueError("Error getting instance information: frontend url not available") raise ValueError("Error getting instance information: frontend url not available")
# support case of already preconfigured frontend which should be used
# instead of instance's default frontends
if self.frontend_address is not None:
logger.info("Overide frontend: %s" %self.frontend_address)
instance_information['frontend-url-list'] = [["user", self.frontend_address]]
instance_url = suite.getScalabilityTestUrl(instance_information) instance_url = suite.getScalabilityTestUrl(instance_information)
bootstrap_url = suite.getBootstrapScalabilityTestUrl(instance_information, count) bootstrap_url = suite.getBootstrapScalabilityTestUrl(instance_information, count)
metric_url = suite.getScalabilityTestMetricUrl(instance_information) metric_url = suite.getScalabilityTestMetricUrl(instance_information)
...@@ -582,7 +614,7 @@ Require valid-user ...@@ -582,7 +614,7 @@ Require valid-user
logger.info("Test case for count : %d is in a running state." % count) logger.info("Test case for count : %d is in a running state." % count)
try: try:
instance_url, bootstrap_url, metric_url, site_availability_url = self.getInstanceInformation(suite, count) instance_url, bootstrap_url, metric_url, site_availability_url = self.getInstanceInformation(suite, count, node_test_suite)
except Exception as e: except Exception as e:
error_message = "Error getting testsuite information: " + str(e) error_message = "Error getting testsuite information: " + str(e)
break break
...@@ -649,7 +681,8 @@ Require valid-user ...@@ -649,7 +681,8 @@ Require valid-user
error_message = "Error in communication with master: " + str(e) error_message = "Error in communication with master: " + str(e)
break break
# Remove installed software # Remove installed software, only if it's a fresh software release and new instance
if not self.use_existing_setup and self.instance_software_release is None:
self.authorize_supply = True self.authorize_supply = True
logger.info("Removing installed software") logger.info("Removing installed software")
for computer_guid in self.involved_nodes_computer_guid: for computer_guid in self.involved_nodes_computer_guid:
......
...@@ -232,8 +232,8 @@ class SlapOSMasterCommunicator(object): ...@@ -232,8 +232,8 @@ class SlapOSMasterCommunicator(object):
except slapos.slap.ServerError: except slapos.slap.ServerError:
logger.error('Got an error requesting partition for its state') logger.error('Got an error requesting partition for its state')
return INSTANCE_STATE_UNKNOWN return INSTANCE_STATE_UNKNOWN
except Exception: except Exception, err:
logger.error("ERROR getting instance state") logger.error("ERROR getting instance state: %s" %err)
  • This is failing python 3 tests for erp5.util:

      File "/srv/slapgrid/slappart0/srv/testnode/cid/soft/a129555caf1f9fa6f7f29ab0dc04bf37/parts/python3.5/lib/python3.5/unittest/loader.py", line 153, in loadTestsFromName
        module = __import__(module_name)
      File "/srv/slapgrid/slappart0/srv/testnode/cid/inst/test0-0/parts/erp5.util/erp5/tests/testERP5TestNode.py", line 7, in <module>
        from erp5.util.testnode.testnode import TestNode, test_type_registry
      File "/srv/slapgrid/slappart0/srv/testnode/cid/inst/test0-0/parts/erp5.util/erp5/util/testnode/testnode.py", line 38, in <module>
        from .ScalabilityTestRunner import ScalabilityTestRunner
      File "/srv/slapgrid/slappart0/srv/testnode/cid/inst/test0-0/parts/erp5.util/erp5/util/testnode/ScalabilityTestRunner.py", line 33, in <module>
        from . import SlapOSControler, SlapOSMasterCommunicator
      File "/srv/slapgrid/slappart0/srv/testnode/cid/inst/test0-0/parts/erp5.util/erp5/util/testnode/SlapOSMasterCommunicator.py", line 235
        except Exception, err:
                        ^
    SyntaxError: invalid syntax
    

    how about something like this:

    
    diff --git a/erp5/util/testnode/SlapOSMasterCommunicator.py b/erp5/util/testnode/SlapOSMasterCommunicator.py
    index f684dea..bde9ea0 100644
    --- a/erp5/util/testnode/SlapOSMasterCommunicator.py
    +++ b/erp5/util/testnode/SlapOSMasterCommunicator.py
    @@ -232,8 +232,8 @@ class SlapOSMasterCommunicator(object):
         except slapos.slap.ServerError:
           logger.error('Got an error requesting partition for its state')
           return INSTANCE_STATE_UNKNOWN
    -    except Exception, err:
    -      logger.error("ERROR getting instance state: %s" %err)
    +    except Exception:
    +      logger.exception("ERROR getting instance state")
           return INSTANCE_STATE_UNKNOWN
     
         started = 0

    ( using logger.exception we have a traceback in the log )

  • @jerome , it's fine with me. If you have it ready please go ahead. Thanks

  • Thanks I pushed e29d0d91

  • and by the way, thank you for these changes, I think this can be really helpful to measure scalability on an instance which is not empty at the beginning 👍

Please register or sign in to reply
return INSTANCE_STATE_UNKNOWN return INSTANCE_STATE_UNKNOWN
started = 0 started = 0
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment