2013-09-20 01:00:54 +08:00
|
|
|
# Copyright (c) 2010-2012 OpenStack Foundation
|
2010-07-12 17:03:45 -05: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.
|
|
|
|
|
|
|
|
import unittest
|
|
|
|
import os
|
2012-12-17 06:39:25 -05:00
|
|
|
import mock
|
2010-07-12 17:03:45 -05:00
|
|
|
from gzip import GzipFile
|
|
|
|
from shutil import rmtree
|
2015-07-07 22:46:37 +05:30
|
|
|
import six.moves.cPickle as pickle
|
2010-10-29 15:26:35 -07:00
|
|
|
import time
|
2010-11-16 11:06:39 -08:00
|
|
|
import tempfile
|
2013-07-20 13:44:11 -07:00
|
|
|
from contextlib import contextmanager, closing
|
2015-08-21 18:14:55 -07:00
|
|
|
from collections import defaultdict
|
2014-05-29 00:54:07 -07:00
|
|
|
from errno import ENOENT, ENOTEMPTY, ENOTDIR
|
2013-07-20 13:44:11 -07:00
|
|
|
|
2010-07-12 17:03:45 -05:00
|
|
|
from eventlet.green import subprocess
|
2011-11-28 09:13:41 -08:00
|
|
|
from eventlet import Timeout, tpool
|
2013-07-20 13:44:11 -07:00
|
|
|
|
2015-08-21 18:14:55 -07:00
|
|
|
from test.unit import (debug_logger, patch_policies, make_timestamp_iter,
|
|
|
|
mocked_http_conn)
|
2013-10-07 12:10:31 +00:00
|
|
|
from swift.common import utils
|
2014-05-29 00:54:07 -07:00
|
|
|
from swift.common.utils import hash_path, mkdirs, normalize_timestamp, \
|
|
|
|
storage_directory
|
2010-07-12 17:03:45 -05:00
|
|
|
from swift.common import ring
|
2013-07-29 15:49:37 -04:00
|
|
|
from swift.obj import diskfile, replicator as object_replicator
|
2014-06-23 12:52:50 -07:00
|
|
|
from swift.common.storage_policy import StoragePolicy, POLICIES
|
2010-07-12 17:03:45 -05:00
|
|
|
|
2010-11-05 09:15:31 -07:00
|
|
|
|
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
|
|
|
def _ips(*args, **kwargs):
|
2010-11-05 09:15:31 -07:00
|
|
|
return ['127.0.0.0']
|
2010-07-12 17:03:45 -05:00
|
|
|
|
2010-11-05 09:15:31 -07:00
|
|
|
|
2010-10-29 15:26:35 -07:00
|
|
|
def mock_http_connect(status):
|
|
|
|
|
|
|
|
class FakeConn(object):
|
|
|
|
|
|
|
|
def __init__(self, status, *args, **kwargs):
|
|
|
|
self.status = status
|
|
|
|
self.reason = 'Fake'
|
|
|
|
self.host = args[0]
|
|
|
|
self.port = args[1]
|
|
|
|
self.method = args[4]
|
|
|
|
self.path = args[5]
|
|
|
|
self.with_exc = False
|
2010-11-05 09:15:31 -07:00
|
|
|
self.headers = kwargs.get('headers', {})
|
2010-10-29 15:26:35 -07:00
|
|
|
|
|
|
|
def getresponse(self):
|
|
|
|
if self.with_exc:
|
|
|
|
raise Exception('test')
|
|
|
|
return self
|
|
|
|
|
|
|
|
def getheader(self, header):
|
|
|
|
return self.headers[header]
|
|
|
|
|
|
|
|
def read(self, amt=None):
|
|
|
|
return pickle.dumps({})
|
|
|
|
|
|
|
|
def close(self):
|
|
|
|
return
|
|
|
|
return lambda *args, **kwargs: FakeConn(status, *args, **kwargs)
|
|
|
|
|
|
|
|
process_errors = []
|
|
|
|
|
2010-11-05 09:15:31 -07:00
|
|
|
|
2010-07-12 17:03:45 -05:00
|
|
|
class MockProcess(object):
|
|
|
|
ret_code = None
|
|
|
|
ret_log = None
|
2010-10-29 15:26:35 -07:00
|
|
|
check_args = None
|
2015-08-21 18:14:55 -07:00
|
|
|
captured_log = None
|
2010-07-12 17:03:45 -05:00
|
|
|
|
|
|
|
class Stream(object):
|
2010-11-05 09:15:31 -07:00
|
|
|
|
2010-07-12 17:03:45 -05:00
|
|
|
def read(self):
|
2015-06-15 22:10:45 +05:30
|
|
|
return next(MockProcess.ret_log)
|
2010-07-12 17:03:45 -05:00
|
|
|
|
|
|
|
def __init__(self, *args, **kwargs):
|
2015-06-15 22:10:45 +05:30
|
|
|
targs = next(MockProcess.check_args)
|
2010-10-29 15:26:35 -07:00
|
|
|
for targ in targs:
|
2014-05-29 00:54:07 -07:00
|
|
|
# Allow more than 2 candidate targs
|
|
|
|
# (e.g. a case that either node is fine when nodes shuffled)
|
|
|
|
if isinstance(targ, tuple):
|
|
|
|
allowed = False
|
|
|
|
for target in targ:
|
|
|
|
if target in args[0]:
|
|
|
|
allowed = True
|
|
|
|
if not allowed:
|
|
|
|
process_errors.append("Invalid: %s not in %s" % (targ,
|
|
|
|
args))
|
|
|
|
else:
|
|
|
|
if targ not in args[0]:
|
|
|
|
process_errors.append("Invalid: %s not in %s" % (targ,
|
|
|
|
args))
|
2015-08-21 18:14:55 -07:00
|
|
|
self.captured_info = {
|
|
|
|
'rsync_args': args[0],
|
|
|
|
}
|
2010-07-12 17:03:45 -05:00
|
|
|
self.stdout = self.Stream()
|
|
|
|
|
|
|
|
def wait(self):
|
2015-08-21 18:14:55 -07:00
|
|
|
# the _mock_process context manager assures this class attribute is a
|
|
|
|
# mutable list and takes care of resetting it
|
|
|
|
rv = next(self.ret_code)
|
|
|
|
if self.captured_log is not None:
|
|
|
|
self.captured_info['ret_code'] = rv
|
|
|
|
self.captured_log.append(self.captured_info)
|
|
|
|
return rv
|
2010-07-12 17:03:45 -05:00
|
|
|
|
2010-11-05 09:15:31 -07:00
|
|
|
|
2010-07-12 17:03:45 -05:00
|
|
|
@contextmanager
|
|
|
|
def _mock_process(ret):
|
2015-08-21 18:14:55 -07:00
|
|
|
captured_log = []
|
|
|
|
MockProcess.captured_log = captured_log
|
2010-07-12 17:03:45 -05:00
|
|
|
orig_process = subprocess.Popen
|
|
|
|
MockProcess.ret_code = (i[0] for i in ret)
|
|
|
|
MockProcess.ret_log = (i[1] for i in ret)
|
2010-10-29 15:26:35 -07:00
|
|
|
MockProcess.check_args = (i[2] for i in ret)
|
2010-07-12 17:03:45 -05:00
|
|
|
object_replicator.subprocess.Popen = MockProcess
|
2015-08-21 18:14:55 -07:00
|
|
|
yield captured_log
|
|
|
|
MockProcess.captured_log = None
|
2010-07-12 17:03:45 -05:00
|
|
|
object_replicator.subprocess.Popen = orig_process
|
|
|
|
|
2010-11-05 09:15:31 -07:00
|
|
|
|
2015-02-26 16:37:16 -08:00
|
|
|
def _create_test_rings(path, devs=None):
|
2010-07-12 17:03:45 -05:00
|
|
|
testgz = os.path.join(path, 'object.ring.gz')
|
|
|
|
intended_replica2part2dev_id = [
|
|
|
|
[0, 1, 2, 3, 4, 5, 6],
|
|
|
|
[1, 2, 3, 0, 5, 6, 4],
|
|
|
|
[2, 3, 0, 1, 6, 4, 5],
|
2013-07-22 15:27:54 -07:00
|
|
|
]
|
2015-02-26 16:37:16 -08:00
|
|
|
intended_devs = devs or [
|
2014-05-29 00:54:07 -07:00
|
|
|
{'id': 0, 'device': 'sda', 'zone': 0,
|
|
|
|
'region': 1, 'ip': '127.0.0.0', 'port': 6000},
|
|
|
|
{'id': 1, 'device': 'sda', 'zone': 1,
|
|
|
|
'region': 2, 'ip': '127.0.0.1', 'port': 6000},
|
|
|
|
{'id': 2, 'device': 'sda', 'zone': 2,
|
|
|
|
'region': 1, 'ip': '127.0.0.2', 'port': 6000},
|
|
|
|
{'id': 3, 'device': 'sda', 'zone': 4,
|
|
|
|
'region': 2, 'ip': '127.0.0.3', 'port': 6000},
|
|
|
|
{'id': 4, 'device': 'sda', 'zone': 5,
|
|
|
|
'region': 1, 'ip': '127.0.0.4', 'port': 6000},
|
2012-06-04 13:27:39 +02:00
|
|
|
{'id': 5, 'device': 'sda', 'zone': 6,
|
2014-05-29 00:54:07 -07:00
|
|
|
'region': 2, 'ip': 'fe80::202:b3ff:fe1e:8329', 'port': 6000},
|
|
|
|
{'id': 6, 'device': 'sda', 'zone': 7, 'region': 1,
|
2012-06-04 13:27:39 +02:00
|
|
|
'ip': '2001:0db8:85a3:0000:0000:8a2e:0370:7334', 'port': 6000},
|
2013-07-20 13:44:11 -07:00
|
|
|
]
|
2010-07-12 17:03:45 -05:00
|
|
|
intended_part_shift = 30
|
2013-07-20 13:44:11 -07:00
|
|
|
with closing(GzipFile(testgz, 'wb')) as f:
|
2013-08-31 23:42:43 -04:00
|
|
|
pickle.dump(
|
|
|
|
ring.RingData(intended_replica2part2dev_id,
|
|
|
|
intended_devs, intended_part_shift),
|
2013-07-20 13:44:11 -07:00
|
|
|
f)
|
2014-03-18 10:50:17 -07:00
|
|
|
|
|
|
|
testgz = os.path.join(path, 'object-1.ring.gz')
|
|
|
|
with closing(GzipFile(testgz, 'wb')) as f:
|
|
|
|
pickle.dump(
|
|
|
|
ring.RingData(intended_replica2part2dev_id,
|
|
|
|
intended_devs, intended_part_shift),
|
|
|
|
f)
|
2015-02-26 16:37:16 -08:00
|
|
|
for policy in POLICIES:
|
|
|
|
policy.object_ring = None # force reload
|
2014-03-18 10:50:17 -07:00
|
|
|
return
|
2010-07-12 17:03:45 -05:00
|
|
|
|
|
|
|
|
2014-03-18 10:50:17 -07:00
|
|
|
@patch_policies([StoragePolicy(0, 'zero', False),
|
|
|
|
StoragePolicy(1, 'one', True)])
|
2010-07-12 17:03:45 -05:00
|
|
|
class TestObjectReplicator(unittest.TestCase):
|
|
|
|
|
|
|
|
def setUp(self):
|
2013-10-07 12:10:31 +00:00
|
|
|
utils.HASH_PATH_SUFFIX = 'endcap'
|
|
|
|
utils.HASH_PATH_PREFIX = ''
|
2010-07-12 17:03:45 -05:00
|
|
|
# Setup a test ring (stolen from common/test_ring.py)
|
2010-11-16 11:06:39 -08:00
|
|
|
self.testdir = tempfile.mkdtemp()
|
2010-07-12 17:03:45 -05:00
|
|
|
self.devices = os.path.join(self.testdir, 'node')
|
|
|
|
rmtree(self.testdir, ignore_errors=1)
|
|
|
|
os.mkdir(self.testdir)
|
|
|
|
os.mkdir(self.devices)
|
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
|
|
|
|
|
|
|
self.objects, self.objects_1, self.parts, self.parts_1 = \
|
|
|
|
self._write_disk_data('sda')
|
2014-03-18 10:50:17 -07:00
|
|
|
_create_test_rings(self.testdir)
|
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
|
|
|
self.logger = debug_logger('test-replicator')
|
2010-07-12 17:03:45 -05:00
|
|
|
self.conf = dict(
|
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
|
|
|
bind_ip=_ips()[0], bind_port=6000,
|
2010-07-12 17:03:45 -05:00
|
|
|
swift_dir=self.testdir, devices=self.devices, mount_check='false',
|
2015-02-12 16:18:54 -08:00
|
|
|
timeout='300', stats_interval='1', sync_method='rsync')
|
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
|
|
|
self._create_replicator()
|
2015-08-21 18:14:55 -07:00
|
|
|
self.ts = make_timestamp_iter()
|
2010-07-12 17:03:45 -05:00
|
|
|
|
2010-10-29 15:26:35 -07:00
|
|
|
def tearDown(self):
|
2015-08-21 18:14:55 -07:00
|
|
|
self.assertFalse(process_errors)
|
2010-10-29 15:26:35 -07:00
|
|
|
rmtree(self.testdir, ignore_errors=1)
|
|
|
|
|
2015-07-14 10:03:18 +05:30
|
|
|
def test_handoff_replication_setting_warnings(self):
|
|
|
|
conf = {'handoffs_first': 'true'}
|
|
|
|
replicator = object_replicator.ObjectReplicator(
|
|
|
|
conf, logger=self.logger)
|
|
|
|
self.assertTrue(replicator.handoffs_first)
|
|
|
|
log_message = 'handoffs_first and handoff_delete should'\
|
|
|
|
' be changed back to the default before the'\
|
|
|
|
' next normal rebalance'
|
|
|
|
expected = [log_message]
|
|
|
|
self.assertEqual(self.logger.get_lines_for_level('warning'), expected)
|
|
|
|
conf = {'handoff_delete': '2'}
|
|
|
|
replicator = object_replicator.ObjectReplicator(
|
|
|
|
conf, logger=self.logger)
|
|
|
|
self.assertEqual(replicator.handoff_delete, 2)
|
|
|
|
expected.append(log_message)
|
|
|
|
self.assertEqual(self.logger.get_lines_for_level('warning'), expected)
|
|
|
|
|
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
|
|
|
def _write_disk_data(self, disk_name):
|
|
|
|
os.mkdir(os.path.join(self.devices, disk_name))
|
|
|
|
objects = os.path.join(self.devices, disk_name,
|
|
|
|
diskfile.get_data_dir(POLICIES[0]))
|
|
|
|
objects_1 = os.path.join(self.devices, disk_name,
|
|
|
|
diskfile.get_data_dir(POLICIES[1]))
|
|
|
|
os.mkdir(objects)
|
|
|
|
os.mkdir(objects_1)
|
|
|
|
parts = {}
|
|
|
|
parts_1 = {}
|
|
|
|
for part in ['0', '1', '2', '3']:
|
|
|
|
parts[part] = os.path.join(objects, part)
|
|
|
|
os.mkdir(parts[part])
|
|
|
|
parts_1[part] = os.path.join(objects_1, part)
|
|
|
|
os.mkdir(parts_1[part])
|
|
|
|
|
|
|
|
return objects, objects_1, parts, parts_1
|
|
|
|
|
|
|
|
def _create_replicator(self):
|
|
|
|
self.replicator = object_replicator.ObjectReplicator(self.conf)
|
|
|
|
self.replicator.logger = self.logger
|
Enable Object Replicator's failure count in recon
This patch makes the count of object replication failure in recon.
And "failure_nodes" is added to Account Replicator and
Container Replicator.
Recon shows the count of object repliction failure as follows:
$ curl http://<ip>:<port>/recon/replication/object
{
"replication_last": 1416334368.60865,
"replication_stats": {
"attempted": 13346,
"failure": 870,
"failure_nodes": {
"192.168.0.1": {"sdb1": 3},
"192.168.0.2": {"sdb1": 851,
"sdc1": 1,
"sdd1": 8},
"192.168.0.3": {"sdb1": 3,
"sdc1": 4}
},
"hashmatch": 0,
"remove": 0,
"rsync": 0,
"start": 1416354240.9761429,
"success": 1908
},
"replication_time": 2316.5563162644703,
"object_replication_last": 1416334368.60865,
"object_replication_time": 2316.5563162644703
}
Note that 'object_replication_last' and 'object_replication_time' are
considered to be transitional and will be removed in the subsequent
releases. Use 'replication_last' and 'replication_time' instead.
Additionaly this patch adds the count in swift-recon and it will be
showed as follows:
$ swift-recon object -r
========================================================================
=======
--> Starting reconnaissance on 4 hosts
========================================================================
=======
[2014-11-27 16:14:09] Checking on replication
[replication_failure] low: 0, high: 0, avg: 0.0, total: 0, Failed: 0.0%,
no_result: 0, reported: 4
[replication_success] low: 3, high: 3, avg: 3.0, total: 12,
Failed: 0.0%, no_result: 0, reported: 4
[replication_time] low: 0, high: 0, avg: 0.0, total: 0, Failed: 0.0%,
no_result: 0, reported: 4
[replication_attempted] low: 1, high: 1, avg: 1.0, total: 4,
Failed: 0.0%, no_result: 0, reported: 4
Oldest completion was 2014-11-27 16:09:45 (4 minutes ago) by
192.168.0.4:6002.
Most recent completion was 2014-11-27 16:14:19 (-10 seconds ago) by
192.168.0.1:6002.
========================================================================
=======
In case there is a cluster which has servers, a server runs with this
patch and the other servers run without this patch. If swift-recon
executes on the server which runs with this patch, there are unnecessary
information on the output such as [failure], [success] and [attempted].
Because other servers which run without this patch are not able to
send a response with information that this patch needs.
Therefore once you apply this patch, you also apply this patch to other
servers before you execute swift-recon.
DocImpact
Change-Id: Iecd33655ae2568482833131f422679996c374d78
Co-Authored-By: Kenichiro Matsuda <matsuda_kenichi@jp.fujitsu.com>
Co-Authored-By: Brian Cline <bcline@softlayer.com>
Implements: blueprint enable-object-replication-failure-in-recon
2014-12-03 06:15:16 +09:00
|
|
|
self.replicator._zero_stats()
|
|
|
|
self.replicator.all_devs_info = set()
|
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
|
|
|
self.df_mgr = diskfile.DiskFileManager(self.conf, self.logger)
|
|
|
|
|
2010-10-29 15:26:35 -07:00
|
|
|
def test_run_once(self):
|
2014-03-18 10:50:17 -07:00
|
|
|
conf = dict(swift_dir=self.testdir, devices=self.devices,
|
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
|
|
|
bind_ip=_ips()[0],
|
2014-03-18 10:50:17 -07:00
|
|
|
mount_check='false', timeout='300', stats_interval='1')
|
|
|
|
replicator = object_replicator.ObjectReplicator(conf)
|
2010-11-03 16:08:13 -07:00
|
|
|
was_connector = object_replicator.http_connect
|
2010-10-29 15:26:35 -07:00
|
|
|
object_replicator.http_connect = mock_http_connect(200)
|
|
|
|
cur_part = '0'
|
2014-03-18 10:50:17 -07:00
|
|
|
df = self.df_mgr.get_diskfile('sda', cur_part, 'a', 'c', 'o',
|
2015-03-17 08:32:57 +00:00
|
|
|
policy=POLICIES[0])
|
DiskFile API, with reference implementation
Refactor on-disk knowledge out of the object server by pushing the
async update pickle creation to the new DiskFileManager class (name is
not the best, so suggestions welcome), along with the REPLICATOR
method logic. We also move the mount checking and thread pool storage
to the new ondisk.Devices object, which then also becomes the new home
of the audit_location_generator method.
For the object server, a new setup() method is now called at the end
of the controller's construction, and the _diskfile() method has been
renamed to get_diskfile(), to allow implementation specific behavior.
We then hide the need for the REST API layer to know how and where
quarantining needs to be performed. There are now two places it is
checked internally, on open() where we verify the content-length,
name, and x-timestamp metadata, and in the reader on close where the
etag metadata is checked if the entire file was read.
We add a reader class to allow implementations to isolate the WSGI
handling code for that specific environment (it is used no-where else
in the REST APIs). This simplifies the caller's code to just use a
"with" statement once open to avoid multiple points where close needs
to be called.
For a full historical comparison, including the usage patterns see:
https://gist.github.com/portante/5488238
(as of master, 2b639f5, Merge
"Fix 500 from account-quota This Commit
middleware")
--------------------------------+------------------------------------
DiskFileManager(conf)
Methods:
.pickle_async_update()
.get_diskfile()
.get_hashes()
Attributes:
.devices
.logger
.disk_chunk_size
.keep_cache_size
.bytes_per_sync
DiskFile(a,c,o,keep_data_fp=) DiskFile(a,c,o)
Methods: Methods:
*.__iter__()
.close(verify_file=)
.is_deleted()
.is_expired()
.quarantine()
.get_data_file_size()
.open()
.read_metadata()
.create() .create()
.write_metadata()
.delete() .delete()
Attributes: Attributes:
.quarantined_dir
.keep_cache
.metadata
*DiskFileReader()
Methods:
.__iter__()
.close()
Attributes:
+.was_quarantined
DiskWriter() DiskFileWriter()
Methods: Methods:
.write() .write()
.put() .put()
* Note that the DiskFile class * Note that the DiskReader() object
implements all the methods returned by the
necessary for a WSGI app DiskFileOpened.reader() method
iterator implements all the methods
necessary for a WSGI app iterator
+ Note that if the auditor is
refactored to not use the DiskFile
class, see
https://review.openstack.org/44787
then we don't need the
was_quarantined attribute
A reference "in-memory" object server implementation of a backend
DiskFile class in swift/obj/mem_server.py and
swift/obj/mem_diskfile.py.
One can also reference
https://github.com/portante/gluster-swift/commits/diskfile for the
proposed integration with the gluster-swift code based on these
changes.
Change-Id: I44e153fdb405a5743e9c05349008f94136764916
Signed-off-by: Peter Portante <peter.portante@redhat.com>
2013-09-12 19:51:18 -04:00
|
|
|
mkdirs(df._datadir)
|
|
|
|
f = open(os.path.join(df._datadir,
|
2010-10-29 15:26:35 -07:00
|
|
|
normalize_timestamp(time.time()) + '.data'),
|
|
|
|
'wb')
|
|
|
|
f.write('1234567890')
|
|
|
|
f.close()
|
|
|
|
ohash = hash_path('a', 'c', 'o')
|
|
|
|
data_dir = ohash[-3:]
|
|
|
|
whole_path_from = os.path.join(self.objects, cur_part, data_dir)
|
|
|
|
process_arg_checker = []
|
2015-03-17 08:32:57 +00:00
|
|
|
ring = replicator.load_object_ring(POLICIES[0])
|
2010-10-29 15:26:35 -07:00
|
|
|
nodes = [node for node in
|
2014-03-18 10:50:17 -07:00
|
|
|
ring.get_part_nodes(int(cur_part))
|
2013-08-31 23:42:43 -04:00
|
|
|
if node['ip'] not in _ips()]
|
2014-05-29 00:54:07 -07:00
|
|
|
rsync_mods = tuple(['%s::object/sda/objects/%s' %
|
|
|
|
(node['ip'], cur_part) for node in nodes])
|
2010-10-29 15:26:35 -07:00
|
|
|
for node in nodes:
|
2010-11-03 16:08:13 -07:00
|
|
|
process_arg_checker.append(
|
2014-05-29 00:54:07 -07:00
|
|
|
(0, '', ['rsync', whole_path_from, rsync_mods]))
|
2010-10-29 15:26:35 -07:00
|
|
|
with _mock_process(process_arg_checker):
|
|
|
|
replicator.run_once()
|
|
|
|
self.assertFalse(process_errors)
|
2014-03-18 10:50:17 -07:00
|
|
|
object_replicator.http_connect = was_connector
|
2010-10-29 15:26:35 -07:00
|
|
|
|
2014-03-18 10:50:17 -07:00
|
|
|
# policy 1
|
|
|
|
def test_run_once_1(self):
|
|
|
|
conf = dict(swift_dir=self.testdir, devices=self.devices,
|
|
|
|
mount_check='false', timeout='300', stats_interval='1')
|
|
|
|
replicator = object_replicator.ObjectReplicator(conf)
|
|
|
|
was_connector = object_replicator.http_connect
|
|
|
|
object_replicator.http_connect = mock_http_connect(200)
|
|
|
|
cur_part = '0'
|
|
|
|
df = self.df_mgr.get_diskfile('sda', cur_part, 'a', 'c', 'o',
|
2015-03-17 08:32:57 +00:00
|
|
|
policy=POLICIES[1])
|
2014-03-18 10:50:17 -07:00
|
|
|
mkdirs(df._datadir)
|
|
|
|
f = open(os.path.join(df._datadir,
|
|
|
|
normalize_timestamp(time.time()) + '.data'),
|
|
|
|
'wb')
|
|
|
|
f.write('1234567890')
|
|
|
|
f.close()
|
|
|
|
ohash = hash_path('a', 'c', 'o')
|
|
|
|
data_dir = ohash[-3:]
|
|
|
|
whole_path_from = os.path.join(self.objects_1, cur_part, data_dir)
|
|
|
|
process_arg_checker = []
|
2015-03-17 08:32:57 +00:00
|
|
|
ring = replicator.load_object_ring(POLICIES[1])
|
2014-03-18 10:50:17 -07:00
|
|
|
nodes = [node for node in
|
|
|
|
ring.get_part_nodes(int(cur_part))
|
|
|
|
if node['ip'] not in _ips()]
|
2014-05-29 00:54:07 -07:00
|
|
|
rsync_mods = tuple(['%s::object/sda/objects-1/%s' %
|
|
|
|
(node['ip'], cur_part) for node in nodes])
|
2014-03-18 10:50:17 -07:00
|
|
|
for node in nodes:
|
|
|
|
process_arg_checker.append(
|
2014-05-29 00:54:07 -07:00
|
|
|
(0, '', ['rsync', whole_path_from, rsync_mods]))
|
2014-03-18 10:50:17 -07:00
|
|
|
with _mock_process(process_arg_checker):
|
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
|
|
|
with mock.patch('swift.obj.replicator.whataremyips',
|
|
|
|
side_effect=_ips):
|
|
|
|
replicator.run_once()
|
2014-03-18 10:50:17 -07:00
|
|
|
self.assertFalse(process_errors)
|
2010-11-03 16:08:13 -07:00
|
|
|
object_replicator.http_connect = was_connector
|
|
|
|
|
2010-11-05 09:15:31 -07:00
|
|
|
def test_check_ring(self):
|
2014-03-18 10:50:17 -07:00
|
|
|
for pol in POLICIES:
|
2015-03-17 08:32:57 +00:00
|
|
|
obj_ring = self.replicator.load_object_ring(pol)
|
2014-03-18 10:50:17 -07:00
|
|
|
self.assertTrue(self.replicator.check_ring(obj_ring))
|
|
|
|
orig_check = self.replicator.next_check
|
|
|
|
self.replicator.next_check = orig_check - 30
|
|
|
|
self.assertTrue(self.replicator.check_ring(obj_ring))
|
|
|
|
self.replicator.next_check = orig_check
|
|
|
|
orig_ring_time = obj_ring._mtime
|
|
|
|
obj_ring._mtime = orig_ring_time - 30
|
|
|
|
self.assertTrue(self.replicator.check_ring(obj_ring))
|
|
|
|
self.replicator.next_check = orig_check - 30
|
|
|
|
self.assertFalse(self.replicator.check_ring(obj_ring))
|
2010-11-05 09:15:31 -07:00
|
|
|
|
2013-01-12 07:25:15 +00:00
|
|
|
def test_collect_jobs_mkdirs_error(self):
|
|
|
|
|
2015-03-31 22:35:37 -07:00
|
|
|
non_local = {}
|
|
|
|
|
2013-01-12 07:25:15 +00:00
|
|
|
def blowup_mkdirs(path):
|
2015-03-31 22:35:37 -07:00
|
|
|
non_local['path'] = path
|
2013-01-12 07:25:15 +00:00
|
|
|
raise OSError('Ow!')
|
|
|
|
|
2015-01-22 15:26:19 -08:00
|
|
|
with mock.patch.object(object_replicator, 'mkdirs', blowup_mkdirs):
|
2013-01-12 07:25:15 +00:00
|
|
|
rmtree(self.objects, ignore_errors=1)
|
|
|
|
object_replicator.mkdirs = blowup_mkdirs
|
2013-03-26 20:42:26 +00:00
|
|
|
self.replicator.collect_jobs()
|
2015-03-31 22:35:37 -07:00
|
|
|
self.assertEqual(self.logger.get_lines_for_level('error'), [
|
|
|
|
'ERROR creating %s: ' % non_local['path']])
|
|
|
|
log_args, log_kwargs = self.logger.log_dict['error'][0]
|
|
|
|
self.assertEqual(str(log_kwargs['exc_info'][1]), 'Ow!')
|
2013-01-12 07:25:15 +00:00
|
|
|
|
2010-11-05 09:15:31 -07:00
|
|
|
def test_collect_jobs(self):
|
|
|
|
jobs = self.replicator.collect_jobs()
|
|
|
|
jobs_to_delete = [j for j in jobs if j['delete']]
|
2014-03-18 10:50:17 -07:00
|
|
|
jobs_by_pol_part = {}
|
2010-11-05 09:15:31 -07:00
|
|
|
for job in jobs:
|
2015-03-17 08:32:57 +00:00
|
|
|
jobs_by_pol_part[str(int(job['policy'])) + job['partition']] = job
|
2015-08-06 00:55:36 +05:30
|
|
|
self.assertEqual(len(jobs_to_delete), 2)
|
2014-03-18 10:50:17 -07:00
|
|
|
self.assertTrue('1', jobs_to_delete[0]['partition'])
|
2015-08-06 00:55:36 +05:30
|
|
|
self.assertEqual(
|
2014-03-18 10:50:17 -07:00
|
|
|
[node['id'] for node in jobs_by_pol_part['00']['nodes']], [1, 2])
|
2015-08-06 00:55:36 +05:30
|
|
|
self.assertEqual(
|
2014-03-18 10:50:17 -07:00
|
|
|
[node['id'] for node in jobs_by_pol_part['01']['nodes']],
|
|
|
|
[1, 2, 3])
|
2015-08-06 00:55:36 +05:30
|
|
|
self.assertEqual(
|
2014-03-18 10:50:17 -07:00
|
|
|
[node['id'] for node in jobs_by_pol_part['02']['nodes']], [2, 3])
|
2015-08-06 00:55:36 +05:30
|
|
|
self.assertEqual(
|
2014-03-18 10:50:17 -07:00
|
|
|
[node['id'] for node in jobs_by_pol_part['03']['nodes']], [3, 1])
|
2015-08-06 00:55:36 +05:30
|
|
|
self.assertEqual(
|
2014-03-18 10:50:17 -07:00
|
|
|
[node['id'] for node in jobs_by_pol_part['10']['nodes']], [1, 2])
|
2015-08-06 00:55:36 +05:30
|
|
|
self.assertEqual(
|
2014-03-18 10:50:17 -07:00
|
|
|
[node['id'] for node in jobs_by_pol_part['11']['nodes']],
|
|
|
|
[1, 2, 3])
|
2015-08-06 00:55:36 +05:30
|
|
|
self.assertEqual(
|
2014-03-18 10:50:17 -07:00
|
|
|
[node['id'] for node in jobs_by_pol_part['12']['nodes']], [2, 3])
|
2015-08-06 00:55:36 +05:30
|
|
|
self.assertEqual(
|
2014-03-18 10:50:17 -07:00
|
|
|
[node['id'] for node in jobs_by_pol_part['13']['nodes']], [3, 1])
|
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
|
|
|
for part in ['00', '01', '02', '03']:
|
2014-03-18 10:50:17 -07:00
|
|
|
for node in jobs_by_pol_part[part]['nodes']:
|
2015-08-06 00:55:36 +05:30
|
|
|
self.assertEqual(node['device'], 'sda')
|
|
|
|
self.assertEqual(jobs_by_pol_part[part]['path'],
|
|
|
|
os.path.join(self.objects, part[1:]))
|
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
|
|
|
for part in ['10', '11', '12', '13']:
|
2014-03-18 10:50:17 -07:00
|
|
|
for node in jobs_by_pol_part[part]['nodes']:
|
2015-08-06 00:55:36 +05:30
|
|
|
self.assertEqual(node['device'], 'sda')
|
|
|
|
self.assertEqual(jobs_by_pol_part[part]['path'],
|
|
|
|
os.path.join(self.objects_1, part[1:]))
|
2010-11-05 09:15:31 -07:00
|
|
|
|
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
|
|
|
@mock.patch('swift.obj.replicator.random.shuffle', side_effect=lambda l: l)
|
|
|
|
def test_collect_jobs_multi_disk(self, mock_shuffle):
|
|
|
|
devs = [
|
|
|
|
# Two disks on same IP/port
|
|
|
|
{'id': 0, 'device': 'sda', 'zone': 0,
|
|
|
|
'region': 1, 'ip': '1.1.1.1', 'port': 1111,
|
|
|
|
'replication_ip': '127.0.0.0', 'replication_port': 6000},
|
|
|
|
{'id': 1, 'device': 'sdb', 'zone': 1,
|
|
|
|
'region': 1, 'ip': '1.1.1.1', 'port': 1111,
|
|
|
|
'replication_ip': '127.0.0.0', 'replication_port': 6000},
|
|
|
|
# Two disks on same server, different ports
|
|
|
|
{'id': 2, 'device': 'sdc', 'zone': 2,
|
|
|
|
'region': 2, 'ip': '1.1.1.2', 'port': 1112,
|
|
|
|
'replication_ip': '127.0.0.1', 'replication_port': 6000},
|
|
|
|
{'id': 3, 'device': 'sdd', 'zone': 4,
|
|
|
|
'region': 2, 'ip': '1.1.1.2', 'port': 1112,
|
|
|
|
'replication_ip': '127.0.0.1', 'replication_port': 6001},
|
|
|
|
]
|
|
|
|
objects_sdb, objects_1_sdb, _, _ = self._write_disk_data('sdb')
|
|
|
|
objects_sdc, objects_1_sdc, _, _ = self._write_disk_data('sdc')
|
|
|
|
objects_sdd, objects_1_sdd, _, _ = self._write_disk_data('sdd')
|
|
|
|
_create_test_rings(self.testdir, devs)
|
|
|
|
|
|
|
|
jobs = self.replicator.collect_jobs()
|
|
|
|
|
|
|
|
self.assertEqual([mock.call(jobs)], mock_shuffle.mock_calls)
|
|
|
|
|
|
|
|
jobs_to_delete = [j for j in jobs if j['delete']]
|
2015-08-06 00:55:36 +05:30
|
|
|
self.assertEqual(len(jobs_to_delete), 4)
|
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
|
|
|
self.assertEqual([
|
|
|
|
'1', '2', # policy 0; 1 not on sda, 2 not on sdb
|
|
|
|
'1', '2', # policy 1; 1 not on sda, 2 not on sdb
|
|
|
|
], [j['partition'] for j in jobs_to_delete])
|
|
|
|
|
|
|
|
jobs_by_pol_part_dev = {}
|
|
|
|
for job in jobs:
|
|
|
|
# There should be no jobs with a device not in just sda & sdb
|
|
|
|
self.assertTrue(job['device'] in ('sda', 'sdb'))
|
|
|
|
jobs_by_pol_part_dev[
|
|
|
|
str(int(job['policy'])) + job['partition'] + job['device']
|
|
|
|
] = job
|
|
|
|
|
2015-08-06 00:55:36 +05:30
|
|
|
self.assertEqual([node['id']
|
|
|
|
for node in jobs_by_pol_part_dev['00sda']['nodes']],
|
|
|
|
[1, 2])
|
|
|
|
self.assertEqual([node['id']
|
|
|
|
for node in jobs_by_pol_part_dev['00sdb']['nodes']],
|
|
|
|
[0, 2])
|
|
|
|
self.assertEqual([node['id']
|
|
|
|
for node in jobs_by_pol_part_dev['01sda']['nodes']],
|
|
|
|
[1, 2, 3])
|
|
|
|
self.assertEqual([node['id']
|
|
|
|
for node in jobs_by_pol_part_dev['01sdb']['nodes']],
|
|
|
|
[2, 3])
|
|
|
|
self.assertEqual([node['id']
|
|
|
|
for node in jobs_by_pol_part_dev['02sda']['nodes']],
|
|
|
|
[2, 3])
|
|
|
|
self.assertEqual([node['id']
|
|
|
|
for node in jobs_by_pol_part_dev['02sdb']['nodes']],
|
|
|
|
[2, 3, 0])
|
|
|
|
self.assertEqual([node['id']
|
|
|
|
for node in jobs_by_pol_part_dev['03sda']['nodes']],
|
|
|
|
[3, 1])
|
|
|
|
self.assertEqual([node['id']
|
|
|
|
for node in jobs_by_pol_part_dev['03sdb']['nodes']],
|
|
|
|
[3, 0])
|
|
|
|
self.assertEqual([node['id']
|
|
|
|
for node in jobs_by_pol_part_dev['10sda']['nodes']],
|
|
|
|
[1, 2])
|
|
|
|
self.assertEqual([node['id']
|
|
|
|
for node in jobs_by_pol_part_dev['10sdb']['nodes']],
|
|
|
|
[0, 2])
|
|
|
|
self.assertEqual([node['id']
|
|
|
|
for node in jobs_by_pol_part_dev['11sda']['nodes']],
|
|
|
|
[1, 2, 3])
|
|
|
|
self.assertEqual([node['id']
|
|
|
|
for node in jobs_by_pol_part_dev['11sdb']['nodes']],
|
|
|
|
[2, 3])
|
|
|
|
self.assertEqual([node['id']
|
|
|
|
for node in jobs_by_pol_part_dev['12sda']['nodes']],
|
|
|
|
[2, 3])
|
|
|
|
self.assertEqual([node['id']
|
|
|
|
for node in jobs_by_pol_part_dev['12sdb']['nodes']],
|
|
|
|
[2, 3, 0])
|
|
|
|
self.assertEqual([node['id']
|
|
|
|
for node in jobs_by_pol_part_dev['13sda']['nodes']],
|
|
|
|
[3, 1])
|
|
|
|
self.assertEqual([node['id']
|
|
|
|
for node in jobs_by_pol_part_dev['13sdb']['nodes']],
|
|
|
|
[3, 0])
|
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
|
|
|
for part in ['00', '01', '02', '03']:
|
2015-08-06 00:55:36 +05:30
|
|
|
self.assertEqual(jobs_by_pol_part_dev[part + 'sda']['path'],
|
|
|
|
os.path.join(self.objects, part[1:]))
|
|
|
|
self.assertEqual(jobs_by_pol_part_dev[part + 'sdb']['path'],
|
|
|
|
os.path.join(objects_sdb, part[1:]))
|
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
|
|
|
for part in ['10', '11', '12', '13']:
|
2015-08-06 00:55:36 +05:30
|
|
|
self.assertEqual(jobs_by_pol_part_dev[part + 'sda']['path'],
|
|
|
|
os.path.join(self.objects_1, part[1:]))
|
|
|
|
self.assertEqual(jobs_by_pol_part_dev[part + 'sdb']['path'],
|
|
|
|
os.path.join(objects_1_sdb, part[1:]))
|
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
|
|
|
|
|
|
|
@mock.patch('swift.obj.replicator.random.shuffle', side_effect=lambda l: l)
|
|
|
|
def test_collect_jobs_multi_disk_diff_ports_normal(self, mock_shuffle):
|
|
|
|
# Normally (servers_per_port=0), replication_ip AND replication_port
|
|
|
|
# are used to determine local ring device entries. Here we show that
|
|
|
|
# with bind_ip='127.0.0.1', bind_port=6000, only "sdc" is local.
|
|
|
|
devs = [
|
|
|
|
# Two disks on same IP/port
|
|
|
|
{'id': 0, 'device': 'sda', 'zone': 0,
|
|
|
|
'region': 1, 'ip': '1.1.1.1', 'port': 1111,
|
|
|
|
'replication_ip': '127.0.0.0', 'replication_port': 6000},
|
|
|
|
{'id': 1, 'device': 'sdb', 'zone': 1,
|
|
|
|
'region': 1, 'ip': '1.1.1.1', 'port': 1111,
|
|
|
|
'replication_ip': '127.0.0.0', 'replication_port': 6000},
|
|
|
|
# Two disks on same server, different ports
|
|
|
|
{'id': 2, 'device': 'sdc', 'zone': 2,
|
|
|
|
'region': 2, 'ip': '1.1.1.2', 'port': 1112,
|
|
|
|
'replication_ip': '127.0.0.1', 'replication_port': 6000},
|
|
|
|
{'id': 3, 'device': 'sdd', 'zone': 4,
|
|
|
|
'region': 2, 'ip': '1.1.1.2', 'port': 1112,
|
|
|
|
'replication_ip': '127.0.0.1', 'replication_port': 6001},
|
|
|
|
]
|
|
|
|
objects_sdb, objects_1_sdb, _, _ = self._write_disk_data('sdb')
|
|
|
|
objects_sdc, objects_1_sdc, _, _ = self._write_disk_data('sdc')
|
|
|
|
objects_sdd, objects_1_sdd, _, _ = self._write_disk_data('sdd')
|
|
|
|
_create_test_rings(self.testdir, devs)
|
|
|
|
|
|
|
|
self.conf['bind_ip'] = '127.0.0.1'
|
|
|
|
self._create_replicator()
|
|
|
|
|
|
|
|
jobs = self.replicator.collect_jobs()
|
|
|
|
|
|
|
|
self.assertEqual([mock.call(jobs)], mock_shuffle.mock_calls)
|
|
|
|
|
|
|
|
jobs_to_delete = [j for j in jobs if j['delete']]
|
2015-08-06 00:55:36 +05:30
|
|
|
self.assertEqual(len(jobs_to_delete), 2)
|
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
|
|
|
self.assertEqual([
|
|
|
|
'3', # policy 0; 3 not on sdc
|
|
|
|
'3', # policy 1; 3 not on sdc
|
|
|
|
], [j['partition'] for j in jobs_to_delete])
|
|
|
|
|
|
|
|
jobs_by_pol_part_dev = {}
|
|
|
|
for job in jobs:
|
|
|
|
# There should be no jobs with a device not sdc
|
|
|
|
self.assertEqual(job['device'], 'sdc')
|
|
|
|
jobs_by_pol_part_dev[
|
|
|
|
str(int(job['policy'])) + job['partition'] + job['device']
|
|
|
|
] = job
|
|
|
|
|
2015-08-06 00:55:36 +05:30
|
|
|
self.assertEqual([node['id']
|
|
|
|
for node in jobs_by_pol_part_dev['00sdc']['nodes']],
|
|
|
|
[0, 1])
|
|
|
|
self.assertEqual([node['id']
|
|
|
|
for node in jobs_by_pol_part_dev['01sdc']['nodes']],
|
|
|
|
[1, 3])
|
|
|
|
self.assertEqual([node['id']
|
|
|
|
for node in jobs_by_pol_part_dev['02sdc']['nodes']],
|
|
|
|
[3, 0])
|
|
|
|
self.assertEqual([node['id']
|
|
|
|
for node in jobs_by_pol_part_dev['03sdc']['nodes']],
|
|
|
|
[3, 0, 1])
|
|
|
|
self.assertEqual([node['id']
|
|
|
|
for node in jobs_by_pol_part_dev['10sdc']['nodes']],
|
|
|
|
[0, 1])
|
|
|
|
self.assertEqual([node['id']
|
|
|
|
for node in jobs_by_pol_part_dev['11sdc']['nodes']],
|
|
|
|
[1, 3])
|
|
|
|
self.assertEqual([node['id']
|
|
|
|
for node in jobs_by_pol_part_dev['12sdc']['nodes']],
|
|
|
|
[3, 0])
|
|
|
|
self.assertEqual([node['id']
|
|
|
|
for node in jobs_by_pol_part_dev['13sdc']['nodes']],
|
|
|
|
[3, 0, 1])
|
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
|
|
|
for part in ['00', '01', '02', '03']:
|
2015-08-06 00:55:36 +05:30
|
|
|
self.assertEqual(jobs_by_pol_part_dev[part + 'sdc']['path'],
|
|
|
|
os.path.join(objects_sdc, part[1:]))
|
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
|
|
|
for part in ['10', '11', '12', '13']:
|
2015-08-06 00:55:36 +05:30
|
|
|
self.assertEqual(jobs_by_pol_part_dev[part + 'sdc']['path'],
|
|
|
|
os.path.join(objects_1_sdc, part[1:]))
|
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
|
|
|
|
|
|
|
@mock.patch('swift.obj.replicator.random.shuffle', side_effect=lambda l: l)
|
|
|
|
def test_collect_jobs_multi_disk_servers_per_port(self, mock_shuffle):
|
|
|
|
# Normally (servers_per_port=0), replication_ip AND replication_port
|
|
|
|
# are used to determine local ring device entries. Here we show that
|
|
|
|
# with servers_per_port > 0 and bind_ip='127.0.0.1', bind_port=6000,
|
|
|
|
# then both "sdc" and "sdd" are local.
|
|
|
|
devs = [
|
|
|
|
# Two disks on same IP/port
|
|
|
|
{'id': 0, 'device': 'sda', 'zone': 0,
|
|
|
|
'region': 1, 'ip': '1.1.1.1', 'port': 1111,
|
|
|
|
'replication_ip': '127.0.0.0', 'replication_port': 6000},
|
|
|
|
{'id': 1, 'device': 'sdb', 'zone': 1,
|
|
|
|
'region': 1, 'ip': '1.1.1.1', 'port': 1111,
|
|
|
|
'replication_ip': '127.0.0.0', 'replication_port': 6000},
|
|
|
|
# Two disks on same server, different ports
|
|
|
|
{'id': 2, 'device': 'sdc', 'zone': 2,
|
|
|
|
'region': 2, 'ip': '1.1.1.2', 'port': 1112,
|
|
|
|
'replication_ip': '127.0.0.1', 'replication_port': 6000},
|
|
|
|
{'id': 3, 'device': 'sdd', 'zone': 4,
|
|
|
|
'region': 2, 'ip': '1.1.1.2', 'port': 1112,
|
|
|
|
'replication_ip': '127.0.0.1', 'replication_port': 6001},
|
|
|
|
]
|
|
|
|
objects_sdb, objects_1_sdb, _, _ = self._write_disk_data('sdb')
|
|
|
|
objects_sdc, objects_1_sdc, _, _ = self._write_disk_data('sdc')
|
|
|
|
objects_sdd, objects_1_sdd, _, _ = self._write_disk_data('sdd')
|
|
|
|
_create_test_rings(self.testdir, devs)
|
|
|
|
|
|
|
|
self.conf['bind_ip'] = '127.0.0.1'
|
|
|
|
self.conf['servers_per_port'] = 1 # diff port ok
|
|
|
|
self._create_replicator()
|
|
|
|
|
|
|
|
jobs = self.replicator.collect_jobs()
|
|
|
|
|
|
|
|
self.assertEqual([mock.call(jobs)], mock_shuffle.mock_calls)
|
|
|
|
|
|
|
|
jobs_to_delete = [j for j in jobs if j['delete']]
|
2015-08-06 00:55:36 +05:30
|
|
|
self.assertEqual(len(jobs_to_delete), 4)
|
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
|
|
|
self.assertEqual([
|
|
|
|
'3', '0', # policy 0; 3 not on sdc, 0 not on sdd
|
|
|
|
'3', '0', # policy 1; 3 not on sdc, 0 not on sdd
|
|
|
|
], [j['partition'] for j in jobs_to_delete])
|
|
|
|
|
|
|
|
jobs_by_pol_part_dev = {}
|
|
|
|
for job in jobs:
|
|
|
|
# There should be no jobs with a device not in just sdc & sdd
|
|
|
|
self.assertTrue(job['device'] in ('sdc', 'sdd'))
|
|
|
|
jobs_by_pol_part_dev[
|
|
|
|
str(int(job['policy'])) + job['partition'] + job['device']
|
|
|
|
] = job
|
|
|
|
|
2015-08-06 00:55:36 +05:30
|
|
|
self.assertEqual([node['id']
|
|
|
|
for node in jobs_by_pol_part_dev['00sdc']['nodes']],
|
|
|
|
[0, 1])
|
|
|
|
self.assertEqual([node['id']
|
|
|
|
for node in jobs_by_pol_part_dev['00sdd']['nodes']],
|
|
|
|
[0, 1, 2])
|
|
|
|
self.assertEqual([node['id']
|
|
|
|
for node in jobs_by_pol_part_dev['01sdc']['nodes']],
|
|
|
|
[1, 3])
|
|
|
|
self.assertEqual([node['id']
|
|
|
|
for node in jobs_by_pol_part_dev['01sdd']['nodes']],
|
|
|
|
[1, 2])
|
|
|
|
self.assertEqual([node['id']
|
|
|
|
for node in jobs_by_pol_part_dev['02sdc']['nodes']],
|
|
|
|
[3, 0])
|
|
|
|
self.assertEqual([node['id']
|
|
|
|
for node in jobs_by_pol_part_dev['02sdd']['nodes']],
|
|
|
|
[2, 0])
|
|
|
|
self.assertEqual([node['id']
|
|
|
|
for node in jobs_by_pol_part_dev['03sdc']['nodes']],
|
|
|
|
[3, 0, 1])
|
|
|
|
self.assertEqual([node['id']
|
|
|
|
for node in jobs_by_pol_part_dev['03sdd']['nodes']],
|
|
|
|
[0, 1])
|
|
|
|
self.assertEqual([node['id']
|
|
|
|
for node in jobs_by_pol_part_dev['10sdc']['nodes']],
|
|
|
|
[0, 1])
|
|
|
|
self.assertEqual([node['id']
|
|
|
|
for node in jobs_by_pol_part_dev['10sdd']['nodes']],
|
|
|
|
[0, 1, 2])
|
|
|
|
self.assertEqual([node['id']
|
|
|
|
for node in jobs_by_pol_part_dev['11sdc']['nodes']],
|
|
|
|
[1, 3])
|
|
|
|
self.assertEqual([node['id']
|
|
|
|
for node in jobs_by_pol_part_dev['11sdd']['nodes']],
|
|
|
|
[1, 2])
|
|
|
|
self.assertEqual([node['id']
|
|
|
|
for node in jobs_by_pol_part_dev['12sdc']['nodes']],
|
|
|
|
[3, 0])
|
|
|
|
self.assertEqual([node['id']
|
|
|
|
for node in jobs_by_pol_part_dev['12sdd']['nodes']],
|
|
|
|
[2, 0])
|
|
|
|
self.assertEqual([node['id']
|
|
|
|
for node in jobs_by_pol_part_dev['13sdc']['nodes']],
|
|
|
|
[3, 0, 1])
|
|
|
|
self.assertEqual([node['id']
|
|
|
|
for node in jobs_by_pol_part_dev['13sdd']['nodes']],
|
|
|
|
[0, 1])
|
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
|
|
|
for part in ['00', '01', '02', '03']:
|
2015-08-06 00:55:36 +05:30
|
|
|
self.assertEqual(jobs_by_pol_part_dev[part + 'sdc']['path'],
|
|
|
|
os.path.join(objects_sdc, part[1:]))
|
|
|
|
self.assertEqual(jobs_by_pol_part_dev[part + 'sdd']['path'],
|
|
|
|
os.path.join(objects_sdd, part[1:]))
|
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
|
|
|
for part in ['10', '11', '12', '13']:
|
2015-08-06 00:55:36 +05:30
|
|
|
self.assertEqual(jobs_by_pol_part_dev[part + 'sdc']['path'],
|
|
|
|
os.path.join(objects_1_sdc, part[1:]))
|
|
|
|
self.assertEqual(jobs_by_pol_part_dev[part + 'sdd']['path'],
|
|
|
|
os.path.join(objects_1_sdd, part[1:]))
|
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
|
|
|
|
2013-08-22 19:23:29 +00:00
|
|
|
def test_collect_jobs_handoffs_first(self):
|
|
|
|
self.replicator.handoffs_first = True
|
|
|
|
jobs = self.replicator.collect_jobs()
|
|
|
|
self.assertTrue(jobs[0]['delete'])
|
2015-08-06 00:55:36 +05:30
|
|
|
self.assertEqual('1', jobs[0]['partition'])
|
2013-08-22 19:23:29 +00:00
|
|
|
|
2015-08-21 18:14:55 -07:00
|
|
|
def test_handoffs_first_mode_will_process_all_jobs_after_handoffs(self):
|
|
|
|
# make a object in the handoff & primary partition
|
|
|
|
expected_suffix_paths = []
|
|
|
|
for policy in POLICIES:
|
|
|
|
# primary
|
|
|
|
ts = next(self.ts)
|
|
|
|
df = self.df_mgr.get_diskfile('sda', '0', 'a', 'c', 'o', policy)
|
|
|
|
with df.create() as w:
|
|
|
|
w.write('asdf')
|
|
|
|
w.put({'X-Timestamp': ts.internal})
|
|
|
|
w.commit(ts)
|
|
|
|
expected_suffix_paths.append(os.path.dirname(df._datadir))
|
|
|
|
# handoff
|
|
|
|
ts = next(self.ts)
|
|
|
|
df = self.df_mgr.get_diskfile('sda', '1', 'a', 'c', 'o', policy)
|
|
|
|
with df.create() as w:
|
|
|
|
w.write('asdf')
|
|
|
|
w.put({'X-Timestamp': ts.internal})
|
|
|
|
w.commit(ts)
|
|
|
|
expected_suffix_paths.append(os.path.dirname(df._datadir))
|
|
|
|
|
|
|
|
# rsync will be called for all parts we created objects in
|
|
|
|
process_arg_checker = [
|
|
|
|
# (return_code, stdout, <each in capture rsync args>)
|
|
|
|
(0, '', []),
|
|
|
|
(0, '', []),
|
|
|
|
(0, '', []), # handoff job "first" policy
|
|
|
|
(0, '', []),
|
|
|
|
(0, '', []),
|
|
|
|
(0, '', []), # handoff job "second" policy
|
|
|
|
(0, '', []),
|
|
|
|
(0, '', []), # update job "first" policy
|
|
|
|
(0, '', []),
|
|
|
|
(0, '', []), # update job "second" policy
|
|
|
|
]
|
|
|
|
# each handoff partition node gets one replicate request for after
|
|
|
|
# rsync (2 * 3), each primary partition with objects gets two
|
|
|
|
# replicate requests (pre-flight and post sync) to each of each
|
|
|
|
# partners (2 * 2 * 2), the 2 remaining empty parts (2 & 3) get a
|
|
|
|
# pre-flight replicate request per node for each storage policy
|
|
|
|
# (2 * 2 * 2) - so 6 + 8 + 8 == 22
|
|
|
|
replicate_responses = [200] * 22
|
|
|
|
stub_body = pickle.dumps({})
|
|
|
|
with _mock_process(process_arg_checker) as rsync_log, \
|
|
|
|
mock.patch('swift.obj.replicator.whataremyips',
|
|
|
|
side_effect=_ips), \
|
|
|
|
mocked_http_conn(*replicate_responses,
|
|
|
|
body=stub_body) as conn_log:
|
|
|
|
self.replicator.handoffs_first = True
|
|
|
|
self.replicator.replicate()
|
|
|
|
# all jobs processed!
|
|
|
|
self.assertEqual(self.replicator.job_count,
|
|
|
|
self.replicator.replication_count)
|
|
|
|
|
|
|
|
# sanity, all the handoffs suffixes we filled in were rsync'd
|
|
|
|
found_rsync_suffix_paths = set()
|
|
|
|
for subprocess_info in rsync_log:
|
|
|
|
local_path, remote_path = subprocess_info['rsync_args'][-2:]
|
|
|
|
found_rsync_suffix_paths.add(local_path)
|
|
|
|
self.assertEqual(set(expected_suffix_paths), found_rsync_suffix_paths)
|
|
|
|
# sanity, all nodes got replicated
|
|
|
|
found_replicate_calls = defaultdict(int)
|
|
|
|
for req in conn_log.requests:
|
|
|
|
self.assertEqual(req['method'], 'REPLICATE')
|
|
|
|
found_replicate_key = (
|
|
|
|
int(req['headers']['X-Backend-Storage-Policy-Index']),
|
|
|
|
req['path'])
|
|
|
|
found_replicate_calls[found_replicate_key] += 1
|
|
|
|
expected_replicate_calls = {
|
|
|
|
(0, '/sda/1/a83'): 3,
|
|
|
|
(1, '/sda/1/a83'): 3,
|
|
|
|
(0, '/sda/0'): 2,
|
|
|
|
(0, '/sda/0/a83'): 2,
|
|
|
|
(1, '/sda/0'): 2,
|
|
|
|
(1, '/sda/0/a83'): 2,
|
|
|
|
(0, '/sda/2'): 2,
|
|
|
|
(1, '/sda/2'): 2,
|
|
|
|
(0, '/sda/3'): 2,
|
|
|
|
(1, '/sda/3'): 2,
|
|
|
|
}
|
|
|
|
self.assertEquals(dict(found_replicate_calls),
|
|
|
|
expected_replicate_calls)
|
|
|
|
|
Improve object-replicator startup time.
The object replicator checks each partition directory to ensure it's
really a directory and not a zero-byte file. This was happening in
collect_jobs(), which is the first thing that the object replicator
does.
The effect was that, at startup, the object-replicator process would
list each "objects" or "objects-N" directory on each object device,
then stat() every single thing in there. On devices with lots of
partitions on them, this makes the replicator take a long time before
it does anything useful.
If you have a cluster with a too-high part_power plus some failing
disks elsewhere, you can easily get thousands of partition directories
on each disk. If you've got 36 disks per node, that turns into a very
long wait for the object replicator to do anything. Worse yet, if you
add in a configuration management system that pushes new rings every
couple hours, the object replicator can spend the vast majority of its
time collecting jobs, then only spend a short time doing useful work
before the ring changes and it has to start all over again.
This commit moves the stat() call (os.path.isfile) to the loop that
processes jobs. In a complete pass, the total work done is about the
same, but the replicator starts doing useful work much sooner.
Change-Id: I5ed4cd09dde514ec7d1e74afe35feaab0cf28a10
2014-12-08 15:05:29 -08:00
|
|
|
def test_replicator_skips_bogus_partition_dirs(self):
|
|
|
|
# A directory in the wrong place shouldn't crash the replicator
|
|
|
|
rmtree(self.objects)
|
|
|
|
rmtree(self.objects_1)
|
|
|
|
os.mkdir(self.objects)
|
|
|
|
os.mkdir(self.objects_1)
|
|
|
|
|
|
|
|
os.mkdir(os.path.join(self.objects, "burrito"))
|
|
|
|
jobs = self.replicator.collect_jobs()
|
|
|
|
self.assertEqual(len(jobs), 0)
|
|
|
|
|
|
|
|
def test_replicator_removes_zbf(self):
|
|
|
|
# After running xfs_repair, a partition directory could become a
|
|
|
|
# zero-byte file. If this happens, the replicator should clean it
|
|
|
|
# up, log something, and move on to the next partition.
|
|
|
|
|
|
|
|
# Surprise! Partition dir 1 is actually a zero-byte file.
|
|
|
|
pol_0_part_1_path = os.path.join(self.objects, '1')
|
|
|
|
rmtree(pol_0_part_1_path)
|
|
|
|
with open(pol_0_part_1_path, 'w'):
|
2012-09-04 13:59:26 -07:00
|
|
|
pass
|
Improve object-replicator startup time.
The object replicator checks each partition directory to ensure it's
really a directory and not a zero-byte file. This was happening in
collect_jobs(), which is the first thing that the object replicator
does.
The effect was that, at startup, the object-replicator process would
list each "objects" or "objects-N" directory on each object device,
then stat() every single thing in there. On devices with lots of
partitions on them, this makes the replicator take a long time before
it does anything useful.
If you have a cluster with a too-high part_power plus some failing
disks elsewhere, you can easily get thousands of partition directories
on each disk. If you've got 36 disks per node, that turns into a very
long wait for the object replicator to do anything. Worse yet, if you
add in a configuration management system that pushes new rings every
couple hours, the object replicator can spend the vast majority of its
time collecting jobs, then only spend a short time doing useful work
before the ring changes and it has to start all over again.
This commit moves the stat() call (os.path.isfile) to the loop that
processes jobs. In a complete pass, the total work done is about the
same, but the replicator starts doing useful work much sooner.
Change-Id: I5ed4cd09dde514ec7d1e74afe35feaab0cf28a10
2014-12-08 15:05:29 -08:00
|
|
|
self.assertTrue(os.path.isfile(pol_0_part_1_path)) # sanity check
|
|
|
|
|
|
|
|
# Policy 1's partition dir 1 is also a zero-byte file.
|
|
|
|
pol_1_part_1_path = os.path.join(self.objects_1, '1')
|
|
|
|
rmtree(pol_1_part_1_path)
|
|
|
|
with open(pol_1_part_1_path, 'w'):
|
2014-03-18 10:50:17 -07:00
|
|
|
pass
|
Improve object-replicator startup time.
The object replicator checks each partition directory to ensure it's
really a directory and not a zero-byte file. This was happening in
collect_jobs(), which is the first thing that the object replicator
does.
The effect was that, at startup, the object-replicator process would
list each "objects" or "objects-N" directory on each object device,
then stat() every single thing in there. On devices with lots of
partitions on them, this makes the replicator take a long time before
it does anything useful.
If you have a cluster with a too-high part_power plus some failing
disks elsewhere, you can easily get thousands of partition directories
on each disk. If you've got 36 disks per node, that turns into a very
long wait for the object replicator to do anything. Worse yet, if you
add in a configuration management system that pushes new rings every
couple hours, the object replicator can spend the vast majority of its
time collecting jobs, then only spend a short time doing useful work
before the ring changes and it has to start all over again.
This commit moves the stat() call (os.path.isfile) to the loop that
processes jobs. In a complete pass, the total work done is about the
same, but the replicator starts doing useful work much sooner.
Change-Id: I5ed4cd09dde514ec7d1e74afe35feaab0cf28a10
2014-12-08 15:05:29 -08:00
|
|
|
self.assertTrue(os.path.isfile(pol_1_part_1_path)) # sanity check
|
|
|
|
|
|
|
|
# Don't delete things in collect_jobs(); all the stat() calls would
|
|
|
|
# make replicator startup really slow.
|
|
|
|
self.replicator.collect_jobs()
|
|
|
|
self.assertTrue(os.path.exists(pol_0_part_1_path))
|
|
|
|
self.assertTrue(os.path.exists(pol_1_part_1_path))
|
|
|
|
|
|
|
|
# After a replication pass, the files should be gone
|
|
|
|
with mock.patch('swift.obj.replicator.http_connect',
|
|
|
|
mock_http_connect(200)):
|
|
|
|
self.replicator.run_once()
|
|
|
|
|
|
|
|
self.assertFalse(os.path.exists(pol_0_part_1_path))
|
|
|
|
self.assertFalse(os.path.exists(pol_1_part_1_path))
|
2015-03-31 22:35:37 -07:00
|
|
|
self.assertEqual(
|
|
|
|
sorted(self.logger.get_lines_for_level('warning')), [
|
|
|
|
('Removing partition directory which was a file: %s'
|
|
|
|
% pol_1_part_1_path),
|
|
|
|
('Removing partition directory which was a file: %s'
|
|
|
|
% pol_0_part_1_path),
|
|
|
|
])
|
2012-09-04 13:59:26 -07:00
|
|
|
|
2010-11-05 09:15:31 -07:00
|
|
|
def test_delete_partition(self):
|
2013-07-30 17:16:59 +02:00
|
|
|
with mock.patch('swift.obj.replicator.http_connect',
|
|
|
|
mock_http_connect(200)):
|
2015-03-17 08:32:57 +00:00
|
|
|
df = self.df_mgr.get_diskfile('sda', '1', 'a', 'c', 'o',
|
|
|
|
policy=POLICIES.legacy)
|
DiskFile API, with reference implementation
Refactor on-disk knowledge out of the object server by pushing the
async update pickle creation to the new DiskFileManager class (name is
not the best, so suggestions welcome), along with the REPLICATOR
method logic. We also move the mount checking and thread pool storage
to the new ondisk.Devices object, which then also becomes the new home
of the audit_location_generator method.
For the object server, a new setup() method is now called at the end
of the controller's construction, and the _diskfile() method has been
renamed to get_diskfile(), to allow implementation specific behavior.
We then hide the need for the REST API layer to know how and where
quarantining needs to be performed. There are now two places it is
checked internally, on open() where we verify the content-length,
name, and x-timestamp metadata, and in the reader on close where the
etag metadata is checked if the entire file was read.
We add a reader class to allow implementations to isolate the WSGI
handling code for that specific environment (it is used no-where else
in the REST APIs). This simplifies the caller's code to just use a
"with" statement once open to avoid multiple points where close needs
to be called.
For a full historical comparison, including the usage patterns see:
https://gist.github.com/portante/5488238
(as of master, 2b639f5, Merge
"Fix 500 from account-quota This Commit
middleware")
--------------------------------+------------------------------------
DiskFileManager(conf)
Methods:
.pickle_async_update()
.get_diskfile()
.get_hashes()
Attributes:
.devices
.logger
.disk_chunk_size
.keep_cache_size
.bytes_per_sync
DiskFile(a,c,o,keep_data_fp=) DiskFile(a,c,o)
Methods: Methods:
*.__iter__()
.close(verify_file=)
.is_deleted()
.is_expired()
.quarantine()
.get_data_file_size()
.open()
.read_metadata()
.create() .create()
.write_metadata()
.delete() .delete()
Attributes: Attributes:
.quarantined_dir
.keep_cache
.metadata
*DiskFileReader()
Methods:
.__iter__()
.close()
Attributes:
+.was_quarantined
DiskWriter() DiskFileWriter()
Methods: Methods:
.write() .write()
.put() .put()
* Note that the DiskFile class * Note that the DiskReader() object
implements all the methods returned by the
necessary for a WSGI app DiskFileOpened.reader() method
iterator implements all the methods
necessary for a WSGI app iterator
+ Note that if the auditor is
refactored to not use the DiskFile
class, see
https://review.openstack.org/44787
then we don't need the
was_quarantined attribute
A reference "in-memory" object server implementation of a backend
DiskFile class in swift/obj/mem_server.py and
swift/obj/mem_diskfile.py.
One can also reference
https://github.com/portante/gluster-swift/commits/diskfile for the
proposed integration with the gluster-swift code based on these
changes.
Change-Id: I44e153fdb405a5743e9c05349008f94136764916
Signed-off-by: Peter Portante <peter.portante@redhat.com>
2013-09-12 19:51:18 -04:00
|
|
|
mkdirs(df._datadir)
|
|
|
|
f = open(os.path.join(df._datadir,
|
2013-08-22 19:23:29 +00:00
|
|
|
normalize_timestamp(time.time()) + '.data'),
|
|
|
|
'wb')
|
|
|
|
f.write('1234567890')
|
|
|
|
f.close()
|
|
|
|
ohash = hash_path('a', 'c', 'o')
|
|
|
|
data_dir = ohash[-3:]
|
|
|
|
whole_path_from = os.path.join(self.objects, '1', data_dir)
|
|
|
|
part_path = os.path.join(self.objects, '1')
|
|
|
|
self.assertTrue(os.access(part_path, os.F_OK))
|
2015-03-17 08:32:57 +00:00
|
|
|
ring = self.replicator.load_object_ring(POLICIES[0])
|
2013-08-22 19:23:29 +00:00
|
|
|
nodes = [node for node in
|
2014-03-18 10:50:17 -07:00
|
|
|
ring.get_part_nodes(1)
|
2013-08-22 19:23:29 +00:00
|
|
|
if node['ip'] not in _ips()]
|
|
|
|
process_arg_checker = []
|
|
|
|
for node in nodes:
|
|
|
|
rsync_mod = '%s::object/sda/objects/%s' % (node['ip'], 1)
|
|
|
|
process_arg_checker.append(
|
|
|
|
(0, '', ['rsync', whole_path_from, rsync_mod]))
|
|
|
|
with _mock_process(process_arg_checker):
|
|
|
|
self.replicator.replicate()
|
|
|
|
self.assertFalse(os.access(part_path, os.F_OK))
|
|
|
|
|
2015-02-26 16:37:16 -08:00
|
|
|
def test_delete_partition_default_sync_method(self):
|
|
|
|
self.replicator.conf.pop('sync_method')
|
|
|
|
with mock.patch('swift.obj.replicator.http_connect',
|
|
|
|
mock_http_connect(200)):
|
2015-03-17 08:32:57 +00:00
|
|
|
df = self.df_mgr.get_diskfile('sda', '1', 'a', 'c', 'o',
|
|
|
|
policy=POLICIES.legacy)
|
2015-02-26 16:37:16 -08:00
|
|
|
mkdirs(df._datadir)
|
|
|
|
f = open(os.path.join(df._datadir,
|
|
|
|
normalize_timestamp(time.time()) + '.data'),
|
|
|
|
'wb')
|
|
|
|
f.write('1234567890')
|
|
|
|
f.close()
|
|
|
|
ohash = hash_path('a', 'c', 'o')
|
|
|
|
data_dir = ohash[-3:]
|
|
|
|
whole_path_from = os.path.join(self.objects, '1', data_dir)
|
|
|
|
part_path = os.path.join(self.objects, '1')
|
|
|
|
self.assertTrue(os.access(part_path, os.F_OK))
|
2015-03-17 08:32:57 +00:00
|
|
|
ring = self.replicator.load_object_ring(POLICIES[0])
|
2015-02-26 16:37:16 -08:00
|
|
|
nodes = [node for node in
|
|
|
|
ring.get_part_nodes(1)
|
|
|
|
if node['ip'] not in _ips()]
|
|
|
|
process_arg_checker = []
|
|
|
|
for node in nodes:
|
|
|
|
rsync_mod = '%s::object/sda/objects/%s' % (node['ip'], 1)
|
|
|
|
process_arg_checker.append(
|
|
|
|
(0, '', ['rsync', whole_path_from, rsync_mod]))
|
|
|
|
with _mock_process(process_arg_checker):
|
|
|
|
self.replicator.replicate()
|
|
|
|
self.assertFalse(os.access(part_path, os.F_OK))
|
|
|
|
|
|
|
|
def test_delete_partition_ssync_single_region(self):
|
|
|
|
devs = [
|
|
|
|
{'id': 0, 'device': 'sda', 'zone': 0,
|
|
|
|
'region': 1, 'ip': '127.0.0.0', 'port': 6000},
|
|
|
|
{'id': 1, 'device': 'sda', 'zone': 1,
|
|
|
|
'region': 1, 'ip': '127.0.0.1', 'port': 6000},
|
|
|
|
{'id': 2, 'device': 'sda', 'zone': 2,
|
|
|
|
'region': 1, 'ip': '127.0.0.2', 'port': 6000},
|
|
|
|
{'id': 3, 'device': 'sda', 'zone': 4,
|
|
|
|
'region': 1, 'ip': '127.0.0.3', 'port': 6000},
|
|
|
|
{'id': 4, 'device': 'sda', 'zone': 5,
|
|
|
|
'region': 1, 'ip': '127.0.0.4', 'port': 6000},
|
|
|
|
{'id': 5, 'device': 'sda', 'zone': 6,
|
|
|
|
'region': 1, 'ip': 'fe80::202:b3ff:fe1e:8329', 'port': 6000},
|
|
|
|
{'id': 6, 'device': 'sda', 'zone': 7, 'region': 1,
|
|
|
|
'ip': '2001:0db8:85a3:0000:0000:8a2e:0370:7334', 'port': 6000},
|
|
|
|
]
|
|
|
|
_create_test_rings(self.testdir, devs=devs)
|
|
|
|
self.conf['sync_method'] = 'ssync'
|
|
|
|
self.replicator = object_replicator.ObjectReplicator(self.conf)
|
|
|
|
self.replicator.logger = debug_logger()
|
Enable Object Replicator's failure count in recon
This patch makes the count of object replication failure in recon.
And "failure_nodes" is added to Account Replicator and
Container Replicator.
Recon shows the count of object repliction failure as follows:
$ curl http://<ip>:<port>/recon/replication/object
{
"replication_last": 1416334368.60865,
"replication_stats": {
"attempted": 13346,
"failure": 870,
"failure_nodes": {
"192.168.0.1": {"sdb1": 3},
"192.168.0.2": {"sdb1": 851,
"sdc1": 1,
"sdd1": 8},
"192.168.0.3": {"sdb1": 3,
"sdc1": 4}
},
"hashmatch": 0,
"remove": 0,
"rsync": 0,
"start": 1416354240.9761429,
"success": 1908
},
"replication_time": 2316.5563162644703,
"object_replication_last": 1416334368.60865,
"object_replication_time": 2316.5563162644703
}
Note that 'object_replication_last' and 'object_replication_time' are
considered to be transitional and will be removed in the subsequent
releases. Use 'replication_last' and 'replication_time' instead.
Additionaly this patch adds the count in swift-recon and it will be
showed as follows:
$ swift-recon object -r
========================================================================
=======
--> Starting reconnaissance on 4 hosts
========================================================================
=======
[2014-11-27 16:14:09] Checking on replication
[replication_failure] low: 0, high: 0, avg: 0.0, total: 0, Failed: 0.0%,
no_result: 0, reported: 4
[replication_success] low: 3, high: 3, avg: 3.0, total: 12,
Failed: 0.0%, no_result: 0, reported: 4
[replication_time] low: 0, high: 0, avg: 0.0, total: 0, Failed: 0.0%,
no_result: 0, reported: 4
[replication_attempted] low: 1, high: 1, avg: 1.0, total: 4,
Failed: 0.0%, no_result: 0, reported: 4
Oldest completion was 2014-11-27 16:09:45 (4 minutes ago) by
192.168.0.4:6002.
Most recent completion was 2014-11-27 16:14:19 (-10 seconds ago) by
192.168.0.1:6002.
========================================================================
=======
In case there is a cluster which has servers, a server runs with this
patch and the other servers run without this patch. If swift-recon
executes on the server which runs with this patch, there are unnecessary
information on the output such as [failure], [success] and [attempted].
Because other servers which run without this patch are not able to
send a response with information that this patch needs.
Therefore once you apply this patch, you also apply this patch to other
servers before you execute swift-recon.
DocImpact
Change-Id: Iecd33655ae2568482833131f422679996c374d78
Co-Authored-By: Kenichiro Matsuda <matsuda_kenichi@jp.fujitsu.com>
Co-Authored-By: Brian Cline <bcline@softlayer.com>
Implements: blueprint enable-object-replication-failure-in-recon
2014-12-03 06:15:16 +09:00
|
|
|
self.replicator._zero_stats()
|
2015-02-26 16:37:16 -08:00
|
|
|
|
|
|
|
with mock.patch('swift.obj.replicator.http_connect',
|
|
|
|
mock_http_connect(200)):
|
2015-03-17 08:32:57 +00:00
|
|
|
df = self.df_mgr.get_diskfile('sda', '1', 'a', 'c', 'o',
|
|
|
|
policy=POLICIES.legacy)
|
2015-02-26 16:37:16 -08:00
|
|
|
mkdirs(df._datadir)
|
2014-10-28 09:51:06 -07:00
|
|
|
ts = normalize_timestamp(time.time())
|
|
|
|
f = open(os.path.join(df._datadir, ts + '.data'),
|
2015-02-26 16:37:16 -08:00
|
|
|
'wb')
|
|
|
|
f.write('1234567890')
|
|
|
|
f.close()
|
|
|
|
ohash = hash_path('a', 'c', 'o')
|
|
|
|
whole_path_from = storage_directory(self.objects, 1, ohash)
|
|
|
|
suffix_dir_path = os.path.dirname(whole_path_from)
|
|
|
|
part_path = os.path.join(self.objects, '1')
|
|
|
|
self.assertTrue(os.access(part_path, os.F_OK))
|
|
|
|
|
|
|
|
def _fake_ssync(node, job, suffixes, **kwargs):
|
2014-10-28 09:51:06 -07:00
|
|
|
return True, {ohash: ts}
|
2015-02-26 16:37:16 -08:00
|
|
|
|
|
|
|
self.replicator.sync_method = _fake_ssync
|
|
|
|
self.replicator.replicate()
|
|
|
|
self.assertFalse(os.access(whole_path_from, os.F_OK))
|
|
|
|
self.assertFalse(os.access(suffix_dir_path, os.F_OK))
|
|
|
|
self.assertFalse(os.access(part_path, os.F_OK))
|
|
|
|
|
2014-03-18 10:50:17 -07:00
|
|
|
def test_delete_partition_1(self):
|
|
|
|
with mock.patch('swift.obj.replicator.http_connect',
|
|
|
|
mock_http_connect(200)):
|
|
|
|
df = self.df_mgr.get_diskfile('sda', '1', 'a', 'c', 'o',
|
2015-03-17 08:32:57 +00:00
|
|
|
policy=POLICIES[1])
|
2014-03-18 10:50:17 -07:00
|
|
|
mkdirs(df._datadir)
|
|
|
|
f = open(os.path.join(df._datadir,
|
|
|
|
normalize_timestamp(time.time()) + '.data'),
|
|
|
|
'wb')
|
|
|
|
f.write('1234567890')
|
|
|
|
f.close()
|
|
|
|
ohash = hash_path('a', 'c', 'o')
|
|
|
|
data_dir = ohash[-3:]
|
|
|
|
whole_path_from = os.path.join(self.objects_1, '1', data_dir)
|
|
|
|
part_path = os.path.join(self.objects_1, '1')
|
|
|
|
self.assertTrue(os.access(part_path, os.F_OK))
|
2015-03-17 08:32:57 +00:00
|
|
|
ring = self.replicator.load_object_ring(POLICIES[1])
|
2014-03-18 10:50:17 -07:00
|
|
|
nodes = [node for node in
|
|
|
|
ring.get_part_nodes(1)
|
|
|
|
if node['ip'] not in _ips()]
|
|
|
|
process_arg_checker = []
|
|
|
|
for node in nodes:
|
|
|
|
rsync_mod = '%s::object/sda/objects-1/%s' % (node['ip'], 1)
|
|
|
|
process_arg_checker.append(
|
|
|
|
(0, '', ['rsync', whole_path_from, rsync_mod]))
|
|
|
|
with _mock_process(process_arg_checker):
|
|
|
|
self.replicator.replicate()
|
|
|
|
self.assertFalse(os.access(part_path, os.F_OK))
|
|
|
|
|
2013-08-22 19:23:29 +00:00
|
|
|
def test_delete_partition_with_failures(self):
|
|
|
|
with mock.patch('swift.obj.replicator.http_connect',
|
|
|
|
mock_http_connect(200)):
|
2015-03-17 08:32:57 +00:00
|
|
|
df = self.df_mgr.get_diskfile('sda', '1', 'a', 'c', 'o',
|
|
|
|
policy=POLICIES.legacy)
|
DiskFile API, with reference implementation
Refactor on-disk knowledge out of the object server by pushing the
async update pickle creation to the new DiskFileManager class (name is
not the best, so suggestions welcome), along with the REPLICATOR
method logic. We also move the mount checking and thread pool storage
to the new ondisk.Devices object, which then also becomes the new home
of the audit_location_generator method.
For the object server, a new setup() method is now called at the end
of the controller's construction, and the _diskfile() method has been
renamed to get_diskfile(), to allow implementation specific behavior.
We then hide the need for the REST API layer to know how and where
quarantining needs to be performed. There are now two places it is
checked internally, on open() where we verify the content-length,
name, and x-timestamp metadata, and in the reader on close where the
etag metadata is checked if the entire file was read.
We add a reader class to allow implementations to isolate the WSGI
handling code for that specific environment (it is used no-where else
in the REST APIs). This simplifies the caller's code to just use a
"with" statement once open to avoid multiple points where close needs
to be called.
For a full historical comparison, including the usage patterns see:
https://gist.github.com/portante/5488238
(as of master, 2b639f5, Merge
"Fix 500 from account-quota This Commit
middleware")
--------------------------------+------------------------------------
DiskFileManager(conf)
Methods:
.pickle_async_update()
.get_diskfile()
.get_hashes()
Attributes:
.devices
.logger
.disk_chunk_size
.keep_cache_size
.bytes_per_sync
DiskFile(a,c,o,keep_data_fp=) DiskFile(a,c,o)
Methods: Methods:
*.__iter__()
.close(verify_file=)
.is_deleted()
.is_expired()
.quarantine()
.get_data_file_size()
.open()
.read_metadata()
.create() .create()
.write_metadata()
.delete() .delete()
Attributes: Attributes:
.quarantined_dir
.keep_cache
.metadata
*DiskFileReader()
Methods:
.__iter__()
.close()
Attributes:
+.was_quarantined
DiskWriter() DiskFileWriter()
Methods: Methods:
.write() .write()
.put() .put()
* Note that the DiskFile class * Note that the DiskReader() object
implements all the methods returned by the
necessary for a WSGI app DiskFileOpened.reader() method
iterator implements all the methods
necessary for a WSGI app iterator
+ Note that if the auditor is
refactored to not use the DiskFile
class, see
https://review.openstack.org/44787
then we don't need the
was_quarantined attribute
A reference "in-memory" object server implementation of a backend
DiskFile class in swift/obj/mem_server.py and
swift/obj/mem_diskfile.py.
One can also reference
https://github.com/portante/gluster-swift/commits/diskfile for the
proposed integration with the gluster-swift code based on these
changes.
Change-Id: I44e153fdb405a5743e9c05349008f94136764916
Signed-off-by: Peter Portante <peter.portante@redhat.com>
2013-09-12 19:51:18 -04:00
|
|
|
mkdirs(df._datadir)
|
|
|
|
f = open(os.path.join(df._datadir,
|
2013-08-22 19:23:29 +00:00
|
|
|
normalize_timestamp(time.time()) + '.data'),
|
|
|
|
'wb')
|
|
|
|
f.write('1234567890')
|
|
|
|
f.close()
|
|
|
|
ohash = hash_path('a', 'c', 'o')
|
|
|
|
data_dir = ohash[-3:]
|
|
|
|
whole_path_from = os.path.join(self.objects, '1', data_dir)
|
|
|
|
part_path = os.path.join(self.objects, '1')
|
|
|
|
self.assertTrue(os.access(part_path, os.F_OK))
|
2015-03-17 08:32:57 +00:00
|
|
|
ring = self.replicator.load_object_ring(POLICIES[0])
|
2013-08-22 19:23:29 +00:00
|
|
|
nodes = [node for node in
|
2014-03-18 10:50:17 -07:00
|
|
|
ring.get_part_nodes(1)
|
2013-08-22 19:23:29 +00:00
|
|
|
if node['ip'] not in _ips()]
|
|
|
|
process_arg_checker = []
|
|
|
|
for i, node in enumerate(nodes):
|
|
|
|
rsync_mod = '%s::object/sda/objects/%s' % (node['ip'], 1)
|
|
|
|
if i == 0:
|
|
|
|
# force one of the rsync calls to fail
|
|
|
|
ret_code = 1
|
|
|
|
else:
|
|
|
|
ret_code = 0
|
|
|
|
process_arg_checker.append(
|
|
|
|
(ret_code, '', ['rsync', whole_path_from, rsync_mod]))
|
|
|
|
with _mock_process(process_arg_checker):
|
|
|
|
self.replicator.replicate()
|
|
|
|
# The path should still exist
|
|
|
|
self.assertTrue(os.access(part_path, os.F_OK))
|
|
|
|
|
|
|
|
def test_delete_partition_with_handoff_delete(self):
|
|
|
|
with mock.patch('swift.obj.replicator.http_connect',
|
|
|
|
mock_http_connect(200)):
|
|
|
|
self.replicator.handoff_delete = 2
|
2015-03-17 08:32:57 +00:00
|
|
|
df = self.df_mgr.get_diskfile('sda', '1', 'a', 'c', 'o',
|
|
|
|
policy=POLICIES.legacy)
|
DiskFile API, with reference implementation
Refactor on-disk knowledge out of the object server by pushing the
async update pickle creation to the new DiskFileManager class (name is
not the best, so suggestions welcome), along with the REPLICATOR
method logic. We also move the mount checking and thread pool storage
to the new ondisk.Devices object, which then also becomes the new home
of the audit_location_generator method.
For the object server, a new setup() method is now called at the end
of the controller's construction, and the _diskfile() method has been
renamed to get_diskfile(), to allow implementation specific behavior.
We then hide the need for the REST API layer to know how and where
quarantining needs to be performed. There are now two places it is
checked internally, on open() where we verify the content-length,
name, and x-timestamp metadata, and in the reader on close where the
etag metadata is checked if the entire file was read.
We add a reader class to allow implementations to isolate the WSGI
handling code for that specific environment (it is used no-where else
in the REST APIs). This simplifies the caller's code to just use a
"with" statement once open to avoid multiple points where close needs
to be called.
For a full historical comparison, including the usage patterns see:
https://gist.github.com/portante/5488238
(as of master, 2b639f5, Merge
"Fix 500 from account-quota This Commit
middleware")
--------------------------------+------------------------------------
DiskFileManager(conf)
Methods:
.pickle_async_update()
.get_diskfile()
.get_hashes()
Attributes:
.devices
.logger
.disk_chunk_size
.keep_cache_size
.bytes_per_sync
DiskFile(a,c,o,keep_data_fp=) DiskFile(a,c,o)
Methods: Methods:
*.__iter__()
.close(verify_file=)
.is_deleted()
.is_expired()
.quarantine()
.get_data_file_size()
.open()
.read_metadata()
.create() .create()
.write_metadata()
.delete() .delete()
Attributes: Attributes:
.quarantined_dir
.keep_cache
.metadata
*DiskFileReader()
Methods:
.__iter__()
.close()
Attributes:
+.was_quarantined
DiskWriter() DiskFileWriter()
Methods: Methods:
.write() .write()
.put() .put()
* Note that the DiskFile class * Note that the DiskReader() object
implements all the methods returned by the
necessary for a WSGI app DiskFileOpened.reader() method
iterator implements all the methods
necessary for a WSGI app iterator
+ Note that if the auditor is
refactored to not use the DiskFile
class, see
https://review.openstack.org/44787
then we don't need the
was_quarantined attribute
A reference "in-memory" object server implementation of a backend
DiskFile class in swift/obj/mem_server.py and
swift/obj/mem_diskfile.py.
One can also reference
https://github.com/portante/gluster-swift/commits/diskfile for the
proposed integration with the gluster-swift code based on these
changes.
Change-Id: I44e153fdb405a5743e9c05349008f94136764916
Signed-off-by: Peter Portante <peter.portante@redhat.com>
2013-09-12 19:51:18 -04:00
|
|
|
mkdirs(df._datadir)
|
|
|
|
f = open(os.path.join(df._datadir,
|
2013-08-22 19:23:29 +00:00
|
|
|
normalize_timestamp(time.time()) + '.data'),
|
|
|
|
'wb')
|
|
|
|
f.write('1234567890')
|
|
|
|
f.close()
|
|
|
|
ohash = hash_path('a', 'c', 'o')
|
|
|
|
data_dir = ohash[-3:]
|
|
|
|
whole_path_from = os.path.join(self.objects, '1', data_dir)
|
2013-07-30 17:16:59 +02:00
|
|
|
part_path = os.path.join(self.objects, '1')
|
|
|
|
self.assertTrue(os.access(part_path, os.F_OK))
|
2015-03-17 08:32:57 +00:00
|
|
|
ring = self.replicator.load_object_ring(POLICIES[0])
|
2013-08-22 19:23:29 +00:00
|
|
|
nodes = [node for node in
|
2014-03-18 10:50:17 -07:00
|
|
|
ring.get_part_nodes(1)
|
2013-08-22 19:23:29 +00:00
|
|
|
if node['ip'] not in _ips()]
|
|
|
|
process_arg_checker = []
|
|
|
|
for i, node in enumerate(nodes):
|
|
|
|
rsync_mod = '%s::object/sda/objects/%s' % (node['ip'], 1)
|
|
|
|
if i == 0:
|
|
|
|
# force one of the rsync calls to fail
|
|
|
|
ret_code = 1
|
|
|
|
else:
|
|
|
|
ret_code = 0
|
|
|
|
process_arg_checker.append(
|
|
|
|
(ret_code, '', ['rsync', whole_path_from, rsync_mod]))
|
|
|
|
with _mock_process(process_arg_checker):
|
|
|
|
self.replicator.replicate()
|
2013-07-30 17:16:59 +02:00
|
|
|
self.assertFalse(os.access(part_path, os.F_OK))
|
2010-11-05 09:15:31 -07:00
|
|
|
|
2013-08-22 19:23:29 +00:00
|
|
|
def test_delete_partition_with_handoff_delete_failures(self):
|
|
|
|
with mock.patch('swift.obj.replicator.http_connect',
|
|
|
|
mock_http_connect(200)):
|
|
|
|
self.replicator.handoff_delete = 2
|
2015-03-17 08:32:57 +00:00
|
|
|
df = self.df_mgr.get_diskfile('sda', '1', 'a', 'c', 'o',
|
|
|
|
policy=POLICIES.legacy)
|
DiskFile API, with reference implementation
Refactor on-disk knowledge out of the object server by pushing the
async update pickle creation to the new DiskFileManager class (name is
not the best, so suggestions welcome), along with the REPLICATOR
method logic. We also move the mount checking and thread pool storage
to the new ondisk.Devices object, which then also becomes the new home
of the audit_location_generator method.
For the object server, a new setup() method is now called at the end
of the controller's construction, and the _diskfile() method has been
renamed to get_diskfile(), to allow implementation specific behavior.
We then hide the need for the REST API layer to know how and where
quarantining needs to be performed. There are now two places it is
checked internally, on open() where we verify the content-length,
name, and x-timestamp metadata, and in the reader on close where the
etag metadata is checked if the entire file was read.
We add a reader class to allow implementations to isolate the WSGI
handling code for that specific environment (it is used no-where else
in the REST APIs). This simplifies the caller's code to just use a
"with" statement once open to avoid multiple points where close needs
to be called.
For a full historical comparison, including the usage patterns see:
https://gist.github.com/portante/5488238
(as of master, 2b639f5, Merge
"Fix 500 from account-quota This Commit
middleware")
--------------------------------+------------------------------------
DiskFileManager(conf)
Methods:
.pickle_async_update()
.get_diskfile()
.get_hashes()
Attributes:
.devices
.logger
.disk_chunk_size
.keep_cache_size
.bytes_per_sync
DiskFile(a,c,o,keep_data_fp=) DiskFile(a,c,o)
Methods: Methods:
*.__iter__()
.close(verify_file=)
.is_deleted()
.is_expired()
.quarantine()
.get_data_file_size()
.open()
.read_metadata()
.create() .create()
.write_metadata()
.delete() .delete()
Attributes: Attributes:
.quarantined_dir
.keep_cache
.metadata
*DiskFileReader()
Methods:
.__iter__()
.close()
Attributes:
+.was_quarantined
DiskWriter() DiskFileWriter()
Methods: Methods:
.write() .write()
.put() .put()
* Note that the DiskFile class * Note that the DiskReader() object
implements all the methods returned by the
necessary for a WSGI app DiskFileOpened.reader() method
iterator implements all the methods
necessary for a WSGI app iterator
+ Note that if the auditor is
refactored to not use the DiskFile
class, see
https://review.openstack.org/44787
then we don't need the
was_quarantined attribute
A reference "in-memory" object server implementation of a backend
DiskFile class in swift/obj/mem_server.py and
swift/obj/mem_diskfile.py.
One can also reference
https://github.com/portante/gluster-swift/commits/diskfile for the
proposed integration with the gluster-swift code based on these
changes.
Change-Id: I44e153fdb405a5743e9c05349008f94136764916
Signed-off-by: Peter Portante <peter.portante@redhat.com>
2013-09-12 19:51:18 -04:00
|
|
|
mkdirs(df._datadir)
|
|
|
|
f = open(os.path.join(df._datadir,
|
2013-08-22 19:23:29 +00:00
|
|
|
normalize_timestamp(time.time()) + '.data'),
|
|
|
|
'wb')
|
|
|
|
f.write('1234567890')
|
|
|
|
f.close()
|
|
|
|
ohash = hash_path('a', 'c', 'o')
|
|
|
|
data_dir = ohash[-3:]
|
|
|
|
whole_path_from = os.path.join(self.objects, '1', data_dir)
|
|
|
|
part_path = os.path.join(self.objects, '1')
|
|
|
|
self.assertTrue(os.access(part_path, os.F_OK))
|
2015-03-17 08:32:57 +00:00
|
|
|
ring = self.replicator.load_object_ring(POLICIES[0])
|
2013-08-22 19:23:29 +00:00
|
|
|
nodes = [node for node in
|
2014-03-18 10:50:17 -07:00
|
|
|
ring.get_part_nodes(1)
|
2013-08-22 19:23:29 +00:00
|
|
|
if node['ip'] not in _ips()]
|
|
|
|
process_arg_checker = []
|
|
|
|
for i, node in enumerate(nodes):
|
|
|
|
rsync_mod = '%s::object/sda/objects/%s' % (node['ip'], 1)
|
|
|
|
if i in (0, 1):
|
|
|
|
# force two of the rsync calls to fail
|
|
|
|
ret_code = 1
|
|
|
|
else:
|
|
|
|
ret_code = 0
|
|
|
|
process_arg_checker.append(
|
|
|
|
(ret_code, '', ['rsync', whole_path_from, rsync_mod]))
|
|
|
|
with _mock_process(process_arg_checker):
|
|
|
|
self.replicator.replicate()
|
|
|
|
# The file should still exist
|
|
|
|
self.assertTrue(os.access(part_path, os.F_OK))
|
|
|
|
|
2014-05-29 00:54:07 -07:00
|
|
|
def test_delete_partition_with_handoff_delete_fail_in_other_region(self):
|
|
|
|
with mock.patch('swift.obj.replicator.http_connect',
|
|
|
|
mock_http_connect(200)):
|
2015-03-17 08:32:57 +00:00
|
|
|
df = self.df_mgr.get_diskfile('sda', '1', 'a', 'c', 'o',
|
|
|
|
policy=POLICIES.legacy)
|
2014-05-29 00:54:07 -07:00
|
|
|
mkdirs(df._datadir)
|
|
|
|
f = open(os.path.join(df._datadir,
|
|
|
|
normalize_timestamp(time.time()) + '.data'),
|
|
|
|
'wb')
|
|
|
|
f.write('1234567890')
|
|
|
|
f.close()
|
|
|
|
ohash = hash_path('a', 'c', 'o')
|
|
|
|
data_dir = ohash[-3:]
|
|
|
|
whole_path_from = os.path.join(self.objects, '1', data_dir)
|
|
|
|
part_path = os.path.join(self.objects, '1')
|
|
|
|
self.assertTrue(os.access(part_path, os.F_OK))
|
2015-03-17 08:32:57 +00:00
|
|
|
ring = self.replicator.load_object_ring(POLICIES[0])
|
2014-05-29 00:54:07 -07:00
|
|
|
nodes = [node for node in
|
|
|
|
ring.get_part_nodes(1)
|
|
|
|
if node['ip'] not in _ips()]
|
|
|
|
process_arg_checker = []
|
|
|
|
for node in nodes:
|
|
|
|
rsync_mod = '%s::object/sda/objects/%s' % (node['ip'], 1)
|
|
|
|
if node['region'] != 1:
|
|
|
|
# the rsync calls for other region to fail
|
|
|
|
ret_code = 1
|
|
|
|
else:
|
|
|
|
ret_code = 0
|
|
|
|
process_arg_checker.append(
|
|
|
|
(ret_code, '', ['rsync', whole_path_from, rsync_mod]))
|
|
|
|
with _mock_process(process_arg_checker):
|
|
|
|
self.replicator.replicate()
|
|
|
|
# The file should still exist
|
|
|
|
self.assertTrue(os.access(part_path, os.F_OK))
|
|
|
|
|
2012-09-28 12:24:15 -07:00
|
|
|
def test_delete_partition_override_params(self):
|
2015-03-17 08:32:57 +00:00
|
|
|
df = self.df_mgr.get_diskfile('sda', '0', 'a', 'c', 'o',
|
|
|
|
policy=POLICIES.legacy)
|
DiskFile API, with reference implementation
Refactor on-disk knowledge out of the object server by pushing the
async update pickle creation to the new DiskFileManager class (name is
not the best, so suggestions welcome), along with the REPLICATOR
method logic. We also move the mount checking and thread pool storage
to the new ondisk.Devices object, which then also becomes the new home
of the audit_location_generator method.
For the object server, a new setup() method is now called at the end
of the controller's construction, and the _diskfile() method has been
renamed to get_diskfile(), to allow implementation specific behavior.
We then hide the need for the REST API layer to know how and where
quarantining needs to be performed. There are now two places it is
checked internally, on open() where we verify the content-length,
name, and x-timestamp metadata, and in the reader on close where the
etag metadata is checked if the entire file was read.
We add a reader class to allow implementations to isolate the WSGI
handling code for that specific environment (it is used no-where else
in the REST APIs). This simplifies the caller's code to just use a
"with" statement once open to avoid multiple points where close needs
to be called.
For a full historical comparison, including the usage patterns see:
https://gist.github.com/portante/5488238
(as of master, 2b639f5, Merge
"Fix 500 from account-quota This Commit
middleware")
--------------------------------+------------------------------------
DiskFileManager(conf)
Methods:
.pickle_async_update()
.get_diskfile()
.get_hashes()
Attributes:
.devices
.logger
.disk_chunk_size
.keep_cache_size
.bytes_per_sync
DiskFile(a,c,o,keep_data_fp=) DiskFile(a,c,o)
Methods: Methods:
*.__iter__()
.close(verify_file=)
.is_deleted()
.is_expired()
.quarantine()
.get_data_file_size()
.open()
.read_metadata()
.create() .create()
.write_metadata()
.delete() .delete()
Attributes: Attributes:
.quarantined_dir
.keep_cache
.metadata
*DiskFileReader()
Methods:
.__iter__()
.close()
Attributes:
+.was_quarantined
DiskWriter() DiskFileWriter()
Methods: Methods:
.write() .write()
.put() .put()
* Note that the DiskFile class * Note that the DiskReader() object
implements all the methods returned by the
necessary for a WSGI app DiskFileOpened.reader() method
iterator implements all the methods
necessary for a WSGI app iterator
+ Note that if the auditor is
refactored to not use the DiskFile
class, see
https://review.openstack.org/44787
then we don't need the
was_quarantined attribute
A reference "in-memory" object server implementation of a backend
DiskFile class in swift/obj/mem_server.py and
swift/obj/mem_diskfile.py.
One can also reference
https://github.com/portante/gluster-swift/commits/diskfile for the
proposed integration with the gluster-swift code based on these
changes.
Change-Id: I44e153fdb405a5743e9c05349008f94136764916
Signed-off-by: Peter Portante <peter.portante@redhat.com>
2013-09-12 19:51:18 -04:00
|
|
|
mkdirs(df._datadir)
|
2012-09-28 12:24:15 -07:00
|
|
|
part_path = os.path.join(self.objects, '1')
|
|
|
|
self.assertTrue(os.access(part_path, os.F_OK))
|
|
|
|
self.replicator.replicate(override_devices=['sdb'])
|
|
|
|
self.assertTrue(os.access(part_path, os.F_OK))
|
|
|
|
self.replicator.replicate(override_partitions=['9'])
|
|
|
|
self.assertTrue(os.access(part_path, os.F_OK))
|
|
|
|
self.replicator.replicate(override_devices=['sda'],
|
|
|
|
override_partitions=['1'])
|
|
|
|
self.assertFalse(os.access(part_path, os.F_OK))
|
|
|
|
|
2015-01-22 15:26:19 -08:00
|
|
|
def test_delete_policy_override_params(self):
|
2015-03-17 08:32:57 +00:00
|
|
|
df0 = self.df_mgr.get_diskfile('sda', '99', 'a', 'c', 'o',
|
|
|
|
policy=POLICIES.legacy)
|
2015-01-22 15:26:19 -08:00
|
|
|
df1 = self.df_mgr.get_diskfile('sda', '99', 'a', 'c', 'o',
|
2015-03-17 08:32:57 +00:00
|
|
|
policy=POLICIES[1])
|
2015-01-22 15:26:19 -08:00
|
|
|
mkdirs(df0._datadir)
|
|
|
|
mkdirs(df1._datadir)
|
|
|
|
|
|
|
|
pol0_part_path = os.path.join(self.objects, '99')
|
|
|
|
pol1_part_path = os.path.join(self.objects_1, '99')
|
|
|
|
|
|
|
|
# sanity checks
|
|
|
|
self.assertTrue(os.access(pol0_part_path, os.F_OK))
|
|
|
|
self.assertTrue(os.access(pol1_part_path, os.F_OK))
|
|
|
|
|
|
|
|
# a bogus policy index doesn't bother the replicator any more than a
|
|
|
|
# bogus device or partition does
|
|
|
|
self.replicator.run_once(policies='1,2,5')
|
|
|
|
|
|
|
|
self.assertFalse(os.access(pol1_part_path, os.F_OK))
|
|
|
|
self.assertTrue(os.access(pol0_part_path, os.F_OK))
|
|
|
|
|
2014-05-29 00:54:07 -07:00
|
|
|
def test_delete_partition_ssync(self):
|
|
|
|
with mock.patch('swift.obj.replicator.http_connect',
|
|
|
|
mock_http_connect(200)):
|
2015-03-17 08:32:57 +00:00
|
|
|
df = self.df_mgr.get_diskfile('sda', '1', 'a', 'c', 'o',
|
|
|
|
policy=POLICIES.legacy)
|
2014-05-29 00:54:07 -07:00
|
|
|
mkdirs(df._datadir)
|
2014-10-28 09:51:06 -07:00
|
|
|
ts = normalize_timestamp(time.time())
|
|
|
|
f = open(os.path.join(df._datadir, ts + '.data'),
|
2014-05-29 00:54:07 -07:00
|
|
|
'wb')
|
|
|
|
f.write('0')
|
|
|
|
f.close()
|
|
|
|
ohash = hash_path('a', 'c', 'o')
|
|
|
|
whole_path_from = storage_directory(self.objects, 1, ohash)
|
|
|
|
suffix_dir_path = os.path.dirname(whole_path_from)
|
|
|
|
part_path = os.path.join(self.objects, '1')
|
|
|
|
self.assertTrue(os.access(part_path, os.F_OK))
|
|
|
|
|
|
|
|
self.call_nums = 0
|
|
|
|
self.conf['sync_method'] = 'ssync'
|
|
|
|
|
|
|
|
def _fake_ssync(node, job, suffixes, **kwargs):
|
|
|
|
success = True
|
2014-10-28 09:51:06 -07:00
|
|
|
ret_val = {ohash: ts}
|
2014-05-29 00:54:07 -07:00
|
|
|
if self.call_nums == 2:
|
|
|
|
# ssync should return (True, []) only when the second
|
|
|
|
# candidate node has not get the replica yet.
|
|
|
|
success = False
|
2014-10-28 09:51:06 -07:00
|
|
|
ret_val = {}
|
2014-05-29 00:54:07 -07:00
|
|
|
self.call_nums += 1
|
2014-10-28 09:51:06 -07:00
|
|
|
return success, ret_val
|
2014-05-29 00:54:07 -07:00
|
|
|
|
|
|
|
self.replicator.sync_method = _fake_ssync
|
|
|
|
self.replicator.replicate()
|
|
|
|
# The file should still exist
|
|
|
|
self.assertTrue(os.access(whole_path_from, os.F_OK))
|
|
|
|
self.assertTrue(os.access(suffix_dir_path, os.F_OK))
|
|
|
|
self.assertTrue(os.access(part_path, os.F_OK))
|
|
|
|
self.replicator.replicate()
|
|
|
|
# The file should be deleted at the second replicate call
|
|
|
|
self.assertFalse(os.access(whole_path_from, os.F_OK))
|
|
|
|
self.assertFalse(os.access(suffix_dir_path, os.F_OK))
|
|
|
|
self.assertTrue(os.access(part_path, os.F_OK))
|
|
|
|
self.replicator.replicate()
|
|
|
|
# The partition should be deleted at the third replicate call
|
|
|
|
self.assertFalse(os.access(whole_path_from, os.F_OK))
|
|
|
|
self.assertFalse(os.access(suffix_dir_path, os.F_OK))
|
|
|
|
self.assertFalse(os.access(part_path, os.F_OK))
|
|
|
|
del self.call_nums
|
|
|
|
|
|
|
|
def test_delete_partition_ssync_with_sync_failure(self):
|
|
|
|
with mock.patch('swift.obj.replicator.http_connect',
|
|
|
|
mock_http_connect(200)):
|
2015-03-17 08:32:57 +00:00
|
|
|
df = self.df_mgr.get_diskfile('sda', '1', 'a', 'c', 'o',
|
|
|
|
policy=POLICIES.legacy)
|
2014-10-28 09:51:06 -07:00
|
|
|
ts = normalize_timestamp(time.time())
|
2014-05-29 00:54:07 -07:00
|
|
|
mkdirs(df._datadir)
|
2014-10-28 09:51:06 -07:00
|
|
|
f = open(os.path.join(df._datadir, ts + '.data'), 'wb')
|
2014-05-29 00:54:07 -07:00
|
|
|
f.write('0')
|
|
|
|
f.close()
|
|
|
|
ohash = hash_path('a', 'c', 'o')
|
|
|
|
whole_path_from = storage_directory(self.objects, 1, ohash)
|
|
|
|
suffix_dir_path = os.path.dirname(whole_path_from)
|
|
|
|
part_path = os.path.join(self.objects, '1')
|
|
|
|
self.assertTrue(os.access(part_path, os.F_OK))
|
|
|
|
self.call_nums = 0
|
|
|
|
self.conf['sync_method'] = 'ssync'
|
|
|
|
|
2015-02-12 16:15:42 -08:00
|
|
|
def _fake_ssync(node, job, suffixes, **kwags):
|
2014-05-29 00:54:07 -07:00
|
|
|
success = False
|
2014-10-28 09:51:06 -07:00
|
|
|
ret_val = {}
|
2014-05-29 00:54:07 -07:00
|
|
|
if self.call_nums == 2:
|
|
|
|
# ssync should return (True, []) only when the second
|
|
|
|
# candidate node has not get the replica yet.
|
|
|
|
success = True
|
2014-10-28 09:51:06 -07:00
|
|
|
ret_val = {ohash: ts}
|
2014-05-29 00:54:07 -07:00
|
|
|
self.call_nums += 1
|
2014-10-28 09:51:06 -07:00
|
|
|
return success, ret_val
|
2014-05-29 00:54:07 -07:00
|
|
|
|
|
|
|
self.replicator.sync_method = _fake_ssync
|
|
|
|
self.replicator.replicate()
|
|
|
|
# The file should still exist
|
|
|
|
self.assertTrue(os.access(whole_path_from, os.F_OK))
|
|
|
|
self.assertTrue(os.access(suffix_dir_path, os.F_OK))
|
|
|
|
self.assertTrue(os.access(part_path, os.F_OK))
|
|
|
|
self.replicator.replicate()
|
|
|
|
# The file should still exist
|
|
|
|
self.assertTrue(os.access(whole_path_from, os.F_OK))
|
|
|
|
self.assertTrue(os.access(suffix_dir_path, os.F_OK))
|
|
|
|
self.assertTrue(os.access(part_path, os.F_OK))
|
|
|
|
self.replicator.replicate()
|
|
|
|
# The file should still exist
|
|
|
|
self.assertTrue(os.access(whole_path_from, os.F_OK))
|
|
|
|
self.assertTrue(os.access(suffix_dir_path, os.F_OK))
|
|
|
|
self.assertTrue(os.access(part_path, os.F_OK))
|
|
|
|
del self.call_nums
|
|
|
|
|
2015-02-12 16:18:54 -08:00
|
|
|
def test_delete_objs_ssync_only_when_in_sync(self):
|
|
|
|
self.replicator.logger = debug_logger('test-replicator')
|
|
|
|
with mock.patch('swift.obj.replicator.http_connect',
|
|
|
|
mock_http_connect(200)):
|
2015-03-17 08:32:57 +00:00
|
|
|
df = self.df_mgr.get_diskfile('sda', '1', 'a', 'c', 'o',
|
|
|
|
policy=POLICIES.legacy)
|
2015-02-12 16:18:54 -08:00
|
|
|
mkdirs(df._datadir)
|
2014-10-28 09:51:06 -07:00
|
|
|
ts = normalize_timestamp(time.time())
|
|
|
|
f = open(os.path.join(df._datadir, ts + '.data'), 'wb')
|
2015-02-12 16:18:54 -08:00
|
|
|
f.write('0')
|
|
|
|
f.close()
|
|
|
|
ohash = hash_path('a', 'c', 'o')
|
|
|
|
whole_path_from = storage_directory(self.objects, 1, ohash)
|
|
|
|
suffix_dir_path = os.path.dirname(whole_path_from)
|
|
|
|
part_path = os.path.join(self.objects, '1')
|
|
|
|
self.assertTrue(os.access(part_path, os.F_OK))
|
|
|
|
self.call_nums = 0
|
|
|
|
self.conf['sync_method'] = 'ssync'
|
|
|
|
|
2014-10-28 09:51:06 -07:00
|
|
|
in_sync_objs = {}
|
2015-02-12 16:18:54 -08:00
|
|
|
|
|
|
|
def _fake_ssync(node, job, suffixes, remote_check_objs=None):
|
|
|
|
self.call_nums += 1
|
|
|
|
if remote_check_objs is None:
|
|
|
|
# sync job
|
2014-10-28 09:51:06 -07:00
|
|
|
ret_val = {ohash: ts}
|
2015-02-12 16:18:54 -08:00
|
|
|
else:
|
|
|
|
ret_val = in_sync_objs
|
2014-10-28 09:51:06 -07:00
|
|
|
return True, ret_val
|
2015-02-12 16:18:54 -08:00
|
|
|
|
|
|
|
self.replicator.sync_method = _fake_ssync
|
|
|
|
self.replicator.replicate()
|
|
|
|
self.assertEqual(3, self.call_nums)
|
|
|
|
# The file should still exist
|
|
|
|
self.assertTrue(os.access(whole_path_from, os.F_OK))
|
|
|
|
self.assertTrue(os.access(suffix_dir_path, os.F_OK))
|
|
|
|
self.assertTrue(os.access(part_path, os.F_OK))
|
|
|
|
|
|
|
|
del self.call_nums
|
|
|
|
|
2014-05-29 00:54:07 -07:00
|
|
|
def test_delete_partition_ssync_with_cleanup_failure(self):
|
|
|
|
with mock.patch('swift.obj.replicator.http_connect',
|
|
|
|
mock_http_connect(200)):
|
2015-03-31 22:35:37 -07:00
|
|
|
self.replicator.logger = mock_logger = \
|
|
|
|
debug_logger('test-replicator')
|
2015-03-17 08:32:57 +00:00
|
|
|
df = self.df_mgr.get_diskfile('sda', '1', 'a', 'c', 'o',
|
|
|
|
policy=POLICIES.legacy)
|
2014-05-29 00:54:07 -07:00
|
|
|
mkdirs(df._datadir)
|
2014-10-28 09:51:06 -07:00
|
|
|
ts = normalize_timestamp(time.time())
|
|
|
|
f = open(os.path.join(df._datadir, ts + '.data'), 'wb')
|
2014-05-29 00:54:07 -07:00
|
|
|
f.write('0')
|
|
|
|
f.close()
|
|
|
|
ohash = hash_path('a', 'c', 'o')
|
|
|
|
whole_path_from = storage_directory(self.objects, 1, ohash)
|
|
|
|
suffix_dir_path = os.path.dirname(whole_path_from)
|
|
|
|
part_path = os.path.join(self.objects, '1')
|
|
|
|
self.assertTrue(os.access(part_path, os.F_OK))
|
|
|
|
|
|
|
|
self.call_nums = 0
|
|
|
|
self.conf['sync_method'] = 'ssync'
|
|
|
|
|
|
|
|
def _fake_ssync(node, job, suffixes, **kwargs):
|
|
|
|
success = True
|
2014-10-28 09:51:06 -07:00
|
|
|
ret_val = {ohash: ts}
|
2014-05-29 00:54:07 -07:00
|
|
|
if self.call_nums == 2:
|
|
|
|
# ssync should return (True, []) only when the second
|
|
|
|
# candidate node has not get the replica yet.
|
|
|
|
success = False
|
2014-10-28 09:51:06 -07:00
|
|
|
ret_val = {}
|
2014-05-29 00:54:07 -07:00
|
|
|
self.call_nums += 1
|
2014-10-28 09:51:06 -07:00
|
|
|
return success, ret_val
|
2014-05-29 00:54:07 -07:00
|
|
|
|
|
|
|
rmdir_func = os.rmdir
|
|
|
|
|
|
|
|
def raise_exception_rmdir(exception_class, error_no):
|
|
|
|
instance = exception_class()
|
|
|
|
instance.errno = error_no
|
|
|
|
|
|
|
|
def func(directory):
|
|
|
|
if directory == suffix_dir_path:
|
|
|
|
raise instance
|
|
|
|
else:
|
|
|
|
rmdir_func(directory)
|
|
|
|
|
|
|
|
return func
|
|
|
|
|
|
|
|
self.replicator.sync_method = _fake_ssync
|
|
|
|
self.replicator.replicate()
|
|
|
|
# The file should still exist
|
|
|
|
self.assertTrue(os.access(whole_path_from, os.F_OK))
|
|
|
|
self.assertTrue(os.access(suffix_dir_path, os.F_OK))
|
|
|
|
self.assertTrue(os.access(part_path, os.F_OK))
|
|
|
|
|
|
|
|
# Fail with ENOENT
|
|
|
|
with mock.patch('os.rmdir',
|
|
|
|
raise_exception_rmdir(OSError, ENOENT)):
|
|
|
|
self.replicator.replicate()
|
2015-03-31 22:35:37 -07:00
|
|
|
self.assertFalse(mock_logger.get_lines_for_level('error'))
|
2014-05-29 00:54:07 -07:00
|
|
|
self.assertFalse(os.access(whole_path_from, os.F_OK))
|
|
|
|
self.assertTrue(os.access(suffix_dir_path, os.F_OK))
|
|
|
|
self.assertTrue(os.access(part_path, os.F_OK))
|
|
|
|
|
|
|
|
# Fail with ENOTEMPTY
|
|
|
|
with mock.patch('os.rmdir',
|
|
|
|
raise_exception_rmdir(OSError, ENOTEMPTY)):
|
|
|
|
self.replicator.replicate()
|
2015-03-31 22:35:37 -07:00
|
|
|
self.assertFalse(mock_logger.get_lines_for_level('error'))
|
2014-05-29 00:54:07 -07:00
|
|
|
self.assertFalse(os.access(whole_path_from, os.F_OK))
|
|
|
|
self.assertTrue(os.access(suffix_dir_path, os.F_OK))
|
|
|
|
self.assertTrue(os.access(part_path, os.F_OK))
|
|
|
|
|
|
|
|
# Fail with ENOTDIR
|
|
|
|
with mock.patch('os.rmdir',
|
|
|
|
raise_exception_rmdir(OSError, ENOTDIR)):
|
|
|
|
self.replicator.replicate()
|
2015-03-31 22:35:37 -07:00
|
|
|
self.assertEqual(len(mock_logger.get_lines_for_level('error')), 1)
|
2014-05-29 00:54:07 -07:00
|
|
|
self.assertFalse(os.access(whole_path_from, os.F_OK))
|
|
|
|
self.assertTrue(os.access(suffix_dir_path, os.F_OK))
|
|
|
|
self.assertTrue(os.access(part_path, os.F_OK))
|
|
|
|
|
|
|
|
# Finally we can cleanup everything
|
|
|
|
self.replicator.replicate()
|
|
|
|
self.assertFalse(os.access(whole_path_from, os.F_OK))
|
|
|
|
self.assertFalse(os.access(suffix_dir_path, os.F_OK))
|
|
|
|
self.assertTrue(os.access(part_path, os.F_OK))
|
|
|
|
self.replicator.replicate()
|
|
|
|
self.assertFalse(os.access(whole_path_from, os.F_OK))
|
|
|
|
self.assertFalse(os.access(suffix_dir_path, os.F_OK))
|
|
|
|
self.assertFalse(os.access(part_path, os.F_OK))
|
|
|
|
|
2010-11-05 09:15:31 -07:00
|
|
|
def test_run_once_recover_from_failure(self):
|
2014-03-18 10:50:17 -07:00
|
|
|
conf = dict(swift_dir=self.testdir, devices=self.devices,
|
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
|
|
|
bind_ip=_ips()[0],
|
2014-03-18 10:50:17 -07:00
|
|
|
mount_check='false', timeout='300', stats_interval='1')
|
|
|
|
replicator = object_replicator.ObjectReplicator(conf)
|
2010-11-05 09:15:31 -07:00
|
|
|
was_connector = object_replicator.http_connect
|
2011-11-28 09:13:41 -08:00
|
|
|
try:
|
|
|
|
object_replicator.http_connect = mock_http_connect(200)
|
|
|
|
# Write some files into '1' and run replicate- they should be moved
|
2014-09-18 21:16:35 -07:00
|
|
|
# to the other partitions and then node should get deleted.
|
2011-11-28 09:13:41 -08:00
|
|
|
cur_part = '1'
|
2015-03-17 08:32:57 +00:00
|
|
|
df = self.df_mgr.get_diskfile('sda', cur_part, 'a', 'c', 'o',
|
|
|
|
policy=POLICIES.legacy)
|
DiskFile API, with reference implementation
Refactor on-disk knowledge out of the object server by pushing the
async update pickle creation to the new DiskFileManager class (name is
not the best, so suggestions welcome), along with the REPLICATOR
method logic. We also move the mount checking and thread pool storage
to the new ondisk.Devices object, which then also becomes the new home
of the audit_location_generator method.
For the object server, a new setup() method is now called at the end
of the controller's construction, and the _diskfile() method has been
renamed to get_diskfile(), to allow implementation specific behavior.
We then hide the need for the REST API layer to know how and where
quarantining needs to be performed. There are now two places it is
checked internally, on open() where we verify the content-length,
name, and x-timestamp metadata, and in the reader on close where the
etag metadata is checked if the entire file was read.
We add a reader class to allow implementations to isolate the WSGI
handling code for that specific environment (it is used no-where else
in the REST APIs). This simplifies the caller's code to just use a
"with" statement once open to avoid multiple points where close needs
to be called.
For a full historical comparison, including the usage patterns see:
https://gist.github.com/portante/5488238
(as of master, 2b639f5, Merge
"Fix 500 from account-quota This Commit
middleware")
--------------------------------+------------------------------------
DiskFileManager(conf)
Methods:
.pickle_async_update()
.get_diskfile()
.get_hashes()
Attributes:
.devices
.logger
.disk_chunk_size
.keep_cache_size
.bytes_per_sync
DiskFile(a,c,o,keep_data_fp=) DiskFile(a,c,o)
Methods: Methods:
*.__iter__()
.close(verify_file=)
.is_deleted()
.is_expired()
.quarantine()
.get_data_file_size()
.open()
.read_metadata()
.create() .create()
.write_metadata()
.delete() .delete()
Attributes: Attributes:
.quarantined_dir
.keep_cache
.metadata
*DiskFileReader()
Methods:
.__iter__()
.close()
Attributes:
+.was_quarantined
DiskWriter() DiskFileWriter()
Methods: Methods:
.write() .write()
.put() .put()
* Note that the DiskFile class * Note that the DiskReader() object
implements all the methods returned by the
necessary for a WSGI app DiskFileOpened.reader() method
iterator implements all the methods
necessary for a WSGI app iterator
+ Note that if the auditor is
refactored to not use the DiskFile
class, see
https://review.openstack.org/44787
then we don't need the
was_quarantined attribute
A reference "in-memory" object server implementation of a backend
DiskFile class in swift/obj/mem_server.py and
swift/obj/mem_diskfile.py.
One can also reference
https://github.com/portante/gluster-swift/commits/diskfile for the
proposed integration with the gluster-swift code based on these
changes.
Change-Id: I44e153fdb405a5743e9c05349008f94136764916
Signed-off-by: Peter Portante <peter.portante@redhat.com>
2013-09-12 19:51:18 -04:00
|
|
|
mkdirs(df._datadir)
|
|
|
|
f = open(os.path.join(df._datadir,
|
2011-11-28 09:13:41 -08:00
|
|
|
normalize_timestamp(time.time()) + '.data'),
|
|
|
|
'wb')
|
|
|
|
f.write('1234567890')
|
|
|
|
f.close()
|
|
|
|
ohash = hash_path('a', 'c', 'o')
|
|
|
|
data_dir = ohash[-3:]
|
|
|
|
whole_path_from = os.path.join(self.objects, cur_part, data_dir)
|
2015-03-17 08:32:57 +00:00
|
|
|
ring = replicator.load_object_ring(POLICIES[0])
|
2011-11-28 09:13:41 -08:00
|
|
|
process_arg_checker = []
|
|
|
|
nodes = [node for node in
|
2014-03-18 10:50:17 -07:00
|
|
|
ring.get_part_nodes(int(cur_part))
|
2013-08-31 23:42:43 -04:00
|
|
|
if node['ip'] not in _ips()]
|
2011-11-28 09:13:41 -08:00
|
|
|
for node in nodes:
|
2012-06-04 13:27:39 +02:00
|
|
|
rsync_mod = '%s::object/sda/objects/%s' % (node['ip'],
|
|
|
|
cur_part)
|
2011-11-28 09:13:41 -08:00
|
|
|
process_arg_checker.append(
|
|
|
|
(0, '', ['rsync', whole_path_from, rsync_mod]))
|
|
|
|
self.assertTrue(os.access(os.path.join(self.objects,
|
|
|
|
'1', data_dir, ohash),
|
|
|
|
os.F_OK))
|
|
|
|
with _mock_process(process_arg_checker):
|
|
|
|
replicator.run_once()
|
|
|
|
self.assertFalse(process_errors)
|
|
|
|
for i, result in [('0', True), ('1', False),
|
|
|
|
('2', True), ('3', True)]:
|
2015-08-06 00:55:36 +05:30
|
|
|
self.assertEqual(os.access(
|
2013-08-31 23:42:43 -04:00
|
|
|
os.path.join(self.objects,
|
|
|
|
i, diskfile.HASH_FILE),
|
|
|
|
os.F_OK), result)
|
2011-11-28 09:13:41 -08:00
|
|
|
finally:
|
|
|
|
object_replicator.http_connect = was_connector
|
|
|
|
|
|
|
|
def test_run_once_recover_from_timeout(self):
|
2014-03-18 10:50:17 -07:00
|
|
|
conf = dict(swift_dir=self.testdir, devices=self.devices,
|
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
|
|
|
bind_ips=_ips()[0],
|
2014-03-18 10:50:17 -07:00
|
|
|
mount_check='false', timeout='300', stats_interval='1')
|
|
|
|
replicator = object_replicator.ObjectReplicator(conf)
|
2011-11-28 09:13:41 -08:00
|
|
|
was_connector = object_replicator.http_connect
|
2015-06-08 19:40:56 +01:00
|
|
|
was_get_hashes = object_replicator.DiskFileManager._get_hashes
|
2011-11-28 09:13:41 -08:00
|
|
|
was_execute = tpool.execute
|
|
|
|
self.get_hash_count = 0
|
|
|
|
try:
|
|
|
|
|
|
|
|
def fake_get_hashes(*args, **kwargs):
|
|
|
|
self.get_hash_count += 1
|
|
|
|
if self.get_hash_count == 3:
|
|
|
|
# raise timeout on last call to get hashes
|
|
|
|
raise Timeout()
|
|
|
|
return 2, {'abc': 'def'}
|
|
|
|
|
|
|
|
def fake_exc(tester, *args, **kwargs):
|
|
|
|
if 'Error syncing partition' in args[0]:
|
|
|
|
tester.i_failed = True
|
|
|
|
|
|
|
|
self.i_failed = False
|
|
|
|
object_replicator.http_connect = mock_http_connect(200)
|
2015-06-08 19:40:56 +01:00
|
|
|
object_replicator.DiskFileManager._get_hashes = fake_get_hashes
|
2011-11-28 09:13:41 -08:00
|
|
|
replicator.logger.exception = \
|
|
|
|
lambda *args, **kwargs: fake_exc(self, *args, **kwargs)
|
|
|
|
# Write some files into '1' and run replicate- they should be moved
|
As-unique-as-possible partition replica placement.
This commit introduces a new algorithm for assigning partition
replicas to devices. Basically, the ring builder organizes the devices
into tiers (first zone, then IP/port, then device ID). When placing a
replica, the ring builder looks for the emptiest device (biggest
parts_wanted) in the furthest-away tier.
In the case where zone-count >= replica-count, the new algorithm will
give the same results as the one it replaces. Thus, no migration is
needed.
In the case where zone-count < replica-count, the new algorithm
behaves differently from the old algorithm. The new algorithm will
distribute things evenly at each tier so that the replication is as
high-quality as possible, given the circumstances. The old algorithm
would just crash, so again, no migration is needed.
Handoffs have also been updated to use the new algorithm. When
generating handoff nodes, first the ring looks for nodes in other
zones, then other ips/ports, then any other drive. The first handoff
nodes (the ones in other zones) will be the same as before; this
commit just extends the list of handoff nodes.
The proxy server and replicators have been altered to avoid looking at
the ring's replica count directly. Previously, with a replica count of
C, RingData.get_nodes() and RingData.get_part_nodes() would return
lists of length C, so some other code used the replica count when it
needed the number of nodes. If two of a partition's replicas are on
the same device (e.g. with 3 replicas, 2 devices), then that
assumption is no longer true. Fortunately, all the proxy server and
replicators really needed was the number of nodes returned, which they
already had. (Bonus: now the only code that mentions replica_count
directly is in the ring and the ring builder.)
Change-Id: Iba2929edfc6ece89791890d0635d4763d821a3aa
2012-04-23 10:41:44 -07:00
|
|
|
# to the other partitions and then node should get deleted.
|
2011-11-28 09:13:41 -08:00
|
|
|
cur_part = '1'
|
2015-03-17 08:32:57 +00:00
|
|
|
df = self.df_mgr.get_diskfile('sda', cur_part, 'a', 'c', 'o',
|
|
|
|
policy=POLICIES.legacy)
|
DiskFile API, with reference implementation
Refactor on-disk knowledge out of the object server by pushing the
async update pickle creation to the new DiskFileManager class (name is
not the best, so suggestions welcome), along with the REPLICATOR
method logic. We also move the mount checking and thread pool storage
to the new ondisk.Devices object, which then also becomes the new home
of the audit_location_generator method.
For the object server, a new setup() method is now called at the end
of the controller's construction, and the _diskfile() method has been
renamed to get_diskfile(), to allow implementation specific behavior.
We then hide the need for the REST API layer to know how and where
quarantining needs to be performed. There are now two places it is
checked internally, on open() where we verify the content-length,
name, and x-timestamp metadata, and in the reader on close where the
etag metadata is checked if the entire file was read.
We add a reader class to allow implementations to isolate the WSGI
handling code for that specific environment (it is used no-where else
in the REST APIs). This simplifies the caller's code to just use a
"with" statement once open to avoid multiple points where close needs
to be called.
For a full historical comparison, including the usage patterns see:
https://gist.github.com/portante/5488238
(as of master, 2b639f5, Merge
"Fix 500 from account-quota This Commit
middleware")
--------------------------------+------------------------------------
DiskFileManager(conf)
Methods:
.pickle_async_update()
.get_diskfile()
.get_hashes()
Attributes:
.devices
.logger
.disk_chunk_size
.keep_cache_size
.bytes_per_sync
DiskFile(a,c,o,keep_data_fp=) DiskFile(a,c,o)
Methods: Methods:
*.__iter__()
.close(verify_file=)
.is_deleted()
.is_expired()
.quarantine()
.get_data_file_size()
.open()
.read_metadata()
.create() .create()
.write_metadata()
.delete() .delete()
Attributes: Attributes:
.quarantined_dir
.keep_cache
.metadata
*DiskFileReader()
Methods:
.__iter__()
.close()
Attributes:
+.was_quarantined
DiskWriter() DiskFileWriter()
Methods: Methods:
.write() .write()
.put() .put()
* Note that the DiskFile class * Note that the DiskReader() object
implements all the methods returned by the
necessary for a WSGI app DiskFileOpened.reader() method
iterator implements all the methods
necessary for a WSGI app iterator
+ Note that if the auditor is
refactored to not use the DiskFile
class, see
https://review.openstack.org/44787
then we don't need the
was_quarantined attribute
A reference "in-memory" object server implementation of a backend
DiskFile class in swift/obj/mem_server.py and
swift/obj/mem_diskfile.py.
One can also reference
https://github.com/portante/gluster-swift/commits/diskfile for the
proposed integration with the gluster-swift code based on these
changes.
Change-Id: I44e153fdb405a5743e9c05349008f94136764916
Signed-off-by: Peter Portante <peter.portante@redhat.com>
2013-09-12 19:51:18 -04:00
|
|
|
mkdirs(df._datadir)
|
|
|
|
f = open(os.path.join(df._datadir,
|
2011-11-28 09:13:41 -08:00
|
|
|
normalize_timestamp(time.time()) + '.data'),
|
|
|
|
'wb')
|
|
|
|
f.write('1234567890')
|
|
|
|
f.close()
|
|
|
|
ohash = hash_path('a', 'c', 'o')
|
|
|
|
data_dir = ohash[-3:]
|
|
|
|
whole_path_from = os.path.join(self.objects, cur_part, data_dir)
|
|
|
|
process_arg_checker = []
|
2015-03-17 08:32:57 +00:00
|
|
|
ring = replicator.load_object_ring(POLICIES[0])
|
2011-11-28 09:13:41 -08:00
|
|
|
nodes = [node for node in
|
2014-03-18 10:50:17 -07:00
|
|
|
ring.get_part_nodes(int(cur_part))
|
2013-08-31 23:42:43 -04:00
|
|
|
if node['ip'] not in _ips()]
|
2015-03-17 08:32:57 +00:00
|
|
|
|
2011-11-28 09:13:41 -08:00
|
|
|
for node in nodes:
|
2012-06-04 13:27:39 +02:00
|
|
|
rsync_mod = '%s::object/sda/objects/%s' % (node['ip'],
|
|
|
|
cur_part)
|
2011-11-28 09:13:41 -08:00
|
|
|
process_arg_checker.append(
|
|
|
|
(0, '', ['rsync', whole_path_from, rsync_mod]))
|
|
|
|
self.assertTrue(os.access(os.path.join(self.objects,
|
|
|
|
'1', data_dir, ohash),
|
|
|
|
os.F_OK))
|
|
|
|
with _mock_process(process_arg_checker):
|
|
|
|
replicator.run_once()
|
|
|
|
self.assertFalse(process_errors)
|
|
|
|
self.assertFalse(self.i_failed)
|
|
|
|
finally:
|
|
|
|
object_replicator.http_connect = was_connector
|
2015-06-08 19:40:56 +01:00
|
|
|
object_replicator.DiskFileManager._get_hashes = was_get_hashes
|
2011-11-28 09:13:41 -08:00
|
|
|
tpool.execute = was_execute
|
2010-07-12 17:03:45 -05:00
|
|
|
|
|
|
|
def test_run(self):
|
2010-11-16 08:32:03 -08:00
|
|
|
with _mock_process([(0, '')] * 100):
|
2013-08-05 15:35:34 -07:00
|
|
|
with mock.patch('swift.obj.replicator.http_connect',
|
|
|
|
mock_http_connect(200)):
|
|
|
|
self.replicator.replicate()
|
2010-07-12 17:03:45 -05:00
|
|
|
|
|
|
|
def test_run_withlog(self):
|
2010-11-16 08:32:03 -08:00
|
|
|
with _mock_process([(0, "stuff in log")] * 100):
|
2013-08-05 15:35:34 -07:00
|
|
|
with mock.patch('swift.obj.replicator.http_connect',
|
|
|
|
mock_http_connect(200)):
|
|
|
|
self.replicator.replicate()
|
2010-07-12 17:03:45 -05:00
|
|
|
|
Object replication ssync (an rsync alternative)
For this commit, ssync is just a direct replacement for how
we use rsync. Assuming we switch over to ssync completely
someday and drop rsync, we will then be able to improve the
algorithms even further (removing local objects as we
successfully transfer each one rather than waiting for whole
partitions, using an index.db with hash-trees, etc., etc.)
For easier review, this commit can be thought of in distinct
parts:
1) New global_conf_callback functionality for allowing
services to perform setup code before workers, etc. are
launched. (This is then used by ssync in the object
server to create a cross-worker semaphore to restrict
concurrent incoming replication.)
2) A bit of shifting of items up from object server and
replicator to diskfile or DEFAULT conf sections for
better sharing of the same settings. conn_timeout,
node_timeout, client_timeout, network_chunk_size,
disk_chunk_size.
3) Modifications to the object server and replicator to
optionally use ssync in place of rsync. This is done in
a generic enough way that switching to FutureSync should
be easy someday.
4) The biggest part, and (at least for now) completely
optional part, are the new ssync_sender and
ssync_receiver files. Nice and isolated for easier
testing and visibility into test coverage, etc.
All the usual logging, statsd, recon, etc. instrumentation
is still there when using ssync, just as it is when using
rsync.
Beyond the essential error and exceptional condition
logging, I have not added any additional instrumentation at
this time. Unless there is something someone finds super
pressing to have added to the logging, I think such
additions would be better as separate change reviews.
FOR NOW, IT IS NOT RECOMMENDED TO USE SSYNC ON PRODUCTION
CLUSTERS. Some of us will be in a limited fashion to look
for any subtle issues, tuning, etc. but generally ssync is
an experimental feature. In its current implementation it is
probably going to be a bit slower than rsync, but if all
goes according to plan it will end up much faster.
There are no comparisions yet between ssync and rsync other
than some raw virtual machine testing I've done to show it
should compete well enough once we can put it in use in the
real world.
If you Tweet, Google+, or whatever, be sure to indicate it's
experimental. It'd be best to keep it out of deployment
guides, howtos, etc. until we all figure out if we like it,
find it to be stable, etc.
Change-Id: If003dcc6f4109e2d2a42f4873a0779110fff16d6
2013-08-28 16:10:43 +00:00
|
|
|
def test_sync_just_calls_sync_method(self):
|
|
|
|
self.replicator.sync_method = mock.MagicMock()
|
|
|
|
self.replicator.sync('node', 'job', 'suffixes')
|
|
|
|
self.replicator.sync_method.assert_called_once_with(
|
|
|
|
'node', 'job', 'suffixes')
|
|
|
|
|
2012-12-17 06:39:25 -05:00
|
|
|
@mock.patch('swift.obj.replicator.tpool_reraise', autospec=True)
|
|
|
|
@mock.patch('swift.obj.replicator.http_connect', autospec=True)
|
|
|
|
def test_update(self, mock_http, mock_tpool_reraise):
|
|
|
|
|
|
|
|
def set_default(self):
|
|
|
|
self.replicator.suffix_count = 0
|
|
|
|
self.replicator.suffix_sync = 0
|
|
|
|
self.replicator.suffix_hash = 0
|
|
|
|
self.replicator.replication_count = 0
|
|
|
|
self.replicator.partition_times = []
|
|
|
|
|
|
|
|
self.headers = {'Content-Length': '0',
|
Object services user-agent string uses full name
It does not appear that, aside from the user-agent string, the strings
"obj-server", "obj-updater", or "obj-replicator" (or "obj-<anything>"*)
appear in the swift code base, aside from the directory containing the
object services code being named "obj".
Furthermore, the container, account, and proxy services construct their
user-agent string, as reported in the logs, using their full name. In
addition, this full name also shows up as the name of the process via
"ps" or "top", etc., which can make it easier for admins to match log
entries with other tools.
For consistency, we update the object services to use an "object-"
prefix rather than "obj-" in its user agent string.
* obj-etag does appear in a unit test, but not part of the regular
code.
Change-Id: I914fc189514207df2535731eda10cb4b3d30cc6c
2014-06-23 12:59:24 -07:00
|
|
|
'user-agent': 'object-replicator %s' % os.getpid()}
|
2012-12-17 06:39:25 -05:00
|
|
|
self.replicator.logger = mock_logger = mock.MagicMock()
|
|
|
|
mock_tpool_reraise.return_value = (0, {})
|
|
|
|
|
|
|
|
all_jobs = self.replicator.collect_jobs()
|
|
|
|
jobs = [job for job in all_jobs if not job['delete']]
|
|
|
|
|
|
|
|
mock_http.return_value = answer = mock.MagicMock()
|
|
|
|
answer.getresponse.return_value = resp = mock.MagicMock()
|
|
|
|
# Check uncorrect http_connect with status 507 and
|
|
|
|
# count of attempts and call args
|
|
|
|
resp.status = 507
|
|
|
|
error = '%(ip)s/%(device)s responded as unmounted'
|
|
|
|
expect = 'Error syncing partition'
|
|
|
|
for job in jobs:
|
|
|
|
set_default(self)
|
2015-03-17 08:32:57 +00:00
|
|
|
ring = job['policy'].object_ring
|
|
|
|
self.headers['X-Backend-Storage-Policy-Index'] = int(job['policy'])
|
2012-12-17 06:39:25 -05:00
|
|
|
self.replicator.update(job)
|
|
|
|
self.assertTrue(error in mock_logger.error.call_args[0][0])
|
|
|
|
self.assertTrue(expect in mock_logger.exception.call_args[0][0])
|
2015-08-06 00:55:36 +05:30
|
|
|
self.assertEqual(len(self.replicator.partition_times), 1)
|
|
|
|
self.assertEqual(mock_http.call_count, len(ring._devs) - 1)
|
2012-12-17 06:39:25 -05:00
|
|
|
reqs = []
|
|
|
|
for node in job['nodes']:
|
2013-08-31 23:42:43 -04:00
|
|
|
reqs.append(mock.call(node['ip'], node['port'], node['device'],
|
|
|
|
job['partition'], 'REPLICATE', '',
|
|
|
|
headers=self.headers))
|
2012-12-17 06:39:25 -05:00
|
|
|
if job['partition'] == '0':
|
2015-08-06 00:55:36 +05:30
|
|
|
self.assertEqual(self.replicator.suffix_hash, 0)
|
2012-12-17 06:39:25 -05:00
|
|
|
mock_http.assert_has_calls(reqs, any_order=True)
|
|
|
|
mock_http.reset_mock()
|
|
|
|
mock_logger.reset_mock()
|
|
|
|
|
|
|
|
# Check uncorrect http_connect with status 400 != HTTP_OK
|
|
|
|
resp.status = 400
|
|
|
|
error = 'Invalid response %(resp)s from %(ip)s'
|
|
|
|
for job in jobs:
|
|
|
|
set_default(self)
|
|
|
|
self.replicator.update(job)
|
|
|
|
self.assertTrue(error in mock_logger.error.call_args[0][0])
|
2015-08-06 00:55:36 +05:30
|
|
|
self.assertEqual(len(self.replicator.partition_times), 1)
|
2012-12-17 06:39:25 -05:00
|
|
|
mock_logger.reset_mock()
|
|
|
|
|
|
|
|
# Check successful http_connection and exception with
|
|
|
|
# uncorrect pickle.loads(resp.read())
|
|
|
|
resp.status = 200
|
|
|
|
expect = 'Error syncing with node:'
|
|
|
|
for job in jobs:
|
|
|
|
set_default(self)
|
|
|
|
self.replicator.update(job)
|
|
|
|
self.assertTrue(expect in mock_logger.exception.call_args[0][0])
|
2015-08-06 00:55:36 +05:30
|
|
|
self.assertEqual(len(self.replicator.partition_times), 1)
|
2012-12-17 06:39:25 -05:00
|
|
|
mock_logger.reset_mock()
|
|
|
|
|
|
|
|
# Check successful http_connection and correct
|
|
|
|
# pickle.loads(resp.read()) for non local node
|
|
|
|
resp.status = 200
|
|
|
|
local_job = None
|
|
|
|
resp.read.return_value = pickle.dumps({})
|
|
|
|
for job in jobs:
|
|
|
|
set_default(self)
|
2014-09-18 21:16:35 -07:00
|
|
|
# limit local job to policy 0 for simplicity
|
2015-03-17 08:32:57 +00:00
|
|
|
if job['partition'] == '0' and int(job['policy']) == 0:
|
2012-12-17 06:39:25 -05:00
|
|
|
local_job = job.copy()
|
|
|
|
continue
|
|
|
|
self.replicator.update(job)
|
2015-08-06 00:55:36 +05:30
|
|
|
self.assertEqual(mock_logger.exception.call_count, 0)
|
|
|
|
self.assertEqual(mock_logger.error.call_count, 0)
|
|
|
|
self.assertEqual(len(self.replicator.partition_times), 1)
|
|
|
|
self.assertEqual(self.replicator.suffix_hash, 0)
|
|
|
|
self.assertEqual(self.replicator.suffix_sync, 0)
|
|
|
|
self.assertEqual(self.replicator.suffix_count, 0)
|
2012-12-17 06:39:25 -05:00
|
|
|
mock_logger.reset_mock()
|
|
|
|
|
Object replication ssync (an rsync alternative)
For this commit, ssync is just a direct replacement for how
we use rsync. Assuming we switch over to ssync completely
someday and drop rsync, we will then be able to improve the
algorithms even further (removing local objects as we
successfully transfer each one rather than waiting for whole
partitions, using an index.db with hash-trees, etc., etc.)
For easier review, this commit can be thought of in distinct
parts:
1) New global_conf_callback functionality for allowing
services to perform setup code before workers, etc. are
launched. (This is then used by ssync in the object
server to create a cross-worker semaphore to restrict
concurrent incoming replication.)
2) A bit of shifting of items up from object server and
replicator to diskfile or DEFAULT conf sections for
better sharing of the same settings. conn_timeout,
node_timeout, client_timeout, network_chunk_size,
disk_chunk_size.
3) Modifications to the object server and replicator to
optionally use ssync in place of rsync. This is done in
a generic enough way that switching to FutureSync should
be easy someday.
4) The biggest part, and (at least for now) completely
optional part, are the new ssync_sender and
ssync_receiver files. Nice and isolated for easier
testing and visibility into test coverage, etc.
All the usual logging, statsd, recon, etc. instrumentation
is still there when using ssync, just as it is when using
rsync.
Beyond the essential error and exceptional condition
logging, I have not added any additional instrumentation at
this time. Unless there is something someone finds super
pressing to have added to the logging, I think such
additions would be better as separate change reviews.
FOR NOW, IT IS NOT RECOMMENDED TO USE SSYNC ON PRODUCTION
CLUSTERS. Some of us will be in a limited fashion to look
for any subtle issues, tuning, etc. but generally ssync is
an experimental feature. In its current implementation it is
probably going to be a bit slower than rsync, but if all
goes according to plan it will end up much faster.
There are no comparisions yet between ssync and rsync other
than some raw virtual machine testing I've done to show it
should compete well enough once we can put it in use in the
real world.
If you Tweet, Google+, or whatever, be sure to indicate it's
experimental. It'd be best to keep it out of deployment
guides, howtos, etc. until we all figure out if we like it,
find it to be stable, etc.
Change-Id: If003dcc6f4109e2d2a42f4873a0779110fff16d6
2013-08-28 16:10:43 +00:00
|
|
|
# Check successful http_connect and sync for local node
|
2012-12-17 06:39:25 -05:00
|
|
|
mock_tpool_reraise.return_value = (1, {'a83': 'ba47fd314242ec8c'
|
|
|
|
'7efb91f5d57336e4'})
|
|
|
|
resp.read.return_value = pickle.dumps({'a83': 'c130a2c17ed45102a'
|
|
|
|
'ada0f4eee69494ff'})
|
|
|
|
set_default(self)
|
2014-05-29 00:54:07 -07:00
|
|
|
self.replicator.sync = fake_func = \
|
|
|
|
mock.MagicMock(return_value=(True, []))
|
2012-12-17 06:39:25 -05:00
|
|
|
self.replicator.update(local_job)
|
|
|
|
reqs = []
|
|
|
|
for node in local_job['nodes']:
|
2013-07-22 15:27:54 -07:00
|
|
|
reqs.append(mock.call(node, local_job, ['a83']))
|
2012-12-17 06:39:25 -05:00
|
|
|
fake_func.assert_has_calls(reqs, any_order=True)
|
2015-08-06 00:55:36 +05:30
|
|
|
self.assertEqual(fake_func.call_count, 2)
|
|
|
|
self.assertEqual(self.replicator.replication_count, 1)
|
|
|
|
self.assertEqual(self.replicator.suffix_sync, 2)
|
|
|
|
self.assertEqual(self.replicator.suffix_hash, 1)
|
|
|
|
self.assertEqual(self.replicator.suffix_count, 1)
|
2014-05-29 00:54:07 -07:00
|
|
|
|
|
|
|
# Efficient Replication Case
|
|
|
|
set_default(self)
|
|
|
|
self.replicator.sync = fake_func = \
|
|
|
|
mock.MagicMock(return_value=(True, []))
|
|
|
|
all_jobs = self.replicator.collect_jobs()
|
|
|
|
job = None
|
|
|
|
for tmp in all_jobs:
|
|
|
|
if tmp['partition'] == '3':
|
|
|
|
job = tmp
|
|
|
|
break
|
|
|
|
# The candidate nodes to replicate (i.e. dev1 and dev3)
|
|
|
|
# belong to another region
|
|
|
|
self.replicator.update(job)
|
2015-08-06 00:55:36 +05:30
|
|
|
self.assertEqual(fake_func.call_count, 1)
|
|
|
|
self.assertEqual(self.replicator.replication_count, 1)
|
|
|
|
self.assertEqual(self.replicator.suffix_sync, 1)
|
|
|
|
self.assertEqual(self.replicator.suffix_hash, 1)
|
|
|
|
self.assertEqual(self.replicator.suffix_count, 1)
|
2014-05-29 00:54:07 -07:00
|
|
|
|
2012-12-17 06:39:25 -05:00
|
|
|
mock_http.reset_mock()
|
|
|
|
mock_logger.reset_mock()
|
|
|
|
|
2014-03-18 10:50:17 -07:00
|
|
|
# test for replication params on policy 0 only
|
2012-12-17 06:39:25 -05:00
|
|
|
repl_job = local_job.copy()
|
|
|
|
for node in repl_job['nodes']:
|
2013-07-22 15:27:54 -07:00
|
|
|
node['replication_ip'] = '127.0.0.11'
|
|
|
|
node['replication_port'] = '6011'
|
2012-12-17 06:39:25 -05:00
|
|
|
set_default(self)
|
2014-09-18 21:16:35 -07:00
|
|
|
# with only one set of headers make sure we specify index 0 here
|
2014-03-18 10:50:17 -07:00
|
|
|
# as otherwise it may be different from earlier tests
|
2014-06-23 12:52:50 -07:00
|
|
|
self.headers['X-Backend-Storage-Policy-Index'] = 0
|
2012-12-17 06:39:25 -05:00
|
|
|
self.replicator.update(repl_job)
|
|
|
|
reqs = []
|
|
|
|
for node in repl_job['nodes']:
|
2013-08-31 23:42:43 -04:00
|
|
|
reqs.append(mock.call(node['replication_ip'],
|
|
|
|
node['replication_port'], node['device'],
|
|
|
|
repl_job['partition'], 'REPLICATE',
|
|
|
|
'', headers=self.headers))
|
|
|
|
reqs.append(mock.call(node['replication_ip'],
|
|
|
|
node['replication_port'], node['device'],
|
|
|
|
repl_job['partition'], 'REPLICATE',
|
|
|
|
'/a83', headers=self.headers))
|
2012-12-17 06:39:25 -05:00
|
|
|
mock_http.assert_has_calls(reqs, any_order=True)
|
|
|
|
|
2015-01-20 12:14:32 +05:30
|
|
|
def test_rsync_compress_different_region(self):
|
|
|
|
self.assertEqual(self.replicator.sync_method, self.replicator.rsync)
|
|
|
|
jobs = self.replicator.collect_jobs()
|
|
|
|
_m_rsync = mock.Mock(return_value=0)
|
|
|
|
_m_os_path_exists = mock.Mock(return_value=True)
|
|
|
|
with mock.patch.object(self.replicator, '_rsync', _m_rsync):
|
|
|
|
with mock.patch('os.path.exists', _m_os_path_exists):
|
|
|
|
for job in jobs:
|
|
|
|
self.assertTrue('region' in job)
|
|
|
|
for node in job['nodes']:
|
|
|
|
for rsync_compress in (True, False):
|
|
|
|
self.replicator.rsync_compress = rsync_compress
|
|
|
|
ret = \
|
|
|
|
self.replicator.sync(node, job,
|
|
|
|
['fake_suffix'])
|
|
|
|
self.assertTrue(ret)
|
|
|
|
if node['region'] != job['region']:
|
|
|
|
if rsync_compress:
|
|
|
|
# --compress arg should be passed to rsync
|
|
|
|
# binary only when rsync_compress option is
|
|
|
|
# enabled AND destination node is in a
|
|
|
|
# different region
|
|
|
|
self.assertTrue('--compress' in
|
|
|
|
_m_rsync.call_args[0][0])
|
|
|
|
else:
|
|
|
|
self.assertFalse('--compress' in
|
|
|
|
_m_rsync.call_args[0][0])
|
|
|
|
else:
|
|
|
|
self.assertFalse('--compress' in
|
|
|
|
_m_rsync.call_args[0][0])
|
|
|
|
self.assertEqual(
|
|
|
|
_m_os_path_exists.call_args_list[-1][0][0],
|
|
|
|
os.path.join(job['path'], 'fake_suffix'))
|
|
|
|
self.assertEqual(
|
|
|
|
_m_os_path_exists.call_args_list[-2][0][0],
|
|
|
|
os.path.join(job['path']))
|
|
|
|
|
2012-12-17 06:39:25 -05:00
|
|
|
|
2010-07-12 17:03:45 -05:00
|
|
|
if __name__ == '__main__':
|
|
|
|
unittest.main()
|