2014-04-09 16:10:13 -07:00
|
|
|
|
2013-09-20 01:00:54 +08:00
|
|
|
# Copyright (c) 2010-2012 OpenStack Foundation
|
2011-06-15 02:01:01 +00:00
|
|
|
#
|
|
|
|
# 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.
|
|
|
|
|
2014-12-24 11:52:34 +08:00
|
|
|
import os
|
2011-06-15 02:01:01 +00:00
|
|
|
import unittest
|
2014-12-24 11:52:34 +08:00
|
|
|
from textwrap import dedent
|
2013-08-06 14:15:48 +02:00
|
|
|
|
|
|
|
import mock
|
2015-07-26 13:31:17 +03:00
|
|
|
import errno
|
Update container on fast-POST
This patch makes a number of changes to enable content-type
metadata to be updated when using the fast-POST mode of
operation, as proposed in the associated spec [1].
* the object server and diskfile are modified to allow
content-type to be updated by a POST and the updated value
to be stored in .meta files.
* the object server accepts PUTs and DELETEs with older
timestamps than existing .meta files. This is to be
consistent with replication that will leave a later .meta
file in place when replicating a .data file.
* the diskfile interface is modified to provide accessor
methods for the content-type and its timestamp.
* the naming of .meta files is modified to encode two
timestamps when the .meta file contains a content-type value
that was set prior to the latest metadata update; this
enables consistency to be achieved when rsync is used for
replication.
* ssync is modified to sync meta files when content-type
differs between local and remote copies of objects.
* the object server issues container updates when handling
POST requests, notifying the container server of the current
immutable metadata (etag, size, hash, swift_bytes),
content-type with their respective timestamps, and the
mutable metadata timestamp.
* the container server maintains the most recently reported
values for immutable metadata, content-type and mutable
metadata, each with their respective timestamps, in a single
db row.
* new probe tests verify that replication achieves eventual
consistency of containers and objects after discrete updates
to content-type and mutable metadata, and that container-sync
sync's objects after fast-post updates.
[1] spec change-id: I60688efc3df692d3a39557114dca8c5490f7837e
Change-Id: Ia597cd460bb5fd40aa92e886e3e18a7542603d01
2015-08-10 10:30:10 -05:00
|
|
|
from swift.common.utils import Timestamp
|
2014-12-24 11:52:34 +08:00
|
|
|
from test.unit import debug_logger
|
2011-06-15 02:01:01 +00:00
|
|
|
from swift.container import sync
|
2015-07-26 13:31:17 +03:00
|
|
|
from swift.common.db import DatabaseConnectionError
|
2011-06-16 00:59:55 +00:00
|
|
|
from swift.common import utils
|
2014-12-24 11:52:34 +08:00
|
|
|
from swift.common.wsgi import ConfigString
|
2013-12-23 17:57:56 +01:00
|
|
|
from swift.common.exceptions import ClientException
|
2014-06-23 12:52:50 -07:00
|
|
|
from swift.common.storage_policy import StoragePolicy
|
2014-12-24 11:52:34 +08:00
|
|
|
import test
|
|
|
|
from test.unit import patch_policies, with_tempdir
|
2011-06-15 02:01:01 +00:00
|
|
|
|
2011-06-16 00:59:55 +00:00
|
|
|
utils.HASH_PATH_SUFFIX = 'endcap'
|
2013-03-20 01:35:41 +02:00
|
|
|
utils.HASH_PATH_PREFIX = 'endcap'
|
2011-06-16 00:59:55 +00:00
|
|
|
|
|
|
|
|
|
|
|
class FakeRing(object):
|
2011-06-15 02:01:01 +00:00
|
|
|
|
|
|
|
def __init__(self):
|
|
|
|
self.devs = [{'ip': '10.0.0.%s' % x, 'port': 1000 + x, 'device': 'sda'}
|
2015-05-25 18:28:02 +02:00
|
|
|
for x in range(3)]
|
2011-06-15 02:01:01 +00:00
|
|
|
|
|
|
|
def get_nodes(self, account, container=None, obj=None):
|
|
|
|
return 1, list(self.devs)
|
|
|
|
|
|
|
|
|
2011-06-16 00:59:55 +00:00
|
|
|
class FakeContainerBroker(object):
|
|
|
|
|
|
|
|
def __init__(self, path, metadata=None, info=None, deleted=False,
|
|
|
|
items_since=None):
|
|
|
|
self.db_file = path
|
2015-07-26 13:31:17 +03:00
|
|
|
self.db_dir = os.path.dirname(path)
|
2011-06-16 00:59:55 +00:00
|
|
|
self.metadata = metadata if metadata else {}
|
|
|
|
self.info = info if info else {}
|
|
|
|
self.deleted = deleted
|
|
|
|
self.items_since = items_since if items_since else []
|
|
|
|
self.sync_point1 = -1
|
|
|
|
self.sync_point2 = -1
|
|
|
|
|
2016-02-18 14:50:08 +02:00
|
|
|
def get_max_row(self):
|
|
|
|
return 1
|
|
|
|
|
2011-06-16 00:59:55 +00:00
|
|
|
def get_info(self):
|
|
|
|
return self.info
|
|
|
|
|
|
|
|
def is_deleted(self):
|
|
|
|
return self.deleted
|
|
|
|
|
|
|
|
def get_items_since(self, sync_point, limit):
|
|
|
|
if sync_point < 0:
|
|
|
|
sync_point = 0
|
|
|
|
return self.items_since[sync_point:sync_point + limit]
|
|
|
|
|
|
|
|
def set_x_container_sync_points(self, sync_point1, sync_point2):
|
|
|
|
self.sync_point1 = sync_point1
|
|
|
|
self.sync_point2 = sync_point2
|
|
|
|
|
|
|
|
|
2014-04-09 16:10:13 -07:00
|
|
|
@patch_policies([StoragePolicy(0, 'zero', True, object_ring=FakeRing())])
|
2011-06-15 02:01:01 +00:00
|
|
|
class TestContainerSync(unittest.TestCase):
|
|
|
|
|
2014-12-24 11:52:34 +08:00
|
|
|
def setUp(self):
|
|
|
|
self.logger = debug_logger('test-container-sync')
|
|
|
|
|
2013-06-19 15:14:13 +00:00
|
|
|
def test_FileLikeIter(self):
|
|
|
|
# Retained test to show new FileLikeIter acts just like the removed
|
|
|
|
# _Iter2FileLikeObject did.
|
|
|
|
flo = sync.FileLikeIter(iter(['123', '4567', '89', '0']))
|
2011-06-15 02:01:01 +00:00
|
|
|
expect = '1234567890'
|
|
|
|
|
|
|
|
got = flo.read(2)
|
|
|
|
self.assertTrue(len(got) <= 2)
|
2015-08-06 00:18:52 +05:30
|
|
|
self.assertEqual(got, expect[:len(got)])
|
2011-06-15 02:01:01 +00:00
|
|
|
expect = expect[len(got):]
|
|
|
|
|
|
|
|
got = flo.read(5)
|
|
|
|
self.assertTrue(len(got) <= 5)
|
2015-08-06 00:18:52 +05:30
|
|
|
self.assertEqual(got, expect[:len(got)])
|
2011-06-15 02:01:01 +00:00
|
|
|
expect = expect[len(got):]
|
|
|
|
|
2015-08-06 00:18:52 +05:30
|
|
|
self.assertEqual(flo.read(), expect)
|
|
|
|
self.assertEqual(flo.read(), '')
|
|
|
|
self.assertEqual(flo.read(2), '')
|
2011-06-15 02:01:01 +00:00
|
|
|
|
2013-06-19 15:14:13 +00:00
|
|
|
flo = sync.FileLikeIter(iter(['123', '4567', '89', '0']))
|
2015-08-06 00:18:52 +05:30
|
|
|
self.assertEqual(flo.read(), '1234567890')
|
|
|
|
self.assertEqual(flo.read(), '')
|
|
|
|
self.assertEqual(flo.read(2), '')
|
2011-06-15 02:01:01 +00:00
|
|
|
|
2014-12-24 11:52:34 +08:00
|
|
|
def assertLogMessage(self, msg_level, expected, skip=0):
|
|
|
|
for line in self.logger.get_lines_for_level(msg_level)[skip:]:
|
|
|
|
msg = 'expected %r not in %r' % (expected, line)
|
|
|
|
self.assertTrue(expected in line, msg)
|
|
|
|
|
|
|
|
@with_tempdir
|
|
|
|
def test_init(self, tempdir):
|
|
|
|
ic_conf_path = os.path.join(tempdir, 'internal-client.conf')
|
2011-06-15 02:01:01 +00:00
|
|
|
cring = FakeRing()
|
2014-12-24 11:52:34 +08:00
|
|
|
|
|
|
|
with mock.patch('swift.container.sync.InternalClient'):
|
|
|
|
cs = sync.ContainerSync({}, container_ring=cring)
|
|
|
|
self.assertTrue(cs.container_ring is cring)
|
|
|
|
|
|
|
|
# specified but not exists will not start
|
|
|
|
conf = {'internal_client_conf_path': ic_conf_path}
|
|
|
|
self.assertRaises(SystemExit, sync.ContainerSync, conf,
|
|
|
|
container_ring=cring, logger=self.logger)
|
|
|
|
|
|
|
|
# not specified will use default conf
|
|
|
|
with mock.patch('swift.container.sync.InternalClient') as mock_ic:
|
|
|
|
cs = sync.ContainerSync({}, container_ring=cring,
|
|
|
|
logger=self.logger)
|
|
|
|
self.assertTrue(cs.container_ring is cring)
|
|
|
|
self.assertTrue(mock_ic.called)
|
|
|
|
conf_path, name, retry = mock_ic.call_args[0]
|
|
|
|
self.assertTrue(isinstance(conf_path, ConfigString))
|
2015-08-06 00:18:52 +05:30
|
|
|
self.assertEqual(conf_path.contents.getvalue(),
|
|
|
|
dedent(sync.ic_conf_body))
|
2014-12-24 11:52:34 +08:00
|
|
|
self.assertLogMessage('warning', 'internal_client_conf_path')
|
|
|
|
self.assertLogMessage('warning', 'internal-client.conf-sample')
|
|
|
|
|
|
|
|
# correct
|
|
|
|
contents = dedent(sync.ic_conf_body)
|
|
|
|
with open(ic_conf_path, 'w') as f:
|
|
|
|
f.write(contents)
|
|
|
|
with mock.patch('swift.container.sync.InternalClient') as mock_ic:
|
|
|
|
cs = sync.ContainerSync(conf, container_ring=cring)
|
2011-06-15 02:01:01 +00:00
|
|
|
self.assertTrue(cs.container_ring is cring)
|
2014-12-24 11:52:34 +08:00
|
|
|
self.assertTrue(mock_ic.called)
|
|
|
|
conf_path, name, retry = mock_ic.call_args[0]
|
2015-08-06 00:18:52 +05:30
|
|
|
self.assertEqual(conf_path, ic_conf_path)
|
2014-12-24 11:52:34 +08:00
|
|
|
|
|
|
|
sample_conf_filename = os.path.join(
|
|
|
|
os.path.dirname(test.__file__),
|
|
|
|
'../etc/internal-client.conf-sample')
|
|
|
|
with open(sample_conf_filename) as sample_conf_file:
|
|
|
|
sample_conf = sample_conf_file.read()
|
|
|
|
self.assertEqual(contents, sample_conf)
|
2011-06-15 02:01:01 +00:00
|
|
|
|
|
|
|
def test_run_forever(self):
|
|
|
|
# This runs runs_forever with fakes to succeed for two loops, the first
|
|
|
|
# causing a report but no interval sleep, the second no report but an
|
|
|
|
# interval sleep.
|
|
|
|
time_calls = [0]
|
|
|
|
sleep_calls = []
|
|
|
|
|
|
|
|
def fake_time():
|
|
|
|
time_calls[0] += 1
|
|
|
|
returns = [1, # Initialized reported time
|
|
|
|
1, # Start time
|
|
|
|
3602, # Is it report time (yes)
|
|
|
|
3602, # Report time
|
|
|
|
3602, # Elapsed time for "under interval" (no)
|
|
|
|
3602, # Start time
|
|
|
|
3603, # Is it report time (no)
|
2013-09-01 01:30:36 -04:00
|
|
|
3603] # Elapsed time for "under interval" (yes)
|
2011-06-15 02:01:01 +00:00
|
|
|
if time_calls[0] == len(returns) + 1:
|
|
|
|
raise Exception('we are now done')
|
|
|
|
return returns[time_calls[0] - 1]
|
|
|
|
|
|
|
|
def fake_sleep(amount):
|
|
|
|
sleep_calls.append(amount)
|
|
|
|
|
2015-07-26 13:31:17 +03:00
|
|
|
gen_func = ('swift.container.sync_store.'
|
|
|
|
'ContainerSyncStore.synced_containers_generator')
|
|
|
|
with mock.patch('swift.container.sync.InternalClient'), \
|
|
|
|
mock.patch('swift.container.sync.time', fake_time), \
|
|
|
|
mock.patch('swift.container.sync.sleep', fake_sleep), \
|
|
|
|
mock.patch(gen_func) as fake_generator, \
|
|
|
|
mock.patch('swift.container.sync.ContainerBroker',
|
|
|
|
lambda p: FakeContainerBroker(p, info={
|
|
|
|
'account': 'a', 'container': 'c',
|
|
|
|
'storage_policy_index': 0})):
|
|
|
|
fake_generator.side_effect = [iter(['container.db']),
|
|
|
|
iter(['container.db'])]
|
|
|
|
cs = sync.ContainerSync({}, container_ring=FakeRing())
|
|
|
|
try:
|
|
|
|
cs.run_forever()
|
|
|
|
except Exception as err:
|
|
|
|
if str(err) != 'we are now done':
|
|
|
|
raise
|
|
|
|
|
|
|
|
self.assertEqual(time_calls, [9])
|
|
|
|
self.assertEqual(len(sleep_calls), 2)
|
|
|
|
self.assertLessEqual(sleep_calls[0], cs.interval)
|
|
|
|
self.assertEqual(cs.interval - 1, sleep_calls[1])
|
|
|
|
self.assertEqual(2, fake_generator.call_count)
|
|
|
|
self.assertEqual(cs.reported, 3602)
|
2011-06-15 02:01:01 +00:00
|
|
|
|
|
|
|
def test_run_once(self):
|
|
|
|
# This runs runs_once with fakes twice, the first causing an interim
|
2013-02-12 15:38:40 -08:00
|
|
|
# report, the second with no interim report.
|
2011-06-15 02:01:01 +00:00
|
|
|
time_calls = [0]
|
|
|
|
|
|
|
|
def fake_time():
|
|
|
|
time_calls[0] += 1
|
|
|
|
returns = [1, # Initialized reported time
|
|
|
|
1, # Start time
|
|
|
|
3602, # Is it report time (yes)
|
|
|
|
3602, # Report time
|
|
|
|
3602, # End report time
|
|
|
|
3602, # For elapsed
|
|
|
|
3602, # Start time
|
|
|
|
3603, # Is it report time (no)
|
|
|
|
3604, # End report time
|
2013-09-01 01:30:36 -04:00
|
|
|
3605] # For elapsed
|
2011-06-15 02:01:01 +00:00
|
|
|
if time_calls[0] == len(returns) + 1:
|
|
|
|
raise Exception('we are now done')
|
|
|
|
return returns[time_calls[0] - 1]
|
|
|
|
|
2015-07-26 13:31:17 +03:00
|
|
|
gen_func = ('swift.container.sync_store.'
|
|
|
|
'ContainerSyncStore.synced_containers_generator')
|
|
|
|
with mock.patch('swift.container.sync.InternalClient'), \
|
|
|
|
mock.patch('swift.container.sync.time', fake_time), \
|
|
|
|
mock.patch(gen_func) as fake_generator, \
|
|
|
|
mock.patch('swift.container.sync.ContainerBroker',
|
|
|
|
lambda p: FakeContainerBroker(p, info={
|
|
|
|
'account': 'a', 'container': 'c',
|
|
|
|
'storage_policy_index': 0})):
|
|
|
|
fake_generator.side_effect = [iter(['container.db']),
|
|
|
|
iter(['container.db'])]
|
|
|
|
cs = sync.ContainerSync({}, container_ring=FakeRing())
|
|
|
|
try:
|
|
|
|
cs.run_once()
|
|
|
|
self.assertEqual(time_calls, [6])
|
|
|
|
self.assertEqual(1, fake_generator.call_count)
|
|
|
|
self.assertEqual(cs.reported, 3602)
|
|
|
|
cs.run_once()
|
|
|
|
except Exception as err:
|
|
|
|
if str(err) != 'we are now done':
|
|
|
|
raise
|
|
|
|
|
|
|
|
self.assertEqual(time_calls, [10])
|
|
|
|
self.assertEqual(2, fake_generator.call_count)
|
|
|
|
self.assertEqual(cs.reported, 3604)
|
2011-06-15 02:01:01 +00:00
|
|
|
|
2011-06-16 00:59:55 +00:00
|
|
|
def test_container_sync_not_db(self):
|
|
|
|
cring = FakeRing()
|
2014-12-24 11:52:34 +08:00
|
|
|
with mock.patch('swift.container.sync.InternalClient'):
|
|
|
|
cs = sync.ContainerSync({}, container_ring=cring)
|
2015-08-06 00:18:52 +05:30
|
|
|
self.assertEqual(cs.container_failures, 0)
|
2011-06-16 00:59:55 +00:00
|
|
|
|
|
|
|
def test_container_sync_missing_db(self):
|
|
|
|
cring = FakeRing()
|
2014-12-24 11:52:34 +08:00
|
|
|
with mock.patch('swift.container.sync.InternalClient'):
|
|
|
|
cs = sync.ContainerSync({}, container_ring=cring)
|
2015-07-26 13:31:17 +03:00
|
|
|
|
|
|
|
broker = 'swift.container.backend.ContainerBroker'
|
|
|
|
store = 'swift.container.sync_store.ContainerSyncStore'
|
|
|
|
|
|
|
|
# In this test we call the container_sync instance several
|
|
|
|
# times with a missing db in various combinations.
|
|
|
|
# Since we use the same ContainerSync instance for all tests
|
|
|
|
# its failures counter increases by one with each call.
|
|
|
|
|
|
|
|
# Test the case where get_info returns DatabaseConnectionError
|
|
|
|
# with DB does not exist, and we succeed in deleting it.
|
|
|
|
with mock.patch(broker + '.get_info') as fake_get_info:
|
|
|
|
with mock.patch(store + '.remove_synced_container') as fake_remove:
|
|
|
|
fake_get_info.side_effect = DatabaseConnectionError(
|
|
|
|
'a',
|
|
|
|
"DB doesn't exist")
|
|
|
|
cs.container_sync('isa.db')
|
|
|
|
self.assertEqual(cs.container_failures, 1)
|
|
|
|
self.assertEqual(cs.container_skips, 0)
|
|
|
|
self.assertEqual(1, fake_remove.call_count)
|
|
|
|
self.assertEqual('isa.db', fake_remove.call_args[0][0].db_file)
|
|
|
|
|
|
|
|
# Test the case where get_info returns DatabaseConnectionError
|
|
|
|
# with DB does not exist, and we fail to delete it.
|
|
|
|
with mock.patch(broker + '.get_info') as fake_get_info:
|
|
|
|
with mock.patch(store + '.remove_synced_container') as fake_remove:
|
|
|
|
fake_get_info.side_effect = DatabaseConnectionError(
|
|
|
|
'a',
|
|
|
|
"DB doesn't exist")
|
|
|
|
fake_remove.side_effect = OSError('1')
|
|
|
|
cs.container_sync('isa.db')
|
|
|
|
self.assertEqual(cs.container_failures, 2)
|
|
|
|
self.assertEqual(cs.container_skips, 0)
|
|
|
|
self.assertEqual(1, fake_remove.call_count)
|
|
|
|
self.assertEqual('isa.db', fake_remove.call_args[0][0].db_file)
|
|
|
|
|
|
|
|
# Test the case where get_info returns DatabaseConnectionError
|
|
|
|
# with DB does not exist, and it returns an error != ENOENT.
|
|
|
|
with mock.patch(broker + '.get_info') as fake_get_info:
|
|
|
|
with mock.patch(store + '.remove_synced_container') as fake_remove:
|
|
|
|
fake_get_info.side_effect = DatabaseConnectionError(
|
|
|
|
'a',
|
|
|
|
"DB doesn't exist")
|
|
|
|
fake_remove.side_effect = OSError(errno.EPERM, 'a')
|
|
|
|
cs.container_sync('isa.db')
|
|
|
|
self.assertEqual(cs.container_failures, 3)
|
|
|
|
self.assertEqual(cs.container_skips, 0)
|
|
|
|
self.assertEqual(1, fake_remove.call_count)
|
|
|
|
self.assertEqual('isa.db', fake_remove.call_args[0][0].db_file)
|
|
|
|
|
|
|
|
# Test the case where get_info returns DatabaseConnectionError
|
|
|
|
# error different than DB does not exist
|
|
|
|
with mock.patch(broker + '.get_info') as fake_get_info:
|
|
|
|
with mock.patch(store + '.remove_synced_container') as fake_remove:
|
|
|
|
fake_get_info.side_effect = DatabaseConnectionError('a', 'a')
|
|
|
|
cs.container_sync('isa.db')
|
|
|
|
self.assertEqual(cs.container_failures, 4)
|
|
|
|
self.assertEqual(cs.container_skips, 0)
|
|
|
|
self.assertEqual(0, fake_remove.call_count)
|
2011-06-16 00:59:55 +00:00
|
|
|
|
|
|
|
def test_container_sync_not_my_db(self):
|
|
|
|
# Db could be there due to handoff replication so test that we ignore
|
|
|
|
# those.
|
|
|
|
cring = FakeRing()
|
2014-12-24 11:52:34 +08:00
|
|
|
with mock.patch('swift.container.sync.InternalClient'):
|
Allow 1+ object-servers-per-disk deployment
Enabled by a new > 0 integer config value, "servers_per_port" in the
[DEFAULT] config section for object-server and/or replication server
configs. The setting's integer value determines how many different
object-server workers handle requests for any single unique local port
in the ring. In this mode, the parent swift-object-server process
continues to run as the original user (i.e. root if low-port binding
is required), binds to all ports as defined in the ring, and forks off
the specified number of workers per listen socket. The child, per-port
servers drop privileges and behave pretty much how object-server workers
always have, except that because the ring has unique ports per disk, the
object-servers will only be handling requests for a single disk. The
parent process detects dead servers and restarts them (with the correct
listen socket), starts missing servers when an updated ring file is
found with a device on the server with a new port, and kills extraneous
servers when their port is found to no longer be in the ring. The ring
files are stat'ed at most every "ring_check_interval" seconds, as
configured in the object-server config (same default of 15s).
Immediately stopping all swift-object-worker processes still works by
sending the parent a SIGTERM. Likewise, a SIGHUP to the parent process
still causes the parent process to close all listen sockets and exit,
allowing existing children to finish serving their existing requests.
The drop_privileges helper function now has an optional param to
suppress the setsid() call, which otherwise screws up the child workers'
process management.
The class method RingData.load() can be told to only load the ring
metadata (i.e. everything except replica2part2dev_id) with the optional
kwarg, header_only=True. This is used to keep the parent and all
forked off workers from unnecessarily having full copies of all storage
policy rings in memory.
A new helper class, swift.common.storage_policy.BindPortsCache,
provides a method to return a set of all device ports in all rings for
the server on which it is instantiated (identified by its set of IP
addresses). The BindPortsCache instance will track mtimes of ring
files, so they are not opened more frequently than necessary.
This patch includes enhancements to the probe tests and
object-replicator/object-reconstructor config plumbing to allow the
probe tests to work correctly both in the "normal" config (same IP but
unique ports for each SAIO "server") and a server-per-port setup where
each SAIO "server" must have a unique IP address and unique port per
disk within each "server". The main probe tests only work with 4
servers and 4 disks, but you can see the difference in the rings for the
EC probe tests where there are 2 disks per server for a total of 8
disks. Specifically, swift.common.ring.utils.is_local_device() will
ignore the ports when the "my_port" argument is None. Then,
object-replicator and object-reconstructor both set self.bind_port to
None if server_per_port is enabled. Bonus improvement for IPv6
addresses in is_local_device().
This PR for vagrant-swift-all-in-one will aid in testing this patch:
https://github.com/swiftstack/vagrant-swift-all-in-one/pull/16/
Also allow SAIO to answer is_local_device() better; common SAIO setups
have multiple "servers" all on the same host with different ports for
the different "servers" (which happen to match the IPs specified in the
rings for the devices on each of those "servers").
However, you can configure the SAIO to have different localhost IP
addresses (e.g. 127.0.0.1, 127.0.0.2, etc.) in the ring and in the
servers' config files' bind_ip setting.
This new whataremyips() implementation combined with a little plumbing
allows is_local_device() to accurately answer, even on an SAIO.
In the default case (an unspecified bind_ip defaults to '0.0.0.0') as
well as an explict "bind to everything" like '0.0.0.0' or '::',
whataremyips() behaves as it always has, returning all IP addresses for
the server.
Also updated probe tests to handle each "server" in the SAIO having a
unique IP address.
For some (noisy) benchmarks that show servers_per_port=X is at least as
good as the same number of "normal" workers:
https://gist.github.com/dbishop/c214f89ca708a6b1624a#file-summary-md
Benchmarks showing the benefits of I/O isolation with a small number of
slow disks:
https://gist.github.com/dbishop/fd0ab067babdecfb07ca#file-results-md
If you were wondering what the overhead of threads_per_disk looks like:
https://gist.github.com/dbishop/1d14755fedc86a161718#file-tabular_results-md
DocImpact
Change-Id: I2239a4000b41a7e7cc53465ce794af49d44796c6
2015-05-14 22:14:15 -07:00
|
|
|
cs = sync.ContainerSync({
|
|
|
|
'bind_ip': '10.0.0.0',
|
|
|
|
}, container_ring=cring)
|
|
|
|
# Plumbing test for bind_ip and whataremyips()
|
|
|
|
self.assertEqual(['10.0.0.0'], cs._myips)
|
2011-06-16 00:59:55 +00:00
|
|
|
orig_ContainerBroker = sync.ContainerBroker
|
|
|
|
try:
|
2013-09-01 01:30:36 -04:00
|
|
|
sync.ContainerBroker = lambda p: FakeContainerBroker(
|
2014-04-09 16:10:13 -07:00
|
|
|
p, info={'account': 'a', 'container': 'c',
|
|
|
|
'storage_policy_index': 0})
|
2011-06-16 00:59:55 +00:00
|
|
|
cs._myips = ['127.0.0.1'] # No match
|
|
|
|
cs._myport = 1 # No match
|
|
|
|
cs.container_sync('isa.db')
|
2015-08-06 00:18:52 +05:30
|
|
|
self.assertEqual(cs.container_failures, 0)
|
2011-06-16 00:59:55 +00:00
|
|
|
|
|
|
|
cs._myips = ['10.0.0.0'] # Match
|
|
|
|
cs._myport = 1 # No match
|
|
|
|
cs.container_sync('isa.db')
|
2015-08-06 00:18:52 +05:30
|
|
|
self.assertEqual(cs.container_failures, 0)
|
2011-06-16 00:59:55 +00:00
|
|
|
|
|
|
|
cs._myips = ['127.0.0.1'] # No match
|
|
|
|
cs._myport = 1000 # Match
|
|
|
|
cs.container_sync('isa.db')
|
2015-08-06 00:18:52 +05:30
|
|
|
self.assertEqual(cs.container_failures, 0)
|
2011-06-16 00:59:55 +00:00
|
|
|
|
|
|
|
cs._myips = ['10.0.0.0'] # Match
|
|
|
|
cs._myport = 1000 # Match
|
|
|
|
# This complete match will cause the 1 container failure since the
|
|
|
|
# broker's info doesn't contain sync point keys
|
|
|
|
cs.container_sync('isa.db')
|
2015-08-06 00:18:52 +05:30
|
|
|
self.assertEqual(cs.container_failures, 1)
|
2011-06-16 00:59:55 +00:00
|
|
|
finally:
|
|
|
|
sync.ContainerBroker = orig_ContainerBroker
|
|
|
|
|
|
|
|
def test_container_sync_deleted(self):
|
|
|
|
cring = FakeRing()
|
2014-12-24 11:52:34 +08:00
|
|
|
with mock.patch('swift.container.sync.InternalClient'):
|
|
|
|
cs = sync.ContainerSync({}, container_ring=cring)
|
2011-06-16 00:59:55 +00:00
|
|
|
orig_ContainerBroker = sync.ContainerBroker
|
|
|
|
try:
|
2013-09-01 01:30:36 -04:00
|
|
|
sync.ContainerBroker = lambda p: FakeContainerBroker(
|
2014-04-09 16:10:13 -07:00
|
|
|
p, info={'account': 'a', 'container': 'c',
|
|
|
|
'storage_policy_index': 0}, deleted=False)
|
2011-06-16 00:59:55 +00:00
|
|
|
cs._myips = ['10.0.0.0'] # Match
|
|
|
|
cs._myport = 1000 # Match
|
|
|
|
# This complete match will cause the 1 container failure since the
|
|
|
|
# broker's info doesn't contain sync point keys
|
|
|
|
cs.container_sync('isa.db')
|
2015-08-06 00:18:52 +05:30
|
|
|
self.assertEqual(cs.container_failures, 1)
|
2011-06-16 00:59:55 +00:00
|
|
|
|
2013-09-01 01:30:36 -04:00
|
|
|
sync.ContainerBroker = lambda p: FakeContainerBroker(
|
2014-04-09 16:10:13 -07:00
|
|
|
p, info={'account': 'a', 'container': 'c',
|
|
|
|
'storage_policy_index': 0}, deleted=True)
|
2011-06-16 00:59:55 +00:00
|
|
|
# This complete match will not cause any more container failures
|
|
|
|
# since the broker indicates deletion
|
|
|
|
cs.container_sync('isa.db')
|
2015-08-06 00:18:52 +05:30
|
|
|
self.assertEqual(cs.container_failures, 1)
|
2011-06-16 00:59:55 +00:00
|
|
|
finally:
|
|
|
|
sync.ContainerBroker = orig_ContainerBroker
|
|
|
|
|
|
|
|
def test_container_sync_no_to_or_key(self):
|
|
|
|
cring = FakeRing()
|
2014-12-24 11:52:34 +08:00
|
|
|
with mock.patch('swift.container.sync.InternalClient'):
|
|
|
|
cs = sync.ContainerSync({}, container_ring=cring)
|
2011-06-16 00:59:55 +00:00
|
|
|
orig_ContainerBroker = sync.ContainerBroker
|
|
|
|
try:
|
2013-09-01 01:30:36 -04:00
|
|
|
sync.ContainerBroker = lambda p: FakeContainerBroker(
|
|
|
|
p, info={'account': 'a', 'container': 'c',
|
2014-04-09 16:10:13 -07:00
|
|
|
'storage_policy_index': 0,
|
2013-09-01 01:30:36 -04:00
|
|
|
'x_container_sync_point1': -1,
|
|
|
|
'x_container_sync_point2': -1})
|
2011-06-16 00:59:55 +00:00
|
|
|
cs._myips = ['10.0.0.0'] # Match
|
|
|
|
cs._myport = 1000 # Match
|
|
|
|
# This complete match will be skipped since the broker's metadata
|
|
|
|
# has no x-container-sync-to or x-container-sync-key
|
|
|
|
cs.container_sync('isa.db')
|
2015-08-06 00:18:52 +05:30
|
|
|
self.assertEqual(cs.container_failures, 0)
|
|
|
|
self.assertEqual(cs.container_skips, 1)
|
2013-06-25 15:16:35 -04:00
|
|
|
|
2013-09-01 01:30:36 -04:00
|
|
|
sync.ContainerBroker = lambda p: FakeContainerBroker(
|
|
|
|
p, info={'account': 'a', 'container': 'c',
|
2014-04-09 16:10:13 -07:00
|
|
|
'storage_policy_index': 0,
|
2013-09-01 01:30:36 -04:00
|
|
|
'x_container_sync_point1': -1,
|
|
|
|
'x_container_sync_point2': -1},
|
2011-06-16 00:59:55 +00:00
|
|
|
metadata={'x-container-sync-to': ('http://127.0.0.1/a/c', 1)})
|
|
|
|
cs._myips = ['10.0.0.0'] # Match
|
|
|
|
cs._myport = 1000 # Match
|
|
|
|
# This complete match will be skipped since the broker's metadata
|
|
|
|
# has no x-container-sync-key
|
|
|
|
cs.container_sync('isa.db')
|
2015-08-06 00:18:52 +05:30
|
|
|
self.assertEqual(cs.container_failures, 0)
|
|
|
|
self.assertEqual(cs.container_skips, 2)
|
2013-06-25 15:16:35 -04:00
|
|
|
|
2013-09-01 01:30:36 -04:00
|
|
|
sync.ContainerBroker = lambda p: FakeContainerBroker(
|
|
|
|
p, info={'account': 'a', 'container': 'c',
|
2014-04-09 16:10:13 -07:00
|
|
|
'storage_policy_index': 0,
|
2013-09-01 01:30:36 -04:00
|
|
|
'x_container_sync_point1': -1,
|
|
|
|
'x_container_sync_point2': -1},
|
2011-06-16 00:59:55 +00:00
|
|
|
metadata={'x-container-sync-key': ('key', 1)})
|
|
|
|
cs._myips = ['10.0.0.0'] # Match
|
|
|
|
cs._myport = 1000 # Match
|
|
|
|
# This complete match will be skipped since the broker's metadata
|
|
|
|
# has no x-container-sync-to
|
|
|
|
cs.container_sync('isa.db')
|
2015-08-06 00:18:52 +05:30
|
|
|
self.assertEqual(cs.container_failures, 0)
|
|
|
|
self.assertEqual(cs.container_skips, 3)
|
2013-06-25 15:16:35 -04:00
|
|
|
|
2013-09-01 01:30:36 -04:00
|
|
|
sync.ContainerBroker = lambda p: FakeContainerBroker(
|
|
|
|
p, info={'account': 'a', 'container': 'c',
|
2014-04-09 16:10:13 -07:00
|
|
|
'storage_policy_index': 0,
|
2013-09-01 01:30:36 -04:00
|
|
|
'x_container_sync_point1': -1,
|
|
|
|
'x_container_sync_point2': -1},
|
2011-06-16 00:59:55 +00:00
|
|
|
metadata={'x-container-sync-to': ('http://127.0.0.1/a/c', 1),
|
|
|
|
'x-container-sync-key': ('key', 1)})
|
|
|
|
cs._myips = ['10.0.0.0'] # Match
|
|
|
|
cs._myport = 1000 # Match
|
|
|
|
cs.allowed_sync_hosts = []
|
|
|
|
# This complete match will cause a container failure since the
|
|
|
|
# sync-to won't validate as allowed.
|
|
|
|
cs.container_sync('isa.db')
|
2015-08-06 00:18:52 +05:30
|
|
|
self.assertEqual(cs.container_failures, 1)
|
|
|
|
self.assertEqual(cs.container_skips, 3)
|
2013-06-25 15:16:35 -04:00
|
|
|
|
2013-09-01 01:30:36 -04:00
|
|
|
sync.ContainerBroker = lambda p: FakeContainerBroker(
|
|
|
|
p, info={'account': 'a', 'container': 'c',
|
2014-04-09 16:10:13 -07:00
|
|
|
'storage_policy_index': 0,
|
2013-09-01 01:30:36 -04:00
|
|
|
'x_container_sync_point1': -1,
|
|
|
|
'x_container_sync_point2': -1},
|
2011-06-16 00:59:55 +00:00
|
|
|
metadata={'x-container-sync-to': ('http://127.0.0.1/a/c', 1),
|
|
|
|
'x-container-sync-key': ('key', 1)})
|
|
|
|
cs._myips = ['10.0.0.0'] # Match
|
|
|
|
cs._myport = 1000 # Match
|
|
|
|
cs.allowed_sync_hosts = ['127.0.0.1']
|
|
|
|
# This complete match will succeed completely since the broker
|
|
|
|
# get_items_since will return no new rows.
|
|
|
|
cs.container_sync('isa.db')
|
2015-08-06 00:18:52 +05:30
|
|
|
self.assertEqual(cs.container_failures, 1)
|
|
|
|
self.assertEqual(cs.container_skips, 3)
|
2011-06-16 00:59:55 +00:00
|
|
|
finally:
|
|
|
|
sync.ContainerBroker = orig_ContainerBroker
|
|
|
|
|
|
|
|
def test_container_stop_at(self):
|
|
|
|
cring = FakeRing()
|
2014-12-24 11:52:34 +08:00
|
|
|
with mock.patch('swift.container.sync.InternalClient'):
|
|
|
|
cs = sync.ContainerSync({}, container_ring=cring)
|
2011-06-16 00:59:55 +00:00
|
|
|
orig_ContainerBroker = sync.ContainerBroker
|
|
|
|
orig_time = sync.time
|
|
|
|
try:
|
2013-09-01 01:30:36 -04:00
|
|
|
sync.ContainerBroker = lambda p: FakeContainerBroker(
|
|
|
|
p, info={'account': 'a', 'container': 'c',
|
2014-04-09 16:10:13 -07:00
|
|
|
'storage_policy_index': 0,
|
2013-09-01 01:30:36 -04:00
|
|
|
'x_container_sync_point1': -1,
|
|
|
|
'x_container_sync_point2': -1},
|
2011-06-16 00:59:55 +00:00
|
|
|
metadata={'x-container-sync-to': ('http://127.0.0.1/a/c', 1),
|
|
|
|
'x-container-sync-key': ('key', 1)},
|
|
|
|
items_since=['erroneous data'])
|
|
|
|
cs._myips = ['10.0.0.0'] # Match
|
|
|
|
cs._myport = 1000 # Match
|
|
|
|
cs.allowed_sync_hosts = ['127.0.0.1']
|
|
|
|
# This sync will fail since the items_since data is bad.
|
|
|
|
cs.container_sync('isa.db')
|
2015-08-06 00:18:52 +05:30
|
|
|
self.assertEqual(cs.container_failures, 1)
|
|
|
|
self.assertEqual(cs.container_skips, 0)
|
2011-06-16 00:59:55 +00:00
|
|
|
|
|
|
|
# Set up fake times to make the sync short-circuit as having taken
|
|
|
|
# too long
|
|
|
|
fake_times = [
|
|
|
|
1.0, # Compute the time to move on
|
|
|
|
100000.0, # Compute if it's time to move on from first loop
|
|
|
|
100000.0] # Compute if it's time to move on from second loop
|
|
|
|
|
|
|
|
def fake_time():
|
|
|
|
return fake_times.pop(0)
|
2013-06-25 15:16:35 -04:00
|
|
|
|
2011-06-16 00:59:55 +00:00
|
|
|
sync.time = fake_time
|
|
|
|
# This same sync won't fail since it will look like it took so long
|
|
|
|
# as to be time to move on (before it ever actually tries to do
|
|
|
|
# anything).
|
|
|
|
cs.container_sync('isa.db')
|
2015-08-06 00:18:52 +05:30
|
|
|
self.assertEqual(cs.container_failures, 1)
|
|
|
|
self.assertEqual(cs.container_skips, 0)
|
2011-06-16 00:59:55 +00:00
|
|
|
finally:
|
|
|
|
sync.ContainerBroker = orig_ContainerBroker
|
|
|
|
sync.time = orig_time
|
|
|
|
|
|
|
|
def test_container_first_loop(self):
|
|
|
|
cring = FakeRing()
|
2014-12-24 11:52:34 +08:00
|
|
|
with mock.patch('swift.container.sync.InternalClient'):
|
|
|
|
cs = sync.ContainerSync({}, container_ring=cring)
|
2011-06-16 00:59:55 +00:00
|
|
|
|
2013-08-06 14:15:48 +02:00
|
|
|
def fake_hash_path(account, container, obj, raw_digest=False):
|
|
|
|
# Ensures that no rows match for full syncing, ordinal is 0 and
|
|
|
|
# all hashes are 0
|
|
|
|
return '\x00' * 16
|
|
|
|
fcb = FakeContainerBroker(
|
|
|
|
'path',
|
|
|
|
info={'account': 'a', 'container': 'c',
|
2014-04-09 16:10:13 -07:00
|
|
|
'storage_policy_index': 0,
|
2013-08-06 14:15:48 +02:00
|
|
|
'x_container_sync_point1': 2,
|
|
|
|
'x_container_sync_point2': -1},
|
|
|
|
metadata={'x-container-sync-to': ('http://127.0.0.1/a/c', 1),
|
|
|
|
'x-container-sync-key': ('key', 1)},
|
|
|
|
items_since=[{'ROWID': 1, 'name': 'o'}])
|
2015-10-21 13:05:37 -07:00
|
|
|
with mock.patch('swift.container.sync.ContainerBroker',
|
|
|
|
lambda p: fcb), \
|
|
|
|
mock.patch('swift.container.sync.hash_path', fake_hash_path):
|
2011-06-16 00:59:55 +00:00
|
|
|
cs._myips = ['10.0.0.0'] # Match
|
|
|
|
cs._myport = 1000 # Match
|
|
|
|
cs.allowed_sync_hosts = ['127.0.0.1']
|
|
|
|
cs.container_sync('isa.db')
|
|
|
|
# Succeeds because no rows match
|
2015-08-06 00:18:52 +05:30
|
|
|
self.assertEqual(cs.container_failures, 1)
|
|
|
|
self.assertEqual(cs.container_skips, 0)
|
2017-06-07 11:37:01 +08:00
|
|
|
self.assertIsNone(fcb.sync_point1)
|
2015-08-06 00:18:52 +05:30
|
|
|
self.assertEqual(fcb.sync_point2, -1)
|
2011-06-16 00:59:55 +00:00
|
|
|
|
2013-08-06 14:15:48 +02:00
|
|
|
def fake_hash_path(account, container, obj, raw_digest=False):
|
|
|
|
# Ensures that all rows match for full syncing, ordinal is 0
|
|
|
|
# and all hashes are 1
|
|
|
|
return '\x01' * 16
|
|
|
|
fcb = FakeContainerBroker('path', info={'account': 'a',
|
|
|
|
'container': 'c',
|
2014-04-09 16:10:13 -07:00
|
|
|
'storage_policy_index': 0,
|
2013-08-06 14:15:48 +02:00
|
|
|
'x_container_sync_point1': 1,
|
|
|
|
'x_container_sync_point2': 1},
|
|
|
|
metadata={'x-container-sync-to':
|
|
|
|
('http://127.0.0.1/a/c', 1),
|
|
|
|
'x-container-sync-key':
|
|
|
|
('key', 1)},
|
|
|
|
items_since=[{'ROWID': 1, 'name': 'o'}])
|
2015-10-21 13:05:37 -07:00
|
|
|
with mock.patch('swift.container.sync.ContainerBroker',
|
|
|
|
lambda p: fcb), \
|
|
|
|
mock.patch('swift.container.sync.hash_path', fake_hash_path):
|
2011-06-16 00:59:55 +00:00
|
|
|
cs._myips = ['10.0.0.0'] # Match
|
|
|
|
cs._myport = 1000 # Match
|
|
|
|
cs.allowed_sync_hosts = ['127.0.0.1']
|
|
|
|
cs.container_sync('isa.db')
|
2012-11-16 18:51:22 +00:00
|
|
|
# Succeeds because the two sync points haven't deviated yet
|
2015-08-06 00:18:52 +05:30
|
|
|
self.assertEqual(cs.container_failures, 1)
|
|
|
|
self.assertEqual(cs.container_skips, 0)
|
|
|
|
self.assertEqual(fcb.sync_point1, -1)
|
|
|
|
self.assertEqual(fcb.sync_point2, -1)
|
2011-06-16 00:59:55 +00:00
|
|
|
|
2013-08-06 14:15:48 +02:00
|
|
|
fcb = FakeContainerBroker(
|
|
|
|
'path',
|
|
|
|
info={'account': 'a', 'container': 'c',
|
2014-04-09 16:10:13 -07:00
|
|
|
'storage_policy_index': 0,
|
2013-08-06 14:15:48 +02:00
|
|
|
'x_container_sync_point1': 2,
|
|
|
|
'x_container_sync_point2': -1},
|
|
|
|
metadata={'x-container-sync-to': ('http://127.0.0.1/a/c', 1),
|
|
|
|
'x-container-sync-key': ('key', 1)},
|
|
|
|
items_since=[{'ROWID': 1, 'name': 'o'}])
|
|
|
|
with mock.patch('swift.container.sync.ContainerBroker', lambda p: fcb):
|
2011-06-16 00:59:55 +00:00
|
|
|
cs._myips = ['10.0.0.0'] # Match
|
|
|
|
cs._myport = 1000 # Match
|
|
|
|
cs.allowed_sync_hosts = ['127.0.0.1']
|
|
|
|
cs.container_sync('isa.db')
|
|
|
|
# Fails because container_sync_row will fail since the row has no
|
|
|
|
# 'deleted' key
|
2015-08-06 00:18:52 +05:30
|
|
|
self.assertEqual(cs.container_failures, 2)
|
|
|
|
self.assertEqual(cs.container_skips, 0)
|
2017-06-07 11:37:01 +08:00
|
|
|
self.assertIsNone(fcb.sync_point1)
|
2015-08-06 00:18:52 +05:30
|
|
|
self.assertEqual(fcb.sync_point2, -1)
|
2011-06-16 00:59:55 +00:00
|
|
|
|
2013-08-06 14:15:48 +02:00
|
|
|
def fake_delete_object(*args, **kwargs):
|
|
|
|
raise ClientException
|
|
|
|
fcb = FakeContainerBroker(
|
|
|
|
'path',
|
|
|
|
info={'account': 'a', 'container': 'c',
|
2014-04-09 16:10:13 -07:00
|
|
|
'storage_policy_index': 0,
|
2013-08-06 14:15:48 +02:00
|
|
|
'x_container_sync_point1': 2,
|
|
|
|
'x_container_sync_point2': -1},
|
|
|
|
metadata={'x-container-sync-to': ('http://127.0.0.1/a/c', 1),
|
|
|
|
'x-container-sync-key': ('key', 1)},
|
|
|
|
items_since=[{'ROWID': 1, 'name': 'o', 'created_at': '1.2',
|
|
|
|
'deleted': True}])
|
2015-10-21 13:05:37 -07:00
|
|
|
with mock.patch('swift.container.sync.ContainerBroker',
|
|
|
|
lambda p: fcb), \
|
2013-08-06 14:15:48 +02:00
|
|
|
mock.patch('swift.container.sync.delete_object',
|
2015-10-21 13:05:37 -07:00
|
|
|
fake_delete_object):
|
2011-06-16 00:59:55 +00:00
|
|
|
cs._myips = ['10.0.0.0'] # Match
|
|
|
|
cs._myport = 1000 # Match
|
|
|
|
cs.allowed_sync_hosts = ['127.0.0.1']
|
|
|
|
cs.container_sync('isa.db')
|
|
|
|
# Fails because delete_object fails
|
2015-08-06 00:18:52 +05:30
|
|
|
self.assertEqual(cs.container_failures, 3)
|
|
|
|
self.assertEqual(cs.container_skips, 0)
|
2017-06-07 11:37:01 +08:00
|
|
|
self.assertIsNone(fcb.sync_point1)
|
2015-08-06 00:18:52 +05:30
|
|
|
self.assertEqual(fcb.sync_point2, -1)
|
2011-06-16 00:59:55 +00:00
|
|
|
|
2013-08-06 14:15:48 +02:00
|
|
|
fcb = FakeContainerBroker(
|
|
|
|
'path',
|
|
|
|
info={'account': 'a', 'container': 'c',
|
2014-04-09 16:10:13 -07:00
|
|
|
'storage_policy_index': 0,
|
2013-08-06 14:15:48 +02:00
|
|
|
'x_container_sync_point1': 2,
|
|
|
|
'x_container_sync_point2': -1},
|
|
|
|
metadata={'x-container-sync-to': ('http://127.0.0.1/a/c', 1),
|
|
|
|
'x-container-sync-key': ('key', 1)},
|
|
|
|
items_since=[{'ROWID': 1, 'name': 'o', 'created_at': '1.2',
|
|
|
|
'deleted': True}])
|
2015-10-21 13:05:37 -07:00
|
|
|
with mock.patch('swift.container.sync.ContainerBroker',
|
|
|
|
lambda p: fcb), \
|
2013-08-06 14:15:48 +02:00
|
|
|
mock.patch('swift.container.sync.delete_object',
|
2015-10-21 13:05:37 -07:00
|
|
|
lambda *x, **y: None):
|
2011-06-16 00:59:55 +00:00
|
|
|
cs._myips = ['10.0.0.0'] # Match
|
|
|
|
cs._myport = 1000 # Match
|
|
|
|
cs.allowed_sync_hosts = ['127.0.0.1']
|
|
|
|
cs.container_sync('isa.db')
|
|
|
|
# Succeeds because delete_object succeeds
|
2015-08-06 00:18:52 +05:30
|
|
|
self.assertEqual(cs.container_failures, 3)
|
|
|
|
self.assertEqual(cs.container_skips, 0)
|
2017-06-07 11:37:01 +08:00
|
|
|
self.assertIsNone(fcb.sync_point1)
|
2015-08-06 00:18:52 +05:30
|
|
|
self.assertEqual(fcb.sync_point2, 1)
|
2011-06-16 00:59:55 +00:00
|
|
|
|
|
|
|
def test_container_second_loop(self):
|
|
|
|
cring = FakeRing()
|
2014-12-24 11:52:34 +08:00
|
|
|
with mock.patch('swift.container.sync.InternalClient'):
|
|
|
|
cs = sync.ContainerSync({}, container_ring=cring,
|
|
|
|
logger=self.logger)
|
2011-06-16 00:59:55 +00:00
|
|
|
orig_ContainerBroker = sync.ContainerBroker
|
|
|
|
orig_hash_path = sync.hash_path
|
|
|
|
orig_delete_object = sync.delete_object
|
|
|
|
try:
|
|
|
|
# We'll ensure the first loop is always skipped by keeping the two
|
|
|
|
# sync points equal
|
|
|
|
|
|
|
|
def fake_hash_path(account, container, obj, raw_digest=False):
|
|
|
|
# Ensures that no rows match for second loop, ordinal is 0 and
|
|
|
|
# all hashes are 1
|
|
|
|
return '\x01' * 16
|
|
|
|
|
|
|
|
sync.hash_path = fake_hash_path
|
2013-09-01 01:30:36 -04:00
|
|
|
fcb = FakeContainerBroker(
|
|
|
|
'path',
|
2011-06-16 00:59:55 +00:00
|
|
|
info={'account': 'a', 'container': 'c',
|
2014-04-09 16:10:13 -07:00
|
|
|
'storage_policy_index': 0,
|
2011-06-16 00:59:55 +00:00
|
|
|
'x_container_sync_point1': -1,
|
|
|
|
'x_container_sync_point2': -1},
|
|
|
|
metadata={'x-container-sync-to': ('http://127.0.0.1/a/c', 1),
|
|
|
|
'x-container-sync-key': ('key', 1)},
|
|
|
|
items_since=[{'ROWID': 1, 'name': 'o'}])
|
|
|
|
sync.ContainerBroker = lambda p: fcb
|
|
|
|
cs._myips = ['10.0.0.0'] # Match
|
|
|
|
cs._myport = 1000 # Match
|
|
|
|
cs.allowed_sync_hosts = ['127.0.0.1']
|
|
|
|
cs.container_sync('isa.db')
|
|
|
|
# Succeeds because no rows match
|
2015-08-06 00:18:52 +05:30
|
|
|
self.assertEqual(cs.container_failures, 0)
|
|
|
|
self.assertEqual(cs.container_skips, 0)
|
|
|
|
self.assertEqual(fcb.sync_point1, 1)
|
2017-06-07 11:37:01 +08:00
|
|
|
self.assertIsNone(fcb.sync_point2)
|
2011-06-16 00:59:55 +00:00
|
|
|
|
|
|
|
def fake_hash_path(account, container, obj, raw_digest=False):
|
|
|
|
# Ensures that all rows match for second loop, ordinal is 0 and
|
|
|
|
# all hashes are 0
|
|
|
|
return '\x00' * 16
|
|
|
|
|
|
|
|
def fake_delete_object(*args, **kwargs):
|
|
|
|
pass
|
|
|
|
|
|
|
|
sync.hash_path = fake_hash_path
|
|
|
|
sync.delete_object = fake_delete_object
|
2013-09-01 01:30:36 -04:00
|
|
|
fcb = FakeContainerBroker(
|
|
|
|
'path',
|
2011-06-16 00:59:55 +00:00
|
|
|
info={'account': 'a', 'container': 'c',
|
2014-04-09 16:10:13 -07:00
|
|
|
'storage_policy_index': 0,
|
2011-06-16 00:59:55 +00:00
|
|
|
'x_container_sync_point1': -1,
|
|
|
|
'x_container_sync_point2': -1},
|
|
|
|
metadata={'x-container-sync-to': ('http://127.0.0.1/a/c', 1),
|
|
|
|
'x-container-sync-key': ('key', 1)},
|
|
|
|
items_since=[{'ROWID': 1, 'name': 'o'}])
|
|
|
|
sync.ContainerBroker = lambda p: fcb
|
|
|
|
cs._myips = ['10.0.0.0'] # Match
|
|
|
|
cs._myport = 1000 # Match
|
|
|
|
cs.allowed_sync_hosts = ['127.0.0.1']
|
|
|
|
cs.container_sync('isa.db')
|
|
|
|
# Fails because row is missing 'deleted' key
|
2013-02-27 00:49:51 +02:00
|
|
|
# Nevertheless the fault is skipped
|
2015-08-06 00:18:52 +05:30
|
|
|
self.assertEqual(cs.container_failures, 1)
|
|
|
|
self.assertEqual(cs.container_skips, 0)
|
|
|
|
self.assertEqual(fcb.sync_point1, 1)
|
2017-06-07 11:37:01 +08:00
|
|
|
self.assertIsNone(fcb.sync_point2)
|
2011-06-16 00:59:55 +00:00
|
|
|
|
2013-09-01 01:30:36 -04:00
|
|
|
fcb = FakeContainerBroker(
|
|
|
|
'path',
|
2011-06-16 00:59:55 +00:00
|
|
|
info={'account': 'a', 'container': 'c',
|
2014-04-09 16:10:13 -07:00
|
|
|
'storage_policy_index': 0,
|
2011-06-16 00:59:55 +00:00
|
|
|
'x_container_sync_point1': -1,
|
|
|
|
'x_container_sync_point2': -1},
|
|
|
|
metadata={'x-container-sync-to': ('http://127.0.0.1/a/c', 1),
|
|
|
|
'x-container-sync-key': ('key', 1)},
|
|
|
|
items_since=[{'ROWID': 1, 'name': 'o', 'created_at': '1.2',
|
|
|
|
'deleted': True}])
|
|
|
|
sync.ContainerBroker = lambda p: fcb
|
|
|
|
cs._myips = ['10.0.0.0'] # Match
|
|
|
|
cs._myport = 1000 # Match
|
|
|
|
cs.allowed_sync_hosts = ['127.0.0.1']
|
|
|
|
cs.container_sync('isa.db')
|
|
|
|
# Succeeds because row now has 'deleted' key and delete_object
|
|
|
|
# succeeds
|
2015-08-06 00:18:52 +05:30
|
|
|
self.assertEqual(cs.container_failures, 1)
|
|
|
|
self.assertEqual(cs.container_skips, 0)
|
|
|
|
self.assertEqual(fcb.sync_point1, 1)
|
2017-06-07 11:37:01 +08:00
|
|
|
self.assertIsNone(fcb.sync_point2)
|
2011-06-16 00:59:55 +00:00
|
|
|
finally:
|
|
|
|
sync.ContainerBroker = orig_ContainerBroker
|
|
|
|
sync.hash_path = orig_hash_path
|
|
|
|
sync.delete_object = orig_delete_object
|
|
|
|
|
2016-02-18 14:50:08 +02:00
|
|
|
def test_container_report(self):
|
|
|
|
container_stats = {'puts': 0,
|
|
|
|
'deletes': 0,
|
|
|
|
'bytes': 0}
|
|
|
|
|
|
|
|
def fake_container_sync_row(self, row, sync_to,
|
|
|
|
user_key, broker, info, realm, realm_key):
|
|
|
|
if 'deleted' in row:
|
|
|
|
container_stats['deletes'] += 1
|
|
|
|
return True
|
|
|
|
|
|
|
|
container_stats['puts'] += 1
|
|
|
|
container_stats['bytes'] += row['size']
|
|
|
|
return True
|
|
|
|
|
|
|
|
def fake_hash_path(account, container, obj, raw_digest=False):
|
|
|
|
# Ensures that no rows match for second loop, ordinal is 0 and
|
|
|
|
# all hashes are 1
|
|
|
|
return '\x01' * 16
|
|
|
|
|
|
|
|
fcb = FakeContainerBroker(
|
|
|
|
'path',
|
|
|
|
info={'account': 'a', 'container': 'c',
|
|
|
|
'storage_policy_index': 0,
|
|
|
|
'x_container_sync_point1': 5,
|
|
|
|
'x_container_sync_point2': -1},
|
|
|
|
metadata={'x-container-sync-to': ('http://127.0.0.1/a/c', 1),
|
|
|
|
'x-container-sync-key': ('key', 1)},
|
|
|
|
items_since=[{'ROWID': 1, 'name': 'o1', 'size': 0,
|
|
|
|
'deleted': True},
|
|
|
|
{'ROWID': 2, 'name': 'o2', 'size': 1010},
|
|
|
|
{'ROWID': 3, 'name': 'o3', 'size': 0,
|
|
|
|
'deleted': True},
|
|
|
|
{'ROWID': 4, 'name': 'o4', 'size': 90},
|
|
|
|
{'ROWID': 5, 'name': 'o5', 'size': 0}])
|
|
|
|
|
|
|
|
with mock.patch('swift.container.sync.InternalClient'), \
|
|
|
|
mock.patch('swift.container.sync.hash_path',
|
|
|
|
fake_hash_path), \
|
|
|
|
mock.patch('swift.container.sync.ContainerBroker',
|
|
|
|
lambda p: fcb):
|
|
|
|
cring = FakeRing()
|
|
|
|
cs = sync.ContainerSync({}, container_ring=cring,
|
|
|
|
logger=self.logger)
|
|
|
|
cs.container_stats = container_stats
|
|
|
|
cs._myips = ['10.0.0.0'] # Match
|
|
|
|
cs._myport = 1000 # Match
|
|
|
|
cs.allowed_sync_hosts = ['127.0.0.1']
|
|
|
|
funcType = type(sync.ContainerSync.container_sync_row)
|
|
|
|
cs.container_sync_row = funcType(fake_container_sync_row,
|
|
|
|
cs, sync.ContainerSync)
|
|
|
|
cs.container_sync('isa.db')
|
|
|
|
# Succeeds because no rows match
|
|
|
|
log_line = cs.logger.get_lines_for_level('info')[0]
|
|
|
|
lines = log_line.split(',')
|
|
|
|
self.assertTrue('sync_point2: 5', lines.pop().strip())
|
|
|
|
self.assertTrue('sync_point1: 5', lines.pop().strip())
|
|
|
|
self.assertTrue('bytes: 1100', lines.pop().strip())
|
|
|
|
self.assertTrue('deletes: 2', lines.pop().strip())
|
|
|
|
self.assertTrue('puts: 3', lines.pop().strip())
|
|
|
|
|
2011-06-16 00:59:55 +00:00
|
|
|
def test_container_sync_row_delete(self):
|
2013-12-08 09:13:59 +00:00
|
|
|
self._test_container_sync_row_delete(None, None)
|
|
|
|
|
|
|
|
def test_container_sync_row_delete_using_realms(self):
|
|
|
|
self._test_container_sync_row_delete('US', 'realm_key')
|
|
|
|
|
|
|
|
def _test_container_sync_row_delete(self, realm, realm_key):
|
|
|
|
orig_uuid = sync.uuid
|
2011-06-16 00:59:55 +00:00
|
|
|
orig_delete_object = sync.delete_object
|
|
|
|
try:
|
2013-12-08 09:13:59 +00:00
|
|
|
class FakeUUID(object):
|
|
|
|
class uuid4(object):
|
|
|
|
hex = 'abcdef'
|
|
|
|
|
|
|
|
sync.uuid = FakeUUID
|
Update container on fast-POST
This patch makes a number of changes to enable content-type
metadata to be updated when using the fast-POST mode of
operation, as proposed in the associated spec [1].
* the object server and diskfile are modified to allow
content-type to be updated by a POST and the updated value
to be stored in .meta files.
* the object server accepts PUTs and DELETEs with older
timestamps than existing .meta files. This is to be
consistent with replication that will leave a later .meta
file in place when replicating a .data file.
* the diskfile interface is modified to provide accessor
methods for the content-type and its timestamp.
* the naming of .meta files is modified to encode two
timestamps when the .meta file contains a content-type value
that was set prior to the latest metadata update; this
enables consistency to be achieved when rsync is used for
replication.
* ssync is modified to sync meta files when content-type
differs between local and remote copies of objects.
* the object server issues container updates when handling
POST requests, notifying the container server of the current
immutable metadata (etag, size, hash, swift_bytes),
content-type with their respective timestamps, and the
mutable metadata timestamp.
* the container server maintains the most recently reported
values for immutable metadata, content-type and mutable
metadata, each with their respective timestamps, in a single
db row.
* new probe tests verify that replication achieves eventual
consistency of containers and objects after discrete updates
to content-type and mutable metadata, and that container-sync
sync's objects after fast-post updates.
[1] spec change-id: I60688efc3df692d3a39557114dca8c5490f7837e
Change-Id: Ia597cd460bb5fd40aa92e886e3e18a7542603d01
2015-08-10 10:30:10 -05:00
|
|
|
ts_data = Timestamp(1.1)
|
2011-06-16 00:59:55 +00:00
|
|
|
|
2014-05-27 21:10:47 +00:00
|
|
|
def fake_delete_object(path, name=None, headers=None, proxy=None,
|
2015-02-18 10:17:23 +00:00
|
|
|
logger=None, timeout=None):
|
2015-08-06 00:18:52 +05:30
|
|
|
self.assertEqual(path, 'http://sync/to/path')
|
|
|
|
self.assertEqual(name, 'object')
|
2013-12-08 09:13:59 +00:00
|
|
|
if realm:
|
2015-08-06 00:18:52 +05:30
|
|
|
self.assertEqual(headers, {
|
2013-12-08 09:13:59 +00:00
|
|
|
'x-container-sync-auth':
|
Update container on fast-POST
This patch makes a number of changes to enable content-type
metadata to be updated when using the fast-POST mode of
operation, as proposed in the associated spec [1].
* the object server and diskfile are modified to allow
content-type to be updated by a POST and the updated value
to be stored in .meta files.
* the object server accepts PUTs and DELETEs with older
timestamps than existing .meta files. This is to be
consistent with replication that will leave a later .meta
file in place when replicating a .data file.
* the diskfile interface is modified to provide accessor
methods for the content-type and its timestamp.
* the naming of .meta files is modified to encode two
timestamps when the .meta file contains a content-type value
that was set prior to the latest metadata update; this
enables consistency to be achieved when rsync is used for
replication.
* ssync is modified to sync meta files when content-type
differs between local and remote copies of objects.
* the object server issues container updates when handling
POST requests, notifying the container server of the current
immutable metadata (etag, size, hash, swift_bytes),
content-type with their respective timestamps, and the
mutable metadata timestamp.
* the container server maintains the most recently reported
values for immutable metadata, content-type and mutable
metadata, each with their respective timestamps, in a single
db row.
* new probe tests verify that replication achieves eventual
consistency of containers and objects after discrete updates
to content-type and mutable metadata, and that container-sync
sync's objects after fast-post updates.
[1] spec change-id: I60688efc3df692d3a39557114dca8c5490f7837e
Change-Id: Ia597cd460bb5fd40aa92e886e3e18a7542603d01
2015-08-10 10:30:10 -05:00
|
|
|
'US abcdef a2401ecb1256f469494a0abcb0eb62ffa73eca63',
|
|
|
|
'x-timestamp': ts_data.internal})
|
2013-12-08 09:13:59 +00:00
|
|
|
else:
|
2015-08-06 00:18:52 +05:30
|
|
|
self.assertEqual(
|
2013-12-08 09:13:59 +00:00
|
|
|
headers,
|
Update container on fast-POST
This patch makes a number of changes to enable content-type
metadata to be updated when using the fast-POST mode of
operation, as proposed in the associated spec [1].
* the object server and diskfile are modified to allow
content-type to be updated by a POST and the updated value
to be stored in .meta files.
* the object server accepts PUTs and DELETEs with older
timestamps than existing .meta files. This is to be
consistent with replication that will leave a later .meta
file in place when replicating a .data file.
* the diskfile interface is modified to provide accessor
methods for the content-type and its timestamp.
* the naming of .meta files is modified to encode two
timestamps when the .meta file contains a content-type value
that was set prior to the latest metadata update; this
enables consistency to be achieved when rsync is used for
replication.
* ssync is modified to sync meta files when content-type
differs between local and remote copies of objects.
* the object server issues container updates when handling
POST requests, notifying the container server of the current
immutable metadata (etag, size, hash, swift_bytes),
content-type with their respective timestamps, and the
mutable metadata timestamp.
* the container server maintains the most recently reported
values for immutable metadata, content-type and mutable
metadata, each with their respective timestamps, in a single
db row.
* new probe tests verify that replication achieves eventual
consistency of containers and objects after discrete updates
to content-type and mutable metadata, and that container-sync
sync's objects after fast-post updates.
[1] spec change-id: I60688efc3df692d3a39557114dca8c5490f7837e
Change-Id: Ia597cd460bb5fd40aa92e886e3e18a7542603d01
2015-08-10 10:30:10 -05:00
|
|
|
{'x-container-sync-key': 'key',
|
|
|
|
'x-timestamp': ts_data.internal})
|
2015-08-06 00:18:52 +05:30
|
|
|
self.assertEqual(proxy, 'http://proxy')
|
2015-02-18 10:17:23 +00:00
|
|
|
self.assertEqual(timeout, 5.0)
|
2014-12-24 11:52:34 +08:00
|
|
|
self.assertEqual(logger, self.logger)
|
2011-06-16 00:59:55 +00:00
|
|
|
|
|
|
|
sync.delete_object = fake_delete_object
|
2014-12-24 11:52:34 +08:00
|
|
|
|
|
|
|
with mock.patch('swift.container.sync.InternalClient'):
|
|
|
|
cs = sync.ContainerSync({}, container_ring=FakeRing(),
|
|
|
|
logger=self.logger)
|
2014-01-16 01:58:49 +00:00
|
|
|
cs.http_proxies = ['http://proxy']
|
Update container on fast-POST
This patch makes a number of changes to enable content-type
metadata to be updated when using the fast-POST mode of
operation, as proposed in the associated spec [1].
* the object server and diskfile are modified to allow
content-type to be updated by a POST and the updated value
to be stored in .meta files.
* the object server accepts PUTs and DELETEs with older
timestamps than existing .meta files. This is to be
consistent with replication that will leave a later .meta
file in place when replicating a .data file.
* the diskfile interface is modified to provide accessor
methods for the content-type and its timestamp.
* the naming of .meta files is modified to encode two
timestamps when the .meta file contains a content-type value
that was set prior to the latest metadata update; this
enables consistency to be achieved when rsync is used for
replication.
* ssync is modified to sync meta files when content-type
differs between local and remote copies of objects.
* the object server issues container updates when handling
POST requests, notifying the container server of the current
immutable metadata (etag, size, hash, swift_bytes),
content-type with their respective timestamps, and the
mutable metadata timestamp.
* the container server maintains the most recently reported
values for immutable metadata, content-type and mutable
metadata, each with their respective timestamps, in a single
db row.
* new probe tests verify that replication achieves eventual
consistency of containers and objects after discrete updates
to content-type and mutable metadata, and that container-sync
sync's objects after fast-post updates.
[1] spec change-id: I60688efc3df692d3a39557114dca8c5490f7837e
Change-Id: Ia597cd460bb5fd40aa92e886e3e18a7542603d01
2015-08-10 10:30:10 -05:00
|
|
|
# Success.
|
|
|
|
# simulate a row with tombstone at 1.1 and later ctype, meta times
|
|
|
|
created_at = ts_data.internal + '+1388+1388' # last modified = 1.2
|
2013-09-01 01:30:36 -04:00
|
|
|
self.assertTrue(cs.container_sync_row(
|
|
|
|
{'deleted': True,
|
|
|
|
'name': 'object',
|
2016-02-18 14:50:08 +02:00
|
|
|
'created_at': created_at,
|
|
|
|
'size': '1000'}, 'http://sync/to/path',
|
2014-04-09 16:10:13 -07:00
|
|
|
'key', FakeContainerBroker('broker'),
|
|
|
|
{'account': 'a', 'container': 'c', 'storage_policy_index': 0},
|
|
|
|
realm, realm_key))
|
2015-08-06 00:18:52 +05:30
|
|
|
self.assertEqual(cs.container_deletes, 1)
|
2011-06-16 00:59:55 +00:00
|
|
|
|
|
|
|
exc = []
|
|
|
|
|
2014-05-27 21:10:47 +00:00
|
|
|
def fake_delete_object(*args, **kwargs):
|
2011-06-16 00:59:55 +00:00
|
|
|
exc.append(Exception('test exception'))
|
|
|
|
raise exc[-1]
|
|
|
|
|
|
|
|
sync.delete_object = fake_delete_object
|
|
|
|
# Failure because of delete_object exception
|
2013-09-01 01:30:36 -04:00
|
|
|
self.assertFalse(cs.container_sync_row(
|
|
|
|
{'deleted': True,
|
|
|
|
'name': 'object',
|
|
|
|
'created_at': '1.2'}, 'http://sync/to/path',
|
2014-04-09 16:10:13 -07:00
|
|
|
'key', FakeContainerBroker('broker'),
|
|
|
|
{'account': 'a', 'container': 'c', 'storage_policy_index': 0},
|
|
|
|
realm, realm_key))
|
2015-08-06 00:18:52 +05:30
|
|
|
self.assertEqual(cs.container_deletes, 1)
|
|
|
|
self.assertEqual(len(exc), 1)
|
|
|
|
self.assertEqual(str(exc[-1]), 'test exception')
|
2011-06-16 00:59:55 +00:00
|
|
|
|
2014-05-27 21:10:47 +00:00
|
|
|
def fake_delete_object(*args, **kwargs):
|
2011-06-16 00:59:55 +00:00
|
|
|
exc.append(ClientException('test client exception'))
|
|
|
|
raise exc[-1]
|
|
|
|
|
|
|
|
sync.delete_object = fake_delete_object
|
|
|
|
# Failure because of delete_object exception
|
2013-09-01 01:30:36 -04:00
|
|
|
self.assertFalse(cs.container_sync_row(
|
|
|
|
{'deleted': True,
|
|
|
|
'name': 'object',
|
|
|
|
'created_at': '1.2'}, 'http://sync/to/path',
|
2014-04-09 16:10:13 -07:00
|
|
|
'key', FakeContainerBroker('broker'),
|
|
|
|
{'account': 'a', 'container': 'c', 'storage_policy_index': 0},
|
|
|
|
realm, realm_key))
|
2015-08-06 00:18:52 +05:30
|
|
|
self.assertEqual(cs.container_deletes, 1)
|
|
|
|
self.assertEqual(len(exc), 2)
|
|
|
|
self.assertEqual(str(exc[-1]), 'test client exception')
|
2011-06-16 00:59:55 +00:00
|
|
|
|
2014-05-27 21:10:47 +00:00
|
|
|
def fake_delete_object(*args, **kwargs):
|
2011-06-16 00:59:55 +00:00
|
|
|
exc.append(ClientException('test client exception',
|
|
|
|
http_status=404))
|
|
|
|
raise exc[-1]
|
|
|
|
|
|
|
|
sync.delete_object = fake_delete_object
|
|
|
|
# Success because the object wasn't even found
|
2013-09-01 01:30:36 -04:00
|
|
|
self.assertTrue(cs.container_sync_row(
|
|
|
|
{'deleted': True,
|
|
|
|
'name': 'object',
|
|
|
|
'created_at': '1.2'}, 'http://sync/to/path',
|
2014-04-09 16:10:13 -07:00
|
|
|
'key', FakeContainerBroker('broker'),
|
|
|
|
{'account': 'a', 'container': 'c', 'storage_policy_index': 0},
|
|
|
|
realm, realm_key))
|
2015-08-06 00:18:52 +05:30
|
|
|
self.assertEqual(cs.container_deletes, 2)
|
|
|
|
self.assertEqual(len(exc), 3)
|
|
|
|
self.assertEqual(str(exc[-1]), 'test client exception: 404')
|
2011-06-16 00:59:55 +00:00
|
|
|
finally:
|
2013-12-08 09:13:59 +00:00
|
|
|
sync.uuid = orig_uuid
|
2011-06-16 00:59:55 +00:00
|
|
|
sync.delete_object = orig_delete_object
|
|
|
|
|
|
|
|
def test_container_sync_row_put(self):
|
2013-12-08 09:13:59 +00:00
|
|
|
self._test_container_sync_row_put(None, None)
|
|
|
|
|
|
|
|
def test_container_sync_row_put_using_realms(self):
|
|
|
|
self._test_container_sync_row_put('US', 'realm_key')
|
|
|
|
|
|
|
|
def _test_container_sync_row_put(self, realm, realm_key):
|
|
|
|
orig_uuid = sync.uuid
|
2011-06-16 00:59:55 +00:00
|
|
|
orig_put_object = sync.put_object
|
2016-01-20 15:55:30 +02:00
|
|
|
orig_head_object = sync.head_object
|
|
|
|
|
2011-06-16 00:59:55 +00:00
|
|
|
try:
|
2013-12-08 09:13:59 +00:00
|
|
|
class FakeUUID(object):
|
|
|
|
class uuid4(object):
|
|
|
|
hex = 'abcdef'
|
|
|
|
|
|
|
|
sync.uuid = FakeUUID
|
Update container on fast-POST
This patch makes a number of changes to enable content-type
metadata to be updated when using the fast-POST mode of
operation, as proposed in the associated spec [1].
* the object server and diskfile are modified to allow
content-type to be updated by a POST and the updated value
to be stored in .meta files.
* the object server accepts PUTs and DELETEs with older
timestamps than existing .meta files. This is to be
consistent with replication that will leave a later .meta
file in place when replicating a .data file.
* the diskfile interface is modified to provide accessor
methods for the content-type and its timestamp.
* the naming of .meta files is modified to encode two
timestamps when the .meta file contains a content-type value
that was set prior to the latest metadata update; this
enables consistency to be achieved when rsync is used for
replication.
* ssync is modified to sync meta files when content-type
differs between local and remote copies of objects.
* the object server issues container updates when handling
POST requests, notifying the container server of the current
immutable metadata (etag, size, hash, swift_bytes),
content-type with their respective timestamps, and the
mutable metadata timestamp.
* the container server maintains the most recently reported
values for immutable metadata, content-type and mutable
metadata, each with their respective timestamps, in a single
db row.
* new probe tests verify that replication achieves eventual
consistency of containers and objects after discrete updates
to content-type and mutable metadata, and that container-sync
sync's objects after fast-post updates.
[1] spec change-id: I60688efc3df692d3a39557114dca8c5490f7837e
Change-Id: Ia597cd460bb5fd40aa92e886e3e18a7542603d01
2015-08-10 10:30:10 -05:00
|
|
|
ts_data = Timestamp(1.1)
|
|
|
|
timestamp = Timestamp(1.2)
|
2016-07-28 18:41:08 +01:00
|
|
|
put_object_calls = []
|
2011-06-16 00:59:55 +00:00
|
|
|
|
2016-07-28 18:41:08 +01:00
|
|
|
def fake_put_object(*args, **kwargs):
|
|
|
|
put_object_calls.append((args, kwargs))
|
|
|
|
|
|
|
|
def check_put_object(extra_headers, sync_to, name=None,
|
|
|
|
headers=None, contents=None, proxy=None,
|
|
|
|
logger=None, timeout=None):
|
2015-08-06 00:18:52 +05:30
|
|
|
self.assertEqual(sync_to, 'http://sync/to/path')
|
|
|
|
self.assertEqual(name, 'object')
|
2016-07-28 18:41:08 +01:00
|
|
|
expected_headers = {
|
|
|
|
'x-timestamp': timestamp.internal,
|
|
|
|
'etag': 'etagvalue',
|
|
|
|
'other-header': 'other header value',
|
|
|
|
'content-type': 'text/plain'}
|
2013-12-08 09:13:59 +00:00
|
|
|
if realm:
|
2016-07-28 18:41:08 +01:00
|
|
|
expected_headers.update({
|
2013-12-08 09:13:59 +00:00
|
|
|
'x-container-sync-auth':
|
2016-07-28 18:41:08 +01:00
|
|
|
'US abcdef a5fb3cf950738e6e3b364190e246bd7dd21dad3c'})
|
2013-12-08 09:13:59 +00:00
|
|
|
else:
|
2016-07-28 18:41:08 +01:00
|
|
|
expected_headers.update({
|
|
|
|
'x-container-sync-key': 'key'})
|
|
|
|
expected_headers.update(extra_headers)
|
|
|
|
self.assertDictEqual(expected_headers, headers)
|
2015-08-06 00:18:52 +05:30
|
|
|
self.assertEqual(contents.read(), 'contents')
|
|
|
|
self.assertEqual(proxy, 'http://proxy')
|
2015-02-18 10:17:23 +00:00
|
|
|
self.assertEqual(timeout, 5.0)
|
2014-12-24 11:52:34 +08:00
|
|
|
self.assertEqual(logger, self.logger)
|
2011-06-16 00:59:55 +00:00
|
|
|
|
|
|
|
sync.put_object = fake_put_object
|
2016-02-02 11:43:44 +00:00
|
|
|
expected_put_count = 0
|
2016-01-20 15:55:30 +02:00
|
|
|
excepted_failure_count = 0
|
2011-06-16 00:59:55 +00:00
|
|
|
|
2014-12-24 11:52:34 +08:00
|
|
|
with mock.patch('swift.container.sync.InternalClient'):
|
|
|
|
cs = sync.ContainerSync({}, container_ring=FakeRing(),
|
|
|
|
logger=self.logger)
|
2014-01-16 01:58:49 +00:00
|
|
|
cs.http_proxies = ['http://proxy']
|
2011-06-16 00:59:55 +00:00
|
|
|
|
2015-10-07 15:14:58 -04:00
|
|
|
def fake_get_object(acct, con, obj, headers, acceptable_statuses,
|
|
|
|
params=None):
|
|
|
|
self.assertEqual({'symlink': 'get'}, params)
|
2014-12-24 11:52:34 +08:00
|
|
|
self.assertEqual(headers['X-Backend-Storage-Policy-Index'],
|
|
|
|
'0')
|
2015-07-30 00:28:44 +02:00
|
|
|
return (200,
|
|
|
|
{'other-header': 'other header value',
|
Update container on fast-POST
This patch makes a number of changes to enable content-type
metadata to be updated when using the fast-POST mode of
operation, as proposed in the associated spec [1].
* the object server and diskfile are modified to allow
content-type to be updated by a POST and the updated value
to be stored in .meta files.
* the object server accepts PUTs and DELETEs with older
timestamps than existing .meta files. This is to be
consistent with replication that will leave a later .meta
file in place when replicating a .data file.
* the diskfile interface is modified to provide accessor
methods for the content-type and its timestamp.
* the naming of .meta files is modified to encode two
timestamps when the .meta file contains a content-type value
that was set prior to the latest metadata update; this
enables consistency to be achieved when rsync is used for
replication.
* ssync is modified to sync meta files when content-type
differs between local and remote copies of objects.
* the object server issues container updates when handling
POST requests, notifying the container server of the current
immutable metadata (etag, size, hash, swift_bytes),
content-type with their respective timestamps, and the
mutable metadata timestamp.
* the container server maintains the most recently reported
values for immutable metadata, content-type and mutable
metadata, each with their respective timestamps, in a single
db row.
* new probe tests verify that replication achieves eventual
consistency of containers and objects after discrete updates
to content-type and mutable metadata, and that container-sync
sync's objects after fast-post updates.
[1] spec change-id: I60688efc3df692d3a39557114dca8c5490f7837e
Change-Id: Ia597cd460bb5fd40aa92e886e3e18a7542603d01
2015-08-10 10:30:10 -05:00
|
|
|
'etag': '"etagvalue"',
|
|
|
|
'x-timestamp': timestamp.internal,
|
2015-07-30 00:28:44 +02:00
|
|
|
'content-type': 'text/plain; swift_bytes=123'},
|
2011-06-16 00:59:55 +00:00
|
|
|
iter('contents'))
|
2014-12-24 11:52:34 +08:00
|
|
|
|
|
|
|
cs.swift.get_object = fake_get_object
|
Update container on fast-POST
This patch makes a number of changes to enable content-type
metadata to be updated when using the fast-POST mode of
operation, as proposed in the associated spec [1].
* the object server and diskfile are modified to allow
content-type to be updated by a POST and the updated value
to be stored in .meta files.
* the object server accepts PUTs and DELETEs with older
timestamps than existing .meta files. This is to be
consistent with replication that will leave a later .meta
file in place when replicating a .data file.
* the diskfile interface is modified to provide accessor
methods for the content-type and its timestamp.
* the naming of .meta files is modified to encode two
timestamps when the .meta file contains a content-type value
that was set prior to the latest metadata update; this
enables consistency to be achieved when rsync is used for
replication.
* ssync is modified to sync meta files when content-type
differs between local and remote copies of objects.
* the object server issues container updates when handling
POST requests, notifying the container server of the current
immutable metadata (etag, size, hash, swift_bytes),
content-type with their respective timestamps, and the
mutable metadata timestamp.
* the container server maintains the most recently reported
values for immutable metadata, content-type and mutable
metadata, each with their respective timestamps, in a single
db row.
* new probe tests verify that replication achieves eventual
consistency of containers and objects after discrete updates
to content-type and mutable metadata, and that container-sync
sync's objects after fast-post updates.
[1] spec change-id: I60688efc3df692d3a39557114dca8c5490f7837e
Change-Id: Ia597cd460bb5fd40aa92e886e3e18a7542603d01
2015-08-10 10:30:10 -05:00
|
|
|
# Success as everything says it worked.
|
|
|
|
# simulate a row with data at 1.1 and later ctype, meta times
|
|
|
|
created_at = ts_data.internal + '+1388+1388' # last modified = 1.2
|
2016-01-20 15:55:30 +02:00
|
|
|
|
|
|
|
def fake_object_in_rcontainer(row, sync_to, user_key,
|
|
|
|
broker, realm, realm_key):
|
|
|
|
return False
|
|
|
|
|
|
|
|
orig_object_in_rcontainer = cs._object_in_remote_container
|
|
|
|
cs._object_in_remote_container = fake_object_in_rcontainer
|
|
|
|
|
2013-09-01 01:30:36 -04:00
|
|
|
self.assertTrue(cs.container_sync_row(
|
|
|
|
{'deleted': False,
|
|
|
|
'name': 'object',
|
2016-02-18 14:50:08 +02:00
|
|
|
'created_at': created_at,
|
|
|
|
'size': 50}, 'http://sync/to/path',
|
2014-04-09 16:10:13 -07:00
|
|
|
'key', FakeContainerBroker('broker'),
|
|
|
|
{'account': 'a', 'container': 'c', 'storage_policy_index': 0},
|
|
|
|
realm, realm_key))
|
2016-07-28 18:41:08 +01:00
|
|
|
self.assertEqual(1, len(put_object_calls))
|
|
|
|
check_put_object({'etag': 'etagvalue'},
|
|
|
|
*put_object_calls[0][0], **put_object_calls[0][1])
|
2016-02-02 11:43:44 +00:00
|
|
|
expected_put_count += 1
|
|
|
|
self.assertEqual(cs.container_puts, expected_put_count)
|
2011-06-16 00:59:55 +00:00
|
|
|
|
2015-10-07 15:14:58 -04:00
|
|
|
def fake_get_object(acct, con, obj, headers, acceptable_statuses,
|
|
|
|
params=None):
|
|
|
|
self.assertEqual({'symlink': 'get'}, params)
|
2015-08-06 00:18:52 +05:30
|
|
|
self.assertEqual(headers['X-Newest'], True)
|
|
|
|
self.assertEqual(headers['X-Backend-Storage-Policy-Index'],
|
|
|
|
'0')
|
2015-07-30 00:28:44 +02:00
|
|
|
return (200,
|
|
|
|
{'date': 'date value',
|
|
|
|
'last-modified': 'last modified value',
|
Update container on fast-POST
This patch makes a number of changes to enable content-type
metadata to be updated when using the fast-POST mode of
operation, as proposed in the associated spec [1].
* the object server and diskfile are modified to allow
content-type to be updated by a POST and the updated value
to be stored in .meta files.
* the object server accepts PUTs and DELETEs with older
timestamps than existing .meta files. This is to be
consistent with replication that will leave a later .meta
file in place when replicating a .data file.
* the diskfile interface is modified to provide accessor
methods for the content-type and its timestamp.
* the naming of .meta files is modified to encode two
timestamps when the .meta file contains a content-type value
that was set prior to the latest metadata update; this
enables consistency to be achieved when rsync is used for
replication.
* ssync is modified to sync meta files when content-type
differs between local and remote copies of objects.
* the object server issues container updates when handling
POST requests, notifying the container server of the current
immutable metadata (etag, size, hash, swift_bytes),
content-type with their respective timestamps, and the
mutable metadata timestamp.
* the container server maintains the most recently reported
values for immutable metadata, content-type and mutable
metadata, each with their respective timestamps, in a single
db row.
* new probe tests verify that replication achieves eventual
consistency of containers and objects after discrete updates
to content-type and mutable metadata, and that container-sync
sync's objects after fast-post updates.
[1] spec change-id: I60688efc3df692d3a39557114dca8c5490f7837e
Change-Id: Ia597cd460bb5fd40aa92e886e3e18a7542603d01
2015-08-10 10:30:10 -05:00
|
|
|
'x-timestamp': timestamp.internal,
|
2015-07-30 00:28:44 +02:00
|
|
|
'other-header': 'other header value',
|
|
|
|
'etag': '"etagvalue"',
|
|
|
|
'content-type': 'text/plain; swift_bytes=123'},
|
2011-06-16 00:59:55 +00:00
|
|
|
iter('contents'))
|
|
|
|
|
2014-12-24 11:52:34 +08:00
|
|
|
cs.swift.get_object = fake_get_object
|
2016-01-20 15:55:30 +02:00
|
|
|
|
2011-06-16 00:59:55 +00:00
|
|
|
# Success as everything says it worked, also checks 'date' and
|
|
|
|
# 'last-modified' headers are removed and that 'etag' header is
|
|
|
|
# stripped of double quotes.
|
2016-07-28 18:41:08 +01:00
|
|
|
put_object_calls = []
|
2013-09-01 01:30:36 -04:00
|
|
|
self.assertTrue(cs.container_sync_row(
|
|
|
|
{'deleted': False,
|
|
|
|
'name': 'object',
|
2016-02-18 14:50:08 +02:00
|
|
|
'created_at': timestamp.internal,
|
|
|
|
'size': 60}, 'http://sync/to/path',
|
2014-04-09 16:10:13 -07:00
|
|
|
'key', FakeContainerBroker('broker'),
|
|
|
|
{'account': 'a', 'container': 'c', 'storage_policy_index': 0},
|
|
|
|
realm, realm_key))
|
2016-07-28 18:41:08 +01:00
|
|
|
self.assertEqual(1, len(put_object_calls))
|
|
|
|
check_put_object({'etag': 'etagvalue'},
|
|
|
|
*put_object_calls[0][0], **put_object_calls[0][1])
|
2016-02-02 11:43:44 +00:00
|
|
|
expected_put_count += 1
|
|
|
|
self.assertEqual(cs.container_puts, expected_put_count)
|
|
|
|
|
|
|
|
# Success as everything says it worked, also check that PUT
|
|
|
|
# timestamp equals GET timestamp when it is newer than created_at
|
|
|
|
# value.
|
2016-07-28 18:41:08 +01:00
|
|
|
put_object_calls = []
|
|
|
|
self.assertTrue(cs.container_sync_row(
|
|
|
|
{'deleted': False,
|
|
|
|
'name': 'object',
|
|
|
|
'created_at': '1.1',
|
|
|
|
'size': 60}, 'http://sync/to/path',
|
|
|
|
'key', FakeContainerBroker('broker'),
|
|
|
|
{'account': 'a', 'container': 'c', 'storage_policy_index': 0},
|
|
|
|
realm, realm_key))
|
|
|
|
self.assertEqual(1, len(put_object_calls))
|
|
|
|
check_put_object({'etag': 'etagvalue'},
|
|
|
|
*put_object_calls[0][0], **put_object_calls[0][1])
|
|
|
|
expected_put_count += 1
|
|
|
|
self.assertEqual(cs.container_puts, expected_put_count)
|
|
|
|
|
2015-10-07 15:14:58 -04:00
|
|
|
def fake_get_object(acct, con, obj, headers, acceptable_statuses,
|
|
|
|
params=None):
|
|
|
|
self.assertEqual({'symlink': 'get'}, params)
|
2016-07-28 18:41:08 +01:00
|
|
|
self.assertEqual(headers['X-Newest'], True)
|
|
|
|
self.assertEqual(headers['X-Backend-Storage-Policy-Index'],
|
|
|
|
'0')
|
|
|
|
return (200,
|
|
|
|
{'date': 'date value',
|
|
|
|
'last-modified': 'last modified value',
|
|
|
|
'x-timestamp': timestamp.internal,
|
|
|
|
'other-header': 'other header value',
|
|
|
|
'etag': '"etagvalue"',
|
|
|
|
'x-static-large-object': 'true',
|
|
|
|
'content-type': 'text/plain; swift_bytes=123'},
|
|
|
|
iter('contents'))
|
|
|
|
|
|
|
|
cs.swift.get_object = fake_get_object
|
|
|
|
|
|
|
|
# Success as everything says it worked, also check that etag
|
|
|
|
# header removed in case of SLO
|
|
|
|
put_object_calls = []
|
2016-02-02 11:43:44 +00:00
|
|
|
self.assertTrue(cs.container_sync_row(
|
|
|
|
{'deleted': False,
|
|
|
|
'name': 'object',
|
2016-02-18 14:50:08 +02:00
|
|
|
'created_at': '1.1',
|
|
|
|
'size': 60}, 'http://sync/to/path',
|
2016-02-02 11:43:44 +00:00
|
|
|
'key', FakeContainerBroker('broker'),
|
|
|
|
{'account': 'a', 'container': 'c', 'storage_policy_index': 0},
|
|
|
|
realm, realm_key))
|
2016-07-28 18:41:08 +01:00
|
|
|
self.assertEqual(1, len(put_object_calls))
|
|
|
|
check_put_object({'x-static-large-object': 'true'},
|
|
|
|
*put_object_calls[0][0], **put_object_calls[0][1])
|
2016-02-02 11:43:44 +00:00
|
|
|
expected_put_count += 1
|
|
|
|
self.assertEqual(cs.container_puts, expected_put_count)
|
2011-06-16 00:59:55 +00:00
|
|
|
|
|
|
|
exc = []
|
|
|
|
|
2015-10-07 15:14:58 -04:00
|
|
|
def fake_get_object(acct, con, obj, headers, acceptable_statuses,
|
|
|
|
params=None):
|
|
|
|
self.assertEqual({'symlink': 'get'}, params)
|
2015-08-06 00:18:52 +05:30
|
|
|
self.assertEqual(headers['X-Newest'], True)
|
|
|
|
self.assertEqual(headers['X-Backend-Storage-Policy-Index'],
|
|
|
|
'0')
|
2011-06-16 00:59:55 +00:00
|
|
|
exc.append(Exception('test exception'))
|
|
|
|
raise exc[-1]
|
|
|
|
|
2014-12-24 11:52:34 +08:00
|
|
|
cs.swift.get_object = fake_get_object
|
2011-06-16 00:59:55 +00:00
|
|
|
# Fail due to completely unexpected exception
|
2013-09-01 01:30:36 -04:00
|
|
|
self.assertFalse(cs.container_sync_row(
|
|
|
|
{'deleted': False,
|
|
|
|
'name': 'object',
|
2016-02-18 14:50:08 +02:00
|
|
|
'created_at': timestamp.internal,
|
|
|
|
'size': 70}, 'http://sync/to/path',
|
2014-04-09 16:10:13 -07:00
|
|
|
'key', FakeContainerBroker('broker'),
|
|
|
|
{'account': 'a', 'container': 'c', 'storage_policy_index': 0},
|
|
|
|
realm, realm_key))
|
2016-02-02 11:43:44 +00:00
|
|
|
self.assertEqual(cs.container_puts, expected_put_count)
|
2016-01-20 15:55:30 +02:00
|
|
|
excepted_failure_count += 1
|
2015-08-06 00:18:52 +05:30
|
|
|
self.assertEqual(len(exc), 1)
|
|
|
|
self.assertEqual(str(exc[-1]), 'test exception')
|
2011-06-16 00:59:55 +00:00
|
|
|
|
2012-11-01 14:52:21 -07:00
|
|
|
exc = []
|
2013-09-01 01:30:36 -04:00
|
|
|
|
2015-10-07 15:14:58 -04:00
|
|
|
def fake_get_object(acct, con, obj, headers, acceptable_statuses,
|
|
|
|
params=None):
|
|
|
|
self.assertEqual({'symlink': 'get'}, params)
|
2015-08-06 00:18:52 +05:30
|
|
|
self.assertEqual(headers['X-Newest'], True)
|
|
|
|
self.assertEqual(headers['X-Backend-Storage-Policy-Index'],
|
|
|
|
'0')
|
2014-12-24 11:52:34 +08:00
|
|
|
|
|
|
|
exc.append(ClientException('test client exception'))
|
2011-06-16 00:59:55 +00:00
|
|
|
raise exc[-1]
|
|
|
|
|
2014-12-24 11:52:34 +08:00
|
|
|
cs.swift.get_object = fake_get_object
|
2011-06-16 00:59:55 +00:00
|
|
|
# Fail due to all direct_get_object calls failing
|
2013-09-01 01:30:36 -04:00
|
|
|
self.assertFalse(cs.container_sync_row(
|
|
|
|
{'deleted': False,
|
|
|
|
'name': 'object',
|
2016-02-18 14:50:08 +02:00
|
|
|
'created_at': timestamp.internal,
|
|
|
|
'size': 80}, 'http://sync/to/path',
|
2014-04-09 16:10:13 -07:00
|
|
|
'key', FakeContainerBroker('broker'),
|
|
|
|
{'account': 'a', 'container': 'c', 'storage_policy_index': 0},
|
|
|
|
realm, realm_key))
|
2016-02-02 11:43:44 +00:00
|
|
|
self.assertEqual(cs.container_puts, expected_put_count)
|
2016-01-20 15:55:30 +02:00
|
|
|
excepted_failure_count += 1
|
2015-08-06 00:18:52 +05:30
|
|
|
self.assertEqual(len(exc), 1)
|
|
|
|
self.assertEqual(str(exc[-1]), 'test client exception')
|
2011-06-16 00:59:55 +00:00
|
|
|
|
2015-10-07 15:14:58 -04:00
|
|
|
def fake_get_object(acct, con, obj, headers, acceptable_statuses,
|
|
|
|
params=None):
|
|
|
|
self.assertEqual({'symlink': 'get'}, params)
|
2015-08-06 00:18:52 +05:30
|
|
|
self.assertEqual(headers['X-Newest'], True)
|
|
|
|
self.assertEqual(headers['X-Backend-Storage-Policy-Index'],
|
|
|
|
'0')
|
2014-12-24 11:52:34 +08:00
|
|
|
return (200, {'other-header': 'other header value',
|
Update container on fast-POST
This patch makes a number of changes to enable content-type
metadata to be updated when using the fast-POST mode of
operation, as proposed in the associated spec [1].
* the object server and diskfile are modified to allow
content-type to be updated by a POST and the updated value
to be stored in .meta files.
* the object server accepts PUTs and DELETEs with older
timestamps than existing .meta files. This is to be
consistent with replication that will leave a later .meta
file in place when replicating a .data file.
* the diskfile interface is modified to provide accessor
methods for the content-type and its timestamp.
* the naming of .meta files is modified to encode two
timestamps when the .meta file contains a content-type value
that was set prior to the latest metadata update; this
enables consistency to be achieved when rsync is used for
replication.
* ssync is modified to sync meta files when content-type
differs between local and remote copies of objects.
* the object server issues container updates when handling
POST requests, notifying the container server of the current
immutable metadata (etag, size, hash, swift_bytes),
content-type with their respective timestamps, and the
mutable metadata timestamp.
* the container server maintains the most recently reported
values for immutable metadata, content-type and mutable
metadata, each with their respective timestamps, in a single
db row.
* new probe tests verify that replication achieves eventual
consistency of containers and objects after discrete updates
to content-type and mutable metadata, and that container-sync
sync's objects after fast-post updates.
[1] spec change-id: I60688efc3df692d3a39557114dca8c5490f7837e
Change-Id: Ia597cd460bb5fd40aa92e886e3e18a7542603d01
2015-08-10 10:30:10 -05:00
|
|
|
'x-timestamp': timestamp.internal,
|
|
|
|
'etag': '"etagvalue"'},
|
2011-06-16 00:59:55 +00:00
|
|
|
iter('contents'))
|
|
|
|
|
2014-05-27 21:10:47 +00:00
|
|
|
def fake_put_object(*args, **kwargs):
|
2011-06-16 00:59:55 +00:00
|
|
|
raise ClientException('test client exception', http_status=401)
|
|
|
|
|
2014-12-24 11:52:34 +08:00
|
|
|
cs.swift.get_object = fake_get_object
|
2011-06-16 00:59:55 +00:00
|
|
|
sync.put_object = fake_put_object
|
|
|
|
# Fail due to 401
|
2013-09-01 01:30:36 -04:00
|
|
|
self.assertFalse(cs.container_sync_row(
|
|
|
|
{'deleted': False,
|
|
|
|
'name': 'object',
|
2016-02-18 14:50:08 +02:00
|
|
|
'created_at': timestamp.internal,
|
|
|
|
'size': 90}, 'http://sync/to/path',
|
2014-04-09 16:10:13 -07:00
|
|
|
'key', FakeContainerBroker('broker'),
|
|
|
|
{'account': 'a', 'container': 'c', 'storage_policy_index': 0},
|
|
|
|
realm, realm_key))
|
2016-02-02 11:43:44 +00:00
|
|
|
self.assertEqual(cs.container_puts, expected_put_count)
|
2016-01-20 15:55:30 +02:00
|
|
|
excepted_failure_count += 1
|
|
|
|
self.assertEqual(cs.container_failures, excepted_failure_count)
|
2014-12-24 11:52:34 +08:00
|
|
|
self.assertLogMessage('info', 'Unauth')
|
2011-06-16 00:59:55 +00:00
|
|
|
|
2014-05-27 21:10:47 +00:00
|
|
|
def fake_put_object(*args, **kwargs):
|
2011-06-16 00:59:55 +00:00
|
|
|
raise ClientException('test client exception', http_status=404)
|
|
|
|
|
|
|
|
sync.put_object = fake_put_object
|
|
|
|
# Fail due to 404
|
2013-09-01 01:30:36 -04:00
|
|
|
self.assertFalse(cs.container_sync_row(
|
|
|
|
{'deleted': False,
|
|
|
|
'name': 'object',
|
2016-02-18 14:50:08 +02:00
|
|
|
'created_at': timestamp.internal,
|
|
|
|
'size': 50}, 'http://sync/to/path',
|
2014-04-09 16:10:13 -07:00
|
|
|
'key', FakeContainerBroker('broker'),
|
|
|
|
{'account': 'a', 'container': 'c', 'storage_policy_index': 0},
|
|
|
|
realm, realm_key))
|
2016-02-02 11:43:44 +00:00
|
|
|
self.assertEqual(cs.container_puts, expected_put_count)
|
2016-01-20 15:55:30 +02:00
|
|
|
excepted_failure_count += 1
|
|
|
|
self.assertEqual(cs.container_failures, excepted_failure_count)
|
2014-12-24 11:52:34 +08:00
|
|
|
self.assertLogMessage('info', 'Not found', 1)
|
2011-06-16 00:59:55 +00:00
|
|
|
|
2014-05-27 21:10:47 +00:00
|
|
|
def fake_put_object(*args, **kwargs):
|
2011-06-16 00:59:55 +00:00
|
|
|
raise ClientException('test client exception', http_status=503)
|
|
|
|
|
|
|
|
sync.put_object = fake_put_object
|
|
|
|
# Fail due to 503
|
2013-09-01 01:30:36 -04:00
|
|
|
self.assertFalse(cs.container_sync_row(
|
|
|
|
{'deleted': False,
|
|
|
|
'name': 'object',
|
2016-02-18 14:50:08 +02:00
|
|
|
'created_at': timestamp.internal,
|
|
|
|
'size': 50}, 'http://sync/to/path',
|
2014-04-09 16:10:13 -07:00
|
|
|
'key', FakeContainerBroker('broker'),
|
|
|
|
{'account': 'a', 'container': 'c', 'storage_policy_index': 0},
|
|
|
|
realm, realm_key))
|
2016-02-02 11:43:44 +00:00
|
|
|
self.assertEqual(cs.container_puts, expected_put_count)
|
2016-01-20 15:55:30 +02:00
|
|
|
excepted_failure_count += 1
|
|
|
|
self.assertEqual(cs.container_failures, excepted_failure_count)
|
2014-12-24 11:52:34 +08:00
|
|
|
self.assertLogMessage('error', 'ERROR Syncing')
|
2016-01-20 15:55:30 +02:00
|
|
|
|
|
|
|
# Test the following cases:
|
|
|
|
# remote has the same date and a put doesn't take place
|
|
|
|
# remote has more up to date copy and a put doesn't take place
|
|
|
|
# head_object returns ClientException(404) and a put takes place
|
|
|
|
# head_object returns other ClientException put doesn't take place
|
|
|
|
# and we get failure
|
|
|
|
# head_object returns other Exception put does not take place
|
|
|
|
# and we get failure
|
|
|
|
# remote returns old copy and a put takes place
|
|
|
|
test_row = {'deleted': False,
|
|
|
|
'name': 'object',
|
|
|
|
'created_at': timestamp.internal,
|
2016-02-18 14:50:08 +02:00
|
|
|
'etag': '1111',
|
|
|
|
'size': 10}
|
2016-01-20 15:55:30 +02:00
|
|
|
test_info = {'account': 'a',
|
|
|
|
'container': 'c',
|
|
|
|
'storage_policy_index': 0}
|
|
|
|
|
|
|
|
actual_puts = []
|
|
|
|
|
|
|
|
def fake_put_object(*args, **kwargs):
|
|
|
|
actual_puts.append((args, kwargs))
|
|
|
|
|
|
|
|
def fake_head_object(*args, **kwargs):
|
|
|
|
return ({'x-timestamp': '1.2'}, '')
|
|
|
|
|
|
|
|
sync.put_object = fake_put_object
|
|
|
|
sync.head_object = fake_head_object
|
|
|
|
cs._object_in_remote_container = orig_object_in_rcontainer
|
|
|
|
self.assertTrue(cs.container_sync_row(
|
|
|
|
test_row, 'http://sync/to/path',
|
|
|
|
'key', FakeContainerBroker('broker'),
|
|
|
|
test_info,
|
|
|
|
realm, realm_key))
|
|
|
|
# No additional put has taken place
|
|
|
|
self.assertEqual(len(actual_puts), 0)
|
|
|
|
# No additional errors
|
|
|
|
self.assertEqual(cs.container_failures, excepted_failure_count)
|
|
|
|
|
|
|
|
def fake_head_object(*args, **kwargs):
|
|
|
|
return ({'x-timestamp': '1.3'}, '')
|
|
|
|
|
|
|
|
sync.head_object = fake_head_object
|
|
|
|
self.assertTrue(cs.container_sync_row(
|
|
|
|
test_row, 'http://sync/to/path',
|
|
|
|
'key', FakeContainerBroker('broker'),
|
|
|
|
test_info,
|
|
|
|
realm, realm_key))
|
|
|
|
# No additional put has taken place
|
|
|
|
self.assertEqual(len(actual_puts), 0)
|
|
|
|
# No additional errors
|
|
|
|
self.assertEqual(cs.container_failures, excepted_failure_count)
|
|
|
|
|
|
|
|
actual_puts = []
|
|
|
|
|
|
|
|
def fake_head_object(*args, **kwargs):
|
|
|
|
raise ClientException('test client exception', http_status=404)
|
|
|
|
|
|
|
|
sync.head_object = fake_head_object
|
|
|
|
self.assertTrue(cs.container_sync_row(
|
|
|
|
test_row, 'http://sync/to/path',
|
|
|
|
'key', FakeContainerBroker('broker'),
|
|
|
|
test_info, realm, realm_key))
|
|
|
|
# Additional put has taken place
|
|
|
|
self.assertEqual(len(actual_puts), 1)
|
|
|
|
# No additional errors
|
|
|
|
self.assertEqual(cs.container_failures, excepted_failure_count)
|
|
|
|
|
|
|
|
def fake_head_object(*args, **kwargs):
|
|
|
|
raise ClientException('test client exception', http_status=401)
|
|
|
|
|
|
|
|
sync.head_object = fake_head_object
|
|
|
|
self.assertFalse(cs.container_sync_row(
|
|
|
|
test_row, 'http://sync/to/path',
|
|
|
|
'key', FakeContainerBroker('broker'),
|
|
|
|
test_info, realm, realm_key))
|
|
|
|
# No additional put has taken place, failures increased
|
|
|
|
self.assertEqual(len(actual_puts), 1)
|
|
|
|
excepted_failure_count += 1
|
|
|
|
self.assertEqual(cs.container_failures, excepted_failure_count)
|
|
|
|
|
|
|
|
def fake_head_object(*args, **kwargs):
|
|
|
|
raise Exception()
|
|
|
|
|
|
|
|
sync.head_object = fake_head_object
|
|
|
|
self.assertFalse(cs.container_sync_row(
|
|
|
|
test_row,
|
|
|
|
'http://sync/to/path',
|
|
|
|
'key', FakeContainerBroker('broker'),
|
|
|
|
test_info, realm, realm_key))
|
|
|
|
# No additional put has taken place, failures increased
|
|
|
|
self.assertEqual(len(actual_puts), 1)
|
|
|
|
excepted_failure_count += 1
|
|
|
|
self.assertEqual(cs.container_failures, excepted_failure_count)
|
|
|
|
|
|
|
|
def fake_head_object(*args, **kwargs):
|
|
|
|
return ({'x-timestamp': '1.1'}, '')
|
|
|
|
|
|
|
|
sync.head_object = fake_head_object
|
|
|
|
self.assertTrue(cs.container_sync_row(
|
|
|
|
test_row, 'http://sync/to/path',
|
|
|
|
'key', FakeContainerBroker('broker'),
|
|
|
|
test_info, realm, realm_key))
|
|
|
|
# Additional put has taken place
|
|
|
|
self.assertEqual(len(actual_puts), 2)
|
|
|
|
# No additional errors
|
|
|
|
self.assertEqual(cs.container_failures, excepted_failure_count)
|
|
|
|
|
2011-06-16 00:59:55 +00:00
|
|
|
finally:
|
2013-12-08 09:13:59 +00:00
|
|
|
sync.uuid = orig_uuid
|
2011-06-16 00:59:55 +00:00
|
|
|
sync.put_object = orig_put_object
|
2016-01-20 15:55:30 +02:00
|
|
|
sync.head_object = orig_head_object
|
2011-06-16 00:59:55 +00:00
|
|
|
|
2014-01-16 01:58:49 +00:00
|
|
|
def test_select_http_proxy_None(self):
|
2014-12-24 11:52:34 +08:00
|
|
|
|
|
|
|
with mock.patch('swift.container.sync.InternalClient'):
|
|
|
|
cs = sync.ContainerSync(
|
|
|
|
{'sync_proxy': ''}, container_ring=FakeRing())
|
2017-06-07 11:37:01 +08:00
|
|
|
self.assertIsNone(cs.select_http_proxy())
|
2014-01-16 01:58:49 +00:00
|
|
|
|
|
|
|
def test_select_http_proxy_one(self):
|
2014-12-24 11:52:34 +08:00
|
|
|
|
|
|
|
with mock.patch('swift.container.sync.InternalClient'):
|
|
|
|
cs = sync.ContainerSync(
|
|
|
|
{'sync_proxy': 'http://one'}, container_ring=FakeRing())
|
2014-01-16 01:58:49 +00:00
|
|
|
self.assertEqual(cs.select_http_proxy(), 'http://one')
|
|
|
|
|
|
|
|
def test_select_http_proxy_multiple(self):
|
2014-12-24 11:52:34 +08:00
|
|
|
|
|
|
|
with mock.patch('swift.container.sync.InternalClient'):
|
|
|
|
cs = sync.ContainerSync(
|
|
|
|
{'sync_proxy': 'http://one,http://two,http://three'},
|
|
|
|
container_ring=FakeRing())
|
2014-01-16 01:58:49 +00:00
|
|
|
self.assertEqual(
|
|
|
|
set(cs.http_proxies),
|
|
|
|
set(['http://one', 'http://two', 'http://three']))
|
|
|
|
|
2011-06-15 02:01:01 +00:00
|
|
|
|
|
|
|
if __name__ == '__main__':
|
|
|
|
unittest.main()
|