diff --git a/doc/source/logs.rst b/doc/source/logs.rst
index 54fc308525..c93b13d7a0 100644
--- a/doc/source/logs.rst
+++ b/doc/source/logs.rst
@@ -138,6 +138,7 @@ VW                      :ref:`versioned_writes`
 SSC                     :ref:`copy`
 SYM                     :ref:`symlink`
 SH                      :ref:`sharding_doc`
+S3                      :ref:`s3api`
 ======================= =============================
 
 
diff --git a/swift/common/middleware/s3api/s3request.py b/swift/common/middleware/s3api/s3request.py
index c3e2c9463c..130f54085f 100644
--- a/swift/common/middleware/s3api/s3request.py
+++ b/swift/common/middleware/s3api/s3request.py
@@ -1218,7 +1218,7 @@ class S3Request(swob.Request):
 
     def _bucket_put_accepted_error(self, container, app):
         sw_req = self.to_swift_req('HEAD', container, None)
-        info = get_container_info(sw_req.environ, app)
+        info = get_container_info(sw_req.environ, app, swift_source='S3')
         sysmeta = info.get('sysmeta', {})
         try:
             acl = json.loads(sysmeta.get('s3api-acl',
@@ -1429,7 +1429,7 @@ class S3Request(swob.Request):
             # if we have already authenticated, yes we can use the account
             # name like as AUTH_xxx for performance efficiency
             sw_req = self.to_swift_req(app, self.container_name, None)
-            info = get_container_info(sw_req.environ, app)
+            info = get_container_info(sw_req.environ, app, swift_source='S3')
             if is_success(info['status']):
                 return info
             elif info['status'] == 404:
diff --git a/test/unit/common/middleware/s3api/test_multi_upload.py b/test/unit/common/middleware/s3api/test_multi_upload.py
index 67fd00838d..ef570ddb06 100644
--- a/test/unit/common/middleware/s3api/test_multi_upload.py
+++ b/test/unit/common/middleware/s3api/test_multi_upload.py
@@ -251,7 +251,7 @@ class TestS3ApiMultiUpload(S3ApiTestCase):
 
     @s3acl
     @patch('swift.common.middleware.s3api.s3request.get_container_info',
-           lambda x, y: {'status': 404})
+           lambda env, app, swift_source: {'status': 404})
     def test_bucket_multipart_uploads_GET_without_bucket(self):
         self.swift.register('HEAD', '/v1/AUTH_test/bucket',
                             swob.HTTPNotFound, {}, '')
@@ -784,7 +784,7 @@ class TestS3ApiMultiUpload(S3ApiTestCase):
                             body=XML)
         with patch(
                 'swift.common.middleware.s3api.s3request.get_container_info',
-                lambda x, y: {'status': 404}):
+                lambda env, app, swift_source: {'status': 404}):
             self.swift.register('HEAD', '/v1/AUTH_test/nobucket',
                                 swob.HTTPNotFound, {}, None)
             status, headers, body = self.call_s3api(req)
@@ -1304,7 +1304,7 @@ class TestS3ApiMultiUpload(S3ApiTestCase):
                                      'Date': self.get_date_header()})
         with patch(
                 'swift.common.middleware.s3api.s3request.get_container_info',
-                lambda x, y: {'status': 404}):
+                lambda env, app, swift_source: {'status': 404}):
             self.swift.register('HEAD', '/v1/AUTH_test/nobucket',
                                 swob.HTTPNotFound, {}, None)
             status, headers, body = self.call_s3api(req)
@@ -1320,8 +1320,8 @@ class TestS3ApiMultiUpload(S3ApiTestCase):
         self.assertEqual(status.split()[0], '204')
 
     @s3acl
-    @patch('swift.common.middleware.s3api.s3request.'
-           'get_container_info', lambda x, y: {'status': 204})
+    @patch('swift.common.middleware.s3api.s3request.get_container_info',
+           lambda env, app, swift_source: {'status': 204})
     def test_object_upload_part_error(self):
         # without upload id
         req = Request.blank('/bucket/object?partNumber=1',
@@ -1367,7 +1367,7 @@ class TestS3ApiMultiUpload(S3ApiTestCase):
                             body='part object')
         with patch(
                 'swift.common.middleware.s3api.s3request.get_container_info',
-                lambda x, y: {'status': 404}):
+                lambda env, app, swift_source: {'status': 404}):
             self.swift.register('HEAD', '/v1/AUTH_test/nobucket',
                                 swob.HTTPNotFound, {}, None)
             status, headers, body = self.call_s3api(req)
@@ -1399,7 +1399,7 @@ class TestS3ApiMultiUpload(S3ApiTestCase):
                                      'Date': self.get_date_header()})
         with patch(
                 'swift.common.middleware.s3api.s3request.get_container_info',
-                lambda x, y: {'status': 404}):
+                lambda env, app, swift_source: {'status': 404}):
             self.swift.register('HEAD', '/v1/AUTH_test/nobucket',
                                 swob.HTTPNotFound, {}, None)
             status, headers, body = self.call_s3api(req)