openstack/deb-openstack-trove
Code Issues Proposed changes

Merge "Enhance mongod pid find for multiple distros"

Browse Source
This commit is contained in:
Jenkins
2016-05-12 01:26:21 +00:00
committed by Gerrit Code Review
parent a72556817a b9a06d968f
commit 5e1ab273a6
2 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
trove/guestagent/datastore/experimental/mongodb/service.py
View File

@@ -458,8 +458,7 @@ class MongoDBAppStatus(service.BaseDbStatus):
return ds_instance.ServiceStatuses.SHUTDOWN
def cleanup_stalled_db_services(self):
out, err = utils.execute_with_timeout(system.FIND_PID, shell=True)
pid = "".join(out.split(" ")[1:2])
pid, err = utils.execute_with_timeout(system.FIND_PID, shell=True)
utils.execute_with_timeout(system.MONGODB_KILL % pid, shell=True)

2
trove/guestagent/datastore/experimental/mongodb/system.py
View File

@@ -36,7 +36,7 @@ MONGO_KEY_FILE = '/etc/mongo_key'
MONGOS_SERVICE_CANDIDATES = ["mongos"]
MONGOD_SERVICE_CANDIDATES = ["mongodb", "mongod"]
MONGODB_KILL = "sudo kill %s"
FIND_PID = "ps xau | grep 'mongo[ds]'"
FIND_PID = "ps xaco pid,cmd | awk '/mongo(d|db|s)/ {print $1}'"
TIME_OUT = 1000
MONGO_USER = {operating_system.REDHAT: "mongod",