Merge "format some code according to pep8"
This commit is contained in:
Jenkins
Gerrit Code Review
commit
d96a7a89f4
@ -35,7 +35,7 @@ class AccountAuditor(Daemon):
|
||||
self.logger = get_logger(conf, log_route='account-auditor')
|
||||
self.devices = conf.get('devices', '/srv/node')
|
||||
self.mount_check = conf.get('mount_check', 'true').lower() in \
|
||||
('true', 't', '1', 'on', 'yes', 'y')
|
||||
TRUE_VALUES
|
||||
self.interval = int(conf.get('interval', 1800))
|
||||
self.account_passes = 0
|
||||
self.account_failures = 0
|
||||
@ -47,21 +47,23 @@ class AccountAuditor(Daemon):
|
||||
|
||||
def _one_audit_pass(self, reported):
|
||||
all_locs = audit_location_generator(self.devices,
|
||||
account_server.DATADIR, mount_check=self.mount_check,
|
||||
logger=self.logger)
|
||||
account_server.DATADIR,
|
||||
mount_check=self.mount_check,
|
||||
logger=self.logger)
|
||||
for path, device, partition in all_locs:
|
||||
self.account_audit(path)
|
||||
if time.time() - reported >= 3600: # once an hour
|
||||
self.logger.info(_('Since %(time)s: Account audits: '
|
||||
'%(passed)s passed audit, %(failed)s failed audit'),
|
||||
{'time': time.ctime(reported),
|
||||
'passed': self.account_passes,
|
||||
'failed': self.account_failures})
|
||||
'%(passed)s passed audit,'
|
||||
'%(failed)s failed audit'),
|
||||
{'time': time.ctime(reported),
|
||||
'passed': self.account_passes,
|
||||
'failed': self.account_failures})
|
||||
self.account_audit(path)
|
||||
dump_recon_cache({'account_audits_since': reported,
|
||||
'account_audits_passed': self.account_passes,
|
||||
'account_audits_failed':
|
||||
self.account_failures},
|
||||
self.account_failures},
|
||||
self.rcache, self.logger)
|
||||
reported = time.time()
|
||||
self.account_passes = 0
|
||||
@ -119,5 +121,5 @@ class AccountAuditor(Daemon):
|
||||
self.logger.increment('failures')
|
||||
self.account_failures += 1
|
||||
self.logger.exception(_('ERROR Could not get account info %s'),
|
||||
(broker.db_file))
|
||||
(broker.db_file))
|
||||
self.logger.timing_since('timing', start_time)
|
||||
|
||||
@ -57,7 +57,7 @@ class AccountReaper(Daemon):
|
||||
self.logger = get_logger(conf, log_route='account-reaper')
|
||||
self.devices = conf.get('devices', '/srv/node')
|
||||
self.mount_check = conf.get('mount_check', 'true').lower() in \
|
||||
('true', 't', '1', 'on', 'yes', 'y')
|
||||
TRUE_VALUES
|
||||
self.interval = int(conf.get('interval', 3600))
|
||||
self.swift_dir = conf.get('swift_dir', '/etc/swift')
|
||||
self.account_ring = None
|
||||
@ -126,8 +126,8 @@ class AccountReaper(Daemon):
|
||||
continue
|
||||
self.reap_device(device)
|
||||
except (Exception, Timeout):
|
||||
self.logger.exception(_("Exception in top-level account reaper " \
|
||||
"loop"))
|
||||
self.logger.exception(_("Exception in top-level account reaper "
|
||||
"loop"))
|
||||
elapsed = time() - begin
|
||||
self.logger.info(_('Devices pass completed: %.02fs'), elapsed)
|
||||
|
||||
@ -252,15 +252,15 @@ class AccountReaper(Daemon):
|
||||
log += _(', %s objects deleted') % self.stats_objects_deleted
|
||||
if self.stats_containers_remaining:
|
||||
log += _(', %s containers remaining') % \
|
||||
self.stats_containers_remaining
|
||||
self.stats_containers_remaining
|
||||
if self.stats_objects_remaining:
|
||||
log += _(', %s objects remaining') % self.stats_objects_remaining
|
||||
if self.stats_containers_possibly_remaining:
|
||||
log += _(', %s containers possibly remaining') % \
|
||||
self.stats_containers_possibly_remaining
|
||||
self.stats_containers_possibly_remaining
|
||||
if self.stats_objects_possibly_remaining:
|
||||
log += _(', %s objects possibly remaining') % \
|
||||
self.stats_objects_possibly_remaining
|
||||
self.stats_objects_possibly_remaining
|
||||
if self.stats_return_codes:
|
||||
log += _(', return codes: ')
|
||||
for code in sorted(self.stats_return_codes.keys()):
|
||||
@ -315,9 +315,11 @@ class AccountReaper(Daemon):
|
||||
while True:
|
||||
objects = None
|
||||
try:
|
||||
objects = direct_get_container(node, part, account, container,
|
||||
marker=marker, conn_timeout=self.conn_timeout,
|
||||
response_timeout=self.node_timeout)[1]
|
||||
objects = direct_get_container(
|
||||
node, part, account, container,
|
||||
marker=marker,
|
||||
conn_timeout=self.conn_timeout,
|
||||
response_timeout=self.node_timeout)[1]
|
||||
self.stats_return_codes[2] = \
|
||||
self.stats_return_codes.get(2, 0) + 1
|
||||
self.logger.increment('return_codes.2')
|
||||
@ -340,15 +342,18 @@ class AccountReaper(Daemon):
|
||||
pool.waitall()
|
||||
except (Exception, Timeout):
|
||||
self.logger.exception(_('Exception with objects for container '
|
||||
'%(container)s for account %(account)s'),
|
||||
{'container': container, 'account': account})
|
||||
'%(container)s for account %(account)s'
|
||||
),
|
||||
{'container': container,
|
||||
'account': account})
|
||||
marker = objects[-1]['name']
|
||||
successes = 0
|
||||
failures = 0
|
||||
for node in nodes:
|
||||
anode = account_nodes.pop()
|
||||
try:
|
||||
direct_delete_container(node, part, account, container,
|
||||
direct_delete_container(
|
||||
node, part, account, container,
|
||||
conn_timeout=self.conn_timeout,
|
||||
response_timeout=self.node_timeout,
|
||||
headers={'X-Account-Host': '%(ip)s:%(port)s' % anode,
|
||||
@ -407,7 +412,8 @@ class AccountReaper(Daemon):
|
||||
for node in nodes:
|
||||
cnode = container_nodes.pop()
|
||||
try:
|
||||
direct_delete_object(node, part, account, container, obj,
|
||||
direct_delete_object(
|
||||
node, part, account, container, obj,
|
||||
conn_timeout=self.conn_timeout,
|
||||
response_timeout=self.node_timeout,
|
||||
headers={'X-Container-Host': '%(ip)s:%(port)s' % cnode,
|
||||
|
||||
@ -49,9 +49,10 @@ class AccountController(object):
|
||||
self.logger = get_logger(conf, log_route='account-server')
|
||||
self.root = conf.get('devices', '/srv/node')
|
||||
self.mount_check = conf.get('mount_check', 'true').lower() in \
|
||||
('true', 't', '1', 'on', 'yes', 'y')
|
||||
TRUE_VALUES
|
||||
self.replicator_rpc = ReplicatorRpc(self.root, DATADIR, AccountBroker,
|
||||
self.mount_check, logger=self.logger)
|
||||
self.mount_check,
|
||||
logger=self.logger)
|
||||
self.auto_create_account_prefix = \
|
||||
conf.get('auto_create_account_prefix') or '.'
|
||||
swift.common.db.DB_PREALLOCATION = \
|
||||
@ -73,15 +74,15 @@ class AccountController(object):
|
||||
except ValueError, err:
|
||||
self.logger.increment('DELETE.errors')
|
||||
return HTTPBadRequest(body=str(err), content_type='text/plain',
|
||||
request=req)
|
||||
request=req)
|
||||
if self.mount_check and not check_mount(self.root, drive):
|
||||
self.logger.increment('DELETE.errors')
|
||||
return HTTPInsufficientStorage(drive=drive, request=req)
|
||||
if 'x-timestamp' not in req.headers or \
|
||||
not check_float(req.headers['x-timestamp']):
|
||||
not check_float(req.headers['x-timestamp']):
|
||||
self.logger.increment('DELETE.errors')
|
||||
return HTTPBadRequest(body='Missing timestamp', request=req,
|
||||
content_type='text/plain')
|
||||
content_type='text/plain')
|
||||
broker = self._get_account_broker(drive, part, account)
|
||||
if broker.is_deleted():
|
||||
self.logger.timing_since('DELETE.timing', start_time)
|
||||
@ -118,9 +119,9 @@ class AccountController(object):
|
||||
self.logger.timing_since('PUT.timing', start_time)
|
||||
return HTTPNotFound(request=req)
|
||||
broker.put_container(container, req.headers['x-put-timestamp'],
|
||||
req.headers['x-delete-timestamp'],
|
||||
req.headers['x-object-count'],
|
||||
req.headers['x-bytes-used'])
|
||||
req.headers['x-delete-timestamp'],
|
||||
req.headers['x-object-count'],
|
||||
req.headers['x-bytes-used'])
|
||||
self.logger.timing_since('PUT.timing', start_time)
|
||||
if req.headers['x-delete-timestamp'] > \
|
||||
req.headers['x-put-timestamp']:
|
||||
@ -143,8 +144,8 @@ class AccountController(object):
|
||||
return HTTPConflict(request=req)
|
||||
metadata = {}
|
||||
metadata.update((key, (value, timestamp))
|
||||
for key, value in req.headers.iteritems()
|
||||
if key.lower().startswith('x-account-meta-'))
|
||||
for key, value in req.headers.iteritems()
|
||||
if key.lower().startswith('x-account-meta-'))
|
||||
if metadata:
|
||||
broker.update_metadata(metadata)
|
||||
self.logger.timing_since('PUT.timing', start_time)
|
||||
@ -170,7 +171,7 @@ class AccountController(object):
|
||||
except ValueError, err:
|
||||
self.logger.increment('HEAD.errors')
|
||||
return HTTPBadRequest(body=str(err), content_type='text/plain',
|
||||
request=req)
|
||||
request=req)
|
||||
if self.mount_check and not check_mount(self.root, drive):
|
||||
self.logger.increment('HEAD.errors')
|
||||
return HTTPInsufficientStorage(drive=drive, request=req)
|
||||
@ -193,8 +194,8 @@ class AccountController(object):
|
||||
if container_ts is not None:
|
||||
headers['X-Container-Timestamp'] = container_ts
|
||||
headers.update((key, value)
|
||||
for key, (value, timestamp) in broker.metadata.iteritems()
|
||||
if value != '')
|
||||
for key, (value, timestamp) in
|
||||
broker.metadata.iteritems() if value != '')
|
||||
self.logger.timing_since('HEAD.timing', start_time)
|
||||
return HTTPNoContent(request=req, headers=headers)
|
||||
|
||||
@ -208,7 +209,7 @@ class AccountController(object):
|
||||
except ValueError, err:
|
||||
self.logger.increment('GET.errors')
|
||||
return HTTPBadRequest(body=str(err), content_type='text/plain',
|
||||
request=req)
|
||||
request=req)
|
||||
if self.mount_check and not check_mount(self.root, drive):
|
||||
self.logger.increment('GET.errors')
|
||||
return HTTPInsufficientStorage(drive=drive, request=req)
|
||||
@ -226,8 +227,8 @@ class AccountController(object):
|
||||
'X-Timestamp': info['created_at'],
|
||||
'X-PUT-Timestamp': info['put_timestamp']}
|
||||
resp_headers.update((key, value)
|
||||
for key, (value, timestamp) in broker.metadata.iteritems()
|
||||
if value != '')
|
||||
for key, (value, timestamp) in
|
||||
broker.metadata.iteritems() if value != '')
|
||||
try:
|
||||
prefix = get_param(req, 'prefix')
|
||||
delimiter = get_param(req, 'delimiter')
|
||||
@ -242,7 +243,8 @@ class AccountController(object):
|
||||
if limit > ACCOUNT_LISTING_LIMIT:
|
||||
self.logger.increment('GET.errors')
|
||||
return HTTPPreconditionFailed(request=req,
|
||||
body='Maximum limit is %d' % ACCOUNT_LISTING_LIMIT)
|
||||
body='Maximum limit is %d' %
|
||||
ACCOUNT_LISTING_LIMIT)
|
||||
marker = get_param(req, 'marker', '')
|
||||
end_marker = get_param(req, 'end_marker')
|
||||
query_format = get_param(req, 'format')
|
||||
@ -255,9 +257,9 @@ class AccountController(object):
|
||||
FORMAT2CONTENT_TYPE['plain'])
|
||||
try:
|
||||
out_content_type = req.accept.best_match(
|
||||
['text/plain', 'application/json',
|
||||
'application/xml', 'text/xml'],
|
||||
default_match='text/plain')
|
||||
['text/plain', 'application/json', 'application/xml',
|
||||
'text/xml'],
|
||||
default_match='text/plain')
|
||||
except AssertionError, err:
|
||||
self.logger.increment('GET.errors')
|
||||
return HTTPBadRequest(body='bad accept header: %s' % req.accept,
|
||||
@ -312,7 +314,7 @@ class AccountController(object):
|
||||
except ValueError, err:
|
||||
self.logger.increment('REPLICATE.errors')
|
||||
return HTTPBadRequest(body=str(err), content_type='text/plain',
|
||||
request=req)
|
||||
request=req)
|
||||
if self.mount_check and not check_mount(self.root, drive):
|
||||
self.logger.increment('REPLICATE.errors')
|
||||
return HTTPInsufficientStorage(drive=drive, request=req)
|
||||
@ -341,7 +343,8 @@ class AccountController(object):
|
||||
not check_float(req.headers['x-timestamp']):
|
||||
self.logger.increment('POST.errors')
|
||||
return HTTPBadRequest(body='Missing or bad timestamp',
|
||||
request=req, content_type='text/plain')
|
||||
request=req,
|
||||
content_type='text/plain')
|
||||
if self.mount_check and not check_mount(self.root, drive):
|
||||
self.logger.increment('POST.errors')
|
||||
return HTTPInsufficientStorage(drive=drive, request=req)
|
||||
@ -352,8 +355,8 @@ class AccountController(object):
|
||||
timestamp = normalize_timestamp(req.headers['x-timestamp'])
|
||||
metadata = {}
|
||||
metadata.update((key, (value, timestamp))
|
||||
for key, value in req.headers.iteritems()
|
||||
if key.lower().startswith('x-account-meta-'))
|
||||
for key, value in req.headers.iteritems()
|
||||
if key.lower().startswith('x-account-meta-'))
|
||||
if metadata:
|
||||
broker.update_metadata(metadata)
|
||||
self.logger.timing_since('POST.timing', start_time)
|
||||
@ -377,7 +380,8 @@ class AccountController(object):
|
||||
res = method(req)
|
||||
except (Exception, Timeout):
|
||||
self.logger.exception(_('ERROR __call__ error with %(method)s'
|
||||
' %(path)s '), {'method': req.method, 'path': req.path})
|
||||
' %(path)s '),
|
||||
{'method': req.method, 'path': req.path})
|
||||
res = HTTPInternalServerError(body=traceback.format_exc())
|
||||
trans_time = '%.4f' % (time.time() - start_time)
|
||||
additional_info = ''
|
||||
|
||||
Loading…
Reference in New Issue
Block a user