openstack/trove
Code Issues Proposed changes

Merge "Increased stop timeout for cassandra"

Browse Source
This commit is contained in:
Jenkins 2014-06-09 17:15:02 +00:00 committed by Gerrit Code Review
commit 11752f3edc
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
trove/guestagent/datastore/cassandra/service.py
View File

@ -92,7 +92,8 @@ class CassandraApp(object):
if do_not_start_on_reboot:
self._disable_db_on_boot()
utils.execute_with_timeout(system.STOP_CASSANDRA,
shell=True)
shell=True,
timeout=system.SERVICE_STOP_TIMEOUT)
if not (self.status.wait_for_real_status_to_change_to(
rd_instance.ServiceStatuses.SHUTDOWN,
@ -113,7 +114,7 @@ class CassandraApp(object):
def _install_db(self, packages):
"""Install cassandra server"""
LOG.debug("Installing cassandra server")
packager.pkg_install(packages, None, system.TIME_OUT)
packager.pkg_install(packages, None, system.INSTALL_TIMEOUT)
LOG.debug("Finished installing cassandra server")
def write_config(self, config_contents):

4
trove/guestagent/datastore/cassandra/system.py
View File

@ -35,5 +35,5 @@ STOP_CASSANDRA = "sudo service cassandra stop"
CASSANDRA_STATUS = """echo "use system;" > /tmp/check; cqlsh -f /tmp/check"""
CASSANDRA_KILL = "sudo killall java || true"
TIME_OUT = 10000
SERVICE_STOP_TIMEOUT = 60
INSTALL_TIMEOUT = 10000