Reviewed:  https://review.openstack.org/315554
Committed: https://git.openstack.org/cgit/openstack/swift/commit/?id=3d934360d66fe768c5c6dadf29b38136d863c550
Submitter: Jenkins
Branch:    feature/crypto

commit 46d61a4dcd9a5d9157625c06d6fe7d916e80c3d2
Author: Prashanth Pai <email address hidden>
Date:   Wed Feb 18 11:59:31 2015 +0530

    Refactor server side copy as middleware
    
    Rewrite server side copy and 'object post as copy' feature as middleware to
    simplify the PUT method in the object controller code. COPY is no longer
    a verb implemented as public method in Proxy application.
    
    The server side copy middleware is inserted to the left of dlo, slo and
    versioned_writes middlewares in the proxy server pipeline. As a result,
    dlo and slo copy_hooks are no longer required. SLO manifests are now
    validated when copied so when copying a manifest to another account the
    referenced segments must be readable in that account for the manifest
    copy to succeed (previously this validation was not made, meaning the
    manifest was copied but could be unusable if the segments were not
    readable).
    
    With this change, there should be no change in functionality or existing
    behavior. This is asserted with (almost) no changes required to existing
    functional tests.
    
    Some notes (for operators):
    * Middleware required to be auto-inserted before slo and dlo and
      versioned_writes
    * Turning off server side copy is not configurable.
    * object_post_as_copy is no longer a configurable option of proxy server
      but of this middleware. However, for smooth upgrade, config option set
      in proxy server app is also read.
    
    DocImpact: Introducing server side copy as middleware
    
    Co-Authored-By: Alistair Coles <email address hidden>
    Co-Authored-By: Thiago da Silva <email address hidden>
    
    Change-Id: Ic96a92e938589a2f6add35a40741fd062f1c29eb
    Signed-off-by: Prashanth Pai <email address hidden>
    Signed-off-by: Thiago da Silva <email address hidden>

commit cb8cda6588735411c542a1e4d78315ee047a357b
Author: Paul Dardeau <email address hidden>
Date:   Mon May 9 20:28:42 2016 +0000

    resurrect gholt blog posts on building consistent hashing ring
    
    These are blog posts authored by Greg Holt (gholt) and used with
    permission to add here. Content was only reformatted as rst and
    wrap prose lines at 70 characters.
    
    Change-Id: I7aa47c24b5019aa598ee005e01612a49514da25f

commit ba1a568f815a8a40bf75c0beb96b789bd07adcb6
Author: Alistair Coles <email address hidden>
Date:   Wed Mar 9 10:48:54 2016 +0000

    Rename hash_cleanup_listdir tests
    
    hash_cleanup_listdir was removed in [1], this patch
    renames all references to it in test_diskfile to refer to
    the cleanup_ondisk_files method that is now tested directly.
    
    Also remove the final references to the now non-existent
    function in a few comments.
    
    [1] I0b96dfde32b4c666eebda6e88228516dd693ef92
    
    Change-Id: I1e151799fc2774de9a1af092afff875af24a630c
    Related-Bug: #1550569

commit 6827affe62771949a041d958db17ba6cd29232ab
Author: John Dickinson <email address hidden>
Date:   Tue Apr 5 11:35:22 2016 -0700

    Rework the contributor docs
    
    This started as a new "new_contributor" doc. But we've already got
    at least 3 different docs like that.
    
    Change-Id: Ia2303ab55eeea01cc71acbccaeab55dad0ef5ff9

commit deaef2f9d62bb8ae7f4e8538e9fd9ddffbb8ebb2
Author: Samuel Merritt <email address hidden>
Date:   Wed May 4 16:48:28 2016 -0700

    Remove unneeded setting of SO_REUSEADDR.
    
    This has been in eventlet.listen() since version 0.15.
    
    Change-Id: Ib77b28231a2180f1ea082f356c4687c39681a6f7

commit b3dd6a5df1ac4a5265b330787abcd52c7e116208
Author: Christopher Bartz <email address hidden>
Date:   Tue May 3 14:33:05 2016 +0200

    Improves log message in swift.obj.replicator
    
    Before this commit, when a local device has not found been found
    in a object-replication run, the policy was not mentioned in the
    error log. But it is of interest to know the policy, for example for
    error searching, when no local device has been found.
    
    Change-Id: Icb9f9f1d4aec5c4a70dd8abdf5483d4816720418

commit 99305b93000f28530731c05b34c69e0c7ce0463f
Author: Samuel Merritt <email address hidden>
Date:   Mon May 2 17:29:32 2016 -0700

    Fix probe tests from commit cf48e75
    
    Commit cf48e75 changed the default account/container/object ports in a
    lot of places, including the probetests. However, it didn't change
    them in doc/saio/bin/remakerings, and since the probe tests must match
    the rings, they started failing.
    
    This commit just backs out the changes to the test/probe directory so
    that remakerings and the probe tests match again.
    
    Change-Id: I316a09e6ee1a911f37ce9df3d641644739f88eeb

commit cf48e75c259350daa667155e3ffd38b17946bf44
Author: Shashirekha Gundur <email address hidden>
Date:   Mon Feb 1 18:06:54 2016 +0000

    change default ports for servers
    
    Changing the recommended ports for Swift services
    from ports 6000-6002 to unused ports 6200-6202;
    so they do not conflict with X-Windows or other services.
    
    Updated SAIO docs.
    
    DocImpact
    Closes-Bug: #1521339
    Change-Id: Ie1c778b159792c8e259e2a54cb86051686ac9d18

commit 4c11833a9cbff499725365e535e217f3eae3c442
Author: Christian Schwede <email address hidden>
Date:   Thu Apr 28 11:53:51 2016 -0500

    Remove ThreadPool class
    
    With the removement of threads_per_disk there is no longer a need to use
    run_in_thread() at all; it was just calling the function itself when
    running with 0 threads.
    Similar to force_run_in_thread() - with 0 threads it was basically doing
    the same like in tpool_reraise(), therefore replacing the call and
    finally removing the complete ThreadPool class.
    
    Note that this might break external consumers that are inheriting
    BaseDiskFileManager; in this case you need to adopt this change in your
    codebase then.
    
    Change-Id: I39489dd660935bdbfbc26b92af86814369369fb5

commit 33fdd0a356d83f12f63b9a94ff423ca815c96066
Author: Bryan Keller <email address hidden>
Date:   Fri Apr 22 10:03:23 2016 -0700

    SwiftLogFormatter will log transaction IDs on INFO level
    
    Previously SwiftLogFormatter would make two checks. One to see if the
    transaction id was already in the message field and another check to
    make sure the log level wasn't set to info. If either of these was
    true, then it would not log the transaction ID in the transaction ID
    field.
    
    This commit removes the check for the info log. Now transaction IDs
    will be recorded in all cases that have them.
    
    Change-Id: Ic06538ab55a75d298169ae1745671573ee9c09e8
    Closes-Bug: #1504344

commit c6ac69c552f87d07cd98b6e3f54258913bdc90db
Author: ZhiQiang Fan <email address hidden>
Date:   Fri Apr 29 20:39:02 2016 +0800

    [Trivial] Remove unnecessary executable privilege
    
    swift/common/storage_policy.py is not required to be executable.
    
    Change-Id: I733d70a88be25b32d8caf590dee4c53d14757fef

commit 96c1838a15645639154f1048285d53a891809937
Author: Brian Cline <email address hidden>
Date:   Fri Apr 29 05:00:36 2016 -0500

    Update mailmap, resolve identity crisis
    
    Change-Id: Ia8e30a8c0f81068c259d5d08adad4f1a98460561

commit a67d91987dff4859924aeaa3ca8fe30190b4c210
Author: Brian Cline <email address hidden>
Date:   Fri Apr 29 04:01:39 2016 -0500

    Fix minor typos in review guidelines
    
    Change-Id: I3acb3daeacb784c4038bf54d4103fab66c52f41a

commit 9d6a055b31f267e2380d0470021cac44cdf36203
Author: Christian Schwede <email address hidden>
Date:   Thu Apr 28 12:06:24 2016 -0500

    Remove threads_per_disk setting
    
    This patch removes the threads_per_disk setting. It was already a deprecated
    setting and by default set to 0, which effectively meant to not use a per-disk
    thread pool at all. Users are encouraged to use servers_per_port instead.
    
    DocImpact
    
    Change-Id: Ie76be5c8a74d60a1330627caace19e06d1b9383c

commit a1ed76f1cbb3dcd5b4253920278b8bc4f32978a2
Author: ZhiQiang Fan <email address hidden>
Date:   Thu Apr 28 06:29:41 2016 +0800

    Fix doc build if git is absent
    
    When building packages if git is absent, then we should not set
    html_last_updated_fmt. It can still be set via the -D switch
    when building with sphinx-build.
    
    Change-Id: I5d0b6cc87f27a052d6d0265546c0d347f00c4bb8
    Closes-Bug: #1552251

commit 00dd89fe6936e4c2da667b496a9996638c26196b
Author: Clay Gerrard <email address hidden>
Date:   Thu Mar 3 06:08:12 2016 +0000

    adding review guidelines
    
    Change-Id: I61304856a4ecccbbf3aa06c30822494592a3b3d5

commit 29544a9e175b1ec9e0dbfd5288edc00a1402d5ca
Author: Samuel Merritt <email address hidden>
Date:   Wed Apr 27 16:59:00 2016 -0500

    Use smaller quorum size in proxy for even numbers of replicas
    
    Requiring 2/2 backends for PUT requests means that the cluster can't
    tolerate a single failure. Likewise, if you have 4 replicas in 2
    regions, requiring 3/4 on a POST request means you cannot POST with
    your inter-region link down or congested.
    
    This changes the (replication) quorum size in the proxy to be at least
    half the nodes instead of a majority of the nodes.
    
    Daemons that were looking for a majority remain unchanged. The
    container reconciler, replicator, and updater still require majorities
    so their functioning is unchanged.
    
    Odd numbers of replicas are unaffected by this commit.
    
    Change-Id: I3b07ff0222aba6293ad7d60afe1747acafbe6ce4

commit 5e420efc728b9f02a3f15eb312ebfa29e2e221ff
Author: Tim Burke <email address hidden>
Date:   Thu Jan 7 15:46:17 2016 -0800

    Fix versioned_writes functional test skipping
    
    Previously, if object versioning was enabled via the old-style
    allow_versions container-server setting rather than the new-style
    allow_versioned_writes proxy-server setting,
    TestCrossPolicyObjectVersioning would skip tests while
    TestObjectVersioning and TestObjectVersioningUTF8 would run them.
    
    Additionally, if versioned_writes was explicitly included in the
    proxy-server's pipeline and allow_versioned_writes was disabled,
    the functional tests would fail with a 412.
    
    Now, all three will use the same logic to check whether versioning is
    enabled. Specifically, they will all try to set an X-Versions-Location
    header and skip if it doesn't stick.
    
    Additionally, the TestCrossPolicyObjectVersioningEnv will now properly
    clean up after itself.
    
    Change-Id: I4c788a0e18587ff17d3c6e346fd22b881495f06d

commit 1a18079a15c2630e602c7c156a30e10e5f884d4b
Author: Denis V. Meltsaykin <email address hidden>
Date:   Thu Apr 7 23:07:13 2016 +0300

    Change pids' type to set
    
    Previously, the pids type was list(), which raised a ValueError in case if
    pid was not in pids during the pids.remove(pid) call. The fix changes
    the type of pids to set() and substitutes remove() with discard(), which
    doesn't raise an Exception if a value is not in the set.
    
    Change-Id: I8d41cb2a8ec14d29e5c7411ddfe48ae7a41deb45
    Closes-Bug: #1567638

commit 0da9da513101c172d8923469e40f9c15b3518e73
Author: Andy McCrae <email address hidden>
Date:   Thu Mar 3 11:14:39 2016 +0000

    Allow fallocate_reserve to be a percentage
    
    Add the ability to set the fallocate_reserve value as a percentage.
    This happens automatically when adding the '%' at the end of the value.
    Having the ability to set a % of free space rather than a byte value is
    useful especially when drive sizes are heterogenous.
    
    The default for fallocate_reserve has been adjusted to 1%, having the
    fallocate_reserve set seems sensible for all deploys and percentages are
    far safer to default than byte values (across drives of any size).
    
    Tests added for using fallocate_reserve as a percentage.
    
    Duplicate tests for fallocate_reserve have been removed.
    
    Docs updated to reflect the fallocate_reserve change.
    
    Change-Id: I4aea613a708205c917e81d6b2861396655e73238

commit 91f980314f305c536e6e7c8607b8b52693c865f5
Author: John Dickinson <email address hidden>
Date:   Wed Apr 13 11:57:45 2016 -0500

    fix fallocate_reserve traceback
    
    Previously, fallocate_reserve could result in a traceback. The
    OSError being raised didn't have the proper errno set. This patch
    sets the errno to ENOSPC.
    
    Change-Id: I017b0584972ca8832f3b160bbcdff335ae9a1aa6

commit e97c4f794db7292a91135adb3fc3e1d6cce4dc84
Author: Janie Richling <email address hidden>
Date:   Sat Jan 16 21:59:20 2016 -0600

    swift-[account|container]-info when disk is full
    
    Extended the use of the DatabaseBroker "stale_reads_ok" flag to the
    AccountBroker and ContainerBroker.  Now checks for an sqlite3 error
    from the _commit_puts call that processes the pending files.
    
    If this error is raised, then the stale_reads_ok flag will be checked
    to determine how to proceed as opposed to simply raising.
    
    The first time that print_info is attempted, the flag will be
    false, but swift-[account|container]-info will check for the
    raised exception.  If it was raised, then a warning is reported
    that the data may be stale, and another attempt will be
    made using the stale_reads_ok=True flag.
    
    Change-Id: I761526eef62327888c865d87a9caafa3e7eabab6
    Closes-Bug: 1531302

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

    Reclaim isolated .meta files
    
    It is possible for an object dir to contain only
    a .meta file*, and currently this file will never
    be deleted. This patch changes the diskfile on disk
    file processing to identify any isolated meta files
    and mark them as ready to be reclaimed, so that the
    cleanup will reclaim them if they are older than
    reclaim age.
    
    *An isolated .meta can occur as follows:
    
    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 be:
    
      A has t2.ts
      B has t2.ts, t4.meta
    
    Once t2 becomes older than (current time - reclaim age) we are
    left with:
    
      B has t4.meta
    
    Closes-Bug: #1534685
    Change-Id: I3a175fd948a331d08df1b28f9831d7529216c6f1