2792fe81a9
After the release of Swift ver. 2.0.0, some recon responses do not
show each policy's information yet. To make things worse, some recon
results only count on policy-0's score, therefore the total is not
shown in the recon results.
With this patch, async_pending count of recon results becomes
policy-aware. Suppose a number of async_pending files for policy-0 is 2
and a number for policy-1 is 3, recon sums up every policy's amount
as follows.
$ curl http://<host>:<port>/recon/async
{"async_pending": 5} # It showed 2 before this commit
Related-Bug: 1375332
Change-Id: Ifc88b8c9e06b9f022a926a87ed807e938e1e0412
85 lines
2.9 KiB
Python
Executable File
85 lines
2.9 KiB
Python
Executable File
#!/usr/bin/env python
|
|
# 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.
|
|
|
|
"""
|
|
swift-recon-cron.py
|
|
"""
|
|
|
|
import os
|
|
import sys
|
|
from ConfigParser import ConfigParser
|
|
from gettext import gettext as _
|
|
|
|
from swift.common.utils import get_logger, dump_recon_cache
|
|
from swift.obj.diskfile import ASYNCDIR_BASE
|
|
|
|
|
|
def get_async_count(device_dir, logger):
|
|
async_count = 0
|
|
for i in os.listdir(device_dir):
|
|
device = os.path.join(device_dir, i)
|
|
for asyncdir in os.listdir(device):
|
|
# skip stuff like "accounts", "containers", etc.
|
|
if not (asyncdir == ASYNCDIR_BASE or
|
|
asyncdir.startswith(ASYNCDIR_BASE + '-')):
|
|
continue
|
|
async_pending = os.path.join(device, asyncdir)
|
|
|
|
if os.path.isdir(async_pending):
|
|
for entry in os.listdir(async_pending):
|
|
if os.path.isdir(os.path.join(async_pending, entry)):
|
|
async_hdir = os.path.join(async_pending, entry)
|
|
async_count += len(os.listdir(async_hdir))
|
|
return async_count
|
|
|
|
|
|
def main():
|
|
c = ConfigParser()
|
|
try:
|
|
conf_path = sys.argv[1]
|
|
except Exception:
|
|
print "Usage: %s CONF_FILE" % sys.argv[0].split('/')[-1]
|
|
print "ex: swift-recon-cron /etc/swift/object-server.conf"
|
|
sys.exit(1)
|
|
if not c.read(conf_path):
|
|
print "Unable to read config file %s" % conf_path
|
|
sys.exit(1)
|
|
conf = dict(c.items('filter:recon'))
|
|
device_dir = conf.get('devices', '/srv/node')
|
|
recon_cache_path = conf.get('recon_cache_path', '/var/cache/swift')
|
|
recon_lock_path = conf.get('recon_lock_path', '/var/lock')
|
|
cache_file = os.path.join(recon_cache_path, "object.recon")
|
|
lock_dir = os.path.join(recon_lock_path, "swift-recon-object-cron")
|
|
conf['log_name'] = conf.get('log_name', 'recon-cron')
|
|
logger = get_logger(conf, log_route='recon-cron')
|
|
try:
|
|
os.mkdir(lock_dir)
|
|
except OSError as e:
|
|
logger.critical(str(e))
|
|
print str(e)
|
|
sys.exit(1)
|
|
try:
|
|
asyncs = get_async_count(device_dir, logger)
|
|
dump_recon_cache({'async_pending': asyncs}, cache_file, logger)
|
|
except Exception:
|
|
logger.exception(
|
|
_('Exception during recon-cron while accessing devices'))
|
|
try:
|
|
os.rmdir(lock_dir)
|
|
except Exception:
|
|
logger.exception(_('Exception remove cronjob lock'))
|
|
|
|
if __name__ == '__main__':
|
|
main()
|