Reviewed:  https://review.openstack.org/288628
Committed: https://git.openstack.org/cgit/openstack/swift/commit/?id=6731dd6da8b3723c8dd821b6b4ba40271b4ecb74
Submitter: Jenkins
Branch:    feature/crypto

commit fad5fabe0a22e8a86635a66523dd3d3d3b1fa705
Author: Tim Burke <email address hidden>
Date:   Thu Mar 3 15:07:08 2016 +0000

    During functional tests, 404 response to a DELETE is successful
    
    Previously, we would only consider 204 responses successful, which would
    cause some spurious gate failures, such as
    
    http://logs.openstack.org/66/287666/3/check/gate-swift-dsvm-functional/c6d2673/console.html#_2016-03-03_13_41_07_846
    
    Change-Id: Ic8c300647924352a297a2781b50064f7657038b4

commit e91de49d6864b3794f8dc5acd9c1bf0c2f7409d1
Author: Alistair Coles <email address hidden>
Date:   Mon Aug 10 10:30:10 2015 -0500

    Update container on fast-POST
    
    This patch makes a number of changes to enable content-type
    metadata to be updated when using the fast-POST mode of
    operation, as proposed in the associated spec [1].
    
    * the object server and diskfile are modified to allow
      content-type to be updated by a POST and the updated value
      to be stored in .meta files.
    
    * the object server accepts PUTs and DELETEs with older
      timestamps than existing .meta files. This is to be
      consistent with replication that will leave a later .meta
      file in place when replicating a .data file.
    
    * the diskfile interface is modified to provide accessor
      methods for the content-type and its timestamp.
    
    * the naming of .meta files is modified to encode two
      timestamps when the .meta file contains a content-type value
      that was set prior to the latest metadata update; this
      enables consistency to be achieved when rsync is used for
      replication.
    
    * ssync is modified to sync meta files when content-type
      differs between local and remote copies of objects.
    
    * the object server issues container updates when handling
      POST requests, notifying the container server of the current
      immutable metadata (etag, size, hash, swift_bytes),
      content-type with their respective timestamps, and the
      mutable metadata timestamp.
    
    * the container server maintains the most recently reported
      values for immutable metadata, content-type and mutable
      metadata, each with their respective timestamps, in a single
      db row.
    
    * new probe tests verify that replication achieves eventual
      consistency of containers and objects after discrete updates
      to content-type and mutable metadata, and that container-sync
      sync's objects after fast-post updates.
    
    [1] spec change-id: I60688efc3df692d3a39557114dca8c5490f7837e
    
    Change-Id: Ia597cd460bb5fd40aa92e886e3e18a7542603d01

commit 3c61ab4678a7aa9ff256ace4bc97ab449607fd49
Author: asettle <email address hidden>
Date:   Wed Feb 10 17:58:05 2016 +1000

    Operational procedures guide
    
    This is the operational procedures guide that HPE used
    to operate and monitor their public Swift systems.
    It has been made publicly available.
    
    Change-Id: Iefb484893056d28beb69265d99ba30c3c84add2b

commit 8e4347afd59aa30708ef03a78202652aaadda2e9
Author: Takashi Kajinami <email address hidden>
Date:   Tue Nov 17 16:15:59 2015 +0900

    Fix proxy-server's support for chunked transferring in GET object
    
    Proxy-server now requires Content-Length in the response header
    when getting object and does not support chunked transferring with
    "Transfer-Encoding: chunked"
    
    This doesn't matter in normal swift, but prohibits us from putting
    any middelwares to execute something like streaming processing of
    objects, which can't calculate the length of their response body
    before they start to send their response.
    
    Change-Id: I60fc6c86338d734e39b7e5f1e48a2647995045ef

commit 9dda1c9526c5b3e0ac905985921605d833bef3cc
Author: Takashi Kajinami <email address hidden>
Date:   Fri Dec 25 10:30:01 2015 +0900

    Update parameters about authtoken middleware in proxy-server.conf.sample
    
    This patch replaces some configration parameters about authtoken
    middleware in proxy-server.conf, which will be deprecated.
    
    The following parameters are to be deprecated.
     auth_admin_prefix, auth_host, auth_port, auth_protocol,
     identity_uri, admin_token, admin_user, admin_password,
     admin_tenant_name
    
    Change-Id: I373734933189c87c4094203b0752dd3762689034

commit 9c5b01e7c7699fbfd221e98ccde1afa9361c8119
Author: Hisashi Osanai <email address hidden>
Date:   Wed Dec 9 08:08:22 2015 +0000

    Add container quota functional test
    
    This patch provides one container quota functional test.
    
    Change-Id: I16354c15fc434d70f9bb6b9b1e18b09357195c83

commit efdc6ee8dbc434e9189a6b85b924c322c3ff6ae3
Author: Hisashi Osanai <email address hidden>
Date:   Thu Dec 10 01:15:30 2015 +0000

    Add X-Delete-After and X-Delete-At functional test
    
    This patch provides functional tests for X-Delete-After and X-Delete-At.
    
    Change-Id: I55b0d0584428413aa7a31f66defec55f9b1bbcd9

commit bd93d44bb46350f716f1dfb66fb43c2ab4ad8c50
Author: Takashi Kajinami <email address hidden>
Date:   Sun Feb 28 13:41:19 2016 +0900

    Make sure all temp files get deleted in test_ringbuilder
    
    This patch makes test_ringbuilder create a temporal directory,
    run ring builder commands under it, and delete it after testing
    for each test cases, to fix temp file leaking.
    
    Change-Id: I6f59fe095ea6485af0e60b5a8e8fc3892e0a0f90

commit 10b5765c60790f8a3ae2a94d6a51736ec2c99ce0
Author: benjkeller <email address hidden>
Date:   Thu Feb 25 18:54:00 2016 -0600

    Rename test_object_delete_at_aysnc
    
    This renames test_object_delete_at_aysnc to
    test_object_delete_at_async to match with the function
    async_update which it tests.
    
    Change-Id: I726afcbf08a3449c7af2834e573b97be378a86cd
    Closes-Bug: 1550067

commit 9e53bb47efa28983109da8ceca5d316925bc6804
Author: John Dickinson <email address hidden>
Date:   Wed Feb 24 09:36:40 2016 -0800

    updated some weird whitespace character to a normal one
    
    Change-Id: I187fb8fc8d10f950bbebc586999eced0bc117432

commit 076134784b4eb1c2e55b28218dc0d64a57795d63
Author: Clay Gerrard <email address hidden>
Date:   Tue Feb 23 17:28:08 2016 -0800

    Add warn method back to LogAdapter
    
    The change in 684c4c04 to improve py3 support breaks older middleware
    that consumes the SwiftLogger.
    
    Good for Swift code to not to use warn because it's deprecated.
    
    Bad for LogAdapter to not faithfully provide the current python logging
    module API (deprecated or otherwise).
    
    Change-Id: Ib0baf66b7f33f91562867076ff0526a287d8e5a6

commit eb7ca115e6501edd9225dce8784b8b3d3e094bb1
Author: Samuel Merritt <email address hidden>
Date:   Tue Feb 23 14:00:34 2016 -0800

    Fix StatsD tests to not use real DNS
    
    In common/test_utils.py, TestStatsdLogging had the majority of its
    test cases calling the real socket.getaddrinfo(), which uses real
    DNS. This is very slightly slower than using a mock getaddrinfo() when
    the machine running the tests has functioning DNS, but on a machine
    with no network connection at all, the tests are excruciatingly slow
    due to timeouts.
    
    This commit mocks things out as appropriate. There's still one user of
    the real getaddrinfo(), but it's for ::1, so that's just local
    resolution based on /etc/hosts.
    
    Timing numbers for "./.unittests test.unit.common.test_utils:TestStatsdLogging":
    
     * network, without this patch: 1.8s
     * no network, without this patch: 221.2s (ouch)
     * network, with this patch: 1.1s
     * no network, with this patch: 1.1s
    
    Change-Id: I1a2d6f24fc9bb928894fb1fd8383516250e29e0c

commit b97adf70ade2982fea5354c55f1eea9f98442fa7
Author: Thiago da Silva <email address hidden>
Date:   Tue Feb 23 16:23:51 2016 -0500

    fix formatting of bulk operations doc
    
    Change-Id: I247d2867c55d6bbf2288dfb74271f57c6f88b243

commit cfd50212358372694ba0713ff8c3bc313c6f1a92
Author: Clay Gerrard <email address hidden>
Date:   Thu Feb 18 21:06:40 2016 -0800

    dry out container unittests
    
    Change Ifcc4392ffa4df485ce3c62a35d0fcc8c93de74aa introduced
    TestContainerController4Replicas as a subclass of
    TestContainerController. And there is duplicated code
    block to override setUp method.
    
    This patch removed the duplicated code block.
    
    Change-Id: Iad0b64cba52554b89dbd959475a2ce7c0d9a20eb

commit 406e8996fb288e9851e02c3f3faa536a9919b28f
Author: Takashi Kajinami <email address hidden>
Date:   Mon Feb 22 16:10:09 2016 +0900

    Use 201 insted of 200 in PUT test case
    
    There are some unit test cases which assumes 200 as the response
    of PUT request, but 200 is never returned in PUT.
    This patch replaces 200 in PUT by 201, and adapt unit test cases
    to real case.
    
    Change-Id: I35fc7a4fe7fcc5558a9e6c6371105793c2710f3e

commit 5b18455cef57d052df3cda3e9179c923d3aadcad
Author: Hisashi Osanai <email address hidden>
Date:   Fri Jan 22 07:06:45 2016 +0000

    Add unit tests for checking responses in ContainerController
    
    This patch provides unit tests to check responses for various situation
    in three/four replicas env.
    
    Change-Id: Ifcc4392ffa4df485ce3c62a35d0fcc8c93de74aa

commit 002513d21786df0d6c71e9772ec4688e2c14d8de
Author: Tim Burke <email address hidden>
Date:   Thu Jan 7 11:56:33 2016 -0800

    Make write-only container access consistent
    
    Previously, if a user could write to (but not read from) a container,
    the behavior for object POST would vary depending on whether
    object_post_as_copy was enabled (403 response) or disabled (202
    response).
    
    Now, POSTs will consistently be allowed, regardless of whether fast-POST
    is enabled.
    
    Change-Id: I1d6dcbc4f5034a322a1073850fc3b059ebb1c0fa

commit 9a6c6b55713f896609b7127560ae99fabbf759e7
Author: Ondřej Nový <email address hidden>
Date:   Thu Feb 18 17:38:42 2016 +0100

    Fixed log format in object auditor
    
    Change-Id: I218e08446c5ffda2db7c774ec8bb9d28ce9f63e7

commit 2d55960a221c9934680053873bf1355c4690bb19
Author: Alistair Coles <email address hidden>
Date:   Thu Jan 14 18:31:21 2016 +0000

    Fix inconsistent suffix hashes after ssync of tombstone
    
    Consider two replicas of the same object whose ondisk files
    have diverged due to failures:
    
      A has t2.ts
      B has t1.data, t4.meta
    
    (The DELETE at t2 did not make it to B. The POST at t4 was
    rejected by A.)
    
    After ssync replication the two ondisk file sets will not be
    consistent:
    
      A has t2.ts  (ssync cannot POST t4.meta to this node)
      B has t2.ts, t4.meta (ssync should not delete t4.meta,
                            there may be a t3.data somewhere)
    
    Consequenty the two nodes will report different hashes for the
    object's suffix, and replication will repeat, always with the
    inconsistent outcome. This scenario is reproduced by the probe
    test added in this patch.
    
    (Note that rsync replication does result in (t2.ts, t4.meta)
    on both nodes.)
    
    The solution is to change the way that suffix hashes are
    calculated. Currently the names of *all* files found in each
    object dir are added to the hash.  With this patch the
    timestamps of only those files that could be used to
    construct a valid diskfile are added to the hash. File
    extensions are appended to the timestamp so that in most
    'normal' situations the result of the hashing is the same
    as before this patch. That avoids a storm of hash mismatches
    when this patch is deployed in an existing cluster.
    
    In the problem case described above, t4.meta is no longer
    added to the hash, since it is not useful for constructing
    a diskfile. (Note that t4.meta is not deleted because it
    may become useful should a t3.data be replicated in future).
    
    Closes-Bug: 1534276
    Change-Id: I99e88b8d5f5d9bc22b42112a99634ba942415e05

commit ddeb0cde9fc828fa79dce90df4975f66737ba054
Author: Kota Tsuyuzaki <email address hidden>
Date:   Wed Feb 17 21:17:34 2016 -0800

    Fix object-server to handle newer ts file
    
    Swift object-server will return 409 Conflict when the incomming
    request X-Timestamp is older than the local disk file to prevent
    wasted data transfer and disk space consumption. However, IFF,
    the local disk file is a tombstone, current object-server will
    write the data in the device and cleanup it according to timestamp
    comparison result in hash_cleanup_list_dir, and then return 201
    Created. That's wasted and far from the semantics in the normal case.
    
    This patch fixes object-server to catch the DiskFileDeleted exception
    at PUT request, and then, set the timestamp from tombstone as
    original_timestamp to be able to compare with request timestamp.
    
    Co-Authored-By: Kazuhiro Miyahara <email address hidden>
    Change-Id: I078c9cb90707a3c320708e76ea42cbfa73e1ea4b
    Closes-Bug: #1546865

commit 878688cae00576ec0bdb0a66eca7ada95e661c0a
Author: Béla Vancsics <email address hidden>
Date:   Mon Dec 7 17:02:40 2015 +0100

    Reduce code duplication
    
    Reduced source code by extracting duplicated code
    (swift/common/direct_client.py)
    http://openqa.sed.hu/dashboard/index/5?did=1
    
    Change-Id: I47fa6ae12c646e8e42fb0a46a017971f05d883fc
    Closes-Bug: 1536067

commit c3201f256cf415988a3cb1c42e9c6b7835195fa3
Author: Kazuhiro MIYAHARA <email address hidden>
Date:   Fri Jan 8 18:03:33 2016 +0900

    Remove execute permissions from doc files and swift.conf-sample
    
    Some doc files and swift.conf-sample were added execute permissions in past changes.
    This patch remove execute permissions from them.
    
    Change-Id: Id8844989a8321578e9207566ebd6660f5b9523f0

commit db87a5a9889d436f2e2aacdc8923d55ca0d3d1ca
Author: Clay Gerrard <email address hidden>
Date:   Tue Feb 16 10:52:01 2016 -0800

    Mock sleep in direct_client retry tests
    
    ... and fixup some assertions, and other mocks
    
    Change-Id: Iadf839d1d3d735109fed24049fc3d829776b7b65

commit 4a44e27e00795c5f12176ef346cd2249fca54fd8
Author: Chaozhe.Chen <email address hidden>
Date:   Tue Feb 16 23:44:27 2016 +0800

    Replace assertEqual(None, *) with assertIsNone in tests
    
    As swift no longer supports Python 2.6, replace assertEqual(None, *)
    with assertIsNone in tests to have more clear messages in case of
    failure.
    
    Change-Id: I94af3e8156ef40465d4f7a2cb79fb99fc7bbda56
    Closes-Bug: #1280522

commit 3b94bd45406f9d457d37caa10c856a19c4cec22a
Author: Mingyu Li <li.mingyu@99cloud.net>
Date:   Sun Feb 7 21:41:08 2016 +0800

    Keep the Usage of exit()/sys.exit() Consistent
    
    It's better to keep the usage of exit()/sys.exit() consistent
    in one file. Furthermore, sys.exit() is considered good to be
    used in production code, while exit is for interactive shell.
    
    Change-Id: Ia3092853a648922588e2bc11db37d6decdec1b48

commit f05da4c8fa37a285bb2ca9b45a355dbe57f7add4
Author: janonymous <email address hidden>
Date:   Sat Feb 6 16:59:57 2016 +0530

    Changing the base version to python2.7 for pep8 checks
    
    tox was taking python3 as it's base version which lead to
    tox pep8 check failing on local env:
    http://paste.openstack.org/show/486183/
    
    Change-Id: Ia822ec5b5e12a1fc30b676f1e6d95e287b9b3368

commit d78e861d850db96989f4fb77ad31e3170034f15d
Author: Richard Hawkins <email address hidden>
Date:   Wed Jan 13 13:15:07 2016 -0600

    Add option for label to static web listings
    
    By default listings are rendered with a label of:
    "Listing of /v1/account/container/path"
    
    This change adds a new custom metadata key/value pair
    "X-Container-Meta-Web-Listings-Label: <label>" that
    when set, will cause the following:
    "Listing of <label>/path" to be rendered instead.
    
    Change-Id: I47c5d21834f47e566b380920196926882ff83abf

commit f2fca9aafa17e45b668c6f76b256927681cc463a
Author: Alistair Coles <email address hidden>
Date:   Tue Feb 2 11:43:44 2016 +0000

    Fix time-shifting of objects PUT with container-sync
    
    When container-sync PUTs an object to a destination container
    it uses the timestamp from the container row rather than the
    actual timestamp of the object being copied. The actual timestamp
    of the object can be newer, so the sync'd object may end up with
    the right content but at the wrong, older, timestamp.
    
    This patch changes the timestamp sent with the sync'd object
    to be that of the actual source object being sent.
    
    Drive-by fix to make code more readable by removing a variable
    rename mid-function, fix a typo and remove a redundant function
    call.
    
    Change-Id: I800e6de4cdeea289864414980a96f5929281da04
    Closes-Bug: #1540884

commit 050e3b35dd88f7b31b6810d9ac88548ef371e3ce
Author: venkatamahesh <email address hidden>
Date:   Thu Feb 4 16:47:15 2016 +0530

    Use uppercase 'S' in word "OpenStack"
    
    Change-Id: I4692aa58b5173b1b662d5eee19fac770ae5aaed0

commit c871e423ef0bed6c774693af3d54750235d6ce1f
Author: Hisashi Osanai <email address hidden>
Date:   Fri Jan 22 05:19:06 2016 +0000

    Add unit tests for checking responses in AccountController
    
    This patch provides unit tests to check responses for various situation
    in three/four replicas env.
    
    Change-Id: I1af48728b28da9780a2a78f3110e1c7487047ff8

commit 2f8105e5fcf4ecee2202797ba1ab48fa8fb1a1f6
Author: Alistair Coles <email address hidden>
Date:   Wed Jan 20 18:14:16 2016 +0000

    Fix bug in mem_diskfile write_metadata method
    
    The mem_diskfile DiskFile.write_metadata method was
    apparently never called in any existing test, as if it
    were it would blow up as reported in the bug.
    
    This patch fixes the method and adds a test that
    exercises it. The test addition itself should be useful
    since it verifies the behaviour of Last-Modified after
    POSTs to an object.
    
    Drive-by fixes for bad docstring and undefined references
    in the _quarantine method.
    
    Change-Id: I17fd62e5f02be5b48bfd9ba7fa25315e30a0a4bf
    Closes-Bug: #1536037

commit 725a166ebd3fde2c34f2c9578ff6f9911cf206d7
Author: Timur Alperovich <email address hidden>
Date:   Fri Jan 8 18:42:33 2016 -0800

    Make _get_addr() method a function in utils.
    
    The patch moves the MemcacheConnPool._get_addr() method a function in
    swift.common.utils. The function is renamed to parse_socket_string()
    and the documentation is updated accordingly. The test for it has also
    been moved.
    
    Change-Id: Ida65b2fded28d0a059e668646f5b89714298f348

commit 0647aea9c5fc95f0860758cc54bc23f965da460d
Author: Timur Alperovich <email address hidden>
Date:   Fri Jan 8 14:54:56 2016 -0800

    Fail early if the memcache address is invalid.
    
    In cases when the memcache address is invalid, we should fail early.
    This patch addresses the cases when the IPv6 addresses are not
    enclosed in "[]". It does not, however, fix the case of an invalid
    hostname. These improvements could also be added to the _get_addr()
    method.
    
    Change-Id: I4743dcda45a1fc1640989325c4a2e1fea591fc69

commit 1292361176aec385137dd5873c5cc9714de1fa17
Author: Clay Gerrard <email address hidden>
Date:   Mon Jan 11 16:25:50 2016 -0800

    functest for x-timestamp validation
    
    Change-Id: I05af7d837af00cd1059a8912df05c131a52ffb90

commit 4691d0592ff3deeea2713195312bf1effd5a7a7b
Author: Hisashi Osanai <email address hidden>
Date:   Fri Dec 25 14:00:16 2015 +0900

    Add object replicator's succeeded and failed counts in log
    
    account-replicator and container-replicator outputted the
    following info in log.
    info account-replicator: 17 successes, 4 failures
    info container-replicator: 178 successes, 29 failures
    
    But there is no output info for object-replicator. This info
    is important to check replicator's status from log.
    
    So this patch adds object-replicator's succeeded and failed
    counts in log like account-replicator and container-replicator.
    
    Change-Id: I7fbaf161540bdb06c0a65a1032aae83764bd970c