Merge lp:~david-goetz/swift/zero_byte_obj_audit into lp:~hudson-openstack/swift/trunk

[David Goetz]

Add a way to speed up object-auditor to check for zero byte files.

[gholt (gholt)]

The TRUE_VALUES -> TRUE_VALS thing seems out of place in this branch.

Unmerged revisions

206. By David Goetz on 2011-02-07

merge up to trunk

205. By David Goetz on 2011-02-03

fixes and true vals refactor

204. By David Goetz on 2011-02-01

object auditor to quickly look for zero byte files

=== modified file 'bin/swift-log-uploader'
--- bin/swift-log-uploader	2011-01-04 23:34:43 +0000
+++ bin/swift-log-uploader	2011-02-08 00:11:22 +0000
@@ -24,7 +24,7 @@
     conf_file, options = parse_options(usage="Usage: %prog CONFIG_FILE PLUGIN")
     try:
         plugin = options['extra_args'][0]
-    except IndexError:
+    except (KeyError, IndexError):
         print "Error: missing plugin name"
         sys.exit(1)
 

=== modified file 'bin/swift-object-auditor'
--- bin/swift-object-auditor	2011-01-04 23:34:43 +0000
+++ bin/swift-object-auditor	2011-02-08 00:11:22 +0000
@@ -17,7 +17,13 @@
 from swift.obj.auditor import ObjectAuditor
 from swift.common.utils import parse_options
 from swift.common.daemon import run_daemon
+from optparse import OptionParser
 
 if __name__ == '__main__':
-    conf_file, options = parse_options(once=True)
+    parser = OptionParser("%prog CONFIG [options]")
+    parser.add_option('-z', '--zero_byte_only', default=False,
+                      action='store_true', help='Audit only zero byte files')
+    parser.add_option('-f', '--zero_byte_fps',
+                      help='Override zero byte files per second in config.')
+    conf_file, options = parse_options(parser=parser, once=True)
     run_daemon(ObjectAuditor, conf_file, **options)

=== modified file 'doc/source/admin_guide.rst'
--- doc/source/admin_guide.rst	2010-12-10 01:57:26 +0000
+++ doc/source/admin_guide.rst	2011-02-08 00:11:22 +0000
@@ -288,3 +288,17 @@
 completely stopping the old service.  There is also a special case of 
 `swift-init all <command>`, which will run the command for all swift services.
 
+--------------
+Object Auditor
+--------------
+
+On system failures, the XFS file system can sometimes truncate files it's
+trying to write and produce zero byte files.  The object-auditor will catch
+these problems but in the case of a system crash it would be advisable to run
+an extra, less rate limited sweep to check for these specific files.  You can
+run this command as follows:
+`swift-object-auditor /path/to/object-server/config/file.conf once -z -f 1000`
+"-z" will check for only zero-byte files and "-f" overrides the
+zero_byte_files_per_second to a 1000 from the config file, which by default is
+only 50.
+

=== modified file 'swift/account/auditor.py'
--- swift/account/auditor.py	2011-01-04 23:34:43 +0000
+++ swift/account/auditor.py	2011-02-08 00:11:22 +0000
@@ -19,7 +19,7 @@
 
 from swift.account import server as account_server
 from swift.common.db import AccountBroker
-from swift.common.utils import get_logger, audit_location_generator
+from swift.common.utils import get_logger, audit_location_generator, TRUE_VALS
 from swift.common.daemon import Daemon
 
 
@@ -30,8 +30,7 @@
         self.conf = conf
         self.logger = get_logger(conf, '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')
+        self.mount_check = conf.get('mount_check', 'true').lower() in TRUE_VALS
         self.interval = int(conf.get('interval', 1800))
         self.account_passes = 0
         self.account_failures = 0

=== modified file 'swift/account/reaper.py'
--- swift/account/reaper.py	2011-01-19 23:21:57 +0000
+++ swift/account/reaper.py	2011-02-08 00:11:22 +0000
@@ -26,7 +26,7 @@
 from swift.common.direct_client import ClientException, \
     direct_delete_container, direct_delete_object, direct_get_container
 from swift.common.ring import Ring
-from swift.common.utils import get_logger, whataremyips
+from swift.common.utils import get_logger, whataremyips, TRUE_VALS
 from swift.common.daemon import Daemon
 
 
@@ -55,8 +55,7 @@
         self.conf = conf
         self.logger = get_logger(conf)
         self.devices = conf.get('devices', '/srv/node')
-        self.mount_check = conf.get('mount_check', 'true').lower() in \
-                              ('true', 't', '1', 'on', 'yes', 'y')
+        self.mount_check = conf.get('mount_check', 'true').lower() in TRUE_VALS
         self.interval = int(conf.get('interval', 3600))
         swift_dir = conf.get('swift_dir', '/etc/swift')
         self.account_ring_path = os.path.join(swift_dir, 'account.ring.gz')

=== modified file 'swift/account/server.py'
--- swift/account/server.py	2011-01-26 22:31:33 +0000
+++ swift/account/server.py	2011-02-08 00:11:22 +0000
@@ -29,7 +29,7 @@
 
 from swift.common.db import AccountBroker
 from swift.common.utils import get_logger, get_param, hash_path, \
-    normalize_timestamp, split_path, storage_directory
+    normalize_timestamp, split_path, storage_directory, TRUE_VALS
 from swift.common.constraints import ACCOUNT_LISTING_LIMIT, \
     check_mount, check_float, check_utf8
 from swift.common.db_replicator import ReplicatorRpc
@@ -44,8 +44,7 @@
     def __init__(self, conf):
         self.logger = get_logger(conf)
         self.root = conf.get('devices', '/srv/node')
-        self.mount_check = conf.get('mount_check', 'true').lower() in \
-                              ('true', 't', '1', 'on', 'yes', 'y')
+        self.mount_check = conf.get('mount_check', 'true').lower() in TRUE_VALS
         self.replicator_rpc = \
             ReplicatorRpc(self.root, DATADIR, AccountBroker, self.mount_check)
 

=== modified file 'swift/common/bench.py'
--- swift/common/bench.py	2011-01-26 22:31:33 +0000
+++ swift/common/bench.py	2011-02-08 00:11:22 +0000
@@ -22,7 +22,7 @@
 import eventlet.pools
 from eventlet.green.httplib import CannotSendRequest
 
-from swift.common.utils import TRUE_VALUES
+from swift.common.utils import TRUE_VALS
 from swift.common import client
 from swift.common import direct_client
 
@@ -44,7 +44,7 @@
         self.user = conf.user
         self.key = conf.key
         self.auth_url = conf.auth
-        self.use_proxy = conf.use_proxy in TRUE_VALUES
+        self.use_proxy = conf.use_proxy in TRUE_VALS
         if self.use_proxy:
             url, token = client.get_auth(self.auth_url, self.user, self.key)
             self.token = token
@@ -126,7 +126,7 @@
         self.logger = logger
         self.conf = conf
         self.names = []
-        self.delete = conf.delete in TRUE_VALUES
+        self.delete = conf.delete in TRUE_VALS
         self.gets = int(conf.num_gets)
 
     def run(self):

=== modified file 'swift/common/daemon.py'
--- swift/common/daemon.py	2011-01-04 23:34:43 +0000
+++ swift/common/daemon.py	2011-02-08 00:11:22 +0000
@@ -41,22 +41,19 @@
         utils.validate_configuration()
         utils.capture_stdio(self.logger, **kwargs)
         utils.drop_privileges(self.conf.get('user', 'swift'))
-
         def kill_children(*args):
             signal.signal(signal.SIGTERM, signal.SIG_IGN)
             os.killpg(0, signal.SIGTERM)
             sys.exit()
 
         signal.signal(signal.SIGTERM, kill_children)
-
         if once:
-            self.run_once()
+            self.run_once(**kwargs)
         else:
-            self.run_forever()
-
-
-def run_daemon(klass, conf_file, section_name='',
-               once=False, **kwargs):
+            self.run_forever(**kwargs)
+
+
+def run_daemon(klass, conf_file, section_name='', once=False, **kwargs):
     """
     Loads settings from conf, then instantiates daemon "klass" and runs the
     daemon with the specified once kwarg.  The section_name will be derived
@@ -77,7 +74,7 @@
                           log_name=kwargs.get('log_name'))
 
     # once on command line (i.e. daemonize=false) will over-ride config
-    once = once or conf.get('daemonize', 'true') not in utils.TRUE_VALUES
+    once = once or conf.get('daemonize', 'true').lower() not in utils.TRUE_VALS
 
     # pre-configure logger
     if 'logger' in kwargs:

=== modified file 'swift/common/db_replicator.py'
--- swift/common/db_replicator.py	2011-01-26 22:31:33 +0000
+++ swift/common/db_replicator.py	2011-02-08 00:11:22 +0000
@@ -29,7 +29,8 @@
     HTTPInsufficientStorage, HTTPBadRequest
 
 from swift.common.utils import get_logger, whataremyips, storage_directory, \
-    renamer, mkdirs, lock_parent_directory, unlink_older_than, LoggerFileObject
+    renamer, mkdirs, lock_parent_directory, unlink_older_than, \
+    LoggerFileObject, TRUE_VALS
 from swift.common import ring
 from swift.common.bufferedhttp import BufferedHTTPConnection
 from swift.common.exceptions import DriveNotMounted, ConnectionTimeout
@@ -94,8 +95,7 @@
         self.conf = conf
         self.logger = get_logger(conf)
         self.root = conf.get('devices', '/srv/node')
-        self.mount_check = conf.get('mount_check', 'true').lower() in \
-                              ('true', 't', '1', 'on', 'yes', 'y')
+        self.mount_check = conf.get('mount_check', 'true').lower() in TRUE_VALS
         self.port = int(conf.get('bind_port', self.default_port))
         concurrency = int(conf.get('concurrency', 8))
         self.cpool = GreenPool(size=concurrency)
@@ -103,8 +103,7 @@
         self.ring = ring.Ring(os.path.join(swift_dir, self.ring_file))
         self.per_diff = int(conf.get('per_diff', 1000))
         self.run_pause = int(conf.get('run_pause', 30))
-        self.vm_test_mode = conf.get(
-            'vm_test_mode', 'no').lower() in ('yes', 'true', 'on', '1')
+        self.vm_test_mode = conf.get('vm_test_mode', 'no').lower() in TRUE_VALS
         self.node_timeout = int(conf.get('node_timeout', 10))
         self.conn_timeout = float(conf.get('conn_timeout', 0.5))
         self.reclaim_age = float(conf.get('reclaim_age', 86400 * 7))

=== modified file 'swift/common/middleware/auth.py'
--- swift/common/middleware/auth.py	2011-01-25 05:39:00 +0000
+++ swift/common/middleware/auth.py	2011-02-08 00:11:22 +0000
@@ -20,7 +20,7 @@
 
 from swift.common.bufferedhttp import http_connect_raw as http_connect
 from swift.common.middleware.acl import clean_acl, parse_acl, referrer_allowed
-from swift.common.utils import cache_from_env, split_path, TRUE_VALUES
+from swift.common.utils import cache_from_env, split_path, TRUE_VALS
 
 
 class DevAuth(object):
@@ -34,7 +34,7 @@
             self.reseller_prefix += '_'
         self.auth_host = conf.get('ip', '127.0.0.1')
         self.auth_port = int(conf.get('port', 11000))
-        self.ssl = conf.get('ssl', 'false').lower() in TRUE_VALUES
+        self.ssl = conf.get('ssl', 'false').lower() in TRUE_VALS
         self.auth_prefix = conf.get('prefix', '/')
         self.timeout = int(conf.get('node_timeout', 10))
 

=== modified file 'swift/common/utils.py'
--- swift/common/utils.py	2011-02-02 18:47:56 +0000
+++ swift/common/utils.py	2011-02-08 00:11:22 +0000
@@ -66,7 +66,7 @@
         pass
 
 # Used when reading config values
-TRUE_VALUES = set(('true', '1', 'yes', 'True', 'Yes', 'on', 'On'))
+TRUE_VALS = set(('true', 't', '1', 'yes', 'y', 'True', 'Yes', 'on', 'On'))
 
 
 def validate_configuration():
@@ -490,11 +490,11 @@
         sys.stderr = LoggerFileObject(logger)
 
 
-def parse_options(usage="%prog CONFIG [options]", once=False, test_args=None):
+def parse_options(parser=None, once=False, test_args=None):
     """
     Parse standard swift server/daemon options with optparse.OptionParser.
 
-    :param usage: String describing usage
+    :param parser: OptionParser to use. If not sent one will be created.
     :param once: Boolean indicating the "once" option is available
     :param test_args: Override sys.argv; used in testing
 
@@ -503,7 +503,8 @@
 
     :raises SystemExit: First arg (CONFIG) is required, file must exist
     """
-    parser = OptionParser(usage)
+    if not parser:
+        parser = OptionParser(usage="%prog CONFIG [options]")
     parser.add_option("-v", "--verbose", default=False, action="store_true",
                       help="log to console")
     if once:
@@ -532,7 +533,8 @@
             extra_args.append(arg)
 
     options = vars(options)
-    options['extra_args'] = extra_args
+    if extra_args:
+        options['extra_args'] = extra_args
     return config, options
 
 

=== modified file 'swift/container/auditor.py'
--- swift/container/auditor.py	2011-01-04 23:34:43 +0000
+++ swift/container/auditor.py	2011-02-08 00:11:22 +0000
@@ -19,7 +19,7 @@
 
 from swift.container import server as container_server
 from swift.common.db import ContainerBroker
-from swift.common.utils import get_logger, audit_location_generator
+from swift.common.utils import get_logger, audit_location_generator, TRUE_VALS
 from swift.common.daemon import Daemon
 
 
@@ -30,8 +30,7 @@
         self.conf = conf
         self.logger = get_logger(conf, 'container-auditor')
         self.devices = conf.get('devices', '/srv/node')
-        self.mount_check = conf.get('mount_check', 'true').lower() in \
-                              ('true', 't', '1', 'on', 'yes', 'y')
+        self.mount_check = conf.get('mount_check', 'true').lower() in TRUE_VALS
         self.interval = int(conf.get('interval', 1800))
         swift_dir = conf.get('swift_dir', '/etc/swift')
         self.container_passes = 0

=== modified file 'swift/container/server.py'
--- swift/container/server.py	2011-01-26 22:31:33 +0000
+++ swift/container/server.py	2011-02-08 00:11:22 +0000
@@ -32,7 +32,7 @@
 
 from swift.common.db import ContainerBroker
 from swift.common.utils import get_logger, get_param, hash_path, \
-    normalize_timestamp, storage_directory, split_path
+    normalize_timestamp, storage_directory, split_path, TRUE_VALS
 from swift.common.constraints import CONTAINER_LISTING_LIMIT, \
     check_mount, check_float, check_utf8
 from swift.common.bufferedhttp import http_connect
@@ -51,8 +51,7 @@
     def __init__(self, conf):
         self.logger = get_logger(conf)
         self.root = conf.get('devices', '/srv/node/')
-        self.mount_check = conf.get('mount_check', 'true').lower() in \
-                              ('true', 't', '1', 'on', 'yes', 'y')
+        self.mount_check = conf.get('mount_check', 'true').lower() in TRUE_VALS
         self.node_timeout = int(conf.get('node_timeout', 3))
         self.conn_timeout = float(conf.get('conn_timeout', 0.5))
         self.replicator_rpc = ReplicatorRpc(self.root, DATADIR,

=== modified file 'swift/container/updater.py'
--- swift/container/updater.py	2011-01-26 22:38:13 +0000
+++ swift/container/updater.py	2011-02-08 00:11:22 +0000
@@ -28,7 +28,7 @@
 from swift.common.db import ContainerBroker
 from swift.common.exceptions import ConnectionTimeout
 from swift.common.ring import Ring
-from swift.common.utils import get_logger, whataremyips
+from swift.common.utils import get_logger, whataremyips, TRUE_VALS
 from swift.common.daemon import Daemon
 
 
@@ -39,8 +39,7 @@
         self.conf = conf
         self.logger = get_logger(conf, 'container-updater')
         self.devices = conf.get('devices', '/srv/node')
-        self.mount_check = conf.get('mount_check', 'true').lower() in \
-                              ('true', 't', '1', 'on', 'yes', 'y')
+        self.mount_check = conf.get('mount_check', 'true').lower() in TRUE_VALS
         swift_dir = conf.get('swift_dir', '/etc/swift')
         self.interval = int(conf.get('interval', 300))
         self.account_ring_path = os.path.join(swift_dir, 'account.ring.gz')

=== modified file 'swift/obj/auditor.py'
--- swift/obj/auditor.py	2011-01-21 01:05:44 +0000
+++ swift/obj/auditor.py	2011-02-08 00:11:22 +0000
@@ -21,23 +21,33 @@
 from swift.obj import server as object_server
 from swift.obj.replicator import invalidate_hash
 from swift.common.utils import get_logger, renamer, audit_location_generator, \
-    ratelimit_sleep
+    ratelimit_sleep, TRUE_VALS
 from swift.common.exceptions import AuditException
 from swift.common.daemon import Daemon
 
 
-class ObjectAuditor(Daemon):
-    """Audit objects."""
-
-    def __init__(self, conf):
+class AuditorWorker(object):
+    """Walk through file system to audit object"""
+    def __init__(self, conf, zero_byte_file_worker=False, zero_byte_fps=None):
         self.conf = conf
         self.logger = get_logger(conf, 'object-auditor')
         self.devices = conf.get('devices', '/srv/node')
-        self.mount_check = conf.get('mount_check', 'true').lower() in \
-                              ('true', 't', '1', 'on', 'yes', 'y')
+        self.mount_check = conf.get('mount_check', 'true').lower() in TRUE_VALS
         self.max_files_per_second = float(conf.get('files_per_second', 20))
         self.max_bytes_per_second = float(conf.get('bytes_per_second',
                                                    10000000))
+        self.auditor_type = 'ALL'
+        self.fasttrack_zero_byte_files = conf.get(
+                'fasttrack_zero_byte_files', 'False').lower() in TRUE_VALS
+        self.zero_byte_file_worker = zero_byte_file_worker
+        if self.zero_byte_file_worker:
+            self.fasttrack_zero_byte_files = True
+            if zero_byte_fps:
+                self.max_files_per_second = float(zero_byte_fps)
+            else:
+                self.max_files_per_second = float(
+                    conf.get('zero_byte_files_per_second', 50))
+            self.auditor_type = 'ZBF'
         self.log_time = int(conf.get('log_time', 3600))
         self.files_running_time = 0
         self.bytes_running_time = 0
@@ -48,18 +58,13 @@
         self.quarantines = 0
         self.errors = 0
 
-    def run_forever(self):
-        """Run the object audit until stopped."""
-        while True:
-            self.run_once('forever')
-            self.total_bytes_processed = 0
-            self.total_files_processed = 0
-            time.sleep(30)
-
-    def run_once(self, mode='once'):
-        """Run the object audit once."""
-        self.logger.info(_('Begin object audit "%s" mode' % mode))
+    def audit_all_objects(self, mode='once'):
+        self.logger.info(_('Begin object audit "%s" mode (%s)' %
+                           (mode, self.auditor_type)))
         begin = reported = time.time()
+        self.total_bytes_processed = 0
+        self.total_files_processed = 0
+        files_running_time = 0
         all_locs = audit_location_generator(self.devices,
                                             object_server.DATADIR,
                                             mount_check=self.mount_check,
@@ -71,9 +76,11 @@
             self.total_files_processed += 1
             if time.time() - reported >= self.log_time:
                 self.logger.info(_(
-                    'Since %(start_time)s: Locally: %(passes)d passed audit, '
+                    'Object audit (%(type)s). '
+                    'Since %(start_time)s: Locally: %(passes)d passed, '
                     '%(quars)d quarantined, %(errors)d errors '
                     'files/sec: %(frate).2f , bytes/sec: %(brate).2f') % {
+                            'type': self.auditor_type,
                             'start_time': time.ctime(reported),
                             'passes': self.passes,
                             'quars': self.quarantines,
@@ -88,9 +95,11 @@
                 self.bytes_processed = 0
         elapsed = time.time() - begin
         self.logger.info(_(
-                'Object audit "%(mode)s" mode completed: %(elapsed).02fs. '
+                'Object audit (%(type)s) "%(mode)s" mode '
+                'completed: %(elapsed).02fs. '
                 'Total files/sec: %(frate).2f , '
                 'Total bytes/sec: %(brate).2f ') % {
+                    'type': self.auditor_type,
                     'mode': mode,
                     'elapsed': elapsed,
                     'frate': self.total_files_processed / elapsed,
@@ -98,7 +107,7 @@
 
     def object_audit(self, path, device, partition):
         """
-        Audits the given object path
+        Audits the given object path.
 
         :param path: a path to an object
         :param device: the device the path is on
@@ -119,11 +128,14 @@
             if df.data_file is None:
                 # file is deleted, we found the tombstone
                 return
-            if os.path.getsize(df.data_file) != \
-                    int(df.metadata['Content-Length']):
+            obj_size = os.path.getsize(df.data_file)
+            if obj_size != int(df.metadata['Content-Length']):
                 raise AuditException('Content-Length of %s does not match '
                     'file size of %s' % (int(df.metadata['Content-Length']),
                                          os.path.getsize(df.data_file)))
+            if self.fasttrack_zero_byte_files and \
+                bool(self.zero_byte_file_worker) == bool(obj_size):
+                return
             etag = md5()
             for chunk in df:
                 self.bytes_running_time = ratelimit_sleep(
@@ -150,3 +162,34 @@
             self.logger.exception(_('ERROR Trying to audit %s'), path)
             return
         self.passes += 1
+
+
+class ObjectAuditor(Daemon):
+    """Audit objects."""
+
+    def __init__(self, conf, **options):
+        self.conf = conf
+        self.logger = get_logger(conf, 'object-auditor')
+        self.fasttrack_zero_byte_files = conf.get(
+                'fasttrack_zero_byte_files', 'False').lower() in TRUE_VALS
+
+    def run_forever(self, zero_byte_only=False, zero_byte_fps=None):
+        """Run the object audit until stopped."""
+        zero_byte_pid = 1
+        if zero_byte_only or self.fasttrack_zero_byte_files:
+            zero_byte_pid = os.fork()
+        if zero_byte_pid == 0:
+            while True:
+                self.run_once(mode='forever', zero_byte_only=True,
+                              zero_byte_fps=zero_byte_fps)
+                time.sleep(30)
+        else:
+            while not zero_byte_only:
+                self.run_once(mode='forever')
+                time.sleep(30)
+
+    def run_once(self, mode='once', zero_byte_only=False, zero_byte_fps=None):
+        """Run the object audit once."""
+        worker = AuditorWorker(self.conf, zero_byte_file_worker=zero_byte_only,
+                               zero_byte_fps=zero_byte_fps)
+        worker.audit_all_objects(mode=mode)

=== modified file 'swift/obj/replicator.py'
--- swift/obj/replicator.py	2011-01-27 22:42:36 +0000
+++ swift/obj/replicator.py	2011-02-08 00:11:22 +0000
@@ -30,7 +30,7 @@
 
 from swift.common.ring import Ring
 from swift.common.utils import whataremyips, unlink_older_than, lock_path, \
-        renamer, compute_eta, get_logger
+        renamer, compute_eta, get_logger, TRUE_VALS
 from swift.common.bufferedhttp import http_connect
 from swift.common.daemon import Daemon
 
@@ -209,10 +209,8 @@
         self.conf = conf
         self.logger = get_logger(conf, 'object-replicator')
         self.devices_dir = conf.get('devices', '/srv/node')
-        self.mount_check = conf.get('mount_check', 'true').lower() in \
-                              ('true', 't', '1', 'on', 'yes', 'y')
-        self.vm_test_mode = conf.get(
-                'vm_test_mode', 'no').lower() in ('yes', 'true', 'on', '1')
+        self.mount_check = conf.get('mount_check', 'true').lower() in TRUE_VALS
+        self.vm_test_mode = conf.get('vm_test_mode', 'no').lower() in TRUE_VALS
         self.swift_dir = conf.get('swift_dir', '/etc/swift')
         self.port = int(conf.get('bind_port', 6000))
         self.concurrency = int(conf.get('concurrency', 1))

=== modified file 'swift/obj/server.py'
--- swift/obj/server.py	2011-01-26 22:38:13 +0000
+++ swift/obj/server.py	2011-02-08 00:11:22 +0000
@@ -37,7 +37,7 @@
 
 from swift.common.utils import mkdirs, normalize_timestamp, \
     storage_directory, hash_path, renamer, fallocate, \
-    split_path, drop_buffer_cache, get_logger, write_pickle
+    split_path, drop_buffer_cache, get_logger, write_pickle, TRUE_VALS
 from swift.common.bufferedhttp import http_connect
 from swift.common.constraints import check_object_creation, check_mount, \
     check_float, check_utf8
@@ -268,8 +268,7 @@
         """
         self.logger = get_logger(conf)
         self.devices = conf.get('devices', '/srv/node/')
-        self.mount_check = conf.get('mount_check', 'true').lower() in \
-                              ('true', 't', '1', 'on', 'yes', 'y')
+        self.mount_check = conf.get('mount_check', 'true').lower() in TRUE_VALS
         self.node_timeout = int(conf.get('node_timeout', 3))
         self.conn_timeout = float(conf.get('conn_timeout', 0.5))
         self.disk_chunk_size = int(conf.get('disk_chunk_size', 65536))

=== modified file 'swift/obj/updater.py'
--- swift/obj/updater.py	2011-01-26 22:31:33 +0000
+++ swift/obj/updater.py	2011-02-08 00:11:22 +0000
@@ -25,7 +25,7 @@
 from swift.common.bufferedhttp import http_connect
 from swift.common.exceptions import ConnectionTimeout
 from swift.common.ring import Ring
-from swift.common.utils import get_logger, renamer, write_pickle
+from swift.common.utils import get_logger, renamer, write_pickle, TRUE_VALS
 from swift.common.daemon import Daemon
 from swift.obj.server import ASYNCDIR
 
@@ -37,8 +37,7 @@
         self.conf = conf
         self.logger = get_logger(conf, 'object-updater')
         self.devices = conf.get('devices', '/srv/node')
-        self.mount_check = conf.get('mount_check', 'true').lower() in \
-                              ('true', 't', '1', 'on', 'yes', 'y')
+        self.mount_check = conf.get('mount_check', 'true').lower() in TRUE_VALS
         swift_dir = conf.get('swift_dir', '/etc/swift')
         self.interval = int(conf.get('interval', 300))
         self.container_ring_path = os.path.join(swift_dir, 'container.ring.gz')

=== modified file 'swift/stats/account_stats.py'
--- swift/stats/account_stats.py	2011-01-30 14:59:35 +0000
+++ swift/stats/account_stats.py	2011-02-08 00:11:22 +0000
@@ -21,7 +21,7 @@
 
 from swift.account.server import DATADIR as account_server_data_dir
 from swift.common.db import AccountBroker
-from swift.common.utils import renamer, get_logger, readconf, mkdirs
+from swift.common.utils import renamer, get_logger, readconf, mkdirs, TRUE_VALS
 from swift.common.constraints import check_mount
 from swift.common.daemon import Daemon
 
@@ -47,7 +47,7 @@
         mkdirs(self.target_dir)
         self.devices = server_conf.get('devices', '/srv/node')
         self.mount_check = server_conf.get('mount_check', 'true').lower() in \
-                              ('true', 't', '1', 'on', 'yes', 'y')
+                              TRUE_VALS
         self.logger = get_logger(stats_conf, 'swift-account-stats-logger')
 
     def run_once(self):

=== modified file 'swift/stats/log_uploader.py'
--- swift/stats/log_uploader.py	2011-01-14 08:45:39 +0000
+++ swift/stats/log_uploader.py	2011-02-08 00:11:22 +0000
@@ -54,7 +54,7 @@
                                       name='proxy-server')
         new_log_cutoff = int(uploader_conf.get('new_log_cutoff', '7200'))
         unlink_log = uploader_conf.get('unlink_log', 'True').lower() in \
-                                                    ('true', 'on', '1', 'yes')
+                                                    utils.TRUE_VALS
         self.unlink_log = unlink_log
         self.new_log_cutoff = new_log_cutoff
         if not log_dir.endswith('/'):

=== modified file 'test/unit/common/test_utils.py'
--- test/unit/common/test_utils.py	2011-02-02 17:38:17 +0000
+++ test/unit/common/test_utils.py	2011-02-08 00:11:22 +0000
@@ -260,26 +260,16 @@
         stde = StringIO()
         utils.sys.stdout = stdo
         utils.sys.stderr = stde
-        err_msg = """Usage: test usage
-
-Error: missing config file argument
-"""
-        test_args = []
-        self.assertRaises(SystemExit, utils.parse_options, 'test usage', True,
-                          test_args)
-        self.assertEquals(stdo.getvalue(), err_msg)
+        self.assertRaises(SystemExit, utils.parse_options, once=True,
+                          test_args=[])
+        self.assert_(stdo.getvalue().find('missing config file') >= 0)
 
         # verify conf file must exist, context manager will delete temp file
         with NamedTemporaryFile() as f:
             conf_file = f.name
-        err_msg += """Usage: test usage
-
-Error: unable to locate %s
-""" % conf_file
-        test_args = [conf_file]
-        self.assertRaises(SystemExit, utils.parse_options, 'test usage', True,
-                          test_args)
-        self.assertEquals(stdo.getvalue(), err_msg)
+        self.assertRaises(SystemExit, utils.parse_options, once=True,
+                          test_args=[conf_file])
+        self.assert_(stdo.getvalue().find('unable to locate') >= 0)
 
         # reset stdio
         utils.sys.stdout = orig_stdout

=== modified file 'test/unit/obj/test_auditor.py'
--- test/unit/obj/test_auditor.py	2011-01-25 01:12:38 +0000
+++ test/unit/obj/test_auditor.py	2011-02-08 00:11:22 +0000
@@ -59,7 +59,7 @@
         rmtree(os.path.dirname(self.testdir), ignore_errors=1)
 
     def test_object_audit_extra_data(self):
-        self.auditor = auditor.ObjectAuditor(self.conf)
+        self.auditor = auditor.AuditorWorker(self.conf)
         cur_part = '0'
         disk_file = DiskFile(self.devices, 'sda', cur_part, 'a', 'c', 'o')
         data = '0' * 1024
@@ -89,7 +89,7 @@
             self.assertEquals(self.auditor.quarantines, pre_quarantines + 1)
 
     def test_object_audit_diff_data(self):
-        self.auditor = auditor.ObjectAuditor(self.conf)
+        self.auditor = auditor.AuditorWorker(self.conf)
         cur_part = '0'
         disk_file = DiskFile(self.devices, 'sda', cur_part, 'a', 'c', 'o')
         data = '0' * 1024
@@ -132,7 +132,7 @@
         fp.write('0' * 1024)
         fp.close()
         invalidate_hash(os.path.dirname(disk_file.datadir))
-        self.auditor = auditor.ObjectAuditor(self.conf)
+        self.auditor = auditor.AuditorWorker(self.conf)
         pre_quarantines = self.auditor.quarantines
         self.auditor.object_audit(
             os.path.join(disk_file.datadir, timestamp + '.data'),
@@ -140,7 +140,7 @@
         self.assertEquals(self.auditor.quarantines, pre_quarantines + 1)
 
     def test_object_audit_bad_args(self):
-        self.auditor = auditor.ObjectAuditor(self.conf)
+        self.auditor = auditor.AuditorWorker(self.conf)
         pre_errors = self.auditor.errors
         self.auditor.object_audit(5, 'sda', '0')
         self.assertEquals(self.auditor.errors, pre_errors + 1)
@@ -149,7 +149,7 @@
         self.assertEquals(self.auditor.errors, pre_errors)  # just returns
 
     def test_object_run_once_pass(self):
-        self.auditor = auditor.ObjectAuditor(self.conf)
+        self.auditor = auditor.AuditorWorker(self.conf)
         self.auditor.log_time = 0
         cur_part = '0'
         timestamp = str(normalize_timestamp(time.time()))
@@ -168,11 +168,11 @@
             }
             disk_file.put(fd, tmppath, metadata)
             disk_file.close()
-        self.auditor.run_once()
+        self.auditor.audit_all_objects()
         self.assertEquals(self.auditor.quarantines, pre_quarantines)
 
     def test_object_run_once_no_sda(self):
-        self.auditor = auditor.ObjectAuditor(self.conf)
+        self.auditor = auditor.AuditorWorker(self.conf)
         cur_part = '0'
         timestamp = str(normalize_timestamp(time.time()))
         pre_quarantines = self.auditor.quarantines
@@ -191,11 +191,11 @@
             disk_file.put(fd, tmppath, metadata)
             disk_file.close()
             os.write(fd, 'extra_data')
-        self.auditor.run_once()
+        self.auditor.audit_all_objects()
         self.assertEquals(self.auditor.quarantines, pre_quarantines + 1)
 
     def test_object_run_once_multi_devices(self):
-        self.auditor = auditor.ObjectAuditor(self.conf)
+        self.auditor = auditor.AuditorWorker(self.conf)
         cur_part = '0'
         timestamp = str(normalize_timestamp(time.time()))
         pre_quarantines = self.auditor.quarantines
@@ -213,7 +213,7 @@
             }
             disk_file.put(fd, tmppath, metadata)
             disk_file.close()
-        self.auditor.run_once()
+        self.auditor.audit_all_objects()
         disk_file = DiskFile(self.devices, 'sdb', cur_part, 'a', 'c', 'ob')
         data = '1' * 10
         etag = md5()
@@ -229,9 +229,64 @@
             disk_file.put(fd, tmppath, metadata)
             disk_file.close()
             os.write(fd, 'extra_data')
-        self.auditor.run_once()
+        self.auditor.audit_all_objects()
         self.assertEquals(self.auditor.quarantines, pre_quarantines + 1)
 
+    def test_object_run_fast_track_non_zero(self):
+        self.conf['fasttrack_zero_byte_files'] = 'yes'
+        self.auditor = auditor.ObjectAuditor(self.conf)
+        self.auditor.log_time = 0
+        cur_part = '0'
+        disk_file = DiskFile(self.devices, 'sda', cur_part, 'a', 'c', 'o')
+        data = '0' * 1024
+        etag = md5()
+        with disk_file.mkstemp() as (fd, tmppath):
+            os.write(fd, data)
+            etag.update(data)
+            etag = etag.hexdigest()
+            metadata = {
+                'ETag': etag,
+                'X-Timestamp': str(normalize_timestamp(time.time())),
+                'Content-Length': str(os.fstat(fd).st_size),
+            }
+            disk_file.put(fd, tmppath, metadata)
+            etag = md5()
+            etag.update('1' + '0' * 1023)
+            etag = etag.hexdigest()
+            metadata['ETag'] = etag
+            write_metadata(fd, metadata)
+
+        quarantine_path = os.path.join(self.devices,
+                                       'sda', 'quarantined', 'objects')
+        self.auditor.run_once(zero_byte_only=True)
+        self.assertFalse(os.path.isdir(quarantine_path))
+        self.auditor.run_once()
+        self.assertTrue(os.path.isdir(quarantine_path))
+
+    def test_object_run_fast_track_zero(self):
+        self.conf['fasttrack_zero_byte_files'] = 'yes'
+        self.auditor = auditor.ObjectAuditor(self.conf)
+        self.auditor.log_time = 0
+        cur_part = '0'
+        disk_file = DiskFile(self.devices, 'sda', cur_part, 'a', 'c', 'o')
+        etag = md5()
+        with disk_file.mkstemp() as (fd, tmppath):
+            etag = etag.hexdigest()
+            metadata = {
+                'ETag': etag,
+                'X-Timestamp': str(normalize_timestamp(time.time())),
+                'Content-Length': 10,
+            }
+            disk_file.put(fd, tmppath, metadata)
+            etag = md5()
+            etag = etag.hexdigest()
+            metadata['ETag'] = etag
+            write_metadata(fd, metadata)
+        quarantine_path = os.path.join(self.devices,
+                                       'sda', 'quarantined', 'objects')
+        self.auditor.run_once()
+        self.assertTrue(os.path.isdir(quarantine_path))
+
 
 if __name__ == '__main__':
     unittest.main()