openstack/swift
Code Issues Proposed changes

Drop support for auth-server from common/manager

Browse Source 
swift-auth-server was removed in 2011. While there are still some lingering
references in test_manager, it's not clear whether removing them would
reduce test coverage for things like bad pid files.

See https://github.com/openstack/swift/commit/bd22dbe

Change-Id: I4bf57c8cdba6773ddc1e4013e2b2a9736dacada8
This commit is contained in:
Tim Burke 2017-03-23 11:36:59 -07:00
parent 8a7c5ec960
commit 9edf914ff9
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
swift/common/manager.py
View File

@ -31,7 +31,6 @@ SWIFT_DIR = '/etc/swift'
RUN_DIR = '/var/run/swift' RUN_DIR = '/var/run/swift'
PROC_DIR = '/proc' PROC_DIR = '/proc'
# auth-server has been removed from ALL_SERVERS, start it explicitly
ALL_SERVERS = ['account-auditor', 'account-server', 'container-auditor', ALL_SERVERS = ['account-auditor', 'account-server', 'container-auditor',
'container-replicator', 'container-reconciler', 'container-replicator', 'container-reconciler',
'container-server', 'container-sync', 'container-server', 'container-sync',
@ -44,7 +43,7 @@ MAIN_SERVERS = ['proxy-server', 'account-server', 'container-server',
REST_SERVERS = [s for s in ALL_SERVERS if s not in MAIN_SERVERS] REST_SERVERS = [s for s in ALL_SERVERS if s not in MAIN_SERVERS]
# aliases mapping # aliases mapping
ALIASES = {'all': ALL_SERVERS, 'main': MAIN_SERVERS, 'rest': REST_SERVERS} ALIASES = {'all': ALL_SERVERS, 'main': MAIN_SERVERS, 'rest': REST_SERVERS}
GRACEFUL_SHUTDOWN_SERVERS = MAIN_SERVERS + ['auth-server'] GRACEFUL_SHUTDOWN_SERVERS = MAIN_SERVERS
START_ONCE_SERVERS = REST_SERVERS START_ONCE_SERVERS = REST_SERVERS
# These are servers that match a type (account-*, container-*, object-*) but # These are servers that match a type (account-*, container-*, object-*) but
# don't use that type-server.conf file and instead use their own. # don't use that type-server.conf file and instead use their own.

7
test/unit/common/test_manager.py
View File

@ -2099,7 +2099,8 @@ class TestManager(unittest.TestCase):
_orig_manager = manager.Manager _orig_manager = manager.Manager
try: try:
m = _orig_manager(['auth']) m = _orig_manager(['*-server'])
self.assertEqual(len(m.servers), 4)
for server in m.servers: for server in m.servers:
self.assertTrue(server.server in self.assertTrue(server.server in
manager.GRACEFUL_SHUTDOWN_SERVERS) manager.GRACEFUL_SHUTDOWN_SERVERS)
@ -2107,8 +2108,8 @@ class TestManager(unittest.TestCase):
status = m.reload() status = m.reload()
self.assertEqual(status, 0) self.assertEqual(status, 0)
expected = { expected = {
'start': [{'graceful': True}], 'start': [{'graceful': True}] * 4,
'stop': [{'graceful': True}], 'stop': [{'graceful': True}] * 4,
} }
self.assertEqual(MockManager.called, expected) self.assertEqual(MockManager.called, expected)
# test force graceful # test force graceful