Comment 2 for bug 1546865

Reviewed: https://review.openstack.org/281636
Committed: https://git.openstack.org/cgit/openstack/swift/commit/?id=ddeb0cde9fc828fa79dce90df4975f66737ba054
Submitter: Jenkins
Branch: master

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