Move recon's locks to /var/run/swift and caches to /var/lib/swift/recon-cache.

Change some of the ways we gather information, since those are normally

Linux-specific.  Make the tests acknowledge these changes.

         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')

+    recon_cache_path = conf.get('recon_cache_path', '/var/lib/swift/recon-cache')

+    recon_lock_path = conf.get('recon_lock_path', '/var/run/swift')

     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')

 [filter:recon]

 use = egg:swift#recon

-# recon_cache_path = /var/cache/swift

+# recon_cache_path = /var/lib/swift/recon-cache

 [account-replicator]

 # You can override the default log routing for this app here (don't use set!):

 # run_pause = 30

 #

-# recon_cache_path = /var/cache/swift

+# recon_cache_path = /var/lib/swift/recon-cache

 [account-auditor]

 # You can override the default log routing for this app here (don't use set!):

 # log_facility = LOG_LOCAL0

 # log_level = INFO

 # accounts_per_second = 200

-# recon_cache_path = /var/cache/swift

+# recon_cache_path = /var/lib/swift/recon-cache

 [account-reaper]

 # You can override the default log routing for this app here (don't use set!):

 [filter:recon]

 use = egg:swift#recon

-#recon_cache_path = /var/cache/swift

+#recon_cache_path = /var/lib/swift/recon-cache

 [container-replicator]

 # You can override the default log routing for this app here (don't use set!):

 # run_pause = 30

 #

-# recon_cache_path = /var/cache/swift

+# recon_cache_path = /var/lib/swift/recon-cache

 [container-updater]

 # You can override the default log routing for this app here (don't use set!):

 # Seconds to suppress updating an account that has generated an error

 # account_suppression_time = 60

 #

-# recon_cache_path = /var/cache/swift

+# recon_cache_path = /var/lib/swift/recon-cache

 [container-auditor]

 # You can override the default log routing for this app here (don't use set!):

 # interval = 1800

 #

 # containers_per_second = 200

-# recon_cache_path = /var/cache/swift

+# recon_cache_path = /var/lib/swift/recon-cache

 [container-sync]

 # You can override the default log routing for this app here (don't use set!):

 [filter:recon]

 use = egg:swift#recon

-#recon_cache_path = /var/cache/swift

-#recon_lock_path = /var/lock

+#recon_cache_path = /var/lib/swift/recon-cache

+#recon_lock_path = /var/run/swift

 [object-replicator]

 # You can override the default log routing for this app here (don't use set!):

 # reclaim_age = 604800

 #

 # ring_check_interval = 15

-# recon_cache_path = /var/cache/swift

+# recon_cache_path = /var/lib/swift/recon-cache

 #

 # limits how long rsync error log lines are

 # 0 means to log the entire line

 # slowdown will sleep that amount between objects

 # slowdown = 0.01

 #

-# recon_cache_path = /var/cache/swift

+# recon_cache_path = /var/lib/swift/recon-cache

 [object-auditor]

 # You can override the default log routing for this app here (don't use set!):

 # bytes_per_second = 10000000

 # log_time = 3600

 # zero_byte_files_per_second = 50

-# recon_cache_path = /var/cache/swift

+# recon_cache_path = /var/lib/swift/recon-cache

 # Takes a comma separated list of ints. If set, the object auditor will

 # increment a counter for every object whose size is <= to the given break

         swift.common.db.DB_PREALLOCATION = \

             config_true_value(conf.get('db_preallocation', 'f'))

         self.recon_cache_path = conf.get('recon_cache_path',

-                                         '/var/cache/swift')

+                                         '/var/lib/swift/recon-cache')

         self.rcache = os.path.join(self.recon_cache_path, "account.recon")

     def _one_audit_pass(self, reported):

             config_true_value(conf.get('db_preallocation', 'f'))

         self._zero_stats()

         self.recon_cache_path = conf.get('recon_cache_path',

-                                         '/var/cache/swift')

+                                         '/var/lib/swift/recon-cache')

         self.recon_replicator = '%s.recon' % self.server_type

         self.rcache = os.path.join(self.recon_cache_path,

                                    self.recon_replicator)

@@ -15,6 +15,7 @@

 import errno

 import os

+import sys

 from swift import gettext_ as _

 from swift import __version__ as swiftver

         swift_dir = conf.get('swift_dir', '/etc/swift')

         self.logger = get_logger(conf, log_route='recon')

         self.recon_cache_path = conf.get('recon_cache_path',

-                                         '/var/cache/swift')

+                                         '/var/lib/swift/recon-cache')

         self.object_recon_cache = os.path.join(self.recon_cache_path,

                                                'object.recon')

         self.container_recon_cache = os.path.join(self.recon_cache_path,

     def get_mounted(self, openr=open):

         """get ALL mounted fs from /proc/mounts"""

         mounts = []

-        with openr('/proc/mounts', 'r') as procmounts:

+        if sys.platform == 'sunos5':

+            mountsfile = '/etc/mnttab'

+        else:

+            mountsfile = '/proc/mounts'

+        with openr(mountsfile, 'r') as procmounts:

             for line in procmounts:

                 mount = {}

-                mount['device'], mount['path'], opt1, opt2, opt3, \

-                    opt4 = line.rstrip().split()

+                mount['device'], mount['path'] = line.rstrip().split()[:2]

                 mounts.append(mount)

         return mounts

     def get_load(self, openr=open):

         """get info from /proc/loadavg"""

         loadavg = {}

-        with openr('/proc/loadavg', 'r') as f:

-            onemin, fivemin, ftmin, tasks, procs = f.read().rstrip().split()

+        if sys.platform == 'sunos5':

+            onemin, fivemin, ftmin = os.getloadavg()

+        else:

+            with openr('/proc/loadavg', 'r') as f:

+                onemin, fivemin, ftmin, tasks, procs = f.read().rstrip().split()

         loadavg['1m'] = float(onemin)

         loadavg['5m'] = float(fivemin)

         loadavg['15m'] = float(ftmin)

-        loadavg['tasks'] = tasks

-        loadavg['processes'] = int(procs)

+        if sys.platform == 'sunos5':

+            # The next two fields don't seem to be used.

+            # executing threads / total threads

+            loadavg['tasks'] = "0/0"

+            # pid of newest process

+            loadavg['processes'] = 0

+        else:

+            loadavg['tasks'] = tasks

+            loadavg['processes'] = int(procs)

         return loadavg

     def get_mem(self, openr=open):

         """get info from /proc/meminfo"""

+        if sys.platform == 'sunos5':

+            return {}

         meminfo = {}

         with openr('/proc/meminfo', 'r') as memlines:

             for i in memlines:

         swift.common.db.DB_PREALLOCATION = \

             config_true_value(conf.get('db_preallocation', 'f'))

         self.recon_cache_path = conf.get('recon_cache_path',

-                                         '/var/cache/swift')

+                                         '/var/lib/swift/recon-cache')

         self.rcache = os.path.join(self.recon_cache_path, "container.recon")

     def _one_audit_pass(self, reported):

@@ -60,7 +60,7 @@ class ContainerUpdater(Daemon):

         swift.common.db.DB_PREALLOCATION = \

             config_true_value(conf.get('db_preallocation', 'f'))

         self.recon_cache_path = conf.get('recon_cache_path',

-                                         '/var/cache/swift')

+                                         '/var/lib/swift/recon-cache')

         self.rcache = os.path.join(self.recon_cache_path, "container.recon")

         self.user_agent = 'container-updater %s' % os.getpid()

         self.recon_cache_path = conf.get('recon_cache_path',

-                                         '/var/cache/swift')

+                                         '/var/lib/swift/recon-cache')

         self.rcache = os.path.join(self.recon_cache_path, "object.recon")

         self.report_first_time = self.report_last_time = time()

         self.report_objects = 0

         self.recon_cache_path = conf.get('recon_cache_path',

-                                         '/var/cache/swift')

+                                         '/var/lib/swift/recon-cache')

         self.rcache = join(self.recon_cache_path, 'object.recon')

         self.concurrency = int(conf.get('concurrency', 1))

         if self.concurrency < 1:

         self.http_timeout = int(conf.get('http_timeout', 60))

         self.lockup_timeout = int(conf.get('lockup_timeout', 1800))

         self.recon_cache_path = conf.get('recon_cache_path',

-                                         '/var/cache/swift')

+                                         '/var/lib/swift/recon-cache')

         self.rcache = os.path.join(self.recon_cache_path, "object.recon")

@@ -52,7 +52,7 @@ class ObjectUpdater(Daemon):

         self.successes = 0

         self.failures = 0

         self.recon_cache_path = conf.get('recon_cache_path',

-                                         '/var/cache/swift')

+                                         '/var/lib/swift/recon-cache')

         self.rcache = os.path.join(self.recon_cache_path, 'object.recon')

 import os

+import sys

 import mock

+from nose import SkipTest

 from swift import __version__ as swiftver

             {'device': 'none', 'path': '/proc/fs/vmblock/mountPoint'}]

         oart = OpenAndReadTester(mounts_content)

         rv = self.app.get_mounted(openr=oart.open)

-        self.assertEquals(oart.open_calls, [(('/proc/mounts', 'r'), {})])

+        self.assertEquals(oart.open_calls, [(('/etc/mnttab', 'r'), {})])

         self.assertEquals(rv, mounted_resp)

     def test_get_load(self):

+        if sys.platform == 'sunos5':

+            raise SkipTest

         oart = OpenAndReadTester(['0.03 0.03 0.00 1/220 16306'])

         rv = self.app.get_load(openr=oart.open)

         self.assertEquals(oart.read_calls, [((), {})])

                                '1m': 0.029999999999999999})

     def test_get_mem(self):

+        if sys.platform == 'sunos5':

+            raise SkipTest

         meminfo_content = ['MemTotal:         505840 kB',

                            'MemFree:           26588 kB',

                            'Buffers:           44948 kB',

         self.assertEquals(self.fakecache.fakeout_calls,

                           [((['replication_time', 'replication_stats',

                               'replication_last'],

-                              '/var/cache/swift/account.recon'), {})])

+                              '/var/lib/swift/recon-cache/account.recon'), {})])

         self.assertEquals(rv, {

             "replication_stats": {

                 "attempted": 1, "diff": 0,

         self.assertEquals(self.fakecache.fakeout_calls,

                           [((['replication_time', 'replication_stats',

                               'replication_last'],

-                              '/var/cache/swift/container.recon'), {})])

+                              '/var/lib/swift/recon-cache/container.recon'), {})])

         self.assertEquals(rv, {

             "replication_time": 200.0,

             "replication_stats": {

         self.assertEquals(self.fakecache.fakeout_calls,

                           [((['object_replication_time',

                               'object_replication_last'],

-                              '/var/cache/swift/object.recon'), {})])

+                              '/var/lib/swift/recon-cache/object.recon'), {})])

         self.assertEquals(rv, {'object_replication_time': 200.0,

                                'object_replication_last': 1357962809.15})

         rv = self.app.get_updater_info('container')

         self.assertEquals(self.fakecache.fakeout_calls,

                           [((['container_updater_sweep'],

-                             '/var/cache/swift/container.recon'), {})])

+                             '/var/lib/swift/recon-cache/container.recon'), {})])

         self.assertEquals(rv, {"container_updater_sweep": 18.476239919662476})

     def test_get_updater_info_object(self):

         rv = self.app.get_updater_info('object')

         self.assertEquals(self.fakecache.fakeout_calls,

                           [((['object_updater_sweep'],

-                             '/var/cache/swift/object.recon'), {})])

+                             '/var/lib/swift/recon-cache/object.recon'), {})])

         self.assertEquals(rv, {"object_updater_sweep": 0.79848217964172363})

     def test_get_auditor_info_account(self):

                               'account_auditor_pass_completed',

                               'account_audits_since',

                               'account_audits_failed'],

-                              '/var/cache/swift/account.recon'), {})])

+                              '/var/lib/swift/recon-cache/account.recon'), {})])

         self.assertEquals(rv, {"account_auditor_pass_completed": 0.24,

                                "account_audits_failed": 0,

                                "account_audits_passed": 6,

                               'container_auditor_pass_completed',

                               'container_audits_since',

                               'container_audits_failed'],

-                              '/var/cache/swift/container.recon'), {})])

+                              '/var/lib/swift/recon-cache/container.recon'), {})])

         self.assertEquals(rv, {"container_auditor_pass_completed": 0.24,

                                "container_audits_failed": 0,

                                "container_audits_passed": 6,

         self.assertEquals(self.fakecache.fakeout_calls,

                           [((['object_auditor_stats_ALL',

                               'object_auditor_stats_ZBF'],

-                              '/var/cache/swift/object.recon'), {})])

+                              '/var/lib/swift/recon-cache/object.recon'), {})])

         self.assertEquals(rv, {

             "object_auditor_stats_ALL": {

                 "audit_time": 115.14418768882751,