openstack/glance
Code Issues Proposed changes

Merge "Add a missing header strip opportunity."

Browse Source
This commit is contained in:
Jenkins 2012-08-02 23:27:47 +00:00 committed by Gerrit Code Review
commit f2858042a2
1 changed files with 17 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
bin/glance-replicator
View File

@ -371,6 +371,8 @@ def replication_load(options, args):
# Remove keys which don't make sense for replication # Remove keys which don't make sense for replication
for key in options.dontreplicate.split(' '): for key in options.dontreplicate.split(' '):
if key in meta: if key in meta:
logging.debug(_('Stripping %(header)s from saved '
'metadata'), {'header': key})
del meta[key] del meta[key]
if _image_present(client, image_uuid): if _image_present(client, image_uuid):
@ -380,6 +382,8 @@ def replication_load(options, args):
headers = client.get_image_meta(image_uuid) headers = client.get_image_meta(image_uuid)
for key in options.dontreplicate.split(' '): for key in options.dontreplicate.split(' '):
if key in headers: if key in headers:
logging.debug(_('Stripping %(header)s from slave '
'metadata'), {'header': key})
del headers[key] del headers[key]
if _dict_diff(meta, headers): if _dict_diff(meta, headers):
@ -420,6 +424,11 @@ def replication_livecopy(options, args):
for image in master_client.get_images(): for image in master_client.get_images():
logging.info(_('Considering %(id)s') % {'id': image['id']}) logging.info(_('Considering %(id)s') % {'id': image['id']})
for key in options.dontreplicate.split(' '):
if key in image:
logging.debug(_('Stripping %(header)s from master metadata'),
{'header': key})
del image[key]
if _image_present(slave_client, image['id']): if _image_present(slave_client, image['id']):
# NOTE(mikal): Perhaps we just need to update the metadata? # NOTE(mikal): Perhaps we just need to update the metadata?
@ -429,8 +438,12 @@ def replication_livecopy(options, args):
if headers['status'] == 'active': if headers['status'] == 'active':
for key in options.dontreplicate.split(' '): for key in options.dontreplicate.split(' '):
if key in image: if key in image:
logging.debug(_('Stripping %(header)s from master '
'metadata'), {'header': key})
del image[key] del image[key]
if key in headers: if key in headers:
logging.debug(_('Stripping %(header)s from slave '
'metadata'), {'header': key})
del headers[key] del headers[key]
if _dict_diff(image, headers): if _dict_diff(image, headers):
@ -470,8 +483,12 @@ def replication_compare(options, args):
headers = slave_client.get_image_meta(image['id']) headers = slave_client.get_image_meta(image['id'])
for key in options.dontreplicate.split(' '): for key in options.dontreplicate.split(' '):
if key in image: if key in image:
logging.debug(_('Stripping %(header)s from master '
'metadata'), {'header': key})
del image[key] del image[key]
if key in headers: if key in headers:
logging.debug(_('Stripping %(header)s from slave '
'metadata'), {'header': key})
del headers[key] del headers[key]
for key in image: for key in image: