portante

diff --git a/swift/common/exceptions.py b/swift/common/exceptions.py
index 5943f89..e0361cf 100644
--- a/swift/common/exceptions.py
+++ b/swift/common/exceptions.py
@@ -54,6 +54,10 @@ class DiskFileDeleted(DiskFileNotExist):
     pass
 
 
+class DiskFileExpired(DiskFileNotExist):
+    pass

portante

======================================================================
FAIL: test_DELETE_if_delete_at_expired_still_deletes (test.unit.obj.test_server.TestObjectController)
----------------------------------------------------------------------
Traceback (most recent call last):
  File "/home/pportant/Documents/OpenStack/swift/upstream/test/unit/obj/test_server.py", line 2632, in test_DELETE_if_delete_at_expired_still_deletes
    self.assertEquals(resp.status_int, 404)
AssertionError: 200 != 404
-------------------- >> begin captured stdout << ---------------------
test: None - - [03/Dec/2013:19:49:51 +0000] "PUT /sda1/p/a/c/o" 201 - "-" "-" "-" 0.0022
test: None - - [03/Dec/2013:19:49:51 +0000] "GET /sda1/p/a/c/o" 200 4 "-" "-" "-" 0.0007

portante

diff --git a/swift/obj/diskfile.py b/swift/obj/diskfile.py
index 288d8a5..326faee 100644
--- a/swift/obj/diskfile.py
+++ b/swift/obj/diskfile.py
@@ -454,7 +454,8 @@ class DiskFileManager(object):
         dev_path = self.get_dev_path(device)
         if not dev_path:
             raise DiskFileDeviceUnavailable()
-        return DiskFile(self, dev_path, self.threadpools[device],
+        return DiskFile(self, join(dev_path, DATADIR),

portante

diff --git a/test/unit/proxy/test_server.py b/test/unit/proxy/test_server.py
index a25684b..c960892 100644
--- a/test/unit/proxy/test_server.py
+++ b/test/unit/proxy/test_server.py
@@ -4655,7 +4655,10 @@ class TestObjectController(unittest.TestCase):
         # Remember Request instance count, make sure the GC is run for pythons
         # without reference counting.
         for i in xrange(4):
+            sleep(0)  # let eventlet do it's thing
             gc.collect()

portante

diff --git a/test/unit/obj/test_diskfile.py b/test/unit/obj/test_diskfile.py
index 6f9ef7f..05ffd78 100644
--- a/test/unit/obj/test_diskfile.py
+++ b/test/unit/obj/test_diskfile.py
@@ -327,7 +327,7 @@ class TestDiskFileModuleMethods(unittest.TestCase):
             self.assertEquals(diskfile.hash_cleanup_listdir('/whatever'),
                               [file2])
 
-            # keep .meta and .data if meta newer than data
+            # keep .meta and .data if meta newer than data and purge .ts

portante

diff --git a/swift/proxy/controllers/base.py b/swift/proxy/controllers/base.py
index 066aece..6ea3637 100644
--- a/swift/proxy/controllers/base.py
+++ b/swift/proxy/controllers/base.py
@@ -29,7 +29,7 @@ import time
 import functools
 import inspect
 from sys import exc_info
-from swift import gettext_ as _
+from swift import gettext_ as _, gettext_

portante

======================================================================
ERROR: test_get_async_dir (test.unit.obj.test_diskfile.TestDiskFileModuleMethods)
----------------------------------------------------------------------
Traceback (most recent call last):
  File "/home/pportant/swift/test/unit/obj/test_diskfile.py", line 109, in test_get_async_dir
    self.assertEquals(diskfile.get_async_dir(1),
  File "/home/pportant/swift/swift/obj/diskfile.py", line 105, in get_async_dir
    raise ValueError("No policy with index %d" % policy_idx)
ValueError: No policy with index 1

portante

$ sosreport --list-plugins

sosreport (version 2.2)

The following plugins are currently enabled:

 acpid           acpid related information
 apache          Apache related information
 auditd          Auditd related information
 bootloader      Bootloader information

portante

======================================================================
ERROR: test_POST_bad_metadata (test.functional.test_container.TestContainer)
----------------------------------------------------------------------
Traceback (most recent call last):
  File "/home/pportant/swift/test/functional/test_container.py", line 44, in setUp
    self.assertEquals(resp.status, 201)
AssertionError: 202 != 201

======================================================================
ERROR: test_POST_metadata (test.functional.test_container.TestContainer)

portante

Jan 21 21:45:37 localhost proxy-server: ERROR with Account server 127.0.0.1:6012/sdb1 re: Trying to POST /AUTH_867bfdf44f2d4b6597e2309c280c2372: 
Traceback (most recent call last):
  File "/opt/stack/new/swift/swift/proxy/controllers/base.py", line 989, in _make_request
    headers=headers, query_string=query)
  File "/opt/stack/new/swift/swift/common/bufferedhttp.py", line 157, in http_connect
    ipaddr, port, method, path, headers, query_string, ssl)
  File "/opt/stack/new/swift/swift/common/bufferedhttp.py", line 189, in http_connect_raw
    conn.endheaders()
  File "/usr/lib/python2.7/httplib.py", line 954, in endheaders
    self._send_output(message_body)