swift 2.23.2__py3-none-any.whl → 2.35.0__py3-none-any.whl

swift-2.23.2.data/scripts/swift-recon-cron → swift/cli/recon_cron.py

@@ -1,4 +1,3 @@
-#!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
@@ -12,27 +11,25 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-"""
-swift-recon-cron.py
-"""
-
 import os
 import sys
+import time
 
 from eventlet import Timeout
 
 from swift.common.utils import get_logger, dump_recon_cache, readconf, \
-    lock_path
+    lock_path, listdir
+from swift.common.recon import RECON_OBJECT_FILE, DEFAULT_RECON_CACHE_PATH
 from swift.obj.diskfile import ASYNCDIR_BASE
 
 
-def get_async_count(device_dir, logger):
+def get_async_count(device_dir):
     async_count = 0
-    for i in os.listdir(device_dir):
+    for i in listdir(device_dir):
         device = os.path.join(device_dir, i)
         if not os.path.isdir(device):
             continue
-        for asyncdir in os.listdir(device):
+        for asyncdir in listdir(device):
             # skip stuff like "accounts", "containers", etc.
             if not (asyncdir == ASYNCDIR_BASE or
                     asyncdir.startswith(ASYNCDIR_BASE + '-')):
@@ -40,10 +37,10 @@ def get_async_count(device_dir, logger):
             async_pending = os.path.join(device, asyncdir)
 
             if os.path.isdir(async_pending):
-                for entry in os.listdir(async_pending):
+                for entry in 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))
+                        async_count += len(listdir(async_hdir))
     return async_count
 
 
@@ -53,24 +50,24 @@ def main():
     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)
+        return 1
     conf = readconf(conf_path, 'filter:recon')
     device_dir = conf.get('devices', '/srv/node')
-    recon_cache_path = conf.get('recon_cache_path', '/var/cache/swift')
+    recon_cache_path = conf.get('recon_cache_path', DEFAULT_RECON_CACHE_PATH)
     recon_lock_path = conf.get('recon_lock_path', '/var/lock')
-    cache_file = os.path.join(recon_cache_path, "object.recon")
+    cache_file = os.path.join(recon_cache_path, RECON_OBJECT_FILE)
     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:
         with lock_path(lock_dir):
-            asyncs = get_async_count(device_dir, logger)
-            dump_recon_cache({'async_pending': asyncs}, cache_file, logger)
+            asyncs = get_async_count(device_dir)
+            dump_recon_cache({
+                'async_pending': asyncs,
+                'async_pending_last': time.time(),
+            }, cache_file, logger)
     except (Exception, Timeout) as err:
         msg = 'Exception during recon-cron while accessing devices'
         logger.exception(msg)
         print('%s: %s' % (msg, err))
-        sys.exit(1)
-
-if __name__ == '__main__':
-    main()
+        return 1

swift-2.23.2.data/scripts/swift-reconciler-enqueue → swift/cli/reconciler_enqueue.py

@@ -1,4 +1,4 @@
-#!python
+#!/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
@@ -11,12 +11,10 @@
 # implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-from __future__ import print_function
 import sys
 from optparse import OptionParser
 
 import eventlet.debug
-eventlet.debug.hub_exceptions(True)
 
 from swift.common.ring import Ring
 from swift.common.utils import split_path
@@ -50,6 +48,7 @@ parser.add_option('-f', '--force', action='store_true',
 
 
 def main():
+    eventlet.debug.hub_exceptions(True)
     options, args = parser.parse_args()
     try:
         policy_index, path, timestamp = args