38ae7bb89c
The account reaper is using a unique timestamp when deleting replicas of the same resource. This will result in unnecessary replication traffic after reaping. This patch makes the reaper use a single timestamp per resource. Probe test is modified to check that delete times are equal across replicas before replicators run. test_direct_client.py is modified to check that it uses explicit timestamp when passed to direct_delete_[object|container] methods. Drive-by bug fixes in the probe test e.g. it was not sending X-Backend-Storage-Policy-Index when doing a direct GET to check object state, so the 404s being verified could in fact be due to diskfile not existing rather than diskfile being deleted. Closes-Bug: 1442879 Change-Id: I8bab22d66308bb9d3294e1e0def017c784228423
150 lines
6.5 KiB
Python
150 lines
6.5 KiB
Python
#!/usr/bin/python -u
|
|
# Licensed under the Apache License, Version 2.0 (the "License");
|
|
# you may not use this file except in compliance with the License.
|
|
# You may obtain a copy of the License at
|
|
#
|
|
# http://www.apache.org/licenses/LICENSE-2.0
|
|
#
|
|
# Unless required by applicable law or agreed to in writing, software
|
|
# distributed under the License is distributed on an "AS IS" BASIS,
|
|
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
|
|
# implied.
|
|
# See the License for the specific language governing permissions and
|
|
# limitations under the License.
|
|
|
|
import uuid
|
|
import unittest
|
|
|
|
from swiftclient import client
|
|
|
|
from swift.common.storage_policy import POLICIES
|
|
from swift.common.manager import Manager
|
|
from swift.common.direct_client import direct_delete_account, \
|
|
direct_get_object, direct_head_container, ClientException
|
|
from test.probe.common import ReplProbeTest, ENABLED_POLICIES
|
|
|
|
|
|
class TestAccountReaper(ReplProbeTest):
|
|
|
|
def test_sync(self):
|
|
all_objects = []
|
|
# upload some containers
|
|
for policy in ENABLED_POLICIES:
|
|
container = 'container-%s-%s' % (policy.name, uuid.uuid4())
|
|
client.put_container(self.url, self.token, container,
|
|
headers={'X-Storage-Policy': policy.name})
|
|
obj = 'object-%s' % uuid.uuid4()
|
|
body = 'test-body'
|
|
client.put_object(self.url, self.token, container, obj, body)
|
|
all_objects.append((policy, container, obj))
|
|
|
|
Manager(['container-updater']).once()
|
|
|
|
headers = client.head_account(self.url, self.token)
|
|
|
|
self.assertEqual(int(headers['x-account-container-count']),
|
|
len(ENABLED_POLICIES))
|
|
self.assertEqual(int(headers['x-account-object-count']),
|
|
len(ENABLED_POLICIES))
|
|
self.assertEqual(int(headers['x-account-bytes-used']),
|
|
len(ENABLED_POLICIES) * len(body))
|
|
|
|
part, nodes = self.account_ring.get_nodes(self.account)
|
|
for node in nodes:
|
|
direct_delete_account(node, part, self.account)
|
|
|
|
# run the reaper
|
|
Manager(['account-reaper']).once()
|
|
|
|
for policy, container, obj in all_objects:
|
|
# verify that any container deletes were at same timestamp
|
|
cpart, cnodes = self.container_ring.get_nodes(
|
|
self.account, container)
|
|
delete_times = set()
|
|
for cnode in cnodes:
|
|
try:
|
|
direct_head_container(cnode, cpart, self.account,
|
|
container)
|
|
except ClientException as err:
|
|
self.assertEquals(err.http_status, 404)
|
|
delete_time = err.http_headers.get(
|
|
'X-Backend-DELETE-Timestamp')
|
|
# 'X-Backend-DELETE-Timestamp' confirms it was deleted
|
|
self.assertTrue(delete_time)
|
|
delete_times.add(delete_time)
|
|
|
|
else:
|
|
# Container replicas may not yet be deleted if we have a
|
|
# policy with object replicas < container replicas, so
|
|
# ignore successful HEAD. We'll check for all replicas to
|
|
# be deleted again after running the replicators.
|
|
pass
|
|
self.assertEqual(1, len(delete_times), delete_times)
|
|
|
|
# verify that all object deletes were at same timestamp
|
|
object_ring = POLICIES.get_object_ring(policy.idx, '/etc/swift/')
|
|
part, nodes = object_ring.get_nodes(self.account, container, obj)
|
|
headers = {'X-Backend-Storage-Policy-Index': int(policy)}
|
|
delete_times = set()
|
|
for node in nodes:
|
|
try:
|
|
direct_get_object(node, part, self.account,
|
|
container, obj, headers=headers)
|
|
except ClientException as err:
|
|
self.assertEquals(err.http_status, 404)
|
|
delete_time = err.http_headers.get('X-Backend-Timestamp')
|
|
# 'X-Backend-Timestamp' confirms obj was deleted
|
|
self.assertTrue(delete_time)
|
|
delete_times.add(delete_time)
|
|
else:
|
|
self.fail('Found un-reaped /%s/%s/%s on %r in %s!' %
|
|
(self.account, container, obj, node, policy))
|
|
self.assertEqual(1, len(delete_times))
|
|
|
|
# run replicators and updaters
|
|
self.get_to_final_state()
|
|
|
|
for policy, container, obj in all_objects:
|
|
# verify that ALL container replicas are now deleted
|
|
cpart, cnodes = self.container_ring.get_nodes(
|
|
self.account, container)
|
|
delete_times = set()
|
|
for cnode in cnodes:
|
|
try:
|
|
direct_head_container(cnode, cpart, self.account,
|
|
container)
|
|
except ClientException as err:
|
|
self.assertEquals(err.http_status, 404)
|
|
delete_time = err.http_headers.get(
|
|
'X-Backend-DELETE-Timestamp')
|
|
# 'X-Backend-DELETE-Timestamp' confirms it was deleted
|
|
self.assertTrue(delete_time)
|
|
delete_times.add(delete_time)
|
|
else:
|
|
self.fail('Found un-reaped /%s/%s on %r' %
|
|
(self.account, container, cnode))
|
|
|
|
# sanity check that object state is still consistent...
|
|
object_ring = POLICIES.get_object_ring(policy.idx, '/etc/swift/')
|
|
part, nodes = object_ring.get_nodes(self.account, container, obj)
|
|
headers = {'X-Backend-Storage-Policy-Index': int(policy)}
|
|
delete_times = set()
|
|
for node in nodes:
|
|
try:
|
|
direct_get_object(node, part, self.account,
|
|
container, obj, headers=headers)
|
|
except ClientException as err:
|
|
self.assertEquals(err.http_status, 404)
|
|
delete_time = err.http_headers.get('X-Backend-Timestamp')
|
|
# 'X-Backend-Timestamp' confirms obj was deleted
|
|
self.assertTrue(delete_time)
|
|
delete_times.add(delete_time)
|
|
else:
|
|
self.fail('Found un-reaped /%s/%s/%s on %r in %s!' %
|
|
(self.account, container, obj, node, policy))
|
|
self.assertEqual(1, len(delete_times))
|
|
|
|
|
|
if __name__ == "__main__":
|
|
unittest.main()
|