openstack/trove
Code Issues Proposed changes

Fix backup using customized container image registry

Browse Source 
Change-Id: Ib35743e1c315bb7fd4d0fbd99eaa409a4bf5c792
Story: 2008996
Task: 42658
This commit is contained in:
Lingxian Kong
2021-06-21 09:03:56 +12:00
parent 189d3493a8
commit 6d2ab68a8a
3 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
releasenotes/notes/xena-fix-backup-custom-image-registry.yaml Normal file
View File

@@ -0,0 +1,4 @@
---
fixes:
- Fixed backup creation failed issue when using custom container image
registry.

2
trove/guestagent/datastore/mysql/service.py
View File

@@ -67,7 +67,7 @@ class MySqlApp(service.BaseMySqlApp):
to openstacktrove/db-backup-mysql5.7:1.0.0 to openstacktrove/db-backup-mysql5.7:1.0.0
""" """
image = cfg.get_configuration_property('backup_docker_image') image = cfg.get_configuration_property('backup_docker_image')
name, tag = image.split(':', 1) name, tag = image.rsplit(':', 1)
# Get minor version # Get minor version
cur_ver = semantic_version.Version.coerce(CONF.datastore_version) cur_ver = semantic_version.Version.coerce(CONF.datastore_version)

5
trove/guestagent/utils/docker.py
View File

@@ -91,11 +91,16 @@ def run_container(client, image, name, network_mode="host", volumes={},
""" """
try: try:
container = client.containers.get(name) container = client.containers.get(name)
LOG.debug(f'Removing existing container {name}')
container.remove(force=True) container.remove(force=True)
except docker.errors.NotFound: except docker.errors.NotFound:
pass pass
try: try:
LOG.info(
f'Running container {name}, image: {image}, '
f'network_mode: {network_mode}, volumes: {volumes}, '
f'command: {command}')
output = client.containers.run( output = client.containers.run(
image, image,
name=name, name=name,