diff options
| author | Joel Wright <joel.wright@sohonet.com> | 2015-02-04 13:50:23 +0000 |
|---|---|---|
| committer | Joel Wright <joel.wright@sohonet.com> | 2015-02-04 14:17:54 +0000 |
| commit | 06c73c6020e5af873e3ce245a27035da3448de7b (patch) | |
| tree | e42b5ddd7924f3e8cc5889a4ec3061cd837c1a61 /swiftclient/service.py | |
| parent | eb28d8aff6d6b6e985e76643bee7dbf729055c82 (diff) | |
| download | python-swiftclient-06c73c6020e5af873e3ce245a27035da3448de7b.tar.gz | |
Fix deleting SLO segments on overwrite
This patch fixes a bug that results in SLO segments being left
behind regardless of the setting of --leave-segments.
Change-Id: I2b3c8ab4817df6facb4b5961dbe570645441a552
Closes-Bug: 1418007
Diffstat (limited to 'swiftclient/service.py')
| -rw-r--r-- | swiftclient/service.py | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/swiftclient/service.py b/swiftclient/service.py index d7a5795..2980fd8 100644 --- a/swiftclient/service.py +++ b/swiftclient/service.py @@ -1590,7 +1590,7 @@ class SwiftService(object): # go over the single object limit, but this gives us a nice way # to create objects from memory if (path is not None and options['segment_size'] - and getsize(path) > int(options['segment_size'])): + and (getsize(path) > int(options['segment_size']))): res['large_object'] = True seg_container = container + '_segments' if options['segment_container']: @@ -1711,6 +1711,7 @@ class SwiftService(object): ) res['response_dict'] = obr if old_manifest or old_slo_manifest_paths: + drs = [] if old_manifest: scontainer, sprefix = old_manifest.split('/', 1) scontainer = unquote(scontainer) @@ -1719,26 +1720,24 @@ class SwiftService(object): for delobj in conn.get_container(scontainer, prefix=sprefix)[1]: delobjs.append(delobj['name']) - drs = [] for dr in self.delete(container=scontainer, objects=delobjs): drs.append(dr) - res['segment_delete_results'] = drs if old_slo_manifest_paths: delobjsmap = {} for seg_to_delete in old_slo_manifest_paths: if seg_to_delete in new_slo_manifest_paths: continue scont, sobj = \ - seg_to_delete.split('/', 1) + seg_to_delete.split(b'/', 1) delobjs_cont = delobjsmap.get(scont, []) delobjs_cont.append(sobj) - drs = [] - for (dscont, dsobjs) in delobjsmap.items(): - for dr in self.delete(container=dscont, - objects=dsobjs): - drs.append(dr) - res['segment_delete_results'] = drs + delobjsmap[scont] = delobjs_cont + for (dscont, dsobjs) in delobjsmap.items(): + for dr in self.delete(container=dscont, + objects=dsobjs): + drs.append(dr) + res['segment_delete_results'] = drs # return dict for printing res.update({ |