x/daisycloud-core
Code Issues Proposed changes

Merge "fix bug of daisy uninstall openstack"

Browse Source
This commit is contained in:
Jenkins 2017-04-27 11:47:19 +00:00 committed by Gerrit Code Review
commit 686ef7c193
5 changed files with 152 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

166
code/daisy/daisy/api/backends/kolla/uninstall.py
View File

@ -16,7 +16,8 @@
""" """
/uninstall endpoint for Daisy v1 API /uninstall endpoint for Daisy v1 API
""" """
import yaml
import time
import subprocess import subprocess
from oslo_log import log as logging from oslo_log import log as logging
from daisy import i18n from daisy import i18n
@ -45,18 +46,68 @@ def update_all_host_progress_to_db(req, hosts_id_list, role_host_meta={}):
role_host_meta) role_host_meta)
def delete_loop_of_lvm(hosts_ip_set):
try:
for host_ip in hosts_ip_set:
LOG.info(_("begin to delete_loop_of_lvm on host %s" % host_ip))
cmd = "losetup -a |grep cinder | awk -F ':' '{print $1}'"
get_devname = 'ssh -o StrictHostKeyChecking=no %s %s' % (host_ip,
cmd)
dev_name = subprocess.check_output(get_devname,
shell=True,
stderr=subprocess.STDOUT)
dev_name = dev_name.strip()
delete_dev = 'ssh -o StrictHostKeyChecking=no %s "losetup -d %s"' \
% (host_ip, dev_name)
dev_delete_result = subprocess.check_output(
delete_dev,
shell=True,
stderr=subprocess.STDOUT)
LOG.info(_("delete_loop_of_lvm on host %s ok!" % host_ip))
except:
pass
def _calc_uninstall_progress(log_file):
progress = 20
docker_execute_result = subprocess.call(
'cat %s |grep "Copying validate-docker-execute.sh file"' % log_file,
shell=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
if docker_execute_result == 0:
progress = 30
destroy_containers_result = subprocess.call(
'cat %s |grep "Destroying all Kolla containers"' % log_file,
shell=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
if destroy_containers_result == 0:
progress = 40
destroy_images_result = subprocess.call(
'cat %s |grep "Destroying Kolla images"' % log_file, shell=True,
stdout=subprocess.PIPE, stderr=subprocess.PIPE)
if destroy_images_result == 0:
progress = 60
destory_folder_result = subprocess.call(
'cat %s |grep " Destroying kolla-cleanup folder"' % log_file,
shell=True,
stdout=subprocess.PIPE, stderr=subprocess.PIPE)
if destory_folder_result == 0:
progress = 80
return progress
class KOLLAUninstallTask(Thread): class KOLLAUninstallTask(Thread):
""" """
Class for kolla uninstall openstack. Class for kolla uninstall openstack.
""" """
def __init__(self, req, cluster_id): def __init__(self, req, cluster_id):
super(KOLLAUpgradeTask, self).__init__() super(KOLLAUninstallTask, self).__init__()
self.req = req self.req = req
self.cluster_id = cluster_id self.cluster_id = cluster_id
self.message = "" self.message = ""
self.progress = ''
self.kolla_file = "/home/kolla_install" self.kolla_file = "/home/kolla_install"
self.log_file = "/var/log/daisy/kolla_%s_upgrade.log" % self.cluster_id self.log_file = "/var/log/daisy/kolla_%s_uninstall.log" \
% self.cluster_id
def run(self): def run(self):
hosts = registry.get_cluster_hosts(self.req.context, self.cluster_id) hosts = registry.get_cluster_hosts(self.req.context, self.cluster_id)
@ -66,21 +117,25 @@ class KOLLAUninstallTask(Thread):
{'progress': 0, {'progress': 0,
'status': kolla_state['UNINSTALLING'], 'status': kolla_state['UNINSTALLING'],
'messages': self.message}) 'messages': self.message})
hosts_ip_set = set()
for host in hosts: for host in hosts:
host_meta = daisy_cmn.get_host_detail(self.req, host["host_id"]) host_meta = daisy_cmn.get_host_detail(self.req, host["host_id"])
host_ip = daisy_cmn.get_management_ip(host_meta) host_ip = daisy_cmn.get_management_ip(host_meta)
host_ip_set = set() hosts_ip_set.add(host_ip)
host_ip_set.add(host_ip) unreached_hosts = daisy_cmn.check_ping_hosts(hosts_ip_set, 3)
unreached_hosts = daisy_cmn.check_ping_hosts(host_ip_set, 3) if unreached_hosts:
if unreached_hosts: self.message = "hosts %s ping failed" % unreached_hosts
self.message = "hosts %s ping failed" % unreached_hosts update_all_host_progress_to_db(self.req, hosts_id_list,
update_all_host_progress_to_db(self.req, hosts_id_list, {'progress': 0,
{'progress': 0, 'status': kolla_state[
'status': kolla_state[ 'UNINSTALL_FAILED'],
'UNINSTALL_FAILED'], 'messages': self.message})
'messages': self.message}) raise exception.NotFound(message=self.message)
raise exception.NotFound(message=self.message) with open('/etc/kolla/globals.yml', 'r') as f:
get_lvm_info = yaml.load(f.read())
f.close()
if get_lvm_info.get('enable_cinder_backend_lvm') == 'yes':
delete_loop_of_lvm(hosts_ip_set)
LOG.info(_("precheck envirnoment successfully ...")) LOG.info(_("precheck envirnoment successfully ..."))
self.message = "uninstalling openstack" self.message = "uninstalling openstack"
@ -93,41 +148,70 @@ class KOLLAUninstallTask(Thread):
with open(self.log_file, "w+") as fp: with open(self.log_file, "w+") as fp:
try: try:
LOG.info(_("begin kolla-ansible destory")) LOG.info(_("begin kolla-ansible destory"))
exc_result = subprocess.check_output( exc_result = subprocess.Popen(
'cd %s/kolla && ./tools/kolla-ansible destroy ' 'cd %s/kolla && ./tools/kolla-ansible destroy '
'--include-images -i ' '--include-images -i '
'%s/kolla/ansible/inventory/multinode ' '%s/kolla/ansible/inventory/multinode '
'--yes-i-really-really-mean-it' % '--yes-i-really-really-mean-it' %
(self.kolla_file, self.kolla_file), (self.kolla_file, self.kolla_file),
shell=True, stderr=subprocess.STDOUT) shell=True, stdout=fp, stderr=fp)
self.progress = 20
execute_times = 0
while True:
time.sleep(5)
return_code = exc_result.poll()
if self.progress == 90:
break
elif return_code == 0:
self.progress = 90
elif return_code == 1:
self.message = "KOLLA uninstall openstack failed!"
LOG.error(self.message)
raise exception.UninstallException(self.message)
else:
self.progress = _calc_uninstall_progress(self.log_file)
if execute_times >= 720:
self.message = \
"KOLLA uninstall openstack timeout for an hour"
LOG.error(self.message)
raise exception.UninstallTimeoutException(
cluster_id=self.cluster_id)
else:
update_all_host_progress_to_db(
self.req, hosts_id_list,
{'progress': self.progress,
'status': kolla_state[
'UNINSTALLING'],
'messages': self.message})
execute_times += 1
if self.progress == 90:
LOG.info(_("openstack uninstall successfully"))
self.message = "openstack uninstall successfully"
update_all_host_progress_to_db(self.req, hosts_id_list,
{'progress': 100,
'status': kolla_state[
'INIT'],
'messages': self.message})
for host_id in hosts_id_list:
daisy_cmn.update_db_host_status(
self.req, host_id, {'tecs_version_id': '',
'tecs_patch_id': ''})
cluster_meta = {}
cluster_meta['tecs_version_id'] = ''
cluster_meta = registry.update_cluster_metadata(
self.req.context, self.cluster_id, cluster_meta)
LOG.info(_("openstack uninstalled for "
"cluster %s successfully."
% self.cluster_id))
except subprocess.CalledProcessError as e: except subprocess.CalledProcessError as e:
LOG.error("kolla-ansible destory failed!") LOG.error("kolla-ansible destory failed!")
self.message = "kolla-ansible destory failed!" self.message = "kolla-ansible destory failed!"
update_all_host_progress_to_db(self.req, hosts_id_list, update_all_host_progress_to_db(self.req, hosts_id_list,
{'progress': 10, {'progress': self.progress,
'status': kolla_state[ 'status': kolla_state[
'UNINSTALL_FAILED'], 'UNINSTALL_FAILED'],
'messages': self.message}) 'messages': self.message})
fp.write(e.output.strip())
exit()
else:
LOG.info(_("openstack uninstall successfully"))
fp.write(exc_result)
self.message = "openstack uninstall successfully"
update_all_host_progress_to_db(self.req, hosts_id_list,
{'progress': 100,
'status': kolla_state[
'INIT'],
'messages': self.message})
for host_id in hosts_id_list:
daisy_cmn.update_db_host_status(
self.req, host_id, {'tecs_version_id': '',
'tecs_patch_id': ''})
cluster_meta = {}
cluster_meta['tecs_version_id'] = ''
cluster_meta = registry.update_cluster_metadata(
self.req.context, self.cluster_id, cluster_meta)
LOG.info(_("openstack uninstalled for cluster %s successfully."
% self.cluster_id))

25
code/daisy/daisy/api/backends/kolla/upgrade.py
View File

@ -116,22 +116,21 @@ class KOLLAUpgradeTask(Thread):
# TODO: re-config docker registry server based upon return value of # TODO: re-config docker registry server based upon return value of
# kolla_cmn.version_load_mcast # kolla_cmn.version_load_mcast
hosts_ip_set = set()
for host in hosts: for host in hosts:
host_meta = daisy_cmn.get_host_detail(self.req, host["host_id"]) host_meta = daisy_cmn.get_host_detail(self.req, host["host_id"])
host_ip = daisy_cmn.get_management_ip(host_meta) host_ip = daisy_cmn.get_management_ip(host_meta)
host_ip_set = set() hosts_ip_set.add(host_ip)
host_ip_set.add(host_ip) unreached_hosts = daisy_cmn.check_ping_hosts(
unreached_hosts = daisy_cmn.check_ping_hosts( hosts_ip_set, 3)
host_ip_set, 3) if unreached_hosts:
if unreached_hosts: self.message = "hosts %s ping failed" % unreached_hosts
self.message = "hosts %s ping failed" % unreached_hosts update_all_host_progress_to_db(self.req, hosts_id_list,
update_all_host_progress_to_db(self.req, hosts_id_list, {'progress': 10,
{'progress': 10, 'status': kolla_state[
'status': kolla_state[ 'UPDATE_FAILED'],
'UPDATE_FAILED'], 'messages': self.message})
'messages': self.message}) raise exception.NotFound(message=self.message)
raise exception.NotFound(message=self.message)
LOG.info(_("precheck envirnoment successfully ...")) LOG.info(_("precheck envirnoment successfully ..."))
self.message = "openstack upgrading" self.message = "openstack upgrading"

9
code/daisy/daisy/common/exception.py
View File

@ -342,11 +342,20 @@ class InstallException(DaisyException):
message = _("Cluster installtation raise exception") message = _("Cluster installtation raise exception")
class UninstallException(DaisyException):
message = _("Cluster uninstalltation raise exception")
class InstallTimeoutException(DaisyException): class InstallTimeoutException(DaisyException):
message = _( message = _(
"Time out, during install backend to cluster %(cluster_id)s") "Time out, during install backend to cluster %(cluster_id)s")
class UninstallTimeoutException(DaisyException):
message = _(
"Time out, during uninstall backend to cluster %(cluster_id)s")
class TaskNotFound(TaskException, NotFound): class TaskNotFound(TaskException, NotFound):
message = _("Task with the given id %(task_id)s was not found") message = _("Task with the given id %(task_id)s was not found")

4
code/daisyclient/daisyclient/v1/uninstall.py
View File

@ -100,5 +100,7 @@ class UninstallManager(base.ManagerWithFind):
raise TypeError(msg % field) raise TypeError(msg % field)
if "cluster_id" in fields: if "cluster_id" in fields:
url = '/v1/uninstall/%s' % fields['cluster_id'] url = '/v1/uninstall/%s' % fields['cluster_id']
resp, body = self.client.post(url)
hdrs = self._uninstall_meta_to_headers(fields)
resp, body = self.client.post(url, headers=None, data=hdrs)
return Uninstall(self, self._format_uninstall_meta_for_user(body)) return Uninstall(self, self._format_uninstall_meta_for_user(body))

4
tools/setup/install/install_func.sh
View File

@ -113,7 +113,9 @@ function kolla_install
cp $imagebakdir/$imagename $imagedir cp $imagebakdir/$imagename $imagedir
fi fi
cd $imagedir cd $imagedir
tar mzxvf $imagedir/$imagename write_install_log "Begin unzip kolla-image, please wait."
tar mzxf $imagedir/$imagename
write_install_log "unzip kolla-image ok!"
sourceversion=$(cat $imagedir/registry-*.version | head -1) sourceversion=$(cat $imagedir/registry-*.version | head -1)
write_install_log "Begin clone kolla... $sourceversion" write_install_log "Begin clone kolla... $sourceversion"