stackforge
/
swiftsync
Code Issues Proposed changes

Fix account deletion on syncer 

Origin and dest can contain same amount
of container since last sync process
but for instance on origin a container
can has been added and one other removed.
So base only deletion evaluation on set
computation.
This commit is contained in:
Fabien Boucher 2013-04-19 11:29:06 +02:00
parent d73a23136a
commit e97c5178b3
2 changed files with 18 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
swsync/accounts.py
View File

@ -83,12 +83,10 @@ class Accounts(object):
account_id, e.http_reason))
return
if int(dest_account_headers['x-account-container-count']) > \
int(orig_account_headers['x-account-container-count']):
self.container_cls.delete_container(dest_storage_cnx,
dest_token,
orig_containers,
dest_containers)
self.container_cls.delete_container(dest_storage_cnx,
dest_token,
orig_containers,
dest_containers)
do_headers = False
if len(dest_account_headers) != len(orig_account_headers):

23
tests/functional/test_syncer.py
View File

@ -20,13 +20,9 @@
# Last-Modified middleware must be installed in the proxy-server
# pipeline.
# ENV:
# User used to synchronize both swift must own the ResellerAdmin role
# in each keystone
#
# TODO(fbo):
# SetUp must setup connector for filler and syncer
# Each test must configure its environement according to test case
# To start this functional test the admin users (on both keystone) used
# to synchronize the destination swift must own the ResellerAdmin role in
# keystone.
import eventlet
import unittest
@ -190,6 +186,11 @@ class TestSyncer(unittest.TestCase):
cnx = sclient.http_connection(url)
sclient.put_container("", token, container, http_conn=cnx)
def delete_container(self, account_id, token, s_type, container):
url = self.get_url(account_id, s_type)
cnx = sclient.http_connection(url)
sclient.delete_container("", token, container, http_conn=cnx)
def post_object(self, account_id, token, s_type, container, name, headers):
url = self.get_url(account_id, s_type)
cnx = sclient.http_connection(url)
@ -468,9 +469,13 @@ class TestSyncer(unittest.TestCase):
'orig',
headers=headers,
container=co_name)
# Add a container
# Add a some more container
self.put_container(account_id, token, 'orig', 'foobar')
# TODO(fbo) Delete a container
self.put_container(account_id, token, 'orig', 'foobar1')
self.put_container(account_id, token, 'orig', 'foobar2')
# Delete one container
co_name = clo[1]['name']
self.delete_container(account_id, token, 'orig', co_name)
# Re - Start sync process
self.swsync.process()