reconciliation between hammer and v0.94.1.2

reconciliation between hammer and v0.94.1.2

[Loic Dachary]

[-- Attachment #1: Type: text/plain, Size: 4865 bytes --]

Hi Ken,

The commits with a + are found in v0.94.1.2 and are not in hammer

$ git rev-parse ceph/hammer
eb69cf758eb25e7ac71e36c754b9b959edb67cee
$ git --no-pager cherry -v ceph/hammer tags/v0.94.1.2
- 46e85f72a26186963836ee9071b93417ebc41af2 Dencoder should never be built with tcmalloc
- e6911ec0730b2786fe7b4b1345cd847140b3c0eb rgw/Makefile.am: Populate DENCODER_SOURCES properly
- 32589dd39c54e494364967a99db8bd11983c1998 Rework mds/Makefile.am to support a dencoder client build
- 0420c8923696e624e41175e5354bcabdc2b362a8 Move ceph-dencoder build to client
- 85faf5fd5b557f826dad8914f5c1751ff1658375 rgw: remove meta file after deleting bucket The meta file is deleted only if the bucket meta data is not synced
- 235e5556ddfde5114a79e54f061ea4accd613fc5 init-radosgw: run RGW as root
- 9dc831ffa7d9d45a8e7d7e40e1f2ba0b1655d297 rgw: send ETag, Last-Modified in response for copying Swift cobject.
- c429d1ac348e9f981a92fd8f94bb9cefa52cae53 rgw: add support for X-Copied-From{-Account} headers of Swift API.
- 3805ee3a2db2994100fd3bc6b74e4da01a24fa09 rgw: refactor dumping metadata of Swift objects.
- ddbfbd25909225edd5839c9a71a7141998c81ece rgw: dump object metadata in response for COPY request of Swift API.
+ d54ab2a8ff754dfddb13ae0bd5c0806706f2a9a7 rgw: send X-Copied-From-Last-Modified header of Swift API.
- a52fe7a376b4dbfc65b635a3f0b92881caa17b93 civetweb: update max num of threads
- ee5858906d5d903db7b04be665dfa3ede3395134 rgw: update keystone cache with token info
- 10013a90b03ff317f7cae7944b2561a504c4718d rgw: generate new tag for object when setting object attrs
- d6f35ae36a3b97b28407aaa5f220c3917e47b2e7 ceph_json: add decode / encoder for multimap
- 62a99817559bcac6d1c48af27a0f0a0081ad248d cls_rgw: use multimap to keep pending operations in bucket index
- 52fc446528c12b305ed0df5aee03a35dd536a110 rgw: don't use rgw_socket_path if frontend is configured
- 3d005b7d868aa17f0707e4ad9bb1694f64d3867e rgw-admin: a tool to fix object locator issue
- ce4b31966a0af942a1360caddc52b361b726226a rgw: set a special object locator if object starts with underscore
- 92ee7e7519bef206d88417e04b6308b76785e773 OSD: handle the case where we resurrected an old, deleted pg
+ 7347e31a8712515792ea55acad8c47d373b6ebd6 common/admin_socket: close socket descriptor in destructor
- 01681d0b16cfadbce78fbf2a253630b3b5aaf1f0 rgw: restore buffer of multipart upload after EEXIST
- 9431633e5225c9cba210087aafd7c3f14490214c rgw: merge manifests correctly when there's prefix override
+ 0d9dd0f5749bb28e6403616b55f0c0ca1b9eaf0e init-radosgw: look in /var/lib/ceph/radosgw
+ 8527d885966c72d35ccb98387be8579c65fb4890 init-radosgw: unify init-radosgw[.sysv]
+ c8db30b9873625feef5b0b418b39f3994b997ed2 init-radosgw.sysv: remove
+ bf63aea024cb660dd4841dcf9b4da40e05db26b3 0.94.1.2

* rgw: send X-Copied-From-Last-Modified header of Swift API is https://github.com/ceph/ceph/commit/d54ab2a8ff754dfddb13ae0bd5c0806706f2a9a7 which is a backport for http://tracker.ceph.com/issues/10663. It has been backported differently in hammer : https://github.com/dachary/ceph/commit/b034511fa79996415640b4aca3e8747340f2a127 as part of https://github.com/ceph/ceph/pull/4568. 

* common/admin_socket: close socket descriptor in destructor is https://github.com/ceph/ceph/commit/7347e31a8712515792ea55acad8c47d373b6ebd6 which is a backport for http://tracker.ceph.com/issues/11535. It has been backported in the same way at https://github.com/ceph/ceph/pull/4657 as shown by 

$ git show 0b6d442  | git patch-id 
cdd3afe1bc8952cfbc9a096acd1d093a326c1959 0b6d4427ac7234fd509a9541adf45e303e40cb16
$ git show 7347e31a8712515792ea55acad8c47d373b6ebd6  | git patch-id 
cdd3afe1bc8952cfbc9a096acd1d093a326c1959 7347e31a8712515792ea55acad8c47d373b6ebd6

however you marked https://github.com/ceph/ceph/pull/4657 as DNM. Is it ready to merge now ?

* init-radosgw: etc. (https://github.com/ceph/ceph/commit/c8db30b9873625feef5b0b418b39f3994b997ed2 https://github.com/ceph/ceph/commit/8527d885966c72d35ccb98387be8579c65fb4890and https://github.com/ceph/ceph/commit/0d9dd0f5749bb28e6403616b55f0c0ca1b9eaf0e) which are backports for http://tracker.ceph.com/issues/11686. It is being backported at http://tracker.ceph.com/issues/11735 and unless you have a different opinion, I think the backport from v0.94.1.2 can be re-used as-is.

I find this branch and the v0.94.1.x tags are a good way to reconcile the backports, we should keep doing this :-) The only thing that is annoying is the divergence on "rgw: send X-Copied-From-Last-Modified header of Swift API". Although it could have been avoided, it's not a big deal and I guess it will happen again. I'm not sure what's the best way to remember "this divergence happened, we looked at it and it's not too much of a problem". Any idea ?

Cheers

-- 
Loïc Dachary, Artisan Logiciel Libre


[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 198 bytes --]