df134df901
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
196 lines
7.7 KiB
Python
Executable File
196 lines
7.7 KiB
Python
Executable File
#!/usr/bin/python -u
|
|
# Copyright (c) 2010-2012 OpenStack Foundation
|
|
#
|
|
# 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.
|
|
|
|
from unittest import main
|
|
|
|
from swiftclient import client
|
|
|
|
from swift.common import direct_client
|
|
from swift.common.manager import Manager
|
|
from test.probe.common import kill_nonprimary_server, \
|
|
kill_server, ReplProbeTest, start_server
|
|
|
|
|
|
class TestAccountFailures(ReplProbeTest):
|
|
|
|
def test_main(self):
|
|
# Create container1 and container2
|
|
container1 = 'container1'
|
|
client.put_container(self.url, self.token, container1)
|
|
container2 = 'container2'
|
|
client.put_container(self.url, self.token, container2)
|
|
|
|
# Assert account level sees them
|
|
headers, containers = client.get_account(self.url, self.token)
|
|
self.assertEquals(headers['x-account-container-count'], '2')
|
|
self.assertEquals(headers['x-account-object-count'], '0')
|
|
self.assertEquals(headers['x-account-bytes-used'], '0')
|
|
found1 = False
|
|
found2 = False
|
|
for container in containers:
|
|
if container['name'] == container1:
|
|
found1 = True
|
|
self.assertEquals(container['count'], 0)
|
|
self.assertEquals(container['bytes'], 0)
|
|
elif container['name'] == container2:
|
|
found2 = True
|
|
self.assertEquals(container['count'], 0)
|
|
self.assertEquals(container['bytes'], 0)
|
|
self.assert_(found1)
|
|
self.assert_(found2)
|
|
|
|
# Create container2/object1
|
|
client.put_object(self.url, self.token, container2, 'object1', '1234')
|
|
|
|
# Assert account level doesn't see it yet
|
|
headers, containers = client.get_account(self.url, self.token)
|
|
self.assertEquals(headers['x-account-container-count'], '2')
|
|
self.assertEquals(headers['x-account-object-count'], '0')
|
|
self.assertEquals(headers['x-account-bytes-used'], '0')
|
|
found1 = False
|
|
found2 = False
|
|
for container in containers:
|
|
if container['name'] == container1:
|
|
found1 = True
|
|
self.assertEquals(container['count'], 0)
|
|
self.assertEquals(container['bytes'], 0)
|
|
elif container['name'] == container2:
|
|
found2 = True
|
|
self.assertEquals(container['count'], 0)
|
|
self.assertEquals(container['bytes'], 0)
|
|
self.assert_(found1)
|
|
self.assert_(found2)
|
|
|
|
# Get to final state
|
|
self.get_to_final_state()
|
|
|
|
# Assert account level now sees the container2/object1
|
|
headers, containers = client.get_account(self.url, self.token)
|
|
self.assertEquals(headers['x-account-container-count'], '2')
|
|
self.assertEquals(headers['x-account-object-count'], '1')
|
|
self.assertEquals(headers['x-account-bytes-used'], '4')
|
|
found1 = False
|
|
found2 = False
|
|
for container in containers:
|
|
if container['name'] == container1:
|
|
found1 = True
|
|
self.assertEquals(container['count'], 0)
|
|
self.assertEquals(container['bytes'], 0)
|
|
elif container['name'] == container2:
|
|
found2 = True
|
|
self.assertEquals(container['count'], 1)
|
|
self.assertEquals(container['bytes'], 4)
|
|
self.assert_(found1)
|
|
self.assert_(found2)
|
|
|
|
apart, anodes = self.account_ring.get_nodes(self.account)
|
|
kill_nonprimary_server(anodes, self.ipport2server, self.pids)
|
|
kill_server((anodes[0]['ip'], anodes[0]['port']),
|
|
self.ipport2server, self.pids)
|
|
# Kill account servers excepting two of the primaries
|
|
|
|
# Delete container1
|
|
client.delete_container(self.url, self.token, container1)
|
|
|
|
# Put container2/object2
|
|
client.put_object(self.url, self.token, container2, 'object2', '12345')
|
|
|
|
# Assert account level knows container1 is gone but doesn't know about
|
|
# container2/object2 yet
|
|
headers, containers = client.get_account(self.url, self.token)
|
|
self.assertEquals(headers['x-account-container-count'], '1')
|
|
self.assertEquals(headers['x-account-object-count'], '1')
|
|
self.assertEquals(headers['x-account-bytes-used'], '4')
|
|
found1 = False
|
|
found2 = False
|
|
for container in containers:
|
|
if container['name'] == container1:
|
|
found1 = True
|
|
elif container['name'] == container2:
|
|
found2 = True
|
|
self.assertEquals(container['count'], 1)
|
|
self.assertEquals(container['bytes'], 4)
|
|
self.assert_(not found1)
|
|
self.assert_(found2)
|
|
|
|
# Run container updaters
|
|
Manager(['container-updater']).once()
|
|
|
|
# Assert account level now knows about container2/object2
|
|
headers, containers = client.get_account(self.url, self.token)
|
|
self.assertEquals(headers['x-account-container-count'], '1')
|
|
self.assertEquals(headers['x-account-object-count'], '2')
|
|
self.assertEquals(headers['x-account-bytes-used'], '9')
|
|
found1 = False
|
|
found2 = False
|
|
for container in containers:
|
|
if container['name'] == container1:
|
|
found1 = True
|
|
elif container['name'] == container2:
|
|
found2 = True
|
|
self.assertEquals(container['count'], 2)
|
|
self.assertEquals(container['bytes'], 9)
|
|
self.assert_(not found1)
|
|
self.assert_(found2)
|
|
|
|
# Restart other primary account server
|
|
start_server((anodes[0]['ip'], anodes[0]['port']),
|
|
self.ipport2server, self.pids)
|
|
|
|
# Assert that server doesn't know about container1's deletion or the
|
|
# new container2/object2 yet
|
|
headers, containers = \
|
|
direct_client.direct_get_account(anodes[0], apart, self.account)
|
|
self.assertEquals(headers['x-account-container-count'], '2')
|
|
self.assertEquals(headers['x-account-object-count'], '1')
|
|
self.assertEquals(headers['x-account-bytes-used'], '4')
|
|
found1 = False
|
|
found2 = False
|
|
for container in containers:
|
|
if container['name'] == container1:
|
|
found1 = True
|
|
elif container['name'] == container2:
|
|
found2 = True
|
|
self.assertEquals(container['count'], 1)
|
|
self.assertEquals(container['bytes'], 4)
|
|
self.assert_(found1)
|
|
self.assert_(found2)
|
|
|
|
# Get to final state
|
|
self.get_to_final_state()
|
|
|
|
# Assert that server is now up to date
|
|
headers, containers = \
|
|
direct_client.direct_get_account(anodes[0], apart, self.account)
|
|
self.assertEquals(headers['x-account-container-count'], '1')
|
|
self.assertEquals(headers['x-account-object-count'], '2')
|
|
self.assertEquals(headers['x-account-bytes-used'], '9')
|
|
found1 = False
|
|
found2 = False
|
|
for container in containers:
|
|
if container['name'] == container1:
|
|
found1 = True
|
|
elif container['name'] == container2:
|
|
found2 = True
|
|
self.assertEquals(container['count'], 2)
|
|
self.assertEquals(container['bytes'], 9)
|
|
self.assert_(not found1)
|
|
self.assert_(found2)
|
|
|
|
|
|
if __name__ == '__main__':
|
|
main()
|