--- /dev/null
+commit ea6c958c38df1216bf95c927f143d8b13c4a9e70 (tag: refs/tags/v0.80.10)
+Author: Jenkins <jenkins@inktank.com>
+Date: Thu Jun 18 09:48:56 2015 -0700
+
+ 0.80.10
+
+commit 9b7f09e280b4610b9f85ac34ec014018f0e2e1d3
+Author: Sage Weil <sage@redhat.com>
+Date: Wed Jun 17 09:35:28 2015 -0700
+
+ qa/workunits/rados/test-upgarde-v9.0.1: fix exclude syntax
+
+ It's -, then a list of all exclusions separated by :. There are just 2.
+
+ Signed-off-by: Sage Weil <sage@redhat.com>
+ (cherry picked from commit 78d894a634d727a9367f809a1f57234e5e6935be)
+
+commit 4e28fbc52db7d808aeaede884f342beafb7fc581
+Author: Sage Weil <sage@redhat.com>
+Date: Tue Jun 16 21:05:29 2015 -0700
+
+ qa/workunits/rados/test-upgrade-v9.0.1: skip one more evict test
+
+ Signed-off-by: Sage Weil <sage@redhat.com>
+ (cherry picked from commit 3e8d60a80ce31860eac76a1f6489a35e1795a0c0)
+
+commit 34ba3719997fed6d0b8148f21e59b446bdf42962
+Author: Josh Durgin <jdurgin@redhat.com>
+Date: Mon Jun 15 15:12:43 2015 -0700
+
+ qa: add compatibility filtered rados api tests for upgrades
+
+ Post-9.0.1, the evict op returns success when an object doesn't exist
+ in the cache tier. Skip the tests that are incompatible across
+ versions.
+
+ Fixes: #11548
+ Signed-off-by: Josh Durgin <jdurgin@redhat.com>
+ (cherry picked from commit 348a3d3c9880e7d022e71a2faafe51c8f771406e)
+
+commit d1f478200342f422ee6e563bf7aad54ba38b3ed3
+Merge: d0f9c5f 7f1abd9
+Author: Sage Weil <sage@redhat.com>
+Date: Wed Jun 10 15:03:48 2015 -0700
+
+ Merge pull request #4924 from ceph/wip-11955-firefly
+
+ 11955: ceph.spec.in: package mkcephfs on EL6
+
+ Reviewed-by: Sage Weil <sage@redhat.com>
+
+commit 7f1abd9053088ded6613aeca4e7c9489c44910e4
+Author: Ken Dreyer <kdreyer@redhat.com>
+Date: Wed Jun 10 15:43:41 2015 -0600
+
+ ceph.spec.in: package mkcephfs on EL6
+
+ Commit efbca0465c2946e113771966df08cf7cf37b1196 added mkcephfs to the
+ RPM %files listing, but this /usr/sbin path is only correct for CentOS
+ 7. In CentOS 6, the utility is present at /sbin/mkcephfs instead. This
+ causes rpmbuild to fail to build the tip of the firefly branch on EL6.
+
+ Adjust the RPM %files list so we properly package mkcephfs on both EL7
+ and EL6.
+
+ http://tracker.ceph.com/issues/11955 Refs: #11955
+
+ Signed-off-by: Ken Dreyer <kdreyer@redhat.com>
+
+commit d0f9c5f47024f53b4eccea2e0fde9b7844746362
+Merge: efbca04 9930138
+Author: Orit Wasserman <owasserm@redhat.com>
+Date: Thu Jun 4 19:07:03 2015 +0200
+
+ Merge pull request #4851 from ceph/wip-10873-firefly
+
+ rgw: generate the "Date" HTTP header for civetweb.
+
+commit 99301384be96997203682679c0430ca0a53be5d3 (refs/remotes/gh/wip-10873-firefly)
+Author: Radoslaw Zarzynski <rzarzynski@mirantis.com>
+Date: Wed Feb 18 15:48:43 2015 +0100
+
+ rgw: generate the "Date" HTTP header for civetweb.
+
+ Fixes: #10873
+ Backport: hammer
+ Signed-off-by: Radoslaw Zarzynski <rzarzynski@mirantis.com>
+ (cherry picked from commit ea384f83b601f60e135c3d3f960fdb75a919dd84)
+
+commit efbca0465c2946e113771966df08cf7cf37b1196
+Author: Sage Weil <sage@redhat.com>
+Date: Wed Jun 3 13:03:50 2015 -0400
+
+ ceph.spec: add mkcephfs to ceph.rpm
+
+ Signed-off-by: Sage Weil <sage@redhat.com>
+
+commit e785f1a2bb4cd77b0aaaccd78060183157ad842e
+Author: Ken Dreyer <kdreyer@redhat.com>
+Date: Tue Dec 2 13:58:10 2014 -0700
+
+ packaging: package ceph-disk(8)
+
+ The ceph-disk man page was added in
+ a450cab2b8148cb8a9b043d629feccf89e5aabac, but this was not added to the
+ RPM or DEB packaging. Add it here.
+
+ Signed-off-by: Ken Dreyer <kdreyer@redhat.com>
+ (cherry picked from commit b743a951114b00bbb6e14fb88f1928b504bc0f8b)
+
+commit 819cf6ddb986b37c5d1229c4ea330010e88bb615
+Merge: e93711a 665a857
+Author: Yehuda Sadeh <yehuda@redhat.com>
+Date: Tue Jun 2 19:53:03 2015 +0300
+
+ Merge pull request #4780 from oritwas/wip-10295-firefly
+
+ rgw: civetweb should use unique request id
+
+ Reviewd-by: Yehuda Sadeh <yehuda@rehat.com>
+
+commit e93711a40d680230b03fe722a4da49a6f9a9b667
+Merge: 071c943 50e8579
+Author: Yehuda Sadeh <yehuda@redhat.com>
+Date: Tue Jun 2 19:02:07 2015 +0300
+
+ Merge pull request #4829 from oritwas/wip-negative_content_length-firefly
+
+ rgw: don't allow negative / invalid content length
+
+ Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
+
+commit 50e85797507a3ba13193f368cff461c08e44a9b3
+Author: Yehuda Sadeh <yehuda@redhat.com>
+Date: Fri Aug 1 16:15:36 2014 -0700
+
+ rgw: don't allow negative / invalid content length
+
+ Certain frontends (e.g., civetweb) don't filter such requests.
+
+ Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
+ (cherry picked from commit 0e74b7a1d56733358e2f1d3df4386125a94c2966)
+
+commit 071c94385ee71b86c5ed8363d56cf299da1aa7b3
+Merge: 68211f6 c632ef1
+Author: Sage Weil <sage@redhat.com>
+Date: Wed May 27 15:36:15 2015 -0700
+
+ Merge pull request #4766 from SUSE/wip-11673-firefly
+
+ Debian: ceph-test and rest-bench debug packages should require their respective binary packages
+
+ Reviewed-by: Sage Weil <sage@redhat.com>
+
+commit 665a85701177230365e43a351d7722cb2adbde93
+Author: Orit Wasserman <owasserm@redhat.com>
+Date: Thu Apr 23 17:36:47 2015 +0200
+
+ rgw: civetweb should use unique request id
+
+ max_req_id was moved to RGWRados and changed to atomic64_t.
+
+ The same request id resulted in gc giving the same idtag to all objects
+ resulting in a leakage of rados objects. It only kept the last deleted object in
+ it's queue, the previous objects were never freed.
+
+ Fixes: 10295
+ Backport: Hammer, Firefly
+
+ Signed-off-by: Orit Wasserman <owasserm@redhat.com>
+ (cherry picked from commit c262259)
+
+ Conflicts:
+ src/rgw/rgw_main.cc
+ src/rgw/rgw_rados.h
+
+commit c632ef13e05654d0e5ddc79fc7e9553cad8cbed0
+Author: Ken Dreyer <kdreyer@redhat.com>
+Date: Mon May 18 10:50:58 2015 -0600
+
+ debian: set rest-bench-dbg ceph-test-dbg dependencies
+
+ Debian's debug packages ought to depend on their respective binary
+ packages. This was the case for many of our ceph packages, but it was
+ not the case for ceph-test-dbg or rest-bench-dbg.
+
+ Add the dependencies on the relevant binary packages, pinned to
+ "= ${binary:Version}" per convention.
+
+ http://tracker.ceph.com/issues/11673 Fixes: #11673
+
+ Signed-off-by: Ken Dreyer <kdreyer@redhat.com>
+ (cherry picked from commit f898ec1e4e3472b0202280f09653a769fc62c8d3)
+
+commit 68211f695941ee128eb9a7fd0d80b615c0ded6cf
+Merge: 7d11b19 cd8f183
+Author: Loic Dachary <loic@dachary.org>
+Date: Mon May 18 14:25:59 2015 +0200
+
+ Merge pull request #4697 from ceph/wip-11622-firefly
+
+ Wip 11622 firefly
+
+ Reviewed-by: Loic Dachary <ldachary@redhat.com>
+
+commit cd8f1830eb5d7ff75b17d7f0915ee4b3b834b149 (refs/remotes/gh/wip-11622-firefly)
+Author: Yehuda Sadeh <yehuda@redhat.com>
+Date: Wed May 13 17:05:22 2015 -0700
+
+ rgw: merge manifests correctly when there's prefix override
+
+ Fixes: #11622
+ Backport: hammer, firefly
+
+ Prefix override happens in a manifest when a rados object does not
+ conform to the generic prefix set on the manifest. When merging
+ manifests (specifically being used in multipart objects upload), we need
+ to check if the rule that we try to merge has a prefix that is the same
+ as the previous rule. Beforehand we checked if both had the same
+ override_prefix setting, but that might not apply as both manifests
+ might have different prefixes.
+
+ Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
+ (cherry picked from commit 389ae6739ddc6239a4dd7c5f7f9bfc9b645b8577)
+
+commit eef3d2f1c400573db90936fd417769183950b6ee
+Author: Yehuda Sadeh <yehuda@redhat.com>
+Date: Tue May 12 16:40:10 2015 -0700
+
+ rgw: restore buffer of multipart upload after EEXIST
+
+ Fixes #11604
+ Backport: hammer, firefly
+
+ When we need to restart a write of part data, we need to revert to
+ buffer to before the write, otherwise we're going to skip some data.
+
+ Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
+ (cherry picked from commit 580ccaec12daae64c38a1616d0be907bdd70a888)
+
+commit 7d11b19003503a9db1572d01f7a170e35b29017d
+Merge: 114f2e9 9b33965
+Author: Yehuda Sadeh <yehuda@redhat.com>
+Date: Fri May 15 10:27:42 2015 -0700
+
+ Merge pull request #4414 from xinxinsh/wip-11125-firefly
+
+ rgw: keystone token cache does not work correctly
+
+commit 114f2e9bb5665760a5be9816785508f1c97662d5
+Merge: ac7d28a f33effc
+Author: Loic Dachary <loic@dachary.org>
+Date: Fri May 15 17:03:04 2015 +0200
+
+ Merge pull request #4415 from xinxinsh/wip-11244-firefly
+
+ cancel_pull: requeue waiters
+
+ Reviewed-by: Samuel Just <sjust@redhat.com>
+
+commit ac7d28a6977084da0b70a3f2d0a54c8fa55b16fa
+Merge: f273792 1f6b1bb
+Author: Loic Dachary <loic@dachary.org>
+Date: Fri May 15 17:02:27 2015 +0200
+
+ Merge pull request #4416 from xinxinsh/wip-10976-firefly
+
+ fix PG::all_unfound_are_queried_or_lost for non-existent osds
+
+ Reviewed-by: Samuel Just <sjust@redhat.com>
+
+commit f273792c675aca95694cd36794d8a854731bf308
+Merge: 8a6632b 019b28b
+Author: Loic Dachary <loic@dachary.org>
+Date: Fri May 15 17:02:05 2015 +0200
+
+ Merge pull request #4556 from xinxinsh/wip-11429-firefly
+
+ OSD::load_pgs: we need to handle the case where an upgrade from earlier versions which ignored non-existent pgs resurrects a pg with a prehistoric osdmap
+
+ Reviewed-by: Samuel Just <sjust@redhat.com>
+
+commit 8a6632b4e5ffad305f92c89656b161a521529e45
+Merge: 156c385 a71f309
+Author: Sage Weil <sage@redhat.com>
+Date: Thu May 14 09:50:28 2015 -0700
+
+ Merge pull request #4638 from SUSE/wip-11453-firefly
+
+ run RGW as root
+
+ Reviewed-by: Ken Dreyer <kdreyer@redhat.com>
+ Reviewed-by: Sage Weil <sage@redhat.com>
+
+commit 019b28b6397dbc3111faa6a8eb57349a48f408d8
+Author: Samuel Just <sjust@redhat.com>
+Date: Mon Apr 20 23:45:57 2015 -0700
+
+ OSD: handle the case where we resurrected an old, deleted pg
+
+ Prior to giant, we would skip pgs in load_pgs which were not present in
+ the current osdmap. Those pgs would eventually refer to very old
+ osdmaps, which we no longer have causing the assertion failure in 11429
+ once the osd is finally upgraded to a version which does not skip the
+ pgs. Instead, if we do not have the map for the pg epoch, complain to
+ the osd log and skip the pg.
+
+ Fixes: 11429
+ Signed-off-by: Samuel Just <sjust@redhat.com>
+ (cherry picked from commit fbfd50de5b9b40d71d2e768418a8eca28b1afaca)
+
+ Conflicts:
+ src/osd/OSD.cc
+ resolved by add a new comment line
+
+commit 156c385ef726e56d219c3383a4015c50aec2758a
+Merge: fcd0ea3 8cc4bc1
+Author: Loic Dachary <loic@dachary.org>
+Date: Tue May 12 13:57:36 2015 +0200
+
+ Merge pull request #4379 from ceph/wip-11416
+
+ rgw: use correct objv_tracker for bucket instance
+
+ Reviewed-by: Josh Durgin <jdurgin@redhat.com>
+ Reviewed-by: Loic Dachary <ldachary@redhat.com>
+
+commit a71f3091a4ea810c02517642fb4ab9ce5516b452
+Author: Ken Dreyer <kdreyer@redhat.com>
+Date: Wed Apr 22 16:36:42 2015 -0600
+
+ init-radosgw: run RGW as root
+
+ The ceph-radosgw service fails to start if the httpd package is not
+ installed. This is because the init.d file attempts to start the RGW
+ process with the "apache" UID. If a user is running civetweb, there is
+ no reason for the httpd or apache2 package to be present on the system.
+
+ Switch the init scripts to use "root" as is done on Ubuntu.
+
+ http://tracker.ceph.com/issues/11453 Refs: #11453
+
+ Reported-by: Vickey Singh <vickey.singh22693@gmail.com>
+ Signed-off-by: Ken Dreyer <kdreyer@redhat.com>
+ (cherry picked from commit 47339c5ac352d305e68a58f3d744c3ce0fd3a2ac)
+
+commit fcd0ea3383582e7a1dc8091e7a48e1d4bbaa76ee
+Author: Greg Farnum <gfarnum@redhat.com>
+Date: Fri May 8 11:29:44 2015 -0700
+
+ workunits: remove defunct cephfs set_layout test
+
+ Signed-off-by: Greg Farnum <gfarnum@redhat.com>
+
+commit df053b86a89edf8f390400dad8c5e654e14df327
+Merge: aef0272 62645d3
+Author: Yehuda Sadeh <yehuda@redhat.com>
+Date: Wed May 6 13:07:11 2015 -0700
+
+ Merge pull request #4571 from ceph/wip-11256-firefly
+
+ Wip 11256 firefly
+
+ Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
+
+commit aef0272d72afaef849b5d4acbf55626033369ee8
+Author: Noah Watkins <noahwatkins@gmail.com>
+Date: Fri Mar 27 19:34:12 2015 -0700
+
+ java: libcephfs_jni.so is in /usr/lib64 on rhel
+
+ Signed-off-by: Noah Watkins <noahwatkins@gmail.com>
+ (cherry picked from commit aed3434dc7c5161c72c7d5655faa3bc693fc9777)
+
+commit a551a23d36e3f30ff5b0679a98ee760166ae47ae
+Author: Yan, Zheng <zyan@redhat.com>
+Date: Mon Mar 2 21:04:25 2015 +0800
+
+ qa/workunits/fs/misc: fix filelock_interrupt.py
+
+ Handle the case that kernel does not support fcntl.F_OFD_SETLK.
+ Also fix the code that checks if fnctl fails with errno == EINTR.
+
+ Signed-off-by: Yan, Zheng <zyan@redhat.com>
+ (cherry picked from commit 4ececa3dc4a21b98f61a592da9e2be60a0d71625)
+ Reviewed-by: Greg Farnum <gfarnum@redhat.com>
+
+commit 07031b151b4ac6677b1f663ac200d09088deff64
+Merge: 83f8d43 3fb97e2
+Author: Loic Dachary <loic@dachary.org>
+Date: Thu Apr 30 00:32:21 2015 +0200
+
+ Merge pull request #4385 from xinxinsh/wip-11199-firefly
+
+ osd: ENOENT on clone
+
+ Reviewed-by: Samuel Just <sjust@redhat.com>
+
+commit 83f8d434a5c245711922ea43a962160177aa5a40
+Merge: f1425e0 29bc9e5
+Author: Loic Dachary <loic@dachary.org>
+Date: Thu Apr 30 00:31:48 2015 +0200
+
+ Merge pull request #4384 from xinxinsh/wip-11197-firefly
+
+ pg stuck stale after create with activation delay
+
+ Reviewed-by: Samuel Just <sjust@redhat.com>
+
+commit f1425e093e00343a5ae4b9ff56911bf654a5c152
+Merge: e980e00 69d9339
+Author: Loic Dachary <loic@dachary.org>
+Date: Thu Apr 30 00:31:32 2015 +0200
+
+ Merge pull request #4382 from xinxinsh/wip-10718-firefly
+
+ osd/PGLog.h: 279: FAILED assert(log.log.size() == log_keys_debug.size())
+
+ Reviewed-by: Samuel Just <sjust@redhat.com>
+
+commit e980e0036909afc392f9bdf5532ce500af602c2f
+Merge: b36229b 110c354
+Author: Loic Dachary <loic@dachary.org>
+Date: Thu Apr 30 00:23:04 2015 +0200
+
+ Merge pull request #4185 from ldachary/wip-11156-firefly
+
+ FAILED assert(soid < scrubber.start || soid >= scrubber.end)
+
+ Reviewed-by: Samuel Just <sjust@redhat.com>
+
+commit b36229b5aeec669cd1494f47120ae207a393846f
+Merge: da75978 20c2175
+Author: Sage Weil <sage@redhat.com>
+Date: Tue Apr 28 08:11:18 2015 -0700
+
+ Merge pull request #4475 from ceph/wip-9538.firefly
+
+ mon: OSDMonitor: fallback to json-pretty in case of invalid formatter
+
+ Reviewed-by: Loic Dachary <ldachary@redhat.com>
+
+commit 20c2175352c9d4e4d0e709d294fe6fe0695761cc
+Author: Loic Dachary <loic-201408@dachary.org>
+Date: Fri Sep 19 15:28:36 2014 +0200
+
+ mon: osd find / metadata --format plain fallback
+
+ ceph --format plain osd find 1 (and metadata) are not implemented and
+ must fallback to the default (json-pretty).
+
+ http://tracker.ceph.com/issues/9538 Fixes: #9538
+
+ Signed-off-by: Loic Dachary <loic-201408@dachary.org>
+ (cherry picked from commit 13780d755115387591888f94ea6c58ac0db3ecc4)
+
+commit da759784ebda11275106c3b280f1d32b64ade00a
+Merge: 1a10a7e e1d5773
+Author: David Zafman <dzafman@redhat.com>
+Date: Mon Apr 27 10:30:49 2015 -0700
+
+ Merge pull request #4453 from ceph/wip-11454
+
+ PG::actingset should be used when checking the number of acting OSDs for...
+
+ Reviewed-by: Sage Weil <sage@redhat.com>
+
+commit 1a10a7eac190249a41b5200f0cc5e3863e76c31d
+Merge: a860e2b b9da6f1
+Author: Loic Dachary <loic@dachary.org>
+Date: Mon Apr 27 10:14:00 2015 +0200
+
+ Merge pull request #4245 from ceph/wip-11113-firefly
+
+ librbd: snap_remove should ignore -ENOENT errors
+
+ Reviewed-by: Shu, Xinxin <xinxin.shu@intel.com>
+ Reviewed-by: Loic Dachary <ldachary@redhat.com>
+
+commit a860e2b3c02ef4f1402b54b08a6bacd4b02cc07f
+Merge: dd15e54 364563a
+Author: Loic Dachary <loic@dachary.org>
+Date: Mon Apr 27 10:12:40 2015 +0200
+
+ Merge pull request #4206 from ceph/wip-5488-firefly
+
+ librbd: acquire cache_lock before refreshing parent
+
+ Reviewed-by: Josh Durgin <jdurgin@redhat.com>
+
+commit dd15e54b2fae134126e9795a8a973e391c628eb7
+Merge: 51ff2b6 5404fbf
+Author: Loic Dachary <loic@dachary.org>
+Date: Mon Apr 27 10:09:23 2015 +0200
+
+ Merge pull request #3963 from dachary/wip-10153-firefly
+
+ Rados.shutdown() dies with Illegal instruction (core dumped)
+
+ Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
+
+commit 51ff2b60dc576fb444bcfea8f6cd3e12043ed5b8
+Merge: 12143ff c0cfd6e
+Author: Loic Dachary <loic@dachary.org>
+Date: Mon Apr 27 10:08:15 2015 +0200
+
+ Merge pull request #4383 from xinxinsh/wip-11144-firefly
+
+ erasure-code-profile set races with erasure-code-profile rm
+
+ Reviewed-by: Loic Dachary <ldachary@redhat.com>
+
+commit 1f6b1bb51d0b40899155313165ac5e3a21dde11a
+Author: Mykola Golub <mgolub@mirantis.com>
+Date: Tue Mar 3 08:45:58 2015 +0200
+
+ osd: fix PG::all_unfound_are_queried_or_lost for non-existent osds
+
+ A common mistake upon osd loss is to remove the osd from the crush map
+ before marking the osd lost. This tends to make it so that the user
+ can no longer mark the osd lost to satisfy all_unfound_are_queried_or_lost.
+
+ The simple solution is for all_unfound_are_queried_or_lost to ignore
+ the osd if it does not exist.
+
+ Fixes: #10976
+ Backports: firefly,giant
+
+ Signed-off-by: Mykola Golub <mgolub@mirantis.com>
+ (cherry picked from commit 5bb51320138ff714806d24312149f6275d546608)
+
+commit e1d57730ddfc92b17562080b10bc22fceb86539a
+Author: Guang Yang <yguang@yahoo-inc.com>
+Date: Mon Sep 29 08:21:10 2014 +0000
+
+ PG::actingset should be used when checking the number of acting OSDs for a given PG.
+ Signed-off-by: Guang Yang <yguang@yahoo-inc.com>
+
+ (cherry picked from commit 19be358322be48fafa17b28054619a8b5e7d403b)
+
+ Conflicts:
+ src/osd/PG.cc PG::get_backfill_priority() doesn't exist in firefly
+ Variation in code related to no "undersized" state in firefly
+
+ Fixes: #11454
+
+commit f33effccc0592fddfcd9c5c2f5c3385462aa9b84
+Author: Samuel Just <sjust@redhat.com>
+Date: Thu Mar 26 10:26:48 2015 -0700
+
+ ReplicatedPG::cancel_pull: requeue waiters as well
+
+ If we are in recovery_wait, we might not recover that object as part of
+ recover_primary for some time. Worse, if we are waiting on a backfill
+ which is blocked waiting on a copy_from on the missing object in
+ question, it can become a dead lock.
+
+ Fixes: 11244
+ Backport: firefly
+ Signed-off-by: Samuel Just <sjust@redhat.com>
+ (cherry picked from commit 0b2e272430dd7433e6763be99b8a4cb127d9be19)
+
+commit 9b3396516c00ef931bab2d4aa6288ad974ec579d
+Author: Yehuda Sadeh <yehuda@redhat.com>
+Date: Tue Mar 3 11:03:35 2015 -0800
+
+ rgw: update keystone cache with token info
+
+ Fixes: #11125
+ Backport: hammer, firefly
+
+ Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
+ (cherry picked from commit 6616294aa140ceb83cc61c6ab6f9947636f5e67d)
+
+commit 8cc4bc162c8c1c240e62840d968b967f5f47b682 (refs/remotes/gh/wip-11416)
+Author: Yehuda Sadeh <yehuda@redhat.com>
+Date: Wed Dec 17 17:12:43 2014 -0800
+
+ rgw: use correct objv_tracker for bucket instance
+
+ When trying to create a bucket that already existed, use the
+ objv_tracker of the newly created instance, and not of the original
+ bucket.
+
+ Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
+ (cherry picked from commit fe158ecc25feefcea8aea4133118e4a84900a8ec)
+
+commit c0cfd6e56ca9d17241da159295bcee7cf44c9ba3
+Author: Loic Dachary <ldachary@redhat.com>
+Date: Wed Mar 18 14:17:00 2015 +0100
+
+ osd: erasure-code-profile incremental rm before set
+
+ It is possible for an incremental change to have both a rm and a set for
+ a given erasure code profile. It only happens when a rm is followed by a
+ set. When a set is followed by a rm, the rm will remove the pending set
+ in the incremental change.
+
+ The logic is the same for pool create and pool delete.
+
+ We must apply the incremental erasure-code-profile removal before the
+ creation otherwise rm and set in the same proposal will ignore the set.
+
+ This fix is minimal. A better change would be that erasure-code-profile
+ set checks if there is a pending removal and wait_for_finished_proposal
+ before creating.
+
+ http://tracker.ceph.com/issues/11144 Fixes: #11144
+
+ Signed-off-by: Loic Dachary <ldachary@redhat.com>
+ (cherry picked from commit 0d52aca0d0c302983d03b0f5213ffed187e4ed63)
+
+ Conflicts:
+ src/osd/OSDMap.cc
+ resolved by replacing i++ with ++i
+
+commit 3fb97e25b194e92112077385b10381801e02ddb9
+Author: Samuel Just <sjust@redhat.com>
+Date: Tue Mar 24 15:14:34 2015 -0700
+
+ ReplicatedPG: trim backfill intervals based on peer's last_backfill_started
+
+ Otherwise, we fail to trim the peer's last_backfill_started and get bug 11199.
+
+ 1) osd 4 backfills up to 31bccdb2/mira01213209-286/head (henceforth: foo)
+
+ 2) Interval change happens
+
+ 3) osd 0 now finds itself backfilling to 4 (lb=foo) and osd.5
+ (lb=b6670ba2/mira01213209-160/snapdir//1, henceforth: bar)
+
+ 4) recover_backfill causes both 4 and 5 to scan forward, so 4 has an interval
+ starting at foo, 5 has an interval starting at bar.
+
+ 5) Once those have come back, recover_backfill attempts to trim off the
+ last_backfill_started, but 4's interval starts after that, so foo remains in
+ osd 4's interval (this is the bug)
+
+ 7) We serve a copyfrom on foo (sent to 4 as well).
+
+ 8) We eventually get to foo in the backfilling. Normally, they would have the
+ same version, but of course we don't update osd.4's interval from the log since
+ it should not have received writes in that interval. Thus, we end up trying to
+ recover foo on osd.4 anyway.
+
+ 9) But, an interval change happens between removing foo from osd.4 and
+ completing the recovery, leaving osd.4 without foo, but with lb >= foo
+
+ Fixes: #11199
+ Backport: firefly
+ Signed-off-by: Samuel Just <sjust@redhat.com>
+ (cherry picked from commit 1388d6bd949a18e8ac0aecb0eb79ffb93d316879)
+
+commit 29bc9e56a978d4e18a507e71858baa21037964c4
+Author: Samuel Just <sjust@redhat.com>
+Date: Tue Mar 24 10:48:02 2015 -0700
+
+ PG: set/clear CREATING in Primary state entry/exit
+
+ Previously, we did not actually set it when we got a pg creation message from
+ the mon. It would actually get set on the first start_peering_interval after
+ that point. If we don't get that far, but do send a stat update to the mon, we
+ can end up with 11197. Instead, let's just set it and clear it upon entry into
+ and exit from the Primary state.
+
+ Fixes: 11197
+ Signed-off-by: Samuel Just <sjust@redhat.com>
+ (cherry picked from commit ddf0292250dfb1040d3cad96fa2cf886fd65933c)
+
+commit 12143ff9b25fdd96f8d1a9cecb1329c7f354d414
+Merge: 53eff01 bf1d8e8
+Author: Yehuda Sadeh <yehuda@redhat.com>
+Date: Mon Apr 6 10:24:06 2015 -0700
+
+ Merge pull request #4275 from jeanchlopez/wip-11160-firefly
+
+ rgw: shouldn't need to disable rgw_socket_path if frontend is configured
+
+commit bf1d8e888439df75feadde76bafe7d07d0e8481a
+Author: Yehuda Sadeh <yehuda@redhat.com>
+Date: Wed Mar 18 20:49:13 2015 -0700
+
+ rgw: don't use rgw_socket_path if frontend is configured
+
+ Fixes: #11160
+ Backport: hammer, firefly
+
+ Previously if we wanted to use the tcp fcgi socket, we needed to clear
+ rgw_socket_path.
+
+ Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
+
+commit 53eff01f1e7ecd3783bb05c47588a134d4fededc
+Merge: 899738e 80afc5e
+Author: Josh Durgin <jdurgin@redhat.com>
+Date: Wed Apr 1 16:30:23 2015 -0700
+
+ Merge pull request #4247 from ceph/wip-11303
+
+ Fix do_autogen.sh so that -L is allowed
+
+ Reviewed-by: Josh Durgin <jdurgin@redhat.com>
+
+commit 80afc5eca293e5e2f168f219931a2f554040cdd8
+Author: Alfredo Deza <adeza@redhat.com>
+Date: Wed Apr 1 19:10:33 2015 -0400
+
+ Fix do_autogen.sh so that -L is allowed
+
+ Signed-off-by: Alfredo Deza <adeza@redhat.com>
+
+commit b9da6f1025683d240baa73a9fcccbf2780035231
+Author: Jason Dillaman <dillaman@redhat.com>
+Date: Mon Mar 16 18:40:49 2015 -0400
+
+ librbd: snap_remove should ignore -ENOENT errors
+
+ If the attempt to deregister the snapshot from the parent
+ image fails with -ENOENT, ignore the error as it is safe
+ to assume that the child is not associated with the parent.
+
+ Fixes: #11113
+ Signed-off-by: Jason Dillaman <dillaman@redhat.com>
+ (cherry picked from commit cf8094942ccdba831e03e5a79451cfa5d78a135f)
+
+commit b250b3cfae69f4e8354027fae26fd85a792da0df
+Author: Jason Dillaman <dillaman@redhat.com>
+Date: Mon Mar 16 18:35:07 2015 -0400
+
+ librbd: get_parent_info should protect against invalid parent
+
+ get_parent_info should return -ENOENT if the image does not
+ have an associated parent image.
+
+ Signed-off-by: Jason Dillaman <dillaman@redhat.com>
+ (cherry picked from commit 21afd0ef8e1fb81c5ace5fd403513c542e2413e3)
+
+commit 69d9339fb352342a87e1148e9b5161246b27776a
+Author: Samuel Just <sjust@redhat.com>
+Date: Mon Feb 2 09:07:27 2015 -0800
+
+ PGLog: improve PGLog::check() debugging
+
+ Related: 10718
+ Signed-off-by: Samuel Just <sjust@redhat.com>
+ (cherry picked from commit c656bcec2441c90b084ca50a17c37625d69942a1)
+
+commit 73cbb6f34a5a556dbbd4db2e6f81391d83447efd
+Author: Samuel Just <sjust@redhat.com>
+Date: Tue Mar 17 10:07:03 2015 -0700
+
+ PGLog::merge_log: in tail extend case, log.log might be empty
+
+ Even if the tail != last_update, the log might be empty due to split
+ moving all entries into other logs.
+
+ Fixes: 10718
+ Signed-off-by: Samuel Just <sjust@redhat.com>
+ (cherry picked from commit f5a2aef3db29b99634250fd388a0c2d9b9a23d38)
+
+commit 62645d30b0ceee075a56bc692fd65cee85b09aa5 (refs/remotes/gh/wip-11256-firefly)
+Author: Yehuda Sadeh <yehuda@redhat.com>
+Date: Mon Mar 30 17:34:57 2015 -0700
+
+ cls_rgw: use multimap to keep pending operations in bucket index
+
+ Fixes: #11256
+ Multiple concurrent requests might be sent using the same tag, need the
+ entry map to be able to hold multiple entries.
+
+ Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
+
+commit 7538319dd7aa80a3318c108d345dee8044cf20a8
+Author: Yehuda Sadeh <yehuda@redhat.com>
+Date: Fri Mar 27 16:32:48 2015 -0700
+
+ rgw: generate new tag for object when setting object attrs
+
+ Fixes: #11256
+ Backport: firefly, hammer
+
+ Beforehand we were reusing the object's tag, which is problematic as
+ this tag is used for bucket index updates, and we might be clobbering a
+ racing update (like object removal).
+
+ Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
+
+commit 364563aac979fdf5ccbb6c588051d097a26bc594
+Author: Jason Dillaman <dillaman@redhat.com>
+Date: Mon Mar 16 11:04:22 2015 -0400
+
+ librbd: acquire cache_lock before refreshing parent
+
+ cache_lock needs to be acquired before snap_lock to avoid
+ the potential for deadlock.
+
+ Fixes: #5488
+ Signed-off-by: Jason Dillaman <dillaman@redhat.com>
+
+commit 110c35498942ea0feec395b6e7992f802dd740ce
+Author: Samuel Just <sjust@redhat.com>
+Date: Fri Mar 20 15:28:15 2015 -0700
+
+ ReplicatedPG::promote_object: check scrubber and block if necessary
+
+ Otherwise, we might attempt to promote into an in-progress scrub
+ interval causing 11156. I would have added a return value to
+ promote_object(), but could not find an existing user which
+ cared to distinguish the cases, even with a null op passed.
+ All existing users are in maybe_handle_cache. The ones which
+ pass a null op are for promoting the object in parallel
+ with a proxy -- a case where not actually performing the promote
+ does not really matter.
+
+ Fixes: #11156
+ Signed-off-by: Samuel Just <sjust@redhat.com>
+ (cherry picked from commit 65bb4df599541cd2e0f195b905f24f529e255c00)
+
+commit 899738e10e82b50dcf7dfffe5cc83937179bf323
+Merge: 15acfe7 9437cb1
+Author: Loic Dachary <ldachary@redhat.com>
+Date: Mon Mar 23 20:38:43 2015 +0100
+
+ Merge pull request #4126 from dzafman/wip-11176-firefly
+
+ ceph-objectstore-tool: Output only unsupported features when incomatible
+
+ Reviewed-by: Loic Dachary <ldachary@redhat.com>
+
+commit 15acfe7f226ca7bc2c942d5fbcd3a40bd41e5930
+Merge: 6c95cd2 cddbff9
+Author: Loic Dachary <ldachary@redhat.com>
+Date: Sat Mar 21 11:38:28 2015 +0100
+
+ Merge pull request #4079 from dachary/wip-11157-firefly
+
+ doc,tests: force checkout of submodules
+
+ Reviewed-by: David Zafman <dzafman@redhat.com>
+
+commit 6c95cd24f6f4a1a933f8799754831e7a5c0a725d
+Merge: ea79a3b 43053fc
+Author: Yuri Weinstein <yuri.weinstein@gmail.com>
+Date: Fri Mar 20 21:06:17 2015 -0700
+
+ Merge pull request #4129 from dzafman/wip-11139-firefly
+
+ ceph-objectstore-tool: Use exit status 11 for incompatible import attemp...
+
+commit 43053fcd8969c406969fef67613aa37ad1cc86bf
+Author: David Zafman <dzafman@redhat.com>
+Date: Fri Mar 20 17:48:01 2015 -0700
+
+ ceph-objectstore-tool: Use exit status 11 for incompatible import attempt
+
+ This is used so upgrade testing doesn't generate false failure.
+ Fixes: #11139
+
+ Signed-off-by: David Zafman <dzafman@redhat.com>
+ (cherry picked from commit 175aff8afe8215547ab57f8d8017ce8fdc0ff543)
+
+commit 9437cb1b284ec9366b51d660396c2c8a9366b31f
+Author: David Zafman <dzafman@redhat.com>
+Date: Fri Mar 20 16:57:40 2015 -0700
+
+ ceph-objectstore-tool: Output only unsupported features when incomatible
+
+ Fixes: #11176
+ Backport: firefly, giant
+
+ Signed-off-by: David Zafman <dzafman@redhat.com>
+ (cherry picked from commit 5b23f5b5892b36fb7d06efc0d77e64a24ef6e8c9)
+
+commit ea79a3b122917ddf5dc1972bb9dc5b20f78e2f18
+Merge: c1c20d8 07fc9f6
+Author: Loic Dachary <ldachary@redhat.com>
+Date: Fri Mar 20 08:44:39 2015 +0100
+
+ Merge pull request #3970 from ceph/firefly-11053
+
+ mds: fix assertion caused by system clock backwards
+
+ Reviewed-by: John Spray <john.spray@redhat.com>
+
+commit c1c20d89d511499d678fdba0667581e88b9b5d95
+Merge: 2fbb9a6 63b39db
+Author: Loic Dachary <ldachary@redhat.com>
+Date: Fri Mar 20 08:42:58 2015 +0100
+
+ Merge pull request #4021 from ceph/wip-7737-firefly
+
+ osd: fix negative degraded objects during backfilling
+
+ Reviewed-by: Sage Weil <sage@redhat.com>
+
+commit 2fbb9a63a82ac5136b033799aec303fc151b25e5
+Merge: 3160e8d 2c7eda6
+Author: Loic Dachary <ldachary@redhat.com>
+Date: Fri Mar 20 08:38:26 2015 +0100
+
+ Merge pull request #3952 from dachary/wip-9986-firefly
+
+ objecter: fix map skipping
+
+ Reviewed-by: Sage Weil <sage@redhat.com>
+
+commit 3160e8d6918a04d1fec9fdccbc30bf007c7940c6
+Author: Yehuda Sadeh <yehuda@redhat.com>
+Date: Wed Mar 18 20:55:24 2015 -0700
+
+ init-radosgw*: don't require rgw_socket_path to be defined
+
+ Fixes: #11159
+ Backport: hammer, firefly
+
+ Scripts required rgw_socket_path to exist in order to start radosgw.
+ This is not needed.
+
+ Reported-by: Dan Mick <dmick@redhat.com>
+ Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
+ (cherry picked from commit 6823bcdcd0ce72cd223e809291f46d82da76115c)
+
+commit cddbff9a3653d6257d13e0ac411cd6e4cd71feef
+Author: Loic Dachary <ldachary@redhat.com>
+Date: Thu Mar 19 00:32:39 2015 +0100
+
+ doc,tests: force checkout of submodules
+
+ When updating submodules, always checkout even if the HEAD is the
+ desired commit hash (update --force) to avoid the following:
+
+ * a directory gmock exists in hammer
+ * a submodule gmock replaces the directory gmock in master
+ * checkout master + submodule update : gmock/.git is created
+ * checkout hammer : the gmock directory still contains the .git from
+ master because it did not exist at the time and checkout won't
+ remove untracked directories
+ * checkout master + submodule update : git rev-parse HEAD is
+ at the desired commit although the content of the gmock directory
+ is from hammer
+
+ http://tracker.ceph.com/issues/11157 Fixes: #11157
+
+ Signed-off-by: Loic Dachary <ldachary@redhat.com>
+
+commit 63b39dbd529936e60d0fd08dffd35f82b3d1729c (refs/remotes/gh/wip-7737-firefly)
+Author: Guang Yang <yguang@yahoo-inc.com>
+Date: Thu Feb 26 08:13:12 2015 +0000
+
+ osd: fix negative degraded objects during backfilling
+
+ When there is deleting requests during backfilling, the reported number of degraded
+ objects could be negative, as the primary's num_objects is the latest (locally) but
+ the number for replicas might not reflect the deletings. A simple fix is to ignore
+ the negative subtracted value.
+
+ Signed-off-by: Guang Yang <yguang@yahoo-inc.com>
+ (cherry picked from commit 14d7e36d3c978844da73d0e1c8a3a1ec863bac15)
+
+ Conflicts:
+ src/osd/PG.cc
+
+commit 493d285508914769cba3639b601ae6c20303af0d
+Merge: 9839726 8a25a51
+Author: Loic Dachary <ldachary@redhat.com>
+Date: Mon Mar 16 23:20:36 2015 +0100
+
+ Merge pull request #3966 from theanalyst/wip-10698-backport
+
+ rgw: fail s3 POST auth if keystone not configured
+
+ Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
+
+commit 9839726f009a3189013a23e8226d2f7618f1d56b
+Merge: dab85cb 651dc55
+Author: Loic Dachary <ldachary@redhat.com>
+Date: Mon Mar 16 23:19:22 2015 +0100
+
+ Merge pull request #3934 from dachary/wip-10665-firefly
+
+ rgw: Swift API. Dump container's custom metadata.
+
+ Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
+
+commit dab85cb7fcc5770fe4d6f075cf583a33ea335aa3
+Merge: 0e55046 d0fd417
+Author: Loic Dachary <ldachary@redhat.com>
+Date: Mon Mar 16 23:18:59 2015 +0100
+
+ Merge pull request #3929 from dachary/wip-10475-firefly
+
+ rgw: Swift API. Support for X-Remove-Container-Meta-{key} header.
+
+ Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
+
+commit 0e550461666d6e3d32981f99c8327931a6bd6d62
+Merge: 1ca6dd9 963439f
+Author: Loic Dachary <ldachary@redhat.com>
+Date: Mon Mar 16 23:18:24 2015 +0100
+
+ Merge pull request #3938 from dachary/wip-10770-firefly
+
+ rgw: send appropriate op to cancel bucket index pending operation
+
+ Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
+
+commit 1ca6dd9676014a81983bd397e3154bf53243c7f2
+Merge: 66327d6 34d19e1
+Author: Loic Dachary <ldachary@redhat.com>
+Date: Mon Mar 16 23:17:56 2015 +0100
+
+ Merge pull request #3961 from dachary/wip-10106-firefly
+
+ rgw: flush xml header on get acl request
+
+ Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
+
+commit 66327d69a9bfa875d58b063c180a11b2769a093e
+Merge: de45d9e 9074eb7
+Author: Loic Dachary <ldachary@redhat.com>
+Date: Mon Mar 16 23:16:53 2015 +0100
+
+ Merge pull request #3958 from dachary/wip-10062-firefly
+
+ rgw: check for timestamp for s3 keystone auth
+
+
+ Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
+ Reviewed-by: Abhishek Lekshmanan <abhishek.lekshmanan@ril.com>
+ Reviewed-by: Valery Tschopp <valery.tschopp@switch.ch>
+
+commit de45d9e2606d8fb6ea5533521163669e748e7d01
+Merge: 308f758 8ef14fc
+Author: Loic Dachary <ldachary@redhat.com>
+Date: Mon Mar 16 17:00:27 2015 +0100
+
+ Merge pull request #3942 from dachary/wip-10844-firefly
+
+ mon: MonCap: take EntityName instead when expanding profiles
+
+ Reviewed-by: Joao Eduardo Luis <joao@redhat.com>
+
+commit 308f758f49d28c012f3ba765519144e5ea5794e6
+Merge: c59a081 ca42905
+Author: Loic Dachary <ldachary@redhat.com>
+Date: Mon Mar 16 16:53:48 2015 +0100
+
+ Merge pull request #3936 from dachary/wip-10724-firefly
+
+ backport ceph-disk man page to Firefly
+
+ Reviewed-by: Loic Dachary <ldachary@redhat.com>
+
+commit c59a08135c35072fa05104e26b500553e800cdd1
+Merge: 331acae 8ec8f11
+Author: Loic Dachary <ldachary@redhat.com>
+Date: Mon Mar 16 16:50:39 2015 +0100
+
+ Merge pull request #3940 from dachary/wip-8753-firefly
+
+ ReplicatedPG::on_change: clean up callbacks_for_degraded_object
+
+ Reviewed-by: Samuel Just <sjust@redhat.com>
+
+commit 331acae4d6b34bb047c914945a2d9c0d9c7b9562
+Merge: fc364a7 4e32ff2
+Author: Loic Dachary <ldachary@redhat.com>
+Date: Mon Mar 16 16:49:56 2015 +0100
+
+ Merge pull request #3827 from dachary/wip-10259-firefly
+
+ osd_types: op_queue_age_hist and fs_perf_stat should be in osd_stat_t::o...
+
+ Reviewed-by: Samuel Just <sjust@redhat.com>
+
+commit fc364a76f85eb5016ea460e5fd9c1603df374bcf
+Merge: 31d99d2 b0d0d44
+Author: Loic Dachary <ldachary@redhat.com>
+Date: Mon Mar 16 16:48:02 2015 +0100
+
+ Merge pull request #3962 from dachary/wip-10150-firefly
+
+ ReplicatedPG::scan_range: an object can disappear between the list and t...
+
+ Reviewed-by: Samuel Just <sjust@redhat.com>
+
+commit 31d99d2de714eb4a8eeb4a431cbc0d40ca749f15
+Merge: 45f0870 5865411
+Author: Loic Dachary <ldachary@redhat.com>
+Date: Mon Mar 16 16:45:32 2015 +0100
+
+ Merge pull request #3948 from dachary/wip-9891-firefly
+
+ DBObjectMap: lock header_lock on sync()
+
+ Reviewed-by: Samuel Just <sjust@redhat.com>
+
+commit 45f087032e27c63dc459318717b05fe5f9888664
+Merge: 3050262 6207333
+Author: Loic Dachary <ldachary@redhat.com>
+Date: Mon Mar 16 16:43:48 2015 +0100
+
+ Merge pull request #3949 from dachary/wip-9915-firefly
+
+ osd: cache tiering: fix the atime logic of the eviction
+
+ Reviewed-by: Samuel Just <sjust@redhat.com>
+
+commit 3050262d7dcb8ac20b9f86544461bb59f4b87cf5
+Merge: c0abc4d 0f31388
+Author: Loic Dachary <ldachary@redhat.com>
+Date: Mon Mar 16 16:40:12 2015 +0100
+
+ Merge pull request #3944 from dachary/wip-9193-firefly
+
+ messages/MWatchNotify: include an error code in the message
+
+ Reviewed-by: Samuel Just <sjust@redhat.com>
+
+commit c0abc4d769afd00773a9f466ffd3feced9cdb17d
+Merge: f9acd3a f856739
+Author: Loic Dachary <ldachary@redhat.com>
+Date: Mon Mar 16 16:39:41 2015 +0100
+
+ Merge pull request #3943 from dachary/wip-8011-firefly
+
+ ReplicatedPG: fail a non-blocking flush if the object is being scrubbed
+
+ Reviewed-by: Samuel Just <sjust@redhat.com>
+
+commit f9acd3ad7397ac1e745beeeaf21b55ecd95484a1
+Merge: f95d327 ca96b59
+Author: Loic Dachary <ldachary@redhat.com>
+Date: Mon Mar 16 16:39:16 2015 +0100
+
+ Merge pull request #3941 from dachary/wip-10817-firefly
+
+ WorkQueue: make wait timeout on empty queue configurable
+
+ Reviewed-by: Samuel Just <sjust@redhat.com>
+
+commit f95d327cbc0750cfb77114c66082ddd5fc458b94
+Merge: 32de8ab 3782b8b
+Author: Loic Dachary <ldachary@redhat.com>
+Date: Mon Mar 16 16:38:42 2015 +0100
+
+ Merge pull request #3937 from dachary/wip-10762-firefly
+
+ mon: ignore osd failures from before up_from
+
+ Reviewed-by: Samuel Just <sjust@redhat.com>
+
+commit 32de8ab146f242f7b73aca211f059bc39d38f85c
+Merge: 24a8c10 6fd3dfa
+Author: Loic Dachary <ldachary@redhat.com>
+Date: Mon Mar 16 16:38:22 2015 +0100
+
+ Merge pull request #3933 from dachary/wip-10617-firefly
+
+ osd: do not ignore deleted pgs on startup
+
+ Reviewed-by: Samuel Just <sjust@redhat.com>
+
+commit 24a8c10a5a215c60b525f4170e45565390e02231
+Merge: f4e76c3 368a5a8
+Author: Loic Dachary <ldachary@redhat.com>
+Date: Mon Mar 16 16:38:01 2015 +0100
+
+ Merge pull request #3932 from dachary/wip-10546-firefly
+
+ mon: Monitor: fix timecheck rounds period
+
+ Reviewed-by: Samuel Just <sjust@redhat.com>
+
+commit f4e76c3db90bf383c02cdb8cca19a37cd187095b
+Merge: fa518ff 66b13f2
+Author: Loic Dachary <ldachary@redhat.com>
+Date: Mon Mar 16 16:37:36 2015 +0100
+
+ Merge pull request #3931 from dachary/wip-10512-firefly
+
+ osd: requeue blocked op before flush it was blocked on
+
+ Reviewed-by: Samuel Just <sjust@redhat.com>
+
+commit fa518ffc5961785f01f0f91980c38a7e02686901
+Merge: ac9980e a22aa8f
+Author: Loic Dachary <ldachary@redhat.com>
+Date: Mon Mar 16 16:37:05 2015 +0100
+
+ Merge pull request #3930 from dachary/wip-10497-firefly
+
+ librados: Translate operation flags from C APIs
+
+ Reviewed-by: Samuel Just <sjust@redhat.com>
+ Reviewed-by: Josh Durgin <jdurgin@redhat.com>
+
+commit ac9980e074adf587b8b16af0bd08b3fc3233804d
+Merge: ccebb5f d3de8a5
+Author: Loic Dachary <ldachary@redhat.com>
+Date: Mon Mar 16 16:31:40 2015 +0100
+
+ Merge pull request #3955 from dachary/wip-10059-firefly
+
+ PG: always clear_primary_state
+
+ Reviewed-by: Samuel Just <sjust@redhat.com>
+
+commit ccebb5f90bea0fd3bac1bd7ab93e5e07700f1301
+Merge: a30379d f4bab86
+Author: Loic Dachary <ldachary@redhat.com>
+Date: Mon Mar 16 16:31:16 2015 +0100
+
+ Merge pull request #3954 from dachary/wip-10014-firefly
+
+ ObjectStore: Don't use largest_data_off to calc data_align.
+
+ Reviewed-by: Samuel Just <sjust@redhat.com>
+
+commit a30379d9af89cffa4b3083ae14a94e3758c2b01c
+Merge: e575ca8 eb03e79
+Author: Loic Dachary <ldachary@redhat.com>
+Date: Mon Mar 16 16:25:59 2015 +0100
+
+ Merge pull request #3947 from dachary/wip-9555-firefly
+
+ osd: check that source OSD is valid for MOSDRepScrub
+
+ Reviewed-by: Samuel Just <sjust@redhat.com>
+
+commit e575ca84419f8be5c7fae7e2ffac549956a74f82
+Merge: cd675bb c60da2f
+Author: Loic Dachary <ldachary@redhat.com>
+Date: Mon Mar 16 16:25:30 2015 +0100
+
+ Merge pull request #3964 from dachary/wip-10157-firefly
+
+ PGLog: include rollback_info_trimmed_to in (read|write)_log
+
+ Reviewed-by: Samuel Just <sjust@redhat.com>
+
+commit cd675bba5fdfb85689880ca7ecbd284181984a63
+Merge: 2b8e476 1a0f770
+Author: Loic Dachary <ldachary@redhat.com>
+Date: Mon Mar 16 16:24:55 2015 +0100
+
+ Merge pull request #3960 from dachary/wip-6003-firefly
+
+ FileJournal: fix journalq population in do_read_entry()
+
+ Reviewed-by: Samuel Just <sjust@redhat.com>
+
+commit 2b8e4762edb7c35950f7e0d69bba2b5e1d83133a
+Merge: d434ead a746f7e
+Author: Loic Dachary <ldachary@redhat.com>
+Date: Mon Mar 16 16:24:03 2015 +0100
+
+ Merge pull request #3950 from dachary/wip-9985-firefly
+
+ Get the currently atime of the object in cache pool for eviction
+
+ Reviewed-by: Samuel Just <sjust@redhat.com>
+ Reviewed-by: Xinze Chi <xmdxcxz@gmail.com>
+
+commit d434eadadd1df6e4df18a6914015736bc09722d1
+Merge: e79e5f8 5f1245e
+Author: Loic Dachary <ldachary@redhat.com>
+Date: Mon Mar 16 16:20:12 2015 +0100
+
+ Merge pull request #3935 from dachary/wip-10723-firefly
+
+ Fix memory leak in python rados bindings
+
+ Reviewed-by: Samuel Just <sjust@redhat.com>
+ Reviewed-by: Josh Durgin <jdurgin@redhat.com>
+
+commit e79e5f8fbbfba6984cf21784e20d1c46cb60a397
+Merge: a9a36de 91b2aca
+Author: Loic Dachary <ldachary@redhat.com>
+Date: Mon Mar 16 15:02:37 2015 +0100
+
+ Merge pull request #3866 from ceph/wip-cot-firefly
+
+ Backport ceph-objectstore-tool changes to firefly
+
+ Reviewed-by: Loic Dachary <ldachary@redhat.com>
+
+commit a9a36deb89ac5719787e905469fe0b1bde5d58ca
+Merge: 83c571e 7e85722
+Author: Loic Dachary <ldachary@redhat.com>
+Date: Mon Mar 16 15:00:56 2015 +0100
+
+ Merge pull request #3996 from dzafman/wip-10676
+
+ Fix ceph command manpage to match ceph -h
+
+ Reviewed-by: Xinxin Shu <xinxin.shu5040@gmail.com>
+
+commit 83c571e3067b4cad3e4567522c797d09a82d87db
+Merge: baa74b8 d5c3a14
+Author: Loic Dachary <ldachary@redhat.com>
+Date: Mon Mar 16 14:55:37 2015 +0100
+
+ Merge pull request #3927 from dachary/wip-10351-firefly
+
+ mount.ceph: avoid spurious error message
+
+ Reviewed-by: Yan, Zheng <zyan@redhat.com>
+
+commit 7e85722fd4c89715fc2ed79697c82d65d7ebf287
+Author: David Zafman <dzafman@redhat.com>
+Date: Fri Mar 13 16:50:13 2015 -0700
+
+ doc: Minor fixes to ceph command manpage
+
+ Fixes: #10676
+
+ Signed-off-by: David Zafman <dzafman@redhat.com>
+
+commit 9ac488c1eb0e30511079ba05aaf11c79615b3940
+Author: David Zafman <dzafman@redhat.com>
+Date: Thu Mar 12 11:39:52 2015 -0700
+
+ doc: Fix ceph command manpage to match ceph -h (firefly)
+
+ Improve synopsis section
+ Fixes: #10676
+
+ Signed-off-by: David Zafman <dzafman@redhat.com>
+
+commit 5f1245e131e33a98572408c8223deed2c7cf7b75
+Author: Josh Durgin <jdurgin@redhat.com>
+Date: Mon Feb 9 20:50:23 2015 -0800
+
+ rados.py: keep reference to python callbacks
+
+ If we don't keep a reference to these, the librados aio calls will
+ segfault since the python-level callbacks will have been garbage
+ collected. Passing them to aio_create_completion() does not take a
+ reference to them. Keep a reference in the python Completion object
+ associated with the request, since they need the same lifetime.
+
+ This fixes a regression from 60b019f69aa0e39d276c669698c92fc890599f50.
+
+ Fixes: #10775
+ Backport: dumpling, firefly, giant
+ Signed-off-by: Josh Durgin <jdurgin@redhat.com>
+ (cherry picked from commit 36d37aadbbbece28d70e827511f1a473d851463d)
+
+commit cf366fc3b21ff6f98530dbadb75a430c25672d56
+Author: Nilamdyuti Goswami <ngoswami@redhat.com>
+Date: Thu Dec 18 17:11:22 2014 +0530
+
+ doc: Changes format style in ceph to improve readability as html.
+
+ Signed-off-by: Nilamdyuti Goswami <ngoswami@redhat.com>
+ (cherry picked from commit 8b796173063ac9af8c21364521fc5ee23d901196)
+
+commit 07fc9f66a69aa31d2cf8bf7a277d3e14ad6209be
+Author: Yan, Zheng <zyan@redhat.com>
+Date: Thu Mar 12 11:01:46 2015 +0800
+
+ mds: fix assertion caused by system clock backwards
+
+ Fixes: #11053
+ Signed-off-by: Yan, Zheng <zyan@redhat.com>
+
+commit 8a25a51e42cdaed2c66dc25a6c6d0245441123a3
+Author: Yehuda Sadeh <yehuda@redhat.com>
+Date: Fri Jan 30 07:03:30 2015 -0800
+
+ rgw: fail s3 POST auth if keystone not configured
+
+ Fixes: #10698
+ This fixes issue introduced in 8b3dfc9472022ea45ad24e02e0aa21dfdad798f8,
+ where if user does not exist, we try keystone authentication. However,
+ if keystone is not configured we justt fall through without failing.
+ This would have failed later on due to bucket permissions, unless bucket
+ had a public write permissions.
+
+ Backports: Firefly
+ Reported-by: Valery Tschopp <valery.tschopp@switch.ch>
+ Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
+
+ Conflicts:
+ src/rgw/rgw_rest_s3.cc
+
+commit eb03e792040bd22c1ae8b7dd73d94fbfd6208eec
+Author: Sage Weil <sage@redhat.com>
+Date: Sat Dec 13 08:06:31 2014 -0800
+
+ osd: check that source OSD is valid for MOSDRepScrub
+
+ Make sure the message we got from the peer OSD is valid. Specifically,
+ this avoids a race like this:
+
+ - A marks down B
+ - B sends MOSDRepScrub
+ - A accepts connection from B as new
+ - A replies to scrub
+ - B crashes because msgr seq 1 < expected seq 1000+
+
+ See #8880 for the most recent fix for requests.
+
+ Fixes: #9555
+ Backport: giant, firefly
+ Signed-off-by: Sage Weil <sage@redhat.com>
+ (cherry picked from commit 847e5e102522d651aa9687a54aaafcebf3afc596)
+
+ Conflicts:
+ src/osd/OSD.cc: require functions first argument is now a reference
+
+commit ae18707b3caa115dc510aff38b77f8afe8555c61
+Author: Sage Weil <sage@redhat.com>
+Date: Sat Dec 13 07:56:39 2014 -0800
+
+ osd: pass Message* to most require_* helpers
+
+ These do nothing but op->get_req(); pass the Message* explicitly so that
+ non-OpRequest callers can use them.
+
+ Signed-off-by: Sage Weil <sage@redhat.com>
+ (cherry picked from commit 707a111d53efb09b3471dd3788b86d2bfee4e96f)
+
+ Conflicts:
+ src/osd/OSD.cc
+ src/osd/OSD.h
+ significantly changes had to be made but in a simple way and
+ stays within the scope of the original commit
+
+commit c60da2f3c34e7325c748d2d6e55140a0a30013fd
+Author: Samuel Just <sjust@redhat.com>
+Date: Thu Nov 20 15:15:08 2014 -0800
+
+ PGLog: include rollback_info_trimmed_to in (read|write)_log
+
+ Fixes: #10157
+ Backport: firefly, giant
+ Signed-off-by: Samuel Just <sjust@redhat.com>
+ (cherry picked from commit 1fe8b846641486cc294fe7e1d2450132c38d2dba)
+
+ Conflicts:
+ src/osd/PGLog.cc
+ in the context coll_t::META_COLL was replaced with META_COLL
+
+commit 1a0f770eea18af6b276a31157f201a93166eb038
+Author: Samuel Just <sjust@redhat.com>
+Date: Fri Feb 6 09:52:29 2015 -0800
+
+ FileJournal: fix journalq population in do_read_entry()
+
+ Fixes: 6003
+ Backport: dumpling, firefly, giant
+ Signed-off-by: Samuel Just <sjust@redhat.com>
+ (cherry picked from commit bae1f3eaa09c4747b8bfc6fb5dc673aa6989b695)
+
+ Conflicts:
+ src/os/FileJournal.cc
+ because reinterpret_cast was added near two hunks after firefly
+
+commit a746f7e5985198024067cb6e123569c09169b356
+Author: Sage Weil <sage@redhat.com>
+Date: Fri Oct 31 19:33:59 2014 -0700
+
+ osd/ReplicatedPG: fix compile error
+
+ From 1fef4c3d541cba360738437420ebfa2447d5802e.
+
+ Signed-off-by: Sage Weil <sage@redhat.com>
+ (cherry picked from commit 4a9ad7dc2da6f4fa6a64235776a3f1d2799aef60)
+
+commit 5404fbfdd9b18cdb3fe5bed67146c769ec3acfa0
+Author: Federico Simoncelli <fsimonce@redhat.com>
+Date: Sat Nov 15 14:14:04 2014 +0000
+
+ common: do not unlock rwlock on destruction
+
+ According to pthread_rwlock_unlock(3p):
+
+ Results are undefined if the read-write lock rwlock is not held
+ by the calling thread.
+
+ and:
+
+ https://sourceware.org/bugzilla/show_bug.cgi?id=17561
+
+ Calling pthread_rwlock_unlock on an rwlock which is not locked
+ is undefined.
+
+ calling pthread_rwlock_unlock on RWLock destruction could cause
+ an unknown behavior for two reasons:
+
+ - the lock is acquired by another thread (undefined)
+ - the lock is not acquired (undefined)
+
+ Moreover since glibc-2.20 calling pthread_rwlock_unlock on a
+ rwlock that is not locked results in a SIGILL that kills the
+ application.
+
+ This patch removes the pthread_rwlock_unlock call on destruction
+ and replaces it with an assertion to check that the RWLock is
+ not in use.
+
+ Any code that relied on the implicit release is now going to
+ break the assertion, e.g.:
+
+ {
+ RWLock l;
+ l.get(for_write);
+ } // implicit release, wrong.
+
+ Signed-off-by: Federico Simoncelli <fsimonce@redhat.com>
+ (cherry picked from commit cf2104d4d991361c53f6e2fea93b69de10cd654b)
+
+commit a73a4cb3889a6da21c3cfa4ddfa16d1a7059d20c
+Author: Yehuda Sadeh <yehuda@inktank.com>
+Date: Sat May 3 08:32:19 2014 -0700
+
+ common/RWLock: track read/write locks via atomics for assertion checks
+
+ Signed-off-by: Yehuda Sadeh <yehuda@inktank.com>
+ (cherry picked from commit 92615ea95a31d9fd22c3d11c860e0f502dc52c26)
+
+commit b0d0d44018de6289b64b6334edd4959ca4a0cc48
+Author: Samuel Just <sjust@redhat.com>
+Date: Thu Dec 11 13:05:54 2014 -0800
+
+ ReplicatedPG::scan_range: an object can disappear between the list and the attr get
+
+ The first item in the range is often last_backfill, upon which writes
+ can be occuring. It's trimmed off on the primary side anyway.
+
+ Fixes: 10150
+ Backport: dumpling, firefly, giant
+ Signed-off-by: Samuel Just <sjust@redhat.com>
+ (cherry picked from commit dce6f288ad541fe7f0ef8374301cd712dd3bfa39)
+
+commit 34d19e1501b242fd8fc7cc95656592b5982f29a6
+Author: Yehuda Sadeh <yehuda@redhat.com>
+Date: Fri Jan 30 18:42:40 2015 -0800
+
+ rgw: flush xml header on get acl request
+
+ Fixes: #10106
+ Backport: firefly, giant
+
+ dump_start() updates the formatter with the appropriate prefix, however,
+ we never flushed the formatter.
+
+ Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
+ (cherry picked from commit eb45f861343162e018968b8c56693a8c6f5b2cab)
+
+commit 9074eb7c46589aa1e5d10a2b9a8534f22dff2154
+Author: Abhishek Lekshmanan <abhishek.lekshmanan@gmail.com>
+Date: Mon Nov 17 17:37:00 2014 +0530
+
+ rgw: check for timestamp for s3 keystone auth
+
+ This commit ensures that we check for timestamp of s3 request is within
+ acceptable grace time of radosgw
+ Addresses some failures in #10062
+ Fixes: #10062
+ Signed-off-by: Abhishek Lekshmanan <abhishek.lekshmanan@gmail.com>
+
+ (cherry picked from commit 4b35ae067fef9f97b886afe112d662c61c564365)
+
+commit d3de8a5722a68d69023cf60c9076c2fb19058bf9
+Author: Samuel Just <sjust@redhat.com>
+Date: Wed Nov 19 08:20:16 2014 -0800
+
+ PG: always clear_primary_state on new interval, but only clear pg temp if not primary
+
+ Signed-off-by: Samuel Just <sjust@redhat.com>
+ (cherry picked from commit f692bfe076b8ddb679c6d1a6ea78cc47f0876326)
+
+commit 8b07236cd799b4752cbe620b737343a02a703a17
+Author: Samuel Just <sjust@redhat.com>
+Date: Fri Nov 14 15:44:20 2014 -0800
+
+ PG: always clear_primary_state when leaving Primary
+
+ Otherwise, entries from the log collection process might leak into the next
+ epoch, where we might end up choosing a different authoritative log. In this
+ case, it resulted in us not rolling back to log entries on one of the replicas
+ prior to trying to recover from an affected object due to the peer_missing not
+ being cleared.
+
+ Fixes: #10059
+ Backport: giant, firefly, dumpling
+ Signed-off-by: Samuel Just <sjust@redhat.com>
+ (cherry picked from commit c87bde64dfccb5d6ee2877cc74c66fc064b1bcd7)
+
+commit f4bab86fe3b218d66c14d06883c297836d9ca19d
+Author: Jianpeng Ma <jianpeng.ma@intel.com>
+Date: Mon Oct 27 11:22:13 2014 +0800
+
+ ObjectStore: Don't use largest_data_off to calc data_align.
+
+ If largest_data_off % CEPH_PAGE_SIZE != 0, the get_data_aligment return
+ a erro value. This make the FileJouranl::align_bl to memcopy much data.
+
+ Tested-by: Sage Weil <sage@redhat.com>
+ Signed-off-by: Jianpeng Ma <jianpeng.ma@intel.com>
+ (cherry picked from commit a1aa70f2f21339feabfe9c1b3c9c9f97fbd53c9d)
+
+commit 2c7eda690ae2f71c8e8e189b8f7330196c1f385f
+Author: Ding Dinghua <dingdinghua85@gmail.com>
+Date: Thu Oct 30 14:58:42 2014 +0800
+
+ osdc/Objecter: Fix a bug of dead looping in Objecter::handle_osd_map
+
+ If current map epoch is less than oldest epoch, current map epoch
+ should step up to oldest epoch.
+
+ Fixes: #9986
+ Signed-off-by: Ding Dinghua <dingdinghua85@gmail.com>
+ (cherry picked from commit e0166a23c2cf655bfb4cf873be021a14d9b9be27)
+
+ Conflicts:
+ src/osdc/Objecter.cc
+ the debug line that follows was re-indented
+
+commit 11f8017cbdf94d4a8083412b96c251ee39286541
+Author: Ding Dinghua <dingdinghua85@gmail.com>
+Date: Thu Oct 30 14:58:05 2014 +0800
+
+ osdc/Objecter: e shouldn't be zero in Objecter::handle_osd_map
+
+ Signed-off-by: Ding Dinghua <dingdinghua85@gmail.com>
+ (cherry picked from commit 31c584c8ba022cd44fe2872d221f3026618cefab)
+
+ Conflicts:
+ src/osdc/Objecter.cc
+ the debug line that follows was re-indented
+
+commit 7831582026441abbd6066dd951db4b63ffb45402
+Author: Xinze Chi <xmdxcxz@gmail.com>
+Date: Wed Oct 29 07:11:11 2014 +0000
+
+ Get the currently atime of the object in cache pool for eviction
+
+ Because if there are mutiple atime in agent_state for the same object, we should use the recently one.
+
+ Signed-off-by: Xinze Chi <xmdxcxz@gmail.com>
+ (cherry picked from commit 1fef4c3d541cba360738437420ebfa2447d5802e)
+
+commit 620733386bd0694960cecac8f32bd1538382d5bb
+Author: Zhiqiang Wang <zhiqiang.wang@intel.com>
+Date: Tue Oct 28 09:37:11 2014 +0800
+
+ osd: cache tiering: fix the atime logic of the eviction
+
+ Reported-by: Xinze Chi <xmdxcxz@gmail.com>
+ Signed-off-by: Zhiqiang Wang <zhiqiang.wang@intel.com>
+ (cherry picked from commit 622c5ac41707069ef8db92cb67c9185acf125d40)
+
+commit 5865411360f722ec511f2df6656d4ba975bef8eb
+Author: Samuel Just <sjust@redhat.com>
+Date: Fri Feb 20 13:43:46 2015 -0800
+
+ DBObjectMap: lock header_lock on sync()
+
+ Otherwise, we can race with another thread updating state.seq
+ resulting in the old, smaller value getting persisted. If there
+ is a crash at that time, we will reuse a sequence number, resulting
+ in an inconsistent node tree and bug #9891.
+
+ Fixes: 9891
+ Backport: giant, firefly, dumpling
+ Signed-off-by: Samuel Just <sjust@redhat.com>
+ (cherry picked from commit 2b63dd25fc1c73fa42e52e9ea4ab5a45dd9422a0)
+
+ Conflicts:
+ src/os/DBObjectMap.cc
+ because we have state.v = 1; instead of state.v = 2;
+
+commit baa74b88a4f4b6073b99b7a9774692b37405b59e
+Merge: be6559a 420ea03
+Author: Loic Dachary <ldachary@redhat.com>
+Date: Wed Mar 11 09:09:23 2015 +0100
+
+ Merge pull request #3828 from dachary/wip-10425-firefly
+
+ librados: fix resources leakage in RadosClient::connect()
+
+ Reviewed-by: Radoslaw Zarzynski <rzarzynski@mirantis.com>
+
+commit be6559a423badde3b573b0c9055056999baae104
+Merge: f91d355 6e58732
+Author: Loic Dachary <ldachary@redhat.com>
+Date: Wed Mar 11 09:06:27 2015 +0100
+
+ Merge pull request #3826 from dachary/wip-10257-firefly
+
+ mon: PGMonitor: several stats output error fixes
+
+ Reviewed-by: Joao Eduardo Luis <joao@redhat.com>
+
+commit f91d355306620cc543113ed21fddf84f4c170d6e
+Merge: f5525a1 1e58bb4
+Author: Loic Dachary <ldachary@redhat.com>
+Date: Wed Mar 11 09:05:13 2015 +0100
+
+ Merge pull request #3824 from dachary/wip-10353-firefly
+
+ crush: set_choose_tries = 100 for erasure code rulesets
+
+ Reviewed-by: Loic Dachary <ldachary@redhat.com>
+
+commit f5525a1f41c9154b48f3ad0ccd899b5203c897bd
+Merge: b7e3614 27dbbb3
+Author: Loic Dachary <ldachary@redhat.com>
+Date: Wed Mar 11 09:04:33 2015 +0100
+
+ Merge pull request #3823 from dachary/wip-10787-firefly
+
+ mon/OSDMonitor: do not trust small values in osd epoch cache
+
+ Reviewed-by: Joao Eduardo Luis <joao@redhat.com>
+
+commit b7e3614ff38379aeea66ba00c64bc88ffa080963
+Merge: b5a67f0 7ed92f7
+Author: Loic Dachary <ldachary@redhat.com>
+Date: Wed Mar 11 09:02:16 2015 +0100
+
+ Merge pull request #3915 from dachary/wip-10080-firefly
+
+ SimpleMessenger: allow RESETSESSION whenever we forget an endpoint
+
+ Reviewed-by: Greg Farnum <gfarnum@redhat.com>
+
+commit 8ef14fcca715a33be8c611a37628c90d7fafca43
+Author: Joao Eduardo Luis <joao@redhat.com>
+Date: Wed Feb 11 23:36:01 2015 +0000
+
+ mon: MonCap: take EntityName instead when expanding profiles
+
+ entity_name_t is tightly coupled to the messenger, while EntityName is
+ tied to auth. When expanding profiles we want to tie the profile
+ expansion to the entity that was authenticated. Otherwise we may incur
+ in weird behavior such as having caps validation failing because a given
+ client messenger inst does not match the auth entity it used.
+
+ e.g., running
+
+ ceph --name osd.0 config-key exists foo daemon-private/osd.X/foo
+
+ has entity_name_t 'client.12345' and EntityName 'osd.0'. Using
+ entity_name_t during profile expansion would not allow the client access
+ to daemon-private/osd.X/foo (client.12345 != osd.X).
+
+ Fixes: #10844
+ Backport: firefly,giant
+
+ Signed-off-by: Joao Eduardo Luis <joao@redhat.com>
+ (cherry picked from commit 87544f68b88fb3dd17c519de3119a9ad9ab21dfb)
+
+commit 370f37f452aff3b48f9ae8a33b7ef26b572b41c8
+Author: Joao Eduardo Luis <joao@redhat.com>
+Date: Fri Nov 14 21:03:54 2014 +0000
+
+ mon: Monitor: stash auth entity name in session
+
+ Backport: giant
+
+ Signed-off-by: Joao Eduardo Luis <joao@redhat.com>
+ (cherry picked from commit ca8e1efc0be9bffcfbdce5593526d257aa498062)
+
+commit 0f31388eb2bb68c09ab270f871b421a9c368af97
+Author: Sage Weil <sage@redhat.com>
+Date: Sun Aug 10 17:51:08 2014 -0700
+
+ messages/MWatchNotify: include an error code in the message
+
+ Document the fields, while we are here.
+
+ Signed-off-by: Sage Weil <sage@redhat.com>
+ (cherry picked from commit 7c7bf5fee7be397ef141b947f532a2a0b3567b42)
+
+commit f856739824bc271405a6fa35bdefc2bdc42c2f02
+Author: Samuel Just <sjust@redhat.com>
+Date: Thu Nov 20 14:27:39 2014 -0800
+
+ ReplicatedPG: fail a non-blocking flush if the object is being scrubbed
+
+ Fixes: #8011
+ Backport: firefly, giant
+ Signed-off-by: Samuel Just <sjust@redhat.com>
+ (cherry picked from commit 9b26de3f3653d38dcdfc5b97874089f19d2a59d7)
+
+commit ca96b59db529ffbba0c834795800b6e90a7e4fce
+Author: Samuel Just <sjust@redhat.com>
+Date: Mon Feb 9 17:11:38 2015 -0800
+
+ WorkQueue: make wait timeout on empty queue configurable
+
+ Fixes: 10817
+ Backport: giant, firefly, dumpling
+ Signed-off-by: Samuel Just <sjust@redhat.com>
+ (cherry picked from commit 5aa6f910843e98a05bfcabe6f29d612cf335edbf)
+
+commit 8ec8f1175a129624dffb511782664d74966d3c42
+Author: Samuel Just <sjust@redhat.com>
+Date: Mon Feb 9 10:37:15 2015 -0800
+
+ ReplicatedPG::on_change: clean up callbacks_for_degraded_object
+
+ Backport: dumpling, firefly, giant
+ Fixes: 8753
+ Signed-off-by: Samuel Just <sjust@redhat.com>
+ (cherry picked from commit a5ecaa189d47a69466a6cd55fa4180e5c3092dc2)
+
+commit 963439f1038000c3f28c728350a2e9d351341e0b
+Author: Yehuda Sadeh <yehuda@redhat.com>
+Date: Thu Feb 5 09:33:26 2015 -0800
+
+ rgw: send appropriate op to cancel bucket index pending operation
+
+ Fixes: #10770
+ Backport: firefly, giant
+
+ Reported-by: baijiaruo <baijiaruo@126.com>
+ Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
+ (cherry picked from commit dfee96e3aebcaeef18c721ab73f0460eba69f1c7)
+
+ Conflicts:
+ src/rgw/rgw_rados.cc
+
+commit 3782b8b3652c0eb3fb8f65193ecfe09e92925170
+Author: Sage Weil <sage@redhat.com>
+Date: Thu Feb 5 03:07:50 2015 -0800
+
+ mon: ignore osd failures from before up_from
+
+ If the failure was generated for an instance of the OSD prior to when
+ it came up, ignore it.
+
+ This probably causes a fair bit of unnecessary flapping in the wild...
+
+ Backport: giant, firefly
+ Fixes: #10762
+ Reported-by: Dan van der Ster <dan@vanderster.com>
+ Signed-off-by: Sage Weil <sage@redhat.com>
+ (cherry picked from commit 400ac237d35d0d1d53f240fea87e8483c0e2a7f5)
+
+commit ca42905a6fca8b2b404500a6f74951ae20c8a488
+Author: Nilamdyuti Goswami <ngoswami@redhat.com>
+Date: Wed Nov 26 22:21:32 2014 +0530
+
+ doc: Adds the updated man page for ceph-disk utility.
+
+ Signed-off-by: Nilamdyuti Goswami <ngoswami@redhat.com>
+ (cherry picked from commit 016080d2c39919d73956e5e138ba5f079327aa44)
+
+commit 6602ab4581f27e066484b4c419d8206fcc20e045
+Author: Nilamdyuti Goswami <ngoswami@redhat.com>
+Date: Wed Nov 26 22:19:01 2014 +0530
+
+ doc: Updates the man page for ceph-disk utility with some changes.
+
+ Signed-off-by: Nilamdyuti Goswami <ngoswami@redhat.com>
+ (cherry picked from commit 8a48847cd46d4807ca1dbd13d3a561a693cdc877)
+
+commit 459807021dd3bf86ce31d30a3b576e783da67e3f
+Author: Nilamdyuti Goswami <ngoswami@redhat.com>
+Date: Tue Nov 25 21:23:08 2014 +0530
+
+ doc: Adds man page for ceph-disk utility.
+
+ Signed-off-by: Nilamdyuti Goswami <ngoswami@redhat.com>
+ (cherry picked from commit 9a118d56d4a5b0a0456e9f092f5ae9293f7bf3f3)
+
+commit 430d821b7592148ad9b2656bb3031a0484763f33
+Author: Nilamdyuti Goswami <ngoswami@redhat.com>
+Date: Tue Nov 25 21:16:16 2014 +0530
+
+ doc: Removes ceph-deploy usage instances from ceph-disk man page.
+
+ Signed-off-by: Nilamdyuti Goswami <ngoswami@redhat.com>
+ (cherry picked from commit 242dd1c0bbb728475a94f47740790b8a196d9804)
+
+commit 21c3256c851065521e34a179dc05d48fcc0a6e0f
+Author: Nilamdyuti Goswami <ngoswami@redhat.com>
+Date: Tue Nov 25 02:06:39 2014 +0530
+
+ doc: Updates man page for ceph-disk utility.
+
+ Signed-off-by: Nilamdyuti Goswami <ngoswami@redhat.com>
+ (cherry picked from commit 7dcc85042b0c0a26e495f7574ce144d1083d15f8)
+
+commit 1a6490e38d7f5fd3ff640a810c3b911699cd4884
+Author: Nilamdyuti Goswami <ngoswami@redhat.com>
+Date: Mon Nov 24 22:05:11 2014 +0530
+
+ doc: Adds man page for ceph-disk utility.
+
+ Signed-off-by: Nilamdyuti Goswami <ngoswami@redhat.com>
+ (cherry picked from commit a450cab2b8148cb8a9b043d629feccf89e5aabac)
+
+commit 3bab47054dc77b9a00d3f47fa73f458ede7d4ab4
+Author: Billy Olsen <billy.olsen@gmail.com>
+Date: Mon Feb 2 16:24:59 2015 -0700
+
+ Fix memory leak in python rados bindings
+
+ A circular reference was inadvertently created when using the
+ CFUNCTYPE binding for callbacks for the asynchronous i/o callbacks.
+ This commit refactors the usage of the callbacks such that the
+ Ioctx object does not have a class reference to the callbacks.
+
+ Fixes: #10723
+ Backport: giant, firefly, dumpling
+ Signed-off-by: Billy Olsen <billy.olsen@gmail.com>
+ Reviewed-by: Dan Mick <dmick@redhat.com>
+ Reviewed-by: Josh Durgin <jdurgin@redhat.com>
+ (cherry picked from commit 60b019f69aa0e39d276c669698c92fc890599f50)
+
+commit d0fd417e872a73033903fb36144fe7a39e90fc9a
+Author: Dmytro Iurchenko <diurchenko@mirantis.com>
+Date: Tue Feb 3 17:54:38 2015 +0200
+
+ rgw: Swift API. Support for X-Remove-Container-Meta-{key} header.
+
+ Fixes: #10475
+ Backport: hammer, firefly
+ Reported-by: Josh Durgin <jdurgin@redhat.com>
+ Signed-off-by: Dmytro Iurchenko <diurchenko@mirantis.com>
+ (cherry picked from commit f67bfa24fd6f69c2fcc0987eba8b6b426dd78320)
+
+ Conflicts:
+ src/rgw/rgw_rest.h
+ trivial merge: prototype of an unrelated function changed
+ s/is_object_op/!(s->object == NULL)/
+
+commit 651dc556047aa4ee9e95fe9fc7bcd11488973872
+Author: Dmytro Iurchenko <diurchenko@mirantis.com>
+Date: Mon Feb 2 11:27:00 2015 +0200
+
+ rgw: Swift API. Dump container's custom metadata.
+
+ Fixes: #10665
+ Backport: hammer, firefly
+ Reported-by: Ahmad Faheem <ahmad.faheem@ril.com>
+ Signed-off-by: Dmytro Iurchenko <diurchenko@mirantis.com>
+ (cherry picked from commit 2f8d31e9b1c4b09506bd1b0dad635c6e820783b2)
+
+ Conflicts:
+ src/rgw/rgw_rest_swift.cc
+ The first hunk conflicts because X-Storage-Policy was added
+ after firefly. The second hunk conflicts because the type of the
+ s->object data member changed after firefly but it is irrelevant
+ because the patch does not need to access s->object anymore.
+
+commit 6fd3dfa7224f0af3101fd1614506e8cb2fc7f6a0
+Author: Sage Weil <sage@redhat.com>
+Date: Fri Jan 23 10:47:44 2015 -0800
+
+ osd: do not ignore deleted pgs on startup
+
+ These need to get instantiated so that we can complete the removal process.
+
+ Fixes: #10617
+ Signed-off-by: Sage Weil <sage@redhat.com>
+ (cherry picked from commit 879fd0c192f5d3c6afd36c2df359806ea95827b8)
+
+commit 368a5a8a8739e98ffdb8ac1210d111092e31be9e
+Author: Joao Eduardo Luis <joao@redhat.com>
+Date: Fri Jan 30 11:37:28 2015 +0000
+
+ mon: Monitor: fix timecheck rounds period
+
+ Fixes: #10546
+ Backports: dumpling?,firefly,giant
+
+ Signed-off-by: Joao Eduardo Luis <joao@redhat.com>
+ (cherry picked from commit 2e749599ac6e1060cf553b521761a93fafbf65bb)
+
+commit 66b13f2beff702c3b0bcb0aaa8da4e12d594eddf
+Author: Sage Weil <sage@redhat.com>
+Date: Sun Jan 11 17:28:04 2015 -0800
+
+ osd: requeue blocked op before flush it was blocked on
+
+ If we have request A (say, cache-flush) that blocks things, and then
+ request B that gets blocked on it, and we have an interval change, then we
+ need to requeue B first, then A, so that the resulting queue will keep
+ A before B and preserve the order.
+
+ This was observed on this firefly run:
+
+ ubuntu@teuthology:/a/sage-2015-01-09_21:43:43-rados-firefly-distro-basic-multi/694675
+
+ Backport: giant, firefly
+ Fixes: #10512
+ Signed-off-by: Sage Weil <sage@redhat.com>
+ (cherry picked from commit 11bdfb4131ecac16d4a364d651c6cf5d1d28c702)
+
+commit a22aa8f3228e0baf2ba08d9e79ee4924cd341a07
+Author: Matt Richards <mattjrichards@gmail.com>
+Date: Thu Jan 8 13:16:17 2015 -0800
+
+ librados: Translate operation flags from C APIs
+
+ The operation flags in the public C API are a distinct enum
+ and need to be translated to Ceph OSD flags, like as happens in
+ the C++ API. It seems like the C enum and the C++ enum consciously
+ use the same values, so I reused the C++ translation function.
+
+ Signed-off-by: Matthew Richards <mattjrichards@gmail.com>
+ (cherry picked from commit 49d114f1fff90e5c0f206725a5eb82c0ba329376)
+
+ Conflicts:
+ src/librados/librados.cc
+ comes from lttng tracepoints introduced after firefly
+
+commit d5c3a14390f6bb2af45a1a4ad842777302dd0553
+Author: Yan, Zheng <zyan@redhat.com>
+Date: Sat Jan 3 15:29:29 2015 +0800
+
+ mount.ceph: avoid spurious error message
+
+ /etc/mtab in most modern distributions is a symbol link to
+ /proc/self/mounts.
+
+ Fixes: #10351
+ Signed-off-by: Yan, Zheng <zyan@redhat.com>
+ (cherry picked from commit bdd0e3c4bda97fe18487a58dd173a7dff752e1a2)
+
+commit 7ed92f7dc5f0f327b77b6f3835e3f821fc810708
+Author: Greg Farnum <gfarnum@redhat.com>
+Date: Tue Dec 2 15:17:57 2014 -0800
+
+ SimpleMessenger: allow RESETSESSION whenever we forget an endpoint
+
+ In the past (e229f8451d37913225c49481b2ce2896ca6788a2) we decided to disable
+ reset of lossless Pipes, because lossless peers resetting caused trouble and
+ they can't forget about each other. But they actually can: if mark_down()
+ is called.
+
+ I can't figure out how else we could forget about a remote endpoint, so I think
+ it's okay if we tell them we reset in order to clean up state. That's desirable
+ so that we don't get into strange situations with out-of-whack counters.
+
+ Fixes: #10080
+ Backport: giant, firefly, dumpling
+
+ Signed-off-by: Greg Farnum <gfarnum@redhat.com>
+ (cherry picked from commit 8cd1fdd7a778eb84cb4d7161f73bc621cc394261)
+
+commit 91b2acaadee1b62c1fcac73147908ec4477840f3
+Author: David Zafman <dzafman@redhat.com>
+Date: Thu Oct 9 11:20:13 2014 -0700
+
+ osd: Get pgid ancestor from last_map when building past intervals
+
+ Fixed OSD::build_past_intervals_parallel() and PG::generate_past_intervals()
+
+ Fixes: #10430
+
+ Signed-off-by: David Zafman <dzafman@redhat.com>
+ (cherry picked from commit 0c5b66da7a9ba516340d06d9e806beb9d1040d0e)
+
+ Conflicts:
+ src/osd/OSD.cc
+
+commit c09b6d9d64fdcdc3842c4f89acf10080125a4adc
+Author: David Zafman <dzafman@redhat.com>
+Date: Tue Dec 23 12:04:26 2014 -0800
+
+ osd: Pass oldest_map when generating past intervals
+
+ From load_pgs() the superblock hasn't been published yet
+ so we need to retrieve the value of oldest_map depending on the context.
+
+ Fixes: #10427
+
+ Signed-off-by: David Zafman <dzafman@redhat.com>
+ (cherry picked from commit 7fb721c1ceb39b38ca2e653299bcf51e109411d7)
+
+ Conflicts:
+ src/osd/OSD.cc
+
+commit 9235d781bf860c1ecef5af600431f1619b56fbc1
+Author: David Zafman <dzafman@redhat.com>
+Date: Wed Dec 17 16:59:09 2014 -0800
+
+ osd: build_push_op() handle short reads so recipient doesn't crash
+
+ Fixes: #8121
+
+ Signed-off-by: David Zafman <dzafman@redhat.com>
+ (cherry picked from commit b9a04846d18e1c6621d7f2794ec1fae02875bed2)
+
+commit 7ce0cb8e33a281d5f675273d7bcbc570a32e5497
+Author: Kefu Chai <kchai@redhat.com>
+Date: Thu Feb 5 16:33:08 2015 +0800
+
+ ceph_objectstore_tool: fix check_output on python2.6
+
+ * backported the subprocess.check_output from python2.7
+
+ Fixes: #10756
+
+ Signed-off-by: Kefu Chai <kchai@redhat.com>
+ (cherry picked from commit 15350a088d84bc6fc664f0d3f5d09b35f58b2144)
+
+ Conflicts:
+ src/test/ceph_objectstore_tool.py
+
+commit d5d34ddd1eac688d9422ca02c859d61be8e3e56e
+Author: David Zafman <dzafman@redhat.com>
+Date: Tue Jan 6 15:49:50 2015 -0800
+
+ ceph_objectstore_tool: For import get object_info_t available for each object
+
+ Add object_info_t to object_begin so we have at object create time
+ This will be useful for importing from multiple erasure coded exports
+
+ Signed-off-by: David Zafman <dzafman@redhat.com>
+ (cherry picked from commit 05d916ed12f361da48ef73953bcc0cef465fcc2a)
+
+commit f70590b211ba28f350921b2f0c92712ed779858e
+Author: David Zafman <dzafman@redhat.com>
+Date: Fri Dec 12 15:16:03 2014 -0800
+
+ ceph_objectstore_tool: Handle import of pg which OSD has split
+
+ Fail import if import data doesn't include OSDMap and can't find it locally
+ See if local map can be read for import's epoch
+ Jump to current epoch like a split would if local map not present
+
+ Fixes: #9781
+
+ Signed-off-by: David Zafman <dzafman@redhat.com>
+ (cherry picked from commit afda6e4f3b98cc1773fd014583dfb5e1f214a939)
+
+ Conflicts:
+ src/tools/ceph_objectstore_tool.cc
+
+commit aedd324f8fbb031d5126ae158f03066c7342f4b0
+Author: David Zafman <dzafman@redhat.com>
+Date: Fri Dec 12 15:38:33 2014 -0800
+
+ ceph_objectstore_tool: On import following a split skip objects no longer in pg
+
+ Signed-off-by: David Zafman <dzafman@redhat.com>
+ (cherry picked from commit 68b27e25a3729566c3a22c0b71f70f7f3aca29a3)
+
+ Conflicts:
+ src/tools/ceph_objectstore_tool.cc
+
+commit c3de607c2ce16a26af7a78a4e557f321ffbcb44d
+Author: David Zafman <dzafman@redhat.com>
+Date: Fri Dec 5 15:12:21 2014 -0800
+
+ ceph_objectstore_tool: Verify that object pool and pgid pool match
+
+ Also, earlier check for invalid --pgid with import op
+
+ Signed-off-by: David Zafman <dzafman@redhat.com>
+ (cherry picked from commit da3be80497a1b1878ee5d2015f8840d202a83aa2)
+
+commit 5ec38e54f40431a5303cafe202c5097cc400fdb6
+Author: David Zafman <dzafman@redhat.com>
+Date: Wed Nov 19 11:47:36 2014 -0800
+
+ ceph_objectstore_tool: Check for splits and fail import if there were splits
+
+ Add osdmap into metadata_section
+ On export put metadata_section before file data
+
+ Fixes: #9780
+
+ Signed-off-by: David Zafman <dzafman@redhat.com>
+ (cherry picked from commit 19fdeea8b67091ed044ebce25799d3237b4d734a)
+
+commit aa472fa4df19d826a5af72e286365fa5ce4c71fb
+Author: David Zafman <dzafman@redhat.com>
+Date: Mon Dec 15 10:03:53 2014 -0800
+
+ ceph_objectstore_tool: Add special exit code for test infrastructure
+
+ Signed-off-by: David Zafman <dzafman@redhat.com>
+ (cherry picked from commit b1f12f09c0211b608178f5ca2e292ab1765ce620)
+
+commit 22b7c2faee8cfad1b40cef019984f4a2d112b268
+Author: David Zafman <dzafman@redhat.com>
+Date: Wed Nov 19 11:41:39 2014 -0800
+
+ ceph_objectstore_tool: Check that pool exists before allowing import
+
+ Signed-off-by: David Zafman <dzafman@redhat.com>
+ (cherry picked from commit f24f646d870703b7b79563cdbc20920248be6142)
+
+ Conflicts:
+ src/tools/ceph_objectstore_tool.cc
+
+commit f65db436f6eb83d7c59fdddced4d35dd9eeeb078
+Author: David Zafman <dzafman@redhat.com>
+Date: Wed Oct 15 15:21:11 2014 -0700
+
+ ceph_objectstore_tool: Check cluster_fsid before allowing an import
+
+ Signed-off-by: David Zafman <dzafman@redhat.com>
+ (cherry picked from commit 196c8112dc9a6e8780b05d6c579cd7fbd5b07589)
+
+commit 360f68ec69b36b172d15c6206698340a5c00aafa
+Author: David Zafman <dzafman@redhat.com>
+Date: Thu Oct 16 12:27:56 2014 -0700
+
+ ceph_objectstore_tool: Allow the metadata_section to be anywhere in the export
+
+ Signed-off-by: David Zafman <dzafman@redhat.com>
+ (cherry picked from commit 62dd912f1192b28700a15b02507a8c9efd710cb5)
+
+ Conflicts:
+ src/tools/ceph_objectstore_tool.cc
+
+commit c3fcbe636ae1a936b9180628cff939b2b5dddf7c
+Author: David Zafman <dzafman@redhat.com>
+Date: Fri Dec 12 15:01:24 2014 -0800
+
+ ceph_objectstore_tool: import-rados shouldn't import internal namespace objects
+
+ Signed-off-by: David Zafman <dzafman@redhat.com>
+ (cherry picked from commit f727d2eaf50b0351feb9f12dcd65d50fb6eff7e9)
+
+commit 2d69076943b9724ce1d5c9f03f2f7594a77b92d2
+Author: David Zafman <dzafman@redhat.com>
+Date: Fri Dec 12 14:58:54 2014 -0800
+
+ ceph_objectstore_tool: Get g_ceph_context available to import-rados
+
+ Signed-off-by: David Zafman <dzafman@redhat.com>
+ (cherry picked from commit ddc4613ec71752e5dccbbfe6dc078b86f0f186a9)
+
+ Conflicts:
+ src/tools/ceph_objectstore_tool.cc
+
+commit bbed3a728471292de625d922abeae8b39d290045
+Author: David Zafman <dzafman@redhat.com>
+Date: Tue Dec 9 18:09:04 2014 -0800
+
+ ceph_objectstore_tool: Fix import-rados skipping of snapshots
+
+ Signed-off-by: David Zafman <dzafman@redhat.com>
+ (cherry picked from commit fe936026ed87c9f95f3b7ad235b24c22e8de5f55)
+
+commit d962c79dc1f0f2189e25743c6d253fac412c004d
+Author: David Zafman <dzafman@redhat.com>
+Date: Thu Nov 20 13:00:10 2014 -0800
+
+ ceph_objectstore_tool: read_fd() doesn't handle ^D from tty stdin, don't allow
+
+ Signed-off-by: David Zafman <dzafman@redhat.com>
+ (cherry picked from commit 5cb692528e3ac0ebea3f1714b3ac43f69d176888)
+
+commit 8b7f4cb232c2f1bde6f50c1f092cb622fe2c41f1
+Author: David Zafman <dzafman@redhat.com>
+Date: Fri Dec 19 13:47:32 2014 -0800
+
+ ceph-objectstore-tool: Remove --pretty-format and use new --format options
+
+ Call new_formatter() with --format specified argument
+
+ Signed-off-by: David Zafman <dzafman@redhat.com>
+ (cherry picked from commit 22b71744bb0cb56434d5f6214ccea7d81f771860)
+
+ Conflicts:
+ src/tools/ceph_objectstore_tool.cc
+
+commit ee183b8e56c6f8a88ac781cf1fedb6a7a93f1005
+Author: David Zafman <dzafman@redhat.com>
+Date: Wed Oct 15 15:20:03 2014 -0700
+
+ ceph_objectstore_tool: Describe super_ver values
+
+ Signed-off-by: David Zafman <dzafman@redhat.com>
+ (cherry picked from commit 0aeba0f216a54390288b5e3d6147deb31877f744)
+
+commit 5f82f824c7b1bb246bdb54b11a694133a49da70a
+Author: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
+Date: Fri Jan 2 18:36:54 2015 +0100
+
+ ceph_objectstore_tool.cc: reduce scope of variable
+
+ Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
+ (cherry picked from commit 78542f9a901c05e627b53b5306ea604be3bc82e8)
+
+commit 2f97c51b5ee5de7c1657bc8fee6ccaa474f6f478
+Author: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
+Date: Fri Jan 2 15:48:08 2015 +0100
+
+ ceph_objectstore_tool.cc: prefer ++operator for non-primitive iterators
+
+ Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
+ (cherry picked from commit 252fc03ba21c7b09922598a8d40997fc639bb994)
+
+commit 2a22bfedc4fa9f461dc8cfd42c659b9c55ddafca
+Author: David Zafman <dzafman@redhat.com>
+Date: Tue Nov 25 16:56:19 2014 -0800
+
+ ceph_objectstore_tool: Prevent tool from transitioning struct_v on rm-past-intervals
+
+ Signed-off-by: David Zafman <dzafman@redhat.com>
+ (cherry picked from commit f056bdf93980a0a8e6157dbb124a79389a8f1a3c)
+
+commit 53aa04f95c43795da81a7d9f3117d7e5816aedcb
+Author: David Zafman <dzafman@redhat.com>
+Date: Thu Dec 4 18:53:08 2014 -0800
+
+ ceph_objectstore_tool: Accept json object with --pgid instead of array
+
+ It isn't anticipated that anyone would use this but keeps backward compatible
+
+ Signed-off-by: David Zafman <dzafman@redhat.com>
+ (cherry picked from commit 59b423e2e8846b098326fdec440de46b8e3d2769)
+
+commit 60e9a8120b292628ee4e5ef33fe933222609b861
+Author: David Zafman <dzafman@redhat.com>
+Date: Thu Dec 4 18:27:50 2014 -0800
+
+ ceph_objectstore_tool: Improve object spec parsing error messages
+
+ Signed-off-by: David Zafman <dzafman@redhat.com>
+ (cherry picked from commit de6384fda183801c16af1b61ed36eaed289bb4f6)
+
+commit 4f95409c0dadeed18334c00630ddc6d7c99d2819
+Author: David Zafman <dzafman@redhat.com>
+Date: Thu Dec 4 17:48:28 2014 -0800
+
+ ceph_objectstore_tool: Fix errors messages in newer code
+
+ Signed-off-by: David Zafman <dzafman@redhat.com>
+ (cherry picked from commit eae7c02fded460f6c8aaf18aa83d2730b89e0eb1)
+
+commit 1703867735c8f8ab1c83aa526c84b278436f38d5
+Author: David Zafman <dzafman@redhat.com>
+Date: Thu Dec 4 16:00:40 2014 -0800
+
+ ceph_objectstore_tool: Remove extraneous endl on error throw messages
+
+ Signed-off-by: David Zafman <dzafman@redhat.com>
+ (cherry picked from commit 32c832f0c62259a492d1c934c56ac165496763a0)
+
+commit f2d2110a8cb1a1b1216c1083b54ea6212138dc93
+Author: David Zafman <dzafman@redhat.com>
+Date: Thu Dec 4 14:01:39 2014 -0800
+
+ ceph_objectstore_tool: Add --format and --pretty-format support
+
+ --pretty-format defaults true
+ Add --format so xml output can be requested
+ --op list defaults to single line of json per object
+ To override this more human readable output use --pretty-format=false
+ Add testing of --op list special handling
+
+ Signed-off-by: David Zafman <dzafman@redhat.com>
+ (cherry picked from commit cca85a534fe488ae314400e8faad55a758609467)
+
+commit a5544c12c3e982edf66f55a8edfb7fc69300520b
+Author: David Zafman <dzafman@redhat.com>
+Date: Wed Dec 3 17:53:11 2014 -0800
+
+ ceph_objectstore_tool: Strip _* (always _head) from pgid in list entry output
+
+ Signed-off-by: David Zafman <dzafman@redhat.com>
+ (cherry picked from commit 5eacd3c5f39766cb8be6b3251d139d16431cf6b6)
+
+commit 4a0a42f3e6b9a1b7ed4df3d4b6c417acfc00050a
+Author: David Zafman <dzafman@redhat.com>
+Date: Wed Dec 3 16:39:04 2014 -0800
+
+ ceph_objectstore_tool: BUG: --op list wasn't including snapshots
+
+ Signed-off-by: David Zafman <dzafman@redhat.com>
+ (cherry picked from commit b617ee2d45886ec6b3dc0db0edbf814ea5748083)
+
+commit 06579b9f269dc9864e920368c5bea9bcb9dd8be9
+Author: David Zafman <dzafman@redhat.com>
+Date: Wed Dec 3 16:38:22 2014 -0800
+
+ ceph_objectstore_tool: For terminal output of list one object per line
+
+ Instead of a parsable array make it easier to cut and paste listed objects
+
+ Signed-off-by: David Zafman <dzafman@redhat.com>
+ (cherry picked from commit 5a66db9418aeed31fec98999c5053dab357d9c1e)
+
+commit 22c6bf410de1b0c81f131aa4d5682f5162dd1a56
+Author: David Zafman <dzafman@redhat.com>
+Date: Wed Dec 3 16:35:09 2014 -0800
+
+ ceph_objectstore_tool: In error case umount objectstore
+
+ Signed-off-by: David Zafman <dzafman@redhat.com>
+ (cherry picked from commit bc6ea9cb8a2b86c73f7f15bc46145177ccf91f4b)
+
+commit d802ab69a4a0f37ed9328ec385746f59643e1420
+Author: Loic Dachary <ldachary@redhat.com>
+Date: Thu Nov 27 01:24:03 2014 +0100
+
+ objectstore_tool: test --op list variants
+
+ Signed-off-by: Loic Dachary <ldachary@redhat.com>
+ (cherry picked from commit ddba2676c4c48c2a556f5d4ffd817bfe134a9153)
+
+commit f30e053fe7b3e5efc679b20cf1b3e2f7f8ed7e54
+Author: Loic Dachary <ldachary@redhat.com>
+Date: Thu Nov 27 00:11:45 2014 +0100
+
+ objectstore_tool: parse new object description format
+
+ The object format changed from
+
+ {json object}
+
+ to
+
+ [pgid,{json object}]
+
+ The parser is updated accordingly. If the --pgid is present, check that
+ it equals the pgid from the object description.
+
+ Signed-off-by: Loic Dachary <ldachary@redhat.com>
+ (cherry picked from commit df9d5c5cfd8b0ff793647a592c7661965cef5c92)
+
+commit fce87c9d7dbb51989826d068d6b6657a2f3d129d
+Author: Loic Dachary <ldachary@redhat.com>
+Date: Wed Nov 26 23:35:21 2014 +0100
+
+ objectstore_tool: filter --op list and explore all PGs
+
+ The positional object name is used to filter the output of --op list and
+ only show the objects with a matching name. If both the object name and
+ the pgid are omitted, all objects from all PGs are displayed.
+
+ The output format is changed from
+
+ {"oid":"GROUP","key":"","snapid":-2,
+ "hash":2659194943,"max":0,"pool":0,"namespace":""}
+
+ to
+
+ [["0.7_head",{"oid":"GROUP","key":"","snapid":-2,
+ "hash":2659194943,"max":0,"pool":0,
+ "namespace":""}]]
+
+ where the first member is the pgid where the object is found.
+
+ Signed-off-by: Loic Dachary <ldachary@redhat.com>
+ (cherry picked from commit c69aaceac7f370e5369d511bf17898adc338ae43)
+
+commit 2f874fd3715d216a68658e94a5c741e665c76632
+Author: Loic Dachary <ldachary@redhat.com>
+Date: Wed Nov 26 23:34:22 2014 +0100
+
+ objectstore_tool: lookup objects by name
+
+ If the object is not a parsable JSON string, assume an object name and
+ look it up in all the PGs. If multiple objects have the same name, only
+ apply the command to one of them. It is primarily useful in a test
+ environment where the names of the tests objects are known and only a
+ small number of objects exists. It replaces the following:
+
+ path='--data-path dev/osd0 --journal-path dev/osd0.journal'
+ for pgid in $(./ceph_objectstore_tool $path --op list-pgs) ; do
+ object=$(./ceph_objectstore_tool $path --pgid $pgid --op list |
+ grep '"oid":"NAME"')
+ test -n "$object" && break
+ done
+ ./ceph_objectstore_tool $path --pgid $pgid "$object" remove
+
+ with:
+
+ ./ceph_objectstore_tool $path NAME remove
+
+ http://tracker.ceph.com/issues/10192 Fixes: #10192
+
+ Signed-off-by: Loic Dachary <ldachary@redhat.com>
+ (cherry picked from commit 7c1165f96391821c00cca1ac04b3433dbec6bb6e)
+
+ Conflicts:
+ src/tools/ceph_objectstore_tool.cc
+
+commit eb48aba2119959c53ea8a103b53f0c2e07c52acb
+Author: Loic Dachary <ldachary@redhat.com>
+Date: Wed Nov 26 17:30:30 2014 +0100
+
+ objectstore_tool: refactor list-lost and fix-lost
+
+ Abstract out the PG exploration loops and encapsulate the list-lost and
+ fix-lost semantic in a callable object.
+
+ Signed-off-by: Loic Dachary <ldachary@redhat.com>
+ (cherry picked from commit d9e747b1bdb53d1fe543ef311e3db35fb78d8051)
+
+commit eab3226edc8ecc6d2d93f463e019ef4eacb9f468
+Author: Loic Dachary <ldachary@redhat.com>
+Date: Wed Nov 26 17:26:54 2014 +0100
+
+ objectstore_tool: update usage strings
+
+ Signed-off-by: Loic Dachary <ldachary@redhat.com>
+ (cherry picked from commit a90233c8b79ae6c035b5169c7f8809f853631689)
+
+ Conflicts:
+ src/tools/ceph_objectstore_tool.cc
+
+commit 5bbe41cb1e7faf40a9c53a9bdc01db8c35670a36
+Author: David Zafman <dzafman@redhat.com>
+Date: Tue Nov 18 13:00:15 2014 -0800
+
+ ceph_objectstore_tool: Add feature called set-allow-sharded-objects
+
+ Uses --op set-allow-sharded-objects option
+ This operation will be rejected if on the target OSD's osdmap there is
+ at least one OSD which does not support ERASURE CODES.
+ Prompt the user that they could import if sharded state allowed
+ Prompt the user to use new feature if sharded state found inconsistent
+
+ Fixes: #10077
+
+ Signed-off-by: David Zafman <dzafman@redhat.com>
+ (cherry picked from commit f3dab446fc8e58b3b3d9334b8c38722e73881b9e)
+
+ Conflicts:
+ src/tools/ceph_objectstore_tool.cc
+
+commit 4e30d8c53c0a4952f81cc3b5680c7e92fffb1355
+Author: David Zafman <dzafman@redhat.com>
+Date: Tue Nov 18 11:59:18 2014 -0800
+
+ ceph_objectstore_tool: Add utility routine get_osdmap()
+
+ Signed-off-by: David Zafman <dzafman@redhat.com>
+ (cherry picked from commit b3021b0d3362000b5938d406ed2e032a8eb38405)
+
+ Conflicts:
+ src/tools/ceph_objectstore_tool.cc
+
+commit f997b126afaeadebe6b6d76954fbe2008bd2a7d8
+Author: David Zafman <dzafman@redhat.com>
+Date: Wed Nov 12 21:14:11 2014 -0800
+
+ ceph_objectstore_tool: Clear ...INCOMPAT_SHARDS from feature if exporting replicated pg
+
+ Don't require importing OSD to have shards feature for replicated pg
+
+ http://tracker.ceph.com/issues/10077 Fixes: #10077
+
+ Signed-off-by: David Zafman <dzafman@redhat.com>
+ (cherry picked from commit 86baf2d38170ef19de2dd5e9ce3f280237d8474d)
+
+commit 3f862da57945f821ed459f5a77f8032331c9cb20
+Author: David Zafman <dzafman@redhat.com>
+Date: Tue Nov 18 00:10:41 2014 -0800
+
+ tests: ceph_objectstore_tool.py test all variants of export/import
+
+ Handle change of error message text
+
+ Signed-off-by: David Zafman <dzafman@redhat.com>
+ (cherry picked from commit 9e53c3554c71121f2e2dd0234b5232da37ad5a1b)
+
+commit 2a58bdee19eb8f02a2800d728d402e76566d7f58
+Author: David Zafman <dzafman@redhat.com>
+Date: Mon Nov 17 23:23:40 2014 -0800
+
+ ceph_objectstore_tool: Make --file option consistent by treating "-" as stdout/stdin
+
+ Signed-off-by: David Zafman <dzafman@redhat.com>
+ (cherry picked from commit 8c87f3284f87d1121218cb7f41edc81b74c9df29)
+
+commit 70329be7be5d80e52d5424958cecd7f4d939add6
+Author: David Zafman <dzafman@redhat.com>
+Date: Sat Nov 15 11:43:10 2014 -0800
+
+ tests: ceph_objectstore_tool.py fix list-attr for erasure code
+
+ Adding testing of xattr for erasure coded shards
+ Fix error message when finding an unexpected xattr key
+
+ Signed-off-by: David Zafman <dzafman@redhat.com>
+ (cherry picked from commit cbecab477a70782f2f69258f035e78fb5c829810)
+
+ Conflicts:
+ src/test/ceph_objectstore_tool.py
+
+commit bc921c7ecbc061ccef4847d967986c9fa902111f
+Author: David Zafman <dzafman@redhat.com>
+Date: Sat Nov 15 11:46:15 2014 -0800
+
+ tests: ceph_objectstore_tool.py check for malformed JSON for erasure code objs
+
+ Signed-off-by: David Zafman <dzafman@redhat.com>
+ (cherry picked from commit 40717aa4c399e87d2c3e32038f78788eb213f87d)
+
+commit 99ffd137f17c438e3ee9dbbc0ab73cdcd3a45a5c
+Author: David Zafman <dzafman@redhat.com>
+Date: Sat Nov 15 11:44:54 2014 -0800
+
+ tests: ceph_objectstore_tool.py fix off by 1 ATTR_OBJS handling
+
+ Signed-off-by: David Zafman <dzafman@redhat.com>
+ (cherry picked from commit eaf1d1e35243566c46b478788e79e0ebf7583015)
+
+commit 951c951a0f164271c5e9b96ecbd510cf5c6663b6
+Author: Loic Dachary <ldachary@redhat.com>
+Date: Fri Nov 14 11:00:17 2014 +0100
+
+ tests: ceph_objectstore_tool.py skip if /dev/tty fails
+
+ Some environments do not have a /dev/tty. When opening /dev/tty fails,
+ skip the test instead of returning an error.
+
+ Signed-off-by: Loic Dachary <ldachary@redhat.com>
+ (cherry picked from commit 4c94f1778fdf483e9e0b62f89f7e46e78aeeebf3)
+
+commit 8dc263555d7aca2befa912c78c585a43c8e7592c
+Author: Loic Dachary <ldachary@redhat.com>
+Date: Thu Nov 13 19:15:50 2014 +0100
+
+ tests: ceph_objectstore_tool.py encapsulate init-ceph stop
+
+ Call init-ceph in kill_daemons and add a call to kill_daemon when main
+ returns on error so that it never leaves daemons hanging.
+
+ Signed-off-by: Loic Dachary <ldachary@redhat.com>
+ (cherry picked from commit fc435ff3623d196dd7cc375302acd8dfc9eb59fd)
+
+commit b78d802f3e082b0762203ae37b3c3a44b7608907
+Author: Loic Dachary <ldachary@redhat.com>
+Date: Thu Nov 13 19:14:49 2014 +0100
+
+ tests: ceph_objectstore_tool.py main returns
+
+ Instead of calling sys.exit() the main function returns the desired exit
+ code.
+
+ Signed-off-by: Loic Dachary <ldachary@redhat.com>
+ (cherry picked from commit 0f3d7b1315f2b5595047d8bd13949ed0d9194bfa)
+
+commit 04e480b09b59f5318e9b206e6c3e529d8bb22328
+Author: Loic Dachary <ldachary@redhat.com>
+Date: Thu Nov 13 17:32:14 2014 +0100
+
+ tests: ceph_objectstore_tool.py replace stop.sh with init-ceph
+
+ The stop.sh will stop all ceph-* processes. Use the init-ceph script
+ instead to selectively kill the daemons run by the vstart.sh cluster
+ used for ceph_objectstore_tool.
+
+ Signed-off-by: Loic Dachary <ldachary@redhat.com>
+ (cherry picked from commit e8f34bd62bf282144b8851fb9764cf4429a49c25)
+
+commit 51855584eb970b28dfa266ee3653963fb77a2b1e
+Author: Loic Dachary <ldachary@redhat.com>
+Date: Thu Nov 13 17:30:29 2014 +0100
+
+ tests: ceph_objectstore_tool.py use a dedicated directory
+
+ Set CEPH_DIR to a directory that is specific to ceph_objectstore_tool so
+ that it can run in parallel with other vstart.sh clusters.
+
+ Signed-off-by: Loic Dachary <ldachary@redhat.com>
+ (cherry picked from commit e303d1afde58e68c1f587962010da9e1f1278bc3)
+
+ Conflicts:
+ src/test/ceph_objectstore_tool.py
+
+commit 454ec85ae449cb20c2ddecade421262d9d9de615
+Author: Loic Dachary <ldachary@redhat.com>
+Date: Thu Nov 13 17:27:01 2014 +0100
+
+ tests: ceph_objectstore_tool.py run faster by default
+
+ By default use only a small number of objects to speed up the tests. If
+ the argument "big" is given, use a large number of objects as it may
+ help find some problems.
+
+ Signed-off-by: Loic Dachary <ldachary@redhat.com>
+ (cherry picked from commit 235257c257aea98b770d9637957818c8aeb6c745)
+
+commit 427fe9177f90db091685b937839dcc4dfe4c8a01
+Author: Loic Dachary <ldachary@redhat.com>
+Date: Thu Nov 13 17:21:48 2014 +0100
+
+ tests: ceph_objectstore_tool.py run mon and osd on specific port
+
+ By default vstart.sh runs MDS but they are not needed for the tests,
+ only run mon and osd instead. Instead of using the default vstart.sh
+ port which may conflict with a already running vstart.sh, set the
+ CEPH_PORT=7400 which is not used by any other test run with make check.
+
+ Signed-off-by: Loic Dachary <ldachary@redhat.com>
+ (cherry picked from commit f04d4e7539bc8c1b6cf94db815f9dcdecc52faa2)
+
+commit 28ed34a7dc32033be61cd61178eb59471de45aac
+Author: Loic Dachary <ldachary@redhat.com>
+Date: Thu Nov 13 17:16:41 2014 +0100
+
+ tests: ceph_objectstore_tool.py can use a WARN cluster
+
+ The tests do not need HEALTH_OK exclusively, a HEALTH_WARN cluster can
+ also run them successfully.
+
+ Signed-off-by: Loic Dachary <ldachary@redhat.com>
+ (cherry picked from commit 783378c019aaac36d542e1b12c0d64196ea21012)
+
+commit 8548d7c65e8743d4e743c77981acd702efab3fb2
+Author: Loic Dachary <ldachary@redhat.com>
+Date: Thu Nov 13 17:12:35 2014 +0100
+
+ tests: ceph_objectstore_tool.py use env python
+
+ Using #/usr/bin/env python instead of a hard coded path is more flexible
+ and can also be used to run from virtualenv.
+
+ Signed-off-by: Loic Dachary <ldachary@redhat.com>
+ (cherry picked from commit 74506d2506d03d05935cbe342fef9dc1d9022a13)
+
+commit 5b4c2ee0902d94e6fa5bee67188fddcf0e0c38a2
+Author: David Zafman <dzafman@redhat.com>
+Date: Wed Nov 12 15:22:04 2014 -0800
+
+ ceph_objectstore_tool: Fixes to make import work again
+
+ The is_pg() call is now true even for pgs pending removal, fix broken
+ finish_remove_pgs() by removing is_pg() check.
+ Need to add create_collection() to the initial transaction on import
+
+ Fixes: #10090
+
+ Signed-off-by: David Zafman <dzafman@redhat.com>
+ Reviewed-by: Sage Weil <sage@redhat.com>
+ (cherry picked from commit 5ce09198bf475e5c3a2df26232fa04ba9912b103)
+
+ Conflicts:
+ src/tools/ceph_objectstore_tool.cc
+
+commit e0dab883d29bd3a54b5707f8d3ea830f8a1ce516
+Author: David Zafman <dzafman@redhat.com>
+Date: Mon Oct 6 18:26:44 2014 -0700
+
+ ceph_objectstore_tool: Accept CEPH_ARGS environment arguments
+
+ Signed-off-by: David Zafman <dzafman@redhat.com>
+ (cherry picked from commit 10fe7cfe561f91717f2ac2e13aeecc06a903704e)
+
+commit 5f788eaa61054c6cb27960b5544b321078706343
+Author: David Zafman <dzafman@redhat.com>
+Date: Fri Oct 3 15:12:28 2014 -0700
+
+ ceph_objectstore_tool: MemStore needs a CephContext
+
+ Pass g_ceph_context to ObjectStore::create() needed by MemStore
+
+ Fixes: #9661
+
+ Signed-off-by: David Zafman <dzafman@redhat.com>
+ (cherry picked from commit 0b155d00c542f0d8b8b5b0324dac4b3cf7ff37b5)
+
+commit 7470c7ca02ef6313b925be3ce4b27437a0c2e1e0
+Author: David Zafman <dzafman@redhat.com>
+Date: Tue Mar 3 10:41:28 2015 -0800
+
+ ceph_objectstore_tool: Rename generated binary to ceph-objectstore-tool
+
+ Signed-off-by: David Zafman <dzafman@redhat.com>
+ (cherry picked from commit 4f72ba545e204a24a55adead43c61cb1d4394381)
+
+ Conflicts:
+ debian/ceph-test.install
+ src/.gitignore
+ src/test/ceph-helpers.sh (doesn't exist in firefly)
+ src/test/ceph_objectstore_tool.py
+ src/tools/ceph_objectstore_tool.cc
+
+commit 4b51645fdfe8a761f7ebc0faee1a87187d498fee
+Author: Sage Weil <sage@redhat.com>
+Date: Wed Nov 12 13:35:43 2014 -0800
+
+ vstart.sh: warn less
+
+ Signed-off-by: Sage Weil <sage@redhat.com>
+ (cherry picked from commit a69b8450f642af91a352d0de4378d93828291933)
+
+commit 3075919c0dcee1f33a0beb299e98d8a88836c5f8
+Author: David Zafman <dzafman@redhat.com>
+Date: Mon Nov 17 23:02:50 2014 -0800
+
+ ceph_objectstore_tool: When exporting to stdout, don't cout messages
+
+ Fixes: #10128
+ Caused by a2bd2aa7
+
+ Signed-off-by: David Zafman <dzafman@redhat.com>
+ (cherry picked from commit 0d5262ac2f69ed3996af76a72894b1722a27b37d)
+ (cherry picked from commit 6cb9a2499cac2645e2cc6903ab29dfd95aac26c7)
+
+commit ca9df2803f3200431f5f7ea99a713005f15b7f5a
+Author: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
+Date: Tue Sep 2 14:56:10 2014 +0200
+
+ ceph_objectstore_tool.cc: prefer ++operator for non-primitive iterators
+
+ Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
+ (cherry picked from commit a5468abe4459159e8a9f7a4f21d082bb414e1cdd)
+
+commit ac396f5df3c51d09b9dbf7e6be7bed1d755d2317
+Author: Zhiqiang Wang <wonzhq@hotmail.com>
+Date: Fri Aug 29 16:39:40 2014 +0800
+
+ Test: fixing a compile warning in ceph_objectstore_tool.cc
+
+ For the compiler's sake:
+ tools/ceph_objectstore_tool.cc:2547:15: warning: ‘r’ may be used
+ uninitialized in this function [-Wmaybe-uninitialized]
+
+ Signed-off-by: Zhiqiang Wang <wonzhq@hotmail.com>
+ (cherry picked from commit c3e1466b46076f133b62f98e2c0b712bdde0e119)
+
+commit b863970110e7f8e835e77864ea59b81f0b026158
+Author: David Zafman <dzafman@redhat.com>
+Date: Wed Aug 20 01:33:45 2014 -0700
+
+ ceph_objectstore_tool: Bug fixes and test improvements
+
+ ceph_objectgstore_tool:
+ Fix bugs in the way collection_list_partial() was being called
+ which caused objects to be seen over and over again.
+
+ Unit test:
+ Fix get_objs() to walk pg tree for pg with sub-directories
+ Create more objects to test object listing code
+ Limit number of larger objects
+ Limit number of objects which get attributes and omaps
+
+ Signed-off-by: David Zafman <dzafman@redhat.com>
+ (cherry picked from commit a03f719eb3a46f410550afce313e6720e0c27946)
+
+commit 4f83005bb8a615df370de7b6dfe5d926c7cfef7f
+Author: David Zafman <david.zafman@inktank.com>
+Date: Tue Aug 5 18:26:11 2014 -0700
+
+ ceph_objectstore_tool, test: Implement import-rados feature and unit test code
+
+ Fixes: #8276
+
+ Signed-off-by: David Zafman <david.zafman@inktank.com>
+ (cherry picked from commit 23ec93a86140c4b271b45d87c62682288079cbba)
+
+commit df334617705fe862b820ef5de674ae54efad0cea
+Author: David Zafman <david.zafman@inktank.com>
+Date: Wed Aug 6 19:53:43 2014 -0700
+
+ test: ceph_objectstore_tool unit test improvements
+
+ Add namespaces to testing
+ Increase filesize so export will have multiple chunks
+ Put json for each object into the db dict
+
+ Signed-off-by: David Zafman <david.zafman@inktank.com>
+
+commit ecd25cf6ce1a1a34e536c7fd313225b3bdedd2e0
+Author: David Zafman <david.zafman@inktank.com>
+Date: Thu Aug 7 13:31:48 2014 -0700
+
+ ceph_objectstore_tool: Add operation "rm-past-intervals" for testing purposes
+
+ Signed-off-by: David Zafman <david.zafman@inktank.com>
+ (cherry picked from commit 3694068b67fd625495c4511390bc5bcbfbbd28f5)
+
+commit 6b50b384efc1f0735f8635a59663b50e3155de1a
+Author: David Zafman <david.zafman@inktank.com>
+Date: Thu Aug 7 11:46:08 2014 -0700
+
+ ceph_objectstore_tool: Add past_intervals to export/import code
+
+ Signed-off-by: David Zafman <david.zafman@inktank.com>
+ (cherry picked from commit 9325ec15d4b89c5537cbcbda4c7594e25dc6e7df)
+
+commit 63529079b97c99cbaa863e1be865e2693e90c556
+Author: David Zafman <david.zafman@inktank.com>
+Date: Thu Aug 7 14:11:21 2014 -0700
+
+ ceph_objectstore_tool: Minor improvements
+
+ Make all non-error non-debug output to stdout
+ Fix a message
+
+ Signed-off-by: David Zafman <david.zafman@inktank.com>
+ (cherry picked from commit a2bd2aa7babb4ad45ba21c70f9d179fda27742aa)
+
+commit 5e3f89ece7bdd09ed06ca4208cfa0a0b3104f109
+Author: David Zafman <david.zafman@inktank.com>
+Date: Tue Aug 5 12:26:42 2014 -0700
+
+ ceph_objectstore_tool, test: Add list-pgs operations and unit test case
+
+ Signed-off-by: David Zafman <david.zafman@inktank.com>
+ (cherry picked from commit f01e334c697057158354f0ce5ecff6d6ba8e2704)
+
+commit edc9f71efeebe5241004c669cc58089905907634
+Author: David Zafman <david.zafman@inktank.com>
+Date: Wed Jul 30 12:39:49 2014 -0700
+
+ Complete replacement of ceph_filestore_tool and ceph_filestore_dump
+ with unified ceph_objectstore_tool
+
+ Move list-lost-objects and fix-lost-objects features from
+ ceph_filestore_tool to ceph_objectstore_tool as list-lost, fix-lost
+ Change --type to --op for info, log, export...operations
+ Add --type for the ObjectStore type (defaults to filestore)
+ Change --filestore-path to --data-path
+ Update installation, Makefile.am, and .gitignore
+ Fix and rename test case to match
+ Add some additional invalid option checks
+
+ Signed-off-by: David Zafman <david.zafman@inktank.com>
+ (cherry picked from commit 83fbc91e5c4e52cc1513f34908f99d2ac3b930df)
+
+commit a42273ecd955470105cba1cc4ac7eb782ac46833
+Author: David Zafman <david.zafman@inktank.com>
+Date: Wed Jul 30 11:22:29 2014 -0700
+
+ Renames and removal towards a unified ceph_objectstore_tool
+
+ Rename ceph_filestore_dump.cc and ceph_filestore_dump.py
+ Remove ceph_filestore_tool.cc
+
+ Signed-off-by: David Zafman <david.zafman@inktank.com>
+ (cherry picked from commit 77864193a1162393ade783480aee39a232934377)
+
+commit 9ee2c27096784efceb02b06a0df4325979385f44
+Author: David Zafman <david.zafman@inktank.com>
+Date: Tue May 20 11:19:19 2014 -0700
+
+ ceph_filestore_dump: Add set-omaphdr object command
+
+ Signed-off-by: David Zafman <david.zafman@inktank.com>
+ (cherry picked from commit b4d95cc85af9af64d33d541cd69c5f28fd45423b)
+
+commit c7d261d40367ab01a577bf255da776a622f8984a
+Author: David Zafman <david.zafman@inktank.com>
+Date: Tue May 20 10:44:37 2014 -0700
+
+ ceph_filestore_dump: Add get-omaphdr object command
+
+ Signed-off-by: David Zafman <david.zafman@inktank.com>
+ (cherry picked from commit 30c0f3114e665acdd99e64bf0d2a7399b33e8d61)
+
+commit 271e3ca19b9e878c6c3c26a9ec461faf06e7a19d
+Author: David Zafman <david.zafman@inktank.com>
+Date: Mon May 19 20:55:47 2014 -0700
+
+ ceph_filestore_dump: Add rm-omap object command
+
+ Signed-off-by: David Zafman <david.zafman@inktank.com>
+ (cherry picked from commit 0fc6bd2777edf24a044f454beacf1647cc52f9fe)
+
+commit 20165d101a30c6beb591ca56b56bdf5505f70cf3
+Author: David Zafman <david.zafman@inktank.com>
+Date: Mon May 19 20:47:14 2014 -0700
+
+ ceph_filestore_dump: Add set-omap object command
+
+ Signed-off-by: David Zafman <david.zafman@inktank.com>
+ (cherry picked from commit 50cd57e902fe508f98f63fea30626780b07561d9)
+
+commit 7547f3d17bc89437c529aa96413b0bebb808da5e
+Author: David Zafman <david.zafman@inktank.com>
+Date: Mon May 19 20:37:01 2014 -0700
+
+ ceph_filestore_dump: Add get-omap object command
+
+ Signed-off-by: David Zafman <david.zafman@inktank.com>
+ (cherry picked from commit b50c43ce5e52f5bbcb3684f6793d50f34ed741d1)
+
+commit f391feb1f50632adbe94c3e8cdc4b75091d6b8e1
+Author: David Zafman <david.zafman@inktank.com>
+Date: Mon May 19 18:33:24 2014 -0700
+
+ ceph_filestore_dump: Add rm-attr object command
+
+ Signed-off-by: David Zafman <david.zafman@inktank.com>
+ (cherry picked from commit 465d77733c7499fbd65bebe7141895714c625e0d)
+
+commit 7bd2dd3a1d022df6d3f886ad12a191d0cfcef1d6
+Author: David Zafman <david.zafman@inktank.com>
+Date: Mon May 19 18:17:27 2014 -0700
+
+ ceph_filestore_dump: Add set-attr object command
+
+ Signed-off-by: David Zafman <david.zafman@inktank.com>
+ (cherry picked from commit 95554e03dcb74b6d74b2f1b2891b3570abb187b8)
+
+commit 6724da821158ddee6ef6ee7b5bac9e97dcfc2292
+Author: David Zafman <david.zafman@inktank.com>
+Date: Thu May 15 15:50:48 2014 -0700
+
+ ceph_filestore_dump: Add get-attr object command
+
+ Signed-off-by: David Zafman <david.zafman@inktank.com>
+ (cherry picked from commit 55d43c0e20fc853daec134449b9954248fd7ef31)
+
+commit 55c21b898834d77234227d3fc14c8580ef698663
+Author: David Zafman <david.zafman@inktank.com>
+Date: Wed May 14 17:52:09 2014 -0700
+
+ ceph_filestore_dump: Add set-bytes object command
+
+ Signed-off-by: David Zafman <david.zafman@inktank.com>
+ (cherry picked from commit 3c24d1f46a624d0a053ad234997a1f8c8b036db5)
+
+commit 2f1926d2f57082666350d8223b09f61da5f95b6f
+Author: David Zafman <david.zafman@inktank.com>
+Date: Wed May 14 17:51:29 2014 -0700
+
+ ceph_filestore_dump: Add get-bytes object command
+
+ Signed-off-by: David Zafman <david.zafman@inktank.com>
+ (cherry picked from commit 869dd92cc8ec29a3a684f88c335d359f225bba24)
+
+commit fcabb8133af3b90d5d9e976ce658ceccfc5b89c5
+Author: David Zafman <david.zafman@inktank.com>
+Date: Wed May 14 17:50:16 2014 -0700
+
+ ceph_filestore_dump: Add list-omap object command
+
+ Signed-off-by: David Zafman <david.zafman@inktank.com>
+ (cherry picked from commit 48890c7741d76cf92b5f589f49378ca57292e88b)
+
+commit 303e4cedd91ca3553e956eec495a05e3136b3c56
+Author: David Zafman <david.zafman@inktank.com>
+Date: Wed May 14 18:32:42 2014 -0700
+
+ ceph_filestore_dump: Add list-attrs object command
+
+ Signed-off-by: David Zafman <david.zafman@inktank.com>
+ (cherry picked from commit 00c6b0673288ca76fe144575b7af76eaa36f5857)
+
+commit aff2c995f67bdde1a592a9b24e4e96e85735d500
+Author: David Zafman <david.zafman@inktank.com>
+Date: Wed May 14 17:39:17 2014 -0700
+
+ ceph_filestore_dump: Add --type list to output objects in a pg in json
+
+ Signed-off-by: David Zafman <david.zafman@inktank.com>
+ (cherry picked from commit 844dabb7f311e68eba0293ae9ca4c68521745877)
+
+commit 7cda8b7a0b43d709b73d875088ecd169f47d59ab
+Author: David Zafman <david.zafman@inktank.com>
+Date: Wed May 14 17:44:31 2014 -0700
+
+ ceph_filestore_dump: Add remove object command and usage for new commands
+
+ Signed-off-by: David Zafman <david.zafman@inktank.com>
+ (cherry picked from commit 605caec64b036f8ab5ae451d7e9e7515d414f28e)
+
+commit a4694643ae4503746d3fac8a0feac706ddc13a16
+Author: David Zafman <david.zafman@inktank.com>
+Date: Fri Jun 6 17:05:53 2014 -0700
+
+ ceph_filestore_dump: Add utility function get_fd_data()
+
+ Signed-off-by: David Zafman <david.zafman@inktank.com>
+ (cherry picked from commit d4a9dafe442f139562497d746f80ba49faa954e8)
+
+commit 62dc823fb3b969c0ad52594419e8a86a3ff1e6ef
+Author: David Zafman <david.zafman@inktank.com>
+Date: Mon May 19 18:16:52 2014 -0700
+
+ ceph_filestore_dump: Fail import/export with a tty for stdin/stdout
+
+ Signed-off-by: David Zafman <david.zafman@inktank.com>
+ (cherry picked from commit 7520e504cf2cdd3de2f236acb2cbf8a5016e6698)
+
+commit 9816f872ad59bcaa1a125b297f3991b333aad39c
+Author: David Zafman <david.zafman@inktank.com>
+Date: Tue May 20 11:56:20 2014 -0700
+
+ ceph_filstore_dump: Save if stdout is a tty and add routine to clean binary strings
+
+ Signed-off-by: David Zafman <david.zafman@inktank.com>
+ (cherry picked from commit 3a574cc78b0e3ec6d8dd0c39ee20e7a54ad64056)
+
+commit d4aedeb833f23bf4ce6187cb82910ab2e71d48e5
+Author: David Zafman <david.zafman@inktank.com>
+Date: Wed May 14 15:30:11 2014 -0700
+
+ common: Add missing ghobject_t::decode() for json
+
+ Signed-off-by: David Zafman <david.zafman@inktank.com>
+ (cherry picked from commit c05f895d15a1d0e78ff5e9ae1a83f0a5424103d0)
+
+ Changes:
+ Adjusted for older shard_t
+
+commit dadecb1e05e528093642ba356fa7a70a0b546727
+Author: David Zafman <david.zafman@inktank.com>
+Date: Wed May 14 15:37:17 2014 -0700
+
+ ceph_filestore_dump: Add --skip-journal-replay and --skip-mount-omap
+
+ Signed-off-by: David Zafman <david.zafman@inktank.com>
+ (cherry picked from commit 2e9dcb256509e7c921556202052f0cc1dcd91398)
+
+commit c6369987b1e1e55a9d0ab0bc328f61f52fc608d0
+Author: David Zafman <david.zafman@inktank.com>
+Date: Wed May 14 15:41:15 2014 -0700
+
+ os: Add optional flags to generic ObjectStore creation (SKIP_JOURNAL_REPLAY
+ and SKIP_MOUNT_OMAP)
+
+ Only FileStore cares about these flags, so passed on during create()
+
+ Signed-off-by: David Zafman <david.zafman@inktank.com>
+ (cherry picked from commit 3d9fde9d92322cd8ac3e3d8bcbf5b0a01ef0528b)
+
+ Conflicts:
+ src/os/FileStore.cc
+
+commit 3381aebb113d14249f6998a86ebf6b4ec6adc42d
+Author: David Zafman <david.zafman@inktank.com>
+Date: Fri May 16 18:20:11 2014 -0700
+
+ ceph_filestore_dump: Improve debug output by showing actual offset
+
+ Signed-off-by: David Zafman <david.zafman@inktank.com>
+ (cherry picked from commit 44b261d5d1b36528bfbcb37dbd866b615e14be99)
+
+commit 1164b2e1610028a40cddbed09f9da5649bd2023a
+Author: David Zafman <david.zafman@inktank.com>
+Date: Wed May 14 12:36:37 2014 -0700
+
+ ceph_filestore_dump: Use cerr now that we aren't closing stderr
+
+ Signed-off-by: David Zafman <david.zafman@inktank.com>
+ (cherry picked from commit 087c0f9d31e0f3d5bae7eac6231978105a71677e)
+
+commit f224429aa4fcba897be5e438bbb49d1025e2c482
+Author: David Zafman <david.zafman@inktank.com>
+Date: Wed May 14 12:42:21 2014 -0700
+
+ common,ceph_filestore_dump: Add ability for utilities to suppress library dout output
+
+ Suppress dout output with CODE_ENVIRONMENT_UTILITY_NODOUT
+ ceph_filestore_dump turns on dout output if --debug specified
+ When used it can still be enable with --log-to-stderr --err-to-stderr
+
+ Signed-off-by: David Zafman <david.zafman@inktank.com>
+ (cherry picked from commit f7f9b251fc377651d8da4cbfd1942c3b86f3247e)
+
+commit 3f4cabdb84e58fcec0c3f508f980881c59fba948
+Author: David Zafman <david.zafman@inktank.com>
+Date: Tue May 13 18:27:30 2014 -0700
+
+ ceph_filestore_dump: Export omap in batches for large omap case
+
+ New function get_omap_batch()
+ Create a TYPE_OMAP section for each batch
+
+ Signed-off-by: David Zafman <david.zafman@inktank.com>
+ (cherry picked from commit 501dd3c05b8983159a289b021943cb828b908f53)
+
+commit 0b757af5be338b65fd9124ac5158bfe02ad5f899
+Author: David Zafman <david.zafman@inktank.com>
+Date: Mon May 12 15:50:34 2014 -0700
+
+ ceph_filestore_dump: Remove unused bufferlist databl
+
+ Signed-off-by: David Zafman <david.zafman@inktank.com>
+ (cherry picked from commit 398b418e2b9f8260bcfacac8bcebea5beffcceca)
+
+commit 4a742fe29b6d959912a38d132344c695f89dd34f
+Author: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
+Date: Wed May 7 14:12:15 2014 +0200
+
+ ceph_filestore_dump.cc: cleanup includes
+
+ Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
+ (cherry picked from commit 8620609884243596d35b69c571d2da751e63cf2b)
+
+commit 420ea03aa3cd52bd035d31ba111c3d6d0745352d
+Author: Radoslaw Zarzynski <rzarzynski@mirantis.com>
+Date: Thu Jan 29 18:19:16 2015 +0100
+
+ librados: rectify the guard in RadosClient::wait_for_osdmap().
+
+ RadosClient::wait_for_osdmap() did not signalize lack of connection
+ via -ENOTCONN error code when the Objecter instance was allocated.
+ The proper way is to check the connection state explicitly.
+
+ Signed-off-by: Radoslaw Zarzynski <rzarzynski@mirantis.com>
+ (cherry picked from commit 34473f78f101d87d2606e0e7112682a47ff24830)
+
+ Conflicts:
+ src/librados/RadosClient.cc
+ the modified guard was not present: add the new guard instead
+ of modifying it
+
+commit 1b2667211f90a1b630d2ddffe99b0fb00bb3c07c
+Author: Radoslaw Zarzynski <rzarzynski@mirantis.com>
+Date: Mon Jan 19 15:07:21 2015 +0100
+
+ librados: fix resources leakage in RadosClient::connect().
+
+ If RadosClient::connect was called a second time (which could
+ happen as a part of recovery from failure), the instances
+ of Objecter and Messenger allocated by the first call were leaked.
+
+ Additionally, the implementation of the method wrongly reported
+ memory allocation problems -- it throwed std::bad_alloc exception
+ instead of returning -ENOMEM error code.
+
+ Fixes: #10425
+ Signed-off-by: Radoslaw Zarzynski <rzarzynski@mirantis.com>
+ (cherry picked from commit 624c056da093c8741242892413438a291c03c7d5)
+
+ Conflicts:
+ src/librados/RadosClient.cc
+ resolve adding (std::nothrow) that failed because the
+ prototype of the constructor is not the same
+
+commit 4e32ff2b60549742d01b18429810c89f5f707548
+Author: Samuel Just <sjust@redhat.com>
+Date: Fri Dec 5 15:29:52 2014 -0800
+
+ osd_types: op_queue_age_hist and fs_perf_stat should be in osd_stat_t::operator==
+
+ Fixes: 10259
+ Backport: giant, firefly, dumpling
+ Signed-off-by: Samuel Just <sjust@redhat.com>
+ (cherry picked from commit 1ac17c0a662e6079c2c57edde2b4dc947f547f57)
+
+commit 6e58732f546ec6241b198d2473902d66327cdc36
+Author: Joao Eduardo Luis <joao@redhat.com>
+Date: Mon Jan 19 18:49:15 2015 +0000
+
+ mon: PGMonitor: skip zeroed osd stats on get_rule_avail()
+
+ Fixes: #10257
+
+ Signed-off-by: Joao Eduardo Luis <joao@redhat.com>
+ (cherry picked from commit b311e7c36273efae39aa2602c1f8bd90d39e5975)
+
+ Conflicts:
+ src/mon/PGMonitor.cc
+ ceph::unordered_map changed the context, simple resolution
+
+commit bcc8cfb24a96a7874a24760771755088a231a8d7
+Author: Joao Eduardo Luis <joao@redhat.com>
+Date: Fri Jan 16 18:13:05 2015 +0000
+
+ mon: PGMonitor: available size 0 if no osds on pool's ruleset
+
+ get_rule_avail() may return < 0, which we were using blindly assuming it
+ would always return an unsigned value. We would end up with weird
+ values if the ruleset had no osds.
+
+ Signed-off-by: Joao Eduardo Luis <joao@redhat.com>
+ (cherry picked from commit 8be6a6ab2aa5a000a39c73a98b11a0ab32fffa1c)
+
+commit 894c8ad26fd2da203dcbf8eb0ad5e2af0223d5a9
+Author: Joao Eduardo Luis <joao@redhat.com>
+Date: Fri Jan 16 18:12:42 2015 +0000
+
+ mon: PGMonitor: fix division by zero on stats dump
+
+ Signed-off-by: Joao Eduardo Luis <joao@redhat.com>
+ (cherry picked from commit 50547dc3c00b7556e26b9a44ec68640c5c3a2384)
+
+commit 1e58bb49b99118d064c1ca92e42cbfb2786fdaff
+Author: Loic Dachary <ldachary@redhat.com>
+Date: Wed Dec 17 16:06:55 2014 +0100
+
+ crush: set_choose_tries = 100 for erasure code rulesets
+
+ It is common for people to try to map 9 OSDs out of a 9 OSDs total ceph
+ cluster. The default tries (50) will frequently lead to bad mappings for
+ this use case. Changing it to 100 makes no significant CPU performance
+ difference, as tested manually by running crushtool on one million
+ mappings.
+
+ http://tracker.ceph.com/issues/10353 Fixes: #10353
+
+ Signed-off-by: Loic Dachary <ldachary@redhat.com>
+ (cherry picked from commit 2f87ac807f3cc7ac55d9677d2051645bf5396a62)
+
+ Conflicts:
+ src/erasure-code/lrc/ErasureCodeLrc.cc
+ safely ignored because the file does not exist
+
+commit 27dbbb3c312ea68a96b011ccb12394c75c0fb0f3
+Author: Sage Weil <sage@redhat.com>
+Date: Thu Feb 12 13:49:50 2015 -0800
+
+ mon/OSDMonitor: do not trust small values in osd epoch cache
+
+ If the epoch cache says the osd has epoch 100 and the osd is asking for
+ epoch 200+, do not send it 100+.
+
+ Fixes: #10787
+ Backport: giant, firefly
+ Signed-off-by: Sage Weil <sage@redhat.com>
+ (cherry picked from commit a5759e9b97107488a8508f36adf9ca1aba3fae07)
--- /dev/null
+commit 8424145d49264624a3b0a204aedb127835161070 (tag: refs/tags/v0.80.11, refs/remotes/gh/firefly)
+Author: Jenkins Build Slave User <jenkins-build@jenkins-slave-wheezy.localdomain>
+Date: Tue Nov 17 18:57:48 2015 +0000
+
+ 0.80.11
+
+commit 2a14d16712fbe2ee9d7d2aef389e18fcb2809a47
+Merge: c551622 a06179a
+Author: Yuri Weinstein <yuri.weinstein@gmail.com>
+Date: Mon Nov 2 14:34:28 2015 -0800
+
+ Merge pull request #6451 from jcsp/wip-firefly-urls
+
+ qa: http://ceph.com/qa -> http://download.ceph.com/qa
+
+commit a06179acb268b073fcf67fbbf19152c1a5a275af
+Author: Sage Weil <sage@redhat.com>
+Date: Thu Sep 24 18:10:46 2015 -0400
+
+ qa: http://ceph.com/qa -> http://download.ceph.com/qa
+
+ Signed-off-by: Sage Weil <sage@redhat.com>
+ (cherry picked from commit d4d65fbd6ad15320339751c604613ac63511e645)
+
+commit c551622ca21fe044bc1083614c45d888a2a34aeb
+Merge: 241edfa bff2f47
+Author: Loic Dachary <loic@dachary.org>
+Date: Fri Oct 23 21:47:27 2015 +0200
+
+ Merge pull request #5823 from SUSE/wip-11700-firefly
+
+ make the all osd/filestore thread pool suicide timeouts separately configurable
+
+ Reviewed-by: Samuel Just <sjust@redhat.com>
+
+commit 241edfabf6a6c767afc1e283dd7387377ece36c7
+Merge: 07e90f5 f39c791
+Author: Loic Dachary <loic@dachary.org>
+Date: Fri Oct 23 21:01:54 2015 +0200
+
+ Merge pull request #5815 from SUSE/wip-12838-firefly
+
+ Mutex Assert from PipeConnection::try_get_pipe
+
+ Reviewed-by: David Zafman <dzafman@redhat.com>
+ Reviewed-by: Samuel Just <sjust@redhat.com>
+
+commit 07e90f54318c0a6202add4de16f965c6e331d513
+Merge: eaf7dc3 d0d6727
+Author: Loic Dachary <loic@dachary.org>
+Date: Thu Oct 22 18:19:39 2015 +0200
+
+ Merge pull request #5529 from SUSE/wip-12586-firefly
+
+ FileStore calls syncfs(2) even it is not supported
+
+ Reviewed-by: Kefu Chai <kchai@redhat.com>
+
+commit eaf7dc343eb78f09d9a4b1815f6bd6ceb4217ad7
+Merge: a960327 98769f7
+Author: Yehuda Sadeh <yehuda@redhat.com>
+Date: Thu Oct 22 07:44:12 2015 -0700
+
+ Merge pull request #5532 from SUSE/wip-12635-firefly
+
+ swift smoke test fails on TestAccountUTF8
+
+commit a96032738ba1e1cc35f21607eba06e7e241abd97
+Merge: 15f3628 86f9e55
+Author: Yehuda Sadeh <yehuda@redhat.com>
+Date: Thu Oct 22 07:33:02 2015 -0700
+
+ Merge pull request #5997 from SUSE/wip-13178-firefly
+
+ rgw: content length parsing calls strtol() instead of strtoll()
+
+commit 15f362808b7100a5bade24cc78e718b04d391b54
+Merge: e010899 ebba1d5
+Author: Loic Dachary <loic@dachary.org>
+Date: Thu Oct 22 10:45:48 2015 +0200
+
+ Merge pull request #5526 from SUSE/wip-12584-firefly
+
+ OSD crash creating/deleting pools
+
+ Reviewed-by: Samuel Just <sjust@redhat.com>
+
+commit e010899ac9cd4060c09f0f1c754f0840b5149f6b
+Merge: 24ffe4c 8c02376
+Author: Loic Dachary <loic@dachary.org>
+Date: Thu Oct 22 10:43:29 2015 +0200
+
+ Merge pull request #5287 from SUSE/wip-12389-firefly
+
+ PGLog::proc_replica_log: correctly handle case where entries between olog.head and log.tail were split out
+
+ Reviewed-by: Sage Weil <sage@redhat.com>
+ Reviewed-by: Samuel Just <sjust@redhat.com>
+
+commit 24ffe4c5156843ce69cae30087fb767063fd489a
+Merge: f48450b c155df2
+Author: Loic Dachary <loic@dachary.org>
+Date: Wed Oct 21 10:03:13 2015 +0200
+
+ Merge pull request #6328 from dachary/wip-13551-firefly
+
+ qemu workunit refers to apt-mirror.front.sepia.ceph.com
+
+ Reviewed-by: Loic Dachary <ldachary@redhat.com>
+
+commit c155df217287b980e176c3c98ee49753d6378740
+Author: Yuan Zhou <yuan.zhou@intel.com>
+Date: Fri Jun 19 00:02:20 2015 +0800
+
+ qa: Use public qemu repo
+
+ This would allow some external tests outside of sepia lab
+
+ Signed-off-by: Yuan Zhou <yuan.zhou@intel.com>
+ (cherry picked from commit 4731c1e35539c9506ff3fe3141553fad099d0eee)
+
+commit d9ae7d80850b9ea4a84549c3afb4603cf9585b6a
+Author: Sage Weil <sage@redhat.com>
+Date: Thu Apr 16 08:29:41 2015 -0700
+
+ use git://git.ceph.com
+
+ Signed-off-by: Sage Weil <sage@redhat.com>
+ (cherry picked from commit 34c467ba06345eacd2fd0e79c162dfd0b22f0486)
+
+ Conflicts:
+ qa/run_xfstests-obsolete.sh : does not exist in firefly
+ qa/workunits/suites/fsx.sh : trivial resolution
+
+commit f48450bdc70eef7cef8f76bc30f678a6d8d52b78
+Merge: f275ad2 b894b36
+Author: Loic Dachary <loic@dachary.org>
+Date: Wed Oct 21 01:02:08 2015 +0200
+
+ Merge pull request #5822 from SUSE/wip-12837-firefly
+
+ WBThrottle::clear_object: signal on cond when we reduce throttle values
+
+ Reviewed-by: David Zafman <dzafman@redhat.com>
+
+commit f275ad21a48cc4f2812f3ab9e3e9b8b05469c3c7
+Merge: 143e267 81bb6dd
+Author: Loic Dachary <loic@dachary.org>
+Date: Tue Oct 20 21:48:39 2015 +0200
+
+ Merge pull request #6325 from dachary/wip-13041-firefly
+
+ common/Thread:pthread_attr_destroy(thread_attr) when done with it
+
+ Reviewed-by: Loic Dachary <ldachary@redhat.com>
+
+commit 143e267a30ef7aac04fdfa530babab529cf30c1a
+Merge: 725401e 6d396a3
+Author: Loic Dachary <loic@dachary.org>
+Date: Tue Oct 20 21:46:28 2015 +0200
+
+ Merge pull request #6091 from SUSE/wip-13252-firefly
+
+ mon: does not check for IO errors on every transaction
+
+ Reviewed-by: Sage Weil <sage@redhat.com>
+
+commit 725401e05d0fbe41d93b200fe39d73d9dddae80c
+Merge: 8fd4dd7 c85d063
+Author: Loic Dachary <loic@dachary.org>
+Date: Tue Oct 20 21:45:19 2015 +0200
+
+ Merge pull request #6087 from SUSE/wip-13244-firefly
+
+ client nonce collision due to unshared pid namespaces
+
+ Reviewed-by: Josh Durgin <jdurgin@redhat.com>
+
+commit 8fd4dd7480148c664d2c99956a7c987b8707c3c3
+Merge: 77a1b5f 6d82eb1
+Author: Loic Dachary <loic@dachary.org>
+Date: Tue Oct 20 21:44:32 2015 +0200
+
+ Merge pull request #6010 from liewegas/wip-globalid-firefly
+
+ increase globalid default for firefly
+
+ Reviewed-by: Kefu Chai <kchai@redhat.com>
+
+commit 77a1b5f1292d8410a1c29cebb0da449b09a230d3
+Merge: a3823fe 8c14cad
+Author: Loic Dachary <loic@dachary.org>
+Date: Tue Oct 20 21:43:33 2015 +0200
+
+ Merge pull request #5991 from SUSE/wip-13043-firefly
+
+ ThreadPool add/remove work queue methods not thread safe
+
+ Reviewed-by: Josh Durgin <jdurgin@redhat.com>
+
+commit a3823fe76171479e4c8f071f6e8eee3f13a02441
+Merge: e771054 48c929e
+Author: Loic Dachary <loic@dachary.org>
+Date: Tue Oct 20 21:42:28 2015 +0200
+
+ Merge pull request #5988 from SUSE/wip-13038-firefly
+
+ PG::handle_advance_map: on_pool_change after handling the map change
+
+ Reviewed-by: Sage Weil <sage@redhat.com>
+
+commit e771054241fcba536a478f1d014feb20a434fa3f
+Merge: e43d049 cd1396c
+Author: Loic Dachary <loic@dachary.org>
+Date: Tue Oct 20 21:41:19 2015 +0200
+
+ Merge pull request #5820 from SUSE/wip-12845-firefly
+
+ osd/PGLog.cc: 732: FAILED assert(log.log.size() == log_keys_debug.size())
+
+ Reviewed-by: Sage Weil <sage@redhat.com>
+
+commit e43d0492a415be5a0feb361efbfbdda6e00a6234
+Merge: 11ed9f9 2c2ffa1
+Author: Loic Dachary <loic@dachary.org>
+Date: Tue Oct 20 21:40:28 2015 +0200
+
+ Merge pull request #5814 from SUSE/wip-12840-firefly
+
+ recursive lock of md_config_t (0)
+
+ Reviewed-by: Sage Weil <sage@redhat.com>
+
+commit 11ed9f9b263a1d3a8df7996d5644f0f6de7a9b1a
+Merge: aead425 2c0d7fe
+Author: Loic Dachary <loic@dachary.org>
+Date: Tue Oct 20 21:39:32 2015 +0200
+
+ Merge pull request #5813 from SUSE/wip-12822-firefly
+
+ ceph-fuse crash in test_client_recovery
+
+ Reviewed-by: Loic Dachary <ldachary@redhat.com>
+
+commit aead4255528e60a2ccc6f4d47a6cb482bfdccc82
+Merge: 1c65d09 d3c9469
+Author: Loic Dachary <loic@dachary.org>
+Date: Tue Oct 20 21:37:58 2015 +0200
+
+ Merge pull request #5726 from ceph/wip-12752
+
+ is_new_interval() fixes
+
+ Reviewed-by: Sage Weil <sage@redhat.com>
+
+commit 1c65d09ef8de2732cfa6f18d22de2c7b3fac0f0f
+Merge: 1f0f4bb 411769c
+Author: Loic Dachary <loic@dachary.org>
+Date: Tue Oct 20 21:37:01 2015 +0200
+
+ Merge pull request #5698 from tchaikov/wip-12638-firefly
+
+ mon: add a cache layer over MonitorDBStore
+
+ Reviewed-by: Loic Dachary <ldachary@redhat.com>
+
+commit 1f0f4bb5347cb935095dd374d6dcdec44ff175e2
+Merge: 4a1e54f 278d732
+Author: Loic Dachary <loic@dachary.org>
+Date: Tue Oct 20 21:35:56 2015 +0200
+
+ Merge pull request #5619 from liewegas/wip-journal-firefly
+
+ os/FileJournal: Fix journal write fail, align for direct io
+
+ Reviewed-by: Loic Dachary <ldachary@redhat.com>
+ Reviewed-by: Nathan Cutler <ncutler@suse.cz>
+
+commit 4a1e54fc88e43885c57049d1ad4c5641621b6c29
+Merge: f272435 de53add
+Author: Loic Dachary <loic@dachary.org>
+Date: Tue Oct 20 21:31:52 2015 +0200
+
+ Merge pull request #5360 from ceph/wip-11786.firefly
+
+ mon: MonitorDBStore: get_next_key() only if prefix matches
+
+ Reviewed-by: Loic Dachary <ldachary@redhat.com>
+
+commit f272435c1303327e7dae248179387d12e28ea6bc
+Merge: 21452ed e7d08b1
+Author: Loic Dachary <loic@dachary.org>
+Date: Tue Oct 20 21:30:04 2015 +0200
+
+ Merge pull request #5236 from SUSE/wip-12312-firefly
+
+ mon: adding exsting pool as tier with --force-nonempty clobbers removed_snaps
+
+ Reviewed-by: Loic Dachary <ldachary@redhat.com>
+
+commit 21452ed93b707984d5301a51040ba8c311678c9c
+Merge: 14c8528 971eb3f
+Author: Loic Dachary <loic@dachary.org>
+Date: Tue Oct 20 21:28:31 2015 +0200
+
+ Merge pull request #5050 from SUSE/wip-12015-firefly
+
+ LibRadosTwoPools[EC]PP.PromoteSnap failure
+
+ Reviewed-by: Sage Weil <sage@redhat.com>
+
+commit 14c85282399aca29a31566e0f068376b10cb95e6
+Merge: b6d5768 7a8b6fb
+Author: Loic Dachary <loic@dachary.org>
+Date: Tue Oct 20 13:09:38 2015 +0200
+
+ Merge pull request #6207 from SUSE/wip-13417-firefly
+
+ Fix -Wno-format and -Werror=format-security options clash
+
+ Reviewed-by: Loic Dachary <ldachary@redhat.com>
+
+commit b6d57686e1f482bf510e6c6c0ae56cff575f3eca
+Merge: fca8a17 415335d
+Author: Loic Dachary <loic@dachary.org>
+Date: Tue Oct 20 13:08:01 2015 +0200
+
+ Merge pull request #6203 from SUSE/wip-13413-firefly
+
+ fedora21 has junit, not junit4
+
+ Reviewed-by: Loic Dachary <ldachary@redhat.com>
+
+commit fca8a17bbb91ce5b3cb0c6a282cded03fe37956f
+Merge: 6240b61 20ad17d
+Author: Loic Dachary <loic@dachary.org>
+Date: Tue Oct 20 13:06:14 2015 +0200
+
+ Merge pull request #5992 from SUSE/wip-13168-firefly
+
+ upstart: configuration is too generous on restarts
+
+ Reviewed-by: Loic Dachary <ldachary@redhat.com>
+
+commit 6240b61fc48e4f7b306ec18eca51f40081b5160d
+Merge: d2459d8 04b2a87
+Author: Loic Dachary <loic@dachary.org>
+Date: Tue Oct 20 13:04:40 2015 +0200
+
+ Merge pull request #5541 from dachary/wip-12418-firefly
+
+ ceph-disk: sometimes the journal symlink is not created
+
+ Reviewed-by: Loic Dachary <ldachary@redhat.com>
+
+commit d2459d8b9c189e557f81bb7d10dd17cc53cf9af1
+Merge: 3e0e3c5 644f213
+Author: Loic Dachary <loic@dachary.org>
+Date: Tue Oct 20 12:36:01 2015 +0200
+
+ Merge pull request #5729 from ceph/wip-11455-firefly
+
+ rgw: init some manifest fields when handling explicit objs
+
+ Reviewed-by: Loic Dachary <ldachary@redhat.com>
+
+commit 3e0e3c518bf68e9d0ad7a79d804602634b9c6466
+Merge: e44a777 e7931a7
+Author: Loic Dachary <loic@dachary.org>
+Date: Tue Oct 20 12:35:22 2015 +0200
+
+ Merge pull request #5730 from ceph/wip-12537-firefly
+
+ RGW returns requested bucket name raw in "Bucket" response header
+
+ Reviewed-by: Loic Dachary <ldachary@redhat.com>
+
+commit e44a7775fb34ccdf7ff36e5e56aba9a309521be1
+Merge: 028da25 3be204f
+Author: Loic Dachary <loic@dachary.org>
+Date: Tue Oct 20 12:34:01 2015 +0200
+
+ Merge pull request #5831 from gnuoy/wip-11140-firefly
+
+ /etc/init.d/radosgw restart does not work correctly
+
+ Reviewed-by: Loic Dachary <ldachary@redhat.com>
+
+commit 81bb6dd7de8a191c11c16b3cdc07355ef3434435
+Author: zqkkqz <zheng.qiankun@h3c.com>
+Date: Fri Aug 7 10:49:45 2015 +0800
+
+ Common/Thread: pthread_attr_destroy(thread_attr) when done with it
+ When a thread attributes object is no longer required, it should be destroyed using the
+ pthread_attr_destroy() function. Destroying a thread attributes object has no effect on threads that were created using that object.
+
+ Fixes: #12570
+ Signed-off-by: zqkqkz zheng.qiankun@h3c.com
+ (cherry picked from commit 9471bb838a420ef5f439191d87e5388fecccb9e6)
+
+commit 77d6426a8323db91a60f246f385826c35f31521c
+Author: Piotr Dałek <piotr.dalek@ts.fujitsu.com>
+Date: Fri Jul 17 12:43:52 2015 +0200
+
+ Thread.cc: remove malloc/free pair
+
+ There's no need for mallocing pthread_attr_t in Thread::try_create(),
+ it can be located on stack as it is freed in same function. This reduces
+ pressure put on memory manager.
+
+ Signed-off-by: Piotr Dałek <piotr.dalek@ts.fujitsu.com>
+ (cherry picked from commit 614ac0f4e375f3dd008c8937d3f89f6005d6e0a0)
+
+commit 7a8b6fb4c7b80c33dd3565fc4140d45fe70f0438
+Author: Boris Ranto <branto@redhat.com>
+Date: Fri Aug 15 19:34:27 2014 +0200
+
+ Fix -Wno-format and -Werror=format-security options clash
+
+ This causes build failure in latest fedora builds, ceph_test_librbd_fsx adds -Wno-format cflag but the default AM_CFLAGS already contain -Werror=format-security, in previous releases, this was tolerated but in the latest fedora rawhide it no longer is, ceph_test_librbd_fsx builds fine without -Wno-format on x86_64 so there is likely no need for the flag anymore
+
+ Signed-off-by: Boris Ranto <branto@redhat.com>
+ Reviewed-by: Sage Weil <sage@redhat.com>
+ (cherry picked from commit 7df67a544f6401fd31157b6e2a6ca590d87d7cbc)
+
+ Conflicts:
+ src/test/Makefile.am
+
+commit 415335df53bf0d6b42f745b038c1c0c9c4aaa810
+Author: Loic Dachary <ldachary@redhat.com>
+Date: Tue Feb 3 16:14:23 2015 +0100
+
+ ceph.spec.in: junit always except for EPEL 6
+
+ The package was renamed a long time ago (around the Fedora 15
+ timeframe). The "junit4" name is only relevant for EPEL 6. For EPEL 7
+ and Fedora 20, the "junit" package has "Provides: junit4". And most
+ recently, in the junit package that ships in Fedora 21 and 22, the
+ package maintainer dropped the old Provides: line.
+
+ http://tracker.ceph.com/issues/10728 Fixes: #10728
+
+ Signed-off-by: Ken Dreyer <kdreyer@redhat.com>
+ Signed-off-by: Loic Dachary <ldachary@redhat.com>
+ (cherry picked from commit 4f36eaee9ea71ed48018ccb2d7eac3e809c72d82)
+
+commit 98769f7ccf97d6a0c98438f1eab7a5705fb9920b
+Author: Robin H. Johnson <robin.johnson@dreamhost.com>
+Date: Fri Sep 4 01:07:48 2015 +0000
+
+ Fix casing of Content-Type header
+
+ It turns out, despite the HTTP spec declaring that header field names
+ should be case-insensitive, some clients treat them wrongly, and
+ consider "Content-type" to not match "Content-Type".
+
+ CyberDuck was one of those clients, now fixed upstream in
+ https://trac.cyberduck.io/ticket/8999
+
+ To reduce future occurances of this bug, fix the casing of the
+ Content-Type header, to strictly comply with the HTTP specification (be
+ strict about what you send, and generous about what you receive).
+
+ Fixes: #12939
+ Backport: hammer, firefly
+ Signed-off-by: Robin H. Johnson <robin.johnson@dreamhost.com>
+ (cherry picked from commit 1b9fbffdc24160251b96cec820d62fb2a12b6eab)
+
+commit ccf268502b0592f5ff58cd1a5920ec02a117acfb
+Author: Orit Wasserman <owasserm@redhat.com>
+Date: Thu Aug 13 15:02:03 2015 +0200
+
+ rgw: we should not overide Swift sent content type
+
+ Fixes: #12363
+ backport: hammer
+
+ Signed-off-by: Orit Wasserman <owasserm@redhat.com>
+ (cherry picked from commit 423cf136f15df3099c9266f55932542d303c2713)
+
+commit 6829ee29a484a3b7055122addcda06a233d3ce53
+Author: Radoslaw Zarzynski <rzarzynski@mirantis.com>
+Date: Thu Jun 25 18:28:50 2015 +0200
+
+ rgw: send Content-Length in response for GET on Swift account.
+
+ Fixes: #12158
+ Signed-off-by: Radoslaw Zarzynski <rzarzynski@mirantis.com>
+ (cherry picked from commit 5f47b11791cd46ce2771046e4888575869cc9685)
+
+ Conflicts:
+ src/rgw/rgw_rest_swift.cc
+ omit dump_account_metadata() call
+
+commit c9226afd7b9e54a8998bf88dfbd6753b262fdf9d
+Author: Radoslaw Zarzynski <rzarzynski@mirantis.com>
+Date: Tue Jun 23 11:54:09 2015 +0200
+
+ rgw: enforce Content-Type in Swift responses.
+
+ Swift sends Content-Type HTTP header even if the response
+ doesn't contain body. We have this behaviour implemented
+ until applying some changes in end_header() function.
+ Unfortunately, lack of Content-Type causes early exits in
+ many Tempest's tests for Swift API verification.
+
+ Fixes: #12157
+ Signed-off-by: Radoslaw Zarzynski <rzarzynski@mirantis.com>
+ (cherry picked from commit 106aeba206736d4080326f9bc191876bed63370b)
+
+commit 9139fbbc1ab3ae455d2e36b3a768601ccb216801
+Author: Orit Wasserman <owasserm@redhat.com>
+Date: Mon Jun 22 13:51:49 2015 +0200
+
+ rgw: force content_type for swift bucket stats request
+
+ Fixes: 12095
+
+ Signed-off-by: Orit Wasserman <owasserm@redhat.com>
+ (cherry picked from commit da259e4da1329e1e448d75c48c6ee3d1318e19b2)
+
+commit 767f1f74c9f015d6bb3376266ec77a10a2d2c59a
+Author: Orit Wasserman <owasserm@redhat.com>
+Date: Tue Apr 21 12:31:19 2015 +0200
+
+ rgw: force content-type header for swift account responses without body
+
+ This regression was introduced in commit 4cfeca03ade21861ab70ca759f94eb244c16cb39
+
+ Fixes: #11438
+
+ Signed-off-by: Orit Wasserman <owasserm@redhat.com>
+ (cherry picked from commit 009664e560ee37ef6dc170a0155d6c749e151b06)
+
+commit e3da03dd6be04e782c3e5786767bba4b4964fbec
+Author: Orit Wasserman <owasserm@redhat.com>
+Date: Thu Apr 9 20:04:59 2015 +0200
+
+ rgw: shouldn't return content-type: application/xml if content length is 0
+
+ Fixed: #11091
+
+ Signed-off-by: Orit Wasserman <owasserm@redhat.com>
+ (cherry picked from commit 5cc92bb27cfbaee4af24dc312c9b98331f899794)
+
+commit e7d08b1bca951f9a963eb0aeb4cd88abbe5723ba
+Author: Samuel Just <sjust@redhat.com>
+Date: Fri May 8 10:26:48 2015 -0700
+
+ test/librados/tier.cc: destroy and recreate cache pool on every test
+
+ Namespaces are not sufficient with the checks for 11493 in the mon.
+
+ Signed-off-by: Samuel Just <sjust@redhat.com>
+ (cherry picked from commit bef09e0cdb274cb1c87335a2af9ee532d14a4596)
+
+commit d7f53442260dcfc92e7afa8bba2dd116c15e030d
+Author: Sage Weil <sage@redhat.com>
+Date: Wed Apr 29 12:34:25 2015 -0700
+
+ mon: prevent pool with snapshot state from being used as a tier
+
+ If we add a pool with snap state as a tier the snap state gets clobbered
+ by OSDMap::Incremental::propogate_snaps_to_tiers(), and may prevent OSDs
+ from starting. Disallow this.
+
+ Include a test.
+
+ Fixes: #11493
+ Backport: hammer, giant, firefly
+ Signed-off-by: Sage Weil <sage@redhat.com>
+ (cherry picked from commit bbec53edf9e585af4e20bbc9ba9057d6fdfda342)
+
+ Conflicts:
+ qa/workunits/cephtool/test.sh
+ properly co-exist with "# make sure we can't create an ec pool tier"
+ src/mon/OSDMonitor.cc
+ properly co-exist with preceding "if (tp->ec_pool())"
+ (The changes to both files would have applied cleanly if
+ https://github.com/ceph/ceph/pull/5389 had not been merged first.)
+
+commit 028da252d85733fcc7d8495750b9ae97043cb0dd
+Merge: ecabc67 f71a6eb
+Author: Loic Dachary <loic@dachary.org>
+Date: Sat Oct 3 09:40:33 2015 +0200
+
+ Merge pull request #5993 from SUSE/wip-13169-firefly
+
+ update docs to point to download.ceph.com
+
+ Reviewed-by: Ken Dreyer <kdreyer@redhat.com>
+
+commit 971eb3f6dddb509d15e5e4bcfd5e34d42ae2e75b
+Author: Sage Weil <sage@redhat.com>
+Date: Thu Nov 13 22:33:10 2014 -0800
+
+ ceph_test_rados_api_tier: fix cleanup of whiteouts
+
+ Doing a normal DELETE on a whiteout returns ENOENT. Use the IGNORE_CACHE
+ flag to make sure it removes the whiteout, too.
+
+ Fixes: #10052
+ Signed-off-by: Sage Weil <sage@redhat.com>
+ (cherry picked from commit 8dde6a61921798aa188bd69406c8fa7afeb96b45)
+
+ Conflicts:
+ src/test/librados/TestCase.cc
+ for it of type ObjectIterator:
+ - use it->first instead of it->get_oid()
+ - use it->second instead of it->get_locator()
+
+commit b134a629863b4601892db03d7c4377040d556bdd
+Author: Sage Weil <sage@redhat.com>
+Date: Thu Nov 13 22:32:20 2014 -0800
+
+ osd/ReplicatedPG: allow whiteout deletion with IGNORE_CACHE flag
+
+ If the client specifies IGNORE_CACHE, allow a regular DELETE to zap a
+ whiteout. Expand test case to verify this works.
+
+ Signed-off-by: Sage Weil <sage@redhat.com>
+ (cherry picked from commit 34e4d24)
+
+ Conflicts:
+ src/test/librados/tier.cc
+ replaced NObjectIterator -> ObjectIterator
+ replaced cache_ioctx.nobjects_begin -> cache_ioctx.objects_begin
+ replaced cache_ioctx.nobjects_end -> cache_ioctx.objects_end
+ replace it->get_oid() with it->first for it of type ObjectIterator
+
+commit 6d396a322e5ad61a3ca262b1c78a670481ff740c
+Author: Sage Weil <sage@redhat.com>
+Date: Wed Sep 23 10:58:01 2015 -0400
+
+ mon/Elector: do a trivial write on every election cycle
+
+ Currently we already do a small write when the *first* election in
+ a round happens (to update the election epoch). If the backend
+ happens to fail while we are already in the midst of elections,
+ however, we may continue to call elections without verifying we
+ are still writeable.
+
+ Signed-off-by: Sage Weil <sage@redhat.com>
+ (cherry picked from commit ef909ccbdc303cce8a39edef255325127832ff16)
+
+ Conflicts:
+ src/mon/Elector.cc
+ no MonitorDBStore::TransactionRef in firefly
+
+commit d2bfa19077422eea37205fee9ed6fd5f2692f222
+Author: Sage Weil <sage@redhat.com>
+Date: Wed Sep 23 10:58:13 2015 -0400
+
+ mon/MonitorDBStore: assert/crash if there is a write error
+
+ Do this globally intead of relying on teh zillion mon callers to
+ check the error code. There are no cases where we want to
+ tolerate a commit failure.
+
+ Fixes: #13089
+ Signed-off-by: Sage Weil <sage@redhat.com>
+ (cherry picked from commit 2fb7b1f0e33ada7c9a1be3de2f7708eb0760fcef)
+
+commit c85d06384e795ab2717868ce45f01ae93181a6be
+Author: Josh Durgin <jdurgin@redhat.com>
+Date: Mon Sep 21 15:46:42 2015 -0700
+
+ use simplifed messenger constructor for clients
+
+ This is all mechanical except the calculation of the nonce, which is
+ now always randomized for clients.
+
+ Fixes: #13032
+ Signed-off-by: Josh Durgin <jdurgin@redhat.com>
+ (cherry picked from commit a3a8c85b79afef67681c32c57b591c0e0a87a349)
+
+ Conflicts:
+ src/ceph_fuse.cc
+ src/ceph_syn.cc
+ src/libcephfs.cc
+ src/librados/RadosClient.cc
+ src/mds/MDSUtility.cc
+ src/mon/MonClient.cc
+ src/test/mon/test_mon_workloadgen.cc
+ - different arguments to Messenger::create() in firefly
+
+commit ef24b4ec7245959b1960a415617439bc3baac9a3
+Author: Sage Weil <sage@redhat.com>
+Date: Mon Oct 6 21:20:08 2014 -0700
+
+ librados: use Messenger factory method
+
+ Signed-off-by: Sage Weil <sage@redhat.com>
+ (cherry picked from commit 5a860bec48348ed4c09256ccd394b33ace6b4f52)
+
+commit 3a52acde3133aab2a717fefa967b0d404e50e2d8
+Author: Sage Weil <sage@redhat.com>
+Date: Mon Oct 6 08:50:48 2014 -0700
+
+ mon/MonClient: use generic Messenger factory
+
+ Signed-off-by: Sage Weil <sage@redhat.com>
+ (cherry picked from commit e55cb1f68ae1a04cc5d281bea57ee79ef4a8af38)
+
+commit de8da652b6c969aa0446f0d3351f63b012063c71
+Author: Josh Durgin <jdurgin@redhat.com>
+Date: Mon Sep 21 15:20:53 2015 -0700
+
+ msg: add simplified messenger constructor
+
+ Several callers create messengers using exactly the same parameters:
+
+ - reading the ms type from cct that is also passed in
+ - a default entity_name_t::CLIENT
+ - the default features
+
+ Additionally, the nonce should be randomized and not depend on
+ e.g. pid, as it does in several callers now. Clients running in
+ containers can easily have pid collisions, leading to hangs, so
+ randomize the nonce in this simplified constructor rather than
+ duplicating that logic in every caller.
+
+ Daemons have meaningful entity_name_ts, and monitors currently depend
+ on using 0 as a nonce, so make this simple constructer
+ client-specific.
+
+ Related: #13032
+ Signed-off-by: Josh Durgin <jdurgin@redhat.com>
+ (cherry picked from commit e3785b0b5fbff870adbd5f121021b671912386cf)
+
+ Conflicts:
+ src/msg/Messenger.cc
+ - different #includes in firefly
+ - different Messenger::create() arguments in firefly
+
+commit ecabc6796f19c03947bb5b14da4e1b761ff8847f
+Merge: 741dd5b 2e09a2c
+Author: Sage Weil <sage@redhat.com>
+Date: Wed Sep 23 17:09:18 2015 -0400
+
+ Merge pull request #6038 from liewegas/wip-13088
+
+ common/HeartBeat: include types
+
+ Reviewed-by: Kefu Chai <kchai@redhat.com>
+
+commit 2e09a2c22ab885f8ec81dbc55f2c8fc0f2984543
+Author: Sage Weil <sage@redhat.com>
+Date: Wed Sep 23 17:06:52 2015 -0400
+
+ common/RWLock: include assert
+
+ Fixes atomic_t build issue without libatomic-ops.
+
+ Fixes: #13088
+ Signed-off-by: Sage Weil <sage@redhat.com>
+
+commit 741dd5b9433d1592ce91aea70ebec106a1354973
+Author: Sage Weil <sage@redhat.com>
+Date: Tue Sep 22 13:03:49 2015 -0400
+
+ .gitmodules: fix ceph-object-corpus source url
+
+ Fixes: #13196
+ Signed-off-by: Sage Weil <sage@redhat.com>
+
+commit a1997879aa26299519ed157017f8f5715c626dcc
+Merge: ee81812 01dc221
+Author: Sage Weil <sage@redhat.com>
+Date: Tue Sep 22 12:29:08 2015 -0400
+
+ Merge pull request #6000 from SUSE/wip-12097-firefly
+
+ kernel_untar_build fails on EL7
+
+commit ee8181206726712729235e4a5f8d2094a6e72f71
+Merge: bb8b422 4e7de5b
+Author: Yehuda Sadeh <yehuda@redhat.com>
+Date: Mon Sep 21 13:07:49 2015 -0700
+
+ Merge pull request #5234 from SUSE/wip-12244-firefly
+
+ Civetweb RGW appears to report full size of object as downloaded when only partially downloaded
+
+commit bb8b422beac22bd8c2e9c1ecd83e265a3de1a3e6
+Merge: 4b08895 f602263
+Author: Yehuda Sadeh <yehuda@redhat.com>
+Date: Mon Sep 21 12:35:52 2015 -0700
+
+ Merge pull request #4535 from xinxinsh/wip-11416-firefly
+
+ rgw: use correct objv_tracker for bucket instance
+
+commit 6d82eb165fdc91851f702a463022b26c50f5094b (refs/remotes/me/wip-globalid-firefly)
+Author: Sage Weil <sage@redhat.com>
+Date: Sun Jan 18 16:49:20 2015 -0800
+
+ mon: handle case where mon_globalid_prealloc > max_global_id
+
+ This triggers with the new larger mon_globalid_prealloc value. It didn't
+ trigger on the existing cluster I tested on because it already had a very
+ large max.
+
+ Signed-off-by: Sage Weil <sage@redhat.com>
+ (cherry picked from commit bbaf582e5bb54ae35327ffd234e4ccf0f07317db)
+
+commit f545a0f430bf6f1e26983fc0ff20a645697f017c
+Author: Sage Weil <sage@redhat.com>
+Date: Sun Jan 18 10:39:25 2015 -0800
+
+ mon: change mon_globalid_prealloc to 10000 (from 100)
+
+ 100 ids (session 100 authentications) can be consumed quite quickly if
+ the monitor is being queried by the CLI via scripts or on a large cluster,
+ especially if the propose interval is long (many seconds). These live in
+ a 64-bit value and are only "lost" if we have a mon election before they
+ are consumed, so there's no real risk here.
+
+ Backport: giant, firefly
+ Reviewed-by: Joao Eduardo Luis <joao@redhat.com>
+ Signed-off-by: Sage Weil <sage@redhat.com>
+ (cherry picked from commit 1d1215fe5f95c2bafee5b670cdae1353104636a0)
+
+commit 01dc221f280ad25aa556f246414e3c3c42762956
+Author: Greg Farnum <gfarnum@redhat.com>
+Date: Tue Jun 16 08:13:41 2015 -0700
+
+ qa: update to newer Linux tarball
+
+ This should make newer gcc releases happier in their default configuration.
+ kernel.org is now distributing tarballs as .xz files so we change to that
+ as well when decompressing (it is supported by Ubuntu Precise so we should
+ be all good).
+
+ Fixes: #11758
+
+ Signed-off-by: Greg Farnum <gfarnum@redhat.com>
+ (cherry picked from commit 1ea3f47ab806d48ca7b045c2731d344eae3900e1)
+
+ Conflicts:
+ qa/workunits/kernel_untar_build.sh
+ trivial resolution
+
+commit 86f9e55f0c151c0b9a289b475f87b6a11329e6e1
+Author: Yehuda Sadeh <yehuda@redhat.com>
+Date: Fri Jan 30 10:51:52 2015 -0800
+
+ rgw: use strict_strtoll() for content length
+
+ instead of strict_strtol().
+
+ Backport: giant, firefly
+ Fixes: #10701
+
+ Reported-by: Axel Dunkel <ad@dunkel.de>
+ Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
+ (cherry picked from commit 1c25dbafb45caf1b261cfcec15b868a2ba6b5fef)
+
+commit f71a6ebf1b371f9389865a0a33652841726ff77b
+Author: Alfredo Deza <adeza@redhat.com>
+Date: Fri Sep 18 14:13:02 2015 -0400
+
+ doc: correct links to download.ceph.com
+
+ Signed-off-by: Alfredo Deza <adeza@redhat.com>
+ (cherry picked from commit 387d7800359154950431d0984c756f43f21dd9b4)
+
+ Conflicts:
+ doc/install/get-packages.rst
+ preferred the new version in all cases
+
+commit 20ad17d271fb443f6c40591e205e880b5014a4f3
+Author: Sage Weil <sage@redhat.com>
+Date: Wed Jun 3 14:57:34 2015 -0400
+
+ upstart: limit respawn to 3 in 30 mins (instead of 5 in 30s)
+
+ It may take tens of seconds to restart each time, so 5 in 30s does not stop
+ the crash on startup respawn loop in many cases. In particular, we'd like
+ to catch the case where the internal heartbeats fail.
+
+ This should be enough for all but the most sluggish of OSDs and capture
+ many cases of failure shortly after startup.
+
+ Fixes: #11798
+ Signed-off-by: Sage Weil <sage@redhat.com>
+ (cherry picked from commit eaff6cb24ef052c54dfa2131811758e335f19939)
+
+commit 8c14cad0895590f19a6640c945b52213f30a9671
+Author: Jason Dillaman <dillaman@redhat.com>
+Date: Mon Aug 10 19:10:19 2015 -0400
+
+ WorkQueue: add/remove_work_queue methods now thread safe
+
+ These methods were not acquiring the ThreadPool lock when
+ manipulating the work_queue collection. This was causing
+ occasional crashes within librbd when opening and closing
+ images.
+
+ Fixes: #12662
+ Backport: hammer, firefly
+ Signed-off-by: Jason Dillaman <dillaman@redhat.com>
+ (cherry picked from commit 3e18449b01c1ab78d1bbfc1cf111aa9bdbef7b1f)
+
+commit 48c929e689b0fa5138922fcb959be5d05296e59a
+Author: Samuel Just <sjust@redhat.com>
+Date: Thu Aug 27 11:08:33 2015 -0700
+
+ PG::handle_advance_map: on_pool_change after handling the map change
+
+ Otherwise, the is_active() checks in the hitset code can erroneously
+ return true firing off repops stamped with the new epoch which then get
+ cleared in the map change code. The filestore callbacks then pass the
+ interval check and call into a destroyed repop structure.
+
+ Fixes: 12809
+ Backport: hammer,firefly
+ Signed-off-by: Samuel Just <sjust@redhat.com>
+ (cherry picked from commit 14e02bc90a463805f4c3e2de210892067a52514b)
+
+commit 4b0889567d7fe28ef6976f8dbb0d329b03200986
+Merge: 0a740d7 5426421
+Author: Nathan Cutler <presnypreklad@gmail.com>
+Date: Thu Sep 10 11:46:41 2015 +0200
+
+ Merge pull request #5200 from SUSE/wip-12289-firefly
+
+ mon: scrub error (osdmap encoding mismatch?) upgrading from 0.80 to ~0.80.2
+
+ Reviewed-by: Kefu Chai <kchai@redhat.com>
+
+commit de53addac8234037a66cdd45cf8007deba7a0530 (refs/remotes/gh/wip-11786.firefly)
+Author: Joao Eduardo Luis <joao@suse.de>
+Date: Mon Sep 7 14:12:19 2015 +0100
+
+ mon: MonitorDBStore: make get_next_key() work properly
+
+ We introduced a significant bug with 2cc7aee, when we fixed issue #11786.
+ Although that patch would fix the problem described in #11786, we
+ managed to not increment the iterator upon returning the current key.
+ This would have the iterator iterating over the same key, forever and
+ ever.
+
+ Signed-off-by: Joao Eduardo Luis <joao@suse.de>
+ (cherry picked from commit 70d31082fd3dc8c7857994104577f1a3631c678c)
+
+commit 0a740d7b2b62e55056fb96d6423203c47e0f3cf6
+Merge: aeea956 37d16a9
+Author: Nathan Cutler <presnypreklad@gmail.com>
+Date: Wed Sep 9 15:45:37 2015 +0200
+
+ Merge pull request #5388 from SUSE/wip-12490-firefly
+
+ buffer: critical bufferlist::zero bug
+
+ Reviewed-by: Gregory Farnum <gfarnum@redhat.com>
+
+commit aeea9567e8b047b3a67badfcc4e43c880f0efa46
+Merge: 973b74d 6b42b06
+Author: Nathan Cutler <presnypreklad@gmail.com>
+Date: Wed Sep 9 06:10:09 2015 +0200
+
+ Merge pull request #5408 from SUSE/wip-12492-firefly
+
+ the output is wrong when runing ceph osd reweight
+
+ Reviewed-by: Kefu Chai <kchai@redhat.com>
+
+commit 973b74d5b266f4e9e7f992a85b22f42c9fb543b1
+Merge: 79403ba 5445461
+Author: Nathan Cutler <presnypreklad@gmail.com>
+Date: Wed Sep 9 06:07:51 2015 +0200
+
+ Merge pull request #5404 from SUSE/wip-12395-firefly
+
+ register_new_pgs() should check ruleno instead of its index
+
+ Reviewed-by: Kefu Chai <kchai@redhat.com>
+
+commit 79403ba8ce526d65521e6cd2ca2bc06f5fe261b9
+Merge: db44bb2 dc12875
+Author: Nathan Cutler <presnypreklad@gmail.com>
+Date: Wed Sep 9 06:05:39 2015 +0200
+
+ Merge pull request #5199 from SUSE/wip-11980-firefly
+
+ MDSMonitor: handle MDSBeacon messages properly
+
+ Reviewed-by: Kefu Chai <kchai@redhat.com>
+
+commit db44bb29b8b036642c50f5d322b5edd9d51699bb
+Merge: fc699f4 31ff7d1
+Author: Nathan Cutler <presnypreklad@gmail.com>
+Date: Wed Sep 9 06:04:15 2015 +0200
+
+ Merge pull request #5410 from SUSE/wip-12497-firefly
+
+ get pools health'info have error
+
+ Reviewed-by: Kefu Chai <kchai@redhat.com>
+
+commit fc699f42459ab3723f3e63b28a4aa5f481c78fc4
+Merge: 6762295 ea0d67c
+Author: Nathan Cutler <presnypreklad@gmail.com>
+Date: Wed Sep 9 06:01:50 2015 +0200
+
+ Merge pull request #5409 from SUSE/wip-12495-firefly
+
+ pgmonitor: wrong at/near target max“ reporting
+
+ Reviewed-by: Kefu Chai <kchai@redhat.com>
+
+commit 67622955b1cfd0b97ac8d3d96b223995440af0b1
+Merge: c4fa5ef 2f35a41
+Author: Nathan Cutler <presnypreklad@gmail.com>
+Date: Mon Sep 7 14:22:52 2015 +0200
+
+ Merge pull request #5358 from ceph/wip-11470.firefly
+
+ mon: PaxosService: call post_refresh() instead of post_paxos_update()
+
+ Reviewed-by: Joao Eduardo Luis <joao@suse.de>
+
+commit 3be204f6a22be109d2aa8cfd5cee09ec3381d9b2
+Author: Dmitry Yatsushkevich <dyatsushkevich@mirantis.com>
+Date: Tue Mar 17 15:44:52 2015 -0700
+
+ rgw: init script waits until the radosgw stops
+
+ Fixes: #11140
+ Init script waits in stop action until the radowgw daemons stop.
+
+ Signed-off-by: Dmitry Yatsushkevich <dyatsushkevich@mirantis.com>
+ (cherry picked from commit 1cca0c1e91a1e18f82f4d22855e96b2fc947f5ea)
+
+commit c4fa5ef989247404ded7adf5dad4e5316b8af04a
+Merge: beff99b c6f3780
+Author: Nathan Cutler <presnypreklad@gmail.com>
+Date: Mon Sep 7 10:20:27 2015 +0200
+
+ Merge pull request #5403 from SUSE/wip-12393-firefly
+
+ Memory leak in Mutex.cc, pthread_mutexattr_init without pthread_mutexattr_destroy
+
+ Reviewed-by: Kefu Chai <kchai@redhat.com>
+ Reviewed-by: Nathan Cutler <ncutler@suse.com>
+
+commit beff99bc7358ee0625079ca60adbf109986f2285
+Merge: 4a3c178 68508e2
+Author: Nathan Cutler <presnypreklad@gmail.com>
+Date: Sun Sep 6 21:19:55 2015 +0200
+
+ Merge pull request #5225 from SUSE/wip-12266-firefly
+
+ ceph.spec.in: 50-rbd.rules conditional is wrong
+
+ Reviewed-by: Loic Dachary <ldachary@redhat.com>
+
+commit 4a3c17834890b69e0467b65f83b1979328f3d27c
+Merge: 6571cd9 2544a6f
+Author: Nathan Cutler <presnypreklad@gmail.com>
+Date: Sun Sep 6 21:19:42 2015 +0200
+
+ Merge pull request #5217 from SUSE/wip-12268-firefly
+
+ ceph-common needs python-argparse on older distros, but doesn't require it
+
+ Reviewed-by: Loic Dachary <ldachary@redhat.com>
+
+commit bff2f477c4ad86b4bd6e3ca3e637a6168c5c8053
+Author: Nathan Cutler <ncutler@suse.com>
+Date: Sun Sep 6 16:30:35 2015 +0200
+
+ OSD: add scrub_finalize_wq suicide timeout
+
+ Signed-off-by: Nathan Cutler <ncutler@suse.com>
+
+commit 91d4c217e32b8b76fcac49f37879a3f78088694d
+Author: Samuel Just <sjust@redhat.com>
+Date: Wed May 6 10:52:40 2015 -0700
+
+ OSD: add scrub_wq suicide timeout
+
+ Signed-off-by: Samuel Just <sjust@redhat.com>
+ (cherry picked from commit 547a7041edc833f3cc8e04d388574809e30a8af6)
+
+ Conflicts:
+ src/osd/OSD.cc
+ firefly still has scrub_finalize_wq
+
+commit 7f6ec65b7c2ca0174142c1c48f18998d8c586b02
+Author: Samuel Just <sjust@redhat.com>
+Date: Wed May 6 11:02:19 2015 -0700
+
+ OSD: add op_wq suicide timeout
+
+ Signed-off-by: Samuel Just <sjust@redhat.com>
+ (cherry picked from commit 3f2946aa9f9b4b432e8c018283503153a2b1eddc)
+
+ Conflicts:
+ src/osd/OSD.cc
+ adapt op_wq() and peering_wq() calls in OSD::OSD
+ src/osd/OSD.h
+ adapt OpWQ instead of ShardedOpWQ
+
+commit 9ce8ce689009cf8ef749edd320d1c2a73ecc2f90
+Author: Samuel Just <sjust@redhat.com>
+Date: Wed May 6 10:54:31 2015 -0700
+
+ OSD: add remove_wq suicide timeout
+
+ Signed-off-by: Samuel Just <sjust@redhat.com>
+ (cherry picked from commit f2fbfa32a16666be46359f0eab7b04ca80a753f5)
+
+ Conflicts:
+ src/osd/OSD.cc
+ No next_removal_seq(0) in master
+
+commit 6926a64fbd4718b8a5df8e04545bc93c4981e413
+Author: Samuel Just <sjust@redhat.com>
+Date: Wed May 6 10:51:28 2015 -0700
+
+ OSD: add snap_trim_wq suicide timeout
+
+ Signed-off-by: Samuel Just <sjust@redhat.com>
+ (cherry picked from commit e1073a4a577211672148a4112bd633831552d66f)
+
+commit d31d1f6f5b08362779fa6af72690e898d2407b90
+Author: Samuel Just <sjust@redhat.com>
+Date: Wed May 6 10:50:19 2015 -0700
+
+ OSD: add recovery_wq suicide timeout
+
+ Signed-off-by: Samuel Just <sjust@redhat.com>
+ (cherry picked from commit 85311b656852af75bfbbc6699f92fc6aa233c316)
+
+ Conflicts:
+ src/common/config_opts.h
+ place OPTION(osd_command_thread_suicide_timeout, ...)
+ directly after OPTION(osd_command_thread_timeout, ...)
+
+commit f85ec2a52e969f9a7927d0cfacda6a1cc6f2898c
+Author: Samuel Just <sjust@redhat.com>
+Date: Wed May 6 10:49:00 2015 -0700
+
+ OSD: add command_wq suicide timeout
+
+ Signed-off-by: Samuel Just <sjust@redhat.com>
+ (cherry picked from commit df4e5de819c30003cfbe50a071c49039cf534419)
+
+ Conflicts:
+ src/common/config_opts.h
+ place OPTION(osd_command_thread_suicide_timeout, ...)
+ directly after OPTION(osd_command_thread_timeout, ...)
+
+commit b894b368790de3383295372250888ba674502fb1
+Author: Samuel Just <sjust@redhat.com>
+Date: Tue Jul 7 08:49:54 2015 -0700
+
+ WBThrottle::clear_object: signal if we cleared an object
+
+ Fixes: #12223
+ Signed-off-by: Samuel Just <sjust@redhat.com>
+ (cherry picked from commit 8447b08d60d5cf7dce20f8b839cc2cb5a93782de)
+
+commit cd1396cd62c79b177e46cfb57ab6b3b6fdcd227b
+Author: Sage Weil <sage@redhat.com>
+Date: Sun Aug 9 10:46:10 2015 -0400
+
+ osd/PGLog: dirty_to is inclusive
+
+ There are only two callers of mark_dirty_to who do not pass max,
+ and they are both in the merge_log extending tail path. In that
+ case, we want to include the last version specified in the log
+ writeout. Fix the tail extending code to always specify the
+ last entry added, inclusive.
+
+ Fixes: #12652
+ Signed-off-by: Sage Weil <sage@redhat.com>
+ (cherry picked from commit f0ca14df0641daa04eee39d98d8bd0faf46e4e6d)
+
+commit f39c7917a39e445efa8d73178657fc5960772275
+Author: Nathan Cutler <ncutler@suse.com>
+Date: Fri Sep 4 17:38:32 2015 +0200
+
+ osd: Keep a reference count on Connection while calling send_message()
+
+ Fixes: #12437
+
+ Signed-off-by: David Zafman <dzafman@redhat.com>
+ (manual backport of commit a140085)
+
+ Conflicts: src/osd/OSD.cc
+ master has share_map_peer; firefly has osd->_share_map_outgoing
+
+commit 6571cd9a9616637bf32f9ac97a9bd864c0bff856
+Merge: 8edc091 bd25136
+Author: Ken Dreyer <kdreyer@redhat.com>
+Date: Fri Sep 4 11:50:22 2015 -0600
+
+ Merge pull request #5224 from SUSE/wip-12304-firefly
+
+ ceph.spec.in running fdupes unnecessarily
+
+ Reviewed-by: Ken Dreyer <kdreyer@redhat.com>
+
+commit 8edc091df90be6935fcfe59c18d7060c88501556
+Merge: 6053bff 601eadb
+Author: Ken Dreyer <kdreyer@redhat.com>
+Date: Fri Sep 4 11:47:49 2015 -0600
+
+ Merge pull request #5394 from SUSE/wip-12447-firefly
+
+ ceph.spec.in: useless %py_requires breaks SLE11-SP3 build
+
+ Reviewed-by: Ken Dreyer <kdreyer@redhat.com>
+
+commit 2c2ffa1d6d1112dbf52cbbe36f4a5376e17da56a
+Author: Josh Durgin <jdurgin@redhat.com>
+Date: Mon Aug 24 15:40:39 2015 -0700
+
+ config: skip lockdep for intentionally recursive md_config_t lock
+
+ lockdep can't handle recursive locks, resulting in false positive
+ reports for certain set_val_or_die() calls, like via
+ md_config_t::parse_argv() passed "-m".
+
+ Fixes: #12614
+ Signed-off-by: Josh Durgin <jdurgin@redhat.com>
+ (cherry picked from commit 415226995ebe841cc9e8639a3233150a75aecaed)
+
+commit 6053bffa8955953cf40a05f2b22684e77b6003a3
+Merge: 49d416e 5559a5f
+Author: Loic Dachary <loic@dachary.org>
+Date: Fri Sep 4 17:18:30 2015 +0200
+
+ Merge pull request #5043 from SUSE/wip-12007-firefly
+
+ Objecter: pg listing can deadlock when throttling is in use
+
+ Reviewed-by: Yehuda Sadeh <ysadehwe@redhat.com>
+ Reviewed-by: Loic Dachary <ldachary@redhat.com>
+
+commit 2c0d7feeb1c7592887e0408fe4fadaa9b4f659e9
+Author: Loic Dachary <ldachary@redhat.com>
+Date: Thu Aug 13 19:41:47 2015 +0200
+
+ tests: tiering agent and proxy read
+
+ Verify that an object promoted to a cache tier because of a proxy read
+ is evicted as expected.
+
+ http://tracker.ceph.com/issues/12673 Refs: #12673
+
+ Signed-off-by: Loic Dachary <ldachary@redhat.com>
+ (cherry picked from commit 7924231930732bd297d3bd034c8295e96cb81088)
+
+ Conflicts:
+ qa/workunits/cephtool/test.sh
+ resolved by manually adding the new test to TESTS
+
+commit aa911767d9326c8aa37671883892b7d383596960
+Author: Loic Dachary <ldachary@redhat.com>
+Date: Thu Aug 13 13:47:24 2015 +0200
+
+ osd: trigger the cache agent after a promotion
+
+ When a proxy read happens, the object promotion is done in parallel. The
+ agent_choose_mode function must be called to reconsider the situation
+ to protect against the following scenario:
+
+ * proxy read
+ * agent_choose_mode finds no object exists and the agent
+ goes idle
+ * object promotion happens
+ * the agent does not reconsider and eviction does not happen
+ although it should
+
+ http://tracker.ceph.com/issues/12673 Fixes: #12673
+
+ Signed-off-by: Loic Dachary <ldachary@redhat.com>
+ (cherry picked from commit e1f58feb9b1d20b72f2eb2eefdea5982e0cddccd)
+
+commit 49d416e6e2e2f3e1f317978371089f9d92358642
+Merge: 7744518 f93eadd
+Author: Loic Dachary <loic@dachary.org>
+Date: Fri Sep 4 17:08:41 2015 +0200
+
+ Merge pull request #4769 from SUSE/wip-11741-firefly
+
+ crush: take crashes due to invalid arg
+
+ Reviewed-by: Loic Dachary <ldachary@redhat.com>
+
+commit 774451810ff055984b79e1d1875bd6a3468dfb7a
+Merge: fc27b0d f122788
+Author: Nathan Cutler <presnypreklad@gmail.com>
+Date: Fri Sep 4 16:50:45 2015 +0200
+
+ Merge pull request #4788 from SUSE/wip-11801-firefly
+
+ Make it more difficult to delete pools in firefly
+
+ Reviewed-by: Sage Weil <sage@redhat.com>
+
+commit fc27b0dbe074dc15450d7669ea722aa3b605b3b2
+Merge: 055624b da78889
+Author: Loic Dachary <loic@dachary.org>
+Date: Fri Sep 4 16:44:57 2015 +0200
+
+ Merge pull request #5235 from SUSE/wip-12310-firefly
+
+ read on chunk-aligned xattr not handled
+
+ Reviewed-by: Loic Dachary <ldachary@redhat.com>
+
+commit 055624bf9a6480fffefb3c7cf5c3a4d4d73985c1
+Merge: 045c056 46e5dea
+Author: Loic Dachary <loic@dachary.org>
+Date: Fri Sep 4 16:42:28 2015 +0200
+
+ Merge pull request #5389 from SUSE/wip-12391-firefly
+
+ EC pools are not allowed as cache pools, disallow in the mon
+
+ Reviewed-by: Loic Dachary <ldachary@redhat.com>
+
+commit 045c0562f97e7d2c68278fbddb9ca1707bb8d5fd
+Merge: 99612e7 b8e3f6e
+Author: Sage Weil <sage@redhat.com>
+Date: Fri Sep 4 09:42:03 2015 -0400
+
+ Merge pull request #5406 from ceph/wip-12465-firefly
+
+ log: take mutex while opening fd
+
+ Reviewed-by: Sage Weil <sage@redhat.com>
+
+commit 99612e7ed9573f2af36604f7d258535f6feadff3
+Merge: 7f8a397 4a709a4
+Author: Nathan Cutler <presnypreklad@gmail.com>
+Date: Thu Sep 3 12:34:32 2015 +0200
+
+ Merge pull request #4854 from ceph/wip-11769-firefly
+
+ librbd: aio calls may block
+
+ Reviewed-by: Josh Durgin <jdurgin@redhat.com>
+
+commit 7f8a397e38101017ef9783d8ed08bb393a8d8825
+Merge: ea601ef f0d2429
+Author: Loic Dachary <loic@dachary.org>
+Date: Wed Sep 2 07:55:15 2015 +0200
+
+ Merge pull request #5233 from SUSE/wip-12074-firefly
+
+ RGW logfile does not get chowned properly
+
+ Reviewed-by: Loic Dachary <ldachary@redhat.com>
+
+commit 644f213c672f6fe2786e041043fdd55f8399871e (refs/remotes/gh/wip-11455-firefly)
+Author: Yehuda Sadeh <yehuda@redhat.com>
+Date: Wed Aug 26 14:34:30 2015 -0700
+
+ rgw: init some manifest fields when handling explicit objs
+
+ Fixes: #11455
+ When dealing with old manifest that has explicit objs, we also
+ need to set the head size and head object correctly so that
+ code that relies on this info doesn't break.
+
+ Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
+ (cherry picked from commit d7bf8cb594e5276d1c80544f5ec954d52b159750)
+
+commit e7931a73df1ab77feb1c2ece13e3de3989ef7a0e
+Author: Yehuda Sadeh <yehuda@redhat.com>
+Date: Thu Jul 30 14:47:15 2015 -0700
+
+ rgw: url encode exposed bucket
+
+ Fixes: #12537
+ Don't send the bucket name back without url encoding it.
+
+ Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
+ (cherry picked from commit ad5507fe0bf72ed5bdf8353e315cc9092c740144)
+
+commit 558c52955d464827630e0aa2fed970df987bb036
+Author: Wido den Hollander <wido@42on.com>
+Date: Wed Jun 3 13:13:33 2015 +0200
+
+ rgw: Do not enclose the Bucket header in quotes
+
+ Fixes: #11860
+ Signed-off-by: Wido den Hollander <wido@42on.com>
+ (cherry picked from commit 8af25faed93fe02d3dad585b8579ce8b041cc4e6)
+
+commit d3c94698e4e852bef3e65fbf439f5f209fbc0b25 (refs/remotes/gh/wip-12752)
+Author: Jason Dillaman <dillaman@redhat.com>
+Date: Fri Aug 21 11:32:39 2015 -0400
+
+ Objecter: pg_interval_t::is_new_interval needs pgid from previous pool
+
+ When increasing the pg_num of a pool, an assert would fail since the
+ calculated pgid seed would be for the pool's new pg_num value instead
+ of the previous pg_num value.
+
+ Fixes: #10399
+ Backport: infernalis, hammer, firefly
+ Signed-off-by: Jason Dillaman <dillaman@redhat.com>
+ (cherry picked from commit f20f7a23e913d09cc7fc22fb3df07f9938ddc144)
+
+ Conflicts: (hobject_t sort order not backported, trivial resolution)
+ src/osdc/Objecter.cc
+ src/osdc/Objecter.h
+
+commit 56d267b7ae02070a7d7ed247990b84124fd62411
+Author: Samuel Just <sjust@redhat.com>
+Date: Tue May 26 12:35:11 2015 -0700
+
+ osd_types::is_new_interval: size change triggers new interval
+
+ Fixes: 11771
+ Signed-off-by: Samuel Just <sjust@redhat.com>
+ (cherry picked from commit ff79959c037a7145f7104b06d9e6a64492fdb95f)
+
+commit 411769c1461c11611b479bd826c72c56b3ce47c5
+Author: Kefu Chai <kchai@redhat.com>
+Date: Mon Aug 10 04:25:03 2015 -0700
+
+ mon: add a cache layer over MonitorDBStore
+
+ the cache of of leveldb does not perform well under some condition,
+ so we need a cache in our own stack.
+
+ * add an option "mon_osd_cache_size" to control the size of cache size
+ of MonitorDBStore.
+
+ Fixes: #12638
+ Signed-off-by: Kefu Chai <kchai@redhat.com>
+ (cherry picked from commit 5e99a578050976ca22b549812ac80d494fe7041d)
+
+ Conflicts:
+ src/mon/OSDMonitor.h
+ minor differences in OSDMonitor ctor
+
+commit 278d732ecd3594cd76e172d78ce3ec84e58e178b (refs/remotes/me/wip-journal-firefly)
+Author: Sage Weil <sage@redhat.com>
+Date: Thu Jan 15 11:20:18 2015 -0800
+
+ os/FileJournal: Fix journal write fail, align for direct io
+
+ when config journal_zero_on_create true, osd mkfs will fail when zeroing journal.
+ journal open with O_DIRECT, buf should align with blocksize.
+
+ Backport: giant, firefly, dumpling
+ Signed-off-by: Xie Rui <875016668@qq.com>
+ Reviewed-by: Sage Weil <sage@redhat.com>
+ (cherry picked from commit 80473f63853593e53d72f17c098152caf17f5e9e)
+
+commit d0d6727762ebda858065101635935df3d44a18ad
+Author: Kefu Chai <kchai@redhat.com>
+Date: Wed Jul 29 15:52:19 2015 +0800
+
+ common/syncfs: fall back to sync(2) if syncfs(2) not available
+
+ Fixes: #12512
+ Signed-off-by: Kefu Chai <kchai@redhat.com>
+ (cherry picked from commit 08210d6a85527b0759f6dc4411f742bc13a4939f)
+
+commit 40494c6e479c2ec4dfe5f6c2d6aef3b6fa841620
+Author: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
+Date: Thu Mar 12 17:38:27 2015 +0100
+
+ sync_filesystem.h: fix unreachable code
+
+ Fix for:
+
+ CID 1264460 (#1 of 1): Structurally dead code (UNREACHABLE)
+ unreachable: This code cannot be reached: sync();
+
+ Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
+ (cherry picked from commit 9921836e982818b92e20280eecb74e701523045c)
+
+commit 3dbbc86ad6d1e7131bbe49a4eff1557d7da9822f
+Author: Jianpeng Ma <jianpeng.ma@intel.com>
+Date: Thu Jan 8 10:29:37 2015 +0800
+
+ mon, os: check the result of sync_filesystem.
+
+ Signed-off-by: Jianpeng Ma <jianpeng.ma@intel.com>
+ (cherry picked from commit 27cb78bd3b2dde40c70de245769d1c0ec252533b)
+
+commit 7fa6fdc6c5e52f11456e4bea4ae32fd62248c80b
+Author: Jianpeng Ma <jianpeng.ma@intel.com>
+Date: Wed Jan 7 15:28:37 2015 +0800
+
+ common: Don't call ioctl(BTRFS_IOC_SYNC) in sync_filesystem.
+
+ From the manual of syncfs, it first appeared in Linux 2.6.39. At this
+ point, btrfs didn't as a stable production. So remove this.
+
+ Signed-off-by: Jianpeng Ma <jianpeng.ma@intel.com>
+ (cherry picked from commit 397b261630dccc656f6eca509f4c70173c8d8d8f)
+
+commit 9f15ed5bb5a837727cb3bef70508e056c125a518
+Author: Jianpeng Ma <jianpeng.ma@intel.com>
+Date: Wed Jan 7 15:26:08 2015 +0800
+
+ common: Directly return the result of syncfs().
+
+ In commit 808c644248e4, it will try sync() if syncfs() return error.
+ No evidence prove this way can work. And sync() don't return result
+ so make this function always return zero which cause filestore omit the
+ error.
+
+ Signed-off-by: Jianpeng Ma <jianpeng.ma@intel.com>
+ (cherry picked from commit 3f7faa4d8d3af3d2e3889c23290b016f27d36386)
+
+commit ea601efc6c693ba8041509c98756fa8c49b9c13a
+Merge: 50fa963 a128ce3
+Author: Nathan Cutler <presnypreklad@gmail.com>
+Date: Wed Aug 12 09:43:19 2015 +0200
+
+ Merge pull request #5390 from SUSE/wip-12503-firefly
+
+ rgw/logrotate.conf calls service with wrong init script name
+
+ Reviewed-by: Ken Dreyer <kdreyer@redhat.com>
+
+commit 50fa9636d0c5e8946fa410891623e2c8363e2067
+Merge: abe6c03 d4ef556
+Author: Yehuda Sadeh <yehuda@redhat.com>
+Date: Tue Aug 11 11:27:16 2015 -0700
+
+ Merge pull request #4765 from SUSE/wip-11721-firefly
+
+ rgw: Keystone PKI token expiration is not enforced
+
+commit 04b2a878b1329202758465cf8e9b0f874cbeeef5
+Author: Dan van der Ster <daniel.vanderster@cern.ch>
+Date: Tue Nov 18 15:51:46 2014 +0100
+
+ ceph-disk: don't change the journal partition uuid
+
+ We observe that the new /dev/disk/by-partuuid/<journal_uuid>
+ symlink is not always created by udev when reusing a journal
+ partition. Fix by not changing the uuid of a journal partition
+ in this case -- instead we can reuse the existing uuid (and
+ journal_symlink) instead. We also now assert that the symlink
+ exists before further preparing the OSD.
+
+ Fixes: #10146
+ Signed-off-by: Dan van der Ster <daniel.vanderster@cern.ch>
+ Tested-by: Dan van der Ster <daniel.vanderster@cern.ch>
+ (cherry picked from commit 29eb1350b4acaeabfe1d2b19efedbce22641d8cc)
+
+commit e57e6f5da10a62f2f4d7b1a6a734a095ed494ebe
+Author: Dan van der Ster <daniel.vanderster@cern.ch>
+Date: Mon Sep 29 13:20:10 2014 +0200
+
+ ceph-disk: set guid if reusing a journal partition
+
+ When reusing a journal partition (e.g. /dev/sda2) we should set a
+ new partition guid and link it correctly with the OSD. This way
+ the journal is symlinked by its persistent name and ceph-disk list
+ works correctly.
+
+ Signed-off-by: Dan van der Ster <daniel.vanderster@cern.ch>
+ (cherry picked from commit beff616f506b96eb52285f0d2e268e10f8edaa2c)
+
+commit ebba1d59b5e4bc11cbdfcda4e480639f7d9e1498
+Author: John Spray <john.spray@redhat.com>
+Date: Thu Jul 30 14:20:56 2015 +0100
+
+ osd/OSDMap: handle incrementals that modify+del pool
+
+ Because new_pools was processed after old_pools, if something
+ was modified and then deleted in the same incremental
+ map, then the resulting state would be a pool in the map
+ that had no entry in pool_name.
+
+ Fixes: #12429
+ Signed-off-by: John Spray <john.spray@redhat.com>
+ (cherry picked from commit 8d4932e721e32a33c1bada54e11d4ecccd868618)
+
+commit 31ff7d14e801ef7b7dff3b050094f1eceacf75dd
+Author: renhwztetecs <rhwlyw@163.com>
+Date: Tue Jul 21 18:55:00 2015 +0800
+
+ Update OSDMonitor.cc
+
+ OSDMonitor::get_pools_health(), s/objects/bytes/
+
+ Fixes: #12402
+ Signed-off-by: ren.huanwen@zte.com.cn
+ (cherry picked from commit 7fc13c9d6b9a4962d7640240416105d8f558d600)
+
+commit ea0d67c482659dfb8c08055a77f400d0689866e0
+Author: huangjun <hjwsm1989@gmail.com>
+Date: Mon Jul 20 10:50:20 2015 +0800
+
+ mon/PGMonitor: avoid uint64_t overflow when checking pool 'target/max' status.
+ Fixes: #12401
+
+ Signed-off-by: huangjun <hjwsm1989@gmail.com>
+
+ (cherry picked from commit f84e6b8157e78fd05cd1c8ac957c92df17e6ba06)
+
+commit 6b42b06239426e5ec54dfaa82f48abca56f824ca
+Author: Joao Eduardo Luis <joao@suse.de>
+Date: Tue Jul 21 11:20:53 2015 +0100
+
+ mon: OSDMonitor: fix hex output on 'osd reweight'
+
+ Fixes: #12251
+
+ Signed-off-by: Joao Eduardo Luis <joao@suse.de>
+ (cherry picked from commit 787fa80c2746fde44ac0583ff7995ec5be9a672d)
+
+commit 5445461ba08fa5b2e12a951a1432916224d3f668
+Author: Xinze Chi <xmdxcxz@gmail.com>
+Date: Fri Jul 3 18:27:13 2015 +0800
+
+ mon/PGMonitor: bug fix pg monitor get crush rule
+
+ when some rules have been deleted before, the index in array of crush->rules
+ is not always equals to crush_ruleset of pool.
+
+ Fixes: #12210
+ Reported-by: Ning Yao <zay11022@gmail.com>
+ Signed-off-by: Xinze Chi <xmdxcxz@gmail.com>
+ (cherry picked from commit 498793393c81c0a8e37911237969fba495a3a183)
+
+commit c6f37807d04af66fbed24e75776aed1b44241150
+Author: Ketor Meng <d.ketor@gmail.com>
+Date: Tue May 26 18:50:17 2015 +0800
+
+ Mutex: fix leak of pthread_mutexattr
+
+ Need pthread_mutexattr_destroy after pthread_mutexattr_init
+
+ Fixes: #111762
+ Signed-off-by: Ketor Meng <d.ketor@gmail.com>
+ (cherry picked from commit 2b23327b3aa8d96341d501a5555195ca1bc0de8f)
+
+commit 601eadbf707597d9a1572efbdf86b22ff6813602
+Author: Nathan Cutler <ncutler@suse.com>
+Date: Thu Jul 9 11:51:13 2015 +0200
+
+ ceph.spec.in: drop SUSE-specific %py_requires macro
+
+ %py_requires expands to
+
+ BuildRequires: /usr/bin/python
+ PreReq: python = 2.7
+
+ The BuildRequires: is already provided, and the PreReq is wrong because
+ e.g. SLE11-SP3 (a platform we are trying to support) has Python 2.6.
+
+ http://tracker.ceph.com/issues/12351 Fixes: #12351
+
+ Signed-off-by: Nathan Cutler <ncutler@suse.com>
+ (cherry picked from commit cbf6c7b46b42e163950bf7956e5b7565fca961c9)
+
+ Conflicts:
+ ceph.spec.in
+ in master, the %py_requires is in the python-rados package,
+ while in firefly it is in the python-ceph package
+
+commit a128ce37038ef6e44c8d7bd082ba196583974ef7
+Author: wuxingyi <wuxingyi2015@outlook.com>
+Date: Wed Mar 11 17:34:40 2015 +0800
+
+ rgw/logrotate.conf: Rename service name
+
+ The service name for ceph rados gateway was changed to "ceph-radosgw",
+ the previous version of service name "radosgw" would cause a failed reload,
+ and finally make it impossible to write any log data to the log file.
+
+ Signed-off-by: wuxingyi <wuxingyi2015@outlook.com>
+ (cherry picked from commit 9df3f798179481fe8ae6ae873dcb793de7d8f367)
+
+commit 46e5deabebeeb047783cfc980aa28a3df46eeeca
+Author: Samuel Just <sjust@redhat.com>
+Date: Fri May 15 13:05:40 2015 -0700
+
+ OSDMonitor: disallow ec pools as tiers
+
+ Fixes: 11650
+ Signed-off-by: Samuel Just <sjust@redhat.com>
+ (cherry picked from commit 11b7801bb57cb25cd2d26d58722d49691747725b)
+
+ Conflicts:
+ qa/workunits/cephtool/test.sh
+ no "# make sure we can't clobber snapshot state" tests in firefly
+ src/mon/OSDMonitor.cc
+ no tp->removed_snaps.empty() in firefly
+
+commit 37d16a9e572580eeae86a2bae6d4ddd0299fb833
+Author: Haomai Wang <haomaiwang@gmail.com>
+Date: Thu Jul 9 13:32:03 2015 +0800
+
+ UnittestBuffer: Add bufferlist zero test case
+
+ Signed-off-by: Haomai Wang <haomaiwang@gmail.com>
+ (cherry picked from commit 577acf665948e531e50d36f5780ea19351a5bf65)
+
+commit 4443acdbef1148e0261bce25f7d7a3433e09cecc
+Author: Haomai Wang <haomaiwang@gmail.com>
+Date: Thu Jul 9 13:42:42 2015 +0800
+
+ buffer: Fix bufferlist::zero bug with special case
+
+ Fixes: #12252
+ Signed-off-by: Haomai Wang <haomaiwang@gmail.com>
+ (cherry picked from commit 43f583d160ccaf879eaf0f3020e77860cf8d1df0)
+
+commit d52187019d321fe8a2dc54fe8a67a5139c310db1
+Author: Joao Eduardo Luis <joao@suse.de>
+Date: Wed May 27 22:28:49 2015 +0100
+
+ mon: MonitorDBStore: get_next_key() only if prefix matches
+
+ get_next_key() had a bug in which we would always return the first key
+ from the iterator, regardless of whether its prefix had been specified
+ to the iterator.
+
+ Fixes: #11786
+
+ Signed-off-by: Joao Eduardo Luis <joao@suse.de>
+ (cherry picked from commit 2cc7aee1abe40453093306c8fef2312b650dff5d)
+
+commit 2f35a415dcd31683151defb0ddb1a6d5696c7051
+Author: Joao Eduardo Luis <joao@suse.de>
+Date: Fri Jun 12 19:21:10 2015 +0100
+
+ mon: PaxosService: call post_refresh() instead of post_paxos_update()
+
+ Whenever the monitor finishes committing a proposal, we call
+ Monitor::refresh_from_paxos() to nudge the services to refresh. Once
+ all services have refreshed, we would then call each services
+ post_paxos_update().
+
+ However, due to an unfortunate, non-critical bug, some services (mainly
+ the LogMonitor) could have messages pending in their
+ 'waiting_for_finished_proposal' callback queue [1], and we need to nudge
+ those callbacks.
+
+ This patch adds a new step during the refresh phase: instead of calling
+ directly the service's post_paxos_update(), we introduce a
+ PaxosService::post_refresh() which will call the services
+ post_paxos_update() function first and then nudge those callbacks when
+ appropriate.
+
+ [1] - Given the monitor will send MLog messages to itself, and given the
+ service is not readable before its initial state is proposed and
+ committed, some of the initial MLog's would be stuck waiting for the
+ proposal to finish. However, by design, we only nudge those message's
+ callbacks when an election finishes or, if the leader, when the proposal
+ finishes. On peons, however, we would only nudge those callbacks if an
+ election happened to be triggered, hence the need for an alternate path
+ to retry any message waiting for the initial proposal to finish.
+
+ Fixes: #11470
+
+ Signed-off-by: Joao Eduardo Luis <joao@suse.de>
+ (cherry picked from commit 1551ebb63238073d2fd30201e6b656a8988e958c)
+
+commit b8e3f6e190809febf80af66415862e7c7e415214
+Author: Samuel Just <sjust@redhat.com>
+Date: Fri Jul 24 15:38:18 2015 -0700
+
+ Log::reopen_log_file: take m_flush_mutex
+
+ Otherwise, _flush() might continue to write to m_fd after it's closed.
+ This might cause log data to go to a data object if the filestore then
+ reuses the fd during that time.
+
+ Fixes: #12465
+ Backport: firefly, hammer
+ Signed-off-by: Samuel Just <sjust@redhat.com>
+ (cherry picked from commit 8778ab3a1ced7fab07662248af0c773df759653d)
+
+ - modified to drop m_flush_mutex_holder, which isn't present in firefly
+
+commit abe6c03d411f5f1d277f910ae87123309fa95d4a
+Merge: 5df7273 9614e4d
+Author: Nathan Cutler <presnypreklad@gmail.com>
+Date: Sat Jul 25 13:51:43 2015 +0200
+
+ Merge pull request #4583 from SUSE/wip-11542-firefly
+
+ rgw: Change variable length array of std::strings (not legal in C++) to std::vector<std::string>
+
+ Reviewed-by: Sage Weil <sage@redhat.com>
+
+commit 5df727379b63abb25421a32c95fdda9a0b62eeac
+Merge: 2a77154 8c573c8
+Author: Nathan Cutler <presnypreklad@gmail.com>
+Date: Sat Jul 25 13:50:06 2015 +0200
+
+ Merge pull request #4584 from SUSE/wip-8911-firefly
+
+ rgw: doesn't return 'x-timestamp' in header which is used by 'View Details' of OpenStack
+
+ Reviewed-by: Sage Weil <sage@redhat.com>
+
+commit 2a77154b4abcd4eebc8d1a315f7beeeabaf2213b
+Merge: 64c3a64 d78e31f
+Author: Nathan Cutler <presnypreklad@gmail.com>
+Date: Sat Jul 25 13:48:31 2015 +0200
+
+ Merge pull request #4642 from SUSE/wip-11323-firefly
+
+ rgw: quota not respected in POST object
+
+ Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
+
+commit 64c3a645c4dba1846532997758c5d7c3a42760b2
+Merge: f11df3c 177ef55
+Author: Nathan Cutler <presnypreklad@gmail.com>
+Date: Sat Jul 25 13:24:39 2015 +0200
+
+ Merge pull request #4641 from SUSE/wip-11149-firefly
+
+ rgw: delete bucket does not remove .bucket.meta file
+
+ Reviewed-by: Yahuda Sadeh <yehuda@redhat.com>
+
+commit f11df3c7819a5f8dd5336be7dbe43e0f21dbb394
+Merge: 090bd12 2ee6e9a
+Author: Nathan Cutler <presnypreklad@gmail.com>
+Date: Sat Jul 25 13:21:31 2015 +0200
+
+ Merge pull request #5170 from SUSE/wip-12039-firefly
+
+ rgw: Swift API: response for PUT on /container does not contain the mandatory Content-Length header when FCGI is used
+
+ Reviewed-by: Yahuda Sadeh <yehuda@redhat.com>
+
+commit 090bd126e15acacc46bce3271d2aa0cfa889b499
+Merge: 94060b7 2d5d8da
+Author: Nathan Cutler <presnypreklad@gmail.com>
+Date: Sat Jul 25 13:20:15 2015 +0200
+
+ Merge pull request #4762 from SUSE/wip-11754-firefly
+
+ rgw: Object copy bug
+
+ Reviewed-by: Yahuda Sadeh <yehuda@redhat.com>
+
+commit 94060b78a2e9b38422a951664dd4f37a6f52316f
+Merge: b9f45fe 3223bd6
+Author: Josh Durgin <jdurgin@redhat.com>
+Date: Fri Jul 24 11:42:58 2015 -0700
+
+ Merge pull request #5171 from SUSE/wip-12240-firefly
+
+ librbd: internal.cc: 1967: FAILED assert(watchers.size() == 1)
+
+ Reviewed-by: Josh Durgin <jdurgin@redhat.com>
+
+commit b9f45fe7816da1ce1fcbfd2a60fe370abe0f1848
+Merge: 57bbc8e 9845258
+Author: Josh Durgin <jdurgin@redhat.com>
+Date: Fri Jul 24 11:26:23 2015 -0700
+
+ Merge pull request #4639 from SUSE/wip-7385-firefly
+
+ librbd: Objectcacher setting max object counts too low
+
+ Reviewed-by: Josh Durgin <jdurgin@redhat.com>
+
+commit 8c02376bd58d463f742966b67fa075a59b5f4269
+Author: Nathan Cutler <ncutler@suse.com>
+Date: Fri Jul 24 18:50:03 2015 +0200
+
+ TestPGLog: fix invalid proc_replica_log test case
+
+ If 1'3 is non-divergent, no osd could correctly have created 2'3. Also,
+ proc_replica_log does not add the extra entries from the auth log to the
+ missing set, that happens later on in activate.
+
+ Signed-off-by: Samuel Just <sjust@redhat.com>
+ (cherry picked from commit 1333b676dba4ed4b5db854fe935bdadbf9f21d08)
+
+ Conflicts:
+ src/test/osd/TestPGLog.cc
+ "sjustm: set_hash() method just does hash = and then rebuilds a cache,
+ but the cache does not exist in firefly so hash = will do fine"
+
+ Signed-off-by: Nathan Cutler <ncutler@suse.com>
+
+commit 4a709a450987cc90126b11a20c1c762d4fbfcea9
+Author: Jason Dillaman <dillaman@redhat.com>
+Date: Tue Jun 2 10:33:35 2015 -0400
+
+ tests: verify librbd blocking aio code path
+
+ Signed-off-by: Jason Dillaman <dillaman@redhat.com>
+ (cherry picked from commit 4cf41486e9c9e1efcb863960a8f3e0326ffca7e5)
+
+commit 4501e90d9b667310a222c3616a7b1f1fb382f997
+Author: Jason Dillaman <dillaman@redhat.com>
+Date: Mon Jun 1 22:56:11 2015 -0400
+
+ librbd: new rbd_non_blocking_aio config option
+
+ Setting this option to false reverts librbd to legacy behavior
+ where AIO operations could potentially block.
+
+ Signed-off-by: Jason Dillaman <dillaman@redhat.com>
+ (cherry picked from commit 769cad12716b85d87eacc1069dd9f5c21cad3915)
+
+ Conflicts:
+ src/common/config_opts.h: trivial resolution
+ src/librbd/librbd.cc: trivial resolution
+
+commit 68863968dd734fc45557dca100c8a0a5060cbd8b
+Author: Jason Dillaman <dillaman@redhat.com>
+Date: Thu Apr 9 20:34:28 2015 -0400
+
+ PendingReleaseNotes: document changes to librbd's aio_read methods
+
+ Signed-off-by: Jason Dillaman <dillaman@redhat.com>
+
+commit 861c20bb2cc05a13a45b0e2368c591212e4eda72
+Author: Jason Dillaman <dillaman@redhat.com>
+Date: Wed Apr 8 21:55:36 2015 -0400
+
+ tests: update librbd AIO tests to remove result code
+
+ Signed-off-by: Jason Dillaman <dillaman@redhat.com>
+
+ Conflicts:
+ src/test/librbd/test_librbd.cc: trivial resolution
+
+commit 4e7cf6115798dd339efe41a528aac148be640b29
+Author: Jason Dillaman <dillaman@redhat.com>
+Date: Thu Apr 9 13:33:09 2015 -0400
+
+ librbd: AioRequest::send no longer returns a result
+
+ The librados calls used by AioRequest::send should always return
+ zero unless there is a bug.
+
+ Signed-off-by: Jason Dillaman <dillaman@redhat.com>
+ (cherry picked from commit c77bce3311ab62892eb8c1d883263ba7ed663b20)
+
+ Conflicts:
+ src/librbd/AioRequest.cc: trivial resolution
+ src/librbd/AioRequest.h: trivial resolution
+ src/librbd/internal.cc: trivial resolution
+
+commit 0ccf47bf9f070ff7fe4e1dd3d3c3e3daa1f621c4
+Author: Jason Dillaman <dillaman@redhat.com>
+Date: Wed Apr 8 21:37:50 2015 -0400
+
+ librbd: internal AIO methods no longer return result
+
+ All failures should be returned via the AioCompletion.
+
+ Signed-off-by: Jason Dillaman <dillaman@redhat.com>
+ (cherry picked from commit 9ab42d613128ab08c688ddbea93df4c95068b9cd)
+
+ Conflicts:
+ src/librbd/AioRequest.cc: trivial resolution
+ src/librbd/internal.cc: trivial resolution
+ src/librbd/internal.h: trivial resolution
+
+commit e48040413849c5d3a577addff644502858ac5a66
+Author: Jason Dillaman <dillaman@redhat.com>
+Date: Wed Apr 8 21:48:21 2015 -0400
+
+ Throttle: added pending_error method to SimpleThrottle
+
+ Allow the client of SimpleThrottle to detect an async error
+ so that it can exit early.
+
+ Signed-off-by: Jason Dillaman <dillaman@redhat.com>
+ (cherry picked from commit b88b88c5df91325fb713c2031a56bffe421268e0)
+
+commit 8ec341ee8f256e8ab91a931f6005e1ebd4b1db60
+Author: Jason Dillaman <dillaman@redhat.com>
+Date: Wed Apr 8 20:18:50 2015 -0400
+
+ librbd: add new fail method to AioCompletion
+
+ Helper method to handle passing fatal errors generated within
+ librbd (not from the OSDs) back to the client.
+
+ Signed-off-by: Jason Dillaman <dillaman@redhat.com>
+ (cherry picked from commit 6d1d0c867855a96bee4c13a0c0a39a0e002ccd12)
+
+ Conflicts:
+ src/librbd/AioCompletion.cc: trivial resolution
+ src/librbd/AioCompletion.h: trivial resolution
+
+commit eed8ce258d116e837d8777f246f31c21a03ceb74
+Author: Jason Dillaman <dillaman@redhat.com>
+Date: Wed Apr 8 19:06:52 2015 -0400
+
+ librbd: avoid blocking AIO API methods
+
+ Enqueue all AIO API methods within the new librbd thread pool to
+ reduce the possibility of any blocking operations. To maintain
+ backwards compatibility with the legacy return codes of the API's
+ AIO methods, it's still possible to block attempting to acquire
+ the snap_lock.
+
+ Fixes: #11056
+ Signed-off-by: Jason Dillaman <dillaman@redhat.com>
+ (cherry picked from commit 3a7b5e30efdb21aa1a0aeb68a5d02a1ac2a5faf3)
+
+ Conflicts:
+ src/librbd/librbd.cc: trivial resolution
+
+commit 220a23e8d99882838626d5647f9c055eefeb28c6
+Author: Jason Dillaman <dillaman@redhat.com>
+Date: Wed Apr 8 17:24:08 2015 -0400
+
+ librbd: add task pool / work queue for AIO requests
+
+ Signed-off-by: Jason Dillaman <dillaman@redhat.com>
+ (cherry picked from commit afb896d91f886b647baf38f7ec94cc3739f6d2a9)
+
+ Conflicts:
+ src/common/config_opts.h: trivial resolution
+ src/librbd/ImageCtx.cc: trivial resolution
+ src/librbd/ImageCtx.h: trivial resolution
+ src/librbd/internal.cc: trivial resolution
+
+commit 3292bd26127f5beb69ac9c5fbcdea7efe002fd40
+Author: Jason Dillaman <dillaman@redhat.com>
+Date: Mon May 11 17:05:49 2015 -0400
+
+ WorkQueue: added virtual destructor
+
+ Signed-off-by: Jason Dillaman <dillaman@redhat.com>
+ (cherry picked from commit b3f5a75332c058816dc39b71e9d2b36e752159f4)
+
+commit 9bf970c1d956c94bc420d874eb83db1f16cf5d44
+Author: Jason Dillaman <dillaman@redhat.com>
+Date: Wed Apr 8 16:46:34 2015 -0400
+
+ WorkQueue: add new ContextWQ work queue
+
+ The queue holds a collection of Context pointers that will
+ be completed by the thread pool.
+
+ Signed-off-by: Jason Dillaman <dillaman@redhat.com>
+ (cherry picked from commit 24a33e977f7b71962adeeb48f75d488a76e70fa9)
+
+ Conflicts:
+ src/common/WorkQueue.h: trivial resolution
+
+commit 94aa947b33083bcfe3cb61f41bfdaea7df605cbb
+Author: Sage Weil <sage@redhat.com>
+Date: Fri Dec 5 14:21:08 2014 -0800
+
+ common/ceph_context: don't import std namespace
+
+ This was broken by 7fed5dee4f96a83d1d6914f6fc0895bba2d15b99
+
+ Signed-off-by: Sage Weil <sage@redhat.com>
+ (cherry picked from commit 9029813b2784fe71879b1b7684855415b4c7566b)
+
+commit b91e594401ab75987a370f6dee0ee8d212189c9f
+Author: Haomai Wang <haomaiwang@gmail.com>
+Date: Mon Dec 1 23:54:16 2014 +0800
+
+ CephContext: Add AssociatedSingletonObject to allow CephContext's singleton
+
+ If some objects associated to CephContext want to create a singleton object,
+ it can inherit AssociatedSingletonObject and implement destruction to get notified.
+
+ Signed-off-by: Haomai Wang <haomaiwang@gmail.com>
+ (cherry picked from commit 7fed5dee4f96a83d1d6914f6fc0895bba2d15b99)
+
+commit f122788b3592da516cdb9f6abdc3383a2e7424a2
+Author: Sage Weil <sage@redhat.com>
+Date: Fri Jan 16 07:54:22 2015 -0800
+
+ mon/OSDMonitor: require mon_allow_pool_delete = true to remove pools
+
+ This is a simple safety check. Since we default to true it is currently
+ opt-in.
+
+ Backport: giant, firefly
+ Signed-off-by: Sage Weil <sage@redhat.com>
+ (cherry picked from commit 6b982e4cc00f9f201d7fbffa0282f8f3295f2309)
+
+ Conflicts:
+ src/test/mon/osd-pool-create.sh
+
+ Changed $CEPH_MON to 127.0.0.1 -- the CEPH_MON was introduced after
+ firefly to allow tests to run in parallel. Back in firefly all tests
+ use the same port because 127.0.0.1 was hardcoded. We can't
+ conveniently backport all that's necessary for tests to run in
+ parallel, therefore we keep the 127.0.0.1 hardcoded.
+
+ Conflicts:
+ src/test/mon/osd-pool-create.sh
+ TEST_no_pool_delete() follows a different test than in master
+
+commit 57bbc8e630e6611d1ab74b9756c96daf0e91be6b
+Merge: c0a601f 3f2fb8a
+Author: Loic Dachary <loic@dachary.org>
+Date: Fri Jul 24 10:49:50 2015 +0200
+
+ Merge pull request #5051 from SUSE/wip-12016-firefly
+
+ osd: cache full mode still skips young objects
+
+ Reviewed-by: Sage Weil <sage@redhat.com>
+
+commit c0a601ff5be45c0630a8659994107672558a982a
+Merge: 71174a5 ef648e5
+Author: Sage Weil <sage@redhat.com>
+Date: Wed Jul 22 11:36:47 2015 -0400
+
+ Merge pull request #5307 from dachary/wip-release-notes-firefly
+
+ backport v0.80.10 release notes to firefly
+
+commit 5559a5fe0f593c0e7af47c6d8a8359dbcbfd1f08
+Author: Guang Yang <yguang@yahoo-inc.com>
+Date: Mon Sep 15 11:41:06 2014 +0000
+
+ For pgls OP, get/put budget on per list session basis, instead of per OP basis, which could lead to deadlock.
+
+ Signed-off-by: Guang Yang (yguang@yahoo-inc.com)
+ (cherry picked from commit 0f884fdb31a26f241401ce2a9329dc0f2c4eccc7)
+
+ Conflicts:
+ src/librados/IoCtxImpl.cc
+ In firefly, return value of objecter->pg_read() is not assigned to c->tid.
+ src/osdc/Objecter.cc
+ src/osdc/Objecter.h
+ There is no _op_submit_with_budget() function in firefly.
+ There is no Objecter::_finish_op() function in firefly.
+ In firefly, _take_op_budget() is called take_op_budget().
+
+commit 71174a53c9a3a2b54b947da7e1425ff36fd44e37
+Merge: f7a085f 989e047
+Author: Loic Dachary <loic@dachary.org>
+Date: Wed Jul 22 10:20:32 2015 +0200
+
+ Merge pull request #4867 from SUSE/wip-11878-firefly
+
+ mon: Clock skew causes missing summary and confuses Calamari
+
+ Reviewed-by: Joao Eduardo Luis <joao@suse.de>
+
+commit 989e04799be567ee93369a87b90405833c3fe8d2
+Author: Thorsten Behrens <tbehrens@suse.com>
+Date: Fri Feb 6 01:26:40 2015 +0100
+
+ Always provide summary for non-healthy cluster.
+
+ This fixes a problem, wherein calamari does not provide
+ popup drill-downs for warnings or errors, should the summary
+ be missing.
+
+ Calamari gets health info from /api/v1/cluster/$FSID/health.
+ If the data here has a summary field, this summary is provided
+ in a popup window:
+
+ /api/v1/cluster/$FSID/health is populated (ultimately) with
+ status obtained via librados python bindings from the ceph
+ cluster. In the case where there's clock skew, the summary
+ field supplied by the ceph cluster is empty.
+
+ No summary field, no popup window with more health details.
+
+ Signed-off-by: Thorsten Behrens <tbehrens@suse.com>
+ (cherry picked from commit eaf6e0cf48488fe604d0ef0db164d44948d4e8d4)
+
+ Conflicts:
+ src/mon/Monitor.cc
+ firefly needs ss
+
+commit f7a085f04c544895bab3d79569276574a96636eb
+Merge: 2f1dd10 d296120
+Author: Josh Durgin <jdurgin@redhat.com>
+Date: Tue Jul 21 13:31:33 2015 -0700
+
+ Merge pull request #5062 from SUSE/wip-11699-firefly
+
+ objecter: resend linger ops on split
+
+ Reviewed-by: Josh Durgin <jdurgin@redhat.com>
+
+commit ef648e592404e8677df91f218c4400caad4034b6
+Author: Sage Weil <sage@redhat.com>
+Date: Tue Jul 21 12:54:19 2015 -0400
+
+ doc: v0.80.10 changelog
+
+ Signed-off-by: Sage Weil <sage@redhat.com>
+ (cherry picked from commit b3a3e0e509eb9530994723ed9d68f85b8434a22d)
+
+commit df837e5cc30cf08ade26df6e42ca402fc628a9bb
+Author: Sage Weil <sage@redhat.com>
+Date: Tue Jul 21 10:55:18 2015 -0400
+
+ doc/release-notes: v0.80.10
+
+ Signed-off-by: Sage Weil <sage@redhat.com>
+ (cherry picked from commit 2a61b611987d169d5a501d77fbd545068550c28c)
+
+ Conflicts:
+ doc/release-notes.rst
+
+commit 90cddd425ca8f1731fff0b8fb4b7e02a96048f92
+Author: Loic Dachary <ldachary@redhat.com>
+Date: Tue Jul 14 16:15:44 2015 +0200
+
+ doc/release-notes: update notes for v0.80.10
+
+ Signed-off-by: Loic Dachary <loic@dachary.org>
+ (cherry picked from commit 1231ae09d675f2ee9e76a04b91f771d73a2fb346)
+
+ Conflicts:
+ doc/release-notes.rst
+
+commit 2f1dd10b71d29a647aa2bab4a51fecc0501d6741
+Merge: 0caf6b3 1d2af55
+Author: Loic Dachary <loic@dachary.org>
+Date: Tue Jul 21 13:03:07 2015 +0200
+
+ Merge pull request #5129 from SUSE/wip-12202-firefly
+
+ mon: ceph fails to compile with boost 1.58
+
+ Reviewed-by: Loic Dachary <ldachary@redhat.com>
+
+commit 0caf6b32849bd673d83e96f0eae19bb6d7e423ae
+Merge: 3010f23 6793d50
+Author: Loic Dachary <loic@dachary.org>
+Date: Tue Jul 21 12:51:10 2015 +0200
+
+ Merge pull request #5044 from SUSE/wip-12011-firefly
+
+ osd: PG stuck with remapped
+
+ Reviewed-by: Loic Dachary <ldachary@redhat.com>
+
+commit 3010f23fae10d37ff78b8d7d5049ccba798bbe6b
+Merge: ad58a32 fcac7ab
+Author: Loic Dachary <loic@dachary.org>
+Date: Tue Jul 21 12:45:22 2015 +0200
+
+ Merge pull request #5039 from SUSE/wip-11961-firefly
+
+ osd: Cleanup boost optionals for boost 1.56
+
+ Reviewed-by: Loic Dachary <ldachary@redhat.com>
+
+commit ad58a32292eee39905ae7bacc8fc52a52c2d08fc
+Merge: 13946e9 a62c720
+Author: Loic Dachary <loic@dachary.org>
+Date: Tue Jul 21 12:39:34 2015 +0200
+
+ Merge pull request #5037 from SUSE/wip-11875-firefly
+
+ tools: ceph-post-file fails on rhel7
+
+ Reviewed-by: Loic Dachary <ldachary@redhat.com>
+
+commit 13946e9c18bbeb209458a3faac6e687ff380ac6e
+Merge: bde35c1 90a1a75
+Author: Loic Dachary <loic@dachary.org>
+Date: Tue Jul 21 12:34:51 2015 +0200
+
+ Merge pull request #4771 from SUSE/wip-11759-firefly
+
+ tools: ceph-disk: support NVMe device partitions
+
+ Reviewed-by: Loic Dachary <ldachary@redhat.com>
+
+commit bde35c11acd34c76d704b41292d167c3fc4cea53
+Merge: 9e11564 10d85e1
+Author: Loic Dachary <loic@dachary.org>
+Date: Tue Jul 21 12:22:52 2015 +0200
+
+ Merge pull request #4636 from SUSE/wip-11143-firefly
+
+ tools: src/ceph-disk : disk zap sgdisk invocation
+
+ Reviewed-by: Loic Dachary <ldachary@redhat.com>
+
+commit 9e11564b36a42b605f256943c7236b91a736fceb
+Merge: 8638443 424289d
+Author: Loic Dachary <loic@dachary.org>
+Date: Tue Jul 21 12:20:50 2015 +0200
+
+ Merge pull request #4635 from SUSE/wip-7387-firefly
+
+ common: Malformed JSON command output when non-ASCII strings are present
+
+ Reviewed-by: Loic Dachary <ldachary@redhat.com>
+
+commit 8638443eac92ac80b4c57271f7350d94e445abf5
+Merge: 4c37d3d 8372f1d
+Author: Loic Dachary <loic@dachary.org>
+Date: Tue Jul 21 12:17:43 2015 +0200
+
+ Merge pull request #4632 from SUSE/wip-11507-firefly
+
+ osd: object creation by write cannot use an offset on an erasure coded pool
+
+ Reviewed-by: Loic Dachary <ldachary@redhat.com>
+
+commit 4c37d3d99f660c835d2f73e8f08b6ef170c0c7b7
+Merge: 8f11ab7 9090967
+Author: Loic Dachary <loic@dachary.org>
+Date: Tue Jul 21 12:12:36 2015 +0200
+
+ Merge pull request #4630 from SUSE/wip-10983-firefly
+
+ tools: use a new disk as journal disk,ceph-disk prepare fail
+
+ Reviewed-by: Loic Dachary <ldachary@redhat.com>
+
+commit 8f11ab7ce27cab43145a2821f3996d3103cf7870
+Merge: 64a21b7 b1ff739
+Author: Loic Dachary <loic@dachary.org>
+Date: Tue Jul 21 12:08:26 2015 +0200
+
+ Merge pull request #4597 from xinxinsh/wip-11026-firefly
+
+ objecter: can get stuck in redirect loop if osdmap epoch == last_force_op_resend
+
+ Reviewed-by: Loic Dachary <ldachary@redhat.com>
+
+commit 64a21b71526c51f8e787b365039de2b0cb0a285b
+Merge: 82e8359 2cb2333
+Author: Loic Dachary <loic@dachary.org>
+Date: Tue Jul 21 12:04:39 2015 +0200
+
+ Merge pull request #4582 from SUSE/wip-11543-firefly
+
+ tools: ceph_argparse_flag has no regular 3rd parameter
+
+ Reviewed-by: Loic Dachary <ldachary@redhat.com>
+
+commit bba50ce8f227af29d559b486274871bb3999fb24
+Author: Samuel Just <sjust@redhat.com>
+Date: Thu Apr 9 16:28:23 2015 -0700
+
+ TestPGLog: fix noop log proc_replica_log test case
+
+ Need to fill in log.head, olog.head.
+
+ Signed-off-by: Samuel Just <sjust@redhat.com>
+ (cherry picked from commit 1e5b22053381580708af29a1536f1e106c9b479c)
+
+commit fdff8ce6c996cda7b3966d20c24b20ff545e468a
+Author: Samuel Just <sjust@redhat.com>
+Date: Thu Apr 9 15:01:41 2015 -0700
+
+ TestPGLog: add test for 11358
+
+ Signed-off-by: Samuel Just <sjust@redhat.com>
+ (cherry picked from commit b61e5aef15d7448d24b713d13dce77697bc0af74)
+
+ Conflicts:
+ src/test/osd/TestPGLog.cc
+ leave out all the other tests that have been
+ added to master since firefly
+
+commit 65028b6304235ba5fa54d14805028db1a032e5a0
+Author: Samuel Just <sjust@redhat.com>
+Date: Thu Apr 9 15:01:29 2015 -0700
+
+ PGLog::proc_replica_log: handle split out overlapping entries
+
+ See the comment, if the overlapping entries between olog.head
+ and log.tail were split out, last_update should be log.tail.
+
+ Fixes: 11358
+ Signed-off-by: Samuel Just <sjust@redhat.com>
+ (cherry picked from commit 6561e0d955c4563a8505b717de41f5bd89119f63)
+
+commit 82e8359783f056cce5f7ede2dabd0cc61d278eab
+Merge: 741f0c2 b061140
+Author: Josh Durgin <jdurgin@redhat.com>
+Date: Fri Jul 17 16:10:43 2015 -0700
+
+ Merge pull request #4633 from SUSE/wip-11535-firefly
+
+ Client admin socket leaks file descriptors
+
+ Reviewed-by: Josh Durgin <jdurgin@redhat.com>
+
+commit da78889d76f641dfcbb80164be32b85e880bb97f
+Author: Sage Weil <sage@redhat.com>
+Date: Wed Mar 18 13:49:20 2015 -0700
+
+ os/chain_xattr: handle read on chnk-aligned xattr
+
+ If we wrote an xattr that was a multiple of a chunk, we will try to read
+ the next chunk and get ENODATA. If that happens bail out of the loop and
+ assume we've read the whole thing.
+
+ Backport: hammer, firefly
+ Signed-off-by: Sage Weil <sage@redhat.com>
+ (cherry picked from commit 8614dcebf384b74b283cd352001a65fa26ba925c)
+
+ Conflicts:
+ src/test/objectstore/chain_xattr.cc
+ added #define FILENAME
+
+commit 4e7de5b5f0e32d1183e2a0490d65e4e01490d942
+Author: Yehuda Sadeh <yehuda@redhat.com>
+Date: Thu Jun 25 14:31:03 2015 -0700
+
+ rgw: error out if frontend did not send all data
+
+ Fixes: #11851
+ The civetweb mg_write() doesn't return error when it can't flush all data
+ to the user, it just sends the total number of bytes written. Modified the
+ client io to return total number of bytes and return an error if didn't
+ send anything.
+
+ Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
+ (cherry picked from commit daa679c3dd3770a6d5421e2cc9a36924f4550439)
+
+commit f0d2429f764aaa756fc8002309545b02dc45c199
+Author: Thorsten Behrens <tbehrens@suse.com>
+Date: Wed Dec 10 11:53:43 2014 +0100
+
+ Unconditionally chown rados log file.
+
+ This fixes bnc#905047 (in a somewhat ad-hoc way). Sadly the log
+ file gets created from several places, so its existence does not
+ mean init-radosgw had actually run.
+
+ Signed-off-by: Thorsten Behrens <tbehrens@suse.com>
+ (cherry picked from commit 41611ea27a42d6221c418613d24dce34d988f2e6)
+
+commit 68508e28adffae64a52ea4c0046fbe8537e0d093
+Author: Nathan Cutler <ncutler@suse.com>
+Date: Thu Jun 25 22:37:52 2015 +0200
+
+ ceph.spec.in: use _udevrulesdir to eliminate conditionals
+
+ The conditionals governing where 50-rbd.rules is installed were not doing the
+ right thing on SUSE distros.
+
+ Start using the %_udevrulesdir RPM macro, while taking care that it is defined
+ and set to the right value. Use it to eliminate some conditionals around other
+ udev rules files as well.
+
+ http://tracker.ceph.com/issues/12166 Fixes: #12166
+
+ Signed-off-by: Nathan Cutler <ncutler@suse.com>
+ (cherry picked from commit 8aa758ee7a14e93ded1d55b4aca7a54aa47d7174)
+
+ Conflicts:
+ ceph.spec.in
+ master spec file has diverged significantly from firefly
+
+commit bd25136d45d32b8d419fbe60e39572038e33cc59
+Author: Nathan Cutler <ncutler@suse.com>
+Date: Mon Jul 13 18:12:01 2015 +0200
+
+ ceph.spec.in: do not run fdupes, even on SLE/openSUSE
+
+ In openSUSE there is a policy to use %fdupes in the spec file if RPMLINT
+ complains about duplicate files wasting space in the filesystem.
+
+ However, RPMLINT is not so complaining, so drop fdupes.
+
+ http://tracker.ceph.com/issues/12301 Fixes: #12301
+
+ Signed-off-by: Nathan Cutler <ncutler@suse.com>
+ (cherry picked from commit 53072b9019caf72e0313b2804ea174237ed7da33)
+
+commit 2544a6fc59a86d3f02dcd67d3c84a72d7a1100a0
+Author: Nathan Cutler <ncutler@suse.com>
+Date: Tue Jun 16 18:27:20 2015 +0200
+
+ ceph.spec.in: python-argparse only in Python 2.6
+
+ argparse is a widely-used Python module for parsing command-line arguments.
+ Ceph makes heavy use of Python scripts, both in the build environment and on
+ cluster nodes and clients.
+
+ Until Python 2.6, argparse was distributed separately from Python proper.
+ As of 2.7 it is part of the Python standard library.
+
+ Although the python package in a given distro may or may not Provide:
+ python-argparse, this cannot be relied upon.
+
+ Therefore, this commit puts appropriate conditionals around Requires:
+ python-argparse and BuildRequires: python-argparse. It does so for Red
+ Hat/CentOS and SUSE only, because the last Fedora version with Python 2.6
+ was Fedora 13, which is EOL.
+
+ argparse is required by both the ceph and ceph-common packages, but since ceph
+ requires ceph-common, the argparse Requires and BuildRequires need only appear
+ once, under ceph-common.
+
+ http://tracker.ceph.com/issues/12034 Fixes: #12034
+
+ Signed-off-by: Nathan Cutler <ncutler@suse.com>
+ (cherry picked from commit 23171c952997d104cfa6b5700ec0bb658a8e0915)
+
+ Conflicts:
+ ceph.spec.in
+
+commit 54264210f4ebec23b08dd6712e09aea49543b52b
+Author: Samuel Just <sam.just@inktank.com>
+Date: Tue Aug 12 15:24:26 2014 -0700
+
+ ReplicatedPG::maybe_handle_cache: do not skip promote for write_ordered
+
+ We cannot redirect a RW ordered read.
+
+ Fixes: #9064
+ Introduced: 0ed3adc1e0a74bf9548d1d956aece11f019afee0
+ Signed-off-by: Samuel Just <sam.just@inktank.com>
+ (cherry picked from commit 24aeca9c439474b079d23600d8d42c0af5d9ce5c)
+
+commit 7e2526784203b0f1bce08869aa7b1fda9c5eedd9
+Author: Zhiqiang Wang <wonzhq@hotmail.com>
+Date: Mon Jul 28 14:06:06 2014 +0800
+
+ osd: promotion on 2nd read for cache tiering
+
+ http://tracker.ceph.com/issues/8674 Fixes: #8674
+
+ Signed-off-by: Zhiqiang Wang <wonzhq@hotmail.com>
+ (cherry picked from commit 0ed3adc1e0a74bf9548d1d956aece11f019afee0)
+
+commit 66f61cd9ae105948f653fd888812df270ff1e832
+Author: Signed-off-by: Zhiqiang Wang <wonzhq@hotmail.com>
+Date: Thu Jul 31 15:49:44 2014 -0700
+
+ ceph_test_rados_api_tier: test promote-on-second-read behavior
+
+ http://tracker.ceph.com/issues/8674 References: #8674
+
+ Signed-off-by: Zhiqiang Wang <wonzhq@hotmail.com>
+ Signed-off-by: Sage Weil <sage@redhat.com>
+ (cherry picked from commit 1417eded65f40bdb2a49c8252fcfffa383a7b965)
+
+commit a8f3d6e1f1f186cbe2299566a575bf5a40500227
+Author: Sage Weil <sage@redhat.com>
+Date: Fri Jul 11 11:31:22 2014 -0700
+
+ osd/osd_types: be pedantic about encoding last_force_op_resend without feature bit
+
+ The addition of the value is completely backward compatible, but if the
+ mon feature bits don't match it can cause monitor scrub noice (due to the
+ parallel OSDMap encoding). Avoid that by only adding the new field if the
+ feature (which was added 2 patches after the encoding, see
+ 3152faf79f498a723ae0fe44301ccb21b15a96ab and
+ 45e79a17a932192995f8328ae9f6e8a2a6348d10.
+
+ Fixes: #8815
+ Backport: firefly
+ Signed-off-by: Sage Weil <sage@redhat.com>
+ (cherry picked from commit c93da05bd3dd6b73e8cfa182c6349359b042717c)
+
+ Conflicts:
+ src/osd/osd_types.cc
+ drop encode_compat variable which is otherwise unused in this context
+
+commit dc128758bb68a50992819f759b5684ff656406ba
+Author: Kefu Chai <kchai@redhat.com>
+Date: Fri May 15 22:50:36 2015 +0800
+
+ mon: always reply mdsbeacon
+
+ the MDS (Beacon) is always expecting the reply for the mdsbeacon messages from
+ the lead mon, and it uses the delay as a metric for the laggy-ness of the
+ Beacon. when it comes to the MDSMonitor on a peon, it will remove the route
+ session at seeing a reply (route message) from leader, so a reply to
+ mdsbeacon will stop the peon from resending the mdsbeacon request to the
+ leader.
+
+ if the MDSMonitor re-forwards the unreplied requests after they are
+ outdated, there are chances that the requests reflecting old and even wrong
+ state of the MDSs mislead the lead monitor. for example, the MDSs which sent
+ the outdated messages could be dead.
+
+ Fixes: #11590
+ Signed-off-by: Kefu Chai <kchai@redhat.com>
+ (cherry picked from commit b3555e9c328633c9e1fbc27d652c004b30535e5b)
+
+commit da720d7d870a53faeacc169796083b4eba4b9406
+Author: Kefu Chai <kchai@redhat.com>
+Date: Tue Jun 2 23:20:21 2015 -0700
+
+ mon/MDSMonitor: rename labels to a better name
+
+ * s/ignore/reply/
+ * s/out/ignore/
+
+ Signed-off-by: Kefu Chai <kchai@redhat.com>
+ (cherry picked from commit f00ecb8b3df73ce6337985bc6d43bce5143ee537)
+
+ Conflicts:
+ src/mon/MDSMonitor.cc
+ Do not compare known daemon health with m->get_health()
+
+commit 329da091d6e8444722b312ff94c7093f81939f13
+Author: Kefu Chai <kchai@redhat.com>
+Date: Tue Jun 2 12:55:06 2015 +0800
+
+ mon: send no_reply() to peon to drop ignored mdsbeacon
+
+ so the peon can remove the ignored mdsbeacon request from the
+ routed_requets at seeing this reply, and hence no longer resend the
+ request.
+
+ Fixes: #11590
+ Signed-off-by: Kefu Chai <kchai@redhat.com>
+ (cherry picked from commit 72a37b3a8e145d8522ea67fc14ce2c5510b6852b)
+
+commit 508332f53075a99295b9edb683ed343d8f59ca4f
+Author: Kefu Chai <kchai@redhat.com>
+Date: Tue Jun 2 12:22:26 2015 +0800
+
+ mon: remove unnecessary error handling
+
+ msg.get_session() should always return a non-zero pointer in
+ Monitor.dispatch()
+
+ Signed-off-by: Kefu Chai <kchai@redhat.com>
+ (cherry picked from commit 16e8e2cc82a90c49cd8aa3d0e3acc4694ba659a0)
+
+ Conflicts:
+ src/mon/Monitor.cc
+ Monitor::_ms_dispatch(Message *m) is bool in firefly
+
+commit 741f0c235228b371486574ba0c3fbf55729e03bd
+Merge: 1623e6c 0a7f2b2
+Author: Samuel Just <sam.just@inktank.com>
+Date: Thu Jul 9 17:24:04 2015 -0700
+
+ Merge pull request #4631 from SUSE/wip-11069-firefly
+
+ PGLog: split divergent priors as well
+
+ Reviewed-by: Samuel Just
+
+commit 3223bd604117b0b302b1e3e235ff9bced8e986bc
+Author: Jason Dillaman <dillaman@redhat.com>
+Date: Fri Jun 26 09:59:36 2015 -0400
+
+ librbd: assertion failure race condition if watch disconnected
+
+ It's possible for librbd's watch of the header object to be reset by
+ connection issues just prior to the image being removed. This will
+ causes an assertion failure which assumes at least one watcher on the
+ image.
+
+ Fixes: #12176
+ Backport: hammer, firefly
+ Signed-off-by: Jason Dillaman <dillaman@redhat.com>
+ (cherry picked from commit af276de4f299960e43761904c043924cec5fef11)
+
+commit 2ee6e9a0cc6513097d6c9f9e40787a1c60c09796
+Author: Radoslaw Zarzynski <rzarzynski@mirantis.com>
+Date: Sun Mar 8 22:45:34 2015 +0100
+
+ rgw: send Content-Length in response for HEAD on Swift account.
+
+ Backport: hammer
+ Signed-off-by: Radoslaw Zarzynski <rzarzynski@mirantis.com>
+ (cherry picked from commit 29073d84640b61d0221b2d2ab73c271d60fd13ba)
+
+commit 1b4536aa47fd6d2440fbd30b64b5b46eaa21215a
+Author: Radoslaw Zarzynski <rzarzynski@mirantis.com>
+Date: Fri Mar 6 13:18:19 2015 +0100
+
+ rgw: send Content-Length in response for DELETE on Swift container.
+
+ Backport: hammer
+ Signed-off-by: Radoslaw Zarzynski <rzarzynski@mirantis.com>
+ (cherry picked from commit d260a93405a7a34a899f716bd9c4e731baa9ffd0)
+
+commit 177324ced968b254458a450f8e348c96cbd10931
+Author: Radoslaw Zarzynski <rzarzynski@mirantis.com>
+Date: Fri Mar 6 13:14:26 2015 +0100
+
+ rgw: send Content-Length in response for PUT on Swift container.
+
+ Fixes: #11036
+ Backport: hammer
+ Signed-off-by: Radoslaw Zarzynski <rzarzynski@mirantis.com>
+ (cherry picked from commit 10c1f1aa1e09df5edf5d2f9f9b0273ddbcb384fa)
+
+commit 0a580c4a23b985ede28cdfc751eed2a368473e09
+Author: Radoslaw Zarzynski <rzarzynski@mirantis.com>
+Date: Fri Feb 27 15:23:16 2015 +0100
+
+ rgw: send Content-Length in response for GET on Swift container.
+
+ Fixes: #10971
+ Backport: hammer
+ Signed-off-by: Radoslaw Zarzynski <rzarzynski@mirantis.com>
+ (cherry picked from commit 5a64fb5430b6b42174bf53a5910d9435043c1380)
+
+commit 84525806a057054dca295f860e0a31d6936d4985
+Author: Radoslaw Zarzynski <rzarzynski@mirantis.com>
+Date: Fri Mar 6 12:42:52 2015 +0100
+
+ rgw: enable end_header() to handle proposal of Content-Length.
+
+ Backport: hammer
+ Signed-off-by: Radoslaw Zarzynski <rzarzynski@mirantis.com>
+ (cherry picked from commit f98fd4dfda7a105d621f99c2b48eb9ab9b45d979)
+
+commit 1d2af55f8c69b4a382eb516d8f90a8316fd3bc02
+Author: Kefu Chai <kchai@redhat.com>
+Date: Fri May 8 15:21:20 2015 +0800
+
+ mon: remove unused variable
+
+ * as a side effect, this change silences
+ http://tracker.ceph.com/issues/11576
+
+ Fixes: #11576
+ Signed-off-by: Kefu Chai <kchai@redhat.com>
+ (cherry picked from commit e7b196a4a091c0ea258866559ba06e7ed0cc4247)
+
+commit d296120c144a62794483338fd696ca8089778e84
+Author: Josh Durgin <josh.durgin@inktank.com>
+Date: Mon Oct 20 13:29:13 2014 -0700
+
+ Objecter: resend linger ops on any interval change
+
+ Watch/notify ops need to be resent after a pg split occurs, as well as
+ a few other circumstances that the existing objecter checks did not
+ catch.
+
+ Refactor the check the OSD uses for this to add a version taking the
+ more basic types instead of the whole OSD map, and stash the needed
+ info when an op is sent.
+
+ Fixes: #9806
+ Backport: giant, firefly, dumpling
+ Signed-off-by: Josh Durgin <josh.durgin@inktank.com>
+ (cherry picked from commit cb9262abd7fd5f0a9f583bd34e4c425a049e56ce)
+
+ Conflicts:
+ src/osd/osd_types.cc
+ src/osdc/Objecter.cc
+ Minor differences.
+
+commit a44b7b4bd870cc72e50a49900cd81fde6d40845b
+Author: Samuel Just <sam.just@inktank.com>
+Date: Wed May 7 11:02:16 2014 -0700
+
+ osd_types: factor out is_new_interval from check_new_interval
+
+ Signed-off-by: Samuel Just <sam.just@inktank.com>
+ (cherry picked from commit 2ee355113ed4374c664909a8cd7dc5dfdc4c9ed7)
+
+commit 3f2fb8a996820843d0287a9337d38d80c7cb616b
+Author: Xinze Chi <xmdxcxz@gmail.com>
+Date: Wed Nov 5 01:00:01 2014 +0000
+
+ osd: cache pool: flush object ignoring cache min flush age when cache pool is full
+ Signed-off-by: Xinze Chi <xmdxcxz@gmail.com>
+
+ (cherry picked from commit f4ee9496ed15e7734abd659f5a353a3cde0dcb23)
+
+commit 9969ae5710bc66e1e96125f22593ea1e0ba381af
+Author: Zhiqiang Wang <wonzhq@hotmail.com>
+Date: Fri Aug 1 16:09:50 2014 +0800
+
+ osd: add local_mtime to struct object_info_t
+
+ This fixes a bug when the time of the OSDs and clients are not
+ synchronized (especially when client is ahead of OSD), and the cache
+ tier dirty ratio reaches the threshold, the agent skips the flush work
+ because it thinks the object is too young.
+
+ Signed-off-by: Zhiqiang Wang <wonzhq@hotmail.com>
+ (cherry picked from commit 13b9dc708426c35436ba58388fc54f04f066f03a)
+
+commit 6793d504b5b622a7a6f69ffb30d6822167b557a3
+Author: Guang Yang <yguang@yahoo-inc.com>
+Date: Mon Oct 13 04:18:45 2014 +0000
+
+ The fix for issue 9614 was not completed, as a result, for those erasure coded PGs with one OSD down, the state was wrongly marked as active+clean+degraded. This patch makes sure the clean flag is not set for such PG.
+ Signed-off-by: Guang Yang <yguang@yahoo-inc.com>
+
+ (cherry picked from commit 35bbb2d6002b1b435ff0b1df653cc7ab271f9258)
+
+commit fcac7ab6305dc3215fdcb46951fa9ee4cbf68ce3
+Author: William A. Kennington III <william@wkennington.com>
+Date: Sat Sep 20 22:52:31 2014 -0700
+
+ osd: Cleanup boost optionals
+
+ Signed-off-by: William A. Kennington III <william@wkennington.com>
+ (cherry picked from commit a53ead14c113047567177630b4906136a2109b65)
+
+commit a62c720dc783b40377dcd34d4e53aa778ac1a84b
+Author: Sage Weil <sage@redhat.com>
+Date: Mon Jun 1 15:10:14 2015 -0700
+
+ Makefile: install ceph-post-file keys with mode 600
+
+ Otherwise ssh (may) prompt for a password.
+
+ Signed-off-by: Sage Weil <sage@redhat.com>
+ (cherry picked from commit 106a1c3081d02446aa3d8e13865da0c3393bae90)
+
+commit fc59ca391f639b2ef1b5c9dda202a3d7d718cf25
+Author: Joseph McDonald <joseph.mcdonald@alcatel-lucent.com>
+Date: Mon Jun 1 15:05:32 2015 -0700
+
+ ceph-post-file: improve check for a source install
+
+ Signed-off-by: Joseph McDonald <joseph.mcdonald@alcatel-lucent.com>
+ (cherry picked from commit ee170eadcdcb4b54d36a7d474558484de9d917eb)
+
+commit 50bfb354d0648162f94c2659e8b915d69f27bf73
+Author: Joseph McDonald <joseph.mcdonald@alcatel-lucent.com>
+Date: Mon Jun 1 15:00:39 2015 -0700
+
+ ceph-post-file: behave when sftp doesn't take -i
+
+ Fixes: #11836
+ Signed-off-by: Joseph McDonald <joseph.mcdonald@alcatel-lucent.com>
+ (cherry picked from commit b84031ed5eaace1222e14d3c4076a3ab1155da96)
+
+commit 1623e6c6517ff6958b343493fce6a8e50a52a042
+Merge: ea6c958 254676b
+Author: David Zafman <dzafman@redhat.com>
+Date: Fri Jun 19 15:57:46 2015 -0700
+
+ Merge pull request #4960 from ceph/wip-10911-firefly
+
+ osd,mon: explicitly specify OSD features in MOSDBoot
+
+ Reviewed-by: David Zafman <dzafman@redhat.com>
+
+commit 254676b63b559fa0117520edb5dcbfe067a76747 (refs/remotes/jashan/wip-10911-firefly)
+Author: Sage Weil <sage@redhat.com>
+Date: Wed Feb 18 14:53:04 2015 -0800
+
+ osd,mon: explicitly specify OSD features in MOSDBoot
+
+ We are using the connection features to populate the features field in the
+ OSDMap, but this is the *intersection* of mon and osd features, not the
+ osd features. Fix this by explicitly specifying the features in
+ MOSDBoot.
+
+ Fixes: #10911
+ Backport: giant, firefly
+ Signed-off-by: Sage Weil <sage@redhat.com>
+ (cherry picked from commit bee91548b07c6a28314dddc50fef8b6a2677e774)
+
+ Conflicts:
+ src/osd/OSD.cc
+ Minor difference in the MOSDBoot constructor
+
+commit b1ff7396c8e9668c0be1a4023e0ffa292067cf64
+Author: xinxin shu <xinxin.shu@intel.com>
+Date: Thu May 7 05:49:18 2015 +0800
+
+ osdc: add epoch_t last_force_resend in Op/LingerOp.
+
+ Using this field record the pg_poo_t::last_force_op_resend to avoid op
+ endless when osd reply with redirect.
+
+ Fixes: #11026
+ Signed-off-by: Jianpeng Ma <jianpeng.ma@intel.com>
+ Signed-off-by: Sage Weil <sage@redhat.com>
+ (cherry picked from commit def4fc4a)
+
+commit 90a1a7587fcb567e2cc6e9188fdd56ec1255a881
+Author: islepnev <islepnev@gmail.com>
+Date: Fri Apr 17 22:33:01 2015 +0300
+
+ ceph-disk: support NVMe device partitions
+
+ Linux nvme kernel module v0.9 enumerate devices as following:
+
+ /dev/nvme0 - characted revice
+ /dev/nvme0n1 - whole block device
+ /dev/nvme0n1p1 - first partition
+ /dev/nvme0n1p2 - second partition
+
+ http://tracker.ceph.com/issues/11612 Fixes: #11612
+
+ Signed-off-by: Ilja Slepnev <islepnev@gmail.com>
+ (cherry picked from commit 9b62cf254d02d30609793be8b1cb8a94f38891f1)
+
+ Conflicts:
+ src/ceph-disk
+
+commit f93eadd793f9f4fded30df5589f98ccfc0e1839f
+Author: Sage Weil <sage@redhat.com>
+Date: Tue May 12 16:37:56 2015 -0700
+
+ mon: prevent bucket deletion when referenced by a rule
+
+ If a rule references a bucket with 'take', prevent deletion.
+
+ Fixes: #11602
+ Signed-off-by: Sage Weil <sage@redhat.com>
+ (cherry picked from commit 3d591afef90b0601572c748f13faac029d05f5a0)
+
+commit d4ef5566e6b1b2ac73925660a1d627dbb6cc7632
+Author: Anton Aksola <anton.aksola@nebula.fi>
+Date: Fri Apr 10 13:25:21 2015 +0300
+
+ rgw: always check if token is expired
+
+ Fixes: #11367
+
+ Currently token expiration is only checked by the token cache. With PKI
+ tokens no expiration check is done after decoding the token. This causes
+ PKI tokens to be valid indefinitely. UUID tokens are validated by
+ keystone after cache miss so they are not affected by this bug.
+
+ This commit adds explicit token expiration check to
+ RGWSwift::validate_keystone_token()
+
+ Signed-off-by: Anton Aksola <anton.aksola@nebula.fi>
+ Reported-by: Riku Lehto <riku.lehto@nexetic.com>
+ (cherry picked from commit 2df069390ea3bbcfbab5022750e89f51d197cc11)
+
+commit 2d5d8da35f627840ee57a8fa071147943b890d0c
+Author: Javier M. Mellid <jmunhoz@igalia.com>
+Date: Fri May 15 14:22:29 2015 +0200
+
+ rgw: Use attrs from source bucket on copy
+
+ On copy objects, when bucket source is the same as the destination, use attrs
+ from source bucket.
+
+ Fixes: #11639
+
+ Signed-off-by: Javier M. Mellid <jmunhoz@igalia.com>
+ (cherry picked from commit 1dac80df1d4a2364154ed8b404d13609936c257b)
+
+commit d78e31f005756700e15d26d187c6cef6d5d24a7a
+Author: 9seconds <nineseconds@yandex.ru>
+Date: Wed Apr 1 09:12:06 2015 +0300
+
+ rgw: quota not respected in POST object
+
+ Signed-off-by: Sergey Arkhipov <nineseconds@yandex.ru>
+ Backport: hammer, firefly
+ Fixes: #11323
+ (cherry picked from commit e76f84e179d2ba8bfc0dc5abf4e620fef14bc8a0)
+
+ Conflicts:
+ src/rgw/rgw_op.cc
+ discard the whitespace modification hunks that were creating
+ conflicts and ignore the conflict due to an unrelated cast
+ modification in the context
+
+commit 177ef55d61c9b08783ae746aa521d2535324d6ba
+Author: Orit Wasserman <owasserm@redhat.com>
+Date: Fri Apr 3 13:43:31 2015 +0200
+
+ rgw: remove meta file after deleting bucket
+ The meta file is deleted only if the bucket meta data is not synced
+
+ Signed-off-by: Orit Wasserman <owasserm@redhat.com>
+
+ Fixes: #11149
+ Backport: hammer, firefly
+ (cherry picked from commit dfdc7afb59cc8e32cf8bff55faa09076c853de06)
+
+commit 9845258f184c823d1e48da1dcb97bdde97220bb6
+Author: Jason Dillaman <dillaman@redhat.com>
+Date: Wed Apr 22 11:27:35 2015 -0400
+
+ librbd: updated cache max objects calculation
+
+ The previous calculation was based upon the image's object size.
+ Since the cache stores smaller bufferheads, the object size is not
+ a good indicator of cache usage and was resulting in objects being
+ evicted from the cache too often. Instead, base the max number of
+ objects on the memory load required to store the extra metadata
+ for the objects.
+
+ Fixes: #7385
+ Backport: firefly, hammer
+ Signed-off-by: Jason Dillaman <dillaman@redhat.com>
+ (cherry picked from commit 0b378942c4f1b79cb65967f2d3466728ca1c8d5b)
+
+ Conflicts:
+ src/librbd/ImageCtx.cc
+ because firefly has cct->_conf->rbd_cache_size
+ instead of cache_size
+
+commit 0a7f2b2a859aefebc995ad5c7b699eb117d6fa12
+Author: Nathan Cutler <ncutler@suse.cz>
+Date: Sun May 10 17:13:22 2015 +0200
+
+ PGLog: split divergent priors as well
+
+ Signed-off-by: Samuel Just <sjust@redhat.com>
+ (cherry picked from commit bbe231a61fc06a1a668e6b831fb8224526721f93)
+
+ Conflicts:
+ src/osd/PGLog.h
+
+ The cherry-picked commit did not compile as-is, because the hobject_t
+ class in firefly lacks a get_hash() method, which was added in 6de83d4.
+ To get the patch to compile, I replaced i->second.get_hash() with
+ i->second.hash.
+
+commit 424289dc4ee8fb09dd00d507b5a9d1fecc786937
+Author: Kefu Chai <kchai@redhat.com>
+Date: Fri May 8 12:01:16 2015 +0800
+
+ json_sprit: fix the FTBFS on old gcc
+
+ Fixes: #11574
+ Signed-off-by: Kefu Chai <kchai@redhat.com>
+ (cherry picked from commit 6b68b27146852f057a3373cd04b08cd6917f3eea)
+
+commit 84b00f189554fc37413c990ac4011079bb5cdb60
+Author: Tim Serong <tserong@suse.com>
+Date: Sat May 2 01:59:53 2015 +1000
+
+ json_spirit: use utf8 intenally when parsing \uHHHH
+
+ When the python CLI is given non-ASCII characters, it converts them to
+ \uHHHH escapes in JSON. json_spirit parses these internally into 16 bit
+ characters, which could only work if json_spirit were built to use
+ std::wstring, which it isn't; it's using std::string, so the high byte
+ ends up being zero'd, leaving the low byte which is effectively garbage.
+
+ This hack^H^H^H^H change makes json_spirit convert to utf8 internally
+ instead, which can be stored just fine inside a std::string.
+
+ Note that this implementation still assumes \uHHHH escapes are four hex
+ digits, so it'll only cope with characters in the Basic Multilingual
+ Plane. Still, that's rather a lot more characters than it could cope
+ with before ;)
+
+ (For characters outside the BMP, Python seems to generate escapes in the
+ form \uHHHHHHHH, i.e. 8 hex digits, which the current implementation
+ doesn't expect to see)
+
+ Fixes: #7387
+
+ Signed-off-by: Tim Serong <tserong@suse.com>
+ (cherry picked from commit 8add15b86e7aaef41397ab8fa9e77ee7957eb607)
+
+ Conflicts:
+ src/test/mon/osd-pool-create.sh
+
+ Changed $CEPH_MON to 127.0.0.1 -- the CEPH_MON was introduced after
+ firefly to allow tests to run in parallel. Back in firefly all tests
+ use the same port because 127.0.0.1 was hardcoded. We can't
+ conveniently backport all that's necessary for tests to run in
+ parallel, therefore we keep the 127.0.0.1 hardcoded.
+
+commit 10d85e1126768f6c72f7d2a301ea7ca9ba59f8e0
+Author: Owen Synge <osynge@suse.com>
+Date: Tue Mar 17 15:41:33 2015 +0100
+
+ Fix "disk zap" sgdisk invocation
+
+ Fixes #11143
+
+ If the metadata on the disk is truly invalid, sgdisk would fail to zero
+ it in one go, because --mbrtogpt apparently tried to operate on the
+ metadata it read before executing --zap-all.
+
+ Splitting this up into two separate invocations to first zap everything
+ and then clear it properly fixes this issue.
+
+ Based on patch by Lars Marowsky-Bree <lmb@suse.com> in ceph-deploy.
+ Created by Vincent Untz <vuntz@suse.com>
+
+ Signed-off-by: Owen Synge <osynge@suse.com>
+ Signed-off-by: Thorsten Behrens <tbehrens@suse.com>
+ (cherry picked from commit fdd7f8d83afa25c4e09aaedd90ab93f3b64a677b)
+
+commit b06114088a354f9dbcfc9182643733399c31f2a8
+Author: Jon Bernard <jbernard@tuxion.com>
+Date: Fri May 8 11:54:06 2015 -0400
+
+ common/admin_socket: close socket descriptor in destructor
+
+ Long-running processes that do not reuse a single client connection will
+ see accumulating file descriptors as a result of not closing the
+ listening socket. In this case, eventually the system will reach
+ file-max and subsequent connections will fail.
+
+ Fixes: #11535
+
+ Signed-off-by: Jon Bernard <jbernard@tuxion.com>
+ (cherry picked from commit 88fabb1ee6cd3c7d211ca46919055195e32245db)
+
+commit 8372f1d53b847224bf4c61894d18851e84ccd357
+Author: Jianpeng Ma <jianpeng.ma@intel.com>
+Date: Fri Mar 6 15:54:07 2015 +0800
+
+ osd: refuse to write a new erasure coded object with an offset > 0
+
+ Even if the offset is properly aligned.
+
+ http://tracker.ceph.com/issues/11507 Fixes: #11507
+
+ Signed-off-by: Jianpeng Ma <jianpeng.ma@intel.com>
+ Signed-off-by: Loic Dachary <ldachary@redhat.com>
+ (cherry picked from commit a4f1256c214ee0e7ebb91ac4ea8655f5d9642dc8)
+
+commit 909096713dcef5dc4fdbb22a9971609554688e23
+Author: Loic Dachary <ldachary@redhat.com>
+Date: Sun Mar 8 15:15:35 2015 +0100
+
+ ceph-disk: more robust parted output parser
+
+ In some cases, depending on the implementation or the operating system,
+
+ parted --machine -- /dev/sdh print
+
+ may contain empty lines. The current parsing code is fragile and highly
+ depends on output details. Replace it with code that basically does the
+ same sanity checks (output not empty, existence of units, existence of
+ the dev entry) but handles the entire output instead of checking line by
+ line.
+
+ http://tracker.ceph.com/issues/10983 Fixes: #10983
+
+ Signed-off-by: Loic Dachary <ldachary@redhat.com>
+ (cherry picked from commit f5acf6bb6a342b05897605703d7d9cb7c09714fd)
+
+commit 8c573c8826096d90dc7dfb9fd0126b9983bc15eb
+Author: Yehuda Sadeh <yehuda@redhat.com>
+Date: Tue Sep 30 14:15:47 2014 -0700
+
+ rgw: swift GET / HEAD object returns X-Timestamp field
+
+ Fixes: #8911
+ Backport: giant, firefly, dumpling
+ Swift clients expect X-Timestamp header, dump it.
+
+ Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
+ (cherry picked from commit 5b41d80b7fb9ed96c26801fc42c044191bb18d84)
+
+commit 9614e4dc5be745dab367d17f29a07377e348b2ca
+Author: Daniel J. Hofmann <daniel@trvx.org>
+Date: Mon May 5 16:06:45 2014 +0200
+
+ Variable length array of std::strings (not legal in C++) changed to std::vector<std::string>
+
+ Signed-off-by: Daniel J. Hofmann <daniel@trvx.org>
+ (cherry picked from commit 08a4e8889783673436972a979c2fc780466893c8)
+
+commit 2cb2333ecdf2106925d74e024697f73ad947f378
+Author: Thorsten Behrens <tbehrens@suse.com>
+Date: Thu Jul 3 00:15:03 2014 +0200
+
+ ceph_argparse_flag has no regular 3rd parameter.
+
+ With clang warning: 'va_start' has undefined behavior with reference
+ types, noticing copy-paste mistake on ceph_argparse_flag.
+
+ Signed-off-by: Thorsten Behrens <tbehrens@suse.com>
+ (cherry picked from commit 0c7c7223a2beb4ffb953d89d316f87d350677063)
+
+commit f6022639758ec13b9a25b03cd831882db0b517b3
+Author: Yehuda Sadeh <yehuda@redhat.com>
+Date: Wed Dec 17 17:12:43 2014 -0800
+
+ rgw: use correct objv_tracker for bucket instance
+
+ When trying to create a bucket that already existed, use the
+ objv_tracker of the newly created instance, and not of the original
+ bucket.
+
+ Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
+ (cherry picked from commit fe158ecc25feefcea8aea4133118e4a84900a8ec)
--- /dev/null
+commit 69eaad7f8308f21573c604f121956e64679a52a7 (tag: refs/tags/v0.80.8)
+Author: Jenkins <jenkins@inktank.com>
+Date: Tue Jan 13 06:28:08 2015 -0800
+
+ 0.80.8
+
+commit 3c7cacf00b66a0e17272cf67fe0823ee863dfa7c
+Author: Sage Weil <sage@redhat.com>
+Date: Tue Aug 19 16:43:02 2014 -0700
+
+ mon/OSDMonitor: fix double-free on old MOSDBoot
+
+ send_latest() does an m->put().
+
+ Backport: firefly, dumpling
+ Signed-off-by: Sage Weil <sage@redhat.com>
+ (cherry picked from commit 97f9b6df668315fba6a5924b79024c7a986f4110)
+
+commit 852d7b5b3c019c02c042b767fc88916088e1a94d
+Author: Sage Weil <sage@redhat.com>
+Date: Thu Jan 8 11:17:03 2015 -0800
+
+ osd: requeue PG when we skip handling a peering event
+
+ If we don't handle the event, we need to put the PG back into the peering
+ queue or else the event won't get processed until the next event is
+ queued, at which point we'll be processing events with a delay.
+
+ The queue_null is not necessary (and is a waste of effort) because the
+ event is still in pg->peering_queue and the PG is queued.
+
+ This is a firefly-specific patch; a (very) similar one will appear in master
+ in 492ccc900c3358f36b6b14a207beec071eb06707.
+
+ Backport: giant, firefly
+ Signed-off-by: Sage Weil <sage@redhat.com>
+
+commit c26ebd38335bb361aade5aacd05ba3217e602b9c
+Merge: b67b7e7 96ba529
+Author: Sage Weil <sage@redhat.com>
+Date: Thu Jan 8 18:31:26 2015 -0800
+
+ Merge pull request #3217 from boydc2014/firefly
+
+ clear data and payload after removed from ops_in_flight
+
+ Reviewed-by: Sage Weil <sage@redhat.com>
+
+commit b67b7e7ad72a1af96f9fb26ade815e65f72b4cb0
+Merge: db92718 7faae89
+Author: Loic Dachary <ldachary@redhat.com>
+Date: Fri Jan 9 01:32:17 2015 +0100
+
+ Merge pull request #3127 from ktdreyer/firefly-no-epoch
+
+ Revert "ceph.spec.: add epoch"
+
+ Reviewed-by: Ken Dreyer <kdreyer@redhat.com>
+ Reviewed-by: Sage Weil <sage@redhat.com>
+ Reviewed-by: Samuel Just <sjust@redhat.com>
+ Reviewed-by: Loic Dachary <ldachary@redhat.com>
+
+commit db927186288cd4c63a3483b42e9eb9e016c96156
+Merge: 0d4abda 820dbfd
+Author: Loic Dachary <ldachary@redhat.com>
+Date: Fri Jan 9 01:31:29 2015 +0100
+
+ Merge pull request #3128 from dachary/wip-10281-make-check-fedora-20
+
+ tests: fixes to run make check on fedora 20
+
+
+ Reviewed-by: Sage Weil <sage@redhat.com>
+ Reviewed-by: Samuel Just <sjust@redhat.com>
+ Reviewed-by: Loic Dachary <ldachary@redhat.com>
+
+commit 0d4abdaf80f1fedff7975d595abaac0a620c8035
+Merge: 1fdcb52 11995b3
+Author: Loic Dachary <ldachary@redhat.com>
+Date: Fri Jan 9 01:30:59 2015 +0100
+
+ Merge pull request #3169 from ceph/wip-8797-firefly
+
+ Wip 8797 firefly
+
+ Reviewed-by: Sage Weil <sage@redhat.com>
+ Reviewed-by: Samuel Just <sjust@redhat.com>
+ Reviewed-by: Loic Dachary <ldachary@redhat.com>
+
+commit 1fdcb524411a02b5627be66d9fd821a473223e9d
+Merge: 4b7b1b0 465eede
+Author: Loic Dachary <ldachary@redhat.com>
+Date: Fri Jan 9 01:28:49 2015 +0100
+
+ Merge pull request #3179 from dachary/wip-9998-crush-underfloat-firefly
+
+ crush: fix weight underfloat issue (firefly)
+
+
+ Reviewed-by: Sage Weil <sage@redhat.com>
+ Reviewed-by: Samuel Just <sjust@redhat.com>
+ Reviewed-by: Loic Dachary <ldachary@redhat.com>
+
+commit 4b7b1b03bfcb7cb056783555884f211009ea5d46
+Merge: 4897ba4 f55b097
+Author: Loic Dachary <ldachary@redhat.com>
+Date: Fri Jan 9 01:28:11 2015 +0100
+
+ Merge pull request #3220 from ceph/wip-mon-backports.firefly
+
+ mon: backports for #9987 against firefly
+
+ Reviewed-by: Joao Eduardo Luis <joao@redhat.com>
+ Reviewed-by: Sage Weil <sage@redhat.com>
+ Reviewed-by: Samuel Just <sjust@redhat.com>
+ Reviewed-by: Loic Dachary <ldachary@redhat.com>
+
+commit 4897ba4a304bcac548b2121312cd7235c34dd5aa
+Merge: efe801f f20225c
+Author: Loic Dachary <ldachary@redhat.com>
+Date: Fri Jan 9 01:26:30 2015 +0100
+
+ Merge pull request #3258 from ceph/wip-10372-firefly
+
+ osd: fix librados pool deletion race on firefly
+
+ Reviewed-by: Sage Weil <sage@redhat.com>
+ Reviewed-by: Samuel Just <sjust@redhat.com>
+ Reviewed-by: Loic Dachary <ldachary@redhat.com>
+
+commit efe801ff3a0d25243da18937c07b89227edbaac4
+Author: Warren Usui <warren.usui@inktank.com>
+Date: Thu Dec 18 20:00:28 2014 -0800
+
+ If trusty, use older version of qemu
+
+ Fixes #10319
+ Signed-off-by: Warren Usui <warren.usui@inktank.com>
+ (cherry-picked from 46a1a4cb670d30397979cd89808a2e420cef2c11)
+
+commit 96ba529ef8ce76e07b8444c94883afb3468d6762
+Author: Lei Dong <leidong@yahoo-inc.com>
+Date: Tue Dec 30 21:02:45 2014 +0800
+
+ clear data and payload inside ops_in_flight_lock
+
+ http://tracker.ceph.com/issues/9916 Fixes: #9916
+ Signed-off-by: Dong Lei <leidong@yahoo-inc.com>
+
+commit e0648e3d30de504b096c4ae3bbe7d9c17652bdb5
+Merge: 455f940 3624006
+Author: Sage Weil <sage@redhat.com>
+Date: Mon Dec 29 14:31:23 2014 -0800
+
+ Merge pull request #3264 from dachary/wip-jerasure-firefly
+
+ erasure-code: update links to jerasure upstream
+
+commit 455f940908f242b1e34983af61351fd3045ce8ab
+Merge: b1ab685 aa95a2d
+Author: Sage Weil <sage@redhat.com>
+Date: Mon Dec 29 10:55:39 2014 -0800
+
+ Merge pull request #3268 from ceph/firefly-10415
+
+ libcephfs/test.cc: close fd before umount
+
+commit 362400667aad0b5098fbe8dbec1b0bde059f84a6
+Author: Loic Dachary <ldachary@redhat.com>
+Date: Sun Dec 28 10:29:54 2014 +0100
+
+ erasure-code: update links to jerasure upstream
+
+ It moved from bitbucket to jerasure.org
+
+ Signed-off-by: Loic Dachary <ldachary@redhat.com>
+ (cherry picked from commit 8e86f901939f16cc9c8ad7a4108ac4bcf3916d2c)
+
+commit aa95a2d20dbba2f3a775f709493c987d0d001e9c
+Author: Yan, Zheng <zyan@redhat.com>
+Date: Tue Dec 23 10:22:00 2014 +0800
+
+ libcephfs/test.cc: close fd before umount
+
+ Fixes: #10415
+ Signed-off-by: Yan, Zheng <zyan@redhat.com>
+ (cherry picked from commit d3fb563cee4c4cf08ff4ee01782e52a100462429)
+
+commit f20225cb99a0d2d08fccfdf88dc89d758ecba077 (refs/remotes/gh/wip-10372-firefly)
+Author: Sage Weil <sage@redhat.com>
+Date: Tue Dec 23 15:49:26 2014 -0800
+
+ osdc/Objecter: handle reply race with pool deletion
+
+ We need to handle this scenario:
+
+ - send request in epoch X
+ - osd replies
+ - pool is deleted in epoch X+1
+ - client gets map X+1, sends a map check
+ - client handles reply
+ -> asserts that no map checks are in flight
+
+ This isn't the best solution. We could infer that a map check isn't needed
+ since the pool existed earlier and doesn't now. But this is firefly and
+ the fix is no more expensive than the old assert.
+
+ Fixes: #10372
+ Signed-off-by: Sage Weil <sage@redhat.com>
+
+commit 820dbfd9947455d07426981b7152861c3c216080
+Author: Sage Weil <sage@redhat.com>
+Date: Tue Aug 5 15:11:18 2014 -0700
+
+ test/ceph-disk.sh: mkdir -p
+
+ Signed-off-by: Sage Weil <sage@redhat.com>
+ (cherry picked from commit c2f58e6694a2457200ab3d59e037ad17b9c82028)
+
+commit 77d393024f9d867b574b8ec8e15ec48a1a291511
+Author: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
+Date: Thu Sep 4 12:23:27 2014 +0200
+
+ test/ceph-disk.sh: resolve symlinks before check
+
+ Make sure symlinks are resolved in command_fixture()
+ before compare result of which command and the current
+ path.
+
+ Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
+ (cherry picked from commit 8ea86dfa7c4a3d7e089cf9d4e49586657875f851)
+
+commit ed6ec2936513d7dd6c45bccd8edf69a12c71dc7b
+Author: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
+Date: Tue Jun 24 19:54:17 2014 +0200
+
+ test/ceph-disk.sh: fix for SUSE
+
+ On SUSE 'which' returns always the full path of (shell) commands and
+ not e.g. './ceph-conf' as on Debian. Add check also for full
+ path returned by which.
+
+ Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
+ (cherry picked from commit 39530536ff923b91899f6303507c283b78040a20)
+
+commit 754363f4563e7dbda1ef23fadc8d6ef1a3fdd0af
+Author: Loic Dachary <loic@dachary.org>
+Date: Fri Jun 13 14:41:39 2014 +0200
+
+ tests: prevent kill race condition
+
+ When trying to kill a daemon, keep its pid in a variable instead of
+ retrieving it from the pidfile multiple times. It prevents the following
+ race condition:
+
+ * try to kill ceph-mon
+ * ceph-mon is in the process of dying and removed its pidfile
+ * try to kill ceph-mon fails because the pidfile is not found
+ * another ceph-mon is spawned and fails to bind the port
+ because the previous ceph-mon is still holding it
+
+ Signed-off-by: Loic Dachary <loic@dachary.org>
+ (cherry picked from commit a1c13c57ba20fc329d943ea57523913e11067dc7)
+
+commit 5be6f2f60e3225bf3d214432044721fe474d55d7
+Author: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
+Date: Wed Jun 25 00:31:48 2014 +0200
+
+ osd/OSD.cc: parse lsb release data via lsb_release
+
+ Use lsb_release tool to be portable since parsing /etc/lsb-release
+ is not the same between different distributions. The old code failed
+ e.g. for SUSE products to parse LSB information.
+
+ Fixes: #8654
+
+ Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
+ (cherry picked from commit 0b3a3987d382ff33fdf892f189b30df22be80e59)
+
+commit b62187c52324a4489c2fc1385b1d6574a058f7e8
+Author: Loic Dachary <loic-201408@dachary.org>
+Date: Tue Aug 26 21:59:39 2014 +0200
+
+ tests: histogram prevent re-use of local variables
+
+ By moving the tests to separate functions.
+
+ http://tracker.ceph.com/issues/9235 Fixes: #9235
+
+ Signed-off-by: Loic Dachary <loic-201408@dachary.org>
+ (cherry picked from commit 4b8b25ecd128c34a386ad7c4cc89f323c4d384e1)
+
+commit e2741c8f1d42cfe91b18201a6a49005d90d85d98
+Author: Loic Dachary <loic-201408@dachary.org>
+Date: Tue Aug 26 21:59:39 2014 +0200
+
+ tests: histogram prevent re-use of local variables
+
+ By moving the test to a separate function.
+
+ http://tracker.ceph.com/issues/9235 Fixes: #9235
+
+ Signed-off-by: Loic Dachary <loic-201408@dachary.org>
+ (cherry picked from commit ee02293ad2ef050672fa8c164ba17b10e8d4ceeb)
+
+commit cf102df7a3f3b38824c26b9e44a21664fcf979a7
+Author: Loic Dachary <ldachary@redhat.com>
+Date: Wed Dec 10 00:08:57 2014 +0100
+
+ tests: avoid tab interpretation problem on fedora 20
+
+ Use . instead of tab in echo to avoid variations in how escape sequences
+ are interpreted by the shell.
+
+ http://tracker.ceph.com/issues/10281 Fixes: #10281
+
+ Signed-off-by: Loic Dachary <ldachary@redhat.com>
+
+commit f55b097764beb973c12866f2d7161c6bd870aa07 (refs/remotes/gh/wip-mon-backports.firefly)
+Author: Sage Weil <sage@redhat.com>
+Date: Sun Nov 2 08:50:59 2014 -0800
+
+ mon/PGMap and PGMonitor: update last_epoch_clean cache from new osd keys
+
+ We were only invalidating the cached value from apply_incremental, which
+ is no longer called on modern clusters.
+
+ Fix this by storing the update epoch in the key as well (it is not part
+ of osd_stat_t).
+
+ Backport: giant, firefly, dumpling(?)
+ Fixes: #9987
+ Signed-off-by: Sage Weil <sage@redhat.com>
+ (cherry picked from commit 093c5f0cabeb552b90d944da2c50de48fcf6f564)
+
+commit 1d314e7a9ab7af5b693583cf2faa5db54f6beb69
+Author: Sage Weil <sage@redhat.com>
+Date: Sun Nov 2 08:49:48 2014 -0800
+
+ mon/PGMap: invalidate cached min_last_epoch_clean from new-style pg keys
+
+ We were only invalidating the cache from the legacy apply_incremental(),
+ which is no longer called on modern clusters.
+
+ Fixes: #9987
+ Signed-off-by: Sage Weil <sage@redhat.com>
+ (cherry picked from commit 3fb731b722c50672a5a9de0c86a621f5f50f2d06)
+
+commit 465eedea9f7411b1e352dc3ccee60a3f1221541d
+Author: Sage Weil <sage@redhat.com>
+Date: Sun Nov 23 18:50:51 2014 -0800
+
+ crush/CrushWrapper: fix create_or_move_item when name exists but item does not
+
+ We were using item_exists(), which simply checks if we have a name defined
+ for the item. Instead, use _search_item_exists(), which looks for an
+ instance of the item somewhere in the hierarchy. This matches what
+ get_item_weightf() is doing, which ensures we get a non-negative weight
+ that converts properly to floating point.
+
+ Backport: giant, firefly
+ Fixes: #9998
+ Reported-by: Pawel Sadowski <ceph@sadziu.pl>
+ Signed-off-by: Sage Weil <sage@redhat.com>
+ (cherry picked from commit 9902383c690dca9ed5ba667800413daa8332157e)
+
+commit cee51af9c1dbde550177c95caf6c93f612442300
+Author: Sage Weil <sage@redhat.com>
+Date: Fri Nov 21 17:47:56 2014 -0800
+
+ crush/builder: prevent bucket weight underflow on item removal
+
+ It is possible to set a bucket weight that is not the sum of the item
+ weights if you manually modify/build the CRUSH map. Protect against any
+ underflow on the bucket weight when removing items.
+
+ Signed-off-by: Sage Weil <sage@redhat.com>
+ (cherry picked from commit 8c87e9502142d5b4a282b94f929ae776a49be1dc)
+
+commit 7ccd5eec11e8cd945d24bf9f6390d6c3fa4a06de
+Author: Sage Weil <sage@redhat.com>
+Date: Fri Nov 21 17:37:03 2014 -0800
+
+ crush/CrushWrapper: fix _search_item_exists
+
+ Reported-by: Pawel Sadowski <ceph@sadziu.pl>
+ Signed-off-by: Sage Weil <sage@redhat.com>
+ (cherry picked from commit eeadd60714d908a3a033aeb7fd542c511e63122b)
+
+commit b1ab685e00034751a161a3d5e0325c6581999c75
+Merge: dd7c8c2 ef3773a
+Author: Sage Weil <sage@redhat.com>
+Date: Fri Dec 12 06:19:50 2014 -0800
+
+ Merge pull request #3124 from ceph/wip-10194-firefly
+
+ rgw: optionally call FCGX_Free() on the fcgi connection
+
+ Reviewed-by: Sage Weil <sage@redhat.com>
+
+commit 11995b329045341c17553269267cfd3688a51b0f
+Author: Dan Mick <dan.mick@redhat.com>
+Date: Wed Dec 10 13:19:53 2014 -0800
+
+ Call Rados.shutdown() explicitly before exit
+
+ This is mostly a demonstration of good behavior, as the resources will
+ be reclaimed on exit anyway.
+
+ Signed-off-by: Dan Mick <dan.mick@redhat.com>
+ (cherry picked from commit b038e8fbf9103cc42a4cde734b3ee601af6019ea)
+
+commit e00270b51896f168d5013b7dc92ec7f8b9e19da3
+Author: Dan Mick <dan.mick@redhat.com>
+Date: Wed Dec 10 13:19:16 2014 -0800
+
+ rados.py: remove Rados.__del__(); it just causes problems
+
+ Recent versions of Python contain a change to thread shutdown that
+ causes ceph to hang on exit; see http://bugs.python.org/issue21963.
+ As it turns out, this is relatively easy to avoid by not spawning
+ threads on exit, as Rados.__del__() will certainly do by calling
+ shutdown(); I suspect, but haven't proven, that the problem is
+ that shutdown() tries to start() a threading.Thread() that never
+ makes it all the way back to signal start().
+
+ Also add a PendingReleaseNote and extra doc comments to clarify.
+
+ Fixes: #8797
+ Signed-off-by: Dan Mick <dan.mick@redhat.com>
+ (cherry picked from commit 5ba9b8f21f8010c59dd84a0ef2acfec99e4b048f)
+
+ Conflicts:
+ PendingReleaseNotes
+
+commit 7faae891aefa4c21c50430fa03d9204a86d082f8
+Author: Ken Dreyer <kdreyer@redhat.com>
+Date: Tue Dec 9 14:52:19 2014 -0700
+
+ Revert "ceph.spec.: add epoch"
+
+ If ICE ships 0.80.8, then it will be newer than what RHCEPH ships
+ (0.80.7), and users won't be able to seamlessly upgrade via Yum.
+
+ We have three options:
+ A) Revert the "Epoch: 1" change on the Firefly branch.
+ B) Revert the "Epoch: 1" change in the ICE packages.
+ C) Bump the Epoch to "2" in Red Hat's packages.
+
+ This commit does Option A.
+
+ Option B may or may not be feasible - it would require a "downstream"
+ change in ICE, and we haven't done that sort of thing before.
+
+ Due to the RHEL release schedule, Option C is not available to us at
+ this point.
+
+ This reverts commit b890c1e4706d7cfef7ed24c9df65b439b4f7ff1d.
+
+commit ef3773ac93413c644e056babce1971f846bbc276
+Author: Yehuda Sadeh <yehuda@redhat.com>
+Date: Wed Nov 26 15:18:07 2014 -0800
+
+ rgw: optionally call FCGX_Free() on the fcgi connection
+
+ Fixes: #10194
+
+ A new configurable controls this behavior. This forces disconnection of
+ the fcgi connection when done with the request.
+
+ Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
+
+commit dd7c8c2bc6b2810ff7f483af940fa09dbe74e83a
+Merge: d759467 a597096
+Author: Gregory Farnum <greg@gregs42.com>
+Date: Mon Dec 8 15:02:52 2014 -0800
+
+ Merge pull request #3109 from ceph/firefly-10263
+
+ mds: store backtrace for straydir
+
+ Reviewed-by: Greg Farnum <gfarnum@redhat.com>
+
+commit d7594672b673796901961cc684c9e7de8dc2c95d
+Merge: adf9a75 73b47db
+Author: Samuel Just <sam.just@inktank.com>
+Date: Mon Dec 8 13:19:44 2014 -0800
+
+ Merge pull request #3009 from dachary/wip-10018-primary-erasure-code-hinfo-firefly
+
+ osd: deep scrub must not abort if hinfo is missing (firefly)
+
+ Reviewed-by: Samuel Just <sjust@redhat.com>
+
+commit a5970963a2148697fc6da64facfbf6ab6686b9cd
+Author: Yan, Zheng <zyan@redhat.com>
+Date: Fri Nov 7 11:38:37 2014 +0800
+
+ mds: store backtrace for straydir
+
+ Backport: giant, firefly, emperor, dumpling
+ Signed-off-by: Yan, Zheng <zyan@redhat.com>
+ (cherry picked from commit 0d89db5d3e5ae5d552d4058a88a4e186748ab1d2)
+
+commit adf9a758000182d27a6582d516356730d02e4099
+Merge: dea38a7 b4a4b75
+Author: Sage Weil <sage@redhat.com>
+Date: Sat Dec 6 11:06:02 2014 -0800
+
+ Merge pull request #3089 from dachary/wip-10063-hobject-shard-firefly
+
+ common: do not omit shard when ghobject NO_GEN is set (firefly)
+
+commit dea38a7af638c833304272c324ed2bc386a40f8f
+Merge: ccc8b46 5138091
+Author: Sage Weil <sage@redhat.com>
+Date: Sat Dec 6 10:59:44 2014 -0800
+
+ Merge pull request #2480 from dachary/wip-9420-erasure-code-non-regression-firefly
+
+ erasure-code: store and compare encoded contents (firefly)
+
+commit ccc8b46b2cdc55c1a861f092259ef36a1296f073
+Merge: bef363c cd3447d
+Author: Sage Weil <sage@redhat.com>
+Date: Fri Dec 5 17:33:05 2014 -0800
+
+ Merge pull request #3096 from dachary/wip-9785-dmcrypt-keys-permissions-firefly
+
+ ceph-disk: dmcrypt file permissions (firefly)
+
+commit cd3447d04cabf6745001afeef69f25a92400cd0e
+Author: Loic Dachary <ldachary@redhat.com>
+Date: Thu Dec 4 22:21:32 2014 +0100
+
+ ceph-disk: dmcrypt file permissions
+
+ The directory in which key files are stored for dmcrypt must be 700 and
+ the file 600.
+
+ http://tracker.ceph.com/issues/9785 Fixes: #9785
+
+ Signed-off-by: Loic Dachary <ldachary@redhat.com>
+ (cherry picked from commit 58682d1776ab1fd4daddd887d921ca9cc312bf50)
+
+commit bef363c1d1fc06fbb315024145a97a809a2471cd
+Merge: cb2c83b 9f3b21d
+Author: Sage Weil <sage@redhat.com>
+Date: Fri Dec 5 09:04:00 2014 -0800
+
+ Merge pull request #3086 from dachary/wip-10125-radosgw-init-firefly
+
+ rgw: run radosgw as apache with systemd (firefly)
+
+commit b4a4b75e6d4deb6818681902f85baa9f63acdb4f
+Author: Loic Dachary <ldachary@redhat.com>
+Date: Fri Nov 14 01:16:10 2014 +0100
+
+ common: do not omit shard when ghobject NO_GEN is set
+
+ Do not silence the display of shard_id when generation is NO_GEN.
+ Erasure coded objects JSON representation used by ceph_objectstore_tool
+ need the shard_id to find the file containing the chunk.
+
+ Minimal testing is added to ceph_objectstore_tool.py
+
+ http://tracker.ceph.com/issues/10063 Fixes: #10063
+
+ Signed-off-by: Loic Dachary <ldachary@redhat.com>
+ (cherry picked from commit dcf09aed121f566221f539106d10283a09f15cf5)
+
+ Conflicts:
+ src/test/ceph_objectstore_tool.py
+
+commit 9f3b21d1b70be591d68bfa57c3393e8f9af8e7df
+Author: Loic Dachary <ldachary@redhat.com>
+Date: Tue Dec 2 18:10:48 2014 +0100
+
+ rgw: run radosgw as apache with systemd
+
+ Same as sysv.
+
+ http://tracker.ceph.com/issues/10125 Fixes: #10125
+
+ Signed-off-by: Loic Dachary <loic@dachary.org>
+ (cherry picked from commit 7b621f4abf63456272dec3449aa108c89504a7a5)
+
+ Conflicts:
+ src/init-radosgw.sysv
+
+commit cb2c83b2f216e503f7a52115f775bda1dbfe0c6a
+Merge: e2ec37b 02d4685
+Author: Josh Durgin <jdurgin@redhat.com>
+Date: Thu Dec 4 11:32:18 2014 -0800
+
+ Merge pull request #3078 from ceph/wip-10030-firefly
+
+ librbd: don't close an already closed parent image upon failure
+
+ Reviewed-by: Josh Durgin <jdurgin@redhat.com>
+
+commit e2ec37bf45fa5e7f5e787db9b67dbb2a98f2fbb7
+Merge: c4c63e8 af12194
+Author: Sage Weil <sage@redhat.com>
+Date: Wed Dec 3 23:01:44 2014 -0800
+
+ Merge pull request #3063 from ceph/wip-10123-firefly
+
+ librbd: protect list_children from invalid child pool IoCtxs
+
+ Reviewed-by: Sage Weil <sage@redhat.com>
+
+commit c4c63e82cd7e4716315ca81208293a2567026c72
+Author: Samuel Just <sam.just@inktank.com>
+Date: Tue Sep 23 15:52:08 2014 -0700
+
+ ReplicatedPG: don't move on to the next snap immediately
+
+ If we have a bunch of trimmed snaps for which we have no
+ objects, we'll spin for a long time. Instead, requeue.
+
+ Fixes: #9487
+ Backport: dumpling, firefly, giant
+ Reviewed-by: Sage Weil <sage@redhat.com>
+ Signed-off-by: Samuel Just <sam.just@inktank.com>
+ (cherry picked from commit c17ac03a50da523f250eb6394c89cc7e93cb4659)
+
+commit 1b656450ca75b12fb98dee82bace914ef5f45c44
+Author: Sage Weil <sage@redhat.com>
+Date: Tue Sep 23 16:21:33 2014 -0700
+
+ osd: initialize purged_snap on backfill start; restart backfill if change
+
+ If we backfill a PG to a new OSD, we currently neglect to initialize
+ purged_snaps. As a result, the first time the snaptrimmer runs it has to
+ churn through every deleted snap for all time, and to make matters worse
+ does so in one go with the PG lock held. This leads to badness on any
+ cluster with a significant number of removed snaps that experiences
+ backfill.
+
+ Resolve this by initializing purged_snaps when we finish backfill. The
+ backfill itself will clear out any stray snaps and ensure the object set
+ is in sync with purged_snaps. Note that purged_snaps on the primary
+ that is driving backfill will not change during this period as the
+ snaptrimmer is not scheduled unless the PG is clean (which it won't be
+ during backfill).
+
+ If we by chance to interrupt backfill, go clean with other OSDs,
+ purge snaps, and then let this OSD rejoin, we will either restart
+ backfill (non-contiguous log) or the log will include the result of
+ the snap trim (the events that remove the trimmed snap).
+
+ Fixes: #9487
+ Backfill: firefly, dumpling
+ Signed-off-by: Sage Weil <sage@redhat.com>
+ (cherry picked from commit 255b430a87201c7d0cf8f10a3c1e62cbe8dd2d93)
+
+commit 02d4685c56e129cb179a5ddfb8e87aefc2fce0b5
+Author: Jason Dillaman <dillaman@redhat.com>
+Date: Thu Nov 6 05:01:38 2014 -0500
+
+ librbd: don't close an already closed parent image upon failure
+
+ If librbd is not able to open a child's parent image, it will
+ incorrectly close the parent image twice, resulting in a crash.
+
+ Fixes: #10030
+ Backport: firefly, giant
+ Signed-off-by: Jason Dillaman <dillaman@redhat.com>
+ (cherry picked from commit 61ebfebd59b61ffdc203dfeca01ee1a02315133e)
+
+commit af121942d7bdfc59fcfae0429ffb12993e7e019d
+Author: Jason Dillaman <dillaman@redhat.com>
+Date: Mon Nov 17 21:49:26 2014 -0500
+
+ librbd: protect list_children from invalid child pool IoCtxs
+
+ While listing child images, don't ignore error codes returned
+ from librados when creating an IoCtx. This will prevent seg
+ faults from occurring when an invalid IoCtx is used.
+
+ Fixes: #10123
+ Backport: giant, firefly, dumpling
+ Signed-off-by: Jason Dillaman <dillaman@redhat.com>
+ (cherry picked from commit 0d350b6817d7905908a4e432cd359ca1d36bab50)
+
+commit c982da44e0e9e0be3c3d4e8f5e0a186fb2fcebb3
+Merge: 4a148df c4e4a31
+Author: Sage Weil <sage@redhat.com>
+Date: Sun Nov 30 10:12:04 2014 -0800
+
+ Merge pull request #3014 from dachary/wip-9665-ceph-disk-partprobe-firefly
+
+ ceph disk zap must call partprobe
+
+commit c4e4a310f14ca3049ac90422aea95051fe0d4b15
+Author: Loic Dachary <loic-201408@dachary.org>
+Date: Fri Oct 10 10:26:31 2014 +0200
+
+ ceph-disk: use update_partition in prepare_dev and main_prepare
+
+ In the case of prepare_dev the partx alternative was missing and is not
+ added because update_partition does it.
+
+ http://tracker.ceph.com/issues/9721 Fixes: #9721
+
+ Signed-off-by: Loic Dachary <loic-201408@dachary.org>
+ (cherry picked from commit 23e71b1ee816c0ec8bd65891998657c46e364fbe)
+
+ Conflicts:
+ src/ceph-disk
+
+commit e70a81464b906b9a304c29f474e6726762b63a7c
+Author: Loic Dachary <loic-201408@dachary.org>
+Date: Thu Oct 9 18:52:17 2014 +0200
+
+ ceph-disk: run partprobe after zap
+
+ Not running partprobe after zapping a device can lead to the following:
+
+ * ceph-disk prepare /dev/loop2
+ * links are created in /dev/disk/by-partuuid
+ * ceph-disk zap /dev/loop2
+ * links are not removed from /dev/disk/by-partuuid
+ * ceph-disk prepare /dev/loop2
+ * some links are not created in /dev/disk/by-partuuid
+
+ This is assuming there is a bug in the way udev events are handled by
+ the operating system.
+
+ http://tracker.ceph.com/issues/9665 Fixes: #9665
+
+ Signed-off-by: Loic Dachary <loic-201408@dachary.org>
+ (cherry picked from commit fed3b06c47a5ef22cb3514c7647544120086d1e7)
+
+commit 5a5f427bc09076ef3fb13a710dede1b47bb232e0
+Author: Loic Dachary <loic-201408@dachary.org>
+Date: Fri Oct 10 10:23:34 2014 +0200
+
+ ceph-disk: encapsulate partprobe / partx calls
+
+ Add the update_partition function to reduce code duplication.
+ The action is made an argument although it always is -a because it will
+ be -d when deleting a partition.
+
+ Use the update_partition function in prepare_journal_dev
+
+ Signed-off-by: Loic Dachary <loic-201408@dachary.org>
+ (cherry picked from commit 922a15ea6865ef915bbdec2597433da6792c1cb2)
+
+ Conflicts:
+ src/ceph-disk
+
+commit 73b47dbee8858f182fd2b4fd8eb5f3c786877bf4
+Author: Loic Dachary <loic-201408@dachary.org>
+Date: Thu Nov 6 17:11:20 2014 +0100
+
+ osd: deep scrub must not abort if hinfo is missing
+
+ Instead it should set read_error.
+
+ http://tracker.ceph.com/issues/10018 Fixes: #10018
+
+ Signed-off-by: Loic Dachary <loic-201408@dachary.org>
+ (cherry picked from commit 9d84d2e8309d26e39ca849a75166d2d7f2dec9ea)
+
+commit 5138091a4073d966a65f537280f89372e801d019
+Author: Loic Dachary <loic-201408@dachary.org>
+Date: Tue Sep 23 11:38:09 2014 +0200
+
+ erasure-code: add corpus verification to make check
+
+ Signed-off-by: Loic Dachary <loic-201408@dachary.org>
+
+commit 8d3d6bf59aec3877c0231e637270e371d9ed3b8c
+Author: Loic Dachary <loic-201408@dachary.org>
+Date: Sat Sep 13 13:36:09 2014 +0200
+
+ erasure-code: workunit to check for encoding regression
+
+ Clone the archive of encoded objects and decode all archived objects, up
+ to and including the current ceph version.
+
+ http://tracker.ceph.com/issues/9420 Refs: #9420
+
+ Signed-off-by: Loic Dachary <loic-201408@dachary.org>
+
+commit 4f4358708ed3c261ca4027cc9c3dc3f952a99470
+Author: Loic Dachary <loic-201408@dachary.org>
+Date: Sat Sep 13 10:16:31 2014 +0200
+
+ erasure-code: store and compare encoded contents
+
+ Introduce ceph_erasure_code_non_regression to check and compare how an
+ erasure code plugin encodes and decodes content with a given set of
+ parameters. For instance:
+
+ ./ceph_erasure_code_non_regression \
+ --plugin jerasure \
+ --parameter technique=reed_sol_van \
+ --parameter k=2 \
+ --parameter m=2 \
+ --stripe-width 3181 \
+ --create \
+ --check
+
+ Will create an encoded object (--create) and store it into a directory
+ along with the chunks, one chunk per file. The directory name is derived
+ from the parameters. The content of the object is a random pattern of 31
+ bytes repeated to fill the object size specified with --stripe-width.
+
+ The check function (--check) reads the object back from the file,
+ encodes it and compares the result with the content of the chunks read
+ from the files. It also attempts recover from one or two erasures.
+
+ Chunks encoded by a given version of Ceph are expected to be encoded
+ exactly in the same way by all Ceph versions going forward.
+
+ http://tracker.ceph.com/issues/9420 Refs: #9420
+
+ Signed-off-by: Loic Dachary <loic-201408@dachary.org>
+
+commit 4a148df544978383c1ed7cd8b90f590adb563f3d
+Merge: c069bce 01faf13
+Author: Loic Dachary <loic-201408@dachary.org>
+Date: Wed Nov 19 02:45:26 2014 +0100
+
+ Merge pull request #2961 from ceph/wip-10114-firefly
+
+ Add annotation to all assembly files to turn off stack-execute bit
+
+ Reviewed-by: Loic Dachary <ldachary@redhat.com>
+
+commit 01faf1356f648ded9acda02e7cc67c1adb9e9ee3
+Author: Dan Mick <dan.mick@redhat.com>
+Date: Fri Nov 14 17:59:57 2014 -0800
+
+ Add annotation to all assembly files to turn off stack-execute bit
+
+ See discussion in http://tracker.ceph.com/issues/10114
+
+ Building with these changes allows output from readelf like this:
+
+ $ readelf -lW src/.libs/librados.so.2 | grep GNU_STACK
+ GNU_STACK 0x000000 0x0000000000000000 0x0000000000000000 0x000000
+ 0x000000 RW 0x8
+
+ (note the absence of 'X' in 'RW')
+
+ Fixes: #10114
+ Signed-off-by: Dan Mick <dan.mick@redhat.com>
+ (cherry picked from commit 06a245a9845c0c126fb3106b41b2fd2bc4bc4df3)
+ (not-yet-present-in-firefly files in isa-l manually removed)
+
+commit c069bce4e8180da3c0ca4951365032a45df76468
+Merge: 0d8ad6a fac1654
+Author: Samuel Just <sam.just@inktank.com>
+Date: Thu Nov 13 10:36:12 2014 -0800
+
+ Merge pull request #2760 from ceph/wip-9835-firefly
+
+ osd: fix erasure hung op bug (9835)
+
+ Reviewed-by: Samuel Just <sjust@redhat.com>
+
+commit fac165475031efdebbb88898ca5c12cd307a5bc3
+Author: Samuel Just <sam.just@inktank.com>
+Date: Wed Nov 5 12:12:14 2014 -0800
+
+ osd: use OSDMap helper to tell if ops are misdirected
+
+ calc_pg_role doesn't actually take into account primary affinity.
+
+ Fixes: #9835
+ Signed-off-by: Samuel Just <sam.just@inktank.com>
+
+commit 588602bf0095de5b59064123ca01345f1364bdde
+Author: Sage Weil <sage@redhat.com>
+Date: Mon Oct 20 13:55:33 2014 -0700
+
+ osd: discard rank > 0 ops on erasure pools
+
+ Erasure pools do not support read from replica, so we should drop
+ any rank > 0 requests.
+
+ This fixes a bug where an erasure pool maps to [1,2,3], temporarily maps
+ to [-1,2,3], sends a request to osd.2, and then remaps back to [1,2,3].
+ Because the 0 shard never appears on osd.2, the request sits in the
+ waiting_for_pg map indefinitely and cases slow request warnings.
+ This problem does not come up on replicated pools because all instances of
+ the PG are created equal.
+
+ Fix by only considering role == 0 for erasure pools as a correct mapping.
+
+ Fixes: #9835
+ Signed-off-by: Sage Weil <sage@redhat.com>
+
+commit 0c1c4152e6f402af7612c8c8d4719ab0f4cc6ad9
+Author: Sage Weil <sage@redhat.com>
+Date: Wed Nov 12 17:04:35 2014 -0800
+
+ osd/OSDMap: add osd_is_valid_op_target()
+
+ Helper to check whether an osd is a given op target for a pg. This
+ assumes that for EC we always send ops to the primary, while for
+ replicated we may target any replica.
+
+ Signed-off-by: Sage Weil <sage@redhat.com>
+ (cherry picked from commit 89c02637914ac7332e9dbdbfefc2049b2b6c127d)
+
+commit 0d8ad6ad3c376bcab981bea9a49e1924d7eddb68
+Author: Josh Durgin <jdurgin@redhat.com>
+Date: Tue Nov 11 18:16:02 2014 -0800
+
+ qa: allow small allocation diffs for exported rbds
+
+ The local filesytem may behave slightly differently. This isn't
+ foolproof, but seems to be reliable enough on rhel7 rootfs, where
+ exact comparison was failing.
+
+ Fixes: #10002
+ Signed-off-by: Josh Durgin <jdurgin@redhat.com>
+ (cherry picked from commit e94d3c11edb9c9cbcf108463fdff8404df79be33)
+
+commit 0804deeab293e09123d1b58825051ccc4dddbc0e
+Author: Sage Weil <sage@inktank.com>
+Date: Sun May 25 08:38:38 2014 -0700
+
+ osd: fix map advance limit to handle map gaps
+
+ The recent change in cf25bdf6b0090379903981fe8cee5ea75efd7ba0 would stop
+ advancing after some number of epochs, but did not take into consideration
+ the possibilty that there are missing maps. In that case, it is impossible
+ to advance past the gap.
+
+ Fix this by increasing the max epoch as we go so that we can always get
+ beyond the gap.
+
+ Signed-off-by: Sage Weil <sage@inktank.com>
+ (cherry picked from commit 1e0a82fd55dede473c0af32924f4bcb5bb697a2b)
+
+commit d30d6b986433eaef920b3703cf5af3c030f8dcf4
+Merge: d241aa7 d548431
+Author: Gregory Farnum <greg@gregs42.com>
+Date: Fri Nov 7 14:10:18 2014 -0800
+
+ Merge pull request #2880 from ceph/wip-10025-firefly
+
+ #10025/firefly -- tools: fix MDS journal import
+
+ Reviewed-by: Greg Farnum <greg@inktank.com>
+
+commit d548431a388da1130564d710e1f006772934224b
+Author: John Spray <john.spray@redhat.com>
+Date: Fri Nov 7 11:34:43 2014 +0000
+
+ tools: fix MDS journal import
+
+ Previously it only worked on fresh filesystems which
+ hadn't been trimmed yet, and resulted in an invalid
+ trimmed_pos when expire_pos wasn't on an object
+ boundary.
+
+ Fixes: #10025
+
+ Signed-off-by: John Spray <john.spray@redhat.com>
+ (cherry picked from commit fb29e71f9a97c12354045ad2e128156e503be696)
+
+commit d241aa7a347655242cc71b8fa3d778df6948c494
+Merge: 2c85b5d 4afb542
+Author: Samuel Just <sam.just@inktank.com>
+Date: Thu Nov 6 10:37:42 2014 -0800
+
+ Merge remote-tracking branch 'origin/wip-sam-firefly-backports' into firefly
+
+commit 2c85b5d72953d01296213185382707122e06415c
+Merge: 23cbffa 1228658
+Author: Samuel Just <sam.just@inktank.com>
+Date: Thu Nov 6 10:30:20 2014 -0800
+
+ Merge pull request #2737 from ceph/wip-9629-firefly
+
+ osd: do not clone/preserve snapdir on cache-evict (firefly backport)
+
+ Reviewed-by: Samuel Just <sjust@redhat.com>
+
+commit 23cbffaa2936dc2707b5b42f8c0e7ce804324ae2
+Merge: 3bba938 e296685
+Author: Samuel Just <sam.just@inktank.com>
+Date: Thu Nov 6 10:26:21 2014 -0800
+
+ Merge pull request #2657 from ceph/wip-9053-9301-firefly
+
+ mon: backport two paxos fixes to firefly
+
+ Reviewed-by: Joao Luis <joao@redhat.com>
+
+commit 3bba9387eb123c6cf055e874db2925b998dc406c
+Merge: 3f9bf73 835f8c6
+Author: Samuel Just <sam.just@inktank.com>
+Date: Thu Nov 6 10:21:12 2014 -0800
+
+ Merge pull request #2656 from ceph/wip-9502-firefly
+
+ mon: backport mon disk full check to firefly
+
+ Reviewed-by: Samuel Just <sjust@redhat.com>
+
+commit 3f9bf738daf47ff4ff56c9f76d1487a5afc5e30a
+Merge: a340e6d 3e17a08
+Author: Samuel Just <sam.just@inktank.com>
+Date: Thu Nov 6 10:18:27 2014 -0800
+
+ Merge pull request #2764 from ceph/wip-9851
+
+ osd: bring FileJournal in sync with giant
+
+ Reviewed-by: Samuel Just <sjust@redhat.com>
+
+commit a340e6d0b166019f58dca0703faf30dd3178c14f
+Merge: b7d5f99 b9450b5
+Author: Samuel Just <sam.just@inktank.com>
+Date: Thu Nov 6 10:12:17 2014 -0800
+
+ Merge pull request #2776 from ceph/wip-9675.firefly
+
+ CrushWrapper: pick a ruleset same as rule_id
+
+ Reviewed-by: Samuel Just <sam.just@inktank.com>
+
+commit b7d5f99c8f4d751e83dc29305649d7a465c657b1
+Author: Sage Weil <sage@redhat.com>
+Date: Mon Sep 15 15:29:08 2014 -0700
+
+ ceph-disk: mount xfs with inode64 by default
+
+ We did this forever ago with mkcephfs, but ceph-disk didn't. Note that for
+ modern XFS this option is obsolete, but for older kernels it was not the
+ default.
+
+ Backport: firefly
+ Signed-off-by: Sage Weil <sage@redhat.com>
+ (cherry picked from commit 11496399ef318498c11e551f139d96db52d3309c)
+
+commit 1a9d000bb679a7392b9dd115373c3827c9626694
+Author: Yehuda Sadeh <yehuda@redhat.com>
+Date: Thu Oct 9 10:20:27 2014 -0700
+
+ rgw: set length for keystone token validation request
+
+ Fixes: #7796
+ Backport: giany, firefly
+ Need to set content length to this request, as the server might not
+ handle a chunked request (even though we don't send anything).
+
+ Tested-by: Mark Kirkwood <mark.kirkwood@catalyst.net.nz>
+ Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
+ (cherry picked from commit 3dd4ccad7fe97fc16a3ee4130549b48600bc485c)
+
+commit 49d27efde2ce5d282c9ee6ca9c8ea9db8f609392
+Author: Yehuda Sadeh <yehuda@redhat.com>
+Date: Tue Aug 19 13:15:46 2014 -0700
+
+ rgw: subuser creation fixes
+
+ Fixes: #8587
+ There were a couple of issues, one when trying to identify whether swift
+ user exists, we weren't using the correct swift id. The second problem
+ is that we relied on the gen_access flag in the swift case, where it
+ doesn't really need to apply.
+
+ Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
+ (cherry picked from commit 1441ffe8103f03c6b2f625f37adbb2e1cfec66bb)
+
+commit 8db2f0969e1715f57088c311a33e7e3499933afb
+Merge: 9a15592 2a5d7f0
+Author: Sage Weil <sage@redhat.com>
+Date: Fri Oct 31 08:35:50 2014 -0700
+
+ Merge pull request #2847 from dachary/wip-9752-past-intervals-firefly
+
+ osd: past_interval display bug on acting
+
+commit 2a5d7f08303eb8b1687c5b58426443b3d40e415c
+Author: Loic Dachary <loic-201408@dachary.org>
+Date: Fri Oct 31 00:49:21 2014 +0100
+
+ osd: past_interval display bug on acting
+
+ The acting array was incorrectly including the primary and up_primary.
+
+ http://tracker.ceph.com/issues/9752 Fixes: #9752
+
+ Signed-off-by: Loic Dachary <loic-201408@dachary.org>
+ (cherry picked from commit c5f8d6eded52da451fdd1d807bd4700221e4c41c)
+
+commit 9a15592eae6739183049f8376392c5577145871e
+Merge: 6fd8879 c20a242
+Author: Yan, Zheng <ukernel@gmail.com>
+Date: Thu Oct 30 17:01:24 2014 -0700
+
+ Merge pull request #2840 from ceph/firefly-9869
+
+ Backport "client: cast m->get_client_tid() to compare to 16-bit Inode::flushing_cap_tid"
+
+commit c20a2421f4a5b33407d7f31806dd4587b4e9077c
+Author: Greg Farnum <greg@inktank.com>
+Date: Wed Oct 22 17:16:31 2014 -0700
+
+ client: cast m->get_client_tid() to compare to 16-bit Inode::flushing_cap_tid
+
+ m->get_client_tid() is 64 bits (as it should be), but Inode::flushing_cap_tid
+ is only 16 bits. 16 bits should be plenty to let the cap flush updates
+ pipeline appropriately, but we need to cast in the proper direction when
+ comparing these differently-sized versions. So downcast the 64-bit one
+ to 16 bits.
+
+ Fixes: #9869
+ Backport: giant, firefly, dumpling
+
+ Signed-off-by: Greg Farnum <greg@inktank.com>
+ (cherry picked from commit a5184cf46a6e867287e24aeb731634828467cd98)
+
+commit 4afb54274bb2087da348103d0a7641b3a018d777
+Author: Samuel Just <sam.just@inktank.com>
+Date: Thu Sep 11 13:46:51 2014 -0700
+
+ ReplicatedPG: cancel cb on blacklisted watcher
+
+ Fixes: #8315
+ Backport: firefly
+ Signed-off-by: Samuel Just <sam.just@inktank.com>
+ (cherry picked from commit 16bd45777166c29c433af3b59254a7169e512d98)
+
+commit 037aa342fa277351fc605da41489a6ceba81ab05
+Author: Samuel Just <sam.just@inktank.com>
+Date: Sun Sep 21 10:19:43 2014 -0700
+
+ ReplicatedPG::on_removal: clear rollback info
+
+ Fixes: #9293
+ Backport: firefly
+ Signed-off-by: Samuel Just <sam.just@inktank.com>
+ (cherry picked from commit 544b8c7ffb4af01765b87239f2d7ab88479ee779)
+
+commit 8978c8dc1f153a9052b5d967ceff11d4f08d51ea
+Merge: 8401e7f 4be53d5
+Author: Samuel Just <sam.just@inktank.com>
+Date: Thu Oct 30 13:48:18 2014 -0700
+
+ Merge remote-tracking branch 'origin/wip-9574' into wip-sam-firefly-backports
+
+commit 8401e7ffa1768770f451143b3c110d1deae1bd40
+Author: Samuel Just <sam.just@inktank.com>
+Date: Mon Sep 29 15:01:25 2014 -0700
+
+ PG: release backfill reservations if a backfill peer rejects
+
+ Also, the full peer will wait until the rejection from the primary
+ to do a state transition.
+
+ Fixes: #9626
+ Backport: giant, firefly, dumpling
+ Signed-off-by: Samuel Just <sam.just@inktank.com>
+ (cherry picked from commit 624aaf2a4ea9950153a89ff921e2adce683a6f51)
+
+commit 5df09fa1b5a42992f9e41aca09e86db0d03d9fbd
+Merge: a0937ef a1aa06b
+Author: Samuel Just <sam.just@inktank.com>
+Date: Thu Oct 30 13:47:22 2014 -0700
+
+ Merge remote-tracking branch 'origin/wip-9113' into wip-sam-firefly-backports
+
+commit a0937ef214b9221e7a5e69e7b0f0697471d56293
+Author: Sage Weil <sage@redhat.com>
+Date: Sun Oct 12 10:05:51 2014 -0700
+
+ osd/osd_types: consider CRUSH_ITEM_NONE in check_new_interval() min_size check
+
+ Fixes: #9718
+ Backport: firefly
+ Signed-off-by: Sage Weil <sage@redhat.com>
+ (cherry picked from commit d947050c82a511f91c98e1c76e48ffa9e187eee7)
+
+ Conflicts:
+ src/osd/osd_types.cc
+
+commit 35e8e6b2c1733cd421bf6c3916553eea3786e76e
+Author: Samuel Just <sam.just@inktank.com>
+Date: Mon Oct 20 14:10:58 2014 -0700
+
+ PG:: reset_interval_flush and in set_last_peering_reset
+
+ If we have a change in the prior set, but not in the up/acting set, we go back
+ through Reset in order to reset peering state. Previously, we would reset
+ last_peering_reset in the Reset constructor. This did not, however, reset the
+ flush_interval, which caused the eventual flush event to be ignored and the
+ peering messages to not be sent.
+
+ Instead, we will always reset_interval_flush if we are actually changing the
+ last_peering_reset value.
+
+ Fixes: #9821
+ Backport: firefly
+ Signed-off-by: Samuel Just <sam.just@inktank.com>
+ (cherry picked from commit d9ff3a6b789c5b9c77aefa3751bd808f5d7b8ca7)
+
+commit 3f35db42977704a12ac4b5bcad6261aaf6b6a88d
+Author: Samuel Just <sam.just@inktank.com>
+Date: Thu Oct 23 09:11:28 2014 -0700
+
+ ReplicatedPG: writeout hit_set object with correct prior_version
+
+ Fixes: #9875
+ Backport: giant, firefly
+ Signed-off-by: Samuel Just <sam.just@inktank.com>
+ (cherry picked from commit 1a3ad307f1a4c0a956d6fd31d13f01ffe411a09d)
+
+commit 6fd88792e77cdc7ad33ff0acf9b3189a7c525430
+Merge: 0975ec9 afe6bd8
+Author: Sage Weil <sage@redhat.com>
+Date: Sun Oct 26 20:37:52 2014 -0700
+
+ Merge pull request #2717 from dachary/wip-9747-ceph-spec-firefly
+
+ rpm: 95-ceph-osd-alt.rules is not needed for centos7 / rhel7 (firefly)
+
+commit b9450b532ab7ad23ec6e2c22ed7cf55e6e1cc4c0
+Author: Xiaoxi Chen <xiaoxi.chen@intel.com>
+Date: Wed Aug 20 15:35:44 2014 +0800
+
+ CrushWrapper: pick a ruleset same as rule_id
+
+ Originally in the add_simple_ruleset funtion, the ruleset_id
+ is not reused but rule_id is reused. So after some add/remove
+ against rules, the newly created rule likely to have
+ ruleset!=rule_id.
+
+ We dont want this happen because we are trying to hold the constraint
+ that ruleset == rule_id.
+
+ Signed-off-by: Xiaoxi Chen <xiaoxi.chen@intel.com>
+ (cherry picked from commit 78e84f34da83abf5a62ae97bb84ab70774b164a6)
+
+ Conflicts:
+ src/test/erasure-code/TestErasureCodeIsa.cc
+
+ Fixes: #9675
+
+commit 3e17a0872a3864cb6aee46959afd955ef0cbafeb
+Author: Ma Jianpeng <jianpeng.ma@intel.com>
+Date: Mon Jul 21 15:08:55 2014 +0800
+
+ os/FileJournal: When dump journal, using correctly seq avoid misjudging joural corrupt.
+
+ In func FileJournal::dump, it always using seq=0 as last-seq and it can
+ misjudge the journal corrupt.
+
+ Signed-off-by: Ma Jianpeng <jianpeng.ma@intel.com>
+ (cherry picked from commit 5f65b4db6d1dad7c2c5a09eab42af63a82ea9e9b)
+
+commit 350da8c98bc1e90cd392992aba290c7478280d88
+Author: Loic Dachary <loic-201408@dachary.org>
+Date: Fri Sep 26 01:15:53 2014 +0200
+
+ os: io_event.res is the size written
+
+ And not an error code to be converted with cpp_strerror()
+
+ Signed-off-by: Loic Dachary <loic-201408@dachary.org>
+ (cherry picked from commit 7827e0035e3350ad2d9230f27a1629545f53af5c)
+
+commit ecff3761f3d15061a2cbf0a595ca249a4c424f4c
+Author: Ma Jianpeng <jianpeng.ma@intel.com>
+Date: Thu Aug 21 15:10:46 2014 +0800
+
+ os/FileJournal: For journal-aio-mode, don't use aio when closing journal.
+
+ For jouranl-aio-mode when closing journal, the write_finish_thread_entry may exit before
+ write_thread_entry. This cause no one wait last aios to complete.
+ On some platform, after that the journal-header on journal corrupted.
+ To avoid this, when closing jouranl we don't use aio.
+
+ Fixes: 9073
+ Reported-by: Mark Kirkwood <mark.kirkwood@catalyst.net.nz>
+ Tested-by: Mark Kirkwood <mark.kirkwood@catalyst.net.nz>
+ Signed-off-by: Ma Jianpeng <jianpeng.ma@intel.com>
+ (cherry picked from commit e870fd09ce846e5642db268c33bbe8e2e17ffef2)
+
+commit dbc33fbab4b35e2ce1e46a881f6714262502c243
+Author: Ma Jianpeng <jianpeng.ma@intel.com>
+Date: Thu Aug 21 21:07:51 2014 +0800
+
+ os/FileJournal: Only using aio then alloc the related resources.
+
+ If define HAVE_LIBAIO, it alloc related resouces. But itt don't check whether
+ using aio mode. Only using aio it alloc the related resources.
+
+ Signed-off-by: Ma Jianpeng <jianpeng.ma@intel.com>
+ (cherry picked from commit a66a4931d5be9ee26c0983b3154fdbe37261a51c)
+
+commit 3312c6eeca21dcd566df9bdd8de7b3fe33356b57
+Author: Ma Jianpeng <jianpeng.ma@intel.com>
+Date: Thu Aug 21 15:49:44 2014 +0800
+
+ os/FileJournal: Tune the judge logic for read_header.
+
+ When reading journal-header, it should firstly check the result of
+ pread and then do decoce operation.
+
+ Signed-off-by: Ma Jianpeng <jianpeng.ma@intel.com>
+ (cherry picked from commit c8e2b89cf6bc36a0ff29887b9e76cbbeceef9f8f)
+
+commit b42107584449e1f85cbee97bfa486ebeb310e6a1
+Author: Sage Weil <sage@redhat.com>
+Date: Tue Aug 19 20:50:13 2014 -0700
+
+ os/FileJournal: signal aio_cond even if seq is 0
+
+ This can happen if we write a journal but no events.
+
+ Reported-by: Somnath Roy <somnath.roy@sandisk.com>
+ Reported-by: Ma, Jianpeng <jianpeng.ma@intel.com>
+ Signed-off-by: Sage Weil <sage@redhat.com>
+ (cherry picked from commit 57778e2c577c1e1bbf9525232720a2994fa36abc)
+
+commit 4a43ea171d84a9f3a13064030eb386fcfbe3bbb8
+Author: Ma Jianpeng <jianpeng.ma@intel.com>
+Date: Wed Jul 23 10:10:38 2014 -0700
+
+ os/FileJournal: Update the journal header when closing journal
+
+ When closing journal, it should check must_write_header and update
+ journal header if must_write_header alreay set.
+ It can reduce the nosense journal-replay after restarting osd.
+
+ Signed-off-by: Ma Jianpeng <jianpeng.ma@intel.com>
+ Reviewed-by: Sage Weil <sage@redhat.com>
+ (cherry picked from commit 5bf472aefb7360a1fe17601b42e551df120badfb)
+
+commit 0975ec9cec1c466f7b15f5173541a7eab02dae18
+Author: Sage Weil <sage@redhat.com>
+Date: Tue Oct 21 06:53:36 2014 -0700
+
+ Revert "os/FileJournal: stop aio completion thread *after* writer thread"
+
+ This reverts commit 334631ae4641824b3df49245f36a8fd4b143bf3f.
+
+commit 5a10b95f7968ecac1f2af4abf9fb91347a290544
+Merge: cc69c16 d5bac46
+Author: Samuel Just <sam.just@inktank.com>
+Date: Fri Oct 17 10:47:22 2014 -0700
+
+ Merge pull request #2716 from ceph/wip-firefly-9419
+
+ Backport fix for bug #9419
+
+commit cc69c16c2108cb231b2434a53e3eef51b597756b
+Merge: f9cdaab 334631a
+Author: Samuel Just <sam.just@inktank.com>
+Date: Fri Oct 17 10:44:30 2014 -0700
+
+ Merge pull request #2724 from dachary/wip-9073-journal-aio-mode-firefly
+
+ os/FileJournal: stop aio completion thread *after* writer thread
+
+commit f9cdaabe078415d7927e2618030996f2f24be2f1
+Merge: 0b4b34a 412c277
+Author: Sage Weil <sage@redhat.com>
+Date: Fri Oct 17 08:20:53 2014 -0700
+
+ Merge pull request #2742 from ceph/firefly-unknown-locktype
+
+ mds: reply -EOPNOTSUPP for unknown lock type
+
+commit 412c2770c74abea73a94e10df7b83ebe11ac82ee
+Author: Yan, Zheng <zyan@redhat.com>
+Date: Tue Oct 14 22:02:41 2014 +0800
+
+ mds: reply -EOPNOTSUPP for unknown lock type
+
+ Signed-off-by: Yan, Zheng <zyan@redhat.com>
+ (cherry picked from commit 675392335c53ff7879031fb9184e4f35bcc90fe2)
+
+commit 1228658871e53e350bdab3e72cdefd1caf33c291
+Author: Sage Weil <sage@redhat.com>
+Date: Sun Sep 21 15:56:18 2014 -0700
+
+ osd/ReplicatedPG: do not clone or preserve snapdir on cache_evict
+
+ If we cache_evict a head in a cache pool, we need to prevent
+ make_writeable() from cloning the head and finish_ctx() from
+ preserving the snapdir object.
+
+ Fixes: #8629
+ Backport: firefly
+ Signed-off-by: Sage Weil <sage@redhat.com>
+ (cherry picked from commit ce8eefca13008a9cce3aedd67b11537145e1fd77)
+
+commit 88e6014463e86e48d78ac419226644209f83f2a0
+Author: Sage Weil <sage@redhat.com>
+Date: Sun Sep 21 15:54:15 2014 -0700
+
+ ceph_test_rados_api_tier: add EvictSnap2 test case
+
+ Verify an evict doesn't create a snapdir object. Reproduces #8629
+
+ Signed-off-by: Sage Weil <sage@redhat.com>
+ (cherry picked from commit 398c74eacb1ce4e573aef0d24718a5925d90272b)
+
+commit 0b4b34aac497d17a6474c35891aab2bde962524b
+Merge: 322958a 0a72235
+Author: Sage Weil <sage@redhat.com>
+Date: Thu Oct 16 06:09:51 2014 -0700
+
+ Merge pull request #2734 from ceph/wip-firefly-undump
+
+ mds: fix --undump-journal
+
+ Reviewed-by: Sage Weil <sage@redhat.com>
+
+commit 0a72235b0556752fadebc3e155ad41b13a0a15e9
+Author: John Spray <john.spray@redhat.com>
+Date: Thu Oct 16 11:17:40 2014 +0100
+
+ mds: fix --undump-journal
+
+ This hadn't worked for a long time. This is a fix
+ for firefly only, as this code was refactored in giant.
+
+ Signed-off-by: John Spray <john.spray@redhat.com>
+
+commit 835f8c6f6121f3ebdec3a0d2d5cb1376301dc03a
+Author: Joao Eduardo Luis <joao@redhat.com>
+Date: Tue Sep 23 14:02:55 2014 +0100
+
+ ceph-mon: check fs stats just before preforking
+
+ Otherwise statfs may fail if mkfs hasn't been run yet or if the monitor
+ data directory does not exist. There are checks to account for the mon
+ data dir not existing and we should wait for them to clear before we go
+ ahead and check the fs stats.
+
+ Signed-off-by: Joao Eduardo Luis <joao@redhat.com>
+ (cherry picked from commit 7f71c11666b25e91dd612c58b4eda9ac0d4752f8)
+
+ Conflicts:
+ src/ceph_mon.cc
+
+commit 1ddf435464562f70f63cdb0032da3187f34ce853
+Author: Joao Eduardo Luis <joao@redhat.com>
+Date: Thu Sep 18 16:53:43 2014 +0100
+
+ ceph_mon: check available storage space for mon data dir on start
+
+ error out if available storage space is below 'mon data avail crit'
+
+ Fixes: #9502
+
+ Signed-off-by: Joao Eduardo Luis <joao@redhat.com>
+ (cherry picked from commit 2da1a2914ac7df18ce842b0aac728fffb5bed2b6)
+
+ Conflicts:
+ src/ceph_mon.cc
+
+commit 112317791b744d9890a65adcc13554c85e90f3af
+Author: Joao Eduardo Luis <joao@redhat.com>
+Date: Thu Sep 18 16:52:34 2014 +0100
+
+ mon: DataHealthService: use get_fs_stats() instead
+
+ and relieve the DataStats struct from clutter by using
+ ceph_data_stats_t instead of multiple fields.
+
+ Signed-off-by: Joao Eduardo Luis <joao@redhat.com>
+ (cherry picked from commit 9996d446988768658db751a7843b13cf3d194213)
+
+ Conflicts:
+ src/mon/DataHealthService.cc
+
+commit f0a92d72fd44542619338db7d6da98e147b6a9fc
+Author: Joao Eduardo Luis <joao@redhat.com>
+Date: Thu Sep 18 16:32:20 2014 +0100
+
+ common: util: add get_fs_stats() function
+
+ simplifies the task of obtaining available/used disk space, as well as
+ used available percentage.
+
+ Signed-off-by: Joao Eduardo Luis <joao@redhat.com>
+ (cherry picked from commit 3d74230d1c0fbfa15487e2a90ac60b883476e840)
+
+commit a8fa009fbe5d5d4d9cfa134d5ecd05c92290a8eb
+Author: Joao Eduardo Luis <jeclui@gmail.com>
+Date: Thu Sep 18 16:25:44 2014 +0100
+
+ include/util.h: prevent multiple inclusion of header
+
+ Signed-off-by: Joao Eduardo Luis <joao.luis@inktank.com>
+ (cherry picked from commit 76eff9503493312cb97e4a2f9236f4dbcbf931df)
+
+commit e296685e8f3f5158238216eefb76482bd6d55134
+Author: Sage Weil <sage@redhat.com>
+Date: Thu Sep 18 14:23:36 2014 -0700
+
+ mon: re-bootstrap if we get probed by a mon that is way ahead
+
+ During bootstrap we verify that our paxos commits overlap with the other
+ mons we will form a quorum with. If they do not, we do a sync.
+
+ However, it is possible we pass those checks, then fail to join a quorum
+ before the quorum moves ahead in time such that we no longer overlap.
+ Currently nothing kicks up back into a probing state to discover we need
+ to sync... we will just keep trying to call or join an election instead.
+
+ Fix this by jumping back to bootstrap if we get a probe that is ahead of
+ us. Only do this from non probe or sync states as these will be common;
+ it is only the active and electing states that matter (and probably just
+ electing!).
+
+ Fixes: #9301
+ Backport: giant, firefly
+ Signed-off-by: Sage Weil <sage@redhat.com>
+ (cherry picked from commit c421b55e8e15ef04ca8aeb47f7d090375eaa8573)
+
+commit 0e57767d5fc524939e8968b506ce2fb3f4f80656
+Author: Sage Weil <sage@redhat.com>
+Date: Thu Sep 18 14:11:24 2014 -0700
+
+ mon/Paxos: fix off-by-one in last_ vs first_committed check
+
+ peon last_committed + 1 == leader first_committed is okay. Note that the
+ other check (where I clean up whitespace) gets this correct.
+
+ Fixes: #9301 (partly)
+ Signed-off-by: Sage Weil <sage@redhat.com>
+ (cherry picked from commit d81cd7f86695185dce31df76c33c9a02123f0e4a)
+
+commit 1f4aaf648f4aa6f6056d0e8ce629eeea05c5424d
+Author: Sage Weil <sage@redhat.com>
+Date: Wed Aug 13 16:17:02 2014 -0700
+
+ mon/Paxos: share state and verify contiguity early in collect phase
+
+ We verify peons are contiguous and share new paxos states to catch peons
+ up at the end of the round. Do this each time we (potentially) get new
+ states via a collect message. This will allow peons to be pulled forward
+ and remain contiguous when they otherwise would not have been able to.
+ For example, if
+
+ mon.0 (leader) 20..30
+ mon.1 (peon) 15..25
+ mon.2 (peon) 28..40
+
+ If we got mon.1 first and then mon.2 second, we would store the new txns
+ and then boot mon.1 out at the end because 15..25 is not contiguous with
+ 28..40. However, with this change, we share 26..30 to mon.1 when we get
+ the collect, and then 31..40 when we get mon.2's collect, pulling them
+ both into the final quorum.
+
+ It also breaks the 'catch-up' work into smaller pieces, which ought to
+ smooth out latency a bit.
+
+ Signed-off-by: Sage Weil <sage@redhat.com>
+ (cherry picked from commit c54f1e4d66b22bad715ac17e9baa72ab93e48c46)
+
+commit 6c5b9a666fcd94e175a8b9771368b55246957efe
+Author: Sage Weil <sage@redhat.com>
+Date: Thu Aug 14 16:55:58 2014 -0700
+
+ mon/Paxos: verify all new peons are still contiguous at end of round
+
+ During the collect phase we verify that each peon has overlapping or
+ contiguous versions as us (and can therefore be caught up with some
+ series of transactions). However, we *also* assimilate any new states we
+ get from those peers, and that may move our own first_committed forward
+ in time. This means that an early responder might have originally been
+ contiguous, but a later one moved us forward, and when the round finished
+ they were not contiguous any more. This leads to a crash on the peon
+ when they get our first begin message.
+
+ For example:
+
+ - we have 10..20
+ - first peon has 5..15
+ - ok!
+ - second peon has 18..30
+ - we apply this state
+ - we are now 18..30
+ - we finish the round
+ - send commit to first peon (empty.. we aren't contiguous)
+ - send no commit to second peon (we match)
+ - we send a begin for state 31
+ - first peon crashes (it's lc is still 15)
+
+ Prevent this by checking at the end of the round if we are still
+ contiguous. If not, bootstrap. This is similar to the check we do above,
+ but reverse to make sure *we* aren't too far ahead of *them*.
+
+ Fixes: #9053
+ Signed-off-by: Sage Weil <sage@redhat.com>
+ (cherry picked from commit 3e5ce5f0dcec9bbe9ed4a6b41758ab7802614810)
+
+commit 11d2c9dd4aeb835ca73bfb41fb15b1038547adf6
+Author: Sage Weil <sage@redhat.com>
+Date: Wed Aug 13 16:01:01 2014 -0700
+
+ mon/Paxos: put source mon id in a temp variable
+
+ Signed-off-by: Sage Weil <sage@redhat.com>
+ (cherry picked from commit bb046ed01ecf58b8c87eeeee2e00a476e6fba467)
+
+commit 322958a5aad82c031b54592b372aa053e8993be4
+Author: Sage Weil <sage@redhat.com>
+Date: Wed Oct 15 12:26:00 2014 -0700
+
+ qa/workunits/rbd/import_export.sh: be case insensitive
+
+ Stop tripping over this change (from dumpling).
+
+ Signed-off-by: Sage Weil <sage@redhat.com>
+ (cherry picked from commit 5558afa03dbd1b20766b76e9410ef5bc3e73784f)
+
+commit 334631ae4641824b3df49245f36a8fd4b143bf3f
+Author: Sage Weil <sage@redhat.com>
+Date: Fri Aug 29 19:40:29 2014 -0700
+
+ os/FileJournal: stop aio completion thread *after* writer thread
+
+ The writer thread may submit a new aio to update the header in its
+ final moments before shutting down. Do not stop the aio thread until after
+ that has happened or else we may not wait for those aio completions.
+
+ Signed-off-by: Sage Weil <sage@redhat.com>
+ (cherry picked from commit c776a89880fdac270e6334ad8e49fa616d05d0d4)
+
+ Conflicts:
+ src/os/FileJournal.cc
+
+commit 111eec9ff6325a12fcbf066ae08f27919aeae5d8
+Merge: cf4e300 6c0127f
+Author: Sage Weil <sage@redhat.com>
+Date: Tue Oct 14 14:57:42 2014 -0700
+
+ Merge remote-tracking branch 'gh/firefly' into firefly-next
+
+commit cf4e30095e8149d1df0f2c9b4c93c9df0779ec84
+Author: Xiaoxi Chen <xiaoxi.chen@intel.com>
+Date: Tue Aug 5 16:12:22 2014 +0800
+
+ mon/OSDMonitor : Use user provided ruleset for replicated pool
+
+ When creating a replicated pool, currently ceph ignore the ruleset
+ name provided by user but use a global default ruleset.
+
+ This patch fix this bug, so the rulset specified by
+ ceph osd pool create replicated
+ can be properly set.
+
+ Signed-off-by: Xiaoxi Chen <xiaoxi.chen@intel.com>
+ (cherry picked from commit bf9726a294abd32b429170284ac328a592802648)
+
+commit bfd7da10e708a6eefc6d992b2b6337b7f06fd5ed
+Author: Loic Dachary <loic@dachary.org>
+Date: Tue Jun 3 13:05:19 2014 +0200
+
+ documentation: update osd pool create erasure
+
+ The properties are replaced with erasure code profiles. Remove the
+ reference to properties and the documentation of each erasure-code
+ related property.
+
+ Signed-off-by: Loic Dachary <loic@dachary.org>
+ (cherry picked from commit 8ff4edda73abb920c91e1226a330e3659def1fbe)
+
+commit afe6bd89f8a1588fb67063d1a08a4be8c1ab2ce6
+Author: Loic Dachary <loic-201408@dachary.org>
+Date: Sat Oct 11 18:20:36 2014 +0200
+
+ rpm: 95-ceph-osd-alt.rules is not needed for centos7 / rhel7
+
+ The || instead of && had it always installed. That was fixed in EPEL
+ already.
+
+ http://tracker.ceph.com/issues/9747 Fixes: #9747
+
+ Signed-off-by: Loic Dachary <loic-201408@dachary.org>
+ (cherry picked from commit 5ff4a850a0d809b3f25988c6cceb82c35095ef84)
+
+commit d5bac46e06c5420f29a021b294e391b2c6694cbd
+Author: David Zafman <dzafman@redhat.com>
+Date: Wed Sep 24 16:02:21 2014 -0700
+
+ osd: Return EOPNOTSUPP if a set-alloc-hint occurs with OSDs that don't support
+
+ Add CEPH_FEATURE_OSD_SET_ALLOC_HINT feature bit
+ Collect the intersection of all peer feature bits during peering
+ When handling CEPH_OSD_OP_SETALLOCHINT check that all OSDs support it
+ by checking for CEPH_FEATURE_OSD_SET_ALLOC_HINT feature bit.
+
+ Fixes: #9419
+ Backport: firefly
+
+ Signed-off-by: David Zafman <dzafman@redhat.com>
+ (cherry picked from commit 9b39033f2b2bcdd2be0f6da4dff06023d0f77499)
+
+ Conflicts:
+
+ src/include/ceph_features.h
+ src/osd/PG.cc
+ src/osd/PG.h
+ src/osd/ReplicatedPG.cc
+
+commit de08802dcf35aea516d013d3d6116aaa7707b923
+Author: David Zafman <dzafman@redhat.com>
+Date: Fri Sep 19 15:12:55 2014 -0700
+
+ osd: Remove unused PG functions queue_notify(), queue_info(), queue_log()
+
+ Signed-off-by: David Zafman <dzafman@redhat.com>
+ (cherry picked from commit 70ef4c11cbae669799c30c7592073ad7aa11dcd6)
+
+commit 5b5aba73031e901457ca27cf15600ce1ca90e258
+Merge: 345714b a1ae7f4
+Author: Gregory Farnum <greg@inktank.com>
+Date: Fri Oct 10 06:57:06 2014 -0700
+
+ Merge pull request #2691 from ceph/firefly-unused-variable
+
+ Firefly unused variable
+
+commit a1ae7f471c809e69d363b9145e70160533bfa48c
+Author: Yan, Zheng <zyan@redhat.com>
+Date: Fri Oct 10 21:36:39 2014 +0800
+
+ mds: Locker: remove unused variable
+
+ Signed-off-by: Yan, Zheng <zyan@redhat.com>
+
+commit 345714b6b4d004ad03cc7952dc56c6db87664ee4
+Merge: fd20a1d 2afb6fe
+Author: Yan, Zheng <ukernel@gmail.com>
+Date: Fri Oct 10 09:37:53 2014 +0800
+
+ Merge pull request #2681 from ceph/firefly-locker-null
+
+ mds: Locker: fix a NULL deref in _update_cap_fields
+
+commit 2afb6febdd8482b8fec5890d79944d656faf1382
+Author: Greg Farnum <greg@inktank.com>
+Date: Thu Oct 9 15:12:19 2014 -0700
+
+ mds: Locker: fix a NULL deref in _update_cap_fields
+
+ The MClientCaps* is allowed to be NULL, so we can't deref it unless
+ the dirty param is non-zero. So don't do the ahead-of-time lookup;
+ just call it explicitly in the if block.
+
+ Signed-off-by: Greg Farnum <greg@inktank.com>
+ (cherry picked from commit 3cd8a7fb9683577a7d6e934f18c29b7e84415be6)
+
+commit fd20a1d01bde67fb1edc6058e38435af9d5d6abc
+Merge: e1bd1b2 86926c6
+Author: Loic Dachary <loic-201408@dachary.org>
+Date: Wed Oct 8 08:44:46 2014 +0200
+
+ Merge pull request #2662 from dachary/wip-9677-ioprio-class-firefly
+
+ common: ceph_ioprio_string_to_class always returns -EINVAL
+
+commit 86926c6089d63014dd770b4bb61fc7aca3998542
+Author: Loic Dachary <loic-201408@dachary.org>
+Date: Tue Oct 7 14:06:38 2014 +0200
+
+ common: ceph_ioprio_string_to_class always returns -EINVAL
+
+ The l string is always empty because std::transform needs a
+ pre-allocated string. Replace with the in-place version. Add unit tests.
+
+ http://tracker.ceph.com/issues/9677 Fixes: #9677
+
+ Signed-off-by: Loic Dachary <loic-201408@dachary.org>
+ (cherry picked from commit 3535b7aba3df8b54fa5117b8a9c2f52b8f0f118b)
+
+ Conflicts:
+ src/test/Makefile.am
+
+commit 5f2eec5036a2910aca1e8ce2d94444d3ed0477df
+Author: Loic Dachary <loic-201408@dachary.org>
+Date: Tue Oct 7 14:05:08 2014 +0200
+
+ osd: log error if set_ioprio fails to parse class
+
+ Signed-off-by: Loic Dachary <loic-201408@dachary.org>
+ (cherry picked from commit 5088e0d49332d579ba7e33c2c9baee3d5f701a3e)
+
+commit 2796d5151df4dcde324a4d09a83c9a779cece00e
+Author: Loic Dachary <loic-201408@dachary.org>
+Date: Tue Oct 7 14:03:39 2014 +0200
+
+ common: set_ioprio debug message including pid
+
+ Signed-off-by: Loic Dachary <loic-201408@dachary.org>
+ (cherry picked from commit 33339c7754875eb7e513345ee6b26a9b2b4d2707)
+
+commit d5ed6b0587b9999b2fd41377b0426e3b09ef8ab9
+Author: Loic Dachary <loic-201408@dachary.org>
+Date: Tue Oct 7 14:02:09 2014 +0200
+
+ common: do not set ioprio if pid is not set
+
+ Signed-off-by: Loic Dachary <loic-201408@dachary.org>
+ (cherry picked from commit c7e4c0bfe70bf29d3b8fe4df4e4b934853e33d26)
+
+commit e1bd1b2774f4eae5444b5f7b984193cb91a2dd98
+Merge: 726c6a1 459dca1
+Author: Sage Weil <sage@redhat.com>
+Date: Tue Oct 7 09:58:03 2014 -0700
+
+ Merge pull request #2632 from ceph/wip-9039-firefly
+
+ rgw: copy object data if target bucket is in a different pool
+
+commit 726c6a147a14c00cf12eb6c6561655475282419f
+Author: Sage Weil <sage@redhat.com>
+Date: Mon Oct 6 15:50:51 2014 -0700
+
+ debian/control: fix python-ceph -> ceph file move to allow upgrades
+
+ This is a backport of 5c6c366d2abe771c581690270c2d176ebb30c571 with the
+ version numbers changed, to compensate for the change in
+ fe3434f41cd09433975d7d0f9dbb2fae662e4a1b (backported in
+ bf1933e5c184476a354664c42fec834e9f59067c).
+
+ Tested-by: Tamil Muthamizhan <tamil.muthamizhan@inktank.com>
+ Signed-off-by: Sage Weil <sage@redhat.com>
+
+commit 884f7c40c4a28d519847d3995c8d98e5837ceaf0
+Merge: 31d57c9 c8a8e47
+Author: Sage Weil <sage@redhat.com>
+Date: Mon Oct 6 07:01:50 2014 -0700
+
+ Merge remote-tracking branch 'gh/wip-rpm-epoch-firefly' into firefly
+
+ Reviewed-by: Boris Ranto <branto@redhat.com>
+
+commit 31d57c9a28502a4a72f8aa141f7ed63ffe1e0192
+Merge: 9a3bac0 548be0b
+Author: Loic Dachary <loic-201408@dachary.org>
+Date: Mon Oct 6 09:50:33 2014 +0200
+
+ Merge pull request #2643 from johnugeorge/wip-9492-crush-firefly
+
+ Crush: Backporting fixes for #9492 to firefly
+
+ Reviewed-by: Loic Dachary <loic-201408@dachary.org>
+
+commit 548be0b2aea18ed3196ef8f0ab5f58a66e3a9af4
+Author: Johnu George <johnugeo@cisco.com>
+Date: Mon Sep 29 10:07:44 2014 -0700
+
+ Crush: Ensuring at most num-rep osds are selected
+
+ Crush temporary buffers are allocated as per replica size configured
+ by the user.When there are more final osds (to be selected as per
+ rule) than the replicas, buffer overlaps and it causes crash.Now, it
+ ensures that at most num-rep osds are selected even if more number of
+ osds are allowed by indep rule. The fix for firstn rules is already
+ merged as part of bug #9492. Required test files are added.
+
+ Fixes: #9492
+
+ Signed-off-by: Johnu George johnugeo@cisco.com
+ (cherry picked from commit 234b066ba04976783d15ff2abc3e81b6cc06fb10)
+
+commit e30c570ce691a994898b4a933c57e7ae014cdc30
+Author: Johnu George <johnugeo@cisco.com>
+Date: Wed Sep 24 09:32:50 2014 -0700
+
+ Crush: Ensuring at most num-rep osds are selected
+
+ Crush temporary buffers are allocated as per replica size configured
+ by the user.When there are more final osds (to be selected as per
+ rule) than the replicas, buffer overlaps and it causes crash.Now, it
+ ensures that at most num-rep osds are selected even if more number of
+ osds are allowed by the rule.
+
+ Fixes: #9492
+
+ Signed-off-by: Johnu George <johnugeo@cisco.com>
+ (cherry picked from commit 6b4d1aa99718e3b367496326c1e64551330fabc0)
+
+commit 9a3bac0c1a7a42cdf7ba846c9ad0a3ae0f15b4bb
+Merge: 0b978fb 5a5e7e7
+Author: Sage Weil <sage@redhat.com>
+Date: Fri Oct 3 11:58:41 2014 -0700
+
+ Merge pull request #2634 from dachary/wip-9653-ceph-disk-bootstrap-osd-firefly
+
+ ceph-disk: bootstrap-osd keyring ignores --statedir (firefly)
+
+commit c8a8e4763a55dec44836bc679254ee7dcc448567
+Author: Sage Weil <sage@redhat.com>
+Date: Wed Oct 1 12:33:38 2014 -0700
+
+ ceph.spec: fix typo
+
+ Signed-off-by: Sage Weil <sage@redhat.com>
+ (cherry picked from commit da9ae5c92ecb4059e0ec6be5ce03af46430e76a5)
+
+commit b890c1e4706d7cfef7ed24c9df65b439b4f7ff1d
+Author: Sage Weil <sage@redhat.com>
+Date: Wed Oct 1 06:02:02 2014 -0700
+
+ ceph.spec.: add epoch
+
+ This is done in fedora packaging. Do it here too so that you can move
+ between upstream packages (from ceph.com) and fedora and other derivatives
+ will builds.
+
+ Backport: firefly, dumpling
+ Signed-off-by: Sage Weil <sage@redhat.com>
+ (cherry picked from commit 83888362089346e473d6fd6e1d366b826d7bd739)
+
+ Conflicts:
+
+ ceph.spec.in
+
+commit d01db8080d97bfae34dcee3d153bf10e6f5327dd
+Author: Sage Weil <sage@inktank.com>
+Date: Tue May 20 13:41:35 2014 -0700
+
+ ceph.spec.in: remove BuildRoot
+
+ Deprecated
+
+ Fixes: #8143
+ Signed-off-by: Sage Weil <sage@inktank.com>
+ (cherry picked from commit 401319a1527dd9cb5398916105d31e7ec065763d)
+
+commit 3c2b5c440863df548afc2bd8aa5440f15a44ac02
+Author: Dan Mick <dan.mick@inktank.com>
+Date: Tue Aug 12 16:31:22 2014 -0700
+
+ ceph.spec.in: tests for rhel or centos need to not include _version
+
+ rhel_version and centos_version are apparently the OpenSUSE Build
+ names; the native macros are just "rhel" and "centos" (and contain
+ a version number, should it be necessary).
+
+ Signed-off-by: Dan Mick <dan.mick@inktank.com>
+ (cherry picked from commit 7474f720c2418cf3d52b755f2b60c524e413570a)
+
+commit c82c29d6174022be45929fe9ba8a84993eef974a
+Author: Dan Mick <dan.mick@inktank.com>
+Date: Tue Aug 12 14:46:52 2014 -0700
+
+ ceph.spec.in: Add a small comment on the empty %files section
+
+ as suggested by Dan Mick.
+
+ Signed-off-by: Erik Logtenberg <erik@logtenberg.eu>
+ (cherry picked from commit e37b262c7928934530c5bb09fe56f83eb61f4244)
+
+commit a4f748aa906fc65b14f65515721bc3a815c18fb8
+Author: Dan Mick <dan.mick@inktank.com>
+Date: Tue Aug 12 14:39:18 2014 -0700
+
+ ceph.spec.in: Obsolete all older versions.
+
+ Now this changeset can be used on all current ceph releases that already
+ have the package split.
+
+ Signed-off-by: Erik Logtenberg <erik@logtenberg.eu>
+ (cherry picked from commit 875a99e25f0ad2cb47149a3b5a28b4771a09125c)
+
+commit 74c7f3caec1cc7a5da89ef33de36a8b59249cfcd
+Author: Dan Mick <dan.mick@inktank.com>
+Date: Tue Aug 12 14:09:43 2014 -0700
+
+ ceph.spec.in: No version on ceph-libs Obsoletes.
+
+ If we are installing with the new package structure we don't ever want the
+ new package to co-exist with the old one; this includes the mistakenly-
+ released v0.81 on Fedora, which should be removed in favor of this
+ version.
+
+ Signed-off-by: Sandon Van Ness <sandon@inktank.com>
+ Reviewed-by: Dan Mick <dan.mick@inktank.com>
+ (cherry picked from commit 8f95daf66b5fdb2a8141988480f984c1249599c5)
+
+commit 561261b6efb7ea442686bb8fce387c4de2482067
+Author: Sandon Van Ness <sandon@inktank.com>
+Date: Fri Aug 8 18:01:30 2014 -0700
+
+ ceph.spec.in: Obselete ceph-libcephfs (not libcephfs)
+
+ I am guessing that because it was a sub-package libcephfs was mistakenly
+ used instead of ceph-libcephfs.
+
+ Signed-off-by: Sandon Van Ness <sandon@inktank.com>
+ (cherry picked from commit 75985024bd30ca6fbe4c61aa7f7cbe5306c9a988)
+
+commit 107bfd9ee7dbf360561187b9e0946964d40b9b1c
+Author: Erik Logtenberg <erik@logtenberg.eu>
+Date: Fri Aug 1 14:20:18 2014 +0200
+
+ ceph.spec.in: We need those nice recent changes for rhel7 in Fedora too.
+
+ Signed-off-by: Erik Logtenberg <erik@logtenberg.eu>
+ (cherry picked from commit 00877ae502ac52613bcd5c5c834d72787d668dca)
+
+commit 7946c5e5de8d6cd25d20beee15f3489113e51539
+Author: Dan Mick <dan.mick@inktank.com>
+Date: Wed Aug 27 12:56:43 2014 -0700
+
+ Move fedora patch file (used by ceph.spec.in) to rpm/ subdir
+
+ Signed-off-by: Dan Mick <dan.mick@inktank.com>
+ (cherry picked from commit 06b92cee621cbe33a6f17e8c64169db4453a5160)
+
+commit cb2ae9afa611175226efb5544f7d2aa705d55ece
+Author: Erik Logtenberg <erik@logtenberg.eu>
+Date: Fri Aug 1 00:13:50 2014 +0200
+
+ ceph.spec.in, init-ceph.in: Don't autostart ceph service on Fedora.
+
+ This patch is taken from the current Fedora package and makes the upstream
+ ceph.spec compliant with Fedora policy. The goal is to be fully compliant
+ upstream so that we can replace current Fedora package with upstream
+ package to fix many bugs in Fedora.
+
+ Addition from Dan Mick <dan.mick@inktank.com>:
+ Do this for RHEL and Centos as well, since they surely will benefit
+ from the same policy. Note: this requires changes to
+ autobuild-ceph and ceph-build scripts, which currently copy
+ only the dist tarball to the rpmbuild/SOURCES dir.
+
+ Signed-off-by: Erik Logtenberg <erik@logtenberg.eu>
+ Signed-off-by: Dan Mick <dan.mick@inktank.com>:
+ (cherry picked from commit 461523b06cdf93e32f1d8b354ac3799e73162d33)
+
+commit 2b11376f1ee8925ab16065ebda912b11d3d7be59
+Author: Erik Logtenberg <erik@logtenberg.eu>
+Date: Thu Jul 31 23:54:03 2014 +0200
+
+ ceph.spec.in: Add obsoletes for libcephfs
+
+ This fixes a bug for Fedora:
+ https://bugzilla.redhat.com/show_bug.cgi?id=1116614
+
+ Signed-off-by: Erik Logtenberg <erik@logtenberg.eu>
+ (cherry picked from commit e9da2d8f2142771f206ef67f19e7f194855275d0)
+
+commit eefc62e3b85f402a7e1ae31c272c8a432d979379
+Author: Erik Logtenberg <erik@logtenberg.eu>
+Date: Thu Jul 31 23:49:56 2014 +0200
+
+ ceph.spec.in: add ceph-libs-compat
+
+ Added a ceph-libs-compat package in accordance with Fedora packaging
+ guidelines [1], to handle the recent package split more gracefully.
+ In Fedora this is necessary because there are already other packages
+ depending on ceph-libs, that need to be adjusted to depend on the new
+ split packages instead. In the mean time, ceph-libs-compat prevents
+ breakage.
+
+ [1] http://fedoraproject.org/wiki/Upgrade_paths_%E2%80%94_renaming_or_splitting_packages
+
+ Signed-off-by: Erik Logtenberg <erik@logtenberg.eu>
+ (cherry picked from commit 6c264f2204cbd54d90b02101e40ac9aa5aa72d7c)
+
+ Conflicts:
+
+ ceph.spec.in
+
+commit 0b978fb15a1307644aba3119419bb7386f98ee04
+Author: Sage Weil <sage@redhat.com>
+Date: Sun Aug 10 14:41:19 2014 -0700
+
+ mon/Paxos: add perfcounters for most paxos operations
+
+ I'm focusing primarily on the ones that result in IO here.
+
+ Signed-off-by: Sage Weil <sage@redhat.com>
+ (cherry picked from commit b09b8563d35dda23faed43afef2a983e93a879c5)
+
+commit 74aa7afc719e517dbed300f802c1bc2dafe43ee0
+Author: Sage Weil <sage@redhat.com>
+Date: Sun Aug 10 14:00:11 2014 -0700
+
+ mon/MonitorDBStore: add get_{keys,bytes}() accounting to Transaction
+
+ Signed-off-by: Sage Weil <sage@redhat.com>
+ (cherry picked from commit fd421b26748e872ddf8e0f068dda2106853edff1)
+
+commit 5a5e7e7bcedbccbe4ae8aab159af6d8615eb3887
+Author: Loic Dachary <loic-201408@dachary.org>
+Date: Fri Oct 3 14:08:57 2014 +0200
+
+ ceph-disk: bootstrap-osd keyring ignores --statedir
+
+ The STATEDIR variable is used to initialize the bootstrap-osd keyring
+ before it gets a chance to be overriden by --statedir. Replace it with
+ {statedir} so that it can be substituted after all options have been
+ parsed.
+
+ http://tracker.ceph.com/issues/9653 Fixes: #9653
+
+ Signed-off-by: Loic Dachary <loic-201408@dachary.org>
+ (cherry picked from commit fa0bd06b4657e5b84e237b76033ac3d3478b6a1f)
+
+commit 459dca1613a14cfad8d3afd7e3c783d825573a42
+Author: Yehuda Sadeh <yehuda@redhat.com>
+Date: Tue Aug 12 13:36:11 2014 -0700
+
+ rgw: copy object data if target bucket is in a different pool
+
+ Fixes: #9039
+ Backport: firefly
+
+ The new manifest does not provide a way to put the head and the tail in
+ separate pools. In any case, if an object is copied between buckets in
+ different pools, we may really just want the object to be copied, rather
+ than reference counted.
+
+ Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
+ (cherry picked from commit 5d3a7e595f47455896304bf358e5251915d0f16f)
+
+commit 711a7e6f81983ff2091caa0f232af914a04a041c
+Author: Jason Dillaman <dillaman@redhat.com>
+Date: Mon Sep 15 00:53:50 2014 -0400
+
+ rbd: ObjectCacher reads can hang when reading sparse files
+
+ The pending read list was not properly flushed when empty objects
+ were read from a space file.
+
+ Signed-off-by: Jason Dillaman <dillaman@redhat.com>
+ (cherry picked from commit cdb7675a21c9107e3596c90c2b1598def3c6899f)
+
+commit b7784dc1baa47560a733fe9dcd2acec51bc93165
+Author: Jason Dillaman <dillaman@redhat.com>
+Date: Sat Sep 6 22:59:40 2014 -0400
+
+ Enforce cache size on read requests
+
+ In-flight cache reads were not previously counted against
+ new cache read requests, which could result in very large
+ cache usage. This effect is most noticeable when writing
+ small chunks to a cloned image since each write requires
+ a full object read from the parent.
+
+ Signed-off-by: Jason Dillaman <dillaman@redhat.com>
+ (cherry picked from commit 4fc9fffc494abedac0a9b1ce44706343f18466f1)
+
+commit ac4fca065a12f3b00a47bf5ec37983696255174b
+Author: Alexandre Marangone <alexandre.marangone@inktank.com>
+Date: Fri Sep 5 10:36:24 2014 -0700
+
+ rgw: add .log to default log path
+
+ Fixes: #9353
+ Signed-off-by: Alexandre Marangone <alexandre.marangone@inktank.com>
+ (cherry picked from commit 46732420897a2619059050044f4980a4737df43e)
+
+commit f03ae7b00e5694f1670493396a1cee195fcc6b35
+Merge: 78c3ef9 ee02cfd
+Author: Yehuda Sadeh <yehuda@inktank.com>
+Date: Thu Oct 2 15:28:40 2014 -0700
+
+ Merge pull request #2565 from ceph/wip-rgw-firefly-backports
+
+ Wip rgw firefly backports
+
+commit 78c3ef90604ca117255cefe232771a7564fed8b1
+Author: Sage Weil <sage@redhat.com>
+Date: Thu Sep 25 13:16:52 2014 -0700
+
+ osdc/Objecter: only post_rx_buffer if no op timeout
+
+ If we post an rx buffer and there is a timeout, the revocation can happen
+ while the reader has consumed the buffers but before it has decoded and
+ constructed the message. In particular, we calculate a crc32c over the
+ data portion of the message after we've taken the buffers and dropped the
+ lock.
+
+ Instead of fixing this race (for example, by reverifying rx_buffers under
+ the lock while calculating the crc.. bleh), just skip the rx buffer
+ optimization entirely when a timeout is present.
+
+ Note that this doesn't cover the op_cancel() paths, but none of those users
+ provide static buffers to read into.
+
+ Fixes: #9582
+ Backport: firefly, dumpling
+ Signed-off-by: Sage Weil <sage@redhat.com>
+
+ backport of 126d0b30e990519b8f845f99ba893fdcd56de447
+
+commit a261b4952056aab7b067453930342960bbe55089
+Author: Sage Weil <sage@redhat.com>
+Date: Mon Sep 29 14:28:32 2014 -0700
+
+ debian: move ceph_rest_api.py into ceph
+
+ Signed-off-by: Sage Weil <sage@redhat.com>
+ (cherry picked from commit fe3434f41cd09433975d7d0f9dbb2fae662e4a1b)
+
+commit eb0f6e347969b40c0655d3165a6c4531c6b595a3
+Author: Sage Weil <sage@redhat.com>
+Date: Mon Sep 29 14:24:01 2014 -0700
+
+ ceph.spec.in: move ceph_rest_api.py into ceph
+
+ Signed-off-by: Sage Weil <sage@redhat.com>
+ (cherry picked from commit 8cda623e0ba34a48a70e9ea988d619b15605c4fd)
+
+commit c4188e31f7bc8f3c337e637cd99c41d5ee4b6787
+Author: Sage Weil <sage@redhat.com>
+Date: Mon Sep 29 13:44:03 2014 -0700
+
+ ceph.spec: fix python-flask dependency
+
+ This is needed by ceph-rest-api, which is in ceph.rpm; it's not related to
+ python-ceph (except that ceph-rest-api happens to require that too).
+
+ Backport: firefly
+ Signed-off-by: Sage Weil <sage@redhat.com>
+ (cherry picked from commit b2416240b88b2e067dfc79a2723335f1584562d0)
+
+commit bf1933e5c184476a354664c42fec834e9f59067c
+Author: Sage Weil <sage@redhat.com>
+Date: Mon Sep 29 13:40:18 2014 -0700
+
+ debian: python-flask is needed by ceph, not python-ceph
+
+ It's used by ceph-rest-api which is in the 'ceph' (server) package.
+
+ Backport: firefly
+ Signed-off-by: Sage Weil <sage@redhat.com>
+ (cherry picked from commit e42424e777e4f7d8b03650482253734c1fa8709d)
+
+ Conflicts:
+
+ debian/control
+
+commit 94a7fbaa11c51db294dce0dc1df728f69aef5bf8
+Author: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
+Date: Fri Sep 19 12:25:07 2014 +0200
+
+ rgw_main.cc: add missing virtual destructor for RGWRequest
+
+ CID 1160858 (#1 of 1): Non-virtual destructor (VIRTUAL_DTOR)
+ nonvirtual_dtor: Class RGWLoadGenRequest has a destructor
+ and a pointer to it is upcast to class RGWRequest which doesn't
+ have a virtual destructor.
+
+ Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
+ (cherry picked from commit b82ceda7775ff85943d9143b73789eb37b09bfa9)
+
+commit 9fee8de25ab5c155cd6a3d32a71e45630a5ded15
+Author: Greg Farnum <greg@inktank.com>
+Date: Mon Sep 29 16:10:36 2014 -0700
+
+ Locker: accept ctime updates from clients without dirty write caps
+
+ The ctime changes any time the inode does. That can happen even without
+ the file itself having changed, so we'd better accept the update whenever
+ the auth caps have dirtied, without worrying about the file caps!
+
+ Fixes: #9514
+ Backport: firefly
+
+ Signed-off-by: Greg Farnum <greg@inktank.com>
+ Reviewed-by: Sage Weil <sage@redhat.com>
+ Reviewed-by: John Spray <john.spray@redhat.com>
+ (cherry picked from commit 0ea20a668cf859881c49b33d1b6db4e636eda18a)
+
+commit 461ece5e9fb1d4994a6214a3b6bdae136773629d
+Author: Sage Weil <sage@redhat.com>
+Date: Wed Oct 1 18:01:51 2014 -0700
+
+ doc/release-notes: fix attributions for 8702 fix
+
+ Oops!
+
+ Signed-off-by: Sage Weil <sage@redhat.com>
+ (cherry picked from commit 188370a94353e29fcb8981699022803e23f3fedd)
+
+commit 917529a78e5046f621df5c48fe5d50d2f7e56560
+Author: Sage Weil <sage@redhat.com>
+Date: Wed Oct 1 17:48:12 2014 -0700
+
+ doc/release-notes: v0.80.6
+
+ Signed-off-by: Sage Weil <sage@redhat.com>
+ (cherry picked from commit c0dc3a56974a469b61523b67cc032cc5726a3a5f)
+
+ Conflicts:
+
+ doc/release-notes.rst
+
+commit 060a5b1422fcdfb8e84636579a2f0c2f1ec14300
+Author: Adam Crume <adamcrume@gmail.com>
+Date: Thu Sep 18 16:57:27 2014 -0700
+
+ common: Add cctid meta variable
+
+ Fixes: #6228
+ Signed-off-by: Adam Crume <adamcrume@gmail.com>
+ (cherry picked from commit bb45621cb117131707a85154292a3b3cdd1c662a)
+
+commit a1aa06b7fb30e509193e1b1bb7355b5f21aedc82
+Author: Samuel Just <sam.just@inktank.com>
+Date: Wed Oct 1 14:30:59 2014 -0700
+
+ ReplicatedPG: dump snap_trimq on pg query
+
+ Signed-off-by: Samuel Just <sam.just@inktank.com>
+
+commit 34f38b68d89baf1dcbb4571d4f4d3076dc354538
+Author: Samuel Just <sam.just@inktank.com>
+Date: Mon Sep 29 16:26:54 2014 -0700
+
+ ReplicatedPG: do not queue the snap trimmer constantly
+
+ Previously, we continuously requeued the snap trimmer while in
+ TrimmingObjects. This is not a good idea now that we try to
+ limit the number of snap trimming repops in flight and requeue
+ the snap trimmer directly as those repops complete.
+
+ Fixes: #9113
+ Backport: giant, dumpling, firefly
+ Signed-off-by: Samuel Just <sam.just@inktank.com>
+
+commit b29bf00f68cf133151c98db06e9498b3e8be22ed
+Author: Samuel Just <sam.just@inktank.com>
+Date: Wed Sep 24 13:55:47 2014 -0700
+
+ ReplicatedPG: clean out completed trimmed objects as we go
+
+ Also, explicitely maintain a max number of concurrently trimming
+ objects.
+
+ Fixes: 9113
+ Backport: dumpling, firefly, giant
+ Signed-off-by: Samuel Just <sam.just@inktank.com>
+
+commit ee02cfd23facb3404fc377f643b213c2f498474d
+Author: Yehuda Sadeh <yehuda@redhat.com>
+Date: Thu Sep 18 20:53:10 2014 -0700
+
+ rgw: calculate hash after writing data
+
+ Since data is written asynchronously, we should do the hash calculation
+ while it's pending.
+
+ Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
+ (cherry picked from commit 5bb94ede19a50543a02a8019ed6c9680b3852d4e)
+
+commit 216730221575d88a72b06ed3d71c9a54cffc5719
+Author: Yehuda Sadeh <yehuda@redhat.com>
+Date: Thu Sep 18 20:51:02 2014 -0700
+
+ crypto: don't hash zero sized buffer
+
+ libnss returns an error and we assert in that case.
+
+ Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
+ (cherry picked from commit 7b137246b49a9f0b4d8b8d5cebfa78cc1ebd14e7)
+
+commit dab7a4f6ad054b53cedca76ee329a6395918b1ab
+Author: Yehuda Sadeh <yehuda@redhat.com>
+Date: Fri Sep 12 14:07:44 2014 -0700
+
+ rgw: push hash calculater deeper
+
+ This might have been the culprit for #9307. Before we were calculating
+ the hash after the call to processor->handle_data(), however, that
+ method might have spliced the bufferlist, so we can't be sure that the
+ pointer that we were holding originally is still invalid. Instead, push
+ the hash calculation down. Added a new explicit complete_hash() call to
+ the processor, since when we're at complete() it's too late (we need to
+ have the hash at that point already).
+
+ Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
+ (cherry picked from commit d41c3e858c6f215792c67b8c2a42312cae07ece9)
+
+ Conflicts:
+ src/rgw/rgw_rados.h
+
+commit bd0a91343ce70d71acced753688a502b7e8b552e
+Author: Yehuda Sadeh <yehuda@redhat.com>
+Date: Thu Aug 21 16:30:10 2014 -0700
+
+ rgw: separate civetweb log from rgw log
+
+ The civetweb log now is independent from the rgw log.
+
+ Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
+ (cherry picked from commit 850242cad749e33e1e6bc008baa75c8ea7eda0c1)
+
+ Conflicts:
+ src/civetweb
+ src/rgw/rgw_main.cc
+
+commit a777562b780e7ab312f881c38b1db26983a1ac47
+Author: Yehuda Sadeh <yehuda@redhat.com>
+Date: Tue Sep 23 13:40:39 2014 -0700
+
+ civetweb: update submodule
+
+ Update submodule to include multiple fixes.
+
+ Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
+
+commit 1bdcc079d79d8211b44e2a46511cd2240f71744b
+Author: Yehuda Sadeh <yehuda@redhat.com>
+Date: Fri Aug 22 15:12:16 2014 -0700
+
+ rgw: convert header field underscores into dashes
+
+ Fixes: 9206
+ Backport: firefly
+
+ Certain web servers filter out underscores in the header field name.
+ Convert them into dashes.
+
+ Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
+ (cherry picked from commit 11acb7097ce21c6218dd48d0c21e0e04a361eb9a)
+
+commit b8fa2ed60b6cce51701df972dbb6f5e02e0d84ba
+Author: Yehuda Sadeh <yehuda@redhat.com>
+Date: Mon Aug 25 10:38:42 2014 -0700
+
+ rgw: fix test to identify whether object has tail
+
+ Fixes: #9226
+ Reported-by: Sylvain Munaut <s.munaut@whatever-company.com>
+ Backport: firefly
+
+ We need to identify whether an object is just composed of a head, or
+ also has a tail. Test for pre-firefly objects ("explicit objs") was
+ broken as it was just looking at the number of explicit objs in the
+ manifest. However, this is insufficient, as we might have empty head,
+ and in this case it wouldn't appear, so we need to check whether the
+ sole object is actually pointing at the head.
+
+ Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
+ (cherry picked from commit 751b3e26532932a42ca34f9c062a0a3e29a58cff)
+
+commit 6fee71154d838868807fd9824d829c8250d9d2eb
+Author: Yehuda Sadeh <yehuda@redhat.com>
+Date: Wed Aug 27 17:44:18 2014 -0700
+
+ rgw: don't try to authenticate a CORS preflight request
+
+ Fixes: #8718
+ Backport: firefly
+
+ CORS preflight requests don't need to be authenticated. Treat them as
+ coming from anonymous user.
+
+ Reported-by: Robert Hubbard <bobby.hubbard@garmin.com>
+ Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
+ (cherry picked from commit 848fcf7871e07fc689bdcd18943ace36b2f4906e)
+
+commit c75a79cbac30cd14d37d89217113824d98693572
+Author: Yehuda Sadeh <yehuda@redhat.com>
+Date: Thu Aug 14 13:35:12 2014 -0700
+
+ rgw: fix compilation
+
+ RGWRadosPutObj couldn't refer to the ceph context.
+
+ Reviewed-by: Sage Weil <sage@redhat.com>
+ Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
+ (cherry picked from commit 6a555434ee3edaf742ee7e5910bcba8dd0de46dd)
+
+commit b0d08aab837808f18708a4f8ced0503c0fce2fec
+Author: Yehuda Sadeh <yehuda@redhat.com>
+Date: Tue Aug 12 11:17:47 2014 -0700
+
+ rgw: call throttle_data() even if renew_state() failed
+
+ Otherwise we're going to leak the aio callback handle.
+
+ Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
+ (cherry picked from commit 7998c322179dd69a1250937321c3c2bb023e0e57)
+
+commit a953b313f1e2f884be6ee2ce356780f4f70849dd
+Author: Yehuda Sadeh <yehuda@redhat.com>
+Date: Wed Jul 30 21:32:48 2014 -0700
+
+ rgw: disable civetweb url decoding
+
+ Fixes: #8621
+
+ We want to have the raw request uri, as we do the decoding ourselves.
+
+ Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
+ (cherry picked from commit ffac52b316e7022796d44ae58804d9c20b9c3df9)
+
+commit ba5357714a19b8af989fef1c75ef775837c6a9d6
+Author: Yehuda Sadeh <yehuda@redhat.com>
+Date: Tue Aug 12 14:23:46 2014 -0700
+
+ rgw: copy_obj_data() uses atomic processor
+
+ Fixes: #9089
+
+ copy_obj_data was not using the current object write infrastructure,
+ which means that the end objects weren't striped.
+
+ Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
+ (cherry picked from commit 800eff24824c0083b8e2441fc34e0bdca5da36dc)
+
+commit d73dbc3a39117eddaaabb2c25d9238cd7c51711b
+Author: Yehuda Sadeh <yehuda@redhat.com>
+Date: Thu Aug 21 21:53:38 2014 -0700
+
+ rgw: clear bufferlist if write_data() successful
+
+ Fixes: #9201
+ Backport: firefly
+
+ We sometimes need to call RGWPutObjProcessor::handle_data() again,
+ so that we send the pending data. However, we failed to clear the buffer
+ that was already sent, thus it was resent. This triggers when using non
+ default pool alignments.
+
+ Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
+ (cherry picked from commit 9181114d6f6062c55ee4b351fc3495345e545c36)
+
+commit 4be53d5eebbc294878ba38050d841359b6c8e19e
+Author: Samuel Just <sam.just@inktank.com>
+Date: Tue Sep 23 12:16:55 2014 -0700
+
+ PG: check full ratio again post-reservation
+
+ Otherwise, we might queue 30 pgs for backfill at 0.80 fullness
+ and then never check again filling the osd after pg 11.
+
+ Fixes: #9574
+ Backport: dumpling, firefly, giant
+ Signed-off-by: Samuel Just <sam.just@inktank.com>
--- /dev/null
+commit b5a67f0e1d15385bc0d60a6da6e7fc810bde6047 (tag: refs/tags/v0.80.9, refs/remotes/gh/firefly)
+Author: Jenkins <jenkins@inktank.com>
+Date: Mon Mar 9 10:42:08 2015 -0700
+
+ 0.80.9
+
+commit 37901afd1556257151c029395caa1143e84860f2
+Merge: 00e5947 3dac68a
+Author: Loic Dachary <ldachary@redhat.com>
+Date: Tue Mar 3 15:58:53 2015 +0100
+
+ Merge pull request #3852 from dachary/wip-10965-rgw-firefly
+
+ rgw: enable ipv6 in civetweb
+
+ Reviewed-by: Loic Dachary <ldachary@redhat.com>
+
+commit 00e5947a28f7810a28329d2f4901aed09a289421
+Merge: 293222a b13f483
+Author: Loic Dachary <ldachary@redhat.com>
+Date: Tue Mar 3 15:58:39 2015 +0100
+
+ Merge pull request #3853 from dachary/wip-10907-rgw-firefly
+
+ rgw: pass civetweb configurables to civetweb
+
+ Reviewed-by: Loic Dachary <ldachary@redhat.com>
+
+commit 293222a284c072a13950831205c106fec7a400df
+Merge: 6512b06 d57b38f
+Author: Loic Dachary <ldachary@redhat.com>
+Date: Tue Mar 3 15:58:25 2015 +0100
+
+ Merge pull request #3851 from dachary/wip-10978-rgw-firefly
+
+ rgw: don't overwrite bucket / object owner when setting acls
+
+ Reviewed-by: Loic Dachary <ldachary@redhat.com>
+
+commit d57b38f85b683dfb365c3cb98362d486594f9eb3
+Author: Yehuda Sadeh <yehuda@redhat.com>
+Date: Fri Feb 27 15:32:50 2015 -0800
+
+ rgw: don't overwrite bucket / object owner when setting acls
+
+ Fixes: #10978
+ Backport: hammer, firefly
+
+ Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
+ (cherry picked from commit eb13f2d4b60c031f16139f7cc4237c012644dd78)
+
+ Conflicts:
+ src/rgw/rgw_op.cc : trivial s/.empty()/== NULL/
+
+commit b13f483e51b37a768c7f4313b6933bf648950c7d
+Author: Yehuda Sadeh <yehuda@redhat.com>
+Date: Tue Feb 17 15:05:40 2015 -0800
+
+ rgw: pass civetweb configurables to civetweb
+
+ Fixes: #10907
+ Backport: firefly
+
+ Pass any configurables in the rgw frontends config line to civetweb.
+
+ Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
+ (cherry picked from commit 986d7554426764a149621ba733c5c075b94e0431)
+
+commit 3dac68a17a909b212a36b0a3c0ae2c47d323deee
+Author: Yehuda Sadeh <yehuda@redhat.com>
+Date: Fri Feb 27 08:14:27 2015 -0800
+
+ civetweb: update submodule
+
+ Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
+ (cherry picked from commit f28fe744285117a1715eac0d08911cdb37285103)
+
+commit 14aca3af18119a76c1cdfa6d71e6085d360e45e2
+Author: Yehuda Sadeh <yehuda@redhat.com>
+Date: Fri Feb 27 08:14:41 2015 -0800
+
+ rgw: update makefile to enable civetweb config
+
+ Fixes: #10965
+ Backport: hammer, firefly
+
+ Civetweb compilation now includes conf header to enable ipv6.
+
+ Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
+ (cherry picked from commit caa90225bad9fe5e9c275e6189b3396b4d396e3f)
+
+ Conflicts:
+ src/rgw/Makefile.am
+ radosgw_CFLAGS = -Icivetweb/include
+ was not yet changed into
+ radosgw_CFLAGS = -I$(srcdir)/civetweb/include
+ in firefly
+
+commit 6512b06fc8a80e3befbe15b543f8850991f74e8a
+Merge: 7b748c6 555cc42
+Author: Loic Dachary <ldachary@redhat.com>
+Date: Sat Feb 28 16:47:55 2015 +0100
+
+ Merge pull request #3820 from tchaikov/firefly-pg-leak-10421
+
+ osd: fix PG leak in SnapTrimWQ._clear()
+
+ Reviewed-by: Loic Dachary <ldachary@redhat.com>
+
+commit 7b748c62764311572342593820ce3f28f74fe9ca
+Merge: d971c95 da95149
+Author: Loic Dachary <ldachary@redhat.com>
+Date: Sat Feb 28 16:46:42 2015 +0100
+
+ Merge pull request #3772 from ceph/wip-10883-firefly
+
+ osd: Fix FileJournal wrap to get header out first
+
+ Reviewed-by: Loic Dachary <ldachary@redhat.com>
+
+commit d971c95c3d8b48494d05b68f40c4c9a4cc6f87a8
+Merge: 0820041 e539971
+Author: Loic Dachary <ldachary@redhat.com>
+Date: Sat Feb 28 16:45:48 2015 +0100
+
+ Merge pull request #3521 from dzafman/wip-10676
+
+ Backport doc fixes that appear to apply to firefly
+
+ Reviewed-by: Loic Dachary <ldachary@redhat.com>
+
+commit 555cc42fc826fd801f0d45187429079d4072d129
+Author: Kefu Chai <kchai@redhat.com>
+Date: Tue Feb 10 16:29:45 2015 +0800
+
+ osd: fix PG leak in SnapTrimWQ._clear()
+
+ Fixes: #10421
+ Signed-off-by: Kefu Chai <kchai@redhat.com>
+ (cherry picked from commit 01e154d592d6cdbf3f859cf1b4357e803536a6b4)
+
+commit 0820041e6515c82c41b81b9e6825e2dd5fcb8165
+Merge: 6565774 702dbc0
+Author: Gregory Farnum <greg@gregs42.com>
+Date: Thu Feb 26 15:59:24 2015 -0800
+
+ Merge pull request #3730 from ceph/wip-firefly-flock
+
+ backport ceph-fuse file locking patches to Firefly
+
+ Reviewed-by: Yan, Zheng <zyan@redhat.com>
+
+commit 6565774d0356efc6225ad561bb13e7cf11da7b1e
+Merge: 7ab02ee 08c2fda
+Author: Josh Durgin <jdurgin@redhat.com>
+Date: Thu Feb 26 14:18:10 2015 -0800
+
+ Merge pull request #3406 from ceph/wip-10299-firefly
+
+ librbd: complete all pending aio ops prior to closing image
+
+ Reviewed-by: Josh Durgin <jdurgin@redhat.com>
+
+commit 08c2fda12cf46937a09a59bb032379c3c5321292
+Author: Jason Dillaman <dillaman@redhat.com>
+Date: Mon Dec 15 10:53:53 2014 -0500
+
+ librbd: complete all pending aio ops prior to closing image
+
+ It was possible for an image to be closed while aio operations
+ were still outstanding. Now all aio operations are tracked and
+ completed before the image is closed.
+
+ Fixes: #10299
+ Backport: giant, firefly, dumpling
+ Signed-off-by: Jason Dillaman <dillaman@redhat.com>
+
+commit 7ab02ee5afb3d017b94d58c3dfc7731f7a3866d9
+Merge: 0c0a552 c23e42e
+Author: Josh Durgin <jdurgin@redhat.com>
+Date: Thu Feb 26 14:12:29 2015 -0800
+
+ Merge pull request #3404 from ceph/wip-10270-firefly
+
+ librbd: gracefully handle deleted/renamed pools
+
+ Reviewed-by: Josh Durgin <jdurgin@redhat.com>
+
+commit 0c0a5520b1b883bcdd5b865b217ba61e471e3ca2
+Merge: 9ef7743 836ab86
+Author: Josh Durgin <jdurgin@redhat.com>
+Date: Thu Feb 26 13:31:37 2015 -0800
+
+ Merge pull request #3410 from ceph/wip-9854-firefly
+
+ osdc: Constrain max number of in-flight read requests
+
+ Reviewed-by: Josh Durgin <jdurgin@redhat.com>
+
+commit da951497b7e5ec227aa6a5e459b0d04d8b88ef13 (refs/remotes/gh/wip-10883-firefly)
+Author: David Zafman <dzafman@redhat.com>
+Date: Wed Feb 18 16:21:12 2015 -0800
+
+ osd: Fix FileJournal wrap to get header out first
+
+ Correct and restore assert that was removed
+
+ Cause by f46b1b473fce0322a672b16c7739e569a45054b6
+ Fixes: #10883
+ Backport: dumpling, firefly, giant
+
+ Signed-off-by: David Zafman <dzafman@redhat.com>
+ (cherry picked from commit 970bb4901f93575709421b5b25c3eff213de61b8)
+
+commit 702dbc0a247c149d53b52d1929f9880bc99d0522
+Author: Yan, Zheng <zyan@redhat.com>
+Date: Wed Oct 15 12:00:58 2014 +0800
+
+ qa/workunits/fs/misc: Add a workunit for file lock interruption
+
+ Signed-off-by: Yan, Zheng <zyan@redhat.com>
+ (cherry picked from commit ac92c455a9aa19e4288acdf0c9a746e03a640efb)
+
+commit d2523b82c5c7b29293d70a66ba95493a1564a840
+Author: Yan, Zheng <zyan@redhat.com>
+Date: Wed Oct 15 12:03:46 2014 +0800
+
+ mds: fix neighbor lock check
+
+ Signed-off-by: Yan, Zheng <zyan@redhat.com>
+ (cherry picked from commit b0e6e85aa08ea74cd209aad04f3f0bf991761e12)
+
+commit f9b6b66b05ddadef043d81676728bf40730ea16c
+Author: Yan, Zheng <zyan@redhat.com>
+Date: Mon Oct 13 11:34:18 2014 +0800
+
+ client: use finisher to abort MDS request
+
+ When a request is interrupted, libfuse first locks an internal mutex,
+ then calls the interrupt callback. libfuse need to lock the same mutex
+ when unregistering interrupt callback. We unregister interrupt callback
+ while client_lock is locked, so we can't acquiring the client_lock in
+ the interrupt callback.
+
+ Signed-off-by: Yan, Zheng <zyan@redhat.com>
+ (cherry picked from commit 09699454e729592d426aeff5b578697e850af12e)
+
+ Conflicts:
+ src/client/Client.cc
+ src/client/Client.h
+
+ Signed-off-by: Greg Farnum <gfarnum@redhat.com>
+
+commit ea355e9ca5203b77e6f74ca4a3e39ce23cc86f67
+Author: Yan, Zheng <zyan@redhat.com>
+Date: Thu Oct 9 13:16:18 2014 +0800
+
+ client: use atomic variable to track reference of MetaRequeset
+
+ this allow us to increase reference count of MetaRequest while not holding
+ the client_lock
+
+ Signed-off-by: Yan, Zheng <zyan@redhat.com>
+ (cherry picked from commit e464a7765230c504b3e3b88bcb1106f67b7c3eb9)
+
+commit ccbdf514717cb0e48d67b57197d6e538faeea415
+Author: Yan, Zheng <zyan@redhat.com>
+Date: Mon Oct 13 10:44:46 2014 +0800
+
+ client: allow interrupting blocked file lock operation
+
+ This commit introduce two new types of setfilelock request. Unlike
+ setfilelock (UNLOCK) request, these two new types of setfilelock request
+ do not drop locks that have alread been acquired, they only interrupt
+ blocked setfilelock request.
+
+ Signed-off-by: Yan, Zheng <zyan@redhat.com>
+ (cherry picked from commit 4134c149d3759dd6a3aaa1a353b77bbfe8e9491b)
+
+commit 875e2fcb060554941d94714ad48ebbc0cbbf8077
+Author: Yan, Zheng <zyan@redhat.com>
+Date: Thu Oct 9 09:42:08 2014 +0800
+
+ client: register callback for fuse interrupt
+
+ libfuse allows program to reigster a callback for interrupt. When a file
+ system operation is interrupted, the fuse kernel driver sends interupt
+ request to libfuse. libfuse calls the interrupt callback when receiving
+ interrupt request.
+
+ Signed-off-by: Yan, Zheng <zyan@redhat.com>
+ (cherry picked from commit 289e8b4a7efa1ae6427115af9bbe541c9e1f0e90)
+
+commit c96aabbd54b24a0273af21a450cd6f517fe4ada0
+Author: Yan, Zheng <zyan@redhat.com>
+Date: Sat Oct 4 09:14:44 2014 +0800
+
+ client: add helper function that updates lock state
+
+ Signed-off-by: Yan, Zheng <zyan@redhat.com>
+ (cherry picked from commit 6a2303a6b6d97f2a6d1422e42d3d88991857618f)
+
+ Conflicts:
+ src/client/Client.h
+
+ Signed-off-by: Greg Farnum <gfarnum@redhat.com>
+
+commit ebbd3ca66722cdc61b56d243baf8e63f7b8c1c1b
+Author: Yan, Zheng <zyan@redhat.com>
+Date: Thu Oct 2 20:21:36 2014 +0800
+
+ fuse: enable fuse_multithreaded by default
+
+ GETFILELOCK MDS request may block for a long time, so we need to
+ use multithread event loop,
+
+ Signed-off-by: Yan, Zheng <zyan@redhat.com>
+ (cherry picked from commit b17b43a8660ed0db29fbecf44798265e47712f85)
+
+commit 924e6f2b6b03456a8b18d8b158b8f325051f0519
+Author: Yan, Zheng <zyan@redhat.com>
+Date: Thu Oct 2 19:07:41 2014 +0800
+
+ client: posix file lock support
+
+ Signed-off-by: Yan, Zheng <zyan@redhat.com>
+ (cherry picked from commit a1b2c8ff955b30807ac53ce6bdc97cf61a7262ca)
+
+ Conflicts:
+ src/client/Client.cc
+ src/client/Client.h
+ src/client/Inode.h
+
+ Signed-off-by: Greg Farnum <gfarnum@redhat.com>
+
+commit 82994946bdcb95867a61e0acf443e30b13925a34
+Author: Yan, Zheng <zyan@redhat.com>
+Date: Thu Oct 2 18:02:50 2014 +0800
+
+ common: link mds/flock.o to libcommon
+
+ later commit will use this code to track file locks held by cephfs
+ client.
+
+ Signed-off-by: Yan, Zheng <zyan@redhat.com>
+ (cherry picked from commit e075c27c3554380c59dce0cc17ef0944eb415025)
+
+ Conflicts:
+ src/mds/Makefile.am
+
+ Signed-off-by: Greg Farnum <gfarnum@redhat.com>
+
+commit 9ef77430f3d46789b0ba1a2afa42729627734500
+Merge: 1205867 b668566
+Author: Loic Dachary <ldachary@redhat.com>
+Date: Fri Feb 13 18:34:11 2015 +0100
+
+ Merge pull request #3684 from ceph/wip-crush-straw-firefly
+
+ osd: backport straw bucket fixes and all other recent crush goodness to firefly
+
+ Reviewed-by: Loic Dachary <ldachary@redhat.com>
+
+commit b668566fd8148414b8074f096b85b22c42ed3af9 (refs/remotes/gh/wip-crush-straw-firefly)
+Author: Sage Weil <sage@redhat.com>
+Date: Fri Jan 16 09:02:28 2015 -0800
+
+ crush/builder: fix warnings
+
+ crush/builder.c: In function 'crush_remove_list_bucket_item':
+ crush/builder.c:977:13: warning: comparison between signed and unsigned integer expressions [-Wsign-compare]
+ if (weight < bucket->h.weight)
+ ^
+ crush/builder.c: In function 'crush_remove_tree_bucket_item':
+ crush/builder.c:1031:14: warning: comparison between signed and unsigned integer expressions [-Wsign-compare]
+ if (weight < bucket->h.weight)
+ ^
+
+ Signed-off-by: Sage Weil <sage@redhat.com>
+ (cherry picked from commit 14eb1a73c71d81b7f193fce27c59cb3babf3e74a)
+
+commit 247afa4efe7d11b5ef06e094680b50ea30d7d5e3
+Author: Loic Dachary <loic-201408@dachary.org>
+Date: Wed Oct 15 17:02:58 2014 -0700
+
+ crush: improve constness of CrushWrapper methods
+
+ A number of CrushWrapper get methods or predicates were not const
+ because they need to maintain transparently the rmaps. Make the rmaps
+ mutable and update the constness of the methods to match what the caller
+ would expect.
+
+ Signed-off-by: Loic Dachary <loic-201408@dachary.org>
+ (cherry picked from commit 236895eea65f8706baa5fdef96fb00ad5b82218c)
+
+commit c59279a25b6c53e0ab3988b0f00ae3cce94f33d7
+Author: Xiaoxi Chen <xiaoxi.chen@intel.com>
+Date: Fri Sep 5 10:56:36 2014 +0800
+
+ Change CrushWrapper::crush to private
+
+ Currently in CrushWrapper, the member "struct crush_map *crush" is a public member,
+ so people can break the encapsulation and manipulate directly to the crush structure.
+
+ This is not a good practice for encapsulation and will lead to inconsistent if code
+ mix use the CrushWrapper API and crush C API.A simple example could be:
+ 1.some code use crush_add_rule(C-API) to add a rule, which will not set the have_rmap flag to false in CrushWrapper
+ 2.another code using CrushWrapper trying to look up the newly added rule by name will get a -ENOENT.
+
+ This patch move CrushWrapper::crush to private, together with three reverse map(type_rmap, name_rmap, rule_name_rmap)
+ and also change codes accessing the CrushWrapper::crush to make it compile.
+
+ Signed-off-by: Xiaoxi Chen <xiaoxi.chen@intel.com>
+ (cherry picked from commit d734600f9251b52f525faa35441e2b5dd660161b)
+
+commit 9fc2fd50aec94233528870aaa371347238a6ea75
+Author: Sage Weil <sage@inktank.com>
+Date: Fri Jul 11 06:58:57 2014 -0700
+
+ crush: include CRUSH_V3, v2/v3 rules checks in dump_tunables()
+
+ Backport: firefly
+ Signed-off-by: Sage Weil <sage@inktank.com>
+ (cherry picked from commit cf94cf3531a349bbd1fc6ee56c3fc260110a252a)
+
+commit f6009a614a3689cc9a96f55b35e70362be4ec64b
+Author: Sage Weil <sage@redhat.com>
+Date: Fri Dec 5 15:58:03 2014 -0800
+
+ mon: 'osd crush reweight-all'
+
+ This corresponds to the crushtool --reweight command.
+
+ Signed-off-by: Sage Weil <sage@redhat.com>
+ (cherry picked from commit 89b2feea8d53b9dc15ab5ae7f5920ad19c8bba18)
+
+commit d5d7495432dd023ed8c9ba2ac08222f06afee48f
+Author: Sage Weil <sage@redhat.com>
+Date: Fri Dec 5 15:55:24 2014 -0800
+
+ crush: set straw_calc_version=1 for default+optimal; do not touch for presets
+
+ When using the presets for compatibility (i.e., based on version), do not
+ touch the straw behavior, as it does not affect mapping or compatibility.
+ However, make a point of setting it by default and for optimal.
+
+ For most users, this means that they will not see any change unless they
+ explicitly enable the new behavior, or switch to default or optimal
+ tunables. The idea is that if they touched it, they shouldn't be
+ too surprised by the subsequent data movement.
+
+ Signed-off-by: Sage Weil <sage@redhat.com>
+ (cherry picked from commit dd7b58f3b1aa1febfc6dc227937df93ee6e284eb)
+
+ (Note: differs from original in that the hammer tunable profile is not
+ present)
+
+commit 5b7b7599123a9d7a837ded52946bd553b09b1ac7
+Author: Sage Weil <sage@redhat.com>
+Date: Wed Dec 3 22:30:00 2014 -0800
+
+ crush/builder: a note about the original crush_calc_straw()
+
+ Signed-off-by: Sage Weil <sage@redhat.com>
+ (cherry picked from commit adf5c6de0aca24a53d3c7b4e7eeb0a5dce9db0f1)
+
+commit 3ab835b059fd74a525cc2a8ebe8b6a1453e0cc87
+Author: Sage Weil <sage@redhat.com>
+Date: Tue Dec 2 16:43:16 2014 -0800
+
+ mon: add 'osd crush {get,set}-tunable <name> [value]' commands
+
+ For now, just add the straw_calc_version tunable.
+
+ Signed-off-by: Sage Weil <sage@redhat.com>
+ (cherry picked from commit 9000068ae45a8b89315c152b7d5509ac873f2957)
+
+ Conflicts:
+ src/mon/OSDMonitor.cc
+
+commit 884414c5788bac9a269f01b26cbc0c55850c34f6
+Author: Sage Weil <sage@redhat.com>
+Date: Tue Dec 2 16:33:11 2014 -0800
+
+ crush: fix crush_calc_straw() scalers when there are duplicate weights
+
+ The straw bucket was originally tested with uniform weights and with a
+ few more complicated patterns, like a stair step (1,2,3,4,5,6,7,8,9). And
+ it worked!
+
+ However, it does not behave with a pattern like
+ 1, 2, 2, 3, 3, 4, 4
+
+ Strangely, it does behave with
+ 1, 1, 2, 2, 3, 3, 4, 4
+
+ and more usefully it does behave with
+ 1, 2, 2.001, 3, 3.001, 4, 4.001
+
+ That is, the logic that explicitly copes with weights that are duplicates
+ is broken.
+
+ The fix is to simply remove the special handling for duplicate weights --
+ it isn't necessary and doesn't work correctly anyway.
+
+ Add a test that compares the mapping result of [1, 2, 2, 3, 3, ...] with
+ [1, 2, 2.001, 3, 3.001, ...] and verifies that the difference is small.
+ With the fix, we get .00012, whereas the original implementation gets
+ .015.
+
+ Note that this changes the straw bucket scalar *precalculated* values that
+ are encoded with the map, and only when the admin opts into the new behavior.
+
+ Backport: giant, firefly
+ Signed-off-by: Sage Weil <sage@redhat.com>
+ (cherry picked from commit 43d5c7caa7ce478477bde1bbd4f0649b5159cdcf)
+
+commit bf677093302f475a23de541471ddde6a7c7153b6
+Author: Sage Weil <sage@redhat.com>
+Date: Tue Dec 2 14:50:21 2014 -0800
+
+ crush: fix distortion of straw scalers by 0-weight items
+
+ The presence of a 0-weight item in a straw bucket should have no effect
+ on the placement of other items. Add a test validating that and fix
+ crush_calc_straw() to fix the distortion.
+
+ Note that this effects the *precalculation* of the straw bucket inputs and
+ does not effect the actually mapping process given a compiled or encoded
+ CRUSH map, and only when straw_calc_version == 1 (i.e., the admin opted in
+ to the new behavior).
+
+ Backport: giant, firefly
+ Signed-off-by: Sage Weil <sage@redhat.com>
+ (cherry picked from commit 85498bc8f62ca56506b33f3c5ec4fc4b111ed73d)
+
+commit e02574ef5d3b66e73424a16460366de2d36eded3
+Author: Sage Weil <sage@redhat.com>
+Date: Tue Dec 2 14:49:42 2014 -0800
+
+ crush/builder: break out new version 1 of crush_calc_straw
+
+ No change, yet.
+
+ Signed-off-by: Sage Weil <sage@redhat.com>
+ (cherry picked from commit 7c1203635f2b5911f281ce3a441905df6e9bd103)
+
+commit c7312a47865c758e67852999803d8aa90ff809c1
+Author: Sage Weil <sage@redhat.com>
+Date: Tue Dec 2 14:45:04 2014 -0800
+
+ crush: pass crush_map * to various builder methods
+
+ In particular, we will need it for crush_calc_straw().
+
+ Signed-off-by: Sage Weil <sage@redhat.com>
+ (cherry picked from commit f35a3d88cb944c292e966f679ac7a8d7a1cd3093)
+
+ Conflicts:
+ src/crush/CrushWrapper.cc
+
+commit 5137cc656548d942d0f21ba3ef28a5b7d4d21831
+Author: Rongze Zhu <zrzhit@gmail.com>
+Date: Fri Oct 10 19:18:00 2014 +0800
+
+ crush: fix incorrect use of adjust_item_weight method
+
+ adjust_item_weight method will adjust all buckets which the item
+ inside. If the osd.0 in host=fake01 and host=fake02, we execute
+ "ceph osd crush osd.0 10 host=fake01", it not only will adjust fake01's
+ weight, but also will adjust fake02's weight.
+
+ the patch add adjust_item_weightf_in_loc method and fix remove_item,
+ _remove_item_under, update_item, insert_item, detach_bucket methods.
+
+ Signed-off-by: Rongze Zhu <zrzhit@gmail.com>
+ (cherry picked from commit 9850227d2f0ca2f692a154de2c14a0a08e751f08)
+
+ Conflicts:
+ src/crush/CrushWrapper.cc
+
+commit 80ec22014deb8536b9c34e8d57b286052898d05a
+Author: Sage Weil <sage@redhat.com>
+Date: Thu Nov 13 10:59:22 2014 -0800
+
+ crush/CrushWrapper: fix detach_bucket
+
+ In commit 9850227d2f0ca2f692a154de2c14a0a08e751f08 we changed the call that
+ changed the weight of all instances of item to one that explicitly
+ changes it in the parent bucket, but parent_id may not be valid at the
+ call site. Move this into the conditional block to fix.
+
+ Fixes: #10095
+ Signed-off-by: Sage Weil <sage@redhat.com>
+ (cherry picked from commit 6f8b96a9fe4793906c74a571109a457aca7ca220)
+
+commit 5bc554ac5a7a4cd86b873bfc4f4313c91287b52c
+Author: Sage Weil <sage@redhat.com>
+Date: Tue Dec 2 14:10:49 2014 -0800
+
+ crush: default to straw_calc_version 1
+
+ Stick with bobtail tunables where it affects compatibility. Use v1 of
+ straw_calc, though, since that does not, and we want the best for new
+ clusters.
+
+ Signed-off-by: Sage Weil <sage@redhat.com>
+ (cherry picked from commit 9565621d6007302fdd68ba27b6aef22e487f0985)
+
+commit cfc718a5a1fec937cf00e6c2b55f66d4390088bb
+Author: Sage Weil <sage@redhat.com>
+Date: Fri Feb 13 08:30:35 2015 -0800
+
+ crush: add straw_calc_version tunable
+
+ It doesn't do anything, yet.
+
+ Signed-off-by: Sage Weil <sage@redhat.com>
+ (cherry picked from commit 50e2ceefee6a5dfbecbe54890139b1fa80a313c8)
+
+ (Modified from original to not create the 'hammer' tunable profile, which
+ we will not backport in its entirety.)
+
+commit 1205867d3afe6d457483f9f51aaee79cca74e040
+Author: Josh Durgin <jdurgin@redhat.com>
+Date: Mon Feb 2 16:43:35 2015 +0100
+
+ qa: use correct binary path on rpm-based systems
+
+ Fixes: #10715
+ Signed-off-by: Josh Durgin <jdurgin@redhat.com>
+ (cherry picked from commit 05ce2aa1bf030ea225300b48e7914577a412b38c)
+
+commit da4146a5e03503083e6bc5c12984c06f41a3b4be
+Author: Greg Farnum <gfarnum@redhat.com>
+Date: Thu Feb 5 21:12:17 2015 -0800
+
+ fsync-tester: print info about PATH and locations of lsof lookup
+
+ We're seeing the lsof invocation fail (as not found) in testing and nobody can
+ identify why. Since attempting to reproduce the issue has not worked, this
+ patch will gather data from a genuinely in-vitro location.
+
+ Signed-off-by: Greg Farnum <gfarnum@redhat.com>
+ (cherry picked from commit a85051483874ff5b8b0fb50426a3577040457596)
+
+commit 61b4f09848796faeacf7eb78dd6dc06513beb737
+Author: Sage Weil <sage@redhat.com>
+Date: Tue Dec 2 14:04:34 2014 -0800
+
+ crush/CrushWrapper: dump chooseleaf_vary_r with other tunables
+
+ Signed-off-by: Sage Weil <sage@redhat.com>
+ (cherry picked from commit c133a83fe7b77e2a7e7c711cb8ab943c59ff0885)
+
+commit e4939ed5535cc4678cf1d1ae80906290448e6590
+Author: Sage Weil <sage@redhat.com>
+Date: Tue Dec 2 10:12:25 2014 -0800
+
+ crush/CrushTester: add new --show-mappings option
+
+ This makes --show-utilization and --show-statistics usable.
+
+ Signed-off-by: Sage Weil <sage@redhat.com>
+ (cherry picked from commit 3877f00877f53e9f86630c2d89e81ab9cff729ec)
+
+commit 8c48ebbf13e6bdb689b4b8ae58ac811653ad2acc
+Author: Sage Weil <sage@redhat.com>
+Date: Tue Dec 2 10:11:57 2014 -0800
+
+ crushtool/CrushTester: output utilization even with 1 batch
+
+ Signed-off-by: Sage Weil <sage@redhat.com>
+ (cherry picked from commit 294b06c6424f4cb69394976add826d9725073b50)
+
+commit e9faab9f296af9cf26b9475afd3562c3f3b9236b
+Author: Sage Weil <sage@redhat.com>
+Date: Tue Dec 2 10:08:18 2014 -0800
+
+ crush: recalculate straw scalers during a reweight
+
+ The crushtool --reweight function triggers a fresh calculation of bucket
+ weights so that they are always the sum of the item weights. In the
+ straw bucket case, the weights were updated but the corresponding straw
+ scalers were not being recalculated. The result is that there was not
+ effect on placement in adjusted buckets until the next time a bucket item's
+ weight was adjusted.
+
+ Backport: giant, firefly
+ Signed-off-by: Sage Weil <sage@redhat.com>
+ (cherry picked from commit 35062937f174a45fb13d9c177eaa1fe4ed5ff4c2)
+
+commit 4c951e9dc1ca31429119de15755caf3d73f6ffce
+Author: Sage Weil <sage@redhat.com>
+Date: Tue Dec 2 08:36:41 2014 -0800
+
+ osdmaptool: --test-map-pgs-dump
+
+ Signed-off-by: Sage Weil <sage@redhat.com>
+ (cherry picked from commit 7a99b489909b368bade36d8cc9722ad33d03a2e8)
+
+commit 3cb5d08feee4811624dd495f74912824203edf00
+Author: Sage Weil <sage@redhat.com>
+Date: Tue Dec 2 06:53:20 2014 -0800
+
+ crush: add dprintk's for crush_calc_straw
+
+ These are compiled out by default.
+
+ Signed-off-by: Sage Weil <sage@redhat.com>
+ (cherry picked from commit 946bebd94b109642f95710802e892c59eb4f0b76)
+
+commit ca8471d65fb2cf7d2247d823c5436faa273efda5
+Author: Rongze Zhu <zrzhit@gmail.com>
+Date: Tue Nov 11 00:13:42 2014 +0800
+
+ crush: fix tree bucket functions
+
+ There are incorrect nodes' weight in tree bucket when construct tree
+ bucket. The tree bucket don't store item id in items array, so the tree
+ bucket will not work correctly. The patch fix above bugs and add a
+ simple test for tree bucket.
+
+ Signed-off-by: Rongze Zhu <zrzhit@gmail.com>
+ (cherry picked from commit 13425488882d360fa740613dfcfd0d098c1b7616)
+
+commit af502f25b04cd0758b753941ecf0b1b59d33ea9e
+Author: Sage Weil <sage@redhat.com>
+Date: Tue Nov 11 11:16:58 2014 -0800
+
+ crush/builder: replace printf with an empty dprintk macro
+
+ This mirrors mapper.c.
+
+ Signed-off-by: Sage Weil <sage@redhat.com>
+ (cherry picked from commit e444b221733360cdea4f4bbdbbbfbf2b6ee30ff5)
+
+commit 26966c4aa9cd79cb53db052553a5fc5653f2591b
+Author: Greg Farnum <gfarnum@redhat.com>
+Date: Thu Nov 6 17:48:01 2014 -0800
+
+ qa: use sudo even more when rsyncing /usr
+
+ Signed-off-by: Greg Farnum <gfarnum@redhat.com>
+ (cherry picked from commit 3aa7797741f9cff06053a2f31550fe6929039692)
+
+commit 6af48421c0ba6195e9a1607053c42eeb62b14ccb
+Author: Greg Farnum <greg@inktank.com>
+Date: Tue Oct 21 10:55:06 2014 -0700
+
+ qa: use sudo when rsyncing /usr so we can read everything
+
+ Signed-off-by: Greg Farnum <greg@inktank.com>
+ (cherry picked from commit fa07c04231db2d130de54647957ffab4a7a53733)
+
+commit 861a18b1f7dd5bdcbb85bc3fa15d1719bb4b2813
+Author: Yehuda Sadeh <yehuda@redhat.com>
+Date: Thu Jan 15 16:31:22 2015 -0800
+
+ rgw: fix partial GET in swift
+
+ Fixes: #10553
+ backport: firefly, giant
+
+ Don't set the ret code to reflect partial download, just set the
+ response status when needed.
+
+ Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
+ (cherry picked from commit 7e1553cedff90fa0fefded65cde87ad068eb5f0c)
+
+commit e539971e2d528b4de6009ea44565f037acb2be66 (refs/remotes/gh/wip-10676)
+Author: Nilamdyuti Goswami <ngoswami@redhat.com>
+Date: Thu Dec 18 17:13:27 2014 +0530
+
+ doc: Adds updated man page for ceph under man/
+
+ Signed-off-by: Nilamdyuti Goswami <ngoswami@redhat.com>
+ (cherry picked from commit 8de9a0f437822c770600c19a9f61977745b7e530)
+
+commit 15596ffe388147b7984457041a38cbb9f472556c
+Author: Nilamdyuti Goswami <ngoswami@redhat.com>
+Date: Sat Dec 13 02:27:45 2014 +0530
+
+ doc: Adds man page for ceph under man/.
+
+ Signed-off-by: Nilamdyuti Goswami <ngoswami@redhat.com>
+ (cherry picked from commit ffd6c7e49686f8f92ddb400ffdec62520708e64b)
+
+commit 893e5cd1f4fd5ea77d65f0e78cc8cff88eb19c1a
+Author: Nilamdyuti Goswami <ngoswami@redhat.com>
+Date: Sat Dec 13 02:24:41 2014 +0530
+
+ doc: Adds man page for ceph.
+
+ Signed-off-by: Nilamdyuti Goswami <ngoswami@redhat.com>
+ (cherry picked from commit 76da87a64ca6b3cc0ceeaf63e19a9f440d6f4161)
+
+commit 8d29a4a231666830914903b95599d80da7b97def
+Author: Sage Weil <sage@redhat.com>
+Date: Mon Dec 15 17:04:32 2014 -0800
+
+ osd: handle no-op write with snapshot case
+
+ If we have a transaction that does something to the object but it !exists
+ both before and after, we will continue through the write path. If the
+ snapdir object already exists, and we try to create it again, we will
+ leak a snapdir obc and lock and later crash on an assert when the obc
+ is destroyed:
+
+ 0> 2014-12-06 01:49:51.750163 7f08d6ade700 -1 osd/osd_types.h: In function 'ObjectContext::~ObjectContext()' thread 7f08d6ade700 time 2014-12-06 01:49:51.605411
+ osd/osd_types.h: 2944: FAILED assert(rwstate.empty())
+
+ Fix is to not recreated the snapdir if it already exists.
+
+ Fixes: #10262
+ Signed-off-by: Sage Weil <sage@redhat.com>
+ (cherry picked from commit 02fae9fc54c10b5a932102bac43f32199d4cb612)
+
+commit 8ba48d10c252b28cde5b4da1286421db12b57cc2
+Author: Sage Weil <sage@redhat.com>
+Date: Mon Jan 19 18:28:20 2015 -0800
+
+ ceph_test_rados_api_misc: do not assert rbd feature match
+
+ This test fails on upgrades when we (or the server) have new
+ features. Make it less fragile.
+
+ Fixes: #10576
+ Signed-off-by: Sage Weil <sage@redhat.com>
+ (cherry picked from commit 9147c62989871cea8b3a85b02c53017825efb55b)
+
+commit 836ab86d89ae15ed5b228ff656bc81c7cc3495aa
+Author: Jason Dillaman <dillaman@redhat.com>
+Date: Mon Oct 27 14:47:19 2014 -0400
+
+ osdc: Constrain max number of in-flight read requests
+
+ Constrain the number of in-flight RADOS read requests to the
+ cache size. This reduces the chance of the cache memory
+ ballooning during certain scenarios like copy-up which can
+ invoke many concurrent read requests.
+
+ Fixes: #9854
+ Backport: giant, firefly, dumpling
+ Signed-off-by: Jason Dillaman <dillaman@redhat.com>
+ (cherry picked from commit 068d68850d09dfcaccc5a3ce85c80b2f6d808ea9)
+
+commit 2964efaf327cf798f892a6722eb4e24f2ffa0fde
+Author: Jason Dillaman <dillaman@redhat.com>
+Date: Mon Jan 19 12:46:00 2015 -0500
+
+ Revert "Enforce cache size on read requests"
+
+ This reverts commit b7784dc1baa47560a733fe9dcd2acec51bc93165.
+
+commit e4c5b153735aba3f84554a50243f779f36568373
+Author: Jason Dillaman <dillaman@redhat.com>
+Date: Mon Jan 19 12:45:25 2015 -0500
+
+ Revert "rbd: ObjectCacher reads can hang when reading sparse files"
+
+ This reverts commit 711a7e6f81983ff2091caa0f232af914a04a041c.
+
+commit c23e42e78ea3ba44706951a728e2ccb74cac7b33
+Author: Jason Dillaman <dillaman@redhat.com>
+Date: Mon Jan 19 10:28:56 2015 -0500
+
+ librbd: gracefully handle deleted/renamed pools
+
+ snap_unprotect and list_children both attempt to scan all
+ pools. If a pool is deleted or renamed during the scan,
+ the methods would previously return -ENOENT. Both methods
+ have been modified to more gracefully handle this condition.
+
+ Fixes: #10270
+ Backport: giant, firefly
+ Signed-off-by: Jason Dillaman <dillaman@redhat.com>
+ (cherry picked from commit 436923c68b77c900b7774fbef918c0d6e1614a36)
+
+commit 24c13d87039d4f61df0bcabdb8862e0e94fe575d
+Author: Yehuda Sadeh <yehuda@redhat.com>
+Date: Fri Dec 12 05:24:01 2014 -0800
+
+ rgw: change multipart upload id magic
+
+ Fixes: #10271
+ Backport: firefly, giant
+
+ Some clients can't sign requests correctly with the original magic
+ prefix.
+
+ Reported-by: Georgios Dimitrakakis <giorgis@acmac.uoc.gr>
+ Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
+ (cherry picked from commit 5fc7a0be67a03ed63fcc8408f8d71a31a1841076)
+
+commit 617002d3ff469ef409a83e35d4f4fd6a0b5b1278
+Author: Yehuda Sadeh <yehuda@redhat.com>
+Date: Thu Dec 11 09:07:10 2014 -0800
+
+ rgw: url decode http query params correctly
+
+ Fixes: #10271
+ Backport: firefly
+
+ This got broken by the fix for #8702. Since we now only url_decode if
+ we're in query, we need to specify that we're in query when decoding
+ these args.
+
+ Reported-by: Georgios Dimitrakakis <giorgis@acmac.uoc.gr>
+ Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
+ (cherry picked from commit 21e07eb6abacb085f81b65acd706b46af29ffc03)
+
+commit d7ccf71d962cec1571f53c9392f9b58350569062
+Author: Josh Durgin <jdurgin@redhat.com>
+Date: Wed Jan 14 15:01:38 2015 -0800
+
+ qa: ignore duplicates in rados ls
+
+ These can happen with split or with state changes due to reordering
+ results within the hash range requested. It's easy enough to filter
+ them out at this stage.
+
+ Backport: giant, firefly
+ Signed-off-by: Josh Durgin <jdurgin@redhat.com>
+ (cherry picked from commit e7cc6117adf653a4915fb7a75fac68f8fa0239ec)
+
+commit aef69572588a0dfad58df94cb0d0980d0590d8e4
+Merge: 69eaad7 534624b
+Author: Yehuda Sadeh <yehuda@redhat.com>
+Date: Thu Jan 15 16:40:48 2015 -0800
+
+ Merge branch 'wip-firefly-rgw-backports' into firefly
+
+commit 534624b7e9decc880e88496355a6fbbe008ede5f
+Author: Sage Weil <sage@redhat.com>
+Date: Tue Oct 21 17:59:30 2014 -0700
+
+ init-radosgw.sysv: set ulimit -n before starting daemon
+
+ If we do the ulimit inside the daemon command we will have already
+ dropped privs and will fail.
+
+ Fixes: #9587
+ Backport: giant, firefly
+ Signed-off-by: Sage Weil <sage@redhat.com>
+ (cherry picked from commit 9803cedf54a7baff45ccd0e0f65d2bc220958a46)
+
+commit fd49cbc535d0d7fa64ebfa458386b47c8ec8616e
+Author: Yehuda Sadeh <yehuda@redhat.com>
+Date: Fri Dec 12 17:07:30 2014 -0800
+
+ rgw: use s->bucket_attrs instead of trying to read obj attrs
+
+ Fixes: #10307
+ Backport: firefly, giant
+
+ This is needed, since we can't really read the bucket attrs by trying to
+ read the bucket entry point attrs. We already have the bucket attrs
+ anyway, use these.
+
+ Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
+ (cherry picked from commit 5cf193c8686196d5235889e68cb5ea8f1fc8e556)
+
+commit 79bfffb55a0b3a302368e34417d62f74b82dc224
+Author: Yehuda Sadeh <yehuda@redhat.com>
+Date: Wed Nov 5 13:40:55 2014 -0800
+
+ rgw: remove swift user manifest (DLO) hash calculation
+
+ Fixes: #9973
+ Backport: firefly, giant
+
+ Previously we were iterating through the parts, creating hash of the
+ parts etags (as S3 does for multipart uploads). However, swift just
+ calculates the etag for the empty manifest object.
+
+ Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
+ (cherry picked from commit ef6d3ad964d34bc526dc4435486bd5c8cdc3b230)
+
+ Conflicts:
+ src/rgw/rgw_op.cc
+
+commit ac799f0834783590cbb6eb91784c8e0753cb1e03
+Author: Lei Dong <leidong@yahoo-inc.com>
+Date: Mon Oct 27 10:29:48 2014 +0800
+
+ fix can not disable max_size quota
+
+ Currently if we enable quota and set max_size = -1, it doesn’t
+ mean max_size is unlimited as expected. Instead, it means object
+ with any size is not allowed to upload because of “QuotaExceeded”.
+ The root cause is the function rgw_rounded_kb which convert max_size
+ to max_size_kb returns 0 for -1 because it takes an unsigned int
+ but we pass an int to it. A simple fix is check max_size before
+ it’s rounded to max_size_kb.
+
+ Test case:
+ 1 enable and set quota:
+ radosgw-admin quota enable --uid={user_id} --quota-scope=user
+ radosgw-admin quota set --quota-scope=user --uid={user_id}\
+ --max-objects=100 --max-size=-1
+ 2 upload any object with non-zero length
+ it will return 403 with “QuotaExceeded” and return 200 if you apply the fix.
+
+ Fixes: #9907
+ Backport: giant, firefly
+ Signed-off-by: Dong Lei leidong@yahoo-inc.com
+ (cherry picked from commit abd3fd3ef9ee9999b99811937af60b7a5e673e35)
+
+commit 30963fdc98f5650a68b5737729920d43459b5899
+Author: Yehuda Sadeh <yehuda@redhat.com>
+Date: Tue Sep 23 12:43:55 2014 -0700
+
+ rgw: rados->set_attrs() updates bucket index
+
+ Fixes: #5595
+ Backport: dumpling, firefly
+ We need to update the bucket index when updating object attrs, otherwise
+ we're missing meta changes that need to be registered. It also
+ solves issue of bucket index not knowing about object acl changes,
+ although this one still requires some more work.
+
+ Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
+ (cherry picked from commit f833f12a200ecc2c4f74ddb443d6fa61b7ad14db)
+
+commit 31f5e332c616dbb7f7338af3ab37ac65ff66f733
+Author: Yehuda Sadeh <yehuda@redhat.com>
+Date: Tue Nov 4 22:05:03 2014 -0800
+
+ rgw: RGWRados::get_obj() returns wrong len if len == 0
+
+ Fixes: #9877
+ We only updated if len was > 0, should update it if r >= 0. This was the
+ culprit for issue #9877.
+ Backport: giant, firefly
+
+ Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
+ (cherry picked from commit fe7bf06366adaf787816d1e68f5e3f68e8c91134)
+
+commit 8682d1b15e097ececd927dfbd096dbb46403afca
+Author: Yehuda Sadeh <yehuda@redhat.com>
+Date: Wed Nov 5 13:28:02 2014 -0800
+
+ rgw: send back ETag on S3 object copy
+
+ Fixes: #9479
+ Backport: firefly, giant
+ We didn't send the etag back correctly. Original code assumed the etag
+ resided in the attrs, but attrs only contained request attrs.
+
+ Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
+ (cherry picked from commit b1bfc3a7e0c9088f01f8ff770ae14f569fbc570d)
+
+ Conflicts:
+ src/rgw/rgw_rados.cc
+
+commit 2d61fc76e97e5e28cf24cc6e341d49a8fe47059c
+Author: Yehuda Sadeh <yehuda@redhat.com>
+Date: Wed Nov 5 12:35:42 2014 -0800
+
+ rgw: S3 object copy content type fix
+
+ Fixes: #9478
+ Backport: firefly, giant
+ Content type for S3 object copy response should be set to
+ application/xml.
+
+ Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
+ (cherry picked from commit 31963459a0a869c4d32f55baa629f36df33eaa90)
+
+commit 011a8c3bd621337e5a1746f18882be20d3854b14
+Author: Yehuda Sadeh <yehuda@redhat.com>
+Date: Fri Dec 12 11:20:26 2014 -0800
+
+ rgw: http headers need to end with \r\n
+
+ Fixes: #9254
+ Backport: firefly, giant
+
+ Reported-by: Benedikt Fraunhofer <fraunhofer@traced.net>
+ Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
+ (cherry picked from commit 7409ab3df18fb312dd6c9f79084f889c523afdce)
+
+ Conflicts:
+ src/rgw/rgw_civetweb.cc
+ src/rgw/rgw_fcgi.cc
+
+commit 71d119f2952716aa1f75817e1daaf5fb67ecde94
+Author: Yehuda Sadeh <yehuda@redhat.com>
+Date: Wed Jan 7 13:56:14 2015 -0800
+
+ rgw: index swift keys appropriately
+
+ Fixes: #10471
+ Backport: firefly, giant
+
+ We need to index the swift keys by the full uid:subuser when decoding
+ the json representation, to keep it in line with how we store it when
+ creating it through other mechanism.
+
+ Reported-by: hemant burman <hemant.burman@gmail.com>
+ Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
+ (cherry picked from commit 478629bd2f3f32afbe6e93eaebb8a8fa01af356f)
+
+commit 7b89a827a063acf78a848a34c1c3298db213950f
+Author: Yehuda Sadeh <yehuda@redhat.com>
+Date: Thu Nov 20 10:36:05 2014 -0800
+
+ rgw-admin: create subuser if needed when creating user
+
+ Fixes: #10103
+ Backport: firefly, giant
+ This turned up after fixing #9973. Earlier we also didn't create the
+ subuser in this case, but we didn't really read the subuser info when it
+ was authenticating. Now we do that as required, so we end up failing the
+ authentication. This only applies to cases where a subuser was created
+ using 'user create', and not the 'subuser create' command.
+
+ Reviewed-by: Sage Weil <sage@redhat.com>
+ Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
+ (cherry picked from commit 9ba17a321db06d3d76c9295e411c76842194b25c)
+
+commit 9ee29b5355e9ffeac76707e8d4070bfff5dc99d5
+Author: Yehuda Sadeh <yehuda@redhat.com>
+Date: Wed Nov 5 14:38:46 2014 -0800
+
+ rgw: update swift subuser perm masks when authenticating
+
+ Fixes: #9918
+ Backport: firefly, giant
+ It seems that we weren't setting the swift perm mask correctly.
+
+ Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
+ (cherry picked from commit 5d9f36f757a7272c24d2c9adc31db1ed5e712992)
+
+commit d298fdda2aa177e1a4b43ca94a2292435a50dea4
+Author: Yehuda Sadeh <yehuda@redhat.com>
+Date: Thu Oct 23 17:39:42 2014 -0700
+
+ rgw: send http status reason explicitly in fastcgi
+
+ There are issues in certain versions of apache 2.4, where the reason is
+ not sent back. Instead, just provide the reason explicitly.
+
+ Backport: firefly, giant
+
+ Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
+ (cherry picked from commit a9dd4af401328e8f9071dee52470a0685ceb296b)
--- /dev/null
+commit e4bfad3a3c51054df7e537a724c8d0bf9be972ff (tag: refs/tags/v0.94.1, refs/remotes/gh/hammer)
+Author: Jenkins <jenkins@inktank.com>
+Date: Fri Apr 10 12:04:50 2015 -0700
+
+ 0.94.1
+
+commit 733864738fa93979727e480e403293e079bb51e9
+Merge: b5921d5 5ca771a
+Author: Loic Dachary <loic@dachary.org>
+Date: Fri Apr 10 17:51:38 2015 +0200
+
+ Merge pull request #4328 from dachary/wip-11364-hammer
+
+ v4 bucket feature detection
+
+ Reviewed-by: Sage Weil <sage@redhat.com>
+
+commit 5ca771a7d1df8e78ee503a7063068cf744d5efcc
+Author: Sage Weil <sage@redhat.com>
+Date: Fri Apr 10 08:43:45 2015 -0700
+
+ crush: fix has_v4_buckets()
+
+ alg, not type!
+
+ This bug made us incorrectly think we were using v4 features when user type
+ 5 was being used. That's currently 'rack' with recent crush maps, but
+ was other types for clusters that were created with older versions. This
+ is clearly problematic as it will lock out non-hammer clients incorrectly,
+ breaking deployments on upgrade.
+
+ Fixes: #11364
+ Backport: hammer
+ Signed-off-by: Sage Weil <sage@redhat.com>
+ (cherry picked from commit 38b35ab9d17eb84ac178c4cd3ebcf2ec0f66d8b6)
+
+commit 33e79ab7aa0b5428e8fb82a90eea17d31d363a88
+Author: Sage Weil <sage@redhat.com>
+Date: Thu Apr 9 17:17:59 2015 -0700
+
+ crush: fix dump of has_v4_buckets
+
+ Backport: hammer
+ Signed-off-by: Sage Weil <sage@redhat.com>
+ (cherry picked from commit d6e23413017fb8f5d7f18d74e993ceeedb82d8bc)
+
+commit b5921d55d16796e12d66ad2c4add7305f9ce2353
+Author: Sage Weil <sage@redhat.com>
+Date: Thu Apr 9 14:42:34 2015 -0700
+
+ crush/mapper: fix divide-by-0 in straw2
+
+ If the item weight is 0 we don't want to divide; instead draw a minimal
+ value.
+
+ Fixes: #11357
+ Reported-by: Yann Dupont <yd@objoo.org>
+ Tested-by: Yann Dupont <yd@objoo.org>
+ Signed-off-by: Sage Weil <sage@redhat.com>
+ (cherry picked from commit 64d1e900ec4f5831972ec80e8d0129604669f5bb)
+
+commit 93c8f436a4f84ac8088e1a1de82350dd33c68d64
+Author: Guang Yang <yguang@yahoo-inc.com>
+Date: Thu Feb 26 08:13:12 2015 +0000
+
+ osd: fix negative degraded objects during backfilling
+
+ When there is deleting requests during backfilling, the reported number of degraded
+ objects could be negative, as the primary's num_objects is the latest (locally) but
+ the number for replicas might not reflect the deletings. A simple fix is to ignore
+ the negative subtracted value.
+
+ Signed-off-by: Guang Yang <yguang@yahoo-inc.com>
+ (cherry picked from commit 14d7e36d3c978844da73d0e1c8a3a1ec863bac15)
--- /dev/null
+commit 95cefea9fd9ab740263bf8bb4796fd864d9afe2b (tag: refs/tags/v0.94.3, refs/remotes/gh/hammer)
+Author: Jenkins <jenkins@inktank.com>
+Date: Wed Aug 26 10:39:37 2015 -0700
+
+ 0.94.3
+
+commit 697101e4dfd9822050ce401b5f6212bfd81fea89
+Merge: 88e7ee7 81a311a
+Author: Gregory Farnum <greg@gregs42.com>
+Date: Tue Aug 18 12:43:57 2015 +0100
+
+ Merge pull request #5589 from ceph/hammer-12709
+
+ Workunits : fs/misc/chmod.sh : Include ACL characters in permission check
+
+ Reviewed-by: Greg Farnum <gfarnum@redhat.com>
+
+commit 81a311a744987564b70852fdacfd915523c73b5d
+Author: Yazen Ghannam <yazen.ghannam@linaro.org>
+Date: Mon May 4 12:33:16 2015 -0400
+
+ Workunits : fs/misc/chmod.sh : Include ACL characters in permission check.
+
+ Signed-off-by: Yazen Ghannam <yazen.ghannam@linaro.org>
+ (cherry picked from commit d3dbfffefb0ae53583350f53258dc902670da659)
+
+commit 88e7ee716fdd7bcf81845087021a677de5a50da8
+Merge: bb12f92 1a32379
+Author: Loic Dachary <loic@dachary.org>
+Date: Tue Aug 4 13:02:17 2015 +0200
+
+ Merge pull request #5160 from theanalyst/wip-11910-hammer
+
+ mon: pg ls is broken
+
+ Reviewed-by: Kefu Chai <kchai@redhat.com>
+
+commit bb12f925cf0d78f97eefc2e271e73596050b9919
+Merge: e801d4c e19f928
+Author: Loic Dachary <loic@dachary.org>
+Date: Tue Aug 4 12:34:18 2015 +0200
+
+ Merge pull request #5384 from dachary/wip-12502-hammer
+
+ rgw: need conversion tool to handle fixes following #11974
+
+ Reviewed-by: Yehuda Sadeh <ysadehwe@redhat.com>
+
+commit e801d4c943b8004ef613345505df91057913cd39
+Merge: 78a4024 154f18c
+Author: Loic Dachary <loic@dachary.org>
+Date: Tue Aug 4 11:22:08 2015 +0200
+
+ Merge pull request #5405 from ceph/wip-12465-hammer
+
+ Log::reopen_log_file: take m_flush_mutex
+
+ Reviewed-by: Loic Dachary <ldachary@redhat.com>
+
+commit 78a4024c14253503b770070aa36a090c6b8f1eaf
+Merge: a451e88 7034720
+Author: Sage Weil <sage@redhat.com>
+Date: Fri Jul 31 15:18:52 2015 -0400
+
+ Merge pull request #5121 from theanalyst/wip-11983-hammer
+
+ FAILED assert(!old_value.deleted()) in upgrade:giant-x-hammer-distro-basic-multi run
+
+ Reviewed-by: Sage Weil <sage@redhat.com>
+
+commit a451e882ab9a929d240747b4b09786ca4b4ce377
+Merge: 218f537 1063f52
+Author: Sage Weil <sage@redhat.com>
+Date: Fri Jul 31 15:17:00 2015 -0400
+
+ Merge pull request #5269 from dachary/wip-12362-hammer
+
+ stuck incomplete
+
+ Reviewed-by: Sage Weil <sage@redhat.com>
+
+commit 218f537491a46a0251bef7690a7f5a86b988ee63
+Merge: 07fa83a 8abc46a
+Author: Loic Dachary <loic@dachary.org>
+Date: Fri Jul 31 20:55:48 2015 +0200
+
+ Merge pull request #5117 from theanalyst/wip-12099-hammer
+
+ rgw: rados objects wronly deleted
+
+ Reviewed-by: Yehuda Sadeh <ysadehwe@redhat.com>
+
+commit 07fa83aefc9bd4ea1495fa1e117a438b2c460e46
+Merge: a69d431 56c2688
+Author: Loic Dachary <loic@dachary.org>
+Date: Fri Jul 31 20:55:29 2015 +0200
+
+ Merge pull request #5118 from theanalyst/wip-12042-hammer
+
+ DragonDisk fails to create directories via S3: MissingContentLength
+
+ Reviewed-by: Yehuda Sadeh <ysadehwe@redhat.com>
+
+commit a69d431ea52b5de7fc5cfe142ff3b69ff64e8048
+Merge: 5353480 c78cc00
+Author: Loic Dachary <loic@dachary.org>
+Date: Fri Jul 31 20:55:14 2015 +0200
+
+ Merge pull request #5214 from SUSE/wip-12299-hammer
+
+ RGW Swift API: support for 202 Accepted response code on container creation
+
+ Reviewed-by: Yehuda Sadeh <ysadehwe@redhat.com>
+
+commit 5353480f1df297ad9dd1bd3154887ed2564f0280
+Merge: fb9156f a5dbcbb
+Author: Loic Dachary <loic@dachary.org>
+Date: Fri Jul 31 20:54:57 2015 +0200
+
+ Merge pull request #5226 from SUSE/wip-12322-hammer
+
+ rgw: keystone does not support chunked input
+
+ Reviewed-by: Yehuda Sadeh <ysadehwe@redhat.com>
+
+commit fb9156f412f83c0ce1fe4c5c9ccd57fd79f0c992
+Merge: 7193c16 b1618a9
+Author: Loic Dachary <loic@dachary.org>
+Date: Fri Jul 31 20:54:41 2015 +0200
+
+ Merge pull request #5227 from SUSE/wip-12323-hammer
+
+ RGW Swift API: XML document generated in response for GET on account does not contain account name
+
+ Reviewed-by: Yehuda Sadeh <ysadehwe@redhat.com>
+
+commit 7193c16b65fdc1694b968899d23eae0638d89f11
+Merge: ac86490 e39dce7
+Author: Loic Dachary <loic@dachary.org>
+Date: Fri Jul 31 20:54:26 2015 +0200
+
+ Merge pull request #5228 from theanalyst/wip-11872-hammer
+
+ RGW does not send Date HTTP header when civetweb frontend is used
+
+ Reviewed-by: Yehuda Sadeh <ysadehwe@redhat.com>
+
+commit ac86490821336ce024940d48d82f7a5ff7a302b1
+Merge: 33dbfc6 557865c
+Author: Loic Dachary <loic@dachary.org>
+Date: Fri Jul 31 20:54:02 2015 +0200
+
+ Merge pull request #5229 from theanalyst/wip-12242-hammer
+
+ Fix tool for #11442 does not correctly fix objects created via multipart uploads
+
+ Reviewed-by: Yehuda Sadeh <ysadehwe@redhat.com>
+
+commit 33dbfc6919840882c6cbc10dad2fc24cf0720bf9
+Merge: 99ca62f e50caab
+Author: Loic Dachary <loic@dachary.org>
+Date: Fri Jul 31 20:53:41 2015 +0200
+
+ Merge pull request #5237 from theanalyst/wip-12245-hammer
+
+ rgw: empty json response when getting user quota
+
+ Reviewed-by: Yehuda Sadeh <ysadehwe@redhat.com>
+
+commit 99ca62f2bf1e21a41cb7b6ecdb8a8731a18de195
+Merge: 1f5f319 2357b6c
+Author: Loic Dachary <loic@dachary.org>
+Date: Fri Jul 31 20:53:18 2015 +0200
+
+ Merge pull request #5284 from SUSE/wip-12398-hammer
+
+ rgw: Properly respond to the Connection header with Civetweb
+
+ Reviewed-by: Yehuda Sadeh <ysadehwe@redhat.com>
+
+commit 1f5f31905bb5f499a2db4a02993dbc6efa1c4251
+Merge: 5cbb6cf 9458b84
+Author: Loic Dachary <loic@dachary.org>
+Date: Fri Jul 31 20:53:04 2015 +0200
+
+ Merge pull request #5285 from SUSE/wip-12399-hammer
+
+ rgw: multipart list part response returns incorrect field
+
+ Reviewed-by: Yehuda Sadeh <ysadehwe@redhat.com>
+
+commit 5cbb6cfb69aad0db470f99e39e33f4b4b1abfb95
+Merge: 1df93e1 e4b55b3
+Author: Loic Dachary <loic@dachary.org>
+Date: Fri Jul 31 20:52:43 2015 +0200
+
+ Merge pull request #5286 from SUSE/wip-12400-hammer
+
+ rgw: radosgw-admin dumps user info twice
+
+ Reviewed-by: Yehuda Sadeh <ysadehwe@redhat.com>
+
+commit 1df93e19a0275ed218c8f83bc674f16d1856f241
+Merge: a48cbc0 2ecb3b7
+Author: Yan, Zheng <ukernel@gmail.com>
+Date: Fri Jul 31 09:50:22 2015 +0800
+
+ Merge pull request #5427 from dachary/wip-12088-hammer-part-2
+
+ Fh ref count will leak if readahead does not need to do read from osd
+
+commit 2ecb3b7f4a49c574bc178a106c6bf0d8247f2a5e
+Author: Zhi Zhang <zhangz.david@outlook.com>
+Date: Wed Jul 22 10:54:53 2015 +0800
+
+ Fh ref count will leak if readahead does not need to do read from osd
+
+ The 3c8cdeacf46ae4031189d2ef6948aa3b6ab4ae43 backport introduced a leak.
+
+ http://tracker.ceph.com/issues/12319 Fixes: #12319
+
+ Signed-off-by: Zhi Zhang <zhangz.david@outlook.com>
+
+commit a48cbc0a847f19ea613b76a479acc831e9316c62
+Merge: 06c27cd 5ef0846
+Author: Loic Dachary <loic@dachary.org>
+Date: Thu Jul 30 21:43:48 2015 +0200
+
+ Merge pull request #5120 from theanalyst/wip-11999-hammer
+
+ cephfs Dumper tries to load whole journal into memory at once
+
+ Reviewed-by: Greg Farnum <gfarnum@redhat.com>
+
+commit 06c27cdd420598c497766ee5879335942a0acc09
+Merge: 19abe5e 408880b
+Author: Loic Dachary <loic@dachary.org>
+Date: Thu Jul 30 21:43:21 2015 +0200
+
+ Merge pull request #5119 from theanalyst/wip-12098-hammer
+
+ kernel_untar_build fails on EL7
+
+ Reviewed-by: Greg Farnum <gfarnum@redhat.com>
+
+commit 19abe5ee35c099c67b56ac268710fcd20bec60d3
+Merge: e3d17e4 4c199bf
+Author: Loic Dachary <loic@dachary.org>
+Date: Thu Jul 30 17:00:14 2015 +0200
+
+ Merge pull request #5417 from dachary/wip-11998-hammer
+
+ debian/control: ceph-common (>> 0.94.2) must be >= 0.94.2-2
+
+ Reviewed-by: Sage Weil <sage@redhat.com>
+
+commit 4c199bf57dc54dc5e5f45cd9b34878a8459d434e
+Author: Loic Dachary <ldachary@redhat.com>
+Date: Thu Jul 30 09:43:20 2015 +0200
+
+ debian/control: ceph-common (>> 0.94.2) must be >= 0.94.2-2
+
+ The d8733be2ef8874b9a858a7ffddfb81b9b656e9a6 backport introduced a
+ regression by adding an incorrect Depends / Break combo supposed to
+ reflect the fact that ceph_argparse moved from ceph to ceph-common after
+ v0.94.2. It assumed the package is released under the 0.94.2 version
+ where in reality it is released under the 0.94.2-1xxx version (where xxx
+ is trusty, jessie etc.).
+
+ The Depends / Break combo is changed to use 0.94.2-2 instead.
+
+ See also http://tracker.ceph.com/issues/12529 for a larger discussion.
+
+ http://tracker.ceph.com/issues/11998 Fixes: #11998
+
+ Signed-off-by: Loic Dachary <ldachary@redhat.com>
+
+commit e3d17e49731569ea92917f574d42d93258c77189
+Merge: cbba706 89aa8ff
+Author: Loic Dachary <loic@dachary.org>
+Date: Wed Jul 29 16:22:36 2015 +0200
+
+ Merge pull request #5248 from ceph/wip-11833-hammer
+
+ mon: add an "osd crush tree" command
+
+ Reviewed-by: Kefu Chai <kchai@redhat.com>
+
+commit cbba7064c6cc4cde3e8a49c25ce671e91d31b9c7
+Merge: 8355bda 3c8cdea
+Author: Loic Dachary <loic@dachary.org>
+Date: Wed Jul 29 10:49:08 2015 +0200
+
+ Merge pull request #5222 from ceph/hammer-12088
+
+ client: reference counting 'struct Fh'
+
+ Reviewed-by: John Spray <john.spray@redhat.com>
+
+commit 8355bdab56bc4e5ce4d20ba3486c082f06d8dcd1
+Merge: 52d0e5d ec70533
+Author: Orit Wasserman <owasserm@redhat.com>
+Date: Tue Jul 28 23:33:18 2015 +0200
+
+ Merge pull request #5231 from theanalyst/wip-12243-hammer
+
+ Civetweb RGW appears to report full size of object as downloaded when only partially downloaded
+
+commit 52d0e5da5ebad7fe42c2e469cea9773c7714c2b5
+Merge: 7fd31b1 03c07d7
+Author: Loic Dachary <loic@dachary.org>
+Date: Tue Jul 28 22:40:23 2015 +0200
+
+ Merge pull request #5243 from theanalyst/wip-12239-hammer
+
+ librbd/internal.cc: 1967: FAILED assert(watchers.size() == 1)
+
+ Reviewed-by: Josh Durgin <jdurgin@redhat.com>
+
+commit 7fd31b1b3c2c8e9dd3d9e5464775422215f7a4bc
+Merge: 7230de3 5c812c1
+Author: Loic Dachary <loic@dachary.org>
+Date: Tue Jul 28 22:40:03 2015 +0200
+
+ Merge pull request #5241 from theanalyst/wip-12238-hammer
+
+ [ FAILED ] TestLibRBD.ExclusiveLockTransition
+
+ Reviewed-by: Josh Durgin <jdurgin@redhat.com>
+
+commit 7230de317736a71a5764cf224bd1309da1c7b3c6
+Merge: 6b6228f 7132277
+Author: Loic Dachary <loic@dachary.org>
+Date: Tue Jul 28 22:30:23 2015 +0200
+
+ Merge pull request #5265 from SUSE/wip-12368-hammer
+
+ linking ceph to tcmalloc causes segfault on SUSE SLE11-SP3
+
+ Reviewed-by: Loic Dachary <ldachary@redhat.com>
+
+commit 6b6228f8949e975cac763513898ea9704cb8baf1
+Merge: d62c3ea f99f312
+Author: Loic Dachary <loic@dachary.org>
+Date: Tue Jul 28 22:27:40 2015 +0200
+
+ Merge pull request #5280 from ceph/wip-12384-hammer
+
+ librbd: add valgrind memory checks for unit tests
+
+ Reviewed-by: Loic Dachary <ldachary@redhat.com>
+
+commit d62c3ea344d9e49e9586867e872e8d5b3f019948
+Merge: 7b57ff8 b872882
+Author: Loic Dachary <loic@dachary.org>
+Date: Tue Jul 28 22:26:25 2015 +0200
+
+ Merge pull request #5279 from ceph/wip-12237-hammer
+
+ A client opening an image mid-resize can result in the object map being invalidated
+
+ Reviewed-by: Loic Dachary <ldachary@redhat.com>
+
+commit 7b57ff8a9ced6c2f22456ed034cc83d07f82fbb3
+Merge: 481728a f819332
+Author: Loic Dachary <loic@dachary.org>
+Date: Tue Jul 28 22:10:03 2015 +0200
+
+ Merge pull request #5283 from SUSE/wip-12397-hammer
+
+ ceph.spec.in: 95-ceph-osd.rules, mount.ceph, and mount.fuse.ceph not installed properly on SUSE
+
+ Reviewed-by: Loic Dachary <ldachary@redhat.com>
+
+commit 481728a04dd2c85096c3bc01cc37da9642b038ca
+Merge: 54bb924 d8733be
+Author: Loic Dachary <loic@dachary.org>
+Date: Tue Jul 28 21:54:33 2015 +0200
+
+ Merge pull request #5206 from SUSE/wip-11998-hammer
+
+ /usr/bin/ceph from ceph-common is broken without installing ceph
+
+ Reviewed-by: Loic Dachary <ldachary@redhat.com>
+
+commit 54bb924e68ae2b4df65576a5d788d593b9d9e722
+Merge: e099058 c5c627f
+Author: Loic Dachary <loic@dachary.org>
+Date: Tue Jul 28 21:47:29 2015 +0200
+
+ Merge pull request #5055 from SUSE/wip-12044-hammer
+
+ rgw/logrotate.conf calls service with wrong init script name
+
+ Reviewed-by: Loic Dachary <ldachary@redhat.com>
+
+commit e0990583298277f1c631f7c2d2260d6c3fa64c9f
+Merge: 8b93978 e149916
+Author: Loic Dachary <loic@dachary.org>
+Date: Tue Jul 28 21:46:11 2015 +0200
+
+ Merge pull request #5040 from SUSE/wip-11964-hammer
+
+ systemd: Increase max files open limit for OSD daemon
+
+ Reviewed-by: Loic Dachary <ldachary@redhat.com>
+
+commit 8b93978881375d063fe2df8f40406ea650dda766
+Merge: 5a7cab2 22f58ce
+Author: Loic Dachary <loic@dachary.org>
+Date: Tue Jul 28 21:45:44 2015 +0200
+
+ Merge pull request #5038 from SUSE/wip-11876-hammer
+
+ ceph-post-file fails on rhel7
+
+ Reviewed-by: Loic Dachary <ldachary@redhat.com>
+
+commit 5a7cab205bb1b3fdbf49a852cb978fc28eba8212
+Merge: 5218eff 38d36b1
+Author: Loic Dachary <loic@dachary.org>
+Date: Tue Jul 28 21:45:25 2015 +0200
+
+ Merge pull request #5030 from SUSE/wip-12092-hammer
+
+ packaging: add SuSEfirewall2 service files
+
+ Reviewed-by: Loic Dachary <ldachary@redhat.com>
+
+commit 5218eff07c303fb2762ea9f38b9a9c23c24efcae
+Merge: 0b54d50 8acfb99
+Author: Loic Dachary <loic@dachary.org>
+Date: Tue Jul 28 21:38:14 2015 +0200
+
+ Merge pull request #5028 from SUSE/wip-12090-hammer
+
+ rcceph script is buggy
+
+ Reviewed-by: Loic Dachary <ldachary@redhat.com>
+
+commit 0b54d50ecd1445dfc1a46552adb83b9dae9210d9
+Merge: 45beb86 37d77d3
+Author: Loic Dachary <loic@dachary.org>
+Date: Tue Jul 28 21:37:44 2015 +0200
+
+ Merge pull request #5026 from SUSE/wip-12087-hammer
+
+ max files open limit for OSD daemon is too low
+
+ Reviewed-by: Loic Dachary <ldachary@redhat.com>
+
+commit e19f928bd770a37f2f631c4cd796e2e30a494234
+Author: Yehuda Sadeh <yehuda@redhat.com>
+Date: Fri Jun 26 16:56:28 2015 -0700
+
+ rgw: conversion tool to fix broken multipart objects
+
+ Fixes: #12079
+
+ Broken multipart objects: multipart objects that created on 0.94.2
+ and that start with underscore have a bad locator on their tail objects.
+ This extends the tool that was needed for older issue we've had with
+ hammer multipart objects (that start with underscore). The same usage
+ applies:
+
+ $ radosgw-admin bucket check --check-head-obj-locator \
+ --bucket=<bucket> [--fix]
+
+ Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
+ (cherry picked from commit f02ca6107172cecd80a490df9f0d66204e62326c)
+
+commit 28d32f6090724d62b6168d64031454f44eb4cc88
+Author: Yehuda Sadeh <yehuda@redhat.com>
+Date: Fri Jun 26 13:49:55 2015 -0700
+
+ rgw: only scan for objects not in namespace
+
+ Fixes: #11984
+ The tool should only work on the head objects, and these are not inside
+ any namespace.
+
+ Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
+ (cherry picked from commit 8103908548bf7d6c9fa47fb181cd450670bae8d6)
+
+commit e22e2b43b4039a44f5f8fbbe59edc21fbe118bdc
+Author: Yehuda Sadeh <yehuda@redhat.com>
+Date: Wed Apr 22 16:04:35 2015 -0700
+
+ rgw_admin: add --remove-bad flag to bucket check
+
+ Add this flag so that the bad object will be removed (should be called
+ only after user has verified that objects content is correct).
+
+ Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
+ (cherry picked from commit 06d67d9139a95b704b80de527381fd1bbf7981ce)
+
+commit 154f18ce3e52094fe84b058565a865ed97b079d6 (refs/remotes/gh/wip-12465-hammer)
+Author: Samuel Just <sjust@redhat.com>
+Date: Fri Jul 24 15:38:18 2015 -0700
+
+ Log::reopen_log_file: take m_flush_mutex
+
+ Otherwise, _flush() might continue to write to m_fd after it's closed.
+ This might cause log data to go to a data object if the filestore then
+ reuses the fd during that time.
+
+ Fixes: #12465
+ Backport: firefly, hammer
+ Signed-off-by: Samuel Just <sjust@redhat.com>
+ (cherry picked from commit 8778ab3a1ced7fab07662248af0c773df759653d)
+
+commit b8728823493b9dfde0333fb41725002fc50e4d9b (refs/remotes/gh/wip-12237-hammer)
+Author: Jason Dillaman <dillaman@redhat.com>
+Date: Sun Jul 5 10:47:38 2015 -0400
+
+ librados_test_stub: read op should return number of bytes read
+
+ Signed-off-by: Jason Dillaman <dillaman@redhat.com>
+ (cherry picked from commit f8a7b507983e31399831e802e99429b95386ed41)
+
+commit 7d9fce3aa3832a1b8bd7f18abd4745dbc0033582
+Author: Jason Dillaman <dillaman@redhat.com>
+Date: Sun Jul 5 10:35:28 2015 -0400
+
+ tests: fixed TestObjectMap.InvalidateFlagInMemoryOnly
+
+ librados and librados_test_stub return different result codes
+ for a read full object operation.
+
+ Signed-off-by: Jason Dillaman <dillaman@redhat.com>
+ (cherry picked from commit 2ace2b77f8ed83e753fe4a48bcc997f5d1dd465f)
+
+commit 4a77be0a65c8b4ec3dc437721f8c321737b260de
+Author: Jason Dillaman <dillaman@redhat.com>
+Date: Sun Jul 5 11:09:09 2015 -0400
+
+ librbd: don't attempt to invalidate an object map in R/O mode
+
+ The ImageWatcher is not initialized when in R/O mode, which
+ resulted in a NULL pointer dereference.
+
+ Signed-off-by: Jason Dillaman <dillaman@redhat.com>
+ (cherry picked from commit 64d740f8fa10ba872e324ec2580a4d8c3f99a9ce)
+
+commit 0aea70f68b299441e692efdce6d5e7ff18b78c39
+Author: Jason Dillaman <dillaman@redhat.com>
+Date: Tue Jun 23 11:17:12 2015 -0400
+
+ tests: add new unit tests for object map invalidation
+
+ Signed-off-by: Jason Dillaman <dillaman@redhat.com>
+ (cherry picked from commit 0215e9753c09460f6fc84ded9397e36a209f2e32)
+
+commit c732cb889b4a61254d06703bf032082e56b196de
+Author: Jason Dillaman <dillaman@redhat.com>
+Date: Wed Mar 25 09:41:13 2015 -0400
+
+ librbd: move object map codes to common location
+
+ These codes will need to be accessible from cls_rbd and librbd.
+
+ Signed-off-by: Jason Dillaman <dillaman@redhat.com>
+ (cherry picked from commit 4ac584c34d576b489ed4c4862703b8fb427b3bc2)
+
+commit 27c99ea972a7b218ea591b208d0d1dd51eef6f95
+Author: Jason Dillaman <dillaman@redhat.com>
+Date: Tue Jun 23 11:14:51 2015 -0400
+
+ librbd: only update image flags when holding exclusive lock
+
+ It was possible for a client to open an image while another client
+ was shrinking an image. This would result in the former invalidating
+ the object map on-disk if it openned the image between updating the
+ image header and resizing the object map.
+
+ Fixes: #11791
+ Backport: hammer
+ Signed-off-by: Jason Dillaman <dillaman@redhat.com>
+ (cherry picked from commit eb81a6a7e391327ac993fd406443b206a7f7bffc)
+
+commit ef453630200ab72373f08357ca6b5ac5c5bbb397
+Author: Jason Dillaman <dillaman@redhat.com>
+Date: Fri Jul 17 12:43:46 2015 -0400
+
+ librbd: new ImageWatcher::is_lock_supported method
+
+ The new version does not attempt to acquire the snap_lock, to avoid
+ cases where a recursive lock would result.
+
+ Signed-off-by: Jason Dillaman <dillaman@redhat.com>
+
+commit e4b55b398e68e870a7cf21276e63da2c4c6e3faa
+Author: guce <guce@h3c.com>
+Date: Sat Jul 11 14:08:33 2015 +0800
+
+ Fixes: #12286 radosgw-admin: after subuser modify print only once user info.
+
+ remove rgw_admin.cc OPT_SUBUSER_MODIFY, show_user_info code block.
+
+ switch (opt_cmd) {
+ ...
+ case OPT_SUBUSER_MODIFY:
+ show_user_info(info, formatter); //show first time (remove this)
+ break;
+ ...
+ }
+
+ // output the result of a user operation
+ if (output_user_info) {
+ ...
+ show_user_info(info, formatter); //show second time
+ }
+
+ test fix:
+ before: after subuser modify print twice user info.
+ after changes, do the same procedure, print only once user info.
+
+ Signed-off-by: guce guce@h3c.com
+ (cherry picked from commit c604dd97fc179e5c2f640818c0f6e7cf99701947)
+
+commit 9458b845bf863ccf878873c4f0b089ddf84c7203
+Author: Henry Chang <henry@bigtera.com>
+Date: Wed Apr 22 18:26:45 2015 +0800
+
+ rgw: fix ListParts response
+
+ The response XML element name should be 'ListPartsResult'.
+
+ Fixes: #11494
+
+ Signed-off-by: Henry Chang <henry@bigtera.com>
+ (cherry picked from commit caa9f0e461f1eed526fc43ee74699a7243aef9b8)
+
+commit 2357b6c808f4f7c5997af48149585a6051c04b8f
+Author: Wido den Hollander <wido@42on.com>
+Date: Sat Jul 11 00:01:52 2015 +0200
+
+ rgw: If the client sends a Connection: close header respond accordingly.
+
+ HTTP/1.1 assumes Keep-Alive by default, but if a Connection: close header is send
+ the server should respond with it as well.
+
+ This makes the client close the connection after the request.
+
+ Fixes: #12298
+ (cherry picked from commit 79197d3711edc4b04a7ea4335b6e1b65754996d5)
+
+commit f819332e2826eae14849c5e68a380d1d87039d22
+Author: Nathan Cutler <ncutler@suse.com>
+Date: Thu Jul 9 21:38:46 2015 +0200
+
+ ceph.spec.in: install 95-ceph-osd.rules, mount.ceph, and mount.fuse.ceph properly on SUSE
+
+ http://tracker.ceph.com/issues/12261 Fixes: #12261
+
+ Signed-off-by: Nathan Cutler <ncutler@suse.com>
+ (cherry picked from commit 5ce38b9536efabf99a236c7a9d15c149fa4c16a6)
+
+commit d8733be2ef8874b9a858a7ffddfb81b9b656e9a6
+Author: Ken Dreyer <kdreyer@redhat.com>
+Date: Tue Apr 14 07:58:17 2015 -0600
+
+ debian: move ceph_argparse into ceph-common
+
+ Prior to this commit, if a user installed the "ceph-common" Debian
+ package without installing "ceph", then /usr/bin/ceph would crash
+ because it was missing the ceph_argparse library.
+
+ Ship the ceph_argparse library in "ceph-common" instead of "ceph". (This
+ was the intention of the original commit that moved argparse to "ceph",
+ 2a23eac54957e596d99985bb9e187a668251a9ec)
+
+ http://tracker.ceph.com/issues/11388 Refs: #11388
+
+ Reported-by: Jens Rosenboom <j.rosenboom@x-ion.de>
+ Signed-off-by: Ken Dreyer <kdreyer@redhat.com>
+ (cherry picked from commit 110608e5bdd9e2f03020ad41f0c2d756684d4417)
+
+ Conflicts:
+ debian/ceph.install
+ There is no ceph_daemon.py in hammer
+ debian/control
+ Depends/Replaces/Breaks version adapted (from 9.0.0 to 0.94.2)
+ also adapted ceph-dbg Replaces/Breaks
+
+commit f99f3125ff76628e2525dca00bb7b983f941a08b (refs/remotes/gh/wip-12384-hammer)
+Author: Zhiqiang Wang <zhiqiang.wang@intel.com>
+Date: Fri Mar 20 16:15:42 2015 +0800
+
+ test: potential memory leak in FlushAioPP
+
+ Should call the release function instead of deleting it to free
+ librbd::RBD::AioCompletion and librbd::AioCompletion. Otherwise there is
+ a potential memory leak.
+
+ Signed-off-by: Zhiqiang Wang <zhiqiang.wang@intel.com>
+ (cherry picked from commit ada7ec860cb7901c560c12a5af36dc7c23051b76)
+
+commit a4fc63af630e77586e3ba2f17df3b6be4a1e2055
+Author: Jason Dillaman <dillaman@redhat.com>
+Date: Tue Apr 28 15:25:49 2015 -0400
+
+ pybind: fix valgrind warning on rbd_get_parent_info call
+
+ Signed-off-by: Jason Dillaman <dillaman@redhat.com>
+ (cherry picked from commit 2586e3ba1e20603a87c833513e09dae9281beb4d)
+
+commit aa3eb28f6be62991bc790de5c19cb7b6e30fa189
+Author: Jason Dillaman <dillaman@redhat.com>
+Date: Tue Apr 28 11:12:00 2015 -0400
+
+ osdc: invalid read of freed memory
+
+ The bytes not in cache stat was potentially reading the bh length
+ from a deleted bufferhead.
+
+ Signed-off-by: Jason Dillaman <dillaman@redhat.com>
+ (cherry picked from commit 5ccc4422d6172376bd6f1be8d3a99c0a54eab807)
+
+commit 18ede754388372cf210d7db87fa46f3536cf0e44
+Author: Jason Dillaman <dillaman@redhat.com>
+Date: Tue Apr 28 10:56:15 2015 -0400
+
+ krbd: fix incorrect types in the krbd API
+
+ The C API functions were referencing the C++ CephContext
+ instead of the C rados_config_t. Additionally, the ceph
+ namespace was missing on the Formatter class.
+
+ Signed-off-by: Jason Dillaman <dillaman@redhat.com>
+ (cherry picked from commit 740fd275a60630e60b3bcf41637a2ca486885d9c)
+
+commit 488578c1d557ebec7e50d53e45ed46f42984f4f8
+Author: Jason Dillaman <dillaman@redhat.com>
+Date: Tue Apr 28 10:54:47 2015 -0400
+
+ fsx: cleanup crypto library at exit
+
+ Also made small tweaks so that it can be compiled under
+ a C++ compiler.
+
+ Signed-off-by: Jason Dillaman <dillaman@redhat.com>
+ (cherry picked from commit c44f8e7fbc19924a9453d8c032c624ebb6c0296f)
+
+commit 97ff6cb2f8fdd4d946eeab338ec225450e3ad8f3
+Author: Jason Dillaman <dillaman@redhat.com>
+Date: Fri Apr 24 14:29:59 2015 -0400
+
+ tests: add run-rbd-valgrind-unit-tests.sh
+
+ Signed-off-by: Jason Dillaman <dillaman@redhat.com>
+ (cherry picked from commit 5534faaa469b8a6a4c9687aad1a6723f3e859353)
+
+commit e690907cbb3b229f84f1e996d58636d00f823e8f
+Author: Jason Dillaman <dillaman@redhat.com>
+Date: Fri Apr 24 00:23:03 2015 -0400
+
+ valgrind: update valgrind suppressions for lttng-ust
+
+ Signed-off-by: Jason Dillaman <dillaman@redhat.com>
+ (cherry picked from commit 8d87bdf597aad3d6be47aedd216a673bd9093a24)
+
+commit fe013e0a813c5697e917da642143388de60e8528
+Author: Jason Dillaman <dillaman@redhat.com>
+Date: Fri Apr 24 00:21:15 2015 -0400
+
+ librbd: TaskFinisher should finish all queued tasks
+
+ The destructor wasn't waiting for all Finisher tasks
+ to complete before stopping the thread.
+
+ Signed-off-by: Jason Dillaman <dillaman@redhat.com>
+ (cherry picked from commit 8e20240e4155e2f0398e79f4c0095d2d6ba1d4cb)
+
+commit 43cd3ac923c9accfb81acf41f5bd12b8a05322c7
+Author: Jason Dillaman <dillaman@redhat.com>
+Date: Thu Apr 23 23:10:23 2015 -0400
+
+ tests: fix valgrind errors with librbd unit test
+
+ Signed-off-by: Jason Dillaman <dillaman@redhat.com>
+ (cherry picked from commit ed5472a10eb515e2a177a640c3f6ed929db9ee4f)
+
+commit 5d8d6a1a776f833847edc80d2a9b31ecb440ade5
+Author: Jason Dillaman <dillaman@redhat.com>
+Date: Thu Apr 23 23:09:45 2015 -0400
+
+ tests: librbd should release global data before exit
+
+ Signed-off-by: Jason Dillaman <dillaman@redhat.com>
+ (cherry picked from commit 6ab1bb5614a5d257a82cf8ea280eef5c90cf765b)
+
+commit 13f926e4e96d0b7178a9762bbbf589961dba47b7
+Author: Jason Dillaman <dillaman@redhat.com>
+Date: Thu Apr 23 23:08:51 2015 -0400
+
+ librados_test_stub: cleanup singleton memory allocation
+
+ Signed-off-by: Jason Dillaman <dillaman@redhat.com>
+ (cherry picked from commit 54c88255b74741d882b88f791497862635357634)
+
+commit 45beb86423c3bd74dbafd36c6822e71ad9680e17
+Merge: 5e399b0 582cf73
+Author: Loic Dachary <loic@dachary.org>
+Date: Fri Jul 17 19:48:05 2015 +0200
+
+ Merge pull request #5046 from ceph/wip-12109-hammer
+
+ librbd: new QA client upgrade tests
+
+ Reviewed-by: Loic Dachary <ldachary@redhat.com>
+
+commit 1063f5275d1031812d564a1bd8ada64bed561026
+Author: Samuel Just <sjust@redhat.com>
+Date: Wed May 20 12:08:15 2015 -0700
+
+ PG::find_best_info: ignore info.les for incomplete peer
+
+ See included update to doc/dev/osd_internals/last_epoch_started.rst
+
+ Fixes: 11687
+ Signed-off-by: Samuel Just <sjust@redhat.com>
+ (cherry picked from commit 371d9baa120dc0302e9e61d3bc0e309dfaa773a0)
+
+commit 5e399b035d7cf861cf66a8ead00b388c4857cbb6
+Merge: 706b1c7 ad5745b
+Author: Samuel Just <sam.just@inktank.com>
+Date: Thu Jul 16 14:58:49 2015 -0700
+
+ Merge pull request #5159 from theanalyst/wip-11701-hammer
+
+ make the all osd/filestore thread pool suicide timeouts separately configurable
+
+ Reviewed-by: Samuel Just <sjust@redhat.com>
+
+commit 713227791ab28c5e09073acb7b2c3c83ca0f0d6a
+Author: Thorsten Behrens <tbehrens@suse.com>
+Date: Mon Mar 16 00:13:38 2015 +0100
+
+ Conditional-compile against minimal tcmalloc.
+
+ Certain older systems (SLE11 in this case) do not provide the full
+ tcmalloc functionality, due to e.g. incomplete libunwind
+ pieces. Use --with-tcmalloc-minimal to enable the cut-down
+ version.
+
+ Here's how the various mem allocator switches interact now:
+
+ --with-jemalloc: overrides --with-tcmalloc & --with-tcmalloc-minimal
+ --with-tcmalloc-minimal: overrides --with-tcmalloc
+ --with-tcmalloc: the default. use --without-tcmalloc to disable
+
+ Signed-off-by: Thorsten Behrens <tbehrens@suse.com>
+ (cherry picked from commit c6f1c07113ca19547fdac10cd9b817a60142aee2)
+
+commit 706b1c7c5bcaaff96aa6950302b7aef097918d30
+Merge: daf5450 5e72479
+Author: Sage Weil <sage@redhat.com>
+Date: Thu Jul 16 11:04:52 2015 -0400
+
+ Merge pull request #5252 from ceph/wip-12021-hammer
+
+ OSDMonitor: allow addition of cache pool with non-empty snaps with co…
+
+ Reviewed-by: Sage Weil <sage@redhat.com>
+
+commit daf5450765684b0b2ed049320d7463b637321e5a
+Merge: d20f513 bd91fb0
+Author: Loic Dachary <loic@dachary.org>
+Date: Thu Jul 16 01:15:51 2015 +0200
+
+ Merge pull request #4891 from theanalyst/wip-11740-hammer
+
+ crush: take crashes due to invalid arg
+
+ Reviewed-by: Loic Dachary <ldachary@redhat.com>
+
+commit ad5745bfd768b52ae6a766391232becad8587641
+Author: Samuel Just <sjust@redhat.com>
+Date: Wed May 6 10:49:00 2015 -0700
+
+ OSD: add command_wq suicide timeout
+
+ Signed-off-by: Samuel Just <sjust@redhat.com>
+ (cherry picked from commit df4e5de819c30003cfbe50a071c49039cf534419)
+
+ Conflicts:
+ src/common/config_opts.h
+ Trivial merge conflict
+
+commit 059a579c02b312bbd32fa41485c361ae3847a3ba
+Author: Samuel Just <sjust@redhat.com>
+Date: Wed May 6 10:54:31 2015 -0700
+
+ OSD: add remove_wq suicide timeout
+
+ Signed-off-by: Samuel Just <sjust@redhat.com>
+ (cherry picked from commit f2fbfa32a16666be46359f0eab7b04ca80a753f5)
+
+commit b8826bc4e3da6fcb9338ad6c01af1a88e6585a4d
+Author: Samuel Just <sjust@redhat.com>
+Date: Wed May 6 10:52:40 2015 -0700
+
+ OSD: add scrub_wq suicide timeout
+
+ Signed-off-by: Samuel Just <sjust@redhat.com>
+ (cherry picked from commit 547a7041edc833f3cc8e04d388574809e30a8af6)
+
+commit 878dd403930a2058656a99c14b465358e134843c
+Author: Samuel Just <sjust@redhat.com>
+Date: Wed May 6 10:51:28 2015 -0700
+
+ OSD: add snap_trim_wq suicide timeout
+
+ Signed-off-by: Samuel Just <sjust@redhat.com>
+ (cherry picked from commit e1073a4a577211672148a4112bd633831552d66f)
+
+commit 11575832a37ea247a8febe912b3058f51a464ab6
+Author: Samuel Just <sjust@redhat.com>
+Date: Wed May 6 10:50:19 2015 -0700
+
+ OSD: add recovery_wq suicide timeout
+
+ Signed-off-by: Samuel Just <sjust@redhat.com>
+ (cherry picked from commit 85311b656852af75bfbbc6699f92fc6aa233c316)
+
+ Conflicts: src/common/config_opts.h
+
+ There was a merge conflict due to introduction of `osd_recovery_sleep`
+ which was introduced in #3829
+
+commit a82b4505848c09ad0094768c886f2015bdaa1148
+Author: Samuel Just <sjust@redhat.com>
+Date: Wed May 6 11:02:19 2015 -0700
+
+ OSD: add op_wq suicide timeout
+
+ Signed-off-by: Samuel Just <sjust@redhat.com>
+
+commit 89aa8ff9855ae868d59bd10fe3a3aab8517e90fc
+Author: Kefu Chai <kchai@redhat.com>
+Date: Tue Jun 2 23:52:22 2015 +0800
+
+ mon: add an "osd crush tree" command
+
+ * to print crush buckets/items in a tree
+
+ Fixes: #11833
+ Signed-off-by: Kefu Chai <kchai@redhat.com>
+ (cherry picked from commit 5436c290f3622feb8d4b279ed6552b2510e0cee9)
+
+ Conflicts:
+ src/test/mon/osd-crush.sh:
+ do not start mon as run() takes care of it already
+
+commit d20f513d9b185eff82bee2ca719b5453358e740b
+Merge: 8753b2b 3d74164
+Author: Loic Dachary <loic@dachary.org>
+Date: Tue Jul 14 20:43:02 2015 +0200
+
+ Merge pull request #4899 from theanalyst/wip-11911-hammer
+
+ start_flush: filter out removed snaps before determining snapc's
+
+ Reviewed-by: Samuel Just <sjust@redhat.com>
+
+commit 8753b2b14536c34a7b6dec927c7a5b8100de7f68
+Merge: 3d72652 ecac1a4
+Author: Loic Dachary <loic@dachary.org>
+Date: Tue Jul 14 20:42:45 2015 +0200
+
+ Merge pull request #4868 from SUSE/wip-11879-hammer
+
+ Clock skew causes missing summary and confuses Calamari
+
+ Reviewed-by: Samuel Just <sjust@redhat.com>
+
+commit 3d72652d7ba6b2fff3d39ea7965c3c61d5fa0a04
+Merge: 9a79e8e fdb43eb
+Author: Loic Dachary <loic@dachary.org>
+Date: Tue Jul 14 16:42:12 2015 +0200
+
+ Merge pull request #4883 from SUSE/wip-11638-hammer
+
+ ceph.spec.in: ceph-common subpackage def needs tweaking for SUSE/openSUSE
+
+ Reviewed-by: Ken Dreyer <kdreyer@redhat.com>
+
+commit 03c07d76ac8361ddd302f5bc0575aee7fb5edc99
+Author: Jason Dillaman <dillaman@redhat.com>
+Date: Fri Jun 26 09:59:36 2015 -0400
+
+ librbd: assertion failure race condition if watch disconnected
+
+ It's possible for librbd's watch of the header object to be reset by
+ connection issues just prior to the image being removed. This will
+ causes an assertion failure which assumes at least one watcher on the
+ image.
+
+ Fixes: #12176
+ Backport: hammer, firefly
+ Signed-off-by: Jason Dillaman <dillaman@redhat.com>
+ (cherry picked from commit af276de4f299960e43761904c043924cec5fef11)
+
+commit 5c812c1552d954f2c91c000332ddc74c9e91825a
+Author: Jason Dillaman <dillaman@redhat.com>
+Date: Thu Jun 25 16:51:31 2015 -0400
+
+ librbd: prevent object map updates from being interrupted
+
+ Object map updates were being canceled in-flight when the exclusive lock
+ is released. This resulted in an ERESTART error code bubbling up to
+ AioRequest.
+
+ Fixes: 12165
+ Backport: hammer
+ Signed-off-by: Jason Dillaman <dillaman@redhat.com>
+ (cherry picked from commit 590cdc90edaf4f4ff06c97eb2f43b92ab9b60084)
+
+ Conflicts:
+ src/librbd/ObjectMap.h
+ conflict due to a variable `m_snap_id' which was introduced in PR #4140
+ which is dropped as we are not backporting that feature
+
+commit e50caab2251bb68fea1adbd17acc43aa98ab1206
+Author: wuxingyi <wuxingyi@letv.com>
+Date: Tue Jun 23 01:46:48 2015 +0000
+
+ rgw: fix empty json response when getting user quota
+
+ Fixes: #12117
+ Signed-off-by: wuxingyi <wuxingyi@letv.com>
+ (cherry picked from commit 64fceed2202c94edf28b8315fe14c9affa8c0116)
+
+commit ec705336551436517c16bffdc6bf5467899ae4bb
+Author: Yehuda Sadeh <yehuda@redhat.com>
+Date: Thu Jun 25 14:31:03 2015 -0700
+
+ rgw: error out if frontend did not send all data
+
+ Fixes: #11851
+ The civetweb mg_write() doesn't return error when it can't flush all data
+ to the user, it just sends the total number of bytes written. Modified the
+ client io to return total number of bytes and return an error if didn't
+ send anything.
+
+ Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
+ (cherry picked from commit daa679c3dd3770a6d5421e2cc9a36924f4550439)
+
+commit 557865c85bb907fe69248c4f1acb88320a7c1bb5
+Author: Yehuda Sadeh <yehuda@redhat.com>
+Date: Wed Jun 17 15:11:28 2015 -0700
+
+ rgw: fix reset_loc()
+
+ Fixes: #11974
+
+ Only need to set locator for underscore if namespace is empty
+
+ Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
+ (cherry picked from commit d3bd27f4855df6bb207b656527138026af1a36a2)
+
+commit b1618a97fef644dc3dced502d600de6a5d55d085
+Author: Radoslaw Zarzynski <rzarzynski@mirantis.com>
+Date: Mon Apr 20 14:55:00 2015 +0200
+
+ rgw: fix lack of account name in XML listing of Swift account.
+
+ Fixes: #11431
+ Backport: hammer
+ Signed-off-by: Radoslaw Zarzynski <rzarzynski@mirantis.com>
+ (cherry picked from commit 837388bbc39a1bf9019302c3a4d3a3fe22caeeb4)
+
+commit e39dce7935dd513b77ce34bc79d70a2c23437cbb
+Author: Radoslaw Zarzynski <rzarzynski@mirantis.com>
+Date: Wed Feb 18 15:48:43 2015 +0100
+
+ rgw: generate the "Date" HTTP header for civetweb.
+
+ Fixes: #10873
+ Backport: hammer
+ Signed-off-by: Radoslaw Zarzynski <rzarzynski@mirantis.com>
+ (cherry picked from commit ea384f83b601f60e135c3d3f960fdb75a919dd84)
+
+commit a5dbcbbdddce6cdeccb1e6f5641601d673cd1896
+Author: Hervé Rousseau <hroussea@cern.ch>
+Date: Mon Apr 27 17:54:30 2015 +0200
+
+ Swift: Set Content-Length when requesting/checking Keystone tokens
+
+ Running Keystone with WSGIChunkedRequest=On is not supported.
+
+ We have to make sure that we set the Content-Length header when getting
+ an admin token and checking revoked tokens, otherwise Keystone returns
+ a HTTP 411 error.
+
+ Same applies when checking revoked tickets.
+
+ Fixes: #11473
+ Backport: Hammer, Firefly
+ Signed-off-by: Hervé Rousseau <hroussea@cern.ch>
+ (cherry picked from commit 24f477417fdac9d68902fa211c8edf92a2e8729f)
+
+commit 3c8cdeacf46ae4031189d2ef6948aa3b6ab4ae43
+Author: Yan, Zheng <zyan@redhat.com>
+Date: Wed Jul 8 10:11:43 2015 +0800
+
+ client: reference counting 'struct Fh'
+
+ The async readahead finisher needs to reference 'struct Fh'. But
+ it's possible user closes FD and free the corresponding 'struct Fh'
+ before async readahead finishes.
+
+ Fixes: #12088
+ Signed-off-by: Yan, Zheng <zyan@redhat.com>
+ (cherry picked from commit 34b939a81d38173b882c429b28dedce778504ba8)
+
+commit c78cc00afb6deb8022db60dbe8649335f61bd345
+Author: Radoslaw Zarzynski <rzarzynski@mirantis.com>
+Date: Thu Mar 19 14:52:18 2015 +0100
+
+ rgw: rectify 202 Accepted in response for PUT on existing bucket.
+
+ Fixes: #11148
+ Backport: hammer
+ Signed-off-by: Radoslaw Zarzynski <rzarzynski@mirantis.com>
+ (cherry picked from commit 3998fe7e02a6c25a3302c80a9c9907357fd3a23e)
+
+commit 9a79e8e7da5f34f1adaf6137e01bcd42766ae677
+Merge: 5527720 7f1c0cc
+Author: Kefu Chai <tchaikov@gmail.com>
+Date: Sun Jul 12 02:19:57 2015 +0800
+
+ Merge pull request #5208 from tchaikov/wip-11975-hammer
+
+ tests: TEST_crush_reject_empty must not run a mon
+
+ Reviewed-by: Loic Dachary <ldachary@redhat.com>
+
+commit 7f1c0cc9cd3deab925440b56d82c3e61a8ba5ab1
+Author: Kefu Chai <kchai@redhat.com>
+Date: Sat Jul 11 23:04:33 2015 +0800
+
+ crush/CrushTester: return EINVAL if crushtool returns non-zero
+
+ this backports a tiny part of ec02441, otherwise
+ CrushTester will return 1, and "ceph" cli will take it
+ as EPERM, which is miss leading, and fails
+ osd-crush.sh:TEST_crush_reject_empty.
+
+ Signed-off-by: Kefu Chai <kchai@redhat.com>
+
+commit 2aaeea145b24b972a0b98549c3527ccf98f4c96f
+Author: Loic Dachary <ldachary@redhat.com>
+Date: Fri Jul 10 16:23:47 2015 +0200
+
+ tests: TEST_crush_reject_empty must not run a mon
+
+ * Back in Hammer, the osd-crush.sh individual tests did not run the
+ monitor, it was taken care of by the run() function. An attempt to run
+ another mon fails with:
+
+ error: IO lock testdir/osd-crush/a/store.db/LOCK: Resource temporarily
+ unavailable
+
+ This problem was introduced by cc1cc033930e8690a57674e842a003f6bbc7a242
+ from https://github.com/ceph/ceph/pull/4936
+ * replace test/mon/mon-test-helpers.sh with test/ceph-helpers.sh as
+ we need run_osd() in this newly added test
+ * update the run-dir of commands: ceph-helpers.sh use the different
+ convention for the run-dir of daemons.
+
+ http://tracker.ceph.com/issues/11975 Refs: #11975
+
+ Signed-off-by: Loic Dachary <ldachary@redhat.com>
+
+commit 80afb81124a0d2ef25a23a12c86617ab1da3a4bd
+Author: Loic Dachary <ldachary@redhat.com>
+Date: Tue Apr 21 16:11:33 2015 +0200
+
+ ceph-helpers: implement test_expect_failure
+
+ To display the output in case the command did not fail with the expected
+ output.
+
+ Signed-off-by: Loic Dachary <ldachary@redhat.com>
+ (cherry picked from commit 5871781b10ff0b26c731b70d1898c474006cbee3)
+
+commit 6b5e9a1df7dfb3a971e40aec35119ec019515b69
+Author: Loic Dachary <ldachary@redhat.com>
+Date: Wed Jun 10 23:16:01 2015 +0200
+
+ tests: display the output of failed make check runs
+
+ After a make check fails, it shows a summary but not the output of the
+ failed tests although they contain information to diagnose the problem.
+
+ Set the VERBOSE=true automake variable which is documented to collect
+ and display the failed script output at the end of a run (the content of
+ the test-suite.log file (valid from automake-1.11 up).
+
+ http://www.gnu.org/software/automake/manual/automake.html#index-VERBOSE
+
+ Also remove the run-make-check.sh that did the same in a way that is not
+ compatible with automake-1.11.
+
+ Signed-off-by: Loic Dachary <ldachary@redhat.com>
+ (cherry picked from commit 3a55cb029bb7db9542d2b14f2deda90feb0ae0f6)
+
+commit 552772025cb8d5f51ffb3a069d1bd93bc73f1123
+Merge: f4d77c2 1440122
+Author: Loic Dachary <loic@dachary.org>
+Date: Fri Jul 10 10:17:24 2015 +0200
+
+ Merge pull request #4889 from theanalyst/wip-11484-hammer
+
+ OPT_INT option interprets 3221225472 as -1073741824, and crashes in Throttle::Throttle()
+
+ Reviewed-by: Kefu Chai <kchai@redhat.com>
+
+commit f4d77c22aa51edb45211e080f3fdf28a7a0cfdd4
+Merge: 5088105 a62c3aa
+Author: Loic Dachary <loic@dachary.org>
+Date: Fri Jul 10 10:16:25 2015 +0200
+
+ Merge pull request #4776 from tchaikov/wip-11279-hammer
+
+ ceph: cli interactive mode does not understand quotes
+
+ Reviewed-by: Kefu Chai <kchai@redhat.com>
+
+commit 5088105300c013b1b804c938a30ac63ba710556d
+Merge: e3b1f7b 0b6d442
+Author: Loic Dachary <loic@dachary.org>
+Date: Fri Jul 10 10:14:42 2015 +0200
+
+ Merge pull request #4657 from ceph/wip-hammer-11535-admin-socket
+
+ common/admin_socket: close socket descriptor in destructor
+
+ Reviewed-by: Loic Dachary <ldachary@redhat.com>
+
+commit e3b1f7be9e8474fbec98076790ff683bccd44ce9
+Merge: dd29a86 558d639
+Author: Kefu Chai <tchaikov@gmail.com>
+Date: Fri Jul 10 16:07:48 2015 +0800
+
+ Merge pull request #4687 from SUSE/wip-7387-hammer
+
+ utf8 and old gcc breakage on RHEL6.5
+
+ Reviewed-by: Kefu Chai <kchai@redhat.com>
+
+commit dd29a869db5503fc9e2c6d1d44ee4311d95af20c
+Merge: 7f1fb57 0e5e7e1
+Author: Kefu Chai <tchaikov@gmail.com>
+Date: Fri Jul 10 16:00:00 2015 +0800
+
+ Merge pull request #5122 from theanalyst/wip-11982-hammer
+
+ ceph fails to compile with boost 1.58
+
+ Reviewed-by: Kefu Chai <kchai@redhat.com>
+
+commit 7f1fb574608800c3e6aa12df6c7888acbf397a52
+Merge: adc7016 5141301
+Author: Kefu Chai <tchaikov@gmail.com>
+Date: Fri Jul 10 15:59:35 2015 +0800
+
+ Merge pull request #4936 from ceph/wip-11975-hammer
+
+ mon crashes when "ceph osd tree 85 --format json"
+
+ Reviewed-by: Kefu Chai <kchai@redhat.com>
+
+commit adc70161d14fc2b51e6c6f38580f76ff0067717a
+Merge: 2d68db8 82988d6
+Author: Loic Dachary <loic@dachary.org>
+Date: Fri Jul 10 09:48:44 2015 +0200
+
+ Merge pull request #4892 from theanalyst/wip-11760-hammer
+
+ ceph-disk: get_partition_type fails on /dev/cciss...
+
+ Reviewed-by: Loic Dachary <ldachary@redhat.com>
+
+commit 2d68db8371263645642cf28473deea4456ca7021
+Merge: 1cffe8c ba1a016
+Author: Loic Dachary <loic@dachary.org>
+Date: Fri Jul 10 09:43:57 2015 +0200
+
+ Merge pull request #4877 from SUSE/wip-11902-hammer
+
+ admin/build-doc: script fails silently under certain circumstances
+
+ Reviewed-by: Loic Dachary <ldachary@redhat.com>
+
+commit 51413011417b76f5ad2830d9f93fbfe78c77e467
+Author: Kefu Chai <kchai@redhat.com>
+Date: Tue May 26 18:11:59 2015 +0800
+
+ mon: add "--check" to CrushTester::test_with_crushtool()
+
+ so we don't need to call CrushTester::check_name_maps() in OSDMonitor.cc
+ anymore.
+
+ Fixes: #11680
+ Signed-off-by: Kefu Chai <kchai@redhat.com>
+ (cherry picked from commit c6e634875316cf17368d497e6dc4f6f4b5dd65d2)
+
+commit 5ec27cf589b4535f07e28a86bd304f7a46427ac4
+Author: Kefu Chai <kchai@redhat.com>
+Date: Tue May 26 17:51:50 2015 +0800
+
+ crushtool: rename "--check-names" to "--check"
+
+ * because "--check" also checks for the max_id
+
+ Note: edited since we do not have the fix introduced in 46103b2 in
+ hammer.
+
+ Signed-off-by: Kefu Chai <kchai@redhat.com>
+ (cherry picked from commit 9381d53acdce85fcbff828926b911e050ba36e51)
+
+commit 2a8fe8862a15342cc5716c146487d0b42af0fbf6
+Author: Kefu Chai <kchai@redhat.com>
+Date: Tue May 26 16:58:23 2015 +0800
+
+ mon: check the new crush map against osdmap.max_osd
+
+ Fixes: #11680
+ Signed-off-by: Kefu Chai <kchai@redhat.com>
+ (cherry picked from commit 22e6bd6e01d5df3f3e897562597e22ca1737f8c8)
+
+commit c0b0f52ddbd4e22998a36addfb32f27614183e19
+Author: Kefu Chai <kchai@redhat.com>
+Date: Tue May 26 15:35:10 2015 +0800
+
+ crushtool: enable check against max_id
+
+ add an argument "max_id" for "--check-names" to check if any item
+ has an id greater or equal to given "max_id" in crush map.
+
+ Note: edited since we do not have the fix introduced in 46103b2 in
+ hammer.
+
+ Signed-off-by: Kefu Chai <kchai@redhat.com>
+ (cherry picked from commit d0658dd3cdf072b2a7c2a1986f8785a697c591ee)
+
+commit f041bbebf98a2aff2ad542e8d0c12c46af427573
+Author: Kefu Chai <kchai@redhat.com>
+Date: Tue May 26 15:34:33 2015 +0800
+
+ crush/CrushTester: check if any item id is too large
+
+ Signed-off-by: Kefu Chai <kchai@redhat.com>
+ (cherry picked from commit e640d89240017956b8c7411babb86be0f1e2b172)
+
+commit cc1cc033930e8690a57674e842a003f6bbc7a242
+Author: Kefu Chai <kchai@redhat.com>
+Date: Mon May 25 20:14:32 2015 +0800
+
+ mon: validate new crush for unknown names
+
+ * the "osd tree dump" command enumerates all buckets/osds found in either the
+ crush map or the osd map. but the newly set crushmap is not validated for
+ the dangling references, so we need to check to see if any item in new crush
+ map is referencing unknown type/name when a new crush map is sent to
+ monitor, reject it if any.
+
+ Fixes: #11680
+ Signed-off-by: Kefu Chai <kchai@redhat.com>
+ (cherry picked from commit a955f36a509e5412b1f72632a1a956d99e768e35)
+
+commit ff29a7f9dd21505c681881e609183aed9ac3250e
+Author: Kefu Chai <kchai@redhat.com>
+Date: Tue May 26 12:08:36 2015 +0800
+
+ crushtool: add the "--check-names" option
+
+ * so one is able to verify that the "ceph osd tree" won't chock on the
+ new crush map because of dangling name/type references
+
+ Signed-off-by: Kefu Chai <kchai@redhat.com>
+ (cherry picked from commit d6b46d4c7b722945ce24ac2930381a109b1e3dda)
+
+commit 960ea49699f421ceb89c9e0c9430378a35f09a9a
+Author: Kefu Chai <kchai@redhat.com>
+Date: Tue May 26 12:08:09 2015 +0800
+
+ crush/CrushTester: add check_name_maps() method
+
+ * check for dangling bucket name or type names referenced by the
+ buckets/items in the crush map.
+ * also check for the references from Item(0, 0, 0) which does not
+ necessarily exist in the crush map under testing. the rationale
+ behind this is: the "ceph osd tree" will also print stray OSDs
+ whose id is greater or equal to 0. so it would be useful to
+ check if the crush map offers the type name indexed by "0"
+ (the name of OSDs is always "OSD.{id}", so we don't need to
+ look up the name of an OSD item in the crushmap).
+
+ Signed-off-by: Kefu Chai <kchai@redhat.com>
+ (cherry picked from commit b75384d73958faf81d45847a7dfa56f4fa347e6f)
+
+commit 1cffe8c46a39142ee0da4e2279eda7276df262e1
+Merge: 6ffb1c4 ef6641c
+Author: Loic Dachary <loic@dachary.org>
+Date: Fri Jul 10 09:39:15 2015 +0200
+
+ Merge pull request #4667 from SUSE/wip-11611-hammer
+
+ ceph.spec: update OpenSUSE BuildRequires
+
+ Reviewed-by: Loic Dachary <ldachary@redhat.com>
+
+commit 5e72479b0882ac13597d7a613698e583dcb2b932
+Author: Samuel Just <sjust@redhat.com>
+Date: Tue Jul 7 11:43:01 2015 -0700
+
+ OSDMonitor: allow addition of cache pool with non-empty snaps with config
+
+ We need to be able to allow the version of ceph_test_* from earlier
+ versions of ceph to continue to work. This patch also adjusts the
+ work unit to use a single rados snap to test the condition without
+ --force-nonempty to ensure that we don't need to be careful about
+ the config value when running that script.
+
+ Signed-off-by: Samuel Just <sjust@redhat.com>
+
+commit 6ffb1c4ae43bcde9f5fde40dd97959399135ed86
+Merge: c7ebf96 524f4a5
+Author: Gregory Farnum <greg@gregs42.com>
+Date: Wed Jul 8 16:52:12 2015 +0100
+
+ Merge pull request #5123 from theanalyst/wip-11979-hammer
+
+ MDSMonitor: handle MDSBeacon messages properly
+
+ Reviewed-by: Kefu Chai <kchai@redhat.com>
+
+commit ecac1a458bc7331ed8d667f20ba31995d74892d3
+Author: Thorsten Behrens <tbehrens@suse.com>
+Date: Fri Feb 6 01:26:40 2015 +0100
+
+ Always provide summary for non-healthy cluster
+
+ This fixes a problem, wherein calamari does not provide
+ popup drill-downs for warnings or errors, should the summary
+ be missing.
+
+ Calamari gets health info from /api/v1/cluster/$FSID/health.
+ If the data here has a summary field, this summary is provided
+ in a popup window:
+
+ /api/v1/cluster/$FSID/health is populated (ultimately) with
+ status obtained via librados python bindings from the ceph
+ cluster. In the case where there's clock skew, the summary
+ field supplied by the ceph cluster is empty.
+
+ No summary field, no popup window with more health details.
+
+ Signed-off-by: Thorsten Behrens <tbehrens@suse.com>
+ (cherry picked from commit eaf6e0cf48488fe604d0ef0db164d44948d4e8d4)
+
+commit c7ebf96a9a4a6143b112c8606d5ee346fb800cec
+Merge: b163728 1a321e4
+Author: Loic Dachary <loic@dachary.org>
+Date: Wed Jul 8 15:36:38 2015 +0200
+
+ Merge pull request #4862 from SUSE/wip-11874-hammer
+
+ Bucket header is enclosed by quotes
+
+ Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
+
+commit b1637289ec4ff99d923457577893b4c4a8d2e9fe
+Merge: e33af22 54f4e7d
+Author: Loic Dachary <loic@dachary.org>
+Date: Wed Jul 8 15:35:53 2015 +0200
+
+ Merge pull request #4885 from theanalyst/wip-11755-hammer
+
+ Object copy bug
+
+ Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
+
+commit e33af22dec32467f229ca2dc1dc9668702a44ce8
+Merge: 5696b0f 9dfef60
+Author: Loic Dachary <loic@dachary.org>
+Date: Wed Jul 8 15:34:45 2015 +0200
+
+ Merge pull request #4884 from theanalyst/wip-11722-hammer
+
+ Keystone PKI token expiration is not enforced
+
+ Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
+
+commit 5696b0ff2a981ae8afe72df796ba7d7da47bb7d1
+Merge: 72ecd52 ed5442b
+Author: Loic Dachary <loic@dachary.org>
+Date: Wed Jul 8 15:30:48 2015 +0200
+
+ Merge pull request #4875 from ceph/wip-11770-hammer
+
+ librbd: aio calls may block
+
+ Reviewed-by: Jason Dillaman <dillaman@redhat.com>
+ Reviewed-by: Loic Dachary <ldachary@redhat.com>
+
+commit 1a32379dd6cb56ed69b8f448d3612506c8131fbe
+Author: Kefu Chai <kchai@redhat.com>
+Date: Mon May 11 19:30:30 2015 +0800
+
+ mon/PGMap: add more constness
+
+ Signed-off-by: Kefu Chai <kchai@redhat.com>
+ (cherry picked from commit e1f1c56ce88ef3ad05e881d650fac637931ce3fe)
+
+commit 84ebc3d320bdf871ccf85e555951cea421b56021
+Author: Kefu Chai <kchai@redhat.com>
+Date: Mon May 11 19:29:13 2015 +0800
+
+ mon/PGMap: sort pg states by the states in "pg ls" spec
+
+ Signed-off-by: Kefu Chai <kchai@redhat.com>
+ (cherry picked from commit 990dfb6cd45438bc8293ac37882daa413860a2f8)
+
+commit e310461aecc667cf26806bc5a3bbabb05696bdfc
+Author: Kefu Chai <kchai@redhat.com>
+Date: Mon May 11 17:02:41 2015 +0800
+
+ mon: s/recovery/recoverying/ in "pg ls*" commands' spec
+
+ * also translate "repair" if specified as "states"
+ * update test_mon_pg in cephtool-test-mon.sh
+
+ Fixes: #11569
+ Signed-off-by: Kefu Chai <kchai@redhat.com>
+ (cherry picked from commit 89f89ca3477eddcae11a05fbd58a8f3658eb1fc1)
+
+commit 524f4a52d115ecda8cd7793d0f8bea148eff92af
+Author: Kefu Chai <kchai@redhat.com>
+Date: Fri May 15 22:50:36 2015 +0800
+
+ mon: always reply mdsbeacon
+
+ the MDS (Beacon) is always expecting the reply for the mdsbeacon messages from
+ the lead mon, and it uses the delay as a metric for the laggy-ness of the
+ Beacon. when it comes to the MDSMonitor on a peon, it will remove the route
+ session at seeing a reply (route message) from leader, so a reply to
+ mdsbeacon will stop the peon from resending the mdsbeacon request to the
+ leader.
+
+ if the MDSMonitor re-forwards the unreplied requests after they are
+ outdated, there are chances that the requests reflecting old and even wrong
+ state of the MDSs mislead the lead monitor. for example, the MDSs which sent
+ the outdated messages could be dead.
+
+ Fixes: #11590
+ Signed-off-by: Kefu Chai <kchai@redhat.com>
+ (cherry picked from commit b3555e9c328633c9e1fbc27d652c004b30535e5b)
+
+commit 413e407dea446bebb9c36abb3025ada450dd4fe9
+Author: Kefu Chai <kchai@redhat.com>
+Date: Tue Jun 2 23:20:21 2015 -0700
+
+ mon/MDSMonitor: rename labels to a better name
+
+ * s/ignore/reply/
+ * s/out/ignore/
+
+ Signed-off-by: Kefu Chai <kchai@redhat.com>
+ (cherry picked from commit f00ecb8b3df73ce6337985bc6d43bce5143ee537)
+
+commit a03968ad584a3ff8e351cc5dce053e535fcdc454
+Author: Kefu Chai <kchai@redhat.com>
+Date: Tue Jun 2 12:55:06 2015 +0800
+
+ mon: send no_reply() to peon to drop ignored mdsbeacon
+
+ so the peon can remove the ignored mdsbeacon request from the
+ routed_requets at seeing this reply, and hence no longer resend the
+ request.
+
+ Fixes: #11590
+ Signed-off-by: Kefu Chai <kchai@redhat.com>
+ (cherry picked from commit 72a37b3a8e145d8522ea67fc14ce2c5510b6852b)
+
+commit 39f34596b0ec6f769f507e2b372204f8551f7ee0
+Author: Kefu Chai <kchai@redhat.com>
+Date: Tue Jun 2 12:22:26 2015 +0800
+
+ mon: remove unnecessary error handling
+
+ msg.get_session() should always return a non-zero pointer in
+ Monitor.dispatch()
+
+ Signed-off-by: Kefu Chai <kchai@redhat.com>
+ (cherry picked from commit 16e8e2cc82a90c49cd8aa3d0e3acc4694ba659a0)
+
+commit 0e5e7e1d259579571c1fc05660f6af8e295e733b
+Author: Kefu Chai <kchai@redhat.com>
+Date: Fri May 8 15:21:20 2015 +0800
+
+ mon: remove unused variable
+
+ * as a side effect, this change silences
+ http://tracker.ceph.com/issues/11576
+
+ Fixes: #11576
+ Signed-off-by: Kefu Chai <kchai@redhat.com>
+ (cherry picked from commit e7b196a4a091c0ea258866559ba06e7ed0cc4247)
+
+commit 70347209260688f1a067354c744569499adb6920
+Author: Samuel Just <sjust@redhat.com>
+Date: Wed Apr 1 16:37:51 2015 -0700
+
+ ReplicatedPG::finish_promote: handle results->snaps is empty case
+
+ If results->snaps winds up empty after filtering removed snaps,
+ we need to treat the object as if we had gotten an ENOENT.
+
+ PartialFix: #11296
+ Backport: firefly, hammer
+ Signed-off-by: Samuel Just <sjust@redhat.com>
+ (cherry picked from commit 6150757dbe0fa11cceb14460865b859a7c8164c7)
+
+commit 3e44dc16ed3fbda053996e44826aa3d90042a234
+Author: Samuel Just <sjust@redhat.com>
+Date: Wed Apr 1 16:25:22 2015 -0700
+
+ ReplicatedPG::finish_promote: fix snap promote head snaps
+
+ If the snaps vector is: 10=[9,5,2]:[4]+head, the backing pool's snaps
+ vector is 3=[2]:[]+head, and we request clone 4 from the backing pool,
+ the backing pool will send us head with an empty results->snaps vector.
+ Actually, clone 4 should be trimmed, but the cache pool does not know
+ that. Thus, we should construct an empty snaps vector for that clone.
+
+ PartialFix: #11296
+ Backport: firefly, hammer
+ Signed-off-by: Samuel Just <sjust@redhat.com>
+ (cherry picked from commit a45a698372def1623323470c6a1c4eb70e0bb79f)
+
+commit 5ef08466abf1b3934fcad0a0ca46f3a4380d6dbd
+Author: John Spray <john.spray@redhat.com>
+Date: Wed Jun 3 10:04:26 2015 +0100
+
+ tools: chunk reads in Dumper
+
+ Previously tried to read entire journal
+ into memory in one go, which was problematic
+ for large journals.
+
+ Fixes: #11746
+ Signed-off-by: John Spray <john.spray@redhat.com>
+ (cherry picked from commit e3ddcb894ad09326698999d42de0ce3feb69f28e)
+
+commit 408880bed296e5cbf05864fa6744a5b00a245272
+Author: Greg Farnum <gfarnum@redhat.com>
+Date: Tue Jun 16 08:13:41 2015 -0700
+
+ qa: update to newer Linux tarball
+
+ This should make newer gcc releases happier in their default configuration.
+ kernel.org is now distributing tarballs as .xz files so we change to that
+ as well when decompressing (it is supported by Ubuntu Precise so we should
+ be all good).
+
+ Fixes: #11758
+
+ Signed-off-by: Greg Farnum <gfarnum@redhat.com>
+ (cherry picked from commit 1ea3f47ab806d48ca7b045c2731d344eae3900e1)
+
+commit 56c2688b87d7d78831f8e147fc67cc0651ab644c
+Author: Yehuda Sadeh <yehuda@redhat.com>
+Date: Fri Apr 24 14:45:40 2015 -0700
+
+ rgw: simplify content length handling
+
+ Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
+ (cherry picked from commit e97fd5052cab83c5f699531a8c960b93437a8f9f)
+
+commit d9bbef3e470c6406bb65dc40e7e9c08c5d599f73
+Author: Robin H. Johnson <robbat2@gentoo.org>
+Date: Fri Apr 24 10:49:16 2015 -0700
+
+ rgw: make compatability deconfliction optional.
+
+ Per request from Yehuda, the deconfliction for having both
+ HTTP_CONTENT_LENGTH and CONTENT_LENGTH set is now optional, and
+ controlled by new configuration boolean, which defaults to false.
+ rgw content length compat
+
+ X-URL: https://github.com/ceph/ceph/pull/4436#issuecomment-95994887
+ Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
+ (cherry picked from commit 79d17af1a1ec0659884f768945a7bac6282b5e0b)
+
+commit 0260abd5d265bd63ea9c89f4082c31ba1c5ae8fa
+Author: Robin H. Johnson <robbat2@gentoo.org>
+Date: Wed Apr 22 12:53:06 2015 -0700
+
+ rgw: improve content-length env var handling
+
+ The FastCGI specification, section 6.3 on Authorizers, describes a case
+ where HTTP_CONTENT_LENGTH will be set in the environment and
+ CONTENT_LENGTH will NOT be set.
+
+ Further documention in the code.
+
+ Fixes: #11419
+ Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
+ (cherry picked from commit 3e38eab44bfb082fdd2b6f29b8b0357f8f5c11bb)
+
+commit 8abc46a157e4c1431a92a1e52ab694dccff5d514
+Author: wuxingyi <wuxingyi@letv.com>
+Date: Wed Jun 10 06:57:57 2015 +0000
+
+ rgw: fix data corruption when race condition
+
+ We should delete the object in the multipart namespace lastly to prevent a previous upload
+ wrongly deleting objects belong to the following upload.
+
+ Fixes: #11749
+ Signed-off-by: wuxingyi <wuxingyi@letv.com>
+ (cherry picked from commit ac1e729a75b5d995028bbc223bcf5ecce0d112cc)
+
+commit 72ecd522941156c8a7e5303531944b0735dcbeb8
+Merge: 59f37a9 d723e11
+Author: Abhishek L <abhishekl.2006@gmail.com>
+Date: Wed Jul 1 18:09:46 2015 +0530
+
+ Merge pull request #4886 from theanalyst/wip-11737-hammer
+
+ Reviewed-by: Greg Farnum <gfarnum@redhat.com>
+
+commit 59f37a9bafc095181b3f41ec5d93ac58e2cda604
+Merge: 53a2143 89d0266
+Author: Kefu Chai <tchaikov@gmail.com>
+Date: Sat Jun 27 17:11:11 2015 +0800
+
+ Merge pull request #5095 from ceph/wip-fix-doc-hammer
+
+ doc: fix doc build
+
+ Reviewed-by: Loic Dachary <ldachary@redhat.com>
+
+commit 89d0266a60729d5d9747867e8c30abf71a891231
+Author: Kefu Chai <kchai@redhat.com>
+Date: Sat Jun 27 14:44:55 2015 +0800
+
+ doc: add the corresponding @endcond command for @cond
+
+ * they are used to applease asphyxiate, as it
+ is not able to handle "enum" sections
+
+ Signed-off-by: Kefu Chai <kchai@redhat.com>
+
+commit 2aa77b33a97e5a3ca134c9c555aa6e7a69ef50f7
+Author: Kefu Chai <kchai@redhat.com>
+Date: Sat Jun 27 14:43:01 2015 +0800
+
+ doc: remove orphan: directive in ceph-create-keys.rst
+
+ * it is used to silence the sphinx warning, but conf.py
+ does not like it.
+
+ Signed-off-by: Kefu Chai <kchai@redhat.com>
+
+commit ad66e40e8bd598da7c9738cb44abb543008c90a3
+Author: Kefu Chai <kchai@redhat.com>
+Date: Sat Jun 27 14:41:59 2015 +0800
+
+ doc: let doxygen ignore src/tracing
+
+ Signed-off-by: Kefu Chai <kchai@redhat.com>
+
+commit 53a2143eb7e549de1185b01ed0bde841ffa5235a
+Merge: 6f7cd04 bfb1442
+Author: Samuel Just <sam.just@inktank.com>
+Date: Fri Jun 26 14:19:40 2015 -0700
+
+ Merge pull request #4902 from theanalyst/wip-11908-hammer
+
+ Fixes for rados ops with snaps
+
+ Reviewed-by: Samuel Just <sjust@redhat.com>
+
+commit 6f7cd0460d5729c15966119e0177ddc56a361d8e
+Merge: 78d894a 356bd2c
+Author: Loic Dachary <loic@dachary.org>
+Date: Thu Jun 25 20:03:42 2015 -0400
+
+ Merge pull request #5069 from dachary/wip-11806-hammer
+
+ ceph / ceph-dbg steal ceph-objecstore-tool from ceph-test / ceph-test-dbg
+
+ Reviewed-by: Ken Dreyer <kdreyer@redhat.com>
+
+commit 356bd2c68ca730e766d06c46a0364784f5d72275
+Author: Loic Dachary <ldachary@redhat.com>
+Date: Wed Jun 24 14:58:47 2015 -0400
+
+ debian: ceph-dbg steals ceph-objectstore-tool from ceph-test-dbg (take 2)
+
+ 968573b8930a7c8485bf53e3a989ce2f7d0a2fff incorrectly backported
+ 6f11fbf41fab10924b1e0e41fcf27864779d4073. It should instead reflect that
+ ceph-dbg in 0.94.2 and above will break ceph-test-dbg in all versions
+ prior to 0.94.2.
+
+ In other words, 0.94-XXXX being lower than 0.94.1, upgrading from
+ 0.94.1 to 0.94.2 will not notice that ceph-dbg breaks ceph-test-dbg.
+
+ $ dpkg --compare-versions 0.94-XXXX lt 0.94.1 && echo yes || echo no
+ yes
+ $ dpkg --compare-versions 0.94.2 lt 0.94.1-xxx && echo yes || echo no
+ no
+
+ http://tracker.ceph.com/issues/11806 Fixes: #11806
+
+ Signed-off-by: Loic Dachary <loic@dachary.org>
+
+commit c5c627fdd3de669ee94ab7ecd6939c29a4a68011
+Author: wuxingyi <wuxingyi2015@outlook.com>
+Date: Wed Mar 11 17:34:40 2015 +0800
+
+ rgw/logrotate.conf: Rename service name
+
+ The service name for ceph rados gateway was changed to "ceph-radosgw",
+ the previous version of service name "radosgw" would cause a failed reload,
+ and finally make it impossible to write any log data to the log file.
+
+ Signed-off-by: wuxingyi <wuxingyi2015@outlook.com>
+ (cherry picked from commit 9df3f798179481fe8ae6ae873dcb793de7d8f367)
+
+commit 582cf731e05baabd2cd79567af89d7f005c24925 (refs/remotes/gh/wip-12109-hammer)
+Author: Jason Dillaman <dillaman@redhat.com>
+Date: Tue May 5 13:08:21 2015 -0400
+
+ tests: add librbd watch/notify version compatibility test
+
+ Fixes: #11405
+ Backport: hammer
+ Signed-off-by: Jason Dillaman <dillaman@redhat.com>
+ (cherry picked from commit 41e4cbe032e32762e3a9e8bc3eff8ece19f91a54)
+
+commit 43b9aef11c1281d8b83b659a523dba365d79add4
+Author: Jason Dillaman <dillaman@redhat.com>
+Date: Tue May 5 11:22:55 2015 -0400
+
+ qa/workunits/rbd: add notify_master/slave bootstrap scripts
+
+ Backport: hammer
+ Signed-off-by: Jason Dillaman <dillaman@redhat.com>
+ (cherry picked from commit 124b1d3d2d0dbd685bbd717856d29b316e62e660)
+
+commit f995fb50d3d7734161fa498db9e204eaded651b6
+Author: Jason Dillaman <dillaman@redhat.com>
+Date: Tue May 5 10:34:48 2015 -0400
+
+ qa/workunits/rbd: add new test_librbd_api workunit
+
+ This only tests the public librbd API for use during upgrade tests.
+
+ Backport: hammer
+ Signed-off-by: Jason Dillaman <dillaman@redhat.com>
+ (cherry picked from commit 9039955f42d01044cfcf20c56ca2181e51c317ee)
+
+commit a09da2a2c6c12c6bf2f8e17f2096b3ab24587007
+Author: Jason Dillaman <dillaman@redhat.com>
+Date: Tue May 5 10:27:38 2015 -0400
+
+ tests: create librbd API-only integration test suite
+
+ The QA client-upgrade test suite requires a librbd test
+ that is dynamically linked to librbd. Since the current
+ ceph_test_librbd includes tests against the non-public API,
+ it is statically linked against librbd and thus cannot be
+ used to test a client upgrade scenario.
+
+ Backport: hammer
+ Signed-off-by: Jason Dillaman <dillaman@redhat.com>
+ (cherry picked from commit 6fe94c8cbb924c31c1007e2d0c76f28ce9dbca57)
+
+commit e149916cd40a58ce5db5f63a2b4efd82a8c4e1ba
+Author: Owen Synge <osynge@suse.com>
+Date: Tue Apr 21 11:31:24 2015 +0200
+
+ Increase max files open limit for OSD daemon.
+
+ Under heavy load the number of file descriptors opened
+ by the OSD can go beyond the 64K file limit. This patch
+ increases the default to 128K.
+
+ Signed-off-by: Owen Synge <osynge@suse.com>
+ (cherry picked from commit ebda4ba1c67172852587e47a8e6fb538809a1b1c)
+
+commit 22f58ce2665f1ea6b38f6016dc585202a4595322
+Author: Sage Weil <sage@redhat.com>
+Date: Mon Jun 1 15:10:14 2015 -0700
+
+ Makefile: install ceph-post-file keys with mode 600
+
+ Otherwise ssh (may) prompt for a password.
+
+ Signed-off-by: Sage Weil <sage@redhat.com>
+ (cherry picked from commit 106a1c3081d02446aa3d8e13865da0c3393bae90)
+
+commit 3e65a10bd2351744da199a4b076659191b4378a2
+Author: Joseph McDonald <joseph.mcdonald@alcatel-lucent.com>
+Date: Mon Jun 1 15:05:32 2015 -0700
+
+ ceph-post-file: improve check for a source install
+
+ Signed-off-by: Joseph McDonald <joseph.mcdonald@alcatel-lucent.com>
+ (cherry picked from commit ee170eadcdcb4b54d36a7d474558484de9d917eb)
+
+commit c1f6743940250b04ae6dbea30d8805571add39b6
+Author: Joseph McDonald <joseph.mcdonald@alcatel-lucent.com>
+Date: Mon Jun 1 15:00:39 2015 -0700
+
+ ceph-post-file: behave when sftp doesn't take -i
+
+ Fixes: #11836
+ Signed-off-by: Joseph McDonald <joseph.mcdonald@alcatel-lucent.com>
+ (cherry picked from commit b84031ed5eaace1222e14d3c4076a3ab1155da96)
+
+commit 38d36b1174160ad104704aaa7ff5290d1ec3e782
+Author: Tim Serong <tserong@suse.com>
+Date: Thu Apr 30 10:55:38 2015 +1000
+
+ packaging: move SuSEfirewall2 templates out of src
+
+ Better to have static config like this that needs to be installed in
+ /etc in a separate subdirectory of the project.
+
+ Signed-off-by: Tim Serong <tserong@suse.com>
+ (cherry picked from commit 70292658d5febb6c5f94af4df9c3e93551772d12)
+
+commit 24bc9f2c58ca78c8023935b8b69f8b01adbc11af
+Author: Tim Serong <tserong@suse.com>
+Date: Wed Apr 29 13:12:38 2015 +1000
+
+ packaging: add SuSEfirewall2 service files
+
+ This adds SuSEfirewall2 service files for Ceph MON, OSD and MDS, for use
+ on SLES and openSUSE. The MON template opens port 6789 and the OSD/MDS
+ template opens the range 6800-7300 as per
+ http://ceph.com/docs/master/rados/configuration/network-config-ref/
+
+ Signed-off-by: Tim Serong <tserong@suse.com>
+ (cherry picked from commit 77685f5b787c56bcb1c4d9f1e058e25312fa62fe)
+
+commit 8acfb994f22efa07beeecccda300cbd50d683566
+Author: Owen Synge <osynge@suse.com>
+Date: Thu May 7 12:02:41 2015 +0200
+
+ Bug fix to ceph systemV compatability script.
+
+ Was failing with more than one OSD / MON deamon on a single node.
+ Fixes suse bugzilla #927862
+
+ Signed-off-by: Owen Synge <osynge@suse.com>
+ (cherry picked from commit dfda3ff8741fcdbac3150456ca7614cf75ef1776)
+
+commit bd3fd929e6f95e6d9840317aa3ac02f52711c94b
+Author: Owen Synge <osynge@suse.com>
+Date: Thu Jun 18 14:16:03 2015 +0200
+
+ Fixes to rcceph script
+
+ - only start OSDs if mon daemons are also present
+ - adds support for mask and unmask
+ - removes support for cluster with non default cluster name,
+ as this was very limited and inconsistent
+ - Reapplied from a patch as could not cherry-pick
+ 66cb46c411d874be009c225450eea5021cf1219b from Mon Jan 12
+ as this produced issues with src/gmock
+
+ Signed-off-by: Owen Synge <osynge@suse.com>
+ (cherry picked from commit bfa0c4a626fdbb2bf978ccfab783ac428156144b)
+
+commit 37d77d3680d2c8adda35eddf9625a331a45ece11
+Author: Owen Synge <osynge@suse.com>
+Date: Tue Apr 21 11:31:24 2015 +0200
+
+ Increase max files open limit for OSD daemon.
+
+ Under heavy load the number of file descriptors opened
+ by the OSD can go beyond the 64K file limit. This patch
+ increases the default to 128K.
+
+ Signed-off-by: Owen Synge <osynge@suse.com>
+ (cherry picked from commit ebda4ba1c67172852587e47a8e6fb538809a1b1c)
+
+commit 78d894a634d727a9367f809a1f57234e5e6935be
+Author: Sage Weil <sage@redhat.com>
+Date: Wed Jun 17 09:35:28 2015 -0700
+
+ qa/workunits/rados/test-upgarde-v9.0.1: fix exclude syntax
+
+ It's -, then a list of all exclusions separated by :. There are just 2.
+
+ Signed-off-by: Sage Weil <sage@redhat.com>
+
+commit 3e8d60a80ce31860eac76a1f6489a35e1795a0c0
+Author: Sage Weil <sage@redhat.com>
+Date: Tue Jun 16 21:05:29 2015 -0700
+
+ qa/workunits/rados/test-upgrade-v9.0.1: skip one more evict test
+
+ Signed-off-by: Sage Weil <sage@redhat.com>
+
+commit 348a3d3c9880e7d022e71a2faafe51c8f771406e
+Author: Josh Durgin <jdurgin@redhat.com>
+Date: Mon Jun 15 15:12:43 2015 -0700
+
+ qa: add compatibility filtered rados api tests for upgrades
+
+ Post-9.0.1, the evict op returns success when an object doesn't exist
+ in the cache tier. Skip the tests that are incompatible across
+ versions.
+
+ Fixes: #11548
+ Signed-off-by: Josh Durgin <jdurgin@redhat.com>
+
+commit d2b80966b8f74de818a671c90b4c821a4b0782db
+Merge: 70bba62 f68bf94
+Author: Sage Weil <sage@redhat.com>
+Date: Mon Jun 15 12:38:57 2015 -0700
+
+ Merge pull request #4961 from ceph/wip-11493-hammer
+
+ backport 11493 fixes, and test, prevetning ec cache pools
+
+ Reviewed-by: Samuel Just <sjust@redhat.com>
+
+commit f68bf94e370fb11a3047ec2762a972a0b7a7c0bb
+Author: Samuel Just <sjust@redhat.com>
+Date: Fri May 15 13:05:40 2015 -0700
+
+ OSDMonitor: disallow ec pools as tiers
+
+ Fixes: 11650
+ Signed-off-by: Samuel Just <sjust@redhat.com>
+ (cherry picked from commit 11b7801bb57cb25cd2d26d58722d49691747725b)
+
+commit 13c8d58da1303cc68d99da19f79d625f91f99d43
+Author: Sage Weil <sage@redhat.com>
+Date: Wed Apr 29 12:34:25 2015 -0700
+
+ mon: prevent pool with snapshot state from being used as a tier
+
+ If we add a pool with snap state as a tier the snap state gets clobbered
+ by OSDMap::Incremental::propogate_snaps_to_tiers(), and may prevent OSDs
+ from starting. Disallow this.
+
+ Include a test.
+
+ Fixes: #11493
+ Backport: hammer, giant, firefly
+ Signed-off-by: Sage Weil <sage@redhat.com>
+ (cherry picked from commit bbec53edf9e585af4e20bbc9ba9057d6fdfda342)
+
+commit 58e62662f6ef04ac76470090d1d958467e34194a
+Author: Samuel Just <sjust@redhat.com>
+Date: Fri May 8 10:26:48 2015 -0700
+
+ test/librados/tier.cc: destroy and recreate cache pool on every test
+
+ Namespaces are not sufficient with the checks for 11493 in the mon.
+
+ Signed-off-by: Samuel Just <sjust@redhat.com>
+ (cherry picked from commit bef09e0cdb274cb1c87335a2af9ee532d14a4596)
+
+commit 70bba6226a64090dcf41cd90b23fdf5aed8cd0ca (refs/remotes/jashan/hammer)
+Merge: 3b6977b 5a60a03
+Author: Loic Dachary <loic@dachary.org>
+Date: Mon Jun 15 17:26:07 2015 +0200
+
+ Merge pull request #4846 from SUSE/wip-11862-hammer
+
+ missing man pages for ceph-create-keys, ceph-disk-*
+
+ Reviewed-by: Kefu Chai <kchai@redhat.com>
+ Reviewed-by: Ken Dreyer <kdreyer@redhat.com>
+
+commit 3b6977b706dbc99cac25bec1b71a628c398c6ff1
+Merge: 5fb8561 3db1026
+Author: Sage Weil <sage@redhat.com>
+Date: Thu Jun 11 13:54:35 2015 -0700
+
+ Merge pull request #4934 from dachary/wip-releases-hammer
+
+ doc/release-notes: v0.94.2
+
+commit 3db1026f3706e6f5a5c25013cb6646a0298057d8
+Author: Sage Weil <sage@redhat.com>
+Date: Wed Jun 10 12:48:41 2015 -0700
+
+ doc/release-notes: v0.94.2
+
+ Signed-off-by: Sage Weil <sage@redhat.com>
+ (cherry picked from commit 306345b29c259ab04a58ed5d40f801645485b29d)
+
+ Conflicts:
+ doc/release-notes.rst
+
+commit ed5442b1057dcc4fb1f9404c805dabe2bbde2252 (refs/remotes/jashan/wip-11770-hammer, refs/remotes/gh/wip-11770-hammer)
+Author: Jason Dillaman <dillaman@redhat.com>
+Date: Tue Jun 2 10:33:35 2015 -0400
+
+ tests: verify librbd blocking aio code path
+
+ Signed-off-by: Jason Dillaman <dillaman@redhat.com>
+ (cherry picked from commit 4cf41486e9c9e1efcb863960a8f3e0326ffca7e5)
+
+ Conflicts:
+ src/test/librbd/test_librbd.cc: trival resolution
+
+commit 20e104869f3d17ce672438144700a4d984d487b4
+Author: Jason Dillaman <dillaman@redhat.com>
+Date: Mon Jun 1 22:56:11 2015 -0400
+
+ librbd: new rbd_non_blocking_aio config option
+
+ Setting this option to false reverts librbd to legacy behavior
+ where AIO operations could potentially block.
+
+ Signed-off-by: Jason Dillaman <dillaman@redhat.com>
+ (cherry picked from commit 769cad12716b85d87eacc1069dd9f5c21cad3915)
+
+commit b4571b3e238efc39767f753e0ec1622c8bd6d6e6
+Author: Jason Dillaman <dillaman@redhat.com>
+Date: Thu Apr 9 20:34:28 2015 -0400
+
+ PendingReleaseNotes: document changes to librbd's aio_read methods
+
+ Signed-off-by: Jason Dillaman <dillaman@redhat.com>
+
+commit 9ea1edd0ca9e385f823ad04b05bc887d77aa5136
+Author: Jason Dillaman <dillaman@redhat.com>
+Date: Thu Apr 9 13:33:09 2015 -0400
+
+ librbd: AioRequest::send no longer returns a result
+
+ The librados calls used by AioRequest::send should always return
+ zero unless there is a bug.
+
+ Signed-off-by: Jason Dillaman <dillaman@redhat.com>
+ (cherry picked from commit c77bce3311ab62892eb8c1d883263ba7ed663b20)
+
+ Conflicts:
+ src/librbd/AioRequest.cc: trivial resolution
+ src/librbd/AsyncFlattenRequest.cc: trivial resolution
+
+commit 272df2aed79a95dd9c45db4e0953e9b321f7b0f5
+Author: Jason Dillaman <dillaman@redhat.com>
+Date: Wed Apr 8 21:55:36 2015 -0400
+
+ tests: update librbd AIO tests to remove result code
+
+ Signed-off-by: Jason Dillaman <dillaman@redhat.com>
+ (cherry picked from commit 948b15eb52fd5d9ce842fa12ee0cecda17353b01)
+
+ Conflicts:
+ src/test/librbd/test_internal.cc: trivial resolution
+ src/test/librbd/test_librbd.cc: trivial resolution
+
+commit dd2e4c13ff6d88edb25f90af62af16ba825c15c9
+Author: Jason Dillaman <dillaman@redhat.com>
+Date: Wed Apr 8 21:37:50 2015 -0400
+
+ librbd: internal AIO methods no longer return result
+
+ All failures should be returned via the AioCompletion.
+
+ Signed-off-by: Jason Dillaman <dillaman@redhat.com>
+ (cherry picked from commit 9ab42d613128ab08c688ddbea93df4c95068b9cd)
+
+ Conflicts:
+ src/librbd/AioRequest.cc: trivial resolution
+ src/librbd/internal.cc: trivial resolution
+
+commit dbd4e293d7124c89a22148e8fa5f425a995c900c
+Author: Jason Dillaman <dillaman@redhat.com>
+Date: Wed Apr 8 21:48:21 2015 -0400
+
+ Throttle: added pending_error method to SimpleThrottle
+
+ Allow the client of SimpleThrottle to detect an async error
+ so that it can exit early.
+
+ Signed-off-by: Jason Dillaman <dillaman@redhat.com>
+ (cherry picked from commit b88b88c5df91325fb713c2031a56bffe421268e0)
+
+commit 7df6091a30b1b94d764240262195e971175554b3
+Author: Jason Dillaman <dillaman@redhat.com>
+Date: Wed Apr 8 20:18:50 2015 -0400
+
+ librbd: add new fail method to AioCompletion
+
+ Helper method to handle passing fatal errors generated within
+ librbd (not from the OSDs) back to the client.
+
+ Signed-off-by: Jason Dillaman <dillaman@redhat.com>
+ (cherry picked from commit 6d1d0c867855a96bee4c13a0c0a39a0e002ccd12)
+
+commit cf6e1f50ea7b5c2fd6298be77c06ed4765d66611
+Author: Jason Dillaman <dillaman@redhat.com>
+Date: Wed Apr 8 19:06:52 2015 -0400
+
+ librbd: avoid blocking AIO API methods
+
+ Enqueue all AIO API methods within the new librbd thread pool to
+ reduce the possibility of any blocking operations. To maintain
+ backwards compatibility with the legacy return codes of the API's
+ AIO methods, it's still possible to block attempting to acquire
+ the snap_lock.
+
+ Fixes: #11056
+ Signed-off-by: Jason Dillaman <dillaman@redhat.com>
+ (cherry picked from commit 3a7b5e30efdb21aa1a0aeb68a5d02a1ac2a5faf3)
+
+commit e61974aed09a3f81e1f65a4bbaed43e3f22b27b4
+Author: Jason Dillaman <dillaman@redhat.com>
+Date: Wed Apr 8 17:24:08 2015 -0400
+
+ librbd: add task pool / work queue for requests
+
+ Signed-off-by: Jason Dillaman <dillaman@redhat.com>
+ (cherry picked from commit afb896d91f886b647baf38f7ec94cc3739f6d2a9)
+
+ Conflicts:
+ src/librbd/ImageCtx.cc: trivial resolution
+ src/librbd/ImageCtx.h: trivial resolution
+
+commit bfb144268b803340efad29cd6c627b170ea32402
+Author: Samuel Just <sjust@redhat.com>
+Date: Wed May 20 16:10:02 2015 -0700
+
+ ReplicatedPG::release_op_ctx_locks: requeue in scrub queue if blocked
+
+ Otherwise we can reorder an op around another op which got blocked by a
+ scrub which started after the first blocked on an obc.
+
+ Fixes: #11691
+ Signed-off-by: Samuel Just <sjust@redhat.com>
+ (cherry picked from commit be873eb8da7b29ecefaa5a99b88de7ddcca711ee)
+
+commit c7b6a6370a69149ea94f9e35d536aa90f06e7659
+Author: Samuel Just <sjust@redhat.com>
+Date: Tue May 19 10:56:11 2015 -0700
+
+ ReplicatedPG::finish_ctx: take excl lock if operation is rw
+
+ Fixes: #11677
+ Signed-off-by: Samuel Just <sjust@redhat.com>
+ (cherry picked from commit 5c2b795724423ed484ab451de855ddcfc085342b)
+
+commit 1550a569dab120ce28396fe365565e8e4acd9801
+Author: Samuel Just <sjust@redhat.com>
+Date: Thu May 21 12:13:43 2015 -0700
+
+ RadosModel: randomly prefix delete with assert_exists
+
+ Signed-off-by: Samuel Just <sjust@redhat.com>
+ (cherry picked from commit 4fe7d2abdff2fce359e5e992206644cc03825ee0)
+
+commit 4cdc5f7d6b3ec488c79c09cb44a43d4d9398b74c
+Author: Samuel Just <sjust@redhat.com>
+Date: Thu May 21 11:36:42 2015 -0700
+
+ RadosModel: assert exists on subsequent writes
+
+ Signed-off-by: Samuel Just <sjust@redhat.com>
+ (cherry picked from commit 121aa3bc612b86281535ac3bcfe98bc99bc99ace)
+
+commit 25c730bda74b94f2c894c508ab09988dbd528c4e
+Author: Samuel Just <sjust@redhat.com>
+Date: Tue May 19 10:23:01 2015 -0700
+
+ test/librados/snapshots.cc: add test for 11677
+
+ Signed-off-by: Samuel Just <sjust@redhat.com>
+ (cherry picked from commit c2d17b927f8a222164b3bf2922a4ff337696f566)
+
+commit 3d74164d3d6caaa5099abd9a1d1920482d3e05c2
+Author: Samuel Just <sjust@redhat.com>
+Date: Wed May 27 11:14:15 2015 -0700
+
+ ReplicatedPG::trim_object: write filtered snapset while we're at it
+
+ If we trimmed an object, we might as well remove the obsolete snaps
+ as well.
+
+ Signed-off-by: Samuel Just <sjust@redhat.com>
+ (cherry picked from commit 90eb7768f99ea249952df195a844a3a7c9a59b78)
+
+commit a1161540bc0094a951021d4ca651b95ec045213e
+Author: Samuel Just <sjust@redhat.com>
+Date: Wed May 27 11:00:54 2015 -0700
+
+ ReplicatedPG: start_flush: use filtered snapset
+
+ Otherwise, we might send our deletes based on deleted snaps. This is
+ problematic since we may have trimmed the clones to which those snaps
+ belong, causing us to send them at an earlier snap than we used before.
+
+ The specific situation was
+
+ 78:[78, 70, 63, 5a, 58, 57]:[64(63), 58(58, 57)]
+
+ with 58 already clean. To flush 64, we send:
+
+ delete@58
+ delete@59
+ copyfrom@62
+
+ Then, snap 63 is trimmed leaving us with a snapset of:
+
+ 78:[78, 70, 63, 5a, 58, 57]:[58(58, 57)]
+
+ since trim_object doesn't filter the head object snapset snaps. This
+ isn't really a bug since in general all snapset users must be aware
+ that there may be trimmed snaps in snapset::snaps. However, here
+ it becomes a problem when we go to flush head:
+
+ delete@58 -- ignored due to snapc
+ delete@59 -- ignored due to snapc
+ copyfrom@78 -- not ignored
+
+ The base pool head is at snap seq 62, so it clones that value into
+ clone 78(78, 70) instead of forgetting it. What should have happened
+ is that we should have based our flushes on filtered snapset:
+
+ 78:[78, 70, 58, 57]:[58(58, 57)]
+
+ Causing us to instead send:
+
+ delete@58 -- ignored due to snapc
+ delete@69 -- not ignored, causes no clone to be made
+ copyfrom@78 -- not ignored, updates head such that a subsequent clone
+ will leave 70 out of the clone snaps vector.
+
+ Fixes: 11787
+ Signed-off-by: Samuel Just <sjust@redhat.com>
+ (cherry picked from commit 6051e255ac062985ada1989edb7f23cd750915e2)
+
+commit 82988d611bad6226138b94590275faadbca3554a
+Author: islepnev <islepnev@gmail.com>
+Date: Fri Apr 17 22:33:01 2015 +0300
+
+ ceph-disk: support NVMe device partitions
+
+ Linux nvme kernel module v0.9 enumerate devices as following:
+
+ /dev/nvme0 - characted revice
+ /dev/nvme0n1 - whole block device
+ /dev/nvme0n1p1 - first partition
+ /dev/nvme0n1p2 - second partition
+
+ http://tracker.ceph.com/issues/11612 Fixes: #11612
+
+ Signed-off-by: Ilja Slepnev <islepnev@gmail.com>
+ (cherry picked from commit 9b62cf254d02d30609793be8b1cb8a94f38891f1)
+
+commit bd91fb027ab91d487b1d61d25516c13590735d89
+Author: Sage Weil <sage@redhat.com>
+Date: Tue May 12 16:37:56 2015 -0700
+
+ mon: prevent bucket deletion when referenced by a rule
+
+ If a rule references a bucket with 'take', prevent deletion.
+
+ Fixes: #11602
+ Signed-off-by: Sage Weil <sage@redhat.com>
+ (cherry picked from commit 3d591afef90b0601572c748f13faac029d05f5a0)
+
+commit 56565ee1cdb06a7705d1c3f26f5592b10399324a
+Author: Sage Weil <sage@redhat.com>
+Date: Tue May 12 14:03:49 2015 -0700
+
+ crush: fix crash from invalid 'take' argument
+
+ Verify that the 'take' argument is a valid device or bucket. Otherwise,
+ ignore it (do not add the value to the working vector).
+
+ Backport: hammer, firefly
+ Fixes: #11602
+ Reported-by: shiva rkreddy <shiva.rkreddy@gmail.com>
+ Signed-off-by: Sage Weil <sage@redhat.com>
+ (cherry picked from commit 9324d0a1af61e1c234cc48e2175b4e6320fff8f4)
+
+commit 1440122d61d5b0a3f8360f4e2101db1018109799
+Author: Kefu Chai <kchai@redhat.com>
+Date: Wed Apr 29 03:28:18 2015 -0700
+
+ common/config: detect overflow of float values
+
+ Signed-off-by: Kefu Chai <kchai@redhat.com>
+ (cherry picked from commit 1ff409ef8d022a1a84d034bd3db976c4d769e993)
+
+commit 9b947fa320b77e0055a581005353c2561a12a198
+Author: Kefu Chai <kchai@redhat.com>
+Date: Wed Apr 29 15:41:08 2015 +0800
+
+ common/config: detect overflow of int values
+
+ * #include "strtol.h" in strtol.cc, to ensure the function defintions
+ are consistent.
+ * add a test accordingly
+ * fix the testcase of converting 1024E.
+ * do not accept integers overflow after adding SI suffix
+ * do not accept integers underflow (i.e. negative values)
+
+ Fixes: #11484
+ Signed-off-by: Kefu Chai <kchai@redhat.com>
+ (cherry picked from commit d62f80dc7b25d312ff05b65b7be854aae15b66a8)
+
+commit d723e1156e70a492d633e43b86e7c373e5750065
+Author: Yan, Zheng <zyan@redhat.com>
+Date: Tue May 12 14:52:30 2015 +0800
+
+ mds: clear CDir::STATE_REJOINUNDEF after fetching dirfrag
+
+ Fixes: #11541
+ Signed-off-by: Yan, Zheng <zyan@redhat.com>
+ (cherry picked from commit ab1e5394dc778f6799472bd79a4d9ba7197107c2)
+
+commit 54f4e7d4a534448293c74612f8140cf34b9cf9f8
+Author: Javier M. Mellid <jmunhoz@igalia.com>
+Date: Fri May 15 14:22:29 2015 +0200
+
+ rgw: Use attrs from source bucket on copy
+
+ On copy objects, when bucket source is the same as the destination, use attrs
+ from source bucket.
+
+ Fixes: #11639
+
+ Signed-off-by: Javier M. Mellid <jmunhoz@igalia.com>
+ (cherry picked from commit 1dac80df1d4a2364154ed8b404d13609936c257b)
+
+commit 9dfef6004d208af3730634796aad199391707826
+Author: Anton Aksola <anton.aksola@nebula.fi>
+Date: Fri Apr 10 13:25:21 2015 +0300
+
+ rgw: always check if token is expired
+
+ Fixes: #11367
+
+ Currently token expiration is only checked by the token cache. With PKI
+ tokens no expiration check is done after decoding the token. This causes
+ PKI tokens to be valid indefinitely. UUID tokens are validated by
+ keystone after cache miss so they are not affected by this bug.
+
+ This commit adds explicit token expiration check to
+ RGWSwift::validate_keystone_token()
+
+ Signed-off-by: Anton Aksola <anton.aksola@nebula.fi>
+ Reported-by: Riku Lehto <riku.lehto@nexetic.com>
+ (cherry picked from commit 2df069390ea3bbcfbab5022750e89f51d197cc11)
+
+commit fdb43ebe2b1211acdb454836a64dbd589feeef45
+Author: Nathan Cutler <ncutler@suse.cz>
+Date: Fri May 15 21:43:34 2015 +0200
+
+ ceph.spec.in: tweak ceph-common for SUSE/openSUSE
+
+ ceph-common needs python-argparse in SUSE/openSUSE and
+ needs redhat-lsb-core only in RHEL/CentOS/Fedora.
+
+ http://tracker.ceph.com/issues/11638 Fixes: #11638
+
+ Signed-off-by: Nathan Cutler <ncutler@suse.cz>
+ (cherry picked from commit 363d957d8fdd15a1674befbd8e485fd89b76d716)
+
+commit ba1a0167cc809081eda7e6cc9ecfb971e439d696
+Author: John Spray <john.spray@redhat.com>
+Date: Wed Jun 3 10:09:09 2015 +0100
+
+ admin/build-doc: fix dependency checks
+
+ http://tracker.ceph.com/issues/11857 Fixes: #11857
+
+ Signed-off-by: John Spray <john.spray@redhat.com>
+ (cherry picked from commit 539c1ba7211f579bad4f59ae824f1e68e620ecbd)
+
+ Conflicts:
+ admin/build-doc
+ Insert lines at appropriate spot
+
+commit 5a60a034bf3015eaf468e5e3f9d8feb08b8fdd95
+Author: Nathan Cutler <ncutler@suse.com>
+Date: Wed Jun 3 10:41:27 2015 +0200
+
+ man/ceph-create-keys.8: add missing file
+
+ This is the generated manpage, taken from a local build of master
+
+ Signed-off-by: Nathan Cutler <ncutler@suse.com>
+ (cherry picked from commit bcda61fcbe07ee36cd5172d80018f287591660ec)
+
+commit 19305b897ac147602049752a2dfbe1fd39ba562c
+Author: Kefu Chai <kchai@redhat.com>
+Date: Tue Apr 21 14:59:32 2015 +0800
+
+ doc: add ceph-create-keys.8
+
+ Fixes: #10725
+ Signed-off-by: Kefu Chai <kchai@redhat.com>
+ (cherry picked from commit 27cee2f1f46a9f47cda9dfeb56ff1259e982960c)
+
+ Conflicts:
+ doc/man/8/ceph-create-keys.rst
+ Includes fixes from https://github.com/ceph/ceph/pull/4855
+
+commit ffd0933dcc790d7cedc1048b664bf4e8c40464a3
+Author: Jason Dillaman <dillaman@redhat.com>
+Date: Mon May 11 17:05:49 2015 -0400
+
+ WorkQueue: added virtual destructor
+
+ Signed-off-by: Jason Dillaman <dillaman@redhat.com>
+ (cherry picked from commit b3f5a75332c058816dc39b71e9d2b36e752159f4)
+
+commit a28adfbdd8abc86e7766c303bc610c0c252910f7
+Author: Jason Dillaman <dillaman@redhat.com>
+Date: Wed Apr 8 16:46:34 2015 -0400
+
+ WorkQueue: add new ContextWQ work queue
+
+ The queue holds a collection of Context pointers that will
+ be completed by the thread pool.
+
+ Signed-off-by: Jason Dillaman <dillaman@redhat.com>
+ (cherry picked from commit 24a33e977f7b71962adeeb48f75d488a76e70fa9)
+
+commit 1a321e477effa23bffbb6cb057aa955586197345
+Author: Wido den Hollander <wido@42on.com>
+Date: Wed Jun 3 13:13:33 2015 +0200
+
+ rgw: Do not enclose the Bucket header in quotes
+
+ Fixes: #11860
+ Signed-off-by: Wido den Hollander <wido@42on.com>
+ (cherry picked from commit 8af25faed93fe02d3dad585b8579ce8b041cc4e6)
+
+commit a62c3aa1df9e0f79ac75d94083d10b902dbba382
+Author: Kefu Chai <kchai@redhat.com>
+Date: Fri Apr 24 14:04:30 2015 +0800
+
+ ceph.in: handle unknown Exception correctly
+
+ * in case parse_cmdargs() throws
+
+ Signed-off-by: Kefu Chai <kchai@redhat.com>
+ (cherry picked from commit 7789eefc01deb9ca7fe90f5521aece3e36c3c350)
+
+commit cc7f7441c1d0457e840bfdc3413f9bc6d5f5134a
+Author: Kefu Chai <kchai@redhat.com>
+Date: Fri Apr 24 01:27:44 2015 +0800
+
+ ceph.in: improve the interactive mode
+
+ * if ceph is not reading from a tty, expect EOF instead of "quit"
+ as the end of input.
+ * do not panic at seeing the EOF
+ * update the test case test_mon_injectargs_SI(). since we disables
+ "ceph injectargs <args,...>" in a458bd83, in which the arguments
+ of "injectargs" are supposed to be consumed by "tell" instead.
+ so "ceph injectargs ..." is taken as an incomplete command, and
+ this command will bring ceph cli into the interactive mode,
+ redirecting its stdin to /dev/null helps ceph cli quit the loop,
+ but in a way of throwing EOFError exception. this change handles
+ the EOF, so the "ceph injectargs ..." does not throws anymore.
+ but the side effect is that the test fails since it expects a
+ non-zero return code. so replace it with an equivalent "tell"
+ command which also fails but due to the non-SI postfix.
+
+ Signed-off-by: Kefu Chai <kchai@redhat.com>
+ (cherry picked from commit da9d2b4077ab1dceeed979ab71f0d9ed59b14266)
+
+commit eb26388cb985456e8f6e07a52a20fa912cf4efaa
+Author: Kefu Chai <kchai@redhat.com>
+Date: Fri Apr 24 00:50:37 2015 +0800
+
+ ceph.in: parse quote correctly in interactive mode
+
+ Fixes: #11279
+ Signed-off-by: Kefu Chai <kchai@redhat.com>
+ (cherry picked from commit bc7d8c99d2e16a141a8b575281ba12c67628dac3)
+
+commit 558d6391ecdfd5d716558341ce5d84ce1f7ec9c3
+Author: Kefu Chai <kchai@redhat.com>
+Date: Fri May 8 12:01:16 2015 +0800
+
+ json_sprit: fix the FTBFS on old gcc
+
+ Fixes: #11574
+ Signed-off-by: Kefu Chai <kchai@redhat.com>
+ (cherry picked from commit 6b68b27146852f057a3373cd04b08cd6917f3eea)
+
+commit 678b3e6082729698ce3575ba70313dd8399b1aed
+Author: Tim Serong <tserong@suse.com>
+Date: Sat May 2 01:59:53 2015 +1000
+
+ json_spirit: use utf8 intenally when parsing \uHHHH
+
+ When the python CLI is given non-ASCII characters, it converts them to
+ \uHHHH escapes in JSON. json_spirit parses these internally into 16 bit
+ characters, which could only work if json_spirit were built to use
+ std::wstring, which it isn't; it's using std::string, so the high byte
+ ends up being zero'd, leaving the low byte which is effectively garbage.
+
+ This hack^H^H^H^H change makes json_spirit convert to utf8 internally
+ instead, which can be stored just fine inside a std::string.
+
+ Note that this implementation still assumes \uHHHH escapes are four hex
+ digits, so it'll only cope with characters in the Basic Multilingual
+ Plane. Still, that's rather a lot more characters than it could cope
+ with before ;)
+
+ (For characters outside the BMP, Python seems to generate escapes in the
+ form \uHHHHHHHH, i.e. 8 hex digits, which the current implementation
+ doesn't expect to see)
+
+ Fixes: #7387
+
+ Signed-off-by: Tim Serong <tserong@suse.com>
+ (cherry picked from commit 8add15b86e7aaef41397ab8fa9e77ee7957eb607)
+
+commit ef6641c0aa47c7f559aa56d7c35a5815afc2ba49
+Author: Loic Dachary <ldachary@redhat.com>
+Date: Mon Mar 23 21:26:23 2015 +0100
+
+ ceph.spec: update OpenSUSE BuildRequires
+
+ OpenSUSE 13.2 needs libsnappy-devel but not bzip2-devel.
+
+ Signed-off-by: Loic Dachary <ldachary@redhat.com>
+ (cherry picked from commit bdac3dc3fb189688af52f60b0b34339dd8fea251)
+
+commit 0b6d4427ac7234fd509a9541adf45e303e40cb16 (refs/remotes/jashan/wip-hammer-11535-admin-socket, refs/remotes/gh/wip-hammer-11535-admin-socket)
+Author: Jon Bernard <jbernard@tuxion.com>
+Date: Fri May 8 11:54:06 2015 -0400
+
+ common/admin_socket: close socket descriptor in destructor
+
+ Long-running processes that do not reuse a single client connection will
+ see accumulating file descriptors as a result of not closing the
+ listening socket. In this case, eventually the system will reach
+ file-max and subsequent connections will fail.
+
+ Fixes: #11535
+
+ Signed-off-by: Jon Bernard <jbernard@tuxion.com>
+ (cherry picked from commit 88fabb1ee6cd3c7d211ca46919055195e32245db)
--- /dev/null
+commit 95292699291242794510b39ffde3f4df67898d3a (tag: refs/tags/v0.94.4, refs/remotes/gh/hammer)
+Author: Jenkins <jenkins@ceph.com>
+Date: Mon Oct 19 07:43:50 2015 -0700
+
+ 0.94.4
+
+commit 5764e233e56be08a59ffe6292f6fba9a76288aee
+Merge: 7f485ed b203979
+Author: Sage Weil <sage@redhat.com>
+Date: Thu Oct 15 16:35:10 2015 -0400
+
+ Merge pull request #6287 from jcsp/wip-test-fixes
+
+ git path backports for hammer
+
+commit b2039797638057dd74a8a47c99091c2c892b042e
+Author: Sage Weil <sage@redhat.com>
+Date: Thu Apr 16 08:29:41 2015 -0700
+
+ use git://git.ceph.com
+
+ Signed-off-by: Sage Weil <sage@redhat.com>
+ (cherry picked from commit 34c467ba06345eacd2fd0e79c162dfd0b22f0486)
+
+commit 0f4ef19047c58aacfb359bdd9d104f059aa2f5b4
+Author: Sage Weil <sage@redhat.com>
+Date: Thu Sep 24 18:10:46 2015 -0400
+
+ qa: http://ceph.com/qa -> http://download.ceph.com/qa
+
+ Signed-off-by: Sage Weil <sage@redhat.com>
+ (cherry picked from commit d4d65fbd6ad15320339751c604613ac63511e645)
+
+commit 7f485ed5aa620fe982561663bf64356b7e2c38f2
+Merge: 3dc1de2 294f016
+Author: Loic Dachary <loic@dachary.org>
+Date: Tue Oct 13 00:28:52 2015 +0200
+
+ Merge pull request #6161 from dachary/wip-13227-hammer
+
+ With root as default user, unable to have multiple RGW instances running
+
+ Reviewed-by: Sage Weil <sage@redhat.com>
+ Reviewed-by: Yehuda Sadeh <ysadehwe@redhat.com>
+ Reviewed-by: Ken Dreyer <kdreyer@redhat.com>
+
+commit 294f016ff84c7efef36ca94daef39fe2686df690
+Author: Sage Weil <sage@redhat.com>
+Date: Thu May 7 15:40:05 2015 -0700
+
+ init-radosgw.sysv: remove
+
+ Signed-off-by: Sage Weil <sage@redhat.com>
+ (cherry picked from commit 9d8c115b0ab05cfc1db6670d1d367737e61fe0ea)
+
+commit 3dc1de22552065bd930cc3e42a486e29639927ba
+Merge: aa74de9 7de65e7
+Author: Yehuda Sadeh <yehuda@redhat.com>
+Date: Mon Oct 12 08:16:17 2015 -0700
+
+ Merge pull request #6166 from dachary/wip-13046-hammer
+
+ RGW : setting max number of buckets for user via ceph.conf option
+
+commit aa74de9d34801552d7d3e0aced07b6bc5bd129b9
+Merge: d3e49eb 77cb503
+Author: Yehuda Sadeh <yehuda@redhat.com>
+Date: Mon Oct 12 08:15:21 2015 -0700
+
+ Merge pull request #6039 from ceph/wip-13015-hammer
+
+ rgw: don't preserve acls when copying object
+
+commit d3e49ebce00d749c36fe8dc46a5c432b1b907126
+Merge: 417e948 424fc1c
+Author: Yehuda Sadeh <yehuda@redhat.com>
+Date: Mon Oct 12 08:14:47 2015 -0700
+
+ Merge pull request #6042 from dreamhost/wip-hammer-crossftp
+
+ rgw: remove trailing :port from host for purposes of subdomain matching
+
+commit 417e948898d260a1ad6354244f9967ccbd75d768
+Merge: b5badcb 9ab9c44
+Author: Yehuda Sadeh <yehuda@redhat.com>
+Date: Mon Oct 12 08:14:09 2015 -0700
+
+ Merge pull request #6160 from dachary/wip-13228-hammer
+
+ rgw: segments are read during HEAD on Swift DLO
+
+commit b5badcb47e565cd17145adca49abf07e167963e0
+Merge: e3f8df9 6119b15
+Author: Yehuda Sadeh <yehuda@redhat.com>
+Date: Mon Oct 12 08:13:25 2015 -0700
+
+ Merge pull request #6162 from dachary/wip-13226-hammer
+
+ Keystone Fernet tokens break auth
+
+commit e3f8df9e12b434714b67036838f37b75ed1f9a25
+Merge: 8078233 ad83304
+Author: Yehuda Sadeh <yehuda@redhat.com>
+Date: Mon Oct 12 08:12:26 2015 -0700
+
+ Merge pull request #6163 from dachary/wip-13054-hammer
+
+ rgw: region data still exist in region-map after region-map update
+
+commit 8078233ca1dda8eef3c59d6a92760365634cf41a
+Merge: dd64c78 4b0686f
+Author: Yehuda Sadeh <yehuda@redhat.com>
+Date: Mon Oct 12 08:12:07 2015 -0700
+
+ Merge pull request #6164 from dachary/wip-13053-hammer
+
+ rgw: GWWatcher::handle_error -> common/Mutex.cc: 95: FAILED assert(r == 0)
+
+commit dd64c7813bbdd2a6a4ffde6767c5d060ee1b9290
+Merge: 135c112 e80bd0a
+Author: Yehuda Sadeh <yehuda@redhat.com>
+Date: Mon Oct 12 08:11:16 2015 -0700
+
+ Merge pull request #5718 from dachary/wip-12859-hammer
+
+ testGetContentType and testHead failed
+
+commit 135c112789d4925a735229394c0ec9e2b728d3ca
+Merge: fd17f3c 3b2affc
+Author: Yehuda Sadeh <yehuda@redhat.com>
+Date: Mon Oct 12 08:10:55 2015 -0700
+
+ Merge pull request #5860 from lebauce/wip-12960-hammer
+
+ rgw: add delimiter to prefix only when path is specified
+
+commit fd17f3ccbf98832098bd1cd35fe2a5d567b51f4c
+Merge: 036c718 297c04d
+Author: Yehuda Sadeh <yehuda@redhat.com>
+Date: Mon Oct 12 08:08:59 2015 -0700
+
+ Merge pull request #6165 from dachary/wip-13052-hammer
+
+ rgw: init_rados failed leads to repeated delete
+
+commit 036c7186f9304e4e48ecf50a4299cf74d55875fe
+Merge: 629b631 698d75c
+Author: Loic Dachary <loic@dachary.org>
+Date: Fri Oct 9 09:17:19 2015 +0200
+
+ Merge pull request #6201 from dachary/wip-13410-hammer
+
+ TEST_crush_rule_create_erasure consistently fails on i386 builder
+
+ Reviewed-by: Kefu Chai <kchai@redhat.com>
+
+commit 629b631488f044150422371ac77dfc005f3de1bc
+Merge: 70e612a 0a5b856
+Author: Sage Weil <sage@redhat.com>
+Date: Thu Oct 8 12:18:49 2015 -0400
+
+ Merge pull request #5885 from Abhishekvrshny/wip-13034-hammer
+
+ osd: copy-from doesn't preserve truncate_{seq,size}
+
+ Reviewed-by: Sage Weil <sage@redhat.com>
+
+commit 698d75c11fa116d6546b09d14484d094fae8f6d7
+Author: Loic Dachary <ldachary@redhat.com>
+Date: Wed Jul 22 10:42:32 2015 +0200
+
+ tests: robust test for the pool create crushmap test
+
+ The test that goes with f1e86be589803596e86acc964ac5c5c03b4038d8 to
+ verify that a bugous crush ruleset will prevent the creation of a pool
+ trying to use it was fragile. I depends on the implementation of the
+ erasure code lrc plugin and turns out to not work on i386.
+
+ The test is modified to use a fake crushtool that always returns false
+ and validate that it prevents the creation of a pool, which demonstrate
+ it is used for crushmap validation prior to the pool creation.
+
+ http://tracker.ceph.com/issues/12419 Fixes: #12419
+
+ Signed-off-by: Loic Dachary <ldachary@redhat.com>
+ (cherry picked from commit e47903727b5d53f795014bf29b417d357f2bd65a)
+
+commit 70e612a395f7f5daf2fa289d8ae522824ef7a38f
+Merge: 0650862 2a28114
+Author: Loic Dachary <loic@dachary.org>
+Date: Thu Oct 8 00:09:24 2015 +0200
+
+ Merge pull request #6192 from dachary/wip-13401-hammer
+
+ mon: fix crush testing for new pools
+
+ Reviewed-by: Sage Weil <sage@redhat.com>
+
+commit 2a28114053fbf4ceee09558790ad3cf755270d5f
+Author: Sage Weil <sage@redhat.com>
+Date: Fri Aug 21 16:40:34 2015 -0400
+
+ crush/CrushTester: test fewer inputs when running crushtool
+
+ If there are a lot of crush rules (say, 100) then the test can
+ take a long time. 100 values per rule should be enough to catch
+ most issues.
+
+ Signed-off-by: Sage Weil <sage@redhat.com>
+ (cherry picked from commit 0f82f461b33d93d868e185912a2c7e4074d06900)
+
+ Conflicts:
+ src/crush/CrushTester.cc
+ in hammer the crushtool validation is via a shell
+ and not via an internal subprocess utility
+
+commit abc5b5f139b05da0be0fbaa99282be16386980db
+Author: Loic Dachary <ldachary@redhat.com>
+Date: Sun Sep 20 23:42:45 2015 +0200
+
+ tests: update to match crushmap validation message
+
+ http://tracker.ceph.com/issues/13182 Fixes: #13182
+
+ Signed-off-by: Loic Dachary <ldachary@redhat.com>
+ (cherry picked from commit 21a1e75d8a7bad89a48cd9d36902c5d609be5015)
+
+ Conflicts:
+ qa/workunits/cephtool/test.sh
+ the test structure in hammer is different, adapt
+ the relevant test.
+
+commit 25bd2778f8b7f5eb5245efebca56a7348dd064eb
+Author: Sage Weil <sage@redhat.com>
+Date: Fri Sep 18 09:42:47 2015 -0400
+
+ mon/OSDMonitor: fix crush injection error message
+
+ Signed-off-by: Sage Weil <sage@redhat.com>
+ (cherry picked from commit 1b3090d50e5bd5ca3e6e396b23d2d9826896c718)
+
+ Conflicts:
+ src/mon/OSDMonitor.cc
+ hammer has a separate error message for EINTR
+ which is in the context of the fix for error message
+
+commit 6635530aa94b1f21c3052e64d4dfe3952f98fe83
+Author: Sage Weil <sage@redhat.com>
+Date: Fri Sep 18 09:41:25 2015 -0400
+
+ mon/OSDMonitor: only test crush ruleset for the newly created pool
+
+ Otherwise, we test *all* crush rules.. which might be a lot, and
+ which is a big waste of time and effort.
+
+ Signed-off-by: Sage Weil <sage@redhat.com>
+ (cherry picked from commit 524b0bdcc45c2f4b95f2239c988e93250f337f3d)
+
+ Conflicts:
+ src/mon/OSDMonitor.cc : trivial resolution
+
+commit cc1fedda02fbf3c95d7a00f0b395db5439e96f90
+Author: Sage Weil <sage@redhat.com>
+Date: Fri Sep 18 09:40:13 2015 -0400
+
+ crush/CrushTester: allow testing by ruleset
+
+ Signed-off-by: Sage Weil <sage@redhat.com>
+ (cherry picked from commit aa238e5ed50f44a94caf84567267e4f6be8732a2)
+
+ Conflicts:
+ src/crush/CrushTester.cc
+ in hammer the crushtool validation is via a shell
+ and not via an internal subprocess utility
+ src/tools/crushtool.cc
+ ceph_argparse_withint is preferred to ceph_argparse_witharg
+
+commit 065086246290cfa02f67c37c95a2ccdb05872f21
+Merge: 79385a8 3a50b90
+Author: Sage Weil <sage@redhat.com>
+Date: Tue Oct 6 11:11:14 2015 -0400
+
+ Merge pull request #5887 from Abhishekvrshny/wip-13044-hammer
+
+ LibCephFS.GetPoolId failure
+
+ Reviewed-by: Sage Weil <sage@redhat.com>
+
+commit 79385a85beea9bccd82c99b6bda653f0224c4fcd
+Merge: 5b25fc9 3228161
+Author: Loic Dachary <loic@dachary.org>
+Date: Sun Oct 4 15:33:49 2015 +0200
+
+ Merge pull request #6172 from dachary/wip-13354-hammer
+
+ qa/workunits/cephtool/test.sh: don't assume crash_replay_interval=45
+
+ Reviewed-by: Loic Dachary <ldachary@redhat.com>
+
+commit 322816116ea14a8fd79616b1c55545ae7c62e7f6
+Author: Sage Weil <sage@redhat.com>
+Date: Mon Sep 28 13:13:40 2015 -0400
+
+ qa/workunits/cephtool/test.sh: don't assume crash_replay_interval=45
+
+ e.g., it's 5 in teuthology's ceph.conf.
+
+ Signed-off-by: Sage Weil <sage@redhat.com>
+ (cherry picked from commit 80b7237e5e74d12b9d8b1f96ea535c96bdff9c6f)
+
+commit ad833044dee4208625213bc83c7847ce9d1a73aa
+Author: dwj192 <duanweijun@h3c.com>
+Date: Wed Sep 9 09:48:16 2015 +0800
+
+ rgw:add --reset-regions for regionmap update
+
+ Fixes: #12964
+
+ Signed-off-by: Weijun Duan <duanweijun@h3c.com>
+ (cherry picked from commit 95685c19d6f1eab50b903e61273b5351bedc2980)
+
+ Conflicts:
+ src/rgw/rgw_admin.cc: usage is on cerr in hammer, not cout
+ src/test/cli/radosgw-admin/help.t: remove extra empty line
+
+commit 5b25fc9c8431423c6239da2eafcf7e8863d2262f
+Merge: e72bdc3 9026c4a
+Author: Loic Dachary <loic@dachary.org>
+Date: Sat Oct 3 09:39:12 2015 +0200
+
+ Merge pull request #6156 from dachary/wip-13170-hammer
+
+ doc: update docs to point to download.ceph.com
+
+ Reviewed-by: Abhishek Varshney <abhishek.varshney@flipkart.com>
+
+commit 7de65e7ede52f3e417c354f180cfd80f1407c6cb
+Author: Vikhyat Umrao <vumrao@redhat.com>
+Date: Thu Sep 3 12:02:05 2015 +0530
+
+ rgw : setting max number of buckets for users via ceph.conf option
+
+ This patch adds a new option "rgw_user_max_buckets" for setting
+ max number of buckets for users via ceph.conf.
+
+ Fixes #12714
+
+ Signed-off-by: Vikhyat Umrao <vumrao@redhat.com>
+ (cherry picked from commit f65267c96cbd4cd25036b6bf399692e77bbb9436)
+
+ Conflicts:
+ src/rgw/rgw_admin.cc: usage is on cerr in hammer, not cout
+
+commit 297c04d856c4864d21b2241ad01560afa61dde40
+Author: Xiaowei Chen <cxwshawn@gmail.com>
+Date: Tue Sep 8 06:58:57 2015 -0400
+
+ rgw: init_rados failed leads to repeated delete
+
+ Fixes: #12978
+
+ Signed-off-by: Xiaowei Chen <chen.xiaowei@h3c.com>
+ (cherry picked from commit ab4232baa7bcc86e90746e13312ac9bda1772872)
+
+commit 4b0686f18f323b95adb1fc5cffe7c1e55e8f1c63
+Author: Yehuda Sadeh <yehuda@redhat.com>
+Date: Wed Aug 26 15:08:18 2015 -0700
+
+ rgw: delete finisher only after finalizing watches
+
+ Fixes: #12208
+
+ The watch error path might try to schedule a finisher work, delete finisher
+ only after watch destruction.
+
+ Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
+ (cherry picked from commit 97aed59fb9e865d30d31d2b7f4e93fc9727c96fa)
+
+commit 6119b152412ddfa2a614c1862aad52a123a4fe8e
+Author: Abhishek Lekshmanan <abhishek.lekshmanan@ril.com>
+Date: Mon Aug 24 23:11:35 2015 +0530
+
+ rgw: be more flexible with iso8601 timestamps
+
+ make parsing 8601 more flexible by not restricting the length of seconds
+ to 5, this allows timestamp to be specified both as ms or us. Newer
+ keystone backends such as fernet token backend default to microseconds
+ when publishing iso8601 timestamps, so this allows these timestamps to
+ be allowed when specifying the token expiry time.
+
+ Fixes: #12761
+ Reported-by: Ian Unruh <ianunruh@gmail.com>
+ Signed-off-by: Abhishek Lekshmanan <abhishek.lekshmanan@ril.com>
+ (cherry picked from commit 136242b5612b8bbf260910b1678389361e86d22a)
+
+commit 607904e8d5616bd7df20e1e387a14d55e4ca43b6
+Author: Sage Weil <sage@redhat.com>
+Date: Tue Sep 22 14:12:02 2015 -0400
+
+ init-radosgw: specify pid file to start-stop-daemon
+
+ This fixes restart when multiple instances are running.
+
+ Fixes: #12407
+ Tested-by: Pavan Rallabhandi <pavan.rallabhandi@sandisk.com>
+ Signed-off-by: Sage Weil <sage@redhat.com>
+ (cherry picked from commit e17c8e1a7a06db0e2680dedc7e954021610320d1)
+
+commit f51ab26d8721bde6852e5c169869d7ae16bd0574
+Author: Vikhyat Umrao <vumrao@redhat.com>
+Date: Thu Jul 23 18:10:06 2015 +0530
+
+ rgw: fix radosgw start-up script.
+
+ radosgw init script is unable to start radosgw daemon.
+ as it is relies on requiretty being disabled.
+ once init script start this daemon with sudo it fails
+ to start the daemon.
+
+ changing 'sudo' to 'su', it will fix this issue and
+ will also help running radosgw daemon with our new
+ "ceph" UID project.
+
+ Fixes: #10927
+
+ Signed-off-by: Vikhyat Umrao <vumrao@redhat.com>
+ (cherry picked from commit c83542296aeb8f5dd96f5d9e09327e7a89370742)
+
+commit 544a98fa9dd47d02778f622de5f7ebe1acccc12f
+Author: Sage Weil <sage@redhat.com>
+Date: Thu May 7 15:39:22 2015 -0700
+
+ init-radosgw: unify init-radosgw[.sysv]
+
+ Signed-off-by: Sage Weil <sage@redhat.com>
+ (cherry picked from commit 1c45f512a91ee49e9253ba6fd3857af9bd2ae57a)
+
+commit 2a733e9e720bcdb8ea342a96be679d6f9efa3b2b
+Author: Sage Weil <sage@redhat.com>
+Date: Thu May 7 15:29:11 2015 -0700
+
+ init-radosgw: look in /var/lib/ceph/radosgw
+
+ Signed-off-by: Sage Weil <sage@redhat.com>
+ (cherry picked from commit a4bb992426b39188e750fce9198052ca0d510117)
+
+commit d00c52b874ddc74aa5f4c2e07b70b881ce963114
+Author: Nathan Cutler <ncutler@suse.cz>
+Date: Sun May 10 18:17:53 2015 +0200
+
+ doc: rgw: fix typo in comments
+
+ Signed-off-by: Nathan Cutler <ncutler@suse.cz>
+ (cherry picked from commit 05cf0db22dc3a9cb2bf4b86b8f240683c23f41ac)
+
+commit eb001d3a7275cc040bea716b8bdb0cf8b97efbc9
+Author: Dmitry Yatsushkevich <dyatsushkevich@mirantis.com>
+Date: Tue Mar 17 15:44:52 2015 -0700
+
+ rgw: init script waits until the radosgw stops
+
+ Fixes: #11140
+ Init script waits in stop action until the radowgw daemons stop.
+
+ Signed-off-by: Dmitry Yatsushkevich <dyatsushkevich@mirantis.com>
+ (cherry picked from commit 1cca0c1e91a1e18f82f4d22855e96b2fc947f5ea)
+
+commit 9ab9c44583c96f1679db3dbcef322a706548a7dd
+Author: Yehuda Sadeh <yehuda@redhat.com>
+Date: Thu Sep 17 09:10:39 2015 -0700
+
+ rgw: don't read actual data on user manifest HEAD
+
+ Fixes: #12780
+ We unconditionally read all the data, which is not needed
+ when doing HEAD operation on user manifest objects.
+
+ Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
+ Signed-off-by: Radoslaw Zarzynski <rzarzynski@mirantis.com>
+ (cherry picked from commit 4a8b08d1dd2511e28e999f1625103fb919fb5465)
+
+commit 9026c4a7c7699a9a013d4fe207e6681403f934a6
+Author: Alfredo Deza <adeza@redhat.com>
+Date: Fri Sep 18 14:20:12 2015 -0400
+
+ doc: remove mention of ceph-extra as a requirement
+
+ Signed-off-by: Alfredo Deza <adeza@redhat.com>
+ (cherry picked from commit a6f07e9fa3bd5e50a2d8cfa387b44a39d383fa65)
+
+commit 45ed24da879fe12b921cf03e4a921ccc0582b8d2
+Author: Alfredo Deza <adeza@redhat.com>
+Date: Fri Sep 18 14:13:21 2015 -0400
+
+ doc: remove ceph-extras
+
+ Signed-off-by: Alfredo Deza <adeza@redhat.com>
+ (cherry picked from commit c0ef84fd22aac58b6ec8e58eb4f8dffed306d39e)
+
+commit faccdce79e003318c751dd9203773af7ed31d052
+Author: Alfredo Deza <adeza@redhat.com>
+Date: Fri Sep 18 14:13:02 2015 -0400
+
+ doc: correct links to download.ceph.com
+
+ Signed-off-by: Alfredo Deza <adeza@redhat.com>
+ (cherry picked from commit 387d7800359154950431d0984c756f43f21dd9b4)
+
+commit e9f4aecf3f406b42b74f840edb398be9243da85a
+Author: ritz303 <ritz_303@yahoo.com>
+Date: Tue Aug 25 10:02:49 2015 -0500
+
+ doc: Added "Hammer" in the list of major releases.
+
+ Fixes: #12771
+
+ Signed-off-by: ritz303 <ritz_303@yahoo.com>
+ (cherry picked from commit 582f0f64455079290ad3b4ae7338b716e170911f)
+
+commit 424fc1ccb244f5084f94904cb20cbf88a1bd4638
+Author: Yehuda Sadeh <yehuda@redhat.com>
+Date: Fri Sep 25 10:44:40 2015 -0700
+
+ rgw: set default value for env->get() call
+
+ Fixes: #13239
+
+ This fixes a regression introduced at commit abe4ec293d08b0314bf5c081ace2456073f3a22c.
+ The host var is a string, env->get() returns a char pointer, shouldn't
+ pass in NULL.
+
+ Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
+ (cherry picked from commit 0d5730efc0054334897315dc23ba04f30548e36e)
+ Signed-off-by: Robin H. Johnson <robin.johnson@dreamhost.com>
+
+commit e72bdc3bf1541e445f74def70b5aa185f1757468
+Author: Sage Weil <sage@redhat.com>
+Date: Mon Sep 21 11:41:03 2015 -0400
+
+ osd/ReplicatedPG: tolerate promotion completion with stopped agent
+
+ We may start a promotion, then get a pool update that disables the
+ agent, and then complete it. We should not segfault in this case.
+
+ Fixes: #13190
+ Signed-off-by: Sage Weil <sage@redhat.com>
+ (cherry picked from commit fd9ce66e8b76787f69c5e337332d57aa72c8b8d5)
+
+commit a3afb3f59435050efa711436134b4abe63a8f5cf
+Author: Sage Weil <sage@redhat.com>
+Date: Tue Jun 9 14:15:10 2015 -0400
+
+ rgw: remove trailing :port from host for purposes of subdomain matching
+
+ Some clients (ahem, CrossFTP) include the :port in the HTTP_HOST header.
+ Strip it out.
+
+ Switch req_info field to a std::string and avoid copying it in preprocess.
+
+ Signed-off-by: Sage Weil <sage@redhat.com>
+ (cherry picked from commit abe4ec293d08b0314bf5c081ace2456073f3a22c)
+
+commit fe0fc4f18f6f275b34e8bbfa868a7310ecc3842f
+Merge: e26f8bc 8ba6b2f
+Author: Yehuda Sadeh <yehuda@redhat.com>
+Date: Thu Sep 24 14:01:26 2015 -0700
+
+ Merge pull request #5715 from dachary/wip-12592-hammer
+
+ RGW returns requested bucket name raw in Bucket response header
+
+commit e26f8bc2dbc82b6ff31d2bd2d5c890aa12da9f4a
+Merge: 19e549e 6acf36f
+Author: Yehuda Sadeh <yehuda@redhat.com>
+Date: Thu Sep 24 14:00:55 2015 -0700
+
+ Merge pull request #5719 from dachary/wip-12855-hammer
+
+ segmentation fault when rgw_gc_max_objs > HASH_PRIME
+
+commit 19e549e9c2fbacdbf747344c1dafcc6b66902339
+Merge: 2b11a4c a13c7fd
+Author: Yehuda Sadeh <yehuda@redhat.com>
+Date: Thu Sep 24 14:00:09 2015 -0700
+
+ Merge pull request #5720 from dachary/wip-12854-hammer
+
+ the arguments 'domain' should not be assigned when return false
+
+commit 77cb503ba057f033825aa40d57dee42e838c67ac (refs/remotes/gh/wip-13015-hammer)
+Author: Yehuda Sadeh <yehuda@redhat.com>
+Date: Wed Sep 9 15:41:02 2015 -0700
+
+ rgw: preserve all attrs if intra-zone copy
+
+ Fixes: #13015
+ Intra zone copy requires that all objects' attributes are preserved.
+
+ Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
+
+commit b9f2ed303eedfa0b747884f8e66fbe97cfeeb0d5
+Author: Yehuda Sadeh <yehuda@redhat.com>
+Date: Thu Aug 13 10:59:32 2015 -0700
+
+ rgw: don't preserve acls when copying object
+
+ Fixes: #12370
+
+ When copying an object we need to use the acls we calculated earlier,
+ and not the source acls.
+ This was broken at e41d97c8e38bb60d7e09e9801c0179efe7af1734.
+
+ Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
+ (cherry picked from commit fb020247449d3daf033885bab5b3a10c0e5df4a5)
+
+commit 2b11a4c07a9416a2f75c8ce62a923994977d799c
+Merge: 0022c03 b3822f1
+Author: Loic Dachary <loic@dachary.org>
+Date: Tue Sep 15 10:23:49 2015 +0200
+
+ Merge pull request #5930 from liewegas/wip-11798-hammer
+
+ upstart: limit respawn to 3 in 30 mins (instead of 5 in 30s)
+
+ Reviewed-by: Loic Dachary <ldachary@redhat.com>
+
+commit 0022c035476eff471a777b23a619d024f632a1bf
+Merge: 23fb811 0d6a8c6
+Author: Loic Dachary <loic@dachary.org>
+Date: Mon Sep 14 23:57:13 2015 +0200
+
+ Merge pull request #5908 from liewegas/wip-simple-connect-hammer
+
+ Pipe: Drop connect_seq increase line
+
+ Reviewed-by: Greg Farnum <gfarnum@redhat.com>
+
+commit b3822f113e07547194b844f647bcb7d45513b25f (refs/remotes/me/wip-11798-hammer)
+Author: Sage Weil <sage@redhat.com>
+Date: Wed Jun 3 14:57:34 2015 -0400
+
+ upstart: limit respawn to 3 in 30 mins (instead of 5 in 30s)
+
+ It may take tens of seconds to restart each time, so 5 in 30s does not stop
+ the crash on startup respawn loop in many cases. In particular, we'd like
+ to catch the case where the internal heartbeats fail.
+
+ This should be enough for all but the most sluggish of OSDs and capture
+ many cases of failure shortly after startup.
+
+ Fixes: #11798
+ Signed-off-by: Sage Weil <sage@redhat.com>
+ (cherry picked from commit eaff6cb24ef052c54dfa2131811758e335f19939)
+
+commit 0d6a8c631f55367ac4f6f792a10ba62cd97e9fed (refs/remotes/me/wip-simple-connect-hammer)
+Author: Haomai Wang <haomaiwang@gmail.com>
+Date: Wed Feb 25 23:38:54 2015 +0800
+
+ Pipe: Drop connect_seq increase line
+
+ Revert commit 0fc47e267b6f8dcd4511d887d5ad37d460374c25.
+
+ When accepting and "connect.connect_seq == existing->connect_seq",
+ existing->state maybe STATE_OPEN, STATE_STANDBY or STANDY_CONNECTING.
+ This commit only fix partial problem and want to assert
+ "(existing->state == STATE_CONNECTING)".
+
+ So later we added codes to catch
+ "(existing->state == STATE_OPEN || existing->state == STATE_STANDBY)"
+ before asserting.
+
+ Backport: dumpling, firefly, giant
+
+ Signed-off-by: Haomai Wang <haomaiwang@gmail.com>
+ (cherry picked from commit 67225cb3ee1f6d274a02293724942bdb25cec8ca)
+
+commit 23fb811303971152f1c348e2a02de4e2bc6ed53d
+Merge: c1849ec 6c4ccc8
+Author: Loic Dachary <loic@dachary.org>
+Date: Sun Sep 13 14:10:23 2015 +0200
+
+ Merge pull request #5767 from dachary/wip-12597-hammer
+
+ Crash during shutdown after writeback blocked by IO errors
+
+ Reviewed-by: Jason Dillaman <dillaman@redhat.com>
+
+commit c1849ecfb2ae55b99b6db75ee49af19886c246b2
+Merge: f35c53d f028389
+Author: Sage Weil <sage@redhat.com>
+Date: Sun Sep 13 07:42:36 2015 -0400
+
+ Merge pull request #5687 from liewegas/wip-hammer-feature-hammer
+
+ include/ceph_features: define HAMMER_0_94_4 feature
+
+commit f35c53df7c155d7ff4a316a0817b11bc018c57ca
+Merge: 6e22620 4be8a28
+Author: Sage Weil <sage@redhat.com>
+Date: Sat Sep 12 09:23:13 2015 -0400
+
+ Merge pull request #5892 from ceph/wip-13060-hammer
+
+ osd: allow peek_map_epoch to return an error
+
+ Reviewed-by: David Zafman <dzafman@redhat.com>
+
+commit 4be8a28d5b5ba868d100300ab64ebb82b188222b
+Author: Sage Weil <sage@redhat.com>
+Date: Fri Sep 11 11:00:38 2015 -0400
+
+ osd/PG: peek_map_epoch: skip legacy PGs if infos object is missing
+
+ - pg is removed
+ - osd is stopped before pg is fully removed
+ - on restart, we ignore/skip the pg because its epoch is too old
+ - we upgrade to hammer and convert other pgs, skipping this one, and then
+ remove the legacy infos object
+ - hammer starts, tries to parse the legacy pg, and fails because the infos
+ object is gone, crashing.
+
+ The fix is to continue ignoring the zombie pg.
+
+ Fixes: #16030
+ Signed-off-by: Sage Weil <sage@redhat.com>
+
+commit f237ed97228839a1b412ad213945f0343df05bf5
+Author: Sage Weil <sage@redhat.com>
+Date: Fri Sep 11 17:41:01 2015 -0400
+
+ osd: allow peek_map_epoch to return an error
+
+ Allow PG::peek_map_epoch to return an error indicating the PG
+ should be skipped.
+
+ Signed-off-by: Sage Weil <sage@redhat.com>
+ (cherry picked from commit f15d9585edc5a12ac2d076951076247253b897c2)
+
+ [fixed *pepoch default of 0]
+ [fixed other return paths in peek_map_epoch]
+
+commit 3a50b904a2ffd613b695ead1b26c93278044d7df
+Author: Yan, Zheng <zyan@redhat.com>
+Date: Wed Aug 5 15:19:13 2015 +0800
+
+ crypto: fix unbalanced ceph::crypto::init/ceph::crypto:shutdown
+
+ we may create a CephContext without calling common_init_finish(), then
+ delete the CephContext. In this case, ceph::crypto:init() is not called,
+ so CephContext::~CephContext() should not call ceph::crypto::shutdown().
+
+ Fixes: #12598
+ Signed-off-by: Yan, Zheng <zyan@redhat.com>
+ (cherry picked from commit 98a85ec6464d8ec3fc7f0c647ac97c8cf002ebe2)
+
+commit 0a5b8569ecc6efa42b3d4fa7a58c155b3c2dbbe8
+Author: Samuel Just <sjust@redhat.com>
+Date: Thu Jul 30 16:59:32 2015 -0700
+
+ ReplicatedPG,Objecter: copy_get should include truncate_seq and size
+
+ Otherwise, we break CephFS over cache tiers.
+
+ Fixes: #12551
+ Signed-off-by: Samuel Just <sjust@redhat.com>
+ (cherry picked from commit 6f9ee7961eee9ee3a61a07cbe0d8d289ee98fa9a)
+
+ Conflicts:
+ src/osd/ReplicatedPG.cc
+
+commit 6e22620165872a88ab4b75ed2fb93f61beb65d12
+Merge: 508733f 00e73ad
+Author: Josh Durgin <jdurgin@redhat.com>
+Date: Wed Sep 9 19:44:09 2015 -0400
+
+ Merge pull request #5769 from dachary/wip-12850-hammer
+
+ Crash during TestInternal.MultipleResize
+
+ Reviewed-by: Josh Durgin <jdurgin@redhat.com>
+
+commit 508733fd48f2c704b79ad36841346965f4d0429b
+Merge: 69a320e dc693fc
+Author: Josh Durgin <jdurgin@redhat.com>
+Date: Wed Sep 9 19:44:01 2015 -0400
+
+ Merge pull request #5768 from dachary/wip-12849-hammer
+
+ [ FAILED ] TestLibRBD.BlockingAIO
+
+ Reviewed-by: Josh Durgin <jdurgin@redhat.com>
+
+commit 82ea02ab8d886c16c511c4bd7d03d826158f954b
+Author: Yehuda Sadeh <yehuda@redhat.com>
+Date: Wed Jun 17 11:35:18 2015 -0700
+
+ rgw: fix assignment of copy obj attributes
+
+ Fixes: #11563
+ Clarify the confusing usage of set_copy_attrs() by switching the source and
+ destinatiion params (attrs, src_attrs). Switch to use attrs instead of
+ src_attrs afterwards. In one of the cases we originally used the wrong
+ variable.
+
+ Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
+ (cherry picked from commit e41d97c8e38bb60d7e09e9801c0179efe7af1734)
+
+commit 3b2affce1a229cead3e0ffacfdfde69258a267cb
+Author: Sylvain Baubeau <sbaubeau@redhat.com>
+Date: Fri Sep 4 22:51:44 2015 +0200
+
+ rgw: add delimiter to prefix only when path is specified
+
+ http://tracker.ceph.com/issues/12960
+ Fixes: #12960
+
+ Signed-off-by: Sylvain Baubeau <sbaubeau@redhat.com>
+ (cherry picked from commit 27cf257248ea55f8f4bc7851c3956611828bcae2)
+
+commit 69a320e185f20da0824d0a62d3de77578c431a7a
+Merge: 8039375 0bc909e
+Author: Loic Dachary <loic@dachary.org>
+Date: Wed Sep 9 16:58:56 2015 +0200
+
+ Merge pull request #5697 from tchaikov/wip-12638-hammer
+
+ mon: add a cache layer over MonitorDBStore
+
+ Reviewed-by: Joao Eduardo Luis <joao@suse.de>
+
+commit 8039375327b5074a700193aae2d8b1922ca85398
+Merge: 19ff928 256620e
+Author: Loic Dachary <loic@dachary.org>
+Date: Wed Sep 9 14:52:54 2015 +0200
+
+ Merge pull request #5381 from dachary/wip-12499-hammer
+
+ ceph-fuse 0.94.2-1trusty segfaults / aborts
+
+ Reviewed-by: Greg Farnum <gfarnum@redhat.com>
+
+commit 19ff92806fd1e0fb866737f58e379aa8078b8017
+Merge: 7614bf7 059bf98
+Author: David Zafman <dzafman@redhat.com>
+Date: Tue Sep 8 14:58:16 2015 -0700
+
+ Merge pull request #5757 from dachary/wip-12836-hammer
+
+ WBThrottle::clear_object: signal on cond when we reduce throttle values
+
+ Reviewed-by: David Zafman <dzafman@redhat.com>
+
+commit 7614bf7d117fdd476931cdd8825265321cef3c4c
+Merge: 2100631 bf72785
+Author: Loic Dachary <loic@dachary.org>
+Date: Mon Sep 7 10:06:30 2015 +0200
+
+ Merge pull request #5759 from dachary/wip-12841-hammer
+
+ recursive lock of md_config_t (0)
+
+ Reviewed-by: Sage Weil <sage@redhat.com>
+
+commit 210063120708a7d6502c2b8d3e8c61731e37de5b
+Merge: a2e1fe2 836f763
+Author: Loic Dachary <loic@dachary.org>
+Date: Mon Sep 7 10:05:41 2015 +0200
+
+ Merge pull request #5761 from dachary/wip-12843-hammer
+
+ long standing slow requests: connection->session->waiting_for_map->connection ref cycle
+
+ Reviewed-by: Sage Weil <sage@redhat.com>
+
+commit a2e1fe26f602d0165999dfb72b97985f9bfe38ce
+Merge: 8ccb771 2348a5b
+Author: Loic Dachary <loic@dachary.org>
+Date: Mon Sep 7 10:04:51 2015 +0200
+
+ Merge pull request #5762 from dachary/wip-12844-hammer
+
+ osd suicide timeout during peering - search for missing objects
+
+ Reviewed-by: Sage Weil <sage@redhat.com>
+
+commit 8ccb7711d68dd3b95d2522c6e46f5021362c9088
+Merge: e9db807 77624af
+Author: Loic Dachary <loic@dachary.org>
+Date: Mon Sep 7 10:04:03 2015 +0200
+
+ Merge pull request #5763 from dachary/wip-12846-hammer
+
+ osd/PGLog.cc: 732: FAILED assert(log.log.size() == log_keys_debug.size())
+
+ Reviewed-by: Sage Weil <sage@redhat.com>
+
+commit e9db8075034dc4ac0ffe5d8dd9dd2153509237fa
+Merge: 5ef999e aa00373
+Author: Loic Dachary <loic@dachary.org>
+Date: Mon Sep 7 10:03:10 2015 +0200
+
+ Merge pull request #5764 from dachary/wip-12847-hammer
+
+ common: do not insert emtpy ptr when rebuild emtpy bufferlist
+
+ Reviewed-by: Sage Weil <sage@redhat.com>
+
+commit 5ef999e4a1dc04d7b7e58b1a61f85511099fd6d4
+Merge: c243f7a cd11b88
+Author: Loic Dachary <loic@dachary.org>
+Date: Mon Sep 7 10:02:14 2015 +0200
+
+ Merge pull request #5373 from dachary/wip-12489-hammer
+
+ pg_interval_t::check_new_interval - for ec pool, should not rely on min_size to determine if the PG was active at the interval
+
+ Reviewed-by: Sage Weil <sage@redhat.com>
+
+commit c243f7a33b0fff261bb92595a3cc7abf12b7e56d
+Merge: e61fdc6 7bddf5d
+Author: Loic Dachary <loic@dachary.org>
+Date: Mon Sep 7 10:00:32 2015 +0200
+
+ Merge pull request #5383 from dachary/wip-12504-hammer
+
+ rest-bench common/WorkQueue.cc: 54: FAILED assert(_threads.empty())
+
+ Reviewed-by: Kefu Chai <kchai@redhat.com>
+
+commit e61fdc67031b0358800335b638c96d22ecb85bd6
+Merge: 62f543b 9f69660
+Author: Loic Dachary <loic@dachary.org>
+Date: Mon Sep 7 09:54:07 2015 +0200
+
+ Merge pull request #5765 from dachary/wip-12883-hammer
+
+ cache agent is idle although one object is left in the cache
+
+ Reviewed-by: Kefu Chai <kchai@redhat.com>
+
+commit 62f543bbb092554746d3b89aab4b1ea75a5cdbf1
+Merge: f25315c e471c5d
+Author: Loic Dachary <loic@dachary.org>
+Date: Mon Sep 7 09:53:14 2015 +0200
+
+ Merge pull request #5754 from dachary/wip-12588-hammer
+
+ Change radosgw pools default crush ruleset
+
+ Reviewed-by: Kefu Chai <kchai@redhat.com>
+
+commit f25315c1e7e6e4700c2f39ba849dbcb25b0f1f89
+Merge: 021abe7 43a72e4
+Author: Loic Dachary <loic@dachary.org>
+Date: Mon Sep 7 09:51:50 2015 +0200
+
+ Merge pull request #5377 from dachary/wip-12396-hammer
+
+ register_new_pgs() should check ruleno instead of its index
+
+ Reviewed-by: Kefu Chai <kchai@redhat.com>
+
+commit 021abe742ccec876497468ac556b9dfaf6c9503d
+Merge: 4125196 c94fd92
+Author: Sage Weil <sage@redhat.com>
+Date: Sun Sep 6 21:07:38 2015 -0400
+
+ Merge pull request #5758 from dachary/wip-12839-hammer
+
+ Mutex Assert from PipeConnection::try_get_pipe
+
+commit 9f69660133f9534722589801a6fc827b74bead44
+Author: Loic Dachary <ldachary@redhat.com>
+Date: Thu Aug 13 19:41:47 2015 +0200
+
+ tests: tiering agent and proxy read
+
+ Verify that an object promoted to a cache tier because of a proxy read
+ is evicted as expected.
+
+ http://tracker.ceph.com/issues/12673 Refs: #12673
+
+ Signed-off-by: Loic Dachary <ldachary@redhat.com>
+ (cherry picked from commit 7924231930732bd297d3bd034c8295e96cb81088)
+
+commit 5656eec0000e95ea790c796a9f572c7261163cfa
+Author: Loic Dachary <ldachary@redhat.com>
+Date: Thu Aug 13 13:47:24 2015 +0200
+
+ osd: trigger the cache agent after a promotion
+
+ When a proxy read happens, the object promotion is done in parallel. The
+ agent_choose_mode function must be called to reconsider the situation
+ to protect against the following scenario:
+
+ * proxy read
+ * agent_choose_mode finds no object exists and the agent
+ goes idle
+ * object promotion happens
+ * the agent does not reconsider and eviction does not happen
+ although it should
+
+ http://tracker.ceph.com/issues/12673 Fixes: #12673
+
+ Signed-off-by: Loic Dachary <ldachary@redhat.com>
+ (cherry picked from commit e1f58feb9b1d20b72f2eb2eefdea5982e0cddccd)
+
+commit 4125196d31de8933656561b2f860e16a546ec4b9
+Merge: 47af509 f47ba4b
+Author: Loic Dachary <loic@dachary.org>
+Date: Sun Sep 6 23:17:22 2015 +0200
+
+ Merge pull request #5276 from dachary/wip-11824-hammer
+
+ implicit erasure code crush ruleset is not validated
+
+ Reviewed-by: Loic Dachary <ldachary@redhat.com>
+
+commit 47af509003e551238702858ccd845b930e5ef1ed
+Merge: 2fd8ec8 1e05578
+Author: Loic Dachary <loic@dachary.org>
+Date: Sun Sep 6 17:24:43 2015 +0200
+
+ Merge pull request #5382 from dachary/wip-12500-hammer
+
+ segfault launching ceph-fuse with bad --name
+
+ Reviewed-by: Sage Weil <sage@redhat.com>
+
+commit 2fd8ec8385a90daaa1bdb9de189ec73c7ba49c6c
+Merge: e6bdae9 fa19474
+Author: Loic Dachary <loic@dachary.org>
+Date: Sun Sep 6 17:23:19 2015 +0200
+
+ Merge pull request #5367 from dachary/wip-12311-hammer
+
+ read on chunk-aligned xattr not handled
+
+ Reviewed-by: Sage Weil <sage@redhat.com>
+
+commit dc693fcaf2c596087b434f9e90fbc553394b9a14
+Author: Jason Dillaman <dillaman@redhat.com>
+Date: Wed Jul 29 12:46:24 2015 -0400
+
+ lockdep: allow lockdep to be dynamically enabled/disabled
+
+ librbd test cases attempt to enable lockdep coverage via the librados
+ API. Use a configuration observer to register/unregister lockdep
+ support.
+
+ Signed-off-by: Jason Dillaman <dillaman@redhat.com>
+ (cherry picked from commit af0cade0293be22e74a3293765676c7b227b06c4)
+
+commit 805732b143fd28603238969ba784adb57eff1a12
+Author: Jason Dillaman <dillaman@redhat.com>
+Date: Tue Jul 28 14:23:14 2015 -0400
+
+ tests: librbd API test cannot use private md_config_t struct
+
+ Remove all depencencies on md_config_t and instead use librados API
+ methods to get/set configuration values.
+
+ Fixes: #12479
+ Backport: hammer
+ Signed-off-by: Jason Dillaman <dillaman@redhat.com>
+ (cherry picked from commit 2c51aadb447d3447b5dace19c5cb6268e94247c8)
+
+commit 7ac01731bcb0f1d46cf98ecf623c7e8e6cb1a38e
+Author: Jason Dillaman <dillaman@redhat.com>
+Date: Thu Apr 9 15:06:27 2015 -0400
+
+ tests: ensure old-format RBD tests still work
+
+ Override the RBD default image format back to version 1
+ to ensure tests properly cover the old format.
+
+ Signed-off-by: Jason Dillaman <dillaman@redhat.com>
+ (cherry picked from commit 3b95edb5bd373bd05f83516eccfd30a6b5cf4693)
+
+commit b68d7574d12944589b246281474bcad01f5347be
+Author: Jason Dillaman <dillaman@redhat.com>
+Date: Thu Jul 30 09:00:57 2015 -0400
+
+ librados_test_stub: implement conf get/set API methods
+
+ Signed-off-by: Jason Dillaman <dillaman@redhat.com>
+ (cherry picked from commit 4d03c664f2a9362009c7e3077ed65e2989f0f21b)
+
+commit f0fa637e4a91a93a326ba303bc22101fadcc787d
+Author: Jason Dillaman <dillaman@redhat.com>
+Date: Tue Jul 28 13:14:29 2015 -0400
+
+ crypto: use NSS_InitContext/NSS_ShutdownContex to avoid memory leak
+
+ Switched to context-aware NSS init/shutdown functions to avoid conflicts
+ with parent application. Use a reference counter to properly shutdown the
+ NSS crypto library when the last CephContext is destroyed. This avoids
+ memory leaks with the NSS library from users of librados.
+
+ Signed-off-by: Jason Dillaman <dillaman@redhat.com>
+ (cherry picked from commit 9fa0112dd9286178da1d76020158503b2062d252)
+
+commit 3f542aa2410139bece0f4192079e4e34260da782
+Author: Yan, Zheng <zyan@redhat.com>
+Date: Sat Mar 21 07:13:51 2015 +0800
+
+ auth: use crypto_init_mutex to protect NSS_Shutdown()
+
+ Signed-off-by: Yan, Zheng <zyan@redhat.com>
+ (cherry picked from commit cf058174fe6be26129eb52f4fb24d0f7146ef7af)
+
+commit e487e8e3d84c7845ce7824ace3e375c6c389ba20
+Author: Yan, Zheng <zyan@redhat.com>
+Date: Sat Mar 21 01:02:42 2015 +0800
+
+ auth: reinitialize NSS modules after fork()
+
+ Fixes: #11128
+ Signed-off-by: Yan, Zheng <zyan@redhat.com>
+ (cherry picked from commit 4c24d0cc074462ae258b5cf901cd884bb4f50a53)
+
+commit 00e73adb03ef4453599268779fe354e4e8513e54
+Author: Jason Dillaman <dillaman@redhat.com>
+Date: Tue Aug 11 09:26:33 2015 -0400
+
+ librbd: prevent race condition between resize requests
+
+ It was possible that the same resize request could be sent twice
+ if a completed resize op started a newly created resize op while
+ it was also being concurrently started by another thread.
+
+ Fixes: #12664
+ Backport: hammer
+ Signed-off-by: Jason Dillaman <dillaman@redhat.com>
+ (cherry picked from commit 6ec431bac1cf9446f3af90209d193dfcf003f2c5)
+
+commit 6c4ccc854fa8a8403b03785b06cb35a7174f4f42
+Author: Jianpeng Ma <jianpeng.ma@intel.com>
+Date: Mon Mar 9 14:23:23 2015 +0800
+
+ librbd: Add a paramter:purge_on_error in ImageCtx::invalidate_cache().
+
+ If bh_write met error, it will try again. For closing image, if met this
+ issue, it will trigger a assert:
+ >>2015-02-03 15:22:49.198292 7ff62d537800 -1 osdc/ObjectCacher.cc: In
+ function 'ObjectCacher::~ObjectCacher()' thread 7ff62d537800 time
+ >>2015-02-03 15:22:49.195927osdc/ObjectCacher.cc: 551: FAILED
+ >>assert(i->empty())
+
+ Now add purge_on_error, when shutdown_cache it set true.
+ In ImageCtx::invalidate_cache, if met error and purge_on_error is true,
+ purge the dirty bh.
+
+ Signed-off-by: Jianpeng Ma <jianpeng.ma@intel.com>
+ (cherry picked from commit 35def5c81f7fc83d55d18320e4860c6a63d4c7f5)
+
+ Conflicts:
+ src/librbd/ImageCtx.cc : trivial resolution
+
+commit 05734916ab119c6d3879c2ce2bc9f9581907861a
+Author: Jianpeng Ma <jianpeng.ma@intel.com>
+Date: Thu Feb 5 11:28:50 2015 +0800
+
+ librbd: Remvoe unused func ImageCtx::read_from_cache.
+
+ Signed-off-by: Jianpeng Ma <jianpeng.ma@intel.com>
+ (cherry picked from commit 101440a41253680770f94bc380af7072c7adaebf)
+
+commit 28838f20a722b72a6e926e53f104342d3b9f4791
+Author: Jianpeng Ma <jianpeng.ma@intel.com>
+Date: Thu Feb 5 11:03:10 2015 +0800
+
+ osdc: clean up code in ObjectCacher::Object::map_write
+
+ Signed-off-by: Jianpeng Ma <jianpeng.ma@intel.com>
+ (cherry picked from commit 9f80c2909ace09cd51c24b49c98a093e0e864dca)
+
+commit 5c4f152efa8e8f57c59ea7decc05ae1a34f2a9ee
+Author: Jianpeng Ma <jianpeng.ma@intel.com>
+Date: Thu Feb 5 10:13:06 2015 +0800
+
+ osdc: Don't pass mutex into ObjectCacher::_wait_for_write.
+
+ Because the mutex is the same as ObjectCacher::lock.
+
+ Signed-off-by: Jianpeng Ma <jianpeng.ma@intel.com>
+ (cherry picked from commit d7cf7aeea5cba1ffa8e51ff1ad2424b1ec161a12)
+
+commit 86e7698a19745c26b9d3e7a12a16c87ea9a5d565
+Author: Jianpeng Ma <jianpeng.ma@intel.com>
+Date: Mon Mar 2 11:23:44 2015 +0800
+
+ osdc: After write try merge bh.
+
+ Signed-off-by: Jianpeng Ma <jianpeng.ma@intel.com>
+ (cherry picked from commit 1a48a8a2b222e41236341cb1241f0885a1b0b9d8)
+
+commit c96541ad19fb142ed31ff3006f1dc25e0c1de86c
+Author: Jianpeng Ma <jianpeng.ma@intel.com>
+Date: Mon Mar 2 11:36:24 2015 +0800
+
+ osdc: Make last missing bh to wake up the reader.
+
+ Avoid wakeup early and wait again.
+
+ Signed-off-by: Jianpeng Ma <jianpeng.ma@intel.com>
+ (cherry picked from commit d582bda090b3339d03e25b0e6d0971ad0267f476)
+
+commit 4135b9a2d199583685a1bae3713347dcc1b872e6
+Author: Jianpeng Ma <jianpeng.ma@intel.com>
+Date: Fri Feb 6 09:53:36 2015 +0800
+
+ osdc: For trust_enoent is true, there is only one extent.
+
+ Now the judgement only in conditon which will return -ENOENT.
+ But o->exists don't depend on the extent size. It only depend on
+ trust_enoent. So move this judgement at the first of _readx().
+ Make this bug ASAP occur.
+
+ Signed-off-by: Jianpeng Ma <jianpeng.ma@intel.com>
+ (cherry picked from commit 2449fddc13b5ce8bbf1bb4ecaa5d6937f54e54d1)
+
+commit 81376b6a1a5db9f8b45c58ea318ec924e932d990
+Author: Jianpeng Ma <jianpeng.ma@intel.com>
+Date: Tue Feb 3 14:46:39 2015 +0800
+
+ osdc: In _readx() only no error can tidy read result.
+
+ Signed-off-by: Jianpeng Ma <jianpeng.ma@intel.com>
+ (cherry picked from commit 540346d4a901d8041c9fd74641c98cdfd2e1ab32)
+
+commit e6bdae903cdd2f702829adc31fa9a31c239a3b87
+Merge: 317770d cdde626
+Author: Ken Dreyer <kdreyer@redhat.com>
+Date: Fri Sep 4 15:38:43 2015 -0600
+
+ Merge pull request #5223 from SUSE/wip-12305-hammer
+
+ ceph.spec.in: running fdupes unnecessarily
+
+ Reviewed-by: Ken Dreyer <kdreyer@redhat.com>
+
+commit e80bd0a2a39afdabcb134100e0cc8fa74cbd14c2
+Author: Radoslaw Zarzynski <rzarzynski@mirantis.com>
+Date: Thu Jun 25 18:28:50 2015 +0200
+
+ rgw: send Content-Length in response for GET on Swift account.
+
+ Fixes: #12158
+ Signed-off-by: Radoslaw Zarzynski <rzarzynski@mirantis.com>
+ (cherry picked from commit 5f47b11791cd46ce2771046e4888575869cc9685)
+ Conflicts:
+ src/rgw/rgw_rest_swift.cc
+
+commit 2e542456dee6c30b3200e9830d4ccae4b0325388
+Author: Orit Wasserman <owasserm@redhat.com>
+Date: Mon Jun 22 13:51:49 2015 +0200
+
+ rgw: force content_type for swift bucket stats request
+
+ Fixes: 12095
+
+ Signed-off-by: Orit Wasserman <owasserm@redhat.com>
+ (cherry picked from commit da259e4da1329e1e448d75c48c6ee3d1318e19b2)
+
+commit 5d57b63c32e43000ff95c2d8ce34347ed0579a8a
+Author: Orit Wasserman <owasserm@redhat.com>
+Date: Thu Aug 13 15:02:03 2015 +0200
+
+ rgw: we should not overide Swift sent content type
+
+ Fixes: #12363
+ backport: hammer
+
+ Signed-off-by: Orit Wasserman <owasserm@redhat.com>
+ (cherry picked from commit 423cf136f15df3099c9266f55932542d303c2713)
+
+commit b8aafbc6f9f80f029606a577d73f8685a80225b8
+Author: Radoslaw Zarzynski <rzarzynski@mirantis.com>
+Date: Tue Jun 23 11:54:09 2015 +0200
+
+ rgw: enforce Content-Type in Swift responses.
+
+ Swift sends Content-Type HTTP header even if the response
+ doesn't contain body. We have this behaviour implemented
+ until applying some changes in end_header() function.
+ Unfortunately, lack of Content-Type causes early exits in
+ many Tempest's tests for Swift API verification.
+
+ Fixes: #12157
+ Signed-off-by: Radoslaw Zarzynski <rzarzynski@mirantis.com>
+ (cherry picked from commit 106aeba206736d4080326f9bc191876bed63370b)
+
+commit 143cfc331efcc7bed8b1cf90d7e3188d0ac7604b
+Author: Orit Wasserman <owasserm@redhat.com>
+Date: Tue Apr 21 12:31:19 2015 +0200
+
+ rgw: force content-type header for swift account responses without body
+
+ This regression was introduced in commit 4cfeca03ade21861ab70ca759f94eb244c16cb39
+
+ Fixes: #11438
+
+ Signed-off-by: Orit Wasserman <owasserm@redhat.com>
+ (cherry picked from commit 009664e560ee37ef6dc170a0155d6c749e151b06)
+
+commit b5420d6f1a6a1da34c7bba339e6763c4b369d349
+Author: Orit Wasserman <owasserm@redhat.com>
+Date: Thu Apr 9 20:04:59 2015 +0200
+
+ rgw: shouldn't return content-type: application/xml if content length is 0
+
+ Fixed: #11091
+
+ Signed-off-by: Orit Wasserman <owasserm@redhat.com>
+ (cherry picked from commit 5cc92bb27cfbaee4af24dc312c9b98331f899794)
+
+commit 317770dd39510221cbc0fc7ee50960992137eaaf
+Merge: 6b02be7 6b36514
+Author: Loic Dachary <loic@dachary.org>
+Date: Thu Sep 3 12:20:38 2015 +0200
+
+ Merge pull request #5716 from dachary/wip-12851-hammer
+
+ Ensure that swift keys don't include backslashes
+
+ Reviewed-by: Orit Wasserman <owasserm@redhat.com>
+
+commit 6b02be7395ad8f41f70458e7bd11630ddd498cc5
+Merge: fa74ea1 f1c7c62
+Author: Loic Dachary <loic@dachary.org>
+Date: Thu Sep 3 12:11:24 2015 +0200
+
+ Merge pull request #5717 from dachary/wip-12591-hammer
+
+ rgw: create a tool for orphaned objects cleanup
+
+ Reviewed-by: Orit Wasserman <owasserm@redhat.com>
+
+commit fa74ea10ac25fe93f359ccf0fd036d567e9610fe
+Merge: 011e4c5 a478385
+Author: Loic Dachary <loic@dachary.org>
+Date: Wed Sep 2 23:35:58 2015 +0200
+
+ Merge pull request #5755 from dachary/wip-12589-hammer
+
+ ceph-disk zap should ensure block device
+
+ Reviewed-by: Loic Dachary <ldachary@redhat.com>
+
+commit 011e4c58ffb41aa5ae3240a40cbeba8266b89001
+Merge: e7c2269 b80859e
+Author: Loic Dachary <loic@dachary.org>
+Date: Wed Sep 2 23:22:59 2015 +0200
+
+ Merge pull request #5732 from ceph/wip-11455-hammer
+
+ rgw: init some manifest fields when handling explicit objs
+
+ Reviewed-by: Loic Dachary <ldachary@redhat.com>
+
+commit e7c2269dbebd5337ae5aad127d6ddaa4260a8f53
+Merge: 92b641f da00bed
+Author: Loic Dachary <loic@dachary.org>
+Date: Wed Sep 2 23:19:02 2015 +0200
+
+ Merge pull request #5721 from dachary/wip-12853-hammer
+
+ RGW Swift API: X-Trans-Id header is wrongly formatted
+
+ Reviewed-by: Radoslaw Zarzynski <rzarzynski@mirantis.com>
+
+commit 92b641f301df33a38ccfcf018c5f7657db8548ae
+Merge: 845d2ae 3ab5d82
+Author: Loic Dachary <loic@dachary.org>
+Date: Wed Sep 2 23:08:24 2015 +0200
+
+ Merge pull request #5498 from ceph/wip-12432-hammer
+
+ rgw: HTTP return code is not being logged by CivetWeb
+
+ Reviewed-by: Loic Dachary <ldachary@redhat.com>
+
+commit 836f7636f76b2778812e4fa055206a887fd27dad
+Author: Samuel Just <sjust@redhat.com>
+Date: Tue Jul 21 11:31:12 2015 -0700
+
+ OSD: break connection->session->waiting message->connection cycle
+
+ Fixes: #12338
+ Signed-off-by: Samuel Just <sjust@redhat.com>
+ (cherry picked from commit 7f15e22be291df139c85909b96b2366f6dbadf37)
+
+commit 77624aff03a8df7805ac0c1c6a7a2085f41fb6a3
+Author: Sage Weil <sage@redhat.com>
+Date: Sun Aug 9 10:46:10 2015 -0400
+
+ osd/PGLog: dirty_to is inclusive
+
+ There are only two callers of mark_dirty_to who do not pass max,
+ and they are both in the merge_log extending tail path. In that
+ case, we want to include the last version specified in the log
+ writeout. Fix the tail extending code to always specify the
+ last entry added, inclusive.
+
+ Fixes: #12652
+ Signed-off-by: Sage Weil <sage@redhat.com>
+ (cherry picked from commit f0ca14df0641daa04eee39d98d8bd0faf46e4e6d)
+
+commit aa003736d2aeea937ce0d8663b159cf06b2dda3e
+Author: Xinze Chi <xmdxcxz@gmail.com>
+Date: Mon Aug 24 23:02:10 2015 +0800
+
+ common: fix code format
+
+ Signed-off-by: Xinze Chi <xmdxcxz@gmail.com>
+ (cherry picked from commit 15e5ebe14787bbbc6b906d72ccd2d418d762cfad)
+
+commit aab35da90d7d50750fda6355d5a124a45d66f1c5
+Author: Xinze Chi <xmdxcxz@gmail.com>
+Date: Mon Aug 24 22:59:40 2015 +0800
+
+ test: add test case for insert empty ptr when buffer rebuild
+
+ Signed-off-by: Xinze Chi <xmdxcxz@gmail.com>
+ (cherry picked from commit 2d2f0eb338906742d516a2f8e6d5d05505be8f47)
+
+commit 2b0b7ae6443eeca271813415a91ab749c886fdf0
+Author: Xinze Chi <xmdxcxz@gmail.com>
+Date: Mon Aug 24 23:01:27 2015 +0800
+
+ common: fix insert empty ptr when bufferlist rebuild
+
+ Fixes: #12775
+ Signed-off-by: Xinze Chi <xmdxcxz@gmail.com>
+ (cherry picked from commit fb1b6ddd7bfe40d4a38d5ec59b1c3f59f2a83f23)
+
+ Conflicts:
+ src/common/buffer.cc : because invalidate_crc did not exist
+ in hammer
+
+commit 845d2aed9e9a9893678226b8661fbd8ff87c090f
+Merge: a6517d2 3396a96
+Author: Loic Dachary <loic@dachary.org>
+Date: Wed Sep 2 12:00:11 2015 +0200
+
+ Merge pull request #5527 from SUSE/wip-12585-hammer
+
+ OSD crash creating/deleting pools
+
+ Reviewed-by: Kefu Chai <kchai@redhat.com>
+
+commit 2348a5b5c96d065fbc2188bd9e8e7ff20c75ecaa
+Author: Guang G Yang <yguang@renownedground.corp.gq1.yahoo.com>
+Date: Wed Jul 29 21:47:17 2015 +0000
+
+ osd: copy the RecoveryCtx::handle when creating a new RecoveryCtx instance from another one
+
+ Fixes: 12523
+
+ Signed-off-by: Guang Yang <yguang@yahoo-inc.com>
+ (cherry picked from commit 6ab9efe799b947f2ef6113df8cc542c73760107d)
+
+commit bf72785e1e11b18df9a03ebfa7c284fe4f43eaa0
+Author: Josh Durgin <jdurgin@redhat.com>
+Date: Mon Aug 24 15:40:39 2015 -0700
+
+ config: skip lockdep for intentionally recursive md_config_t lock
+
+ lockdep can't handle recursive locks, resulting in false positive
+ reports for certain set_val_or_die() calls, like via
+ md_config_t::parse_argv() passed "-m".
+
+ Fixes: #12614
+ Signed-off-by: Josh Durgin <jdurgin@redhat.com>
+ (cherry picked from commit 415226995ebe841cc9e8639a3233150a75aecaed)
+
+commit c94fd926239a31dea1389a760f55f332a9b6814a
+Author: David Zafman <dzafman@redhat.com>
+Date: Thu Jul 23 16:36:19 2015 -0700
+
+ osd: Keep a reference count on Connection while calling send_message()
+
+ Fixes: #12437
+
+ Signed-off-by: David Zafman <dzafman@redhat.com>
+ (cherry picked from commit a140085f467889f2743294a3c150f13b62fcdf51)
+
+commit 059bf98d40fa7e1eddb7aef2ecfdfb6bc96c14fb
+Author: Samuel Just <sjust@redhat.com>
+Date: Tue Jul 7 08:49:54 2015 -0700
+
+ WBThrottle::clear_object: signal if we cleared an object
+
+ Fixes: #12223
+ Signed-off-by: Samuel Just <sjust@redhat.com>
+ (cherry picked from commit 8447b08d60d5cf7dce20f8b839cc2cb5a93782de)
+
+commit a478385334323071b5cfa4d546eef5b0ef43dce7
+Author: Loic Dachary <ldachary@redhat.com>
+Date: Sun May 31 19:42:45 2015 +0200
+
+ ceph-disk: always check zap is applied on a full device
+
+ zap only makes sense on a full device and this is verified for
+
+ ceph-disk prepare --zap-disk
+
+ but not for
+
+ ceph-disk zap
+
+ Unify the two and add a test to check that it fails as expected when
+ trying to zap a directory.
+
+ http://tracker.ceph.com/issues/11272 Fixes: #11272
+
+ Signed-off-by: Loic Dachary <ldachary@redhat.com>
+ (cherry picked from commit 8e1bcf21f090fc98ac9b495d76614e3012f5872a)
+
+ Conflicts:
+ src/test/ceph-disk.sh : trivial resolution
+
+commit e471c5dc16847ba35d3c3c8c74da1bf7c4c946e0
+Author: Yuan Zhou <yuan.zhou@intel.com>
+Date: Wed Jul 8 10:35:49 2015 +0800
+
+ librados: Make librados pool_create respect default_crush_ruleset
+
+ Make pool_create in librados use the osd_pool_default_crush_replicated_ruleset
+
+ Fixes: #11640
+
+ Signed-off-by: Yuan Zhou <yuan.zhou@intel.com>
+ (cherry picked from commit da96a89033590277460aef1c80f385bd93d625e1)
+
+commit a6517d286b59eac283d7bfd04b620f5b859657b6
+Merge: a89c173 35fa47a
+Author: Loic Dachary <loic@dachary.org>
+Date: Wed Sep 2 02:19:26 2015 +0200
+
+ Merge pull request #5551 from ceph/wip-corpus-hammer
+
+ ceph-object-corpus: add 0.94.2-207-g88e7ee7 hammer objects
+
+ Reviewed-by: Loic Dachary <ldachary@redhat.com>
+
+commit 35fa47a117a3e8d185f7ebe02eea5671f8229427 (refs/remotes/me/wip-corpus-hammer, refs/remotes/gh/wip-corpus-hammer)
+Author: Sage Weil <sage@redhat.com>
+Date: Tue Sep 1 17:44:06 2015 -0400
+
+ ceph-object-corpus: add 0.94.2-207-g88e7ee7 hammer objects
+
+ Signed-off-by: Sage Weil <sage@redhat.com>
+
+commit b80859e2b2efc2402dc62aa319e40319863586f7 (refs/remotes/gh/wip-11455-hammer)
+Author: Yehuda Sadeh <yehuda@redhat.com>
+Date: Wed Aug 26 14:34:30 2015 -0700
+
+ rgw: init some manifest fields when handling explicit objs
+
+ Fixes: #11455
+ When dealing with old manifest that has explicit objs, we also
+ need to set the head size and head object correctly so that
+ code that relies on this info doesn't break.
+
+ Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
+ (cherry picked from commit d7bf8cb594e5276d1c80544f5ec954d52b159750)
+
+commit f47ba4b1a1029a55f8bc4ab393a7fa3712cd4e00
+Author: Loic Dachary <ldachary@redhat.com>
+Date: Thu Jul 16 18:02:02 2015 +0200
+
+ mon: test the crush ruleset when creating a pool
+
+ We want to fix the following scenario:
+
+ * an erasure code plugin (or another part of the code) creates a
+ ruleset
+ * the ruleset crashes during mapping (for whatever reason)
+ * ceph osd pool create uses the bugous ruleset
+ * the monitors try to do mapping a crash
+
+ Having a bugous ruleset in the crush map is very difficult prevent. The
+ catastrophic event of using it with a newly created pool can however be
+ prevented by calling the CrushTester just before creating the pool and
+ after all implicit or explicit crush ruleset creation happened.
+
+ http://tracker.ceph.com/issues/11814 Fixes: #11814
+
+ Signed-off-by: Loic Dachary <ldachary@redhat.com>
+ (cherry picked from commit f1e86be589803596e86acc964ac5c5c03b4038d8)
+
+ Conflicts:
+ src/test/mon/osd-crush.sh
+ removed the run_mon because in hammer it is shared
+ between all tests
+ src/mon/OSDMonitor.cc
+ prepare_new_pool changed stringstream to *ostream
+
+commit b58cbbab4f74e352c3d4a61190cea2731057b3c9
+Author: Loic Dachary <ldachary@redhat.com>
+Date: Sat May 30 12:40:26 2015 +0200
+
+ erasure-code: set max_size to chunk_count() instead of 20 for shec
+
+ See 8b64fe93b088a3a33d357869c47e6bf928c3f0e4 for a detailed explanation.
+
+ Signed-off-by: Loic Dachary <ldachary@redhat.com>
+ (cherry picked from commit a44499f7e6609d9a32254dc6f4303122de74db31)
+
+commit 6f0af185ad7cf9640557efb7f61a7ea521871b5b
+Author: Mykola Golub <mgolub@mirantis.com>
+Date: Thu Feb 26 21:22:31 2015 +0200
+
+ vstart.sh: set PATH to include pwd
+
+ ceph-mon needs crushtool to be in PATH. Don't set if it is run
+ from ceph_vstart_wrapper, which already sets it as it needs.
+
+ Signed-off-by: Mykola Golub <mgolub@mirantis.com>
+ (cherry picked from commit e08bccf377292d72463796ae1dff5d8be40d88e9)
+
+commit a89c1731e0e327acdb876d39df574e27379aaa1e
+Merge: c3a2bf3 0fde3a2
+Author: Gregory Farnum <greg@gregs42.com>
+Date: Mon Aug 31 09:41:33 2015 +0100
+
+ Merge pull request #5365 from dachary/wip-12491-hammer
+
+ buffer: critical bufferlist::zero bug
+
+ Reviewed-by: Greg Farnum <gfarnum@redhat.com>
+
+commit c3a2bf3f6b1d1bf416fa04df1629630abe2fe563
+Merge: 0a44eb1 4457d3e
+Author: Loic Dachary <loic@dachary.org>
+Date: Sun Aug 30 19:58:25 2015 +0200
+
+ Merge pull request #5369 from dachary/wip-12498-hammer
+
+ get pools health'info have error
+
+ Reviewed-by: Kefu Chai <kchai@redhat.com>
+
+commit 0a44eb12fc7d2ef902f1999e37abae0f11511d66
+Merge: dfcdba7 9916d37
+Author: Loic Dachary <loic@dachary.org>
+Date: Sun Aug 30 19:52:52 2015 +0200
+
+ Merge pull request #5370 from dachary/wip-12496-hammer
+
+ pgmonitor: wrong at/near target max“ reporting
+
+ Reviewed-by: Kefu Chai <kchai@redhat.com>
+
+commit dfcdba75f310eaa2cfc5ae97ba3093afe1198737
+Merge: 69a9a4c b8176d0
+Author: Loic Dachary <loic@dachary.org>
+Date: Sun Aug 30 19:44:56 2015 +0200
+
+ Merge pull request #5378 from dachary/wip-12394-hammer
+
+ Memory leak in Mutex.cc, pthread_mutexattr_init without pthread_mutexattr_destroy
+
+ Reviewed-by: Kefu Chai <kchai@redhat.com>
+
+commit 69a9a4cbf28c87fcd68f6c6c0c09f7a6d95ab003
+Merge: d3b160e 42bff0b
+Author: Loic Dachary <loic@dachary.org>
+Date: Sun Aug 30 19:44:26 2015 +0200
+
+ Merge pull request #5372 from dachary/wip-12493-hammer
+
+ the output is wrong when runing ceph osd reweight
+
+ Reviewed-by: Kefu Chai <kchai@redhat.com>
+
+commit da00bedbc2f5d2facb9472078fd6cdd7260492ac
+Author: Radoslaw Zarzynski <rzarzynski@mirantis.com>
+Date: Thu Aug 6 15:52:58 2015 +0200
+
+ rgw: rework X-Trans-Id header to be conform with Swift API.
+
+ Fixes: #12108
+ Signed-off-by: Radoslaw Zarzynski <rzarzynski@mirantis.com>
+ (cherry picked from commit d1735a4e8ea2056d333a5001a7a410fc03fe1b9e)
+
+commit 9937c818f1073bceffcf5811c7cc543b9043e646
+Author: Abhishek Dixit <dixitabhi@gmail.com>
+Date: Mon Jun 8 22:59:54 2015 +0530
+
+ Transaction Id added in response
+
+ Signed-off-by: Abhishek Dixit dixitabhi@gmail.com
+
+ (cherry picked from commit b711e3124f8f73c17ebd19b38807a1b77f201e44)
+
+ Conflicts:
+ src/rgw/rgw_rest.cc
+ the prototype of the end_header( function
+ in the context of the diff changed
+
+commit f1c7c629f2a7baf87a3d25d68b7a40fb3b2f6c49
+Author: Yehuda Sadeh <yehuda@redhat.com>
+Date: Mon Jun 29 15:35:04 2015 -0700
+
+ rgw: api adjustment following a rebase
+
+ Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
+ (cherry picked from commit 7cf1f376e7dbc98a44f4a8e78bfa11f84291a941)
+
+commit 85911df5226dccfd2f1806a204a23eae3966eee7
+Author: Yehuda Sadeh <yehuda@redhat.com>
+Date: Mon Jun 29 15:34:44 2015 -0700
+
+ rgw: orphans, fix check on number of shards
+
+ Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
+ (cherry picked from commit 47edec359be2a4d230a4a54c0c670d0aa711fa1e)
+
+commit c1cf7dfb672032012889840fb4462b1a076f34c0
+Author: Yehuda Sadeh <yehuda@redhat.com>
+Date: Mon Jun 29 15:34:11 2015 -0700
+
+ rgw: orphans, change default number of shards
+
+ Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
+ (cherry picked from commit 5528f21d0861d42378a8eb10759a1e55ddd66c09)
+
+commit bb1d4cc3a3e9af3bf8cd8fd80085fbbbaeb8b89f
+Author: Yehuda Sadeh <yehuda@redhat.com>
+Date: Tue May 5 14:43:05 2015 -0700
+
+ rgw: change error output related to orphans
+
+ Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
+ (cherry picked from commit cac57caf639236adc9a641a85352eb729b58725a)
+
+commit 2e0f6fe98787e1f3ea7d107a814caadce7ee5f23
+Author: Yehuda Sadeh <yehuda@redhat.com>
+Date: Mon May 4 17:02:29 2015 -0700
+
+ rgw: orphan, fix truncated detection
+
+ Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
+ (cherry picked from commit d8ce04db8542dae0027423f3c50355e5de74dc9a)
+
+commit 1bfebefba2e09448d28853b34415d3f65e323c76
+Author: Yehuda Sadeh <yehuda@redhat.com>
+Date: Mon May 4 16:32:57 2015 -0700
+
+ radosgw-admin: simplify orphan command
+
+ No need for --init-search
+
+ Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
+ (cherry picked from commit 4980cbd04ff650d79a033bc5298e6c1abe985133)
+
+commit f244b159ac8793c11a5707ea0b104b3180efb58f
+Author: Yehuda Sadeh <yehuda@redhat.com>
+Date: Mon May 4 15:24:00 2015 -0700
+
+ radosgw-admin: stat orphan objects before reporting leakage
+
+ We don't want to report new objects as leaked, because they might just
+ be written, and waiting to be linked to a new object. The number of
+ seconds prior to the job initialization can be cofigured through
+ --orphan-stale-secs (by default it's 24h).
+
+ Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
+ (cherry picked from commit 66b0090023859d97da2bbaca698b6a50c225abd0)
+
+commit f80e2b2bc8879d1cc40338816196f51378aaa785
+Author: Yehuda Sadeh <yehuda@redhat.com>
+Date: Mon May 4 14:39:20 2015 -0700
+
+ radosgw-admin: orphans finish command
+
+ A command to remove orphans data
+
+ Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
+ (cherry picked from commit 55d6f5ecf18f532c7f056f8b60c101843594b00c)
+
+commit 88d32c641a06823df93f0e3fae640a880778e1e4
+Author: Yehuda Sadeh <yehuda@redhat.com>
+Date: Sat May 2 17:28:30 2015 -0700
+
+ rgw: cannot re-init an orphan scan job
+
+ Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
+ (cherry picked from commit f8993102731518153bb18eb74c3e6e4943a5dbac)
+
+commit 80a40342b6a0d9e7a47ca4b672901315246385df
+Author: Yehuda Sadeh <yehuda@redhat.com>
+Date: Sat May 2 16:38:08 2015 -0700
+
+ rgw: stat_async() sets the object locator appropriately
+
+ Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
+ (cherry picked from commit d7d117121858155acc8548908e9459a48c676dd1)
+
+commit 0082036348e0463e42520504466961eb2bd77602
+Author: Yehuda Sadeh <yehuda@redhat.com>
+Date: Sat May 2 16:34:09 2015 -0700
+
+ rgw: list_objects() sets namespace appropriately
+
+ list_objects() now uses parse_raw_oid(), so that it can set the correct
+ namespace. It only affects users of the function that want to get all
+ objects in bucket, regardless to the namespace associated with it. This
+ makes it so that the orphan code actually works now with namespaced
+ objects, and with special named objects (namely, start with underscore).
+
+ Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
+ (cherry picked from commit 20bd490bebf9be3553d4e25322c9544b0b090086)
+
+commit 1c3707291e83771ca1d5cd24ce445f723006b744
+Author: Yehuda Sadeh <yehuda@redhat.com>
+Date: Fri May 1 17:23:44 2015 -0700
+
+ rgw: modify orphan search fingerprints
+
+ Now works with multipart uploads.
+
+ Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
+ (cherry picked from commit fa61ea2ccc94f04afb39868ac34abc264806d8d4)
+
+commit ef81367a1eaeb7778dc60a668b9fe2f6a77e06ff
+Author: Yehuda Sadeh <yehuda@redhat.com>
+Date: Fri May 1 15:17:10 2015 -0700
+
+ rgw: compare oids and dump leaked objects
+
+ Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
+ (cherry picked from commit 1bc63d98ff8a3aa180065153690b4f8a73658b79)
+
+commit f4d0544e63f68fa94b21fda71c0b78edd05038a1
+Author: Yehuda Sadeh <yehuda@redhat.com>
+Date: Thu Apr 30 16:17:54 2015 -0700
+
+ rgw: keep accurate state for linked objects orphan scan
+
+ Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
+ (cherry picked from commit f19b2f087cfb5a89edf3b19487c0df3a214e350f)
+
+commit 748ea57cfeca7b295afca5b8126d454eb85550c7
+Author: Yehuda Sadeh <yehuda@redhat.com>
+Date: Wed Apr 29 17:12:34 2015 -0700
+
+ rgw: iterate over linked objects, store them
+
+ only keep part of the oid name if it is in a namespace.
+
+ Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
+ (cherry picked from commit 75902fdb12ce0413d3beb455df47134f3d7386e7)
+
+commit 6c6aa5ddf38102012e61f79f5234b9647d42b461
+Author: Yehuda Sadeh <yehuda@redhat.com>
+Date: Wed Apr 29 17:12:00 2015 -0700
+
+ rgw: add rgw_obj::parse_raw_oid()
+
+ Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
+ (cherry picked from commit 7c1aa8373a090d5c1b2aa121582547723120a079)
+
+commit 62d562d76e0456cc3c735c6708531c7deb2874da
+Author: Yehuda Sadeh <yehuda@redhat.com>
+Date: Wed Apr 29 14:50:15 2015 -0700
+
+ rgw: iterate asynchronously over linked objects
+
+ Read objects manifest. So that we could keep the relevant info later.
+
+ Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
+ (cherry picked from commit 05a953d965a0a6a0e9feddaa62f7429e154e828e)
+
+commit 00ecf2d0a895407bc8ec0e55e1b1b0f47a1aa96f
+Author: Yehuda Sadeh <yehuda@redhat.com>
+Date: Wed Apr 29 14:15:33 2015 -0700
+
+ rgw: async object stat functionality
+
+ An async functionality that stats object.
+
+ Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
+ (cherry picked from commit 13adf3cf4f5fd8a0feb7cc1d7a4ee4ded9f573db)
+
+commit 7d1cc48ba32e8bc732c43ecb539312c6bfcc0f80
+Author: Yehuda Sadeh <yehuda@redhat.com>
+Date: Tue Apr 28 16:45:49 2015 -0700
+
+ rgw-admin: build index of bucket indexes
+
+ for the orphan search tool
+
+ Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
+ (cherry picked from commit 16a2dbd838b69fb445c06122a68fc65ec3a7b3de)
+
+commit c1b0e7a985cc9e742dcef4c8c427c57a2f58fa43
+Author: Yehuda Sadeh <yehuda@redhat.com>
+Date: Sat Apr 25 09:37:53 2015 -0700
+
+ rgw: initial work of orphan detection tool implementation
+
+ So far doesn't do much, iterate through all objects in a specific pool
+ data, store it in a sharded index.
+
+ Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
+ (cherry picked from commit 767fc29aa62a0a4e4dd8a78785576e8f1b44ee5b)
+
+commit b16129c3393d6e301b4af5203ffa1c6d8dfdda38
+Author: Pavan Rallabhandi <pavan.rallabhandi@sandisk.com>
+Date: Wed Apr 29 13:35:29 2015 +0530
+
+ Avoid an extra read on the atomic variable
+
+ Signed-off-by: Pavan Rallabhandi <pavan.rallabhandi@sandisk.com>
+ (cherry picked from commit 7476e944af049aefdb8871cce62883b86f6b6f8d)
+
+commit 1f6916d5a9b0ebe5181b801c4c381a699883bb09
+Author: Pavan Rallabhandi <pavan.rallabhandi@sandisk.com>
+Date: Wed Apr 8 18:53:14 2015 +0530
+
+ RGW: Make RADOS handles in RGW to be a configurable option
+
+ Having a configurable number of RADOS handles is resulting
+ in significant performance boost for all types of workloads.
+ Each RGW worker thread would now get to pick a RADOS handle
+ for its lifetime, from the available bunch.
+
+ Signed-off-by: Pavan Rallabhandi <pavan.rallabhandi@sandisk.com>
+ (cherry picked from commit b3c3a24fe9c0fbb2bdbbccb08b40efc1dca207cc)
+
+commit d3b160ecbe181c2b969a14825cf314a056630188
+Merge: 7357659 695f782
+Author: Loic Dachary <loic@dachary.org>
+Date: Sun Aug 30 15:50:03 2015 +0200
+
+ Merge pull request #5374 from dachary/wip-12487-hammer
+
+ ceph osd crush reweight-subtree does not reweight parent node
+
+ Reviewed-by: Sage Weil <sage@redhat.com>
+
+commit 7357659b59d9bf3522bf664f1a3da7475a7c8a49
+Merge: 8f559d5 8a2ad05
+Author: Loic Dachary <loic@dachary.org>
+Date: Sun Aug 30 15:49:41 2015 +0200
+
+ Merge pull request #5380 from dachary/wip-12390-hammer
+
+ PGLog::proc_replica_log: correctly handle case where entries between olog.head and log.tail were split out
+
+ Reviewed-by: Sage Weil <sage@redhat.com>
+
+commit a13c7fd7c39e83072f2975477e1cdcfe079fb041
+Author: Ruifeng Yang <149233652@qq.com>
+Date: Sat Aug 1 17:39:17 2015 +0800
+
+ rgw:the arguments 'domain' should not be assigned when return false
+
+ Hostnames: [B.A]
+ Inputs: [X.BB.A]
+ Return: [false]
+ Output: [B.A] it is wrong.
+
+ Fixes: #12629
+ Signed-off-by: Ruifeng Yang <149233652@qq.com>
+ (cherry picked from commit 9420d24c21b4e06d62f356637599c6ec8e7e3e4d)
+
+commit 6acf36f8851b8a369949f0fad9d0156af7dde20f
+Author: Ruifeng Yang <149233652@qq.com>
+Date: Sun Aug 2 16:16:05 2015 +0800
+
+ rgw:segmentation fault when rgw_gc_max_objs > HASH_PRIME
+
+ obj_names[] is index out of bounds when rgw_gc_max_objs > HASH_PRIME
+
+ Fixes: #12630
+ Signed-off-by: Ruifeng Yang <149233652@qq.com>
+ (cherry picked from commit e3147b8ddcaafafde9ce2029f7af5062e22076d3)
+
+commit 6b365144862cbd387d8b931939a3dc2cfe17bbbd
+Author: Yehuda Sadeh <yehuda@redhat.com>
+Date: Mon Jul 20 20:27:33 2015 -0700
+
+ rgw: avoid using slashes for generated secret keys
+
+ Just use plain alphanumeric characterset.
+
+ Fixes: #7647
+
+ Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
+ (cherry picked from commit 3f04a6126fdbfb93304f798da3775c0eec9b7d44)
+
+commit 8f559d58b42b91f070bfa590d9c33e9a156e0066
+Merge: d94e764 931ffe3
+Author: Sage Weil <sage@redhat.com>
+Date: Sun Aug 30 08:36:37 2015 -0400
+
+ Merge pull request #5366 from dachary/wip-12303-hammer
+
+ arm: all programs that link to librados2 hang forever on startup
+
+commit 8ba6b2f628a0f80964afbf4a83b61c4eee9c78ce
+Author: Yehuda Sadeh <yehuda@redhat.com>
+Date: Thu Jul 30 14:47:15 2015 -0700
+
+ rgw: url encode exposed bucket
+
+ Fixes: #12537
+ Don't send the bucket name back without url encoding it.
+
+ Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
+ (cherry picked from commit ad5507fe0bf72ed5bdf8353e315cc9092c740144)
+
+commit d94e7642d0b0213a4b650a5acffa050d042087eb
+Merge: 11a80d8 6417e8e
+Author: Loic Dachary <loic@dachary.org>
+Date: Sun Aug 30 13:41:01 2015 +0200
+
+ Merge pull request #5202 from SUSE/wip-12293-hammer
+
+ ceph.spec.in: rpm: cephfs_java not fully conditionalized
+
+ Reviewed-by: Loic Dachary <ldachary@redhat.com>
+
+commit 11a80d8bec6ff704e794a2995d653cd5d5c1c979
+Merge: a792ae6 3728477
+Author: Loic Dachary <loic@dachary.org>
+Date: Sun Aug 30 13:40:48 2015 +0200
+
+ Merge pull request #5203 from SUSE/wip-11997-hammer
+
+ ceph.spec.in: rpm: not possible to turn off Java
+
+ Reviewed-by: Loic Dachary <ldachary@redhat.com>
+
+commit a792ae65e2e03e1ca8804380cdbbfa1aec7a2123
+Merge: f7e76d2 8f78001
+Author: Loic Dachary <loic@dachary.org>
+Date: Sun Aug 30 13:40:30 2015 +0200
+
+ Merge pull request #5204 from SUSE/wip-11629-hammer
+
+ ceph.spec.in: SUSE/openSUSE builds need libbz2-devel
+
+ Reviewed-by: Loic Dachary <ldachary@redhat.com>
+
+commit f7e76d2c9e681b3c5775f74c582830f546359703
+Merge: d1feb04 4eb58ad
+Author: Loic Dachary <loic@dachary.org>
+Date: Sun Aug 30 13:40:09 2015 +0200
+
+ Merge pull request #5207 from SUSE/wip-12267-hammer
+
+ ceph.spec.in: 50-rbd.rules conditional is wrong
+
+ Reviewed-by: Loic Dachary <ldachary@redhat.com>
+
+commit d1feb0415b3b3dc9c5b003d8528079ccccd0729f
+Merge: 2dca2ec 8b576bd
+Author: Loic Dachary <loic@dachary.org>
+Date: Sun Aug 30 13:39:57 2015 +0200
+
+ Merge pull request #5216 from SUSE/wip-12269-hammer
+
+ ceph.spec.in: ceph-common needs python-argparse on older distros, but doesn't require it
+
+ Reviewed-by: Loic Dachary <ldachary@redhat.com>
+
+commit 2dca2ece0478972e89ed6611a15892ad9e449cc8
+Merge: 64fafc9 0818e9f
+Author: Loic Dachary <loic@dachary.org>
+Date: Sun Aug 30 13:39:31 2015 +0200
+
+ Merge pull request #5264 from SUSE/wip-12361-hammer
+
+ ceph.spec.in: snappy-devel for all supported distros
+
+ Reviewed-by: Loic Dachary <ldachary@redhat.com>
+
+commit 64fafc95785024421cbb7ccae41ed4276eeb8fe9
+Merge: 4675971 add0f1e
+Author: Loic Dachary <loic@dachary.org>
+Date: Sun Aug 30 13:39:14 2015 +0200
+
+ Merge pull request #5368 from dachary/wip-12331-hammer
+
+ ceph: cli throws exception on unrecognized errno
+
+ Reviewed-by: Loic Dachary <ldachary@redhat.com>
+
+commit 4675971ce3331f1285398d1556a594f671e489c0
+Merge: 53cdcf2 e004941
+Author: Loic Dachary <loic@dachary.org>
+Date: Sun Aug 30 13:39:00 2015 +0200
+
+ Merge pull request #5371 from dachary/wip-12494-hammer
+
+ ceph tell: broken error message / misleading hinting
+
+ Reviewed-by: Loic Dachary <ldachary@redhat.com>
+
+commit 53cdcf20482823cdb8682dde89706d6f21d8d0d2
+Merge: 362874c eccf369
+Author: Loic Dachary <loic@dachary.org>
+Date: Sun Aug 30 13:38:43 2015 +0200
+
+ Merge pull request #5385 from dachary/wip-12501-hammer
+
+ error in ext_mime_map_init() when /etc/mime.types is missing
+
+ Reviewed-by: Loic Dachary <ldachary@redhat.com>
+
+commit 362874ca39e32c3bc5ee13b13f905fd7693d9449
+Merge: 2044f3c 8804b3f
+Author: Loic Dachary <loic@dachary.org>
+Date: Sun Aug 30 13:38:29 2015 +0200
+
+ Merge pull request #5411 from SUSE/wip-12446-hammer
+
+ ceph.spec.in: radosgw requires apache for SUSE only -- makes no sense
+
+ Reviewed-by: Loic Dachary <ldachary@redhat.com>
+
+commit 2044f3cd7b220cc642245e7ca93c21a17cc8c536
+Merge: 260e24b a785193
+Author: Loic Dachary <loic@dachary.org>
+Date: Sun Aug 30 13:38:13 2015 +0200
+
+ Merge pull request #5412 from SUSE/wip-12448-hammer
+
+ ceph.spec.in: useless %py_requires breaks SLE11-SP3 build
+
+ Reviewed-by: Loic Dachary <ldachary@redhat.com>
+
+commit 260e24bba0e83dfa61d25ac0489f656244211db4
+Merge: dc944fb b575ecc
+Author: Loic Dachary <loic@dachary.org>
+Date: Sun Aug 30 13:30:18 2015 +0200
+
+ Merge pull request #5318 from ceph/wip-12236-hammer
+
+ Possible crash while concurrently writing and shrinking an image
+
+ Reviewed-by: Loic Dachary <ldachary@redhat.com>
+
+commit dc944fbbedcee56dfbd9d4f5ac3c38d15a6621ea
+Merge: a8c1b4e 92272dd
+Author: Loic Dachary <loic@dachary.org>
+Date: Sun Aug 30 13:30:01 2015 +0200
+
+ Merge pull request #5319 from ceph/wip-12235-hammer
+
+ librbd: deadlock during cooperative exclusive lock transition
+
+ Reviewed-by: Loic Dachary <ldachary@redhat.com>
+
+commit a8c1b4e7436832ed3040d5a90df713ef6029cb69
+Merge: a39aeee e971820
+Author: Loic Dachary <loic@dachary.org>
+Date: Sun Aug 30 13:29:26 2015 +0200
+
+ Merge pull request #5296 from ceph/wip-12345-hammer
+
+ librbd: correct issues discovered via lockdep / helgrind
+
+ Reviewed-by: Loic Dachary <ldachary@redhat.com>
+
+commit a39aeeedf07518d65c9944476b98a0788585f5c1
+Merge: 6a949e1 153744d
+Author: Loic Dachary <loic@dachary.org>
+Date: Sun Aug 30 12:14:22 2015 +0200
+
+ Merge pull request #5559 from ceph/wip-12682-hammer
+
+ object_map_update fails with -EINVAL return code
+
+ Reviewed-by: Loic Dachary <ldachary@redhat.com>
+
+commit 6a949e10198a1787f2008b6c537b7060d191d236
+Merge: 1e423af 4faa8e0
+Author: Loic Dachary <loic@dachary.org>
+Date: Sun Aug 30 12:11:10 2015 +0200
+
+ Merge pull request #5468 from ceph/wip-12577-hammer
+
+ osd: fix repair when recorded digest is wrong
+
+ Reviewed-by: Loic Dachary <ldachary@redhat.com>
+
+commit 1e423afd3c7e534e302dbea0798a47f82acec141
+Merge: 574932b 0ca93db
+Author: Loic Dachary <loic@dachary.org>
+Date: Sun Aug 30 12:06:59 2015 +0200
+
+ Merge pull request #5376 from dachary/wip-12433-hammer
+
+ Show osd as NONE in ceph osd map <pool> <object> output
+
+ Reviewed-by: Loic Dachary <ldachary@redhat.com>
+
+commit 574932b2f438787f1a330a271644d9787eecbb63
+Merge: ed162d4 d08db7a
+Author: Loic Dachary <loic@dachary.org>
+Date: Sun Aug 30 11:54:55 2015 +0200
+
+ Merge pull request #5359 from ceph/wip-11470.hammer
+
+ mon: PaxosService: call post_refresh() instead of post_paxos_update()
+
+ Reviewed-by: Loic Dachary <ldachary@redhat.com>
+
+commit ed162d498051ac237be33ac6a6764ae0c61d57a6
+Merge: 41a245a bee8666
+Author: Josh Durgin <jdurgin@redhat.com>
+Date: Fri Aug 28 14:43:31 2015 -0400
+
+ Merge pull request #5691 from jdurgin/wip-10399-hammer
+
+ is_new_interval() fixes
+
+ Reviewed-by: Samuel Just <sjust@redhat.com>
+
+commit 0bc909e54b0edd8a32a3e7db16877f1d875c3186
+Author: Kefu Chai <kchai@redhat.com>
+Date: Mon Aug 10 04:25:03 2015 -0700
+
+ mon: add a cache layer over MonitorDBStore
+
+ the cache of of leveldb does not perform well under some condition,
+ so we need a cache in our own stack.
+
+ * add an option "mon_osd_cache_size" to control the size of cache size
+ of MonitorDBStore.
+
+ Fixes: #12638
+ Signed-off-by: Kefu Chai <kchai@redhat.com>
+ (cherry picked from commit 5e99a578050976ca22b549812ac80d494fe7041d)
+
+ Conflicts:
+ src/mon/OSDMonitor.h
+ minor differences in OSDMonitor ctor
+
+commit bee86660377cfaa74f7ed668dd02492f25553ff9
+Author: Jason Dillaman <dillaman@redhat.com>
+Date: Fri Aug 21 11:32:39 2015 -0400
+
+ Objecter: pg_interval_t::is_new_interval needs pgid from previous pool
+
+ When increasing the pg_num of a pool, an assert would fail since the
+ calculated pgid seed would be for the pool's new pg_num value instead
+ of the previous pg_num value.
+
+ Fixes: #10399
+ Backport: infernalis, hammer, firefly
+ Signed-off-by: Jason Dillaman <dillaman@redhat.com>
+ (cherry picked from commit f20f7a23e913d09cc7fc22fb3df07f9938ddc144)
+
+ Conflicts: (hobject_t sort order not backported, trivial resolution)
+ src/osdc/Objecter.cc
+ src/osdc/Objecter.h
+
+commit b5418b9a7138b45b5fe4f24cfb679c2abb30ab71
+Author: Samuel Just <sjust@redhat.com>
+Date: Tue May 26 12:35:11 2015 -0700
+
+ osd_types::is_new_interval: size change triggers new interval
+
+ Fixes: 11771
+ Signed-off-by: Samuel Just <sjust@redhat.com>
+ (cherry picked from commit ff79959c037a7145f7104b06d9e6a64492fdb95f)
+
+commit f0283890d22e8d5c2210d565077ad3af1921f098 (refs/remotes/gh/liewegas-wip-hammer-feature-hammer)
+Author: Sage Weil <sage@redhat.com>
+Date: Thu Aug 27 14:09:50 2015 -0400
+
+ include/ceph_features: define HAMMER_0_94_4 feature
+
+ This is to constrain upgrades past hammer to version that include
+ the appropriate compatibility fixes (e.g., hobject_t encoding).
+
+ Signed-off-by: Sage Weil <sage@redhat.com>
+ (cherry picked from commit 2868b49c0e39fdc7ae72af81962370c4f95a859e)
+
+ # Conflicts:
+ # src/include/ceph_features.h
+
+commit 41a245aff77dde8a2ab212f9c91a73a23a77c40d
+Merge: 95cefea 65b380f
+Author: Sage Weil <sage@redhat.com>
+Date: Thu Aug 27 13:07:29 2015 -0400
+
+ Merge remote-tracking branch 'gh/wip-12536-hammer' into hammer
+
+ This includes wip-osd-compat-hammer.
+
+commit 65b380f7f28a36bb51a6771a2fd9b657ea2848ba (refs/remotes/gh/wip-12536-hammer)
+Merge: 00d802d 9b91adc
+Author: Sage Weil <sage@redhat.com>
+Date: Wed Aug 19 09:52:02 2015 -0400
+
+ Merge remote-tracking branch 'gh/wip-osd-compat-hammer' into wip-12536-hammer
+
+commit 153744d7c596705c4f92bee5e827846b46c80141
+Author: Jason Dillaman <dillaman@redhat.com>
+Date: Mon Aug 10 09:39:50 2015 -0400
+
+ tests: increase test coverage for partial encodes/decodes
+
+ Multiple combinations of offsets/lengths are now tested when
+ performing partial encodes/decodes of the bit vector.
+
+ Signed-off-by: Jason Dillaman <dillaman@redhat.com>
+ (cherry picked from commit 3e145f714ac9b2d599b45a058c6b93595e38f424)
+
+commit fca78765366f3ac365cfa98224aca5fb79b2a7fe
+Author: Jason Dillaman <dillaman@redhat.com>
+Date: Mon Aug 10 09:34:42 2015 -0400
+
+ common: bit_vector extent calculation incorrect for last page
+
+ It's highly probable that the last page in the bit vector will not
+ be a full page size. As a result, the computed extents will extend
+ beyond the data portion of the bit vector, resulting in a end_of_buffer
+ exception.
+
+ Fixes: #12611
+ Backport: hammer
+ Signed-off-by: Jason Dillaman <dillaman@redhat.com>
+ (cherry picked from commit c6d98992691683524d3d96def83a90a6f5fe7f93)
+
+commit 3396a969741f74e5b1f55d8d7af258493ca26478
+Author: John Spray <john.spray@redhat.com>
+Date: Thu Jul 30 14:20:56 2015 +0100
+
+ osd/OSDMap: handle incrementals that modify+del pool
+
+ Because new_pools was processed after old_pools, if something
+ was modified and then deleted in the same incremental
+ map, then the resulting state would be a pool in the map
+ that had no entry in pool_name.
+
+ Fixes: #12429
+ Signed-off-by: John Spray <john.spray@redhat.com>
+ (cherry picked from commit 8d4932e721e32a33c1bada54e11d4ecccd868618)
+
+commit 3ab5d82a1c09142267c27156b69a3117d30c5b7d (refs/remotes/gh/wip-12432-hammer)
+Author: Yehuda Sadeh <yehuda@redhat.com>
+Date: Wed Jul 22 10:01:00 2015 -0700
+
+ rgw: set http status in civetweb
+
+ Need to set the http status in civetweb so that we report it correctly.
+ Fixes: #12432
+
+ Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
+ (cherry picked from commit b8e28ab9f914bf48c9ba4f0def9a0deb9dbb93bc)
+
+commit 10a03839853246c535e639b6dc6cea45b8673642
+Author: Yehuda Sadeh <yehuda@redhat.com>
+Date: Fri Jul 31 11:03:29 2015 -0700
+
+ civetweb: update submodule to support setting of http status
+
+ Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
+
+commit 00d802d97ba5e1a8bde2414f8710494f15807fcd
+Author: Sage Weil <sage@redhat.com>
+Date: Tue Dec 23 11:03:17 2014 -0800
+
+ hobject_t: fix get_boundary to work with new sorting regime
+
+ The hash is no longer the most significant field; set everything that is
+ more significant, too.
+
+ Signed-off-by: Sage Weil <sage@redhat.com>
+ (cherry picked from commit 45281efad1ae6b2b5ddd5549c56dbdd46671e5c5)
+
+commit 9b91adc560c8dffc1f5f7470d28c25f448b2b619 (refs/remotes/gh/wip-osd-compat-hammer)
+Author: Sage Weil <sage@redhat.com>
+Date: Tue Aug 4 13:21:50 2015 -0400
+
+ mon: disallow post-hammer OSDs if there are up pre-hammer OSDs
+
+ Force *all* OSDs to upgrade to hammer before allowing post-hammer
+ OSDs to join. This prevents any pre-hammer OSDs from running at
+ the same time as a post-hammer OSD.
+
+ This commit, as well as the definition of the sentinal post-hammer
+ feature, should get backported to hammer stable series.
+
+ Backport: hammer
+ Signed-off-by: Sage Weil <sage@redhat.com>
+ (cherry picked from commit e38d60e94503c7e8511a60a8dceceb3cd39c2bd8)
+
+ # Conflicts:
+ # src/mon/OSDMonitor.cc
+
+commit 8a559c1e80bb7c70e13c46f1900896c9b8fcd9a9
+Author: Sage Weil <sage@redhat.com>
+Date: Tue Aug 4 13:16:11 2015 -0400
+
+ include/ceph_features: define MON_METADATA feature
+
+ This was added in master in 40307748b9b8f84c98354a7141da645a3c556ba9. We
+ define it but notably do not support it!
+
+ Signed-off-by: Sage Weil <sage@redhat.com>
+
+commit 4faa8e04069417a6e2a6c4ea5c10b54d76aa00c4 (refs/remotes/gh/wip-12577-hammer)
+Author: Sage Weil <sage@redhat.com>
+Date: Fri Mar 27 10:17:12 2015 -0700
+
+ osd: include newlines in scrub errors
+
+ We may log more than one of these in a scrubmap; make sure they are
+ not concatenated.
+
+ Signed-off-by: Sage Weil <sage@redhat.com>
+ (cherry picked from commit 2b3dd1bb7ab360e8f467a47b7ce3a0e4d3a979b2)
+
+commit 455eb2a89197e9609c5bb510112d661d388b4c85
+Author: Sage Weil <sage@redhat.com>
+Date: Fri Mar 27 10:04:00 2015 -0700
+
+ osd: fix condition for loggin scrub errors
+
+ We may have an error to log even though the authoritative map is empty:
+ when we have a digest that doesn't match all replicas.
+
+ Signed-off-by: Sage Weil <sage@redhat.com>
+ (cherry picked from commit d23766be902080ffb29528acb5a00d70beb97a9f)
+
+commit 67e7946ce8e28f00db9588bed670ef5141268f41
+Author: Sage Weil <sage@redhat.com>
+Date: Fri Mar 27 10:03:22 2015 -0700
+
+ osd: fix fallback logic; move into be_select_auth_object
+
+ The fallback behavior was printing a promising message but then doing
+ a 'continue' and not actually scrubbing the object. Instead, fall back to
+ a less-bad auth inside be_select_auth_object.
+
+ Signed-off-by: Sage Weil <sage@redhat.com>
+ (cherry picked from commit b597db59fedc9a96dbe4b37f03b819dcf8fdb1bb)
+
+commit 0f57c7017a98f7e416a160375b8b80355b8e0fc3
+Author: Sage Weil <sage@redhat.com>
+Date: Fri Mar 27 09:34:44 2015 -0700
+
+ osd: log a scrub error when we can't pick an auth object
+
+ If we really can't find a suitable auth, log an error.
+
+ Signed-off-by: Sage Weil <sage@redhat.com>
+ (cherry picked from commit a476d8f3903ca78b5cf36d63059f13cb5268efe5)
+
+commit d4f4c5c4334add6acfc66407c2383d01094d384d
+Author: Sage Weil <sage@redhat.com>
+Date: Fri Mar 27 10:20:23 2015 -0700
+
+ osd: repair record digest if all replicas match but do not match
+
+ If the recorded digest does not match the replicas, and all replicas
+ match, then (on repair) fix the recorded digest.
+
+ Signed-off-by: Sage Weil <sage@redhat.com>
+ (cherry picked from commit f581fecd8a16b9250fa96beec5aa26074f401028)
+
+commit acfed6b5eae764d381c88ed7d3f4942c61191127
+Author: Sage Weil <sage@redhat.com>
+Date: Thu Mar 26 13:52:20 2015 -0700
+
+ osd: move recorded vs on disk digest warning into be_compare_scrubmaps
+
+ This is a better place for it. While we are here, change the wording to
+ clearly call out the 'recorded' digest (from object_info_t) vs the 'on
+ disk' digest (what we observed during scrub).
+
+ Signed-off-by: Sage Weil <sage@redhat.com>
+ (cherry picked from commit cf349ff35e9111ca52db1b0aad3753d0680b486d)
+
+commit 674029bc6c519e82011d1429ab5eddff9720c2dc
+Author: Sage Weil <sage@redhat.com>
+Date: Thu Mar 26 13:46:22 2015 -0700
+
+ osd: be slightly paranoid about value of okseed
+
+ The scrubber.seed value is set based on the peer feature; check for that
+ too explicitly, and assert the scrubber.seed value matches.
+
+ No change in behavior here.
+
+ Signed-off-by: Sage Weil <sage@redhat.com>
+ (cherry picked from commit e34d31b7a9a71132a17b95cf5ad60255ece60243)
+
+commit f2002b7fa2af2db52037da4c1cf66d405a4941e7
+Author: Sage Weil <sage@redhat.com>
+Date: Thu Mar 26 13:44:25 2015 -0700
+
+ osd: be precise about "known" vs "best guess"
+
+ We cannot assume that the auth info has the "known" digest; all replicas
+ may have a matching digest that does not match the oi, or we may choose
+ a different auth info for some other reason. Verify that the digest
+ matches the oi before calling it "known".
+
+ Signed-off-by: Sage Weil <sage@redhat.com>
+ (cherry picked from commit 546d1c7b8224d96d0cc93dc3c96f52787cd69413)
+
+commit 4e5d146ad36ef0380eb72e45dca651494658aeeb
+Author: Sage Weil <sage@redhat.com>
+Date: Thu Mar 26 13:24:11 2015 -0700
+
+ osd: record digest if object is clean (vs entire scrub chunk)
+
+ If an individual object is clean, record it in the missing_digest map.
+ If not, leave it out. This lets us drop the old condition that only
+ recorded any digests if the entire scrub chunk was clean.
+
+ Signed-off-by: Sage Weil <sage@redhat.com>
+ (cherry picked from commit c39e0e5f126028f552d410ab6924cac6e1f714fb)
+
+commit 1357ed1bd0e250b942bcba0346c97c24bb79a5d1
+Author: Sage Weil <sage@redhat.com>
+Date: Mon Aug 3 13:05:45 2015 -0400
+
+ hobject_t: decode future hobject_t::get_min() properly
+
+ The post-hammer wip-temp branch changed hobject_t::get_min() so that pool
+ is INT64_MIN instead of -1 and neglected to deal with the encoding compat
+ with older versions. Compensate on hammer by mapping INT64_MIN to -1
+ locally. See commit ff99af38df830e215359bfb8837bf310a2023a4d.
+
+ Note that this means upgrades from hammer to post-hammer *must* include
+ this fix prior to the upgrade. This will need to be well-documented in the
+ release notes.
+
+ Master gets a similar fix so that they map our min value to the new
+ INT64_MIN one on decode.
+
+ Fixes: #12536 (for hammer)
+ Signed-off-by: Sage Weil <sage@redhat.com>
+
+commit 6d01d6b700300841f49f288a89d514f26a4f94b1
+Author: Samuel Just <sjust@redhat.com>
+Date: Wed Jul 29 11:49:57 2015 -0700
+
+ OSDMonitor::preprocess_get_osdmap: send the last map as well
+
+ Fixes: #12410
+ Backport: hammer
+ Signed-off-by: Samuel Just <sjust@redhat.com>
+ (cherry picked from commit 1320e29dfaee9995409a6d99b9ccaa748dc67b90)
+
+commit a7851933033473d11e69fa1f237c0ad8bbbd4a13
+Author: Nathan Cutler <ncutler@suse.com>
+Date: Thu Jul 9 11:51:13 2015 +0200
+
+ ceph.spec.in: drop SUSE-specific %py_requires macro
+
+ %py_requires expands to
+
+ BuildRequires: /usr/bin/python
+ PreReq: python = 2.7
+
+ The BuildRequires: is already provided, and the PreReq is wrong because
+ e.g. SLE11-SP3 (a platform we are trying to support) has Python 2.6.
+
+ http://tracker.ceph.com/issues/12351 Fixes: #12351
+
+ Signed-off-by: Nathan Cutler <ncutler@suse.com>
+ (cherry picked from commit cbf6c7b46b42e163950bf7956e5b7565fca961c9)
+
+commit 8804b3f1ab5180c8a85b25b9b46b986fe7022868
+Author: Nathan Cutler <ncutler@suse.com>
+Date: Thu Jul 16 15:16:22 2015 +0200
+
+ ceph.spec.in: remove SUSE-specific apache2-mod_fcgid dependency
+
+ This package is no longer required for RGW to work in SUSE.
+
+ http://tracker.ceph.com/issues/12358 Fixes: #12358
+
+ Signed-off-by: Nathan Cutler <ncutler@suse.com>
+ (cherry picked from commit f3f8d3660d0ece3139e5f3dc7881ccceadcf648d)
+
+ Conflicts:
+ ceph.spec.in
+ In master, the "%if %else %endif" has been changed
+ into two "%if %endif"s
+
+commit b575ecca9743ab08439bfe0b5283e483e2a799ce
+Author: Jason Dillaman <dillaman@redhat.com>
+Date: Tue Jun 23 14:20:16 2015 -0400
+
+ tests: verify that image shrink properly handles flush op
+
+ Signed-off-by: Jason Dillaman <dillaman@redhat.com>
+ (cherry picked from commit 8dfcc72071d63c7867a5a59abe871cf5db673a0a)
+
+commit d4eb7bd63a5e46b790bad7001d2873c5c238cc90
+Author: Jason Dillaman <dillaman@redhat.com>
+Date: Tue Jun 23 14:18:20 2015 -0400
+
+ librbd: invalidate cache outside cache callback context
+
+ When shrinking an image, it's possible that the op flush callback
+ will be from within the cache callback context. This would result
+ in a deadlock when attempting to re-lock the cache lock in order to
+ invalidate the cache.
+
+ Fixes: #11743
+ Backport: hammer
+ Signed-off-by: Jason Dillaman <dillaman@redhat.com>
+ (cherry picked from commit 726d699b7790c7e371279281ab32cd3aeb8ece7b)
+
+commit 92272dd676ebb67a3095ce3933cac24809b054da
+Author: Jason Dillaman <dillaman@redhat.com>
+Date: Fri May 15 11:18:29 2015 -0400
+
+ librbd: don't cancel request lock early
+
+ It's possible that a stale notice is received and will
+ be discarded after the request lock has been canceled.
+ This will stale the client.
+
+ Signed-off-by: Jason Dillaman <dillaman@redhat.com>
+ (cherry picked from commit d9dd5c5890029107df40ed438f23fb9865d7de29)
+
+commit 58ae92f1a716e1ffac6408793e19d47f99d63520
+Author: Jason Dillaman <dillaman@redhat.com>
+Date: Thu May 14 16:13:38 2015 -0400
+
+ tests: new test for transitioning exclusive lock
+
+ Signed-off-by: Jason Dillaman <dillaman@redhat.com>
+ (cherry picked from commit f97ce46ea4c9c7cdc6e37e3759871d5b41b25769)
+
+commit 7b21ccba7c2885027b1d345baaad08a978fbc72f
+Author: Jason Dillaman <dillaman@redhat.com>
+Date: Thu May 7 13:31:50 2015 -0400
+
+ tests: verify that librbd will periodically resend lock request
+
+ Signed-off-by: Jason Dillaman <dillaman@redhat.com>
+ (cherry picked from commit d2a1c226ab3f7e202f62896f0c80c4cf3607cdaf)
+
+commit c95b37f48c129ef6780f67b326e97957f3771472
+Author: Jason Dillaman <dillaman@redhat.com>
+Date: Fri May 15 10:49:36 2015 -0400
+
+ common: Mutex shouldn't register w/ lockdep if disabled
+
+ Signed-off-by: Jason Dillaman <dillaman@redhat.com>
+ (cherry picked from commit 879b8a73e2452332b26b8f3428ff5e3e0af8ddad)
+
+commit 117205af89398457e197793505381622705488b2
+Author: Jason Dillaman <dillaman@redhat.com>
+Date: Fri May 15 10:47:04 2015 -0400
+
+ librbd: improve debugging output for ImageWatcher
+
+ Include the instance pointer so that different images
+ can be differentiated in the logs.
+
+ Signed-off-by: Jason Dillaman <dillaman@redhat.com>
+ (cherry picked from commit b951a7398e3e749cb64a3f6a604212a5627e82a0)
+
+commit 08ae01231754d3010c1ede762579cf75c1c7460d
+Author: Jason Dillaman <dillaman@redhat.com>
+Date: Fri May 15 10:45:04 2015 -0400
+
+ librados_test_stub: watcher id should be the instance id (gid)
+
+ Signed-off-by: Jason Dillaman <dillaman@redhat.com>
+ (cherry picked from commit 3e1e561cc29043eb64dff8afb3a2c1ed77788e93)
+
+commit 704c0e09479d435ecbb84693a786c60694732b19
+Author: Jason Dillaman <dillaman@redhat.com>
+Date: Thu May 7 12:51:49 2015 -0400
+
+ librbd: retry lock requests periodically until acquired
+
+ If the exclusive lock owner acks the lock release request but crashes
+ before it actually releases the lock, the requestor will wait forever.
+ Therefore, after a certain timeout, retry the request again until it
+ succeeds.
+
+ Fixes: #11537
+ Backport: hammer
+ Signed-off-by: Jason Dillaman <dillaman@redhat.com>
+ (cherry picked from commit 37c74e6e5274208d1b6efaf315afec03ea7eaa82)
+
+commit dbaaed9cf99121d0c97c22a695a7a6e872a11f48
+Author: Jason Dillaman <dillaman@redhat.com>
+Date: Thu May 7 12:35:36 2015 -0400
+
+ librbd: don't hold owner_lock for write during flush
+
+ The various IO callback codepaths will attempt to take
+ the lock, which will result in deadlock since the flush
+ cannot complete.
+
+ Backport: hammer
+ Fixes: #11537
+ Signed-off-by: Jason Dillaman <dillaman@redhat.com>
+
+ (cherry picked from commit 2b6d0633d5c89de3a557cdd72621dfc19f0540de)
+
+commit e9718201c6ed785c61077797a74ffda7e0438fb9
+Author: Jason Dillaman <dillaman@redhat.com>
+Date: Mon Jun 22 15:30:02 2015 -0400
+
+ lockdep: do not automatically collect all backtraces
+
+ It is expensive to collect backtraces every time a lock is
+ checked in order to provide cycle backtraces. The backtraces
+ can be forced on for specific locks or globally via the new
+ config option "lockdep_force_backtrace".
+
+ Signed-off-by: Jason Dillaman <dillaman@redhat.com>
+ (cherry picked from commit 7354d25f56c5e004f288febdee2b6961c069163b)
+
+commit 27f7042e923366c31748c4cc9992c1a8cb37b457
+Author: Jason Dillaman <dillaman@redhat.com>
+Date: Tue Jun 9 13:20:54 2015 -0400
+
+ librbd: flush operations need to acquire owner lock
+
+ Cache writeback operations will expect the owner lock to be held.
+
+ Signed-off-by: Jason Dillaman <dillaman@redhat.com>
+ (cherry picked from commit adfa2e0070ccca7b6556d3bfc5fac7ce4d43a4d0)
+
+commit 5b39983025f510c3119ebb375870e7669be7ddd0
+Author: Jason Dillaman <dillaman@redhat.com>
+Date: Thu May 21 00:13:31 2015 -0400
+
+ librbd: avoid infinite loop if copyup fails
+
+ Signed-off-by: Jason Dillaman <dillaman@redhat.com>
+ (cherry picked from commit 43e0e3cd63f0067217ed0811d73f6c546f3027be)
+
+commit 88b583b249a74a71bc87409015f7a8d85200e1bf
+Author: Jason Dillaman <dillaman@redhat.com>
+Date: Tue May 12 10:19:48 2015 -0400
+
+ librbd: flush pending ops while not holding lock
+
+ Signed-off-by: Jason Dillaman <dillaman@redhat.com>
+ (cherry picked from commit 3d5cef38c37e5dda6b23751ad560851f1304d86d)
+
+commit a88b180571cb481a31cb94c249a3b486220232fa
+Author: Jason Dillaman <dillaman@redhat.com>
+Date: Tue May 12 10:07:21 2015 -0400
+
+ tests: fix possible deadlock in librbd ImageWatcher tests
+
+ Signed-off-by: Jason Dillaman <dillaman@redhat.com>
+ (cherry picked from commit 742a85d667b26b3490d96270b5c500b08f2a5283)
+
+commit 321eb8d1c3f7d553addb780928e201acf5091132
+Author: Jason Dillaman <dillaman@redhat.com>
+Date: Mon May 11 13:59:49 2015 -0400
+
+ tests: enable lockdep for librbd unit tests
+
+ Signed-off-by: Jason Dillaman <dillaman@redhat.com>
+ (cherry picked from commit 45cb9cb5980e90235b8244d0d61ece40bde4784a)
+
+commit bfe5b90921a3faaad0533388cb150cea20f47ae9
+Author: Jason Dillaman <dillaman@redhat.com>
+Date: Thu May 7 14:17:37 2015 -0400
+
+ librbd: owner_lock should be held during flush request
+
+ Flush might result in the cache writing out dirty objects, which
+ would require that the owner_lock be held.
+
+ Signed-off-by: Jason Dillaman <dillaman@redhat.com>
+ (cherry picked from commit c9142fe35372cf69b7a56f334622a775a6b7c43f)
+
+commit 1e84fb05f48c146cc9d2d090be8c2d355326938b
+Author: Jason Dillaman <dillaman@redhat.com>
+Date: Thu May 7 14:06:16 2015 -0400
+
+ osdc: ObjectCacher flusher might needs additional locks
+
+ librbd requires the ObjectCacher flusher thread to acquire
+ an additional lock in order to maintain lock ordering
+ constraints.
+
+ Signed-off-by: Jason Dillaman <dillaman@redhat.com>
+ (cherry picked from commit a38f9e5104a6e08e130dc4f15ad19a06d9e63719)
+
+commit 506a45a906024d4bb5d3d4d6cc6cbb9eec39c5f2
+Author: Jason Dillaman <dillaman@redhat.com>
+Date: Thu Apr 30 16:11:03 2015 -0400
+
+ librbd: fix recursive locking issues
+
+ Signed-off-by: Jason Dillaman <dillaman@redhat.com>
+ (cherry picked from commit 1b57cc1da7a51e6f8ffea689b94ef843732c20a4)
+
+commit acf5125fe27fb3b9de8b97c4e44fa1f5c61147fd
+Author: Jason Dillaman <dillaman@redhat.com>
+Date: Thu Apr 30 16:04:28 2015 -0400
+
+ librbd: simplify state machine handling of exclusive lock
+
+ It is expected that all IO is flushed and all async ops are cancelled
+ prior to releasing the exclusive lock. Therefore, replace handling of
+ lost exclusive locks in state machines with an assertion.
+
+ Signed-off-by: Jason Dillaman <dillaman@redhat.com>
+ (cherry picked from commit d6b733dbdd0aeb5d1e136dcbf30c58c80952651e)
+
+commit 9454f04e62ece39fdcdbb4eb5a83945f76bcc0a5
+Author: Jason Dillaman <dillaman@redhat.com>
+Date: Thu Apr 30 15:32:38 2015 -0400
+
+ librbd: ObjectMap::aio_update can acquire snap_lock out-of-order
+
+ Detected during an fsx run where a refresh and CoR were occurring
+ concurrently. The refresh held the snap_lock and was waiting on
+ the object_map_lock, while the CoR held object_map_lock and was
+ waiting for snap_lock.
+
+ Fixes: #11577
+ Signed-off-by: Jason Dillaman <dillaman@redhat.com>
+ (cherry picked from commit 8cbd92b1fe835b1eb3a898976f9507f51cc115b2)
+
+commit 3e0358e17e7ddb488109bce04bb08cd16fd5bb2f
+Author: Jason Dillaman <dillaman@redhat.com>
+Date: Thu Apr 16 14:15:10 2015 -0400
+
+ librbd: move copyup class method call to CopyupRequest
+
+ Move AbstractWrite's invocation of copyup to the CopyupRequest
+ class. The AioRequest write path will now always create a
+ CopyupRequest, which will now append the actual write ops to the
+ copyup.
+
+ Signed-off-by: Jason Dillaman <dillaman@redhat.com>
+ (cherry picked from commit 7be3df67809925164237cc185f9f29e145f45768)
+
+commit 2ee64a80794297d4fc5aeafbb185818f7f6a77b8
+Author: Jason Dillaman <dillaman@redhat.com>
+Date: Tue Mar 31 12:28:11 2015 -0400
+
+ librbd: simplify AioRequest constructor parameters
+
+ Moved all parent overlap computation to within AioRequest so that
+ callers don't need to independently compute the overlap. Also
+ removed the need to pass the snap_id for write operations since
+ it can only be CEPH_NOSNAP.
+
+ Signed-off-by: Jason Dillaman <dillaman@redhat.com>
+ (cherry picked from commit 46515971edab8888284b1a8307ffca88a9c75f5c)
+
+commit 3e71a7554da05aee06d5a2227808c321a3e3f0f1
+Author: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
+Date: Sat Mar 14 01:16:31 2015 +0100
+
+ librbd/AioRequest.h: fix UNINIT_CTOR
+
+ Fix for:
+
+ CID 1274319: Uninitialized scalar field (UNINIT_CTOR)
+ uninit_member: Non-static class member m_object_state is not
+ initialized in this constructor nor in any functions that it calls.
+
+ Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
+ (cherry picked from commit 48f18ea0e1c4c6de1921ea2359448deb761461e7)
+
+commit cb57fe581df7c14d174e6eaff382d6a28ab658d6
+Author: Jason Dillaman <dillaman@redhat.com>
+Date: Fri Jul 17 15:04:10 2015 -0400
+
+ librbd: add object state accessor to ObjectMap
+
+ Signed-off-by: Jason Dillaman <dillaman@redhat.com>
+
+commit 9249ab7dacd43e7a546656b99013a595381fd5fd
+Author: Jason Dillaman <dillaman@redhat.com>
+Date: Thu Apr 30 15:41:59 2015 -0400
+
+ librbd: AsyncObjectThrottle should always hold owner_lock
+
+ Signed-off-by: Jason Dillaman <dillaman@redhat.com>
+ (cherry picked from commit c352bcdc0f63eea55677fe3c3b5f0c61347c0db3)
+
+commit 26902b94f97edb189ae620c86a8dda8166df471a
+Author: Jason Dillaman <dillaman@redhat.com>
+Date: Thu Apr 30 15:34:43 2015 -0400
+
+ librbd: execute flush completion outside of cache_lock
+
+ Signed-off-by: Jason Dillaman <dillaman@redhat.com>
+ (cherry picked from commit 5f157f20980de7e9a05fb933fb57efdc759da78b)
+
+commit 571220d6f4642dd3cd78988882645fdf647c150e
+Author: Jason Dillaman <dillaman@redhat.com>
+Date: Thu Apr 30 15:17:54 2015 -0400
+
+ librbd: add AsyncRequest task enqueue helper method
+
+ In order to support the invariant that all state machine
+ callbacks occur without holding locks, transitions that
+ don't always involve a librados call should queue their
+ callback.
+
+ Signed-off-by: Jason Dillaman <dillaman@redhat.com>
+ (cherry picked from commit 218bc2d0f8d90c9c64408cb22e26680e88138844)
+
+commit 8e280f4cfef0d2fdc706d43bbee0c377d288a457
+Author: Jason Dillaman <dillaman@redhat.com>
+Date: Thu May 7 15:32:27 2015 -0400
+
+ librbd: disable lockdep on AioCompletion
+
+ It is only used by clients and it causes a large slowdown
+ in performance due to the rate at which the lock is constructed/
+ destructed for each IO request.
+
+ Signed-off-by: Jason Dillaman <dillaman@redhat.com>
+ (cherry picked from commit 66e74641baeed9aadb7e474d6e6b142b7725722d)
+
+commit b38da48059792e9182fe2877786d9159007683d3
+Author: Jason Dillaman <dillaman@redhat.com>
+Date: Thu Apr 30 13:42:19 2015 -0400
+
+ librbd: AioCompletion shouldn't hold its lock during callback
+
+ The callback routine most likely will attempt to retrieve the result
+ code, which will result in a recursive lock attempt.
+
+ Signed-off-by: Jason Dillaman <dillaman@redhat.com>
+ (cherry picked from commit 3ad19ae349ebb27ff6027e40883735240fa97a3c)
+
+commit 6fdd3f1ce69fa2e00c6f1bedd5f72352953e1e44
+Author: Jason Dillaman <dillaman@redhat.com>
+Date: Thu Apr 30 13:51:03 2015 -0400
+
+ librbd: give locks unique names to prevent false lockdep failures
+
+ Signed-off-by: Jason Dillaman <dillaman@redhat.com>
+ (cherry picked from commit c474ee42b87975c04eeb2b40b976deb5a5e2d518)
+
+commit 70041499f99cad551b3aab16f086f725b33b25e2
+Author: Jason Dillaman <dillaman@redhat.com>
+Date: Thu Apr 30 13:40:16 2015 -0400
+
+ librbd: complete cache read in a new thread context
+
+ The ObjectCacher complete the read callback while still holding
+ the cache lock. This introduces lock ordering issues which are
+ resolved by queuing the completion to execute in a clean (unlocked)
+ context.
+
+ Signed-off-by: Jason Dillaman <dillaman@redhat.com>
+ (cherry picked from commit 0024677dc8adfd610418ca47599dd95d3a5a6612)
+
+commit 65ef695eba0f5b5d87347ffb3407bb5d6d75b402
+Author: Jason Dillaman <dillaman@redhat.com>
+Date: Thu Mar 19 15:35:59 2015 -0400
+
+ librbd: require callers to ObjectMap::aio_update to acquire lock
+
+ This is needed to allow an atomic compare and update operation
+ from the rebuild object map utility.
+
+ Signed-off-by: Jason Dillaman <dillaman@redhat.com>
+ (cherry picked from commit 2db758cb4cb6d88cbaf9842b1e5d0872a185d8df)
+
+commit 58b8fafb87b18f2a4d8c38f77ecf81ff58452409
+Author: Jason Dillaman <dillaman@redhat.com>
+Date: Thu Apr 30 13:38:29 2015 -0400
+
+ log: fix helgrind warnings regarding possible data race
+
+ Signed-off-by: Jason Dillaman <dillaman@redhat.com>
+ (cherry picked from commit c1e14451775049bbd95bcb19a0b62ab5e2c0a7bb)
+
+commit a5203d32544d40cb51eb60fc906cc3ceaacbfe96
+Author: Jason Dillaman <dillaman@redhat.com>
+Date: Thu Apr 30 13:37:56 2015 -0400
+
+ librados_test_stub: fix helgrind warnings
+
+ Signed-off-by: Jason Dillaman <dillaman@redhat.com>
+ (cherry picked from commit b65ae4bc26f2dcaaa9518d5cce0e8b83ea310de8)
+
+commit b73e87eb307137786e0f0d89362ef0e92e2670b8
+Author: Jason Dillaman <dillaman@redhat.com>
+Date: Thu Apr 30 13:36:26 2015 -0400
+
+ librados_test_stub: add support for flushing watches
+
+ Signed-off-by: Jason Dillaman <dillaman@redhat.com>
+ (cherry picked from commit 6e400b9049ede5870e40e4dd2cb41874550eac25)
+
+commit 2fa35b1c5ca8e33959fff8c84eaa4feca0f67df3
+Author: Jason Dillaman <dillaman@redhat.com>
+Date: Thu Apr 30 13:29:12 2015 -0400
+
+ common: lockdep now support unregistering once destructed
+
+ librbd use of an image hierarchy resulted in lock names being
+ re-used and incorrectly analyzed. librbd now uses unique lock
+ names per instance, but to prevent an unbounded growth of
+ tracked locks, we now remove lock tracking once a lock is
+ destructed.
+
+ Signed-off-by: Jason Dillaman <dillaman@redhat.com>
+ (cherry picked from commit 7c7df2ce9f837628535d21df61ae4f13d809c4fa)
+
+commit 7b85c7bfe599644eb29e6b1e03733da4774c2eac
+Author: Jason Dillaman <dillaman@redhat.com>
+Date: Thu Apr 30 13:26:41 2015 -0400
+
+ common: add valgrind.h convenience wrapper
+
+ Conditionally support helgrind annotations if valgrind support is
+ enabled during the build.
+
+ Signed-off-by: Jason Dillaman <dillaman@redhat.com>
+ (cherry picked from commit 650ad32d74a24d248dd8e19bff1bbd31f0bb224b)
+
+commit 6d3db5ffbef71c8927a9ffc68c5955dca0f5612c
+Author: Jason Dillaman <dillaman@redhat.com>
+Date: Wed Apr 8 17:24:08 2015 -0400
+
+ librbd: add work queue for op completions
+
+ Signed-off-by: Jason Dillaman <dillaman@redhat.com>
+ (cherry picked from commit 21f990efe6c6d710376d5b1a49fc8cd53aa020e6)
+
+commit 64425e861400fde4703fb06529777c55650b6676
+Author: Jason Dillaman <dillaman@redhat.com>
+Date: Wed Apr 8 16:46:34 2015 -0400
+
+ WorkQueue: ContextWQ can now accept a return code
+
+ Signed-off-by: Jason Dillaman <dillaman@redhat.com>
+ (cherry picked from commit e5ffae578e83c1e4fca3f328c937e7c9be8cc03c)
+
+commit eccf36980511de7ed122a38d426170496ffdea64
+Author: Ken Dreyer <kdreyer@redhat.com>
+Date: Tue Jun 23 13:41:53 2015 -0600
+
+ packaging: RGW depends on /etc/mime.types
+
+ If the mimecap RPM or mime-support DEB is not installed, then the
+ /etc/mime.types file is not present on the system. RGW attempts to read
+ this file during startup, and if the file is not present, RGW logs an
+ error:
+
+ ext_mime_map_init(): failed to open file=/etc/mime.types ret=-2
+
+ Make the radosgw package depend on the mailcap/mime-support packages so
+ that /etc/mime.types is always available on RGW systems.
+
+ http://tracker.ceph.com/issues/11864 Fixes: #11864
+
+ Signed-off-by: Ken Dreyer <kdreyer@redhat.com>
+ (cherry picked from commit c74a2f86a1f9b15aae0e723b410bedfc1d01a79b)
+
+commit 7bddf5d4dad09b1f6d3b4e80e4bdd895191560b0
+Author: huangjun <hjwsm1989@gmail.com>
+Date: Thu Jul 16 09:42:55 2015 +0800
+
+ rest_bench: bucketname is not mandatory as we have a default name
+
+ Signed-off-by: huangjun <hjwsm1989@gmail.com>
+
+ (cherry picked from commit bc56a87ea3b69b4856a2b9f9fb2a63dbfb1211c3)
+
+commit 6e7358b3958b7ee11ef612302b300d07f3982d54
+Author: huangjun <hjwsm1989@gmail.com>
+Date: Thu Jul 16 09:17:59 2015 +0800
+
+ rest_bench: drain the work queue to fix a crash
+ Fixes: #3896
+ Signed-off-by: huangjun <hjwsm1989@gmail.com>
+
+ (cherry picked from commit f3d34d8ff921dbd2ff21f6b72af7c73bb9c6940e)
+
+commit 1e055782f5ade94c19c2614be0d61d797490701e
+Author: John Spray <john.spray@redhat.com>
+Date: Tue Jul 21 16:09:32 2015 +0100
+
+ auth: check return value of keyring->get_secret
+
+ get_secret can fail to populate the passed CryptoKey, for
+ example if the entity name is not found in the keyring. In
+ this case, attempts to use the CryptoKey will lead to
+ segfaults.
+
+ Fixes: #12417
+ Signed-off-by: John Spray <john.spray@redhat.com>
+ (cherry picked from commit 64e5041008744362fdbb16e16bc3e049a2d426aa)
+
+commit 256620e37fd94ee4b3af338ea6955be55529d0d6
+Author: Greg Farnum <gfarnum@redhat.com>
+Date: Thu Jul 16 04:45:05 2015 -0700
+
+ Client: check dir is still complete after dropping locks in _readdir_cache_cb
+
+ We drop the lock when invoking the callback, which means the directory
+ we're looking at might get dentries trimmed out of memory. Make sure that
+ hasn't happened after we get the lock back. If it *has* happened, fall back
+ to requesting the directory contents from the MDS. Update the dirp location
+ pointers after each entry to facilitate this.
+ Because this requires we update the dirp->at_cache_name value on every loop,
+ we rework the updating scheme a bit: to dereference the dn->name before
+ unlocking, so we know it's filled in; and since we update it on every loop
+ we don't need to refer to the previous dentry explicitly like we did before.
+
+ This should also handle racing file deletes: we get back a trace on
+ the removed dentry and that will clear the COMPLETE|ORDERED flags.
+
+ Fixes #12297
+
+ Signed-off-by: Greg Farnum <gfarnum@redhat.com>
+ (cherry picked from commit 62dd63761701a7e0f7ce39f4071dcabc19bb1cf4)
+
+commit 8a2ad0540994efe530a1775ebd949aeaf6609e57
+Author: Samuel Just <sjust@redhat.com>
+Date: Thu Apr 9 16:29:45 2015 -0700
+
+ TestPGLog: fix invalid proc_replica_log test caes
+
+ If 1'3 is non-divergent, no osd could correctly have created 2'3. Also,
+ proc_replica_log does not add the extra entries from the auth log to the
+ missing set, that happens later on in activate.
+
+ Signed-off-by: Samuel Just <sjust@redhat.com>
+ (cherry picked from commit 1333b676dba4ed4b5db854fe935bdadbf9f21d08)
+
+commit df71e6be7ccbe18d99200b2a5844a9f19ac70141
+Author: Samuel Just <sjust@redhat.com>
+Date: Thu Apr 9 16:28:23 2015 -0700
+
+ TestPGLog: fix noop log proc_replica_log test case
+
+ Need to fill in log.head, olog.head.
+
+ Signed-off-by: Samuel Just <sjust@redhat.com>
+ (cherry picked from commit 1e5b22053381580708af29a1536f1e106c9b479c)
+
+commit 549ff9a938c5126d4dcb15535845d5354cb44bb2
+Author: Samuel Just <sjust@redhat.com>
+Date: Thu Apr 9 15:01:41 2015 -0700
+
+ TestPGLog: add test for 11358
+
+ Signed-off-by: Samuel Just <sjust@redhat.com>
+ (cherry picked from commit b61e5aef15d7448d24b713d13dce77697bc0af74)
+
+commit c224fc70e14bd76494bc437595c8b0b0d275694e
+Author: Samuel Just <sjust@redhat.com>
+Date: Thu Apr 9 15:01:29 2015 -0700
+
+ PGLog::proc_replica_log: handle split out overlapping entries
+
+ See the comment, if the overlapping entries between olog.head
+ and log.tail were split out, last_update should be log.tail.
+
+ Fixes: 11358
+ Signed-off-by: Samuel Just <sjust@redhat.com>
+ (cherry picked from commit 6561e0d955c4563a8505b717de41f5bd89119f63)
+
+commit b8176d0f21ce80d2e5a92057ab85f7618504cd9f
+Author: Ketor Meng <d.ketor@gmail.com>
+Date: Tue May 26 18:50:17 2015 +0800
+
+ Mutex: fix leak of pthread_mutexattr
+
+ Need pthread_mutexattr_destroy after pthread_mutexattr_init
+
+ Fixes: #111762
+ Signed-off-by: Ketor Meng <d.ketor@gmail.com>
+ (cherry picked from commit 2b23327b3aa8d96341d501a5555195ca1bc0de8f)
+
+commit 43a72e47c4adae674e02bb262645d88ac528e2be
+Author: Xinze Chi <xmdxcxz@gmail.com>
+Date: Fri Jul 3 18:27:13 2015 +0800
+
+ mon/PGMonitor: bug fix pg monitor get crush rule
+
+ when some rules have been deleted before, the index in array of crush->rules
+ is not always equals to crush_ruleset of pool.
+
+ Fixes: #12210
+ Reported-by: Ning Yao <zay11022@gmail.com>
+ Signed-off-by: Xinze Chi <xmdxcxz@gmail.com>
+ (cherry picked from commit 498793393c81c0a8e37911237969fba495a3a183)
+
+commit 0ca93db7d79f11e51af75e322941419b860bb2f8
+Author: Shylesh Kumar <shmohan@redhat.com>
+Date: Wed Jul 22 18:47:20 2015 +0530
+
+ mon: ceph osd map shows NONE when an osd is missing
+
+ Signed-off-by: Shylesh Kumar <shmohan@redhat.com>
+ (cherry picked from commit 4d030302ea3709eb021710e873f1ebe62f951cec)
+
+commit 695f782e59baffbe8429f9daa47a4f1476a02976
+Author: Sage Weil <sage@redhat.com>
+Date: Sun Jun 7 20:05:58 2015 -0400
+
+ crush/CrushWrapper: fix adjust_subtree_weight debug
+
+ Signed-off-by: Sage Weil <sage@redhat.com>
+ (cherry picked from commit 26be86f649a1e9846280204fe1e3f8344eb975ce)
+
+commit 0bd4c81ce41a22b22ca76e539de87260b140bbc4
+Author: Sage Weil <sage@redhat.com>
+Date: Fri Jun 5 12:15:45 2015 -0700
+
+ crush/CrushWrapper: return changed from adjust_subtree_weight
+
+ Signed-off-by: Sage Weil <sage@redhat.com>
+ (cherry picked from commit 551ab2d69dd50a078d62340740d357d85ab8dcbb)
+
+commit 05fc59bee9138d04227255a2f31bd82efe94b1e9
+Author: Sage Weil <sage@redhat.com>
+Date: Fri Jun 5 12:15:22 2015 -0700
+
+ crush/CrushWrapper: adjust subtree base in adjust_subtree_weight
+
+ We were correctly adjusting all the children, but the subtree root was
+ not being updated.
+
+ Fixes: #11855
+ Signed-off-by: Sage Weil <sage@redhat.com>
+ (cherry picked from commit 1da96ab8442522bda4fc39e05597f17b8ebddf89)
+
+commit d2f31adc49a7c6b8276dbf8773575e91ba5e18fa
+Author: Sage Weil <sage@redhat.com>
+Date: Fri Jun 5 12:12:41 2015 -0700
+
+ unittest_crush_wrapper: test adjust_subtree_weight
+
+ Signed-off-by: Sage Weil <sage@redhat.com>
+ (cherry picked from commit b461dc2e970f139dcb25d93b32be6b4bb9f1c8eb)
+
+commit 0ccdf342e7cf0072d3c38c6e1a6cf3a87f154a28
+Author: Sage Weil <sage@redhat.com>
+Date: Fri Jun 5 12:17:26 2015 -0700
+
+ unittest_crush_wrapper: attach buckets to root in adjust_item_weight test
+
+ Signed-off-by: Sage Weil <sage@redhat.com>
+ (cherry picked from commit a8351eb3de2b4069ffec9c4f561eb1519ea11aa2)
+
+commit 1e737532cfe1daf43bea3d9bd4e55faed560f0f2
+Author: Sage Weil <sage@redhat.com>
+Date: Fri Jun 5 12:12:32 2015 -0700
+
+ unittest_crush_wrapper: parse env
+
+ Signed-off-by: Sage Weil <sage@redhat.com>
+ (cherry picked from commit 14c60b288b33e4cec9c9819d4668a5ff9855ccc1)
+
+commit cd11b887c6c586085a7014ba44123b115370a462
+Author: Guang G Yang <yguang@renownedground.corp.gq1.yahoo.com>
+Date: Thu Jul 2 05:29:47 2015 +0000
+
+ osd: pg_interval_t::check_new_interval should not rely on pool.min_size to determine if the PG was active
+
+ If the pool's min_size is set improperly, during peering, pg_interval_t::check_new_interval
+ might wrongly determine the PG's state and cause the PG to stuck at down+peering forever
+
+ Fixes: #12162
+ Signed-off-by: Guang Yang yguang@yahoo-inc.com
+ (cherry picked from commit 684927442d81ea08f95878a8af69d08d3a14d973)
+
+ Conflicts:
+ src/osd/PG.cc
+ because PG::start_peering_interval has an assert
+ that is not found in hammer in the context
+ src/test/osd/types.cc
+ because include/stringify.h is not included by
+ types.cc in hammer
+
+commit c5f0e2222cc55a92ebc46d12b618fadb3d2fb577
+Author: Guang G Yang <yguang@renownedground.corp.gq1.yahoo.com>
+Date: Wed Jul 1 20:26:54 2015 +0000
+
+ osd: Move IsRecoverablePredicate/IsReadablePredicate to osd_types.h
+
+ Signed-off-by: Guang Yang <yguang@yahoo-inc.com>
+ (cherry picked from commit 466b083166231ec7e4c069fef8c9e07d38accab9)
+
+commit 42bff0b9e2f80e32001082a608d63719332677e3
+Author: Joao Eduardo Luis <joao@suse.de>
+Date: Tue Jul 21 11:20:53 2015 +0100
+
+ mon: OSDMonitor: fix hex output on 'osd reweight'
+
+ Fixes: #12251
+
+ Signed-off-by: Joao Eduardo Luis <joao@suse.de>
+ (cherry picked from commit 787fa80c2746fde44ac0583ff7995ec5be9a672d)
+
+commit e00494118ee42322784988fe56623cbc7aac4cc9
+Author: Kefu Chai <kchai@redhat.com>
+Date: Wed Jul 15 19:03:33 2015 +0800
+
+ ceph.in: print more detailed warning for 'ceph <type> tell'
+
+ put the full signature of "tell <target> <command> [options...]"
+ instead of "tell {0}.<id>", which could be misleading somehow.
+
+ Fixes: 11101
+ Signed-off-by: Kefu Chai <kchai@redhat.com>
+ (cherry picked from commit aa1a5222eebd0256d4ecffb0eefeb0f78ecf0a1f)
+
+commit f18900f2eb724acd898e8b32fe75c0850d7cf94c
+Author: Kefu Chai <kchai@redhat.com>
+Date: Wed Jul 15 18:01:52 2015 +0800
+
+ ceph.in: print more detailed error message for 'tell' command
+
+ * we do not allow user specify a certain daemon when starting an
+ interactive session. the existing error message could lead to
+ some confusion. so put more details in it.
+
+ Fixes: #11101
+ Signed-off-by: Kefu Chai <kchai@redhat.com>
+ (cherry picked from commit 972dc9145235ff0f60663369ebcab8c16628b89f)
+
+commit 9916d37ead705d467b1d730adb15bb6974b3bf1b
+Author: huangjun <hjwsm1989@gmail.com>
+Date: Mon Jul 20 10:50:20 2015 +0800
+
+ mon/PGMonitor: avoid uint64_t overflow when checking pool 'target/max' status.
+ Fixes: #12401
+
+ Signed-off-by: huangjun <hjwsm1989@gmail.com>
+
+ (cherry picked from commit f84e6b8157e78fd05cd1c8ac957c92df17e6ba06)
+
+commit 4457d3eb70712ec3b7d8e98af973e099c8c7d258
+Author: renhwztetecs <rhwlyw@163.com>
+Date: Tue Jul 21 18:55:00 2015 +0800
+
+ Update OSDMonitor.cc
+
+ OSDMonitor::get_pools_health(), s/objects/bytes/
+
+ Fixes: #12402
+ Signed-off-by: ren.huanwen@zte.com.cn
+ (cherry picked from commit 7fc13c9d6b9a4962d7640240416105d8f558d600)
+
+commit add0f1e5e229c9ad66e8ef77ad59e0e390e20db6
+Author: Kefu Chai <kchai@redhat.com>
+Date: Thu Apr 16 18:29:00 2015 +0800
+
+ ceph.in: do not throw on unknown errno
+
+ some of the errnos are not listed in errno.errorcode. if we happen
+ to run into them, print 'Unknown' instead.
+
+ Fixes: #11354
+ Signed-off-by: Kefu Chai <kchai@redhat.com>
+ (cherry picked from commit 53514ad97f6f75746613f09d464f69a7c31bed55)
+
+commit fa194744fdaed13949bffb6f2b8a0fc420006e0b
+Author: Sage Weil <sage@redhat.com>
+Date: Wed Mar 18 13:49:20 2015 -0700
+
+ os/chain_xattr: handle read on chnk-aligned xattr
+
+ If we wrote an xattr that was a multiple of a chunk, we will try to read
+ the next chunk and get ENODATA. If that happens bail out of the loop and
+ assume we've read the whole thing.
+
+ Backport: hammer, firefly
+ Signed-off-by: Sage Weil <sage@redhat.com>
+ (cherry picked from commit 8614dcebf384b74b283cd352001a65fa26ba925c)
+
+commit 931ffe3b3a43157798717e64de8f46fadbcd9e9b
+Author: Boris Ranto <branto@redhat.com>
+Date: Wed Jun 3 12:24:48 2015 +0200
+
+ common/Cycles.cc: skip initialization if rdtsc is not implemented
+
+ The Cycles initialization gets stuck in infinite loop if rdtsc is not
+ implemented. This patch fixes the issue by quitting the initialization
+ if rtdsc fails.
+
+ The patch was cherry-picked from ubuntu patch by James Page, see
+
+ https://bugzilla.redhat.com/show_bug.cgi?id=1222286
+
+ for more details on the patch.
+
+ Signed-off-by: James Page <james.page@ubuntu.com>
+ (cherry picked from commit 35c5fd0091fc4d63b21207fb94e46b343519fd56)
+
+commit 0fde3a2465e156ebf9a5cdc6adc45d66d6d647fc
+Author: Haomai Wang <haomaiwang@gmail.com>
+Date: Thu Jul 9 13:42:42 2015 +0800
+
+ buffer: Fix bufferlist::zero bug with special case
+
+ Fixes: #12252
+ Signed-off-by: Haomai Wang <haomaiwang@gmail.com>
+ (cherry picked from commit 43f583d160ccaf879eaf0f3020e77860cf8d1df0)
+
+commit dabc61110a5773262614fc77d3653674aac421f7
+Author: Haomai Wang <haomaiwang@gmail.com>
+Date: Thu Jul 9 13:32:03 2015 +0800
+
+ UnittestBuffer: Add bufferlist zero test case
+
+ Signed-off-by: Haomai Wang <haomaiwang@gmail.com>
+ (cherry picked from commit 577acf665948e531e50d36f5780ea19351a5bf65)
+
+commit d08db7a0677412dbe590c850976fb4fe2f503a79 (refs/remotes/gh/wip-11470.hammer)
+Author: Joao Eduardo Luis <joao@suse.de>
+Date: Fri Jun 12 19:21:10 2015 +0100
+
+ mon: PaxosService: call post_refresh() instead of post_paxos_update()
+
+ Whenever the monitor finishes committing a proposal, we call
+ Monitor::refresh_from_paxos() to nudge the services to refresh. Once
+ all services have refreshed, we would then call each services
+ post_paxos_update().
+
+ However, due to an unfortunate, non-critical bug, some services (mainly
+ the LogMonitor) could have messages pending in their
+ 'waiting_for_finished_proposal' callback queue [1], and we need to nudge
+ those callbacks.
+
+ This patch adds a new step during the refresh phase: instead of calling
+ directly the service's post_paxos_update(), we introduce a
+ PaxosService::post_refresh() which will call the services
+ post_paxos_update() function first and then nudge those callbacks when
+ appropriate.
+
+ [1] - Given the monitor will send MLog messages to itself, and given the
+ service is not readable before its initial state is proposed and
+ committed, some of the initial MLog's would be stuck waiting for the
+ proposal to finish. However, by design, we only nudge those message's
+ callbacks when an election finishes or, if the leader, when the proposal
+ finishes. On peons, however, we would only nudge those callbacks if an
+ election happened to be triggered, hence the need for an alternate path
+ to retry any message waiting for the initial proposal to finish.
+
+ Fixes: #11470
+
+ Signed-off-by: Joao Eduardo Luis <joao@suse.de>
+ (cherry picked from commit 1551ebb63238073d2fd30201e6b656a8988e958c)
+
+commit 0818e9f78b11801aa619b9ec04eeffb2795c3f62
+Author: Nathan Cutler <ncutler@suse.com>
+Date: Thu Jul 9 13:28:22 2015 +0200
+
+ ceph.spec.in: snappy-devel for all supported distros
+
+ Signed-off-by: Nathan Cutler <ncutler@suse.com>
+ (cherry picked from commit e4634ddcc1c0a2abe51679425d15e6f693811e17)
+
+ Conflicts:
+ ceph.spec.in
+ minor difference
+
+commit 8b576bd529d7c1604f0a4cdf97ece64fc5d69447
+Author: Nathan Cutler <ncutler@suse.com>
+Date: Tue Jun 16 18:27:20 2015 +0200
+
+ ceph.spec.in: python-argparse only in Python 2.6
+
+ argparse is a widely-used Python module for parsing command-line arguments.
+ Ceph makes heavy use of Python scripts, both in the build environment and on
+ cluster nodes and clients.
+
+ Until Python 2.6, argparse was distributed separately from Python proper.
+ As of 2.7 it is part of the Python standard library.
+
+ Although the python package in a given distro may or may not Provide:
+ python-argparse, this cannot be relied upon.
+
+ Therefore, this commit puts appropriate conditionals around Requires:
+ python-argparse and BuildRequires: python-argparse. It does so for Red
+ Hat/CentOS and SUSE only, because the last Fedora version with Python 2.6
+ was Fedora 13, which is EOL.
+
+ argparse is required by both the ceph and ceph-common packages, but since ceph
+ requires ceph-common, the argparse Requires and BuildRequires need only appear
+ once, under ceph-common.
+
+ http://tracker.ceph.com/issues/12034 Fixes: #12034
+
+ Signed-off-by: Nathan Cutler <ncutler@suse.com>
+ (cherry picked from commit 23171c952997d104cfa6b5700ec0bb658a8e0915)
+
+commit cdde626f6371e1da501306ed16bc450ee1ec0b91
+Author: Nathan Cutler <ncutler@suse.com>
+Date: Mon Jul 13 18:12:01 2015 +0200
+
+ ceph.spec.in: do not run fdupes, even on SLE/openSUSE
+
+ In openSUSE there is a policy to use %fdupes in the spec file if RPMLINT
+ complains about duplicate files wasting space in the filesystem.
+
+ However, RPMLINT is not so complaining, so drop fdupes.
+
+ http://tracker.ceph.com/issues/12301 Fixes: #12301
+
+ Signed-off-by: Nathan Cutler <ncutler@suse.com>
+ (cherry picked from commit 53072b9019caf72e0313b2804ea174237ed7da33)
+
+commit 6417e8eff942dbbf6cd231ffb73136b7bdcd837f
+Author: Nathan Cutler <ncutler@suse.com>
+Date: Fri Jun 12 17:50:58 2015 +0200
+
+ rpm: add missing Java conditionals
+
+ http://tracker.ceph.com/issues/11991 Fixes: #11991
+
+ Signed-off-by: Nathan Cutler <ncutler@suse.com>
+ (cherry picked from commit 04e91bbd929801de7f1d6a05086d47a781c2e361)
+
+commit 37284773a754ef4b91d2b5436d46a5fd2be4f67e
+Author: Owen Synge <osynge@suse.com>
+Date: Fri May 29 13:28:24 2015 +0200
+
+ Add rpm conditionals : cephfs_java
+
+ Extracted conditionals from SUSE rpm spec file to forward port.
+ Original work done by Thorsten Behrens <tbehrens@suse.com>
+
+ Signed-off-by: Owen Synge <osynge@suse.com>
+ (cherry picked from commit c65538f489897821877421043300d9c008224f02)
+
+commit 8f78001c2e09d483dcbcd33c24e2ef8043119773
+Author: Nathan Cutler <ncutler@suse.cz>
+Date: Thu May 14 20:07:37 2015 +0200
+
+ ceph.spec.in: SUSE/openSUSE builds need libbz2-devel
+
+ http://tracker.ceph.com/issues/11629 Fixes: #11629
+
+ Signed-off-by: Nathan Cutler <ncutler@suse.cz>
+ (cherry picked from commit 584ed2e28b0a31821f29a99cf6078cfd76ee31fc)
+
+commit 4eb58ad2027148561d94bb43346b464b55d041a6
+Author: Nathan Cutler <ncutler@suse.com>
+Date: Thu Jun 25 22:37:52 2015 +0200
+
+ ceph.spec.in: use _udevrulesdir to eliminate conditionals
+
+ The conditionals governing where 50-rbd.rules is installed were not doing the
+ right thing on SUSE distros.
+
+ Start using the %_udevrulesdir RPM macro, while taking care that it is defined
+ and set to the right value. Use it to eliminate some conditionals around other
+ udev rules files as well.
+
+ http://tracker.ceph.com/issues/12166 Fixes: #12166
+
+ Signed-off-by: Nathan Cutler <ncutler@suse.com>
+ (cherry picked from commit 8aa758ee7a14e93ded1d55b4aca7a54aa47d7174)
+
+ Conflicts:
+ ceph.spec.in
+ hammer does not yet have _with_systemd or ceph_daemon.py
--- /dev/null
+commit 9764da52395923e0b32908d83a9f7304401fee43 (tag: refs/tags/v0.94.5, refs/remotes/gh/hammer)
+Author: Jenkins <jenkins@ceph.com>
+Date: Mon Oct 26 07:05:32 2015 -0700
+
+ 0.94.5
+
+commit 1107f29224e24211860b719b82f9b85a022c25e3
+Merge: d86eab5 d3abcbe
+Author: Loic Dachary <loic@dachary.org>
+Date: Fri Oct 23 20:41:33 2015 +0200
+
+ Merge pull request #6348 from dillaman/wip-13567-hammer
+
+ librbd: potential assertion failure during cache read
+
+ Reviewed-by: Sage Weil <sage@redhat.com>
+
+commit d86eab5b860186066c888208d92a42a748569d78
+Merge: 4ebfa1b 250dc07
+Author: Loic Dachary <loic@dachary.org>
+Date: Fri Oct 23 15:20:32 2015 +0200
+
+ Merge pull request #6362 from liewegas/wip-shut-up-osd-hammer
+
+ osd/ReplicatedPG: remove stray debug line
+
+ Reviewed-by: Loic Dachary <ldachary@redhat.com>
+
+commit 250dc0722b9156fe1b8be81e09fb4ead699065f3 (refs/remotes/me/wip-shut-up-osd-hammer)
+Author: Sage Weil <sage@redhat.com>
+Date: Sat Sep 12 08:33:44 2015 -0400
+
+ osd/ReplicatedPG: remove stray debug line
+
+ This snuck in
+
+ Signed-off-by: Sage Weil <sage@redhat.com>
+ (cherry picked from commit ff9600a6cef613d40e875597b6392778df1bb04c)
+
+commit d3abcbea1fdb04f0994f19584b93f6f1b1ff37ca
+Author: Jason Dillaman <dillaman@redhat.com>
+Date: Wed Oct 21 13:12:48 2015 -0400
+
+ librbd: potential assertion failure during cache read
+
+ It's possible for a cache read from a clone to trigger a writeback if a
+ previous read op determined the object doesn't exist in the clone,
+ followed by a cached write to the non-existent clone object, followed
+ by another read request to the same object. This causes the cache to
+ flush the pending writeback ops while not holding the owner lock.
+
+ Fixes: #13559
+ Backport: hammer
+ Signed-off-by: Jason Dillaman <dillaman@redhat.com>
+ (cherry picked from commit 4692c330bd992a06b97b5b8975ab71952b22477a)
+
+commit 991d0f0575411e2f2b53df35e36ff6170bcc9d8b
+Author: Jason Dillaman <dillaman@redhat.com>
+Date: Wed Oct 21 13:09:54 2015 -0400
+
+ tests: reproduce crash during read-induced CoW
+
+ Signed-off-by: Jason Dillaman <dillaman@redhat.com>
+ (cherry picked from commit 382219b6bba09156f8cf3d420c6348738e7ed4c6)
+
+commit 4ebfa1bcc7e3b57c3c12000633654d36a005d512
+Merge: 9529269 51f3d6a
+Author: Jason Dillaman <dillaman@redhat.com>
+Date: Thu Oct 22 12:14:42 2015 -0400
+
+ Merge pull request #6330 from dachary/wip-13550-hammer
+
+ qemu workunit refers to apt-mirror.front.sepia.ceph.com
+
+ Reviewed-by: Jason Dillaman <dillaman@redhat.com>
+
+commit 51f3d6a489760dbcb931676396eea92159ca2ad9
+Author: Yuan Zhou <yuan.zhou@intel.com>
+Date: Fri Jun 19 00:02:20 2015 +0800
+
+ qa: Use public qemu repo
+
+ This would allow some external tests outside of sepia lab
+
+ Signed-off-by: Yuan Zhou <yuan.zhou@intel.com>
+ (cherry picked from commit 4731c1e35539c9506ff3fe3141553fad099d0eee)
--- /dev/null
+commit e832001feaf8c176593e0325c8298e3f16dfb403 (tag: refs/tags/v0.94.6, refs/remotes/gh/hammer)
+Author: Jenkins Build Slave User <jenkins-build@jenkins-slave-wheezy.localdomain>
+Date: Mon Feb 22 21:10:17 2016 +0000
+
+ 0.94.6
+
+commit 7abb6ae8f3cba67009bd022aaeee0a87cdfc6477
+Merge: ceb6fcc a8fc6a9
+Author: Loic Dachary <loic@dachary.org>
+Date: Mon Feb 8 14:19:57 2016 +0700
+
+ Merge pull request #7501 from SUSE/wip-14624-hammer
+
+ hammer: fsx failed to compile
+
+ Reviewed-by: Loic Dachary <ldachary@redhat.com>
+
+commit ceb6fcc5f2828995bfe59bfc4e206010a4fe3230
+Merge: 2f4e1d1 f2ca42b
+Author: Sage Weil <sage@redhat.com>
+Date: Fri Feb 5 21:10:46 2016 -0500
+
+ Merge pull request #7524 from ktdreyer/wip-14637-hammer-man-radosgw-admin-orphans
+
+ hammer: doc: regenerate man pages, add orphans commands to radosgw-admin(8)
+
+commit 2f4e1d1ff8e91fc2ee9c23d5a17c3174d15a7103
+Merge: 2ca3c3e 9ab5fd9
+Author: Orit Wasserman <owasserm@redhat.com>
+Date: Fri Feb 5 10:30:22 2016 +0100
+
+ Merge pull request #7526 from ceph/wip-14516-hammer
+
+ hammer: rgw-admin: document orphans commands in usage
+
+commit 2ca3c3e5683ef97902d0969e49980d69c81b4034
+Merge: 02353f6 5c8d1d7
+Author: Loic Dachary <loic@dachary.org>
+Date: Fri Feb 5 12:47:33 2016 +0700
+
+ Merge pull request #7441 from odivlad/backport-pr-14569
+
+ [backport] hammer: rgw: Make RGW_MAX_PUT_SIZE configurable
+
+ Reviewed-by: Yehuda Sadeh <ysadehwe@redhat.com>
+
+commit 02353f6baa460949d7dd2738346d8d748401bc5b
+Merge: f3bab8c 0e1378e
+Author: Loic Dachary <loic@dachary.org>
+Date: Fri Feb 5 12:46:54 2016 +0700
+
+ Merge pull request #7442 from odivlad/backport-pr-14570
+
+ [backport] rgw: fix wrong etag calculation during POST on S3 bucket.
+
+ Reviewed-by: Yehuda Sadeh <ysadehwe@redhat.com>
+
+commit 9ab5fd9d67da43e986489e4f580a597dd8cb551e
+Author: Yehuda Sadeh <yehuda@redhat.com>
+Date: Mon Feb 1 16:33:55 2016 -0800
+
+ rgw-admin: document orphans commands in usage
+
+ Fixes: #14516
+
+ Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
+ (cherry picked from commit 105a76bf542e05b739d5a03ca8ae55432350f107)
+
+ Conflicts:
+ src/rgw/rgw_admin.cc (trivial resolution)
+
+commit 0e1378effdd1d0d70d3de05c79b208e9f8b8e328
+Author: Radoslaw Zarzynski <rzarzynski@mirantis.com>
+Date: Mon Sep 21 20:32:29 2015 +0200
+
+ [backport] rgw: fix wrong etag calculation during POST on S3 bucket.
+
+ Closes: #14570
+ (cherry picked from commit 742906a)
+
+ Signed-off-by: Radoslaw Zarzynski <rzarzynski@mirantis.com>
+ Signed-off-by: Vladislav Odintsov <odivlad@gmail.com>
+ Tested-by: Vladislav Odintsov <odivlad@gmail.com>
+
+commit 5c8d1d74069f70b85bc4286e6d1136bce1dc593f
+Author: Yuan Zhou <yuan.zhou@intel.com>
+Date: Thu Jul 9 16:56:07 2015 +0800
+
+ [backport] rgw: Make RGW_MAX_PUT_SIZE configurable
+
+ The 5GB limit of a single operation uploading was part of S3 spec.
+ However some private setups may have some special requirements
+ on this limit. It's more convinent to have a configurable value.
+
+ Closes: http://tracker.ceph.com/issues/14569
+ (cherry picked from commit df97f28)
+
+ Signed-off-by: Yuan Zhou <yuan.zhou@intel.com>
+ Signed-off-by: Vladislav Odintsov <odivlad@gmail.com>
+ Tested-by: Vladislav Odintsov <odivlad@gmail.com>
+
+commit f2ca42b1218182f4bfa27718c9606705d8b9941f
+Author: Ken Dreyer <kdreyer@redhat.com>
+Date: Wed Feb 3 19:51:58 2016 -0700
+
+ doc: add orphans commands to radosgw-admin(8)
+
+ The --help text was added in 105a76bf542e05b739d5a03ca8ae55432350f107.
+ Add the corresponding entries to the man page.
+
+ Fixes: #14637
+
+ Signed-off-by: Ken Dreyer <kdreyer@redhat.com>
+
+ (cherry picked from commit ec162f068b40f594c321df5caa9fe2541551b89e)
+ Cherry-pick to hammer includes nroff source change (in master the
+ nroff sources are no longer present in Git.)
+
+commit e42ed6d6414ad55d671dd0f406b1dababd643af8
+Author: Ken Dreyer <kdreyer@redhat.com>
+Date: Thu Feb 4 11:04:39 2016 -0700
+
+ man: rebuild manpages
+
+ following the procedure in admin/manpage-howto.txt.
+
+ Signed-off-by: Ken Dreyer <kdreyer@redhat.com>
+
+commit a8fc6a9ffb2f8021657ad412fd0aaaaf7f98bd53
+Author: Greg Farnum <gfarnum@redhat.com>
+Date: Wed Jan 13 13:17:53 2016 -0800
+
+ fsx: checkout old version until it compiles properly on miras
+
+ I sent a patch to xfstests upstream at
+ http://article.gmane.org/gmane.comp.file-systems.fstests/1665, but
+ until that's fixed we need a version that works in our test lab.
+
+ Signed-off-by: Greg Farnum <gfarnum@redhat.com>
+ (cherry picked from commit 7d52372ae74878ebd001036ff0a7aad525eb15b6)
+
+commit f3bab8c7bc6bba3c79329d7106684596634e17a6
+Merge: 31d86b1 1b02859
+Author: Loic Dachary <loic@dachary.org>
+Date: Wed Feb 3 12:41:56 2016 +0700
+
+ Merge pull request #7454 from dachary/wip-14584-hammer
+
+ hammer: fsstress.sh fails
+
+ Reviewed-by: Loic Dachary <ldachary@redhat.com>
+
+commit 31d86b1580d59581d130e7a5e84905a5b4d67666
+Merge: 2c8e579 2817ffc
+Author: Loic Dachary <loic@dachary.org>
+Date: Wed Feb 3 11:38:57 2016 +0700
+
+ Merge pull request #6918 from asheplyakov/hammer-bug-12449
+
+ osd: check for full before changing the cached obc (hammer)
+
+ Reviewed-by: Loic Dachary <ldachary@redhat.com>
+
+commit 1b02859480677abbd8708650764ed6815917e0cd
+Author: Yan, Zheng <zyan@redhat.com>
+Date: Tue Aug 18 15:22:55 2015 +0800
+
+ qa/fsstress.sh: fix 'cp not writing through dangling symlink'
+
+ On some test machines, /usr/lib/ltp/testcases/bin/fsstress is
+ dangling symlink. 'cp -f' is impotent in this case.
+
+ Fixes: #12710
+ Signed-off-by: Yan, Zheng <zyan@redhat.com>
+ (cherry picked from commit 479f2a760baf6af4714d3391a366a6b3acf1bcaf)
+
+commit 2c8e57934284dae0ae92d1aa0839a87092ec7c51
+Merge: 1cab151 700be56
+Author: Sage Weil <sage@redhat.com>
+Date: Sat Jan 30 21:42:29 2016 -0500
+
+ Merge pull request #7236 from athanatos/wip-14376
+
+ config_opts: increase suicide timeout to 300 to match recovery
+
+ http://pulpito.ceph.com/sage-2016-01-30_09:58:32-rados-wip-sage-testing-hammer---basic-mira/
+
+ Reviewed-by: Sage Weil <sage@redhat.com>
+
+commit 1cab151a6cdc8a1b9b2f11518b77ea149c19d067
+Merge: a134c44 5105d50
+Author: Sage Weil <sage@redhat.com>
+Date: Sat Jan 30 21:42:12 2016 -0500
+
+ Merge pull request #6450 from dachary/wip-13672-hammer
+
+ tests: testprofile must be removed before it is re-created
+
+ http://pulpito.ceph.com/sage-2016-01-30_09:58:32-rados-wip-sage-testing-hammer---basic-mira/
+
+ Reviewed-by: Sage Weil <sage@redhat.com>
+
+commit a134c44d626ead3308464474d67604363bac6f5d
+Merge: 520792d 3f1292e
+Author: Sage Weil <sage@redhat.com>
+Date: Sat Jan 30 21:41:39 2016 -0500
+
+ Merge pull request #6680 from SUSE/wip-13859-hammer
+
+ hammer: ceph.spec.in License line does not reflect COPYING
+
+ http://pulpito.ceph.com/sage-2016-01-30_09:58:32-rados-wip-sage-testing-hammer---basic-mira/
+
+commit 520792d51e949c451767d116e267d86fee812ada
+Merge: 4d0fafb c2c6d02
+Author: Sage Weil <sage@redhat.com>
+Date: Sat Jan 30 21:41:18 2016 -0500
+
+ Merge pull request #6791 from branch-predictor/bp-5812-backport
+
+ Race condition in rados bench
+
+ http://pulpito.ceph.com/sage-2016-01-30_09:58:32-rados-wip-sage-testing-hammer---basic-mira/
+
+commit 4d0fafb289fc35f44e6e74bb974c402ba147d4d4
+Merge: 211a093 6379ff1
+Author: Sage Weil <sage@redhat.com>
+Date: Sat Jan 30 21:40:38 2016 -0500
+
+ Merge pull request #6973 from dreamhost/wip-configure-hammer
+
+ configure.ac: no use to add "+" before ac_ext=c
+
+ http://pulpito.ceph.com/sage-2016-01-30_09:58:32-rados-wip-sage-testing-hammer---basic-mira/
+
+ Reviewed-by: Kefu Chai <kchai@redhat.com>
+
+commit 211a093d4107c1806ad7e4876bc5c550a5b5b7d4
+Merge: 0c13656 53742bd
+Author: Sage Weil <sage@redhat.com>
+Date: Sat Jan 30 21:40:13 2016 -0500
+
+ Merge pull request #7206 from dzafman/wip-14292
+
+ osd/PG.cc: 3837: FAILED assert(0 == "Running incompatible OSD")
+
+ http://pulpito.ceph.com/sage-2016-01-30_09:58:32-rados-wip-sage-testing-hammer---basic-mira/
+
+ Reviewed-by: David Zafman <dzafman@redhat.com>
+
+commit 0c136561600e295ec48dcf29a77aa2cd293a7236
+Merge: 1ea14ba ae56de0
+Author: Sage Weil <sage@redhat.com>
+Date: Sat Jan 30 21:39:42 2016 -0500
+
+ Merge pull request #7207 from rldleblanc/recency_fix_for_hammer
+
+ hammer: osd/ReplicatedPG: Recency fix for Hammer
+
+ Reviewed-by: Sage Weil <sage@redhat.com>
+
+commit 1ea14bae10930ed3e66b7b0140e359009a44275e
+Merge: 1740d8c 8d9e08c
+Author: Sage Weil <sage@redhat.com>
+Date: Sat Jan 30 21:39:11 2016 -0500
+
+ Merge pull request #7347 from tchaikov/wip-hammer-10093
+
+ tools: ceph-monstore-tool must do out_store.close()
+
+ http://pulpito.ceph.com/sage-2016-01-30_09:58:32-rados-wip-sage-testing-hammer---basic-mira/
+
+ Reviewed-by: Sage Weil <sage@redhat.com>
+
+commit 1740d8ce8eb7e7debce1684a19736783489628c3
+Merge: 7848cdc c7252a3
+Author: Sage Weil <sage@redhat.com>
+Date: Sat Jan 30 21:38:35 2016 -0500
+
+ Merge pull request #7411 from dachary/wip-14467-hammer
+
+ hammer: disable filestore_xfs_extsize by default
+
+ http://pulpito.ceph.com/sage-2016-01-30_09:58:32-rados-wip-sage-testing-hammer---basic-mira/
+
+ Reviewed-by: Sage Weil <sage@redhat.com>
+
+commit 7848cdc4c8c3598cd291d26a2dd4d76abc4bcda9
+Merge: 57abeab 70f1ba3
+Author: Sage Weil <sage@redhat.com>
+Date: Sat Jan 30 21:38:13 2016 -0500
+
+ Merge pull request #7412 from dachary/wip-14470-hammer
+
+ tools: tool for artificially inflate the leveldb of the mon store for testing purposes
+
+ Reviewed-by: Sage Weil <sage@redhat.com>
+
+commit 57abeab1f2610d89f0ab2a028c8e093afde5e403
+Merge: 4d7d7c3 9109304
+Author: Sage Weil <sage@redhat.com>
+Date: Sat Jan 30 21:37:46 2016 -0500
+
+ Merge pull request #7446 from liewegas/wip-14537-hammer
+
+ mon: compact full epochs also
+
+ http://pulpito.ceph.com/sage-2016-01-30_09:58:32-rados-wip-sage-testing-hammer---basic-mira/
+
+ Reviewed-by: Sage Weil <sage@redhat.com>
+
+commit 4d7d7c33ff58ffeb27b47d379bf7dd4af90785b0
+Merge: 8360486 8c28f2f
+Author: Josh Durgin <jdurgin@redhat.com>
+Date: Sat Jan 30 11:45:31 2016 -0800
+
+ Merge pull request #7182 from dachary/wip-14143-hammer
+
+ hammer: Verify self-managed snapshot functionality on image create
+
+ Reviewed-by: Josh Durgin <jdurgin@redhat.com>
+
+commit 8360486764c3ab4e10a34f5bdf7555e4c3385977
+Merge: 501e01a b2961ce
+Author: Josh Durgin <jdurgin@redhat.com>
+Date: Sat Jan 30 11:45:20 2016 -0800
+
+ Merge pull request #7183 from dachary/wip-14283-hammer
+
+ hammer: rbd: fix bench-write
+
+ Reviewed-by: Josh Durgin <jdurgin@redhat.com>
+
+commit 501e01acc55f846cd3ad85e8294a9598c1c90907
+Merge: 97d4f6a 24c0b27
+Author: Josh Durgin <jdurgin@redhat.com>
+Date: Sat Jan 30 11:45:05 2016 -0800
+
+ Merge pull request #7416 from dachary/wip-14466-hammer
+
+ hammer: rbd-replay does not check for EOF and goes to endless loop
+
+ Reviewed-by: Josh Durgin <jdurgin@redhat.com>
+
+commit 97d4f6a7bed5a0d47f18b3a223a916aef355eaf9
+Merge: 51cc015 46d626d
+Author: Josh Durgin <jdurgin@redhat.com>
+Date: Sat Jan 30 11:44:50 2016 -0800
+
+ Merge pull request #7417 from dachary/wip-14553-hammer
+
+ hammer: rbd: TaskFinisher::cancel should remove event from SafeTimer
+
+ Reviewed-by: Josh Durgin <jdurgin@redhat.com>
+
+commit 51cc015c7e20d2ea9b9517238481fb80687be17c
+Merge: 23c24fc 73e03de
+Author: Josh Durgin <jdurgin@redhat.com>
+Date: Sat Jan 30 11:44:32 2016 -0800
+
+ Merge pull request #7407 from dillaman/wip-14543-hammer
+
+ librbd: ImageWatcher shouldn't block the notification thread
+
+ Reviewed-by: Josh Durgin <jdurgin@redhat.com>
+
+commit 23c24fc50d07a07db12239ac372bfce5a9fe2255
+Merge: 9513391 26e832e
+Author: Josh Durgin <jdurgin@redhat.com>
+Date: Sat Jan 30 11:44:12 2016 -0800
+
+ Merge pull request #6980 from dillaman/wip-14063-hammer
+
+ librbd: fix merge-diff for >2GB diff-files
+
+ Reviewed-by: Josh Durgin <jdurgin@redhat.com>
+
+commit 91093041a86fda40de08a366b5118e5e3ae275f0 (refs/remotes/me/wip-14537-hammer)
+Author: Kefu Chai <kchai@redhat.com>
+Date: Thu Jan 28 02:09:53 2016 -0800
+
+ mon: compact full epochs also
+
+ by compacting the ${prefix}.${start}..${prefix}..${end} does not
+ necessary compact the range of ${prefix}."full_"${start}..
+ ${prefix}."full_"${end}. so when more and more epochs get trimmed
+ with out a full range compaction, the size of monitor store could
+ be very large.
+
+ Fixes: #14537
+ Signed-off-by: Kefu Chai <kchai@redhat.com>
+ (cherry picked from commit 93d633a25ad8c36c972bb766c38187e2612041e1)
+
+commit 2817ffcf4e57f92551b86388681fc0fe70c386ec
+Author: Alexey Sheplyakov <asheplyakov@mirantis.com>
+Date: Wed Dec 16 15:31:52 2015 +0300
+
+ Check for full before changing the cached obc
+
+ ReplicatedPG::prepare_transaction(): check if the pool is full before
+ updating the cached ObjectContext to avoid the discrepancy between
+ the cached and the actual object size (and other metadata).
+ While at it improve the check itself: consider cluster full flag,
+ not just the pool full flag, also consider object count changes too,
+ not just bytes.
+
+ Based on commit a1eb380c3d5254f9f1fe34b4629e51d77fe010c1
+
+ Fixes: #13335
+
+ Signed-off-by: Alexey Sheplyakov <asheplyakov@mirantis.com>
+
+commit 951339103d35bc8ee2de880f77aada40d15b592a (refs/remotes/gh/wip-test-14716-4)
+Merge: e43aca5 5e5b512
+Author: Loic Dachary <loic@dachary.org>
+Date: Fri Jan 29 23:31:47 2016 +0700
+
+ Merge pull request #6353 from theanalyst/wip-13513-hammer
+
+ rgw: value of Swift API's X-Object-Manifest header is not url_decoded during segment look up
+
+ Reviewed-by: Yehuda Sadeh <ysadehwe@redhat.com>
+
+commit e43aca51d630274a57237b0f91a56df79ce8874a
+Merge: 7e20e6e 4420929
+Author: Loic Dachary <loic@dachary.org>
+Date: Fri Jan 29 23:31:16 2016 +0700
+
+ Merge pull request #6620 from SUSE/wip-13820-hammer
+
+ hammer: rgw: Setting ACL on Object removes ETag
+
+ Reviewed-by: Yehuda Sadeh <ysadehwe@redhat.com>
+
+commit 7e20e6e9d6626c5ac8b1f479011ab77a9e87da23
+Merge: f1d5570 cbb5c1f
+Author: Loic Dachary <loic@dachary.org>
+Date: Fri Jan 29 23:30:57 2016 +0700
+
+ Merge pull request #7186 from dachary/wip-13888-hammer
+
+ hammer: rgw: orphans finish segfaults
+
+ Reviewed-by: Yehuda Sadeh <ysadehwe@redhat.com>
+
+commit ae56de09fe1385958b5b600d1f0c91383989926f
+Author: Sage Weil <sage@redhat.com>
+Date: Wed Nov 25 14:40:26 2015 -0500
+
+ osd: recency should look at newest (not oldest) hitsets
+
+ Reported-by: xinxin shu <xinxin.shu@intel.com>
+ Signed-off-by: Sage Weil <sage@redhat.com>
+ (cherry picked from commit 528eae92d010ea34ae8cf0e8b2290aaa5e058d24)
+
+ Conflicts:
+ src/osd/ReplicatedPG.cc
+ code section was moved to ReplicatedPG::maybe_promote
+ in master.
+ Signed-off-by: Robert LeBlanc <robert.leblanc@endurance.com>
+
+commit 5cefcb975771f0c2efb7dfc77ce14a93a4ee7f1b
+Author: Sage Weil <sage@redhat.com>
+Date: Wed Nov 25 14:39:08 2015 -0500
+
+ osd/ReplicatedPG: fix promotion recency logic
+
+ Recency is defined as how many of the last N hitsets an object
+ must appear in in order to be promoted. The previous logic did
+ nothing of the sort... it checked for the object in any one of
+ the last N hitsets, which led to way to many promotions and killed
+ any chance of the cache performing properly.
+
+ While we are here, we can simplify the code to drop the max_in_*
+ fields (no longer necessary).
+
+ Note that we may still want a notion of 'temperature' that does
+ tolerate the object missing in one of the recent hitsets.. but
+ that would be different than recency, and should probably be
+ modeled after the eviction temperature model.
+
+ Backport: infernalis, hammer
+ Reported-by: Nick Fisk <nick@fisk.me.uk>
+ Signed-off-by: Sage Weil <sage@redhat.com>
+ (cherry picked from commit 180c8743addc5ae2f1db9c58cd2996ca6e7ac18b)
+
+ Conflicts:
+ src/osd/ReplicatedPG.cc
+ code section was moved to ReplicatedPG::maybe_promote
+ in master.
+ Signed-off-by: Robert LeBlanc <robert.leblanc@endurance.com>
+
+commit f1d5570beab0769b925b917e402d441ff053794c
+Merge: c4bb343 50c82f2
+Author: Sage Weil <sage@redhat.com>
+Date: Fri Jan 29 08:52:51 2016 -0500
+
+ Merge pull request #5789 from SUSE/wip-12928-hammer
+
+ rpm: libcephfs_jni1 has no %post and %postun
+
+ Reviewed-by: Sage Weil <sage@redhat.com>
+
+commit c4bb34320df8bfa734512a400fe8664c131363ff
+Merge: 86ba6ca a5e4f70
+Author: Sage Weil <sage@redhat.com>
+Date: Fri Jan 29 08:50:56 2016 -0500
+
+ Merge pull request #7434 from tchaikov/wip-14441-hammer
+
+ man: document listwatchers cmd in "rados" manpage
+
+ Reviewed-by: Sage Weil <sage@redhat.com>
+
+commit a5e4f70af422b05ece53f245bc15491bb1dd540d
+Author: Kefu Chai <kchai@redhat.com>
+Date: Wed Dec 23 11:23:38 2015 +0800
+
+ man: document listwatchers cmd in "rados" manpage
+
+ Signed-off-by: Kefu Chai <kchai@redhat.com>
+ (cherry picked from commit c2e391301efc43f0b431e89737246b2c43bf10a9)
+
+ man/rados.8: also added the rendered man.8 man page, as we don't
+ put the generated man pages in master anymore. but
+ they are still in the hammer's source repo.
+
+commit 46d626d92d7af218816d831cfcc1265b3ea31b72
+Author: Douglas Fuller <dfuller@redhat.com>
+Date: Fri Jan 22 11:18:40 2016 -0800
+
+ rbd: remove canceled tasks from timer thread
+
+ When canceling scheduled tasks using the timer thread, TaskFinisher::cancel
+ does not call SafeTimer::cancel_event, so events fire anyway. Add this call.
+
+ Fixes: #14476
+ Signed-off-by: Douglas Fuller <dfuller@redhat.com>
+ (cherry picked from commit 2aa0f318c862dbe3027d74d345671506605778eb)
+
+commit 24c0b27c6f6a26c2b7bab5bcbc421a18592d026f
+Author: Mykola Golub <mgolub@mirantis.com>
+Date: Thu Jan 21 13:45:42 2016 +0200
+
+ rbd-replay: handle EOF gracefully
+
+ Fixes: #14452
+ Signed-off-by: Mykola Golub <mgolub@mirantis.com>
+ (cherry picked from commit c59b84c3e2c9bbda68219e4d2288a889dd9ca6cb)
+
+ Conflicts:
+ src/rbd_replay/BufferReader.cc: trivial resolution
+ caused by s/CEPH_PAGE_SIZE/CEPH_BUFFER_APPEND_SIZE/
+ in the context of one hunk.
+
+commit 70f1ba33fe1a81d2631d54429749433a6cbfca44
+Author: Cilang Zhao <zhao.cilang@h3c.com>
+Date: Tue Jan 5 14:34:05 2016 +0800
+
+ tools: monstore: add 'show-versions' command.
+
+ Using this tool, the first/last committed version of maps will be shown.
+
+ Signed-off-by: Cilang Zhao <zhao.cilang@h3c.com>
+ (cherry picked from commit 21e6ba0c18428caff45733e6b43d197be38af8bb)
+
+commit 926017187910c9e6a3fb8babf9b498cf07941819
+Author: Kefu Chai <kchai@redhat.com>
+Date: Wed Sep 16 18:28:52 2015 +0800
+
+ tools: ceph_monstore_tool: add inflate-pgmap command
+
+ this command repeatly add the latest pgmap to the monstore in order
+ to inflate it. the command helps with the testing of some monstore
+ related performance issue of monitor
+
+ Fixes: #14217
+ Signed-off-by: Kefu Chai <kchai@redhat.com>
+ (cherry picked from commit b0f6af814a58dd374ca95e84a4e381f8ef1368de)
+
+commit a1d5728c928eb7e6b8c655741a0db3398ced7d56
+Author: Bo Cai <cai.bo@h3c.com>
+Date: Tue Oct 20 15:23:49 2015 +0800
+
+ tools:support printing the crushmap in readable fashion.
+
+ Signed-off-by: Bo Cai <cai.bo@h3c.com>
+ (cherry picked from commit b7faf678ed0241abc7eb86b9baaa6db669a22d53)
+
+commit bd9484750f546974047dacd9176a8072be846596
+Author: Bo Cai <cai.bo@h3c.com>
+Date: Mon Sep 14 19:50:47 2015 +0800
+
+ tools:print the map infomation in human readable format.
+
+ Signed-off-by: Bo Cai <cai.bo@h3c.com>
+ (cherry picked from commit 5ed8cdc19150382c946a373ec940d76f98e6ecb7)
+
+commit fba65832aad8a46d94a9256a56997e9df9e62297
+Author: Bo Cai <cai.bo@h3c.com>
+Date: Mon Sep 14 19:19:05 2015 +0800
+
+ tools:remove the local file when get map failed.
+
+ Signed-off-by: Bo Cai <cai.bo@h3c.com>
+ (cherry picked from commit 0b03b32d8ba76fe9f6f1158e68eb440e3670393a)
+
+commit 1bb899a290b77188b44a53ef7c7a40910c9248b2
+Author: Joao Eduardo Luis <joao@suse.de>
+Date: Mon Jul 13 12:35:13 2015 +0100
+
+ tools: ceph_monstore_tool: describe behavior of rewrite command
+
+ Signed-off-by: Joao Eduardo Luis <joao@suse.de>
+ (cherry picked from commit a881f9385feb0f5a61fa22357984d6f291c08177)
+
+commit 9035c69481f4aa4786414ac41cbc36fb4a3ca51d
+Author: Kefu Chai <kchai@redhat.com>
+Date: Fri Jun 19 22:57:57 2015 +0800
+
+ tools/ceph-monstore-tools: add rewrite command
+
+ "rewrite" command will
+ - add a new osdmap version to update current osdmap held by OSDMonitor
+ - add a new paxos version, as a proposal it will
+ * rewrite all osdmap epochs from specified epoch to the last_committed
+ one with the specified crush map.
+ * add the new osdmap which is added just now
+ so the leader monitor can trigger a recovery process to apply the transaction
+ to all monitors in quorum, and hence bring them back to normal after being
+ injected with a faulty crushmap.
+
+ Fixes: #11815
+ Signed-off-by: Kefu Chai <kchai@redhat.com>
+ (cherry picked from commit 306373427836ca0c2418dbe6caab26d74d94d12e)
+
+commit 90aaed744243dfc7c620f91e19fc0bfa233f711f
+Author: huangjun <hjwsm1989@gmail.com>
+Date: Tue Apr 21 14:04:40 2015 +0800
+
+ tools: ceph-monstore-tool must do out_store.close()
+
+ this change fixes the "store-copy" command.
+ Like the bug reported in http://tracker.ceph.com/issues/10093.
+
+ Signed-off-by: huangjun <hjwsm1989@gmail.com>
+ (cherry picked from commit d85e0f8c50fce62be012506f7ffcb1cdeb0c819c)
+
+commit c7252a3d54bae88f91c2b4e63fc9c27cfbb2423e
+Author: Ken Dreyer <kdreyer@redhat.com>
+Date: Mon Jan 18 08:24:46 2016 -0700
+
+ osd: disable filestore_xfs_extsize by default
+
+ This option involves a tradeoff: When disabled, fragmentation is worse,
+ but large sequential writes are faster. When enabled, large sequential
+ writes are slower, but fragmentation is reduced.
+
+ Fixes: #14397
+ (cherry picked from commit aed85775bf53c273786ce4999320134822722af5)
+
+commit 86ba6caf992d2544cdd174e3b3f26a6099c91fc5
+Merge: b6b8ee4 0325f8a
+Author: Loic Dachary <loic@dachary.org>
+Date: Fri Jan 29 10:36:05 2016 +0700
+
+ Merge pull request #7316 from ceph/wip-deb-lttng-hammer
+
+ deb: strip tracepoint libraries from Wheezy/Precise builds
+
+ All other "modern" Debian-based OSes have a functional LTTng-UST. Since only hammer needs to build on these older distros, this fix only affects the deb building process for those two releases(since autoconf detects that LTTng is broken).
+
+ Reviewed-by: Loic Dachary <ldachary@redhat.com>
+
+commit b6b8ee41fc77679e82304e79da6dbd0c35f5c067
+Merge: d54840b f96c812
+Author: Loic Dachary <loic@dachary.org>
+Date: Fri Jan 29 10:21:43 2016 +0700
+
+ Merge pull request #7187 from dachary/wip-13831-hammer
+
+ hammer: init script reload doesn't work on EL7
+
+ Reviewed-by: Loic Dachary <ldachary@redhat.com>
+
+commit 73e03def9271fb5d1739b195e428c3ebfcebd59b
+Author: Jason Dillaman <dillaman@redhat.com>
+Date: Thu Jan 28 14:38:20 2016 -0500
+
+ librbd: ImageWatcher shouldn't block the notification thread
+
+ Blocking the notification thread will also result in librados async
+ callbacks becoming blocked (since they use the same thread).
+
+ Signed-off-by: Jason Dillaman <dillaman@redhat.com>
+ (cherry picked from commit 7e2019a72733dff43e55c9b22df12939d584f87d)
+
+ Conflicts:
+ src/librbd/ImageWatcher.[cc|h]: fewer RPC messages
+
+commit 5617166f78c1995436b4e0794dab2d8254331815
+Author: Jason Dillaman <dillaman@redhat.com>
+Date: Thu Jan 28 14:35:54 2016 -0500
+
+ librados_test_stub: watch/notify now behaves similar to librados
+
+ Notifications are executed via the same librados AIO callback
+ thread, so it's now possible to catch deadlock.
+
+ Signed-off-by: Jason Dillaman <dillaman@redhat.com>
+ (cherry picked from commit 43722571838a2d78ca8583b5a1ea381cd988de0b)
+
+commit 8fc82b23304ef327933723373cd4d1090d04bfbc
+Author: Jason Dillaman <dillaman@redhat.com>
+Date: Thu Jan 28 12:40:18 2016 -0500
+
+ tests: simulate writeback flush during snap create
+
+ Signed-off-by: Jason Dillaman <dillaman@redhat.com>
+ (cherry picked from commit e9570fcf4be9cd5c06937769d074fa52ffb32e4b)
+
+commit d54840bf4a70fc65285bbfdff0c7bf8f579643b1
+Merge: 4051bc2 9f30fe1
+Author: Sage Weil <sage@redhat.com>
+Date: Tue Jan 26 10:12:29 2016 -0500
+
+ Merge pull request #7365 from liewegas/wip-tcmalloc-hammer
+
+ osd: pass tcmalloc env through to ceph-osd
+
+ Reviewed-by: Ken Dreyer <kdreyer@redhat.com>
+
+commit 9f30fe18e839f5846c90e3b5995171a0132d7f3a
+Author: Sage Weil <sage@redhat.com>
+Date: Tue Jan 26 08:43:15 2016 -0500
+
+ upstart/ceph-osd.conf: pass TCMALLOC_MAX_TOTAL_THREAD_CACHE_BYTES through
+
+ Signed-off-by: Sage Weil <sage@redhat.com>
+ (cherry picked from commit a95a3d34cccb9f9f0782a96ca05e5fe9c2b01772)
+
+commit a58873e213d7423d89c95db4e1710dc9631e3313
+Author: Sage Weil <sage@redhat.com>
+Date: Wed Jan 20 18:36:08 2016 -0500
+
+ init-ceph: pass TCMALLOC_MAX_TOTAL_THREAD_CACHE_BYTES through
+
+ ..when set in the sysconfig/default file.
+
+ Signed-off-by: Sage Weil <sage@redhat.com>
+ (cherry picked from commit 03e01ae263ef207046933890821ae75d5e60d9b8)
+
+ [source default/sysconfig file too]
+
+commit 8d9e08c44150a4f3ad06ec1abc130b9aeaf479d9
+Author: huangjun <hjwsm1989@gmail.com>
+Date: Tue Apr 21 14:04:40 2015 +0800
+
+ tools: ceph-monstore-tool must do out_store.close()
+
+ this change fixes the "store-copy" command.
+ Like the bug reported in http://tracker.ceph.com/issues/10093.
+
+ Signed-off-by: huangjun <hjwsm1989@gmail.com>
+ (cherry picked from commit d85e0f8c50fce62be012506f7ffcb1cdeb0c819c)
+
+commit 0325f8af5cbee3d74e9f363f61c2e2ababf501d9
+Author: Jason Dillaman <dillaman@redhat.com>
+Date: Thu Jan 21 15:36:37 2016 -0500
+
+ deb: strip tracepoint libraries from Wheezy/Precise builds
+
+ These releases do not (by default) have a sane LTTng-UST environment,
+ which results in autoconf disabling support for tracing.
+
+ Signed-off-by: Jason Dillaman <dillaman@redhat.com>
+
+commit 4051bc2a5e4313ac0f6236d7a34ed5fb4a1d9ea2
+Merge: 4e67418 e4d3e9b
+Author: Jason Dillaman <dillaman@redhat.com>
+Date: Mon Jan 18 20:46:07 2016 -0500
+
+ Merge pull request #7252 from ceph/wip-13483-hammer
+
+ qa: remove legacy OS support from rbd/qemu-iotests
+
+ Reviewed-by: Jason Dillaman <dillaman@redhat.com>
+
+commit e4d3e9b29aa6a5f9efff8b787949a5bbf48ad7de (refs/remotes/gh/wip-13483-hammer)
+Author: Jason Dillaman <dillaman@redhat.com>
+Date: Mon Jan 18 15:57:43 2016 -0500
+
+ qa: disable rbd/qemu-iotests test case 055 on RHEL/CentOS
+
+ Fixes: #14385
+ Signed-off-by: Jason Dillaman <dillaman@redhat.com>
+
+commit f7acd44c26310242b69ee50322bd6b43fdc774b9
+Author: Jason Dillaman <dillaman@redhat.com>
+Date: Thu Oct 15 12:44:06 2015 -0400
+
+ qa: remove legacy OS support from rbd/qemu-iotests
+
+ RHEL7 derivatives were failing test 002 since they were using
+ legacy test cases for now unsupported OSes.
+
+ Fixes: #13483
+ Signed-off-by: Vasu Kulkarni <vasu@redhat.com>
+
+commit 8c28f2f28d960d823ffd632671edaf029c30fb0f
+Author: Jason Dillaman <dillaman@redhat.com>
+Date: Mon Dec 14 17:41:49 2015 -0500
+
+ librbd: optionally validate RBD pool configuration (snapshot support)
+
+ Fixes: #13633
+ Signed-off-by: Jason Dillaman <dillaman@redhat.com>
+ (cherry picked from commit 1fea4dadc60e13518e9ee55d136fbc4e9d3a621e)
+
+ Conflicts:
+ src/common/config_opts.h: trivial resolution
+
+commit 700be56c530879a72a628c62265d18f0a5d8fb3b
+Author: Samuel Just <sjust@redhat.com>
+Date: Thu Jan 14 08:35:23 2016 -0800
+
+ config_opts: increase suicide timeout to 300 to match recovery
+
+ Fixes: 14376
+ Backport: hammer, firefly
+ Signed-off-by: Samuel Just <sjust@redhat.com>
+
+commit 4e67418958e5caf5e4f81c4ed566e8c7269930fa
+Merge: 28e99a9 1ab2b48
+Author: Sage Weil <sage@redhat.com>
+Date: Thu Jan 14 09:21:50 2016 -0500
+
+ Merge pull request #7179 from dachary/wip-14287-hammer
+
+ hammer: ReplicatedPG: wrong result code checking logic during sparse_read
+
+ Reviewed-by: Sage Weil <sage@redhat.com>
+
+commit 28e99a90b38ce8c0285c1aec9c5524365385be00
+Merge: 17a2965 86f5cf6
+Author: Sage Weil <sage@redhat.com>
+Date: Thu Jan 14 09:20:53 2016 -0500
+
+ Merge pull request #7178 from dachary/wip-14285-hammer
+
+ hammer: osd/OSD.cc: 2469: FAILED assert(pg_stat_queue.empty()) on shutdown
+
+ Reviewed-by: Sage Weil <sage@redhat.com>
+
+commit 17a2965825494765249c244aef59ebd821711d42
+Merge: a1459ea b0856ee
+Author: Sage Weil <sage@redhat.com>
+Date: Thu Jan 14 09:20:34 2016 -0500
+
+ Merge pull request #7177 from dachary/wip-14043-hammer
+
+ hammer: osd/PG.cc: 288: FAILED assert(info.last_epoch_started >= info.history.last_epoch_started)
+
+ Reviewed-by: Sage Weil <sage@redhat.com>
+
+commit a1459eacd7cc0d064493d01f963b8c1231cd3518
+Merge: c9a13a1 9cee89b
+Author: Sage Weil <sage@redhat.com>
+Date: Thu Jan 14 09:20:10 2016 -0500
+
+ Merge pull request #7180 from dachary/wip-14288-hammer
+
+ hammer: ceph osd pool stats broken in hammer
+
+ Reviewed-by: Sage Weil <sage@redhat.com>
+
+commit c9a13a12e88c9a18bfb3cc99d4a7c103b4330426
+Merge: 174a1a9 4d0b9a1
+Author: Sage Weil <sage@redhat.com>
+Date: Thu Jan 14 09:19:18 2016 -0500
+
+ Merge pull request #6994 from badone/wip-13993-hammer
+
+ log: Log.cc: Assign LOG_DEBUG priority to syslog calls
+
+ Reviewed-by: Sage Weil <sage@redhat.com>
+
+commit 174a1a974725ce4025be4dfdf3b13df766dfac76
+Merge: cb167e9 6cf261c
+Author: Sage Weil <sage@redhat.com>
+Date: Thu Jan 14 09:18:55 2016 -0500
+
+ Merge pull request #6839 from SUSE/wip-13789-hammer
+
+ Objecter: potential null pointer access when do pool_snap_list.
+
+ Reviewed-by: Sage Weil <sage@redhat.com>
+
+commit cb167e998bbbdf1b9c273f6bc4f118796d396d37
+Merge: 1c4ba85 66ff0aa
+Author: Sage Weil <sage@redhat.com>
+Date: Thu Jan 14 09:18:23 2016 -0500
+
+ Merge pull request #6835 from SUSE/wip-13892-hammer
+
+ hammer: auth/cephx: large amounts of log are produced by osd
+
+ Reviewed-by: Sage Weil <sage@redhat.com>
+
+commit 1c4ba855b34290069c7ce0fa990fe72b7a1b381e
+Merge: 72b6b68 61da13b
+Author: Sage Weil <sage@redhat.com>
+Date: Thu Jan 14 09:17:53 2016 -0500
+
+ Merge pull request #6834 from SUSE/wip-13930-hammer
+
+ hammer: Ceph Pools' MAX AVAIL is 0 if some OSDs' weight is 0
+
+ Reviewed-by: Sage Weil <sage@redhat.com>
+
+commit 72b6b68f43ffc953ca7f3056574bd68428a5abe8
+Merge: d064f9f 53e81aa
+Author: Sage Weil <sage@redhat.com>
+Date: Thu Jan 14 09:17:25 2016 -0500
+
+ Merge pull request #6832 from SUSE/wip-13936-hammer
+
+ hammer: Ceph daemon failed to start, because the service name was already used.
+
+ Reviewed-by: Sage Weil <sage@redhat.com>
+
+commit d064f9f6b3bc93fa5887304a9b9ab92d503ebd15
+Merge: 0ca6285 ac05617
+Author: Sage Weil <sage@redhat.com>
+Date: Thu Jan 14 09:16:54 2016 -0500
+
+ Merge pull request #6755 from SUSE/wip-13870-hammer
+
+ hammer: OSD: race condition detected during send_failures
+
+ Reviewed-by: Sage Weil <sage@redhat.com>
+
+commit 0ca62855f22136c7042a5988366d46e59629f206
+Merge: e9f545b a81bcf7
+Author: Loic Dachary <loic@dachary.org>
+Date: Thu Jan 14 08:22:35 2016 +0100
+
+ Merge pull request #6415 from dillaman/wip-13541-hammer
+
+ LTTng-UST tracing should be dynamically enabled
+
+ Reviewed-by: Loic Dachary <ldachary@redhat.com>
+
+commit e9f545b4a44c91faf91a8ae3824b1b0d46909244
+Merge: 8521916 b2f1e76
+Author: Loic Dachary <loic@dachary.org>
+Date: Thu Jan 14 08:15:02 2016 +0100
+
+ Merge pull request #7176 from dachary/wip-13440-hammer
+
+ ceph-disk prepare fails if device is a symlink
+
+ Reviewed-by: Loic Dachary <ldachary@redhat.com>
+
+commit 85219163f9b78faa3c1fe96cad7129c6813550c0
+Merge: ebfb3fb 5264bc6
+Author: Loic Dachary <loic@dachary.org>
+Date: Thu Jan 14 08:14:31 2016 +0100
+
+ Merge pull request #7150 from jecluis/wip-14236
+
+ mon: OSDMonitor: do not assume a session exists in send_incremental()
+
+ Reviewed-by: Kefu Chai <kchai@redhat.com>
+
+commit ebfb3fbe8a1920474941d4a95540cc4a53a747d4
+Merge: e1b9208 447ab1d
+Author: Josh Durgin <jdurgin@redhat.com>
+Date: Wed Jan 13 17:15:32 2016 -0800
+
+ Merge pull request #7226 from dillaman/wip-13810-hammer
+
+ tests: notification slave needs to wait for master
+
+ Reviewed-by: Josh Durgin <jdurgin@redhat.com>
+
+commit 447ab1d70a63fceed39518d5714c138c54f6525e
+Author: Jason Dillaman <dillaman@redhat.com>
+Date: Wed Jan 13 12:44:01 2016 -0500
+
+ tests: notification slave needs to wait for master
+
+ If the slave instance starts before the master, race
+ conditions are possible.
+
+ Fixes: #13810
+ Backport: infernalis, hammer
+ Signed-off-by: Jason Dillaman <dillaman@redhat.com>
+ (cherry picked from commit 3992d6fe67bbf82322cedc1582406caaf6d4de60)
+
+commit 53742bdbc587747c93413f9db38f3eeb71487872
+Author: David Zafman <dzafman@redhat.com>
+Date: Mon Jun 15 17:55:41 2015 -0700
+
+ ceph_osd: Add required feature bits related to this branch to osd_required mask
+
+ Signed-off-by: David Zafman <dzafman@redhat.com>
+ (cherry picked from commit 0b2bab460c013ea5cece10ea028d26da3485eaf5)
+
+commit 3066231865e2fe56344de9db26024ac65e03053d
+Author: David Zafman <dzafman@redhat.com>
+Date: Thu Jun 4 18:47:42 2015 -0700
+
+ osd: CEPH_FEATURE_CHUNKY_SCRUB feature now required
+
+ Feature present since at least the Dumpling release.
+ A later commit will add it to the osd_required mask
+
+ Fixes: #11661
+
+ Signed-off-by: David Zafman <dzafman@redhat.com>
+ (cherry picked from commit 7a10a7e196efd0f59fa7adb87d0a120655b227d8)
+
+commit e1b92081c9e4b21eb30cc873c239083a08fce12f
+Merge: 9708e59 3d3595f
+Author: Loic Dachary <loic@dachary.org>
+Date: Tue Jan 12 14:28:26 2016 +0100
+
+ Merge pull request #6530 from SUSE/wip-13760-hammer
+
+ unknown argument --quiet in udevadm settle
+
+ Reviewed-by: Loic Dachary <ldachary@redhat.com>
+
+commit 6379ff16dbc7fdecccaa8874d978d1ab58ce44cf
+Author: Kefu Chai <kchai@redhat.com>
+Date: Tue May 5 15:07:33 2015 +0800
+
+ configure.ac: no use to add "+" before ac_ext=c
+
+ Signed-off-by: Kefu Chai <kchai@redhat.com>
+ (cherry picked from commit 899dd23766c5ae6fef39bf24ef0692127d17deb3)
+ Signed-off-by: Robin H. Johnson <robin.johnson@dreamhost.com>
+
+commit f96c8125d423f24e52df0f8420b0b2748e34ca90
+Author: Herve Rousseau <hroussea@cern.ch>
+Date: Fri Nov 6 09:52:28 2015 +0100
+
+ rgw: fix reload on non Debian systems.
+
+ When using reload in non-debian systems, /bin/sh's kill is used to send the HUP signal to the radosgw process.
+ This kill version doesn't understand -SIGHUP as a valid signal, using -HUP does work.
+
+ Fix: #13709
+ Backport: hammer
+ Signed-off-by: Hervé Rousseau <hroussea@cern.ch>
+ (cherry picked from commit 1b000abac3a02d1e788bf25eead4b6873133f5d2)
+
+commit cbb5c1fc2386205277ad22474c1f696a07fcb972
+Author: Igor Fedotov <ifedotov@mirantis.com>
+Date: Thu Nov 19 13:38:40 2015 +0300
+
+ Fixing NULL pointer dereference
+
+ Signed-off-by: Igor Fedotov <ifedotov@mirantis.com>
+ (cherry picked from commit 93d3dfe0441be50a6990d458ee0ee3289af39b20)
+
+commit b2961cef3d8e84d2302815e33eb7dc9033d2bb78
+Author: Sage Weil <sage@redhat.com>
+Date: Tue Aug 18 16:05:29 2015 -0400
+
+ rbd: fix bench-write
+
+ Make each IO get a unique offset!
+
+ Signed-off-by: Sage Weil <sage@redhat.com>
+ (cherry picked from commit 333f3a01a9916c781f266078391c580efb81a0fc)
+
+commit 9cee89bbdd1d89d2fe72c8d73fc0c18db515198a
+Author: BJ Lougee <almightybeeij@gmail.com>
+Date: Mon Apr 13 11:24:38 2015 -0500
+
+ Check that delta_sum.stats.sum.num_object_copies and delta_sum.stats.sum.num_object are greater than zero
+
+ This fixes division by zero.
+
+ Signed-off-by BJ Lougee <almightybeeij@gmail.com>
+
+ (cherry picked from commit 27ed729c1088133400aa072eeca9e125942f2d94)
+
+commit 1ab2b481596ad5296e168bf8027e59d41190176e
+Author: xiexingguo <258156334@qq.com>
+Date: Tue Dec 22 17:05:06 2015 +0800
+
+ ReplicatedPG: fix sparse-read result code checking logic
+
+ Move ahead the result code checking logic before we continue to verify the trailing hole, otherwise
+ the real result of non-hole reading may be overwritten and thus confuse caller.
+
+ Fixes: #14151
+ Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
+ (cherry picked from commit b3aa29e324cf0a96a1f2f5dcf1ba998219457bcd)
+
+ Conflicts:
+ src/osd/ReplicatedPG.cc: trivial resolution
+
+commit 86f5cf6caa36760802775df19cdabe55bcafa33e
+Author: Sage Weil <sage@redhat.com>
+Date: Fri Jan 1 09:32:04 2016 -0500
+
+ osd: clear pg_stat_queue after stopping pgs
+
+ Fixes: #14212
+ Signed-off-by: Sage Weil <sage@redhat.com>
+ (cherry picked from commit c25ff9927febe77cda31b534971b62f75c196ca2)
+
+commit b0856ee67c0e7cf6ab6095d3f657c18014859526
+Author: David Zafman <dzafman@redhat.com>
+Date: Thu Dec 3 14:52:24 2015 -0800
+
+ osd: Test osd_find_best_info_ignore_history_les config in another assert
+
+ Signed-off-by: David Zafman <dzafman@redhat.com>
+ (cherry picked from commit 02a9a41f151a3d968bf8066749658659dc6e3ac4)
+
+commit b2f1e76d8e95b6e2f88fa1c122ea8cd24532cd10
+Author: Joe Julian <jjulian@io.com>
+Date: Fri Oct 9 12:57:06 2015 -0700
+
+ Compare parted output with the dereferenced path
+
+ Compare parted output with the dereferenced path of the device as parted
+ prints that instead of the symlink we called it with.
+
+ http://tracker.ceph.com/issues/13438 Fixes: #13438
+
+ Signed-off-by: Joe Julian <jjulian@io.com>
+ (cherry picked from commit b3c7cb098195111b9c642e5a9b726b63717f2e0d)
+
+commit 9708e59a1fc2ae52cfae848ce585751bc9fbe572
+Merge: 9739d4d b62cac6
+Author: Loic Dachary <loic@dachary.org>
+Date: Mon Jan 11 09:01:12 2016 +0100
+
+ Merge pull request #6512 from SUSE/wip-13734-hammer
+
+ rgw: swift API returns more than real object count and bytes used when retrieving account metadata
+
+ Reviewed-by: Yehuda Sadeh <ysadehwe@redhat.com>
+
+commit 5264bc677f0f612165987bf51fe7d7b4af32fa77
+Author: Joao Eduardo Luis <joao@suse.de>
+Date: Thu Jan 7 19:20:47 2016 +0000
+
+ mon: OSDMonitor: do not assume a session exists in send_incremental()
+
+ We may not have an open session for a given osd. If we blindly assume we
+ do, we may end up trying to send incrementals we do not have to the osd.
+
+ And then we will crash.
+
+ This fixes a regression introduced by
+
+ 171fee1b82d2675e364da7f96dfb9dd286d9b6e6
+
+ which is meant as a backport of
+
+ de43a02e06650a552f048dc8acd17f255126fed9
+
+ but so happens to intruduce a line that wasn't on the original patch. We
+ imagine it was meant to make the 's->osd_epoch' assignment work without
+ checking the session, as per the original patch, but the backporter must
+ have forgotten to also backport the assertion on the not-null session.
+ The unfortunate introduction of the check for a not-null session
+ triggered this regression.
+
+ The regression itself is due to enforcing that a session exists for the
+ osd we are sending the incrementals to. However, if we come via the
+ OSDMonitor::process_failures() path, that may very well not be the case,
+ as we are handling potentially-old MOSDFailure messages that may no
+ longer have an associated session. By enforcing the not-null session, we
+ don't check whether we have the requested versions (i.e., if
+ our_earliest_version <= requested_version), and thus we end up on the
+ path that assumes that we DO HAVE all the necessary versions -- when we
+ may not, thus finally asserting because we are reading blank
+ incremental versions.
+
+ Fixes: #14236
+
+ Signed-off-by: Joao Eduardo Luis <joao@suse.de>
+
+commit 4d0b9a1bbbabe7b27279a7b6e0a45f5b0d920c66
+Author: Brad Hubbard <bhubbard@redhat.com>
+Date: Mon Dec 7 11:31:28 2015 +1000
+
+ log: Log.cc: Assign LOG_DEBUG priority to syslog calls
+
+ Fixes: #13993
+ Signed-off-by: Brad Hubbard <bhubbard@redhat.com>
+ (cherry picked from commit 8e93f3f45db681f82633ca695a7dc4e7bd030584)
+
+commit 26e832e76de90e0a751868b044ea745a97a5af82
+Author: Jason Dillaman <dillaman@redhat.com>
+Date: Fri Dec 18 15:22:13 2015 -0500
+
+ librbd: fix merge-diff for >2GB diff-files
+
+ Fixes: #14063
+ Signed-off-by: Jason Dillaman <dillaman@redhat.com>
+
+commit 9739d4de49f8167866eda556b2f1581c068ec8a7
+Merge: d064636 a9d3f07
+Author: Sage Weil <sage@redhat.com>
+Date: Thu Dec 17 10:16:29 2015 -0500
+
+ Merge pull request #6544 from liewegas/wip-smaller-object-info
+
+ osd: make encoded object_info_t smaller to fit inside the XFS inode
+
+ Reviewed-by: Samuel Just <sjust@redhat.com>
+
+commit a9d3f078cb6cdaf7f8778ba1a07d333548a9d1a2
+Author: Sage Weil <sage@redhat.com>
+Date: Mon Dec 14 13:13:33 2015 -0500
+
+ osd/osd_types: skip encoding newer object_info_t fields if they are unused
+
+ This reduces the size of the encoded object_info_t in most cases,
+ enough to get us under the 255 byte limit for a single inline
+ xattr in XFS.
+
+ Signed-off-by: Sage Weil <sage@redhat.com>
+
+commit 1548a3fda7dd63e28792140e7e8ad1ac9b706e49
+Author: Sage Weil <sage@redhat.com>
+Date: Mon Dec 14 13:00:27 2015 -0500
+
+ osd/ReplicatedPG: do not set local_mtime on non-tiered pool
+
+ If a pool isn't tiered, don't bother with setting local_mtime. The only
+ users are the tiering agent (which isn't needed if there is not tiering)
+ and scrub for deciding if an object should get its digest recorded (we can
+ use mtime instead).
+
+ Signed-off-by: Sage Weil <sage@redhat.com>
+
+commit 98bdb09bb8d632b2df0b252b3d9676fd9511a1c8
+Author: Sage Weil <sage@redhat.com>
+Date: Mon Dec 14 12:59:29 2015 -0500
+
+ osd/PGBackend: use mtime for digest decision if local_mtime is empty
+
+ If we don't have a local_mtime value, use mtime instead, for the purposes
+ of deciding if we should record a digest after scrub.
+
+ Signed-off-by: Sage Weil <sage@redhat.com>
+
+commit fe1c28dea4e5607a0c72eab1f046074616cd55a7
+Author: Sage Weil <sage@redhat.com>
+Date: Mon Dec 14 11:35:46 2015 -0500
+
+ osd/ReplicatedPG: do not set omap digest if there is no omap
+
+ We want to avoid encoding it if we can. And if the FLAG_OMAP is not set
+ we don't need to *also* store an empty crc.
+
+ Signed-off-by: Sage Weil <sage@redhat.com>
+
+commit 6cf261cd2e80adbaf2898cb354c8159a57749e9d
+Author: xiexingguo <258156334@qq.com>
+Date: Mon Nov 2 21:46:11 2015 +0800
+
+ Objecter: remove redundant result-check of _calc_target in _map_session.
+
+ Result-code check is currently redundant since _calc_target never returns a negative value.
+ Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
+
+ (cherry picked from commit 5a6117e667024f51e65847f73f7589467b6cb762)
+
+commit 5d0b5c1389d8c0baddb40cc5ff8f1d9cc6a4d315
+Author: xiexingguo <258156334@qq.com>
+Date: Thu Oct 29 17:32:50 2015 +0800
+
+ Objecter: potential null pointer access when do pool_snap_list.
+
+ Objecter: potential null pointer access when do pool_snap_list. Shall check pool existence first.
+ Fixes: #13639
+ Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
+ (cherry picked from commit 865541605b6c32f03e188ec33d079b44be42fa4a)
+
+commit 66ff0aa0130973aa2bea3a1a4ec8f4e3e6c19da8
+Author: qiankunzheng <zheng.qiankun@h3c.com>
+Date: Thu Nov 5 07:29:49 2015 -0500
+
+ auth/cephx: large amounts of log are produced by osd
+ if the auth of osd is deleted when the osd is running, the osd will produce large amounts of log.
+
+ Fixes:#13610
+ Signed-off-by: Qiankun Zheng <zheng.qiankun@h3c.com>
+ (cherry picked from commit 102f0b19326836e3b0754b4d32da89eb2bc0b03c)
+
+commit 61da13bbe271964c56116fb2bed51045290f951a
+Author: Chengyuan Li <chengyli@ebay.com>
+Date: Thu Nov 19 22:29:39 2015 -0700
+
+ mon/PGMonitor: MAX AVAIL is 0 if some OSDs' weight is 0
+
+ In get_rule_avail(), even p->second is 0, it's possible to be used
+ as divisor and quotient is infinity, then is converted to an integer
+ which is negative value.
+ So we should check p->second value before calculation.
+
+ It fixes BUG #13840.
+
+ Signed-off-by: Chengyuan Li <chengyli@ebay.com>
+ (cherry picked from commit 18713e60edd1fe16ab571f7c83e6de026db483ca)
+
+commit 53e81aab442855b34ee6e922f181bae3bf33e292
+Author: wangchaunhong <root@A22832429.(none)>
+Date: Tue Oct 20 18:40:23 2015 +0800
+
+ init-ceph: fix systemd-run cant't start ceph daemon sometimes
+
+ Fixes: #13474
+ Signed-off-by: Chuanhong Wang <wang.chuanhong@zte.com.cn>
+ (cherry picked from commit 2f36909e1e08bac993e77d1781a777b386335669)
+
+ Conflicts:
+ src/init-ceph.in
+ different content of cmd variable
+
+commit c2c6d02591519dfd15ddcb397ac440322a964deb
+Author: Piotr Dałek <piotr.dalek@ts.fujitsu.com>
+Date: Mon Jul 6 09:56:11 2015 +0200
+
+ tools: fix race condition in seq/rand bench
+
+ Under certain conditions (like bench seq/rand -b 1024 -t 128) it is
+ possible that aio_read reads data into destination buffers before or
+ during memcmp execution, resulting in "[..] is not correct!" errors
+ even if actual objects are perfectly fine.
+ Also, moved latencty calculation around, so it is no longer affeted
+ by memcmp.
+
+ Signed-off-by: Piotr Dałek <piotr.dalek@ts.fujitsu.com>
+
+ Conflicts:
+ src/common/obj_bencher.cc
+
+commit a619b621b0a7c670eeaf163d9e2b742d13c9f517
+Author: Piotr Dałek <piotr.dalek@ts.fujitsu.com>
+Date: Wed May 20 12:41:22 2015 +0200
+
+ tools: add --no-verify option to rados bench
+
+ When doing seq and rand read benchmarks using rados bench, a quite large
+ portion of cpu time is consumed by doing object verification. This patch
+ adds an option to disable this verification when it's not needed, in turn
+ giving better cluster utilization. rados -p storage bench 600 rand scores
+ without --no-verification:
+
+ Total time run: 600.228901
+ Total reads made: 144982
+ Read size: 4194304
+ Bandwidth (MB/sec): 966
+ Average IOPS: 241
+ Stddev IOPS: 38
+ Max IOPS: 909522486
+ Min IOPS: 0
+ Average Latency: 0.0662
+ Max latency: 1.51
+ Min latency: 0.004
+
+ real 10m1.173s
+ user 5m41.162s
+ sys 11m42.961s
+
+ Same command, but with --no-verify:
+
+ Total time run: 600.161379
+ Total reads made: 174142
+ Read size: 4194304
+ Bandwidth (MB/sec): 1.16e+03
+ Average IOPS: 290
+ Stddev IOPS: 20
+ Max IOPS: 909522486
+ Min IOPS: 0
+ Average Latency: 0.0551
+ Max latency: 1.12
+ Min latency: 0.00343
+
+ real 10m1.172s
+ user 4m13.792s
+ sys 13m38.556s
+
+ Note the decreased latencies, increased bandwidth and more reads performed.
+
+ Signed-off-by: Piotr Dałek <piotr.dalek@ts.fujitsu.com>
+ (cherry picked from commit ca6abca63de813c83a6960f83624be8e1a86a1f8)
+
+ Conflicts:
+ src/common/obj_bencher.cc
+ src/common/obj_bencher.h
+
+commit d06463604cb8daeda288e824e8812352c0d6a7d9
+Merge: ec35347 609f256
+Author: Loic Dachary <loic@dachary.org>
+Date: Wed Dec 2 20:48:00 2015 +0100
+
+ Merge pull request #6527 from theanalyst/wip-12856-hammer
+
+ rgw: missing handling of encoding-type=url when listing keys in bucket
+
+ Reviewed-by: Yehuda Sadeh <ysadehwe@redhat.com>
+
+commit ec35347d8fd7a0eb175710e6111a9196746e278c
+Merge: 487dc34 1b06f03
+Author: Loic Dachary <loic@dachary.org>
+Date: Wed Dec 2 20:47:43 2015 +0100
+
+ Merge pull request #6491 from SUSE/wip-13716-hammer
+
+ rgw:swift use Civetweb ssl can not get right url
+
+ Reviewed-by: Yehuda Sadeh <ysadehwe@redhat.com>
+
+commit 487dc3436a8fabd1b1a31563071c907bdf18f525
+Merge: 18d3ba3 99b4d1d
+Author: Loic Dachary <loic@dachary.org>
+Date: Wed Dec 2 20:47:27 2015 +0100
+
+ Merge pull request #6351 from theanalyst/wip-13538-hammer
+
+ rgw: orphan tool should be careful about removing head objects
+
+ Reviewed-by: Yehuda Sadeh <ysadehwe@redhat.com>
+
+commit 18d3ba30323a44c1cc45bf4e870b8d9aeb5c3b0b
+Merge: 36e4db3 6d89f4b
+Author: Loic Dachary <loic@dachary.org>
+Date: Wed Dec 2 20:47:09 2015 +0100
+
+ Merge pull request #6349 from theanalyst/wip-13540-hammer
+
+ rgw: get bucket location returns region name, not region api name
+
+ Reviewed-by: Yehuda Sadeh <ysadehwe@redhat.com>
+
+commit 36e4db36f5ec9418672bbfe0dce6ae757f697efe
+Merge: 8c4145e db1cbe7
+Author: Loic Dachary <loic@dachary.org>
+Date: Wed Dec 2 20:46:49 2015 +0100
+
+ Merge pull request #5910 from kmroz/wip-hammer-backport-content-type
+
+ rgw: backport content-type casing
+
+ Reviewed-by: Yehuda Sadeh <ysadehwe@redhat.com>
+
+commit ac05617b246d3c2a329b1b99b0371e3f6b8541e9
+Author: Sage Weil <sage@redhat.com>
+Date: Thu Sep 17 21:42:53 2015 -0400
+
+ osd: fix send_failures() locking
+
+ It is unsafe to check failure_queue.empty() without the lock.
+
+ Signed-off-by: Sage Weil <sage@redhat.com>
+ (cherry picked from commit b3ca828ae8ebc9068073494c46faf3e8e1443ada)
+
+commit 8c4145ecc4a68accdb2120889fd933e8f6630dba
+Merge: 4804eec 112c686
+Author: Josh Durgin <jdurgin@redhat.com>
+Date: Wed Nov 25 08:47:10 2015 -0800
+
+ Merge pull request #6587 from theanalyst/wip-13758-hammer
+
+ common: pure virtual method called
+
+ Reviewed-by: Josh Durgin <jdurgin@redhat.com>
+
+commit 4804eec095959c3747b13d29224b2cfa5b7d198d
+Merge: 9b97e4f e693755
+Author: Daniel Gryniewicz <dang@fprintf.net>
+Date: Wed Nov 25 10:49:15 2015 -0500
+
+ Merge pull request #6352 from theanalyst/wip-13536-hammer
+
+ rgw: bucket listing hangs on versioned buckets
+
+commit 9b97e4f6a41bb3fe7bae92b71ae266361022cf5c
+Merge: 5a9e0a7 0378445
+Author: Loic Dachary <loic@dachary.org>
+Date: Wed Nov 25 16:48:09 2015 +0100
+
+ Merge pull request #6589 from theanalyst/wip-13693-hammer
+
+ osd: bug with cache/tiering and snapshot reads
+
+ Reviewed-by: Kefu Chai <kchai@redhat.com>
+
+commit 5a9e0a722c654b83fc483e083ddb3035281f5397
+Merge: 3047f2b a322317
+Author: Loic Dachary <loic@dachary.org>
+Date: Wed Nov 25 16:22:10 2015 +0100
+
+ Merge pull request #6585 from theanalyst/wip-13753-hammer
+
+ rbd: avoid re-writing old-format image header on resize
+
+ Reviewed-by: Josh Durgin <jdurgin@redhat.com>
+
+commit 3047f2bc50d5d26e70e832bd427f15073bf7733c
+Merge: 407bd02 9c33dcc
+Author: Loic Dachary <loic@dachary.org>
+Date: Mon Nov 23 19:57:03 2015 +0100
+
+ Merge pull request #6586 from theanalyst/wip-13755-hammer
+
+ rbd: QEMU hangs after creating snapshot and stopping VM
+
+ Reviewed-by: Josh Durgin <jdurgin@redhat.com>
+
+commit 407bd0281582ebb3b50ce51bdb48244e22463c8f
+Merge: c3c400f bddbda1
+Author: Loic Dachary <loic@dachary.org>
+Date: Mon Nov 23 17:32:21 2015 +0100
+
+ Merge pull request #6588 from theanalyst/wip-13770-hammer
+
+ Objecter: pool op callback may hang forever.
+
+ Reviewed-by: Sage Weil <sage@redhat.com>
+
+commit c3c400f68d9c2593acd9485d1214d14af4e930d0
+Merge: d116959 a52f7cb
+Author: Loic Dachary <loic@dachary.org>
+Date: Mon Nov 23 15:13:24 2015 +0100
+
+ Merge pull request #6430 from SUSE/wip-13654-hammer
+
+ crush: crash if we see CRUSH_ITEM_NONE in early rule step
+
+ Reviewed-by: Sage Weil <sage@redhat.com>
+
+commit 3f1292e117ab1cdcaef3b24ee33854f7be142795
+Author: Nathan Cutler <ncutler@suse.com>
+Date: Thu Sep 3 20:30:50 2015 +0200
+
+ ceph.spec.in: fix License line
+
+ This is closer to my reading of
+ https://github.com/ceph/ceph/blob/master/COPYING than the previous version.
+
+ http://tracker.ceph.com/issues/12935 Fixes: #12935
+
+ Signed-off-by: Nathan Cutler <ncutler@suse.com>
+ (cherry picked from commit ef7418421b3748c712019c8aedd02b8005c1e1ea)
+
+commit d116959442f67c8f36898ca989b490ca84a609c6
+Merge: 12be099 74203b8
+Author: Loic Dachary <loic@dachary.org>
+Date: Mon Nov 23 09:28:09 2015 +0100
+
+ Merge pull request #6420 from SUSE/wip-13637-hammer
+
+ FileStore: potential memory leak if getattrs fails.
+
+ Reviewed-by: Kefu Chai <kchai@redhat.com>
+
+commit 12be099a7b0f2692c167af96928e939b2227160c
+Merge: 39c70d4 2052187
+Author: Loic Dachary <loic@dachary.org>
+Date: Sat Nov 21 09:10:27 2015 +0100
+
+ Merge pull request #6528 from theanalyst/wip-13695-hammer
+
+ init-rbdmap uses distro-specific functions
+
+ Reviewed-by: Boris Ranto <branto@redhat.com>
+
+commit 39c70d4364a1be39f7c393847417f44279b4364c
+Merge: 65aeba0 9643ee6
+Author: Loic Dachary <loic@dachary.org>
+Date: Sat Nov 21 09:07:13 2015 +0100
+
+ Merge pull request #6499 from SUSE/wip-13692-hammer
+
+ osd: do not cache unused memory in attrs
+
+ Reviewed-by: Samuel Just <sjust@redhat.com>
+
+commit 65aeba0b2f165d893d06df7e9bbe25f989edafe9
+Merge: 24d6698 394fbfc
+Author: Loic Dachary <loic@dachary.org>
+Date: Sat Nov 21 08:59:25 2015 +0100
+
+ Merge pull request #6143 from dachary/wip-13340-hammer
+
+ small probability sigabrt when setting rados_osd_op_timeout
+
+ Reviewed-by: Sage Weil <sage@redhat.com>
+
+commit 24d66981d351848c44ae9e0395dad392f852be2b
+Merge: 5d204db 171fee1
+Author: Loic Dachary <loic@dachary.org>
+Date: Sat Nov 21 08:58:11 2015 +0100
+
+ Merge pull request #5773 from tchaikov/wip-12835-hammer
+
+ mon: map_cache can become inaccurate if osd does not receive the osdmaps
+
+ Reviewed-by: Loic Dachary <ldachary@redhat.com>
+
+commit a81bcf723c1099f2bea5daf8b01b7d9853de323a
+Author: Jason Dillaman <dillaman@redhat.com>
+Date: Thu Oct 15 00:15:54 2015 -0400
+
+ ceph_context: remove unsafe cast for singletons
+
+ It was previously assumed that a CephContext singleton would
+ inherit from CephContext::AssociatedSingletonObject, but it was
+ not enforced. This could result in unknown behavior when the
+ singleton is destroyed due to the implied virtual destructor.
+
+ Signed-off-by: Jason Dillaman <dillaman@redhat.com>
+ (cherry picked from commit fb62c78637d7092f48871d943282f45029bd6d29)
+
+commit d50d7b2fa3751e8520694ee75eefe5ae56e57267
+Author: Jason Dillaman <dillaman@redhat.com>
+Date: Wed Sep 30 22:53:28 2015 -0400
+
+ osd: conditionally initialize the tracepoint provider
+
+ Signed-off-by: Jason Dillaman <dillaman@redhat.com>
+ (cherry picked from commit 0009f343a5daf28358a669836d95660c0d9068d8)
+
+commit bf34b3657339dc40c7939fcdddaf2b7ae78c82ad
+Author: Jason Dillaman <dillaman@redhat.com>
+Date: Wed Sep 30 22:37:05 2015 -0400
+
+ librados: conditionally initialize the tracepoint provider
+
+ Signed-off-by: Jason Dillaman <dillaman@redhat.com>
+ (cherry picked from commit 6368c281b53d6175a564725b85516de4b6ae54de)
+
+commit afc4f176f8371f0e61ce3463602f8a355b9283b9
+Author: Jason Dillaman <dillaman@redhat.com>
+Date: Wed Sep 30 22:10:10 2015 -0400
+
+ librbd: conditionally initialize the tracepoint provider
+
+ Signed-off-by: Jason Dillaman <dillaman@redhat.com>
+ (cherry picked from commit 1a6eea95bd1ccef53f01cf53e493e652faa203ee)
+
+ Conflicts:
+ src/librbd/librbd.cc: trivial resolution
+
+commit c82f93915875875b21ed779e7aaf297b8fbcdca1
+Author: Jason Dillaman <dillaman@redhat.com>
+Date: Wed Sep 30 19:17:08 2015 -0400
+
+ common: new tracing config options
+
+ Config options to enable LTTng-UST tracepoint providers for
+ the OSD, OSD objectstore, librados, and librbd.
+
+ Signed-off-by: Jason Dillaman <dillaman@redhat.com>
+ (cherry picked from commit 2ccef89badb1f7a63721a0bf48d05eb4c2d0a97a)
+
+ Conflicts:
+ src/common/config_opts.h: trivial resolution
+
+commit 2168c151066e0cea86284ffdf947a353f3b323d5
+Author: Jason Dillaman <dillaman@redhat.com>
+Date: Wed Sep 30 18:49:32 2015 -0400
+
+ tracing: merge tracepoint provider makefiles into main makefile
+
+ This results in the tracepoint provider shared libraries being
+ placed in the library path for unittests.
+
+ Signed-off-by: Jason Dillaman <dillaman@redhat.com>
+ (cherry picked from commit e11d8d68da27a1c224aa55fc40a72ac6aaa0441c)
+
+ Conflicts:
+ configure.ac: trivial resolution
+ src/Makefile.am: trivial resolution
+
+commit d02beff1cf7650fe6e57cdafe64dcbee2631ed52
+Author: Jason Dillaman <dillaman@redhat.com>
+Date: Wed Sep 30 15:13:24 2015 -0400
+
+ tracing: dynamic tracepoint provider helper
+
+ The TracepointProvider class is a configuration observer. When
+ tracing is enabled, it will dynamically load the associated
+ tracepoint provider.
+
+ Signed-off-by: Jason Dillaman <dillaman@redhat.com>
+ (cherry picked from commit b3d02cc21b4cc40a194f84a9bbbf82cf9e7956d1)
+
+ Conflicts:
+ src/common/Makefile.am: trivial resolution
+
+commit e53d66e42b1c3aea47832f7e8983284ec45d9efa
+Author: Jason Dillaman <dillaman@redhat.com>
+Date: Tue Sep 29 14:33:48 2015 -0400
+
+ packaging: add new tracepoint probe shared libraries
+
+ Signed-off-by: Jason Dillaman <dillaman@redhat.com>
+ (cherry picked from commit a7ed8e161b27c7852bf0f3a23a977ebd39137943)
+
+commit bb7c0f501918b75dee97052faeafb1d6db61bd0a
+Author: Jason Dillaman <dillaman@redhat.com>
+Date: Tue Sep 29 14:30:43 2015 -0400
+
+ ceph.spec.in: add new tracepoint probe shared libraries
+
+ Signed-off-by: Jason Dillaman <dillaman@redhat.com>
+ (cherry picked from commit f4feee2f9dcd7b94476701b66d1f0bdf6fb6e0c2)
+
+ Conflicts:
+ ceph.spec.in: trivial resolution
+
+commit e1da27134e4c9b4a2881aca664818598e5b2125b
+Author: Jason Dillaman <dillaman@redhat.com>
+Date: Tue Sep 29 14:13:46 2015 -0400
+
+ lttng: move tracepoint probes to dynamic libraries
+
+ LTTng-UST initializes itself at program load, which means it is
+ currently always enabled. This can lead to issues with SElinux
+ and AppArmor which might restrict access to the necessary device
+ files.
+
+ Signed-off-by: Jason Dillaman <dillaman@redhat.com>
+ (cherry picked from commit 4a5305e41677885d45b2b74299113a3d00189c66)
+
+ Conflicts:
+ src/test/Makefile-client.am: trivial resolution
+ src/tracing/Makefile.am: trivial resolution
+
+commit 5d204db85b2ed84411cfabea9eb73aa04c6ce05a
+Merge: 1dbd4c6 8378aaf
+Author: Loic Dachary <loic@dachary.org>
+Date: Thu Nov 19 19:45:25 2015 +0100
+
+ Merge pull request #6580 from dachary/wip-13786-hammer
+
+ rbd-replay-* moved from ceph-test-dbg to ceph-common-dbg as well
+
+ Reviewed-by: Loic Dachary <ldachary@redhat.com>
+
+commit 1dbd4c66307e615670c7569f107418876f8b977f
+Merge: 24a5dc0 634d7f6
+Author: Loic Dachary <loic@dachary.org>
+Date: Thu Nov 19 19:45:03 2015 +0100
+
+ Merge pull request #6286 from dillaman/wip-13460-hammer
+
+ rbd-replay-prep and rbd-replay improvements
+
+ Reviewed-by: Loic Dachary <ldachary@redhat.com>
+
+commit 24a5dc0a6b4f73c92c82e1933a1924db3f8e1090
+Merge: d27da2e 6a40e4f
+Author: Loic Dachary <loic@dachary.org>
+Date: Thu Nov 19 19:41:20 2015 +0100
+
+ Merge pull request #5790 from SUSE/wip-12932-hammer
+
+ Miscellaneous spec file fixes
+
+ Reviewed-by: Loic Dachary <ldachary@redhat.com>
+
+commit d27da2ee8fa3e074fdd91d414df2d59978db9497
+Merge: 7d21127 8358fb8
+Author: Kefu Chai <tchaikov@gmail.com>
+Date: Thu Nov 19 19:13:11 2015 +0800
+
+ Merge pull request #6644 from dachary/wip-13812-upgrade
+
+ revert: osd: use GMT time for hitsets
+
+ Reviewed-by: Kefu Chai <kchai@redhat.com>
+
+commit 8358fb8946d8809d695092baa4a6abf5d5b5e265
+Author: Loic Dachary <loic@dachary.org>
+Date: Wed Nov 18 18:08:58 2015 +0100
+
+ revert: osd: use GMT time for hitsets
+
+ "Merge pull request #5825 from tchaikov/wip-12848-hammer"
+
+ This reverts commit 39544718dc2f09bcfdc632ac72fd2a3cda87687e, reversing
+ changes made to 4ad97162026e1eb6e6e948ddf3eb39f711431e45.
+
+ http://tracker.ceph.com/issues/13812 Fixes: #13812
+
+ Signed-off-by: Loic Dachary <loic@dachary.org>
+
+commit 4420929eacb67d17635fed53f15471a28942f31d
+Author: brian <bjfelton@gmail.com>
+Date: Wed Sep 23 09:49:36 2015 -0500
+
+ rgw: fix modification to index attrs when setting acls
+
+ Fixes: #12955
+
+ - add ACL change after initial population
+ - populate bufferlist with object attributes
+
+ Signed-off-by: Brian Felton <bjfelton@gmail.com>
+ (cherry picked from commit 7496741ebbd75b74d5ffeca5341cccb2318176e6)
+
+commit 7d21127f433afa2d9172954e7b8ff47c40d2d62b
+Merge: 6930601 1448915
+Author: Loic Dachary <loic@dachary.org>
+Date: Tue Nov 17 10:24:45 2015 +0100
+
+ Merge pull request #6402 from SUSE/wip-13621-hammer
+
+ CephFS restriction on removing cache tiers is overly strict
+
+ Reviewed-by: Greg Farnum <gfarnum@redhat.com>
+
+commit 693060102594a2c505bed1e7e274731b554e9179
+Merge: c2daf09 3f33ce6
+Author: Loic Dachary <loic@dachary.org>
+Date: Mon Nov 16 22:06:51 2015 +0100
+
+ Merge pull request #6354 from theanalyst/wip-13387-hammer
+
+ librbd: reads larger than cache size hang
+
+ Reviewed-by: Jason Dillaman <dillaman@redhat.com>
+
+commit c2daf09fc6b8802240e13367a0a2f3349a7cca56
+Merge: 1ca72fb af734e6
+Author: Loic Dachary <loic@dachary.org>
+Date: Mon Nov 16 19:48:07 2015 +0100
+
+ Merge pull request #6289 from dillaman/wip-13461-hammer
+
+ librbd: invalidate object map on error even w/o holding lock
+
+ Reviewed-by: Loic Dachary <ldachary@redhat.com>
+
+commit 1ca72fbe6be0d664a3cbbd4356a8547c3b749a03
+Merge: ca573fe 3e65730
+Author: Loic Dachary <loic@dachary.org>
+Date: Mon Nov 16 18:06:25 2015 +0100
+
+ Merge pull request #6153 from dachary/wip-13205-hammer
+
+ ReplicatedBackend: populate recovery_info.size for clone (bug symptom is size mismatch on replicated backend on a clone in scrub)
+
+ Reviewed-by: Samuel Just <sjust@redhat.com>
+
+commit ca573fe7ac5a699b77cacb8fedfa50fffc77dd52
+Merge: fdb3446 7161a2c
+Author: Loic Dachary <loic@dachary.org>
+Date: Mon Nov 16 18:06:12 2015 +0100
+
+ Merge pull request #6158 from dachary/wip-13336-hammer
+
+ osd: we do not ignore notify from down osds
+
+ Reviewed-by: Samuel Just <sjust@redhat.com>
+
+commit fdb3446194743135b78a65c30a8285d001e563b6
+Merge: f017566 0ad9521
+Author: Loic Dachary <loic@dachary.org>
+Date: Mon Nov 16 18:06:01 2015 +0100
+
+ Merge pull request #6335 from Abhishekvrshny/wip-13488-hammer
+
+ object_info_t::decode() has wrong version
+
+ Reviewed-by: Samuel Just <sjust@redhat.com>
+
+commit f017566823af70323b7d4cbe1f7b3b761378d07e
+Merge: a79acd4 9f3aebe
+Author: Loic Dachary <loic@dachary.org>
+Date: Mon Nov 16 18:05:39 2015 +0100
+
+ Merge pull request #6401 from SUSE/wip-13620-hammer
+
+ osd: pg stuck in replay
+
+ Reviewed-by: Samuel Just <sjust@redhat.com>
+
+commit 8378aaf3f9d5463fb61a19d601201dd63a884419
+Author: Loic Dachary <ldachary@redhat.com>
+Date: Fri Nov 13 19:10:28 2015 +0100
+
+ build/ops: rbd-replay moved from ceph-test-dbg to ceph-common-dbg
+
+ http://tracker.ceph.com/issues/13785 Fixes: #13785
+
+ Signed-off-by: Loic Dachary <loic@dachary.org>
+ (cherry picked from commit a0204dc47acc0c50223e449fd23a2fc97bfd111a)
+
+ Conflicts:
+ debian/control: << 0.94.5-2 is appropriate for hammer
+
+commit 03784457ab77617ddafc048b01044858b1e65bd3
+Author: Kefu Chai <kchai@redhat.com>
+Date: Tue Sep 29 22:26:48 2015 +0800
+
+ osd: fix the snapshot reads of evicted tiering pool
+
+ reset ssc->exsits in finish_ctx() if the ctx->cache_evict is true, and
+ the head is removed.
+
+ Fixes: #12748
+ Signed-off-by: Kefu Chai <kchai@redhat.com>
+ (cherry picked from commit b61f3e43f1c9d43daa0dedd7cbd0fe5787cbdfbb)
+
+commit bddbda121c8d52ba8e50abd0341f14e332c6af5a
+Author: xiexingguo <258156334@qq.com>
+Date: Thu Oct 29 20:04:11 2015 +0800
+
+ Objecter: pool_op callback may hang forever.
+
+ pool_op callback may hang forever due to osdmap update during reply handling.
+ Fixes: #13642
+ Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
+
+ (cherry picked from commit 00c6fa9e31975a935ed2bb33a099e2b4f02ad7f2)
+
+commit 112c686ffc98e3739c9944635f4044e2b34f210a
+Author: Jason Dillaman <dillaman@redhat.com>
+Date: Tue Jul 7 12:11:13 2015 -0400
+
+ WorkQueue: new PointerWQ base class for ContextWQ
+
+ The existing work queues do not properly function if added to a running
+ thread pool. librbd uses a singleton thread pool which requires
+ dynamically adding/removing work queues as images are opened and closed.
+
+ Fixes: #13636
+ Signed-off-by: Jason Dillaman <dillaman@redhat.com>
+ (cherry picked from commit 3e78b18b09d75626ca2599bac3b9f9c9889507a5)
+
+ Conflicts:
+ src/common/WorkQueue.h
+ Trivial merge conflict at class `ContextWQ` initialization
+
+commit 9c33dccaad9a4cdd46e9ecfa1e3ba6c03d95885a
+Author: Jason Dillaman <dillaman@redhat.com>
+Date: Mon Nov 9 11:22:24 2015 -0500
+
+ librbd: fixed deadlock while attempting to flush AIO requests
+
+ In-flight AIO requests might force a flush if a snapshot was created
+ out-of-band. The flush completion was previously invoked asynchronously,
+ potentially via the same thread worker handling the AIO request. This
+ resulted in the flush operation deadlocking since it can't complete.
+
+ Fixes: #13726
+ Backport: infernalis, hammer
+ Signed-off-by: Jason Dillaman <dillaman@redhat.com>
+ (cherry picked from commit bfeb90e5fe24347648c72345881fd3d932243c98)
+
+commit b3b7877f9b4b3f43acab09d0dd6ee971b6aa1c29
+Author: Jason Dillaman <dillaman@redhat.com>
+Date: Mon Nov 9 10:48:10 2015 -0500
+
+ tests: new test case to catch deadlock on RBD image refresh
+
+ Signed-off-by: Jason Dillaman <dillaman@redhat.com>
+ (cherry picked from commit a9729d9553e7fb925509cad8d388cf52a9fede9c)
+
+commit a3223173f85c42147ff4ced730beffe85146a4ed
+Author: Jason Dillaman <dillaman@redhat.com>
+Date: Mon Nov 2 16:50:19 2015 -0500
+
+ librbd: resize should only update image size within header
+
+ Previously, the whole RBD image format 1 header struct was
+ re-written to disk on a resize operation.
+
+ Fixes: #13674
+ Backport: infernalis, hammer, firefly
+ Signed-off-by: Jason Dillaman <dillaman@redhat.com>
+ (cherry picked from commit d5be20b6d4646284571568ab28cbf45b0729390b)
+
+commit 6a40e4f19d7b4cd45a25161303c7363e96fe799e
+Author: Nathan Cutler <ncutler@suse.com>
+Date: Tue Sep 29 10:39:16 2015 +0200
+
+ ceph.spec.in: lttng in SLES12 only
+
+ Over in the SUSE sector, we are trying to enable the SLE_12 and openSUSE_13.2
+ build targets. The lttng/babeltrace stuff is currently available only in
+ SLE_12.
+
+ Signed-off-by: Nathan Cutler <ncutler@suse.com>
+ (cherry picked from commit bf9ca1eb107c4462d8768faf3ff4db7972384ffd)
+
+ Conflicts:
+ ceph.spec.in
+ trivial resolution
+
+commit e508a44485366557ac8a280de35584f3b5edf720
+Author: Nathan Cutler <ncutler@suse.com>
+Date: Wed Jul 15 12:54:20 2015 +0200
+
+ ceph.spec.in: fix lttng/babeltrace conditionals
+
+ lttng and babeltrace are build dependencies for rbd-replay-prep. Make
+ sure the right package names are used. Enable for SLE12, as well as
+ for openSUSE 13.1 and higher.
+
+ Move the BuildRequires out of the ceph-test subpackage and into the
+ distro-conditional dependencies section.
+
+ Make ordering of BuildRequires a little more alphabetical.
+
+ http://tracker.ceph.com/issues/12360 Fixes: #12360
+
+ Signed-off-by: Nathan Cutler <ncutler@suse.com>
+ (cherry picked from commit e267128ce22d8b8cd83f6d6d82f24f496600e678)
+
+ Conflicts:
+ ceph.spec.in
+ Dropped Requires: xmlstarlet in ceph-test that had inadvertently
+ been grabbed from d2cc2b1
+
+commit 19c9546b79f506d0b4ee005a138a77f120c629e8
+Author: Ken Dreyer <kdreyer@redhat.com>
+Date: Tue Sep 8 10:41:02 2015 -0600
+
+ packaging: move rbd-replay* to ceph-common
+
+ The rbd-replay* utilities are useful for Ceph users with RBD clients.
+ Currently the rbd-replay* utilities ship in the "ceph-test" package, and
+ we intend this ceph-test package for Ceph developers and contributors,
+ not normal users.
+
+ Move the rbd-replay* utilities to "ceph-common".
+
+ http://tracker.ceph.com/issues/12994 Fixes: #12994
+
+ Signed-off-by: Ken Dreyer <kdreyer@redhat.com>
+ (cherry picked from commit 96486fd6f284ca3ab67f4f94631896d41c529e85)
+
+ Conflicts:
+ ceph.spec.in
+ 50a33dea has not been backported to hammer
+ debian/ceph-test.install
+ 50a33dea has not been backported to hammer
+ debian/control
+ different ceph-test Replaces: and Breaks: version
+
+commit a79acd41187e6b049432bdc314f192e3fbb560a3
+Merge: 3d61493 31b7864
+Author: Loic Dachary <loic@dachary.org>
+Date: Wed Nov 11 11:59:36 2015 +0100
+
+ Merge pull request #6213 from SUSE/wip-13425-hammer
+
+ wrong conditional for boolean function KeyServer::get_auth()
+
+ Reviewed-by: Kefu Chai <kchai@redhat.com>
+
+commit 3d61493337d481dec5139ccb6172710a118b2009
+Merge: 147f437 7ffd072
+Author: Loic Dachary <loic@dachary.org>
+Date: Wed Nov 11 06:59:55 2015 +0100
+
+ Merge pull request #6336 from Abhishekvrshny/wip-13535-hammer
+
+ LibRadosWatchNotify.WatchNotify2Timeout
+
+ Reviewed-by: Sage Weil <sage@redhat.com>
+
+commit 147f437279e72c0766a126653e3db53abb73a4ac
+Merge: 1970e61 9085c82
+Author: Loic Dachary <loic@dachary.org>
+Date: Wed Nov 11 06:59:42 2015 +0100
+
+ Merge pull request #6391 from SUSE/wip-13590-hammer
+
+ mon: should not set isvalid = true when cephx_verify_authorizer return false
+
+ Reviewed-by: Sage Weil <sage@redhat.com>
+
+commit 1970e618209a242fc0bd3c707dfdfb1a886d6a2c
+Merge: fb83704 ade0f1a
+Author: Loic Dachary <loic@dachary.org>
+Date: Wed Nov 11 06:58:55 2015 +0100
+
+ Merge pull request #6398 from SUSE/wip-13588-hammer
+
+ OSD::build_past_intervals_parallel() shall reset primary and up_primary when begin a new past_interval.
+
+ Reviewed-by: Sage Weil <sage@redhat.com>
+
+commit 3d3595f86083a0f9847585eae4cffb8a82c816d4
+Author: Jason Dillaman <dillaman@redhat.com>
+Date: Tue Oct 27 10:13:27 2015 -0400
+
+ krbd: remove deprecated --quiet param from udevadm
+
+ This parameter has been removed since systemd 213, so this
+ effects Fedora 21+, Debian Jessie, and potentially future
+ releases of RHEL 7.
+
+ Fixes: #13560
+ Backport: hammer, infernalis
+ Signed-off-by: Jason Dillaman <dillaman@redhat.com>
+ (cherry picked from commit 4300f2a9fe29627eea580564ff2d576de3647467)
+
+commit 4d81cd19087e049bf3c2fe0d10de9215852ab51d
+Author: Jason Dillaman <dillaman@redhat.com>
+Date: Tue Oct 27 10:12:34 2015 -0400
+
+ run_cmd: close parent process console file descriptors
+
+ Signed-off-by: Jason Dillaman <dillaman@redhat.com>
+ (cherry picked from commit f46f7dc94139c0bafe10361622416d7dc343d31f)
+
+commit fb83704d5db81aad95c61a61be52d07ce2d4d2b5
+Merge: 3954471 0742177
+Author: Loic Dachary <loic@dachary.org>
+Date: Tue Nov 10 20:24:35 2015 +0100
+
+ Merge pull request #6199 from liewegas/wip-randomize-scrub-hammer
+
+ osd: randomize scrub times
+
+ Reviewed-by: Loic Dachary <ldachary@redhat.com>
+
+commit 39544718dc2f09bcfdc632ac72fd2a3cda87687e
+Merge: 4ad9716 6a4734a
+Author: Loic Dachary <loic@dachary.org>
+Date: Tue Nov 10 20:23:23 2015 +0100
+
+ Merge pull request #5825 from tchaikov/wip-12848-hammer
+
+ ReplicatedPG::hit_set_trim osd/ReplicatedPG.cc: 11006: FAILED assert(obc)
+
+ Reviewed-by: Loic Dachary <ldachary@redhat.com>
+
+commit 2052187929e059a25f6a3baf67329f7ce0bf6d8a
+Author: Boris Ranto <branto@redhat.com>
+Date: Fri Oct 23 15:31:27 2015 +0200
+
+ init-rbdmap: Rewrite to use logger + clean-up
+
+ This patch rewrites the init-rbdmap init script so that it uses logger
+ instead of the log_* functions. The patch also fixes various smaller
+ bugs like:
+ * MAP_RV was undefined if mapping already existed
+ * UMNT_RV and UMAP_RV were almost always empty (if they succeeded) ->
+ removed them
+ * use of continue instead RET_OP in various places (RET_OP was not being
+ checked after the switch to logger messages)
+ * removed use of DESC (used only twice and only one occurrence actually
+ made sense)
+
+ Signed-off-by: Boris Ranto <branto@redhat.com>
+ (cherry picked from commit c567341e98fffbe39177f951511a7698f88abf5f)
+
+commit f972f38445bc7a6efe122a5f9fc2ba7658625e26
+Author: Boris Ranto <branto@redhat.com>
+Date: Fri Oct 23 16:39:16 2015 +0200
+
+ ceph.spec.in: We no longer need redhat-lsb-core
+
+ Drop the redhat-lsb-core dependency as it is no longer necessary on
+ fedora/rhel.
+
+ The other two init scripts do not use redhat-lsb-core either. The
+ init-ceph.in conditionally requires /lib/lsb/init-functions and does not
+ use any of the functions defined in that file (at least not directly).
+ The init-radosgw file includes /etc/rc.d/init.d/functions on non-debian
+ platforms instead of /lib/lsb/init-functions file so it does not require
+ redhat-lsb-core either.
+
+ Signed-off-by: Boris Ranto <branto@redhat.com>
+ (cherry picked from commit 15600572265bed397fbd80bdd2b7d83a0e9bd918)
+
+ Conflicts:
+ ceph.spec.in
+ Merge conflict because there were other commits that introduced systemd
+ & SUSE specific bits in the master which havent yet reached
+ hammer. Since this commit only removed redhat-lsb-core from *el distros
+ removing the specific lines
+
+commit 609f256a00f6ee18564ee055dd79f8293217940c
+Author: Jeff Weber <jweber@cofront.net>
+Date: Wed Aug 5 19:06:46 2015 -0400
+
+ rgw: implement s3 encoding-type for get bucket
+
+ This change introduces handling for the encoding-type request
+ parameter on the get bucket operation. An object key may contain
+ characters which are not supported in XML. Passing the value "url" for
+ the encoding-type parameter will cause the key to be urlencoded in the
+ response.
+
+ Fixes: #12735
+ Signed-off-by: Jeff Weber <jweber@cofront.net>
+ (cherry picked from commit 180ca7b56ba91a3995c76dac698aa4ee31d9a2ce)
+
+commit 394fbfcc40d77ad6c8b3301c5ff2630c052107cd
+Author: Ruifeng Yang <yangruifeng.09209@h3c.com>
+Date: Fri Sep 25 10:18:11 2015 +0800
+
+ Objecter: maybe access wild pointer(op) in _op_submit_with_budget.
+
+ look at "after giving up session lock it can be freed at any time by response handler" in _op_submit,
+ so the _op_submit_with_budget::op maybe is wild after call _op_submit.
+
+ Fixes: #13208
+ Signed-off-by: Ruifeng Yang <yangruifeng.09209@h3c.com>
+ (cherry picked from commit 0635b1358354b19ae44105576f730381f3b5b963)
+
+commit 84068f8cea0452333f00f8b65230c00caa2e52ff
+Author: Ruifeng Yang <yangruifeng.09209@h3c.com>
+Date: Fri Sep 25 12:42:28 2015 +0800
+
+ Objecter: repeated free op->ontimeout.
+
+ repeated free op->ontimeout in SafeTimer::timer_thread::callback->complete
+
+ Fixes: #13208
+ Signed-off-by: Ruifeng Yang <yangruifeng.09209@h3c.com>
+ (cherry picked from commit f1d8a8f577cee6d66f4dcffac667675f18145ebb)
+
+commit 3e657304dc41facd40b8cab7531180083d14d22a
+Author: Samuel Just <sjust@redhat.com>
+Date: Fri Aug 28 12:46:57 2015 -0700
+
+ ReplicatedBackend::prepare_pull: set recover_info.size for clones
+
+ Fixes: #12828
+ Signed-off-by: Samuel Just <sjust@redhat.com>
+ (cherry picked from commit 1d3e46bedb9a8c0d2200e39f62f4e2c3337619f3)
+
+commit 4ad97162026e1eb6e6e948ddf3eb39f711431e45
+Merge: 92b2153 f1271ea
+Author: Loic Dachary <loic@dachary.org>
+Date: Tue Nov 10 10:34:01 2015 +0100
+
+ Merge pull request #6157 from dachary/wip-13040-hammer
+
+ common/Thread:pthread_attr_destroy(thread_attr) when done with it
+
+ Reviewed-by: Sage Weil <sage@redhat.com>
+
+commit 92b21532f64792da023188d9aa620d900c0245ca
+Merge: 1f02886 a17f2a9
+Author: Loic Dachary <loic@dachary.org>
+Date: Tue Nov 10 10:33:41 2015 +0100
+
+ Merge pull request #6155 from dachary/wip-13171-hammer
+
+ objecter: cancellation bugs
+
+ Reviewed-by: Sage Weil <sage@redhat.com>
+
+commit 1f02886d7edc10ff93074afc3d2bf4cf77c709d5
+Merge: 77df385 7d4b303
+Author: Loic Dachary <loic@dachary.org>
+Date: Tue Nov 10 10:33:19 2015 +0100
+
+ Merge pull request #6152 from dachary/wip-13233-hammer
+
+ mon: include min_last_epoch_clean as part of PGMap::print_summary and PGMap::dump
+
+ Reviewed-by: Sage Weil <sage@redhat.com>
+
+commit 77df385e23452f401f3c0c269e220446d288fb8e
+Merge: 469398f d8ca88d
+Author: Loic Dachary <loic@dachary.org>
+Date: Tue Nov 10 10:33:01 2015 +0100
+
+ Merge pull request #6146 from dachary/wip-13337-hammer
+
+ segfault in agent_work
+
+ Reviewed-by: Sage Weil <sage@redhat.com>
+
+commit 469398f14b62af01068e65bcc5cc7c585a04e878
+Merge: d87d136 397042a
+Author: Loic Dachary <loic@dachary.org>
+Date: Tue Nov 10 10:32:53 2015 +0100
+
+ Merge pull request #6145 from dachary/wip-13338-hammer
+
+ filestore: fix peek_queue for OpSequencer
+
+ Reviewed-by: Sage Weil <sage@redhat.com>
+
+commit d87d1364fb8e345a1f85b65c2d4c7c80596ba5f9
+Merge: 717eff9 d4e4d85
+Author: Loic Dachary <loic@dachary.org>
+Date: Tue Nov 10 10:32:42 2015 +0100
+
+ Merge pull request #6144 from dachary/wip-13339-hammer
+
+ mon: check for store writeablility before participating in election
+
+ Reviewed-by: Sage Weil <sage@redhat.com>
+
+commit 717eff9a61818fde71ec5220998e9b5c14bbb3a9
+Merge: e133ddc e8cce08
+Author: Loic Dachary <loic@dachary.org>
+Date: Tue Nov 10 10:30:54 2015 +0100
+
+ Merge pull request #5891 from Abhishekvrshny/wip-13035-hammer
+
+ requeue_scrub when kick_object_context_blocked
+
+ Reviewed-by: Sage Weil <sage@redhat.com>
+
+commit e133ddc622d3532b0182c208f0ebb9956daab44f
+Merge: c72306a 8ee93d5
+Author: Loic Dachary <loic@dachary.org>
+Date: Tue Nov 10 10:30:38 2015 +0100
+
+ Merge pull request #5890 from Abhishekvrshny/wip-13037-hammer
+
+ hit set clear repops fired in same epoch as map change -- segfault since they fall into the new interval even though the repops are cleared
+
+ Reviewed-by: Sage Weil <sage@redhat.com>
+
+commit c72306a1dd3b193948d5df3371471797d4131cfe
+Merge: 5e8c9d9 2bd5d0b
+Author: Loic Dachary <loic@dachary.org>
+Date: Tue Nov 10 10:21:07 2015 +0100
+
+ Merge pull request #6322 from sponce/WIP-13210-hammer
+
+ tests : BACKPORT #13210 Fixed broken Makefiles after integration of ttng into rados
+
+ Reviewed-by: Kefu Chai <kchai@redhat.com>
+
+commit b62cac6c345df53bbda1c42a5336cffc8f0f9652
+Author: Sangdi Xu <xu.sangdi@h3c.com>
+Date: Wed Sep 23 19:31:32 2015 +0800
+
+ rgw: fix swift API returning incorrect account metadata
+
+ Fixes: #13140
+
+ Fix the bug that swift account stat command returns doubled object count and bytes used
+
+ Signed-off-by: Sangdi Xu <xu.sangdi@h3c.com>
+ (cherry picked from commit 66d19c78ba75b79190c81c95f94e7ef3084fda9e)
+
+commit 9643ee65a6e968e479ca33a102f5f575924a7ff0
+Author: Xinze Chi <xmdxcxz@gmail.com>
+Date: Sun Aug 2 18:36:40 2015 +0800
+
+ bug fix: osd: do not cache unused buffer in attrs
+
+ attrs only reference the origin bufferlist (decode from MOSDPGPush or
+ ECSubReadReply message) whose size is much greater than attrs in recovery.
+ If obc cache it (get_obc maybe cache the attr), this causes the whole origin
+ bufferlist would not be free until obc is evicted from obc cache. So rebuild
+ the bufferlist before cache it.
+
+ Fixes: #12565
+ Signed-off-by: Ning Yao <zay11022@gmail.com>
+ Signed-off-by: Xinze Chi <xmdxcxz@gmail.com>
+ (cherry picked from commit c5895d3fad9da0ab7f05f134c49e22795d5c61f3)
+
+commit 5e8c9d967e0ade393e36893965ca8ddfaa317b48
+Merge: db0366d dba8b5b
+Author: Loic Dachary <loic@dachary.org>
+Date: Mon Nov 9 08:38:31 2015 +0100
+
+ Merge pull request #5810 from Abhishekvrshny/wip-12948-hammer
+
+ Heavy memory shuffling in rados bench
+
+ Reviewed-by: Kefu Chai <kchai@redhat.com>
+
+commit 1b06f03b541983461469f8f53ef2a271b08d2f78
+Author: Weijun Duan <duanweijun@h3c.com>
+Date: Thu Oct 29 21:46:02 2015 -0400
+
+ rgw:swift use Civetweb ssl can not get right url
+
+ Fixes: #13628
+
+ Signed-off-by: Weijun Duan <duanweijun@h3c.com>
+ (cherry picked from commit e0fd540bf441e2f8276cbd96c601a0539892efe2)
+
+commit db0366dd979cc0d401b1974c233e38dfe5b1b5d1
+Merge: 22dce75 a65c398
+Author: Loic Dachary <loic@dachary.org>
+Date: Thu Nov 5 13:12:11 2015 +0100
+
+ Merge pull request #5530 from SUSE/wip-12587-hammer
+
+ FileStore calls syncfs(2) even it is not supported
+
+ Reviewed-by: Kefu Chai <kchai@redhat.com>
+
+commit 22dce75181b254548226fc09decafac14dcf84a6
+Merge: ed153c1 d8ac510
+Author: Loic Dachary <loic@dachary.org>
+Date: Wed Nov 4 19:38:53 2015 +0100
+
+ Merge pull request #5889 from Abhishekvrshny/wip-13042-hammer
+
+ ThreadPool add/remove work queue methods not thread safe
+
+ Reviewed-by: Josh Durgin <jdurgin@redhat.com>
+
+commit ed153c13226138eec71e472d1e3c8481db9b9009
+Merge: ca8802f 8610de8
+Author: Loic Dachary <loic@dachary.org>
+Date: Wed Nov 4 19:14:28 2015 +0100
+
+ Merge pull request #6151 from dachary/wip-13245-hammer
+
+ client nonce collision due to unshared pid namespaces
+
+ Reviewed-by: Josh Durgin <jdurgin@redhat.com>
+
+commit ca8802fb0cb8603267ecfc7320fee7a679617b8b
+Merge: 19450b9 6e29e90
+Author: Loic Dachary <loic@dachary.org>
+Date: Wed Nov 4 11:36:39 2015 +0100
+
+ Merge pull request #6159 from dachary/wip-13341-hammer
+
+ ceph upstart script rbdmap.conf incorrectly processes parameters
+
+ Reviewed-by: Loic Dachary <ldachary@redhat.com>
+
+commit 19450b90e4c20556580d276bab7dafb23db1758f
+Merge: 18882c8 6849288
+Author: Loic Dachary <loic@dachary.org>
+Date: Wed Nov 4 11:34:07 2015 +0100
+
+ Merge pull request #6154 from dachary/wip-13195-hammer
+
+ should recalc the min_last_epoch_clean when decode PGMap
+
+ Reviewed-by: Sage Weil <sage@redhat.com>
+
+commit 18882c81a71c4b517cb0eaa5a884637ea5cbe7a6
+Merge: de4f37b 3c1f7cb
+Author: Loic Dachary <loic@dachary.org>
+Date: Wed Nov 4 11:28:03 2015 +0100
+
+ Merge pull request #6132 from SUSE/wip-13307-hammer
+
+ dumpling incrementals do not work properly on hammer and newer
+
+ Reviewed-by: Loic Dachary <ldachary@redhat.com>
+
+commit de4f37bb0abc932c813983792e170de1bb40241b
+Merge: 1c632a7 24268cf
+Author: Loic Dachary <loic@dachary.org>
+Date: Wed Nov 4 11:23:14 2015 +0100
+
+ Merge pull request #6097 from dillaman/wip-13045-hammer
+
+ librbd: diff_iterate needs to handle holes in parent images
+
+ Reviewed-by: Loic Dachary <ldachary@redhat.com>
+
+commit 1c632a7ea7057522fb9df61994b5b3cf65416689
+Merge: bedb334 71a42f7
+Author: Loic Dachary <loic@dachary.org>
+Date: Wed Nov 4 11:22:25 2015 +0100
+
+ Merge pull request #6060 from XinzeChi/wip-hammer-outdata-set
+
+ bug fix: osd: avoid multi set osd_op.outdata in tier pool
+
+ Reviewed-by: Loic Dachary <ldachary@redhat.com>
+
+commit bedb3344f6c802ea04a171dabd4fb596284af34a
+Merge: 0d3d819 cecd68d
+Author: Loic Dachary <loic@dachary.org>
+Date: Wed Nov 4 11:20:50 2015 +0100
+
+ Merge pull request #5897 from tchaikov/wip-12940-hammer
+
+ IO error on kvm/rbd with an erasure coded pool tier
+
+ Reviewed-by: Loic Dachary <ldachary@redhat.com>
+
+commit 0d3d81951db61a97f6cb26d9f75e80a3400a2a37
+Merge: 381cfcc 7475a8f
+Author: Loic Dachary <loic@dachary.org>
+Date: Wed Nov 4 11:11:00 2015 +0100
+
+ Merge pull request #5787 from SUSE/wip-12923-hammer
+
+ logrotate reload error on Ubuntu 14.04
+
+ Reviewed-by: Loic Dachary <ldachary@redhat.com>
+
+commit 381cfccf38bade28a001f3f24392c61896b3c711
+Merge: cad1cfb 86f88df
+Author: Loic Dachary <loic@dachary.org>
+Date: Wed Nov 4 11:10:26 2015 +0100
+
+ Merge pull request #5766 from dachary/wip-12590-hammer
+
+ ceph mds add_data_pool check for EC pool is wrong
+
+ Reviewed-by: Greg Farnum <gfarnum@redhat.com>
+
+commit cad1cfb088b095e8333c4a7d79ccefc2b2c4d782
+Merge: 9764da5 e8d6d5a
+Author: Loic Dachary <loic@dachary.org>
+Date: Wed Nov 4 11:06:18 2015 +0100
+
+ Merge pull request #5361 from ceph/wip-11786.hammer
+
+ mon: MonitorDBStore: get_next_key() only if prefix matches
+
+ Reviewed-by: Loic Dachary <ldachary@redhat.com>
+
+commit 5105d50d1c20d465229189bbb24cdfb5d16cf7bc
+Author: Loic Dachary <ldachary@redhat.com>
+Date: Tue Nov 3 00:21:51 2015 +0100
+
+ tests: test/librados/test.cc must create profile
+
+ Now that the create_one_ec_pool function removes the testprofile each
+ time it is called, it must create the testprofile erasure code profile
+ again for the test to use.
+
+ http://tracker.ceph.com/issues/13664 Refs: #13664
+
+ Signed-off-by: Loic Dachary <ldachary@redhat.com>
+ (cherry picked from commit a60342942b5a42ee04d59af77a6b904ce62eefc4)
+
+commit 302375068a59b86c50bda73ecefd99831ab52ea4
+Author: Loic Dachary <ldachary@redhat.com>
+Date: Mon Nov 2 20:24:51 2015 +0100
+
+ tests: destroy testprofile before creating one
+
+ The testprofile erasure code profile is destroyed before creating a new
+ one so that it does not fail when another testprofile erasure code
+ profile already exists with different parameters.
+
+ This must be done when creating erasure coded pools with the C++
+ interface, in the same way it's done with the C interface.
+
+ http://tracker.ceph.com/issues/13664 Fixes: #13664
+
+ Signed-off-by: Loic Dachary <ldachary@redhat.com>
+ (cherry picked from commit 47abab9a6f182aa0abe5047c04402850379bcd6d)
+
+commit 3a7423dbe0a6af831d4c47acc98e6ced5ed5fe0c
+Author: Loic Dachary <ldachary@redhat.com>
+Date: Mon Nov 2 20:23:52 2015 +0100
+
+ tests: add destroy_ec_profile{,_pp} helpers
+
+ Signed-off-by: Loic Dachary <ldachary@redhat.com>
+ (cherry picked from commit ab46d79bc09fc711fa35302f49eecac81a98519b)
+
+commit a52f7cb372339dffbeed7dae8ce2680586760754
+Author: Sage Weil <sage@redhat.com>
+Date: Tue Oct 13 09:55:01 2015 -0400
+
+ crush/mapper: ensure take bucket value is valid
+
+ Ensure that the take argument is a valid bucket ID before indexing the
+ buckets array.
+
+ Signed-off-by: Sage Weil <sage@redhat.com>
+ (cherry picked from commit 93ec538e8a667699876b72459b8ad78966d89c61)
+
+commit 81d8aa14f3f2b7bf4bdd0b4e53e3a653a600ef38
+Author: Sage Weil <sage@redhat.com>
+Date: Tue Oct 27 20:55:26 2015 -0400
+
+ crush/mapper: ensure bucket id is valid before indexing buckets array
+
+ We were indexing the buckets array without verifying the index was within
+ the [0,max_buckets) range. This could happen because a multistep rule
+ does not have enough buckets and has CRUSH_ITEM_NONE
+ for an intermediate result, which would feed in CRUSH_ITEM_NONE and
+ make us crash.
+
+ Fixes: #13477
+ Signed-off-by: Sage Weil <sage@redhat.com>
+ (cherry picked from commit 976a24a326da8931e689ee22fce35feab5b67b76)
+
+commit 74203b806e8c268aa3edac8cfc7c4b393f7b1f27
+Author: xiexingguo <258156334@qq.com>
+Date: Mon Oct 26 18:38:01 2015 +0800
+
+ FileStore: potential memory leak if _fgetattrs fails
+
+ Memory leak happens if _fgetattrs encounters some error and simply returns.
+ Fixes: #13597
+ Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
+
+ (cherry picked from commit ace7dd096b58a88e25ce16f011aed09269f2a2b4)
+
+commit db1cbe700e41ee7a2db5ef10173c429283bc5a2a
+Author: Robin H. Johnson <robin.johnson@dreamhost.com>
+Date: Fri Sep 4 01:07:48 2015 +0000
+
+ Fix casing of Content-Type header
+
+ It turns out, despite the HTTP spec declaring that header field names
+ should be case-insensitive, some clients treat them wrongly, and
+ consider "Content-type" to not match "Content-Type".
+
+ CyberDuck was one of those clients, now fixed upstream in
+ https://trac.cyberduck.io/ticket/8999
+
+ To reduce future occurances of this bug, fix the casing of the
+ Content-Type header, to strictly comply with the HTTP specification (be
+ strict about what you send, and generous about what you receive).
+
+ Fixes: #12939
+ Backport: infernalis, hammer, firefly
+ Signed-off-by: Robin H. Johnson <robin.johnson@dreamhost.com>
+ (cherry picked from commit 1b9fbffdc24160251b96cec820d62fb2a12b6eab)
+
+commit 1448915e49bb6c8abc192053e6f2e8a380c4e92a
+Author: John Spray <john.spray@redhat.com>
+Date: Mon Jun 1 13:55:22 2015 +0100
+
+ qa: update cephtool test for CephFS tier cases
+
+ 1. Creating a filesystem using a
+ readonly tier on an EC pool (should be forbidden)
+ 2. Removing a tier from a replicated base pool (should
+ be permitted)
+
+ Signed-off-by: John Spray <john.spray@redhat.com>
+ (cherry picked from commit f9b11b0abe7c2b0dcdfc5802336be8a0426ccb3a)
+
+commit 14c36f0ccf103dea39b63e0e1b03082b99c42cb1
+Author: John Spray <john.spray@redhat.com>
+Date: Mon Jun 1 13:54:25 2015 +0100
+
+ mon: forbid readonly cache tiers for CephFS
+
+ For EC pools, we need a tier that is not just forwarding
+ writes, in order to provide the ops required
+ by CephFS.
+
+ Signed-off-by: John Spray <john.spray@redhat.com>
+ (cherry picked from commit 11e5faf3c1d4fa28a8b41e3a92f0f684a844e5f5)
+
+commit 31e59fbca0ba636fc57c208e612d7488a48a6287
+Author: John Spray <john.spray@redhat.com>
+Date: Thu May 7 14:23:37 2015 +0100
+
+ mon: refine check_remove_tier checks
+
+ Fixes: #11504
+ Signed-off-by: John Spray <john.spray@redhat.com>
+ (cherry picked from commit a50c8f1f2ad8845c7f77110868f9376f2d1ff883)
+
+commit 9f3aebee16e256888b149fa770df845787b06b6e
+Author: Sage Weil <sage@redhat.com>
+Date: Tue Sep 22 13:57:37 2015 -0400
+
+ osd: fix requeue of replay requests during activating
+
+ If the replay period expires while we are still in the activating
+ state, we can simply insert our list of requests at the front of
+ the waiting_for_active list.
+
+ Fixes: #13116
+ Signed-off-by: Sage Weil <sage@redhat.com>
+ (cherry picked from commit d18cf51d9419819cdda3782b188b010969288911)
+
+commit ade0f1a4285348c20fbae8e2a366fc332a7b7fbe
+Author: xiexingguo <258156334@qq.com>
+Date: Tue Oct 13 14:04:20 2015 +0800
+
+ OSD:shall reset primary and up_primary fields when beginning a new past_interval.
+
+ Shall reset primary and up_primary fields when we start over a new past_interval in OSD::build_past_intervals_parallel().
+ Fixes: #13471
+ Signed-off-by: xie.xingguo@zte.com.cn
+ (cherry picked from commit 65064ca05bc7f8b6ef424806d1fd14b87add62a4)
+
+commit 9085c820491f25a04ec02accc5098c1ab9b57311
+Author: yangruifeng <yangruifeng.09209@h3c.com>
+Date: Mon Oct 19 08:08:12 2015 -0400
+
+ mon: should not set isvalid = true when cephx_verify_authorizer return false
+
+ Fixes: #13525
+ Signed-off-by: Ruifeng Yang <yangruifeng.09209@h3c.com>
+ (cherry picked from commit c7f75b8f7c0a773148ec16141941efd00ee76626)
+
+commit 4875d05a3e265e80463a2a33a2c922affb0dad66
+Author: Ken Dreyer <kdreyer@redhat.com>
+Date: Mon Mar 16 10:02:35 2015 -0600
+
+ ceph.spec.in: rm EOL Fedoras; add OBS RHEL5 instead
+
+ Fedora 12 has been EOL for a long time. Remove the reference in the
+ RPM .spec file.
+
+ Since RHEL 5 support for Ceph is a work in progress, we won't remove
+ this entire python_sitelib / python_sitearch conditional for now, since
+ those are still needed on RHEL 5.
+
+ Add the rhel_version macro to make the conditional compatible with
+ SUSE's OBS.
+
+ Signed-off-by: Ken Dreyer <kdreyer@redhat.com>
+ (cherry picked from commit 353a3258968f76deaea4542d2165e9ab32b88de8)
+
+commit dfba6acce75eea02251e98e2d57e6fbb344241fa
+Author: Travis Rhoden <trhoden@redhat.com>
+Date: Thu May 7 20:13:53 2015 -0400
+
+ packaging: Add rgw placeholder dirs in proper packages
+
+ Automatically create /var/lib/ceph/radosgw with the
+ ceph-radosgw package, and /var/lib/ceph/bootstrap-rgw
+ via the ceph package.
+
+ Signed-off-by: Travis Rhoden <trhoden@redhat.com>
+ (cherry picked from commit bf93128f664ac74383806530a1f974edde8df5b6)
+
+ Conflicts:
+ ceph.spec.in
+ hammer uses %ghost
+
+commit 2387c8e0caef00e7181241e16549457d58a12192
+Author: Nathan Cutler <ncutler@suse.cz>
+Date: Fri May 15 21:39:39 2015 +0200
+
+ ceph.spec.in: consolidate centos/rhel macros
+
+ 0%{?rhel} || 0%{?centos} can be simplified to just 0%{?rhel}, since
+ CentOS defines that macro for compatibility with RHEL.
+
+ Signed-off-by: Nathan Cutler <ncutler@suse.cz>
+ (cherry picked from commit 46404dd381e240634d224e77adc69f0ba4807045)
+
+ Conflicts:
+ ceph.spec.in
+ https://github.com/ceph/ceph/pull/4068 has not been backported
+
+commit 7c58d312db2aa42088f419dbfa7e841d897fdad6
+Author: Nathan Cutler <ncutler@suse.com>
+Date: Thu Jun 25 16:55:10 2015 +0200
+
+ packaging: make logrotate a hard dependency across all distros
+
+ Given ceph's reputation for voluminous logs, it makes sense for
+ logrotate to be a hard dependency for all distros.
+
+ Signed-off-by: Nathan Cutler <ncutler@suse.com>
+ (cherry picked from commit 0734cd1ec3ca3bd012686dc1bdda675909224a49)
+
+commit 61acc4e20ca58e11b9aba1efcdca78d1d7ddd2f7
+Author: Nathan Cutler <ncutler@suse.com>
+Date: Thu Jul 9 12:05:24 2015 +0200
+
+ ceph.spec.in: add missing -%{release}
+
+ We have it everywhere else and I can't think of any reason why
+ it should be omitted here.
+
+ Signed-off-by: Nathan Cutler <ncutler@suse.com>
+ (cherry picked from commit d952d59ae95d5f66aa4b98fd7aa4f4ecb36a4848)
+
+commit 20590d367226ea01c9d4d95de15cfd1aa354d02b
+Author: Nathan Cutler <ncutler@suse.com>
+Date: Fri Jun 26 20:21:59 2015 +0200
+
+ ceph.spec.in: remove duplicate BuildRequires: sharutils
+
+ Signed-off-by: Nathan Cutler <ncutler@suse.com>
+ (cherry picked from commit c418bd9615e6f23f3c14ae9e71003c66d31d4b78)
+
+commit 6b306eba829b1ec9822b24243ee7c021aab3d738
+Author: Nathan Cutler <ncutler@suse.com>
+Date: Mon Jun 15 12:58:00 2015 +0200
+
+ ceph.spec.in: fix python-flask dependency for SUSE
+
+ In SLE and openSUSE, the package is called python-Flask with an upper-case F.
+
+ Signed-off-by: Nathan Cutler <ncutler@suse.com>
+ (cherry picked from commit 39c28b9faf0fb069d91ac069a4d8df7bf03fb490)
+
+ Conflicts:
+ ceph.spec.in
+ add missing SUSE-specific build deps
+
+commit 7a2cbcb0a4efa365b6d92ec58d7acf4a66e9d2b1
+Author: Nathan Cutler <ncutler@suse.com>
+Date: Thu Jun 25 18:55:39 2015 +0200
+
+ ceph.spec.in: clarify two important comments
+
+ First, the terms "common" and "specific" are vague. Second,
+ "common" can easily be confused with the ceph-common subpackage.
+
+ Fix this by rephrasing to "distro-unconditional dependencies" and
+ "distro-conditional dependencies", respectively.
+
+ Third, move the "distro-unconditional dependencies" header so it
+ is above the part where these dependencies are actually defined.
+
+ Signed-off-by: Nathan Cutler <ncutler@suse.com>
+ (cherry picked from commit dd212fd1d367f70c61f65a97599959668b44aa53)
+
+commit dfe27c6ba05d49bb73854754b9d5c02cf1c7b1ef
+Author: Ken Dreyer <kdreyer@redhat.com>
+Date: Wed Jun 24 16:37:58 2015 -0600
+
+ ceph.spec.in: rm reference to EOL Fedoras (< 20)
+
+ Fedora 19 is EOL, so there's no need to refer to Fedoras less than 20.
+ "%{fedora}" effectively implies "Fedora 20 and above".
+
+ Reported-by: Ira Cooper <ira@samba.org>
+ Signed-off-by: Ken Dreyer <kdreyer@redhat.com>
+ (cherry picked from commit f3e4a91c458ca7b11706fe4608cb739499f5d3cc)
+
+ Conflicts:
+ ceph.spec.in
+ added xmlstarlet dependency to ceph-test package
+
+commit 371b64ef4aa786db3fd29bc84ff98e63000a859b
+Author: Ken Dreyer <kdreyer@redhat.com>
+Date: Wed Jun 24 16:39:30 2015 -0600
+
+ ceph.spec.in: package rbd-replay-prep on all Fedoras
+
+ This reverts the change in commit
+ 85517d611b7bf4cb6cbffcd2c65303be0d038264. Since we BuildRequire:
+ libbabeltrace-devel, autoconf will see that babeltrace is available
+ during the build, and make will build/install the rbd-replay-prep
+ utility.
+
+ This change also simplifies Fedora selection logic, because Fedora 19 is
+ EOL, so "%{fedora}" implies "Fedora 20 and above".
+
+ Reported-by: Ira Cooper <ira@samba.org>
+ Signed-off-by: Ken Dreyer <kdreyer@redhat.com>
+ (cherry picked from commit 2db9480fa2646de776f0076d82747e202e574ddd)
+
+commit 82425b33f712047442d9d29c5a4349818b44b40a
+Author: Boris Ranto <branto@redhat.com>
+Date: Tue Jun 16 23:07:04 2015 +0200
+
+ ceph.spec.in: rbd-replay-prep is not being built on f21+
+
+ Signed-off-by: Boris Ranto <branto@redhat.com>
+ (cherry picked from commit 85517d611b7bf4cb6cbffcd2c65303be0d038264)
+
+commit 53e2f702681dc08ddd0414b116e51de6488f42ca
+Author: Owen Synge <osynge@suse.com>
+Date: Mon Jun 8 17:48:55 2015 +0200
+
+ ceph.spec.in:BuildRequires sharutils
+
+ The uudecode binary is used to build Java-related components, and
+ uudecode is provided by the sharutils package on all supported
+ RPM platforms. When building with "--without=cephfs_java",
+ sharutils is not needed.
+
+ Thanks to Nathan Cutler <ncutler@suse.cz> for going into the
+ details with me.
+
+ On OBS without this patch we get the error message:
+
+ [ 170s] -----------------------------------------------------------------
+ [ 170s] ----- building ceph.spec (user abuild)
+ [ 170s] -----------------------------------------------------------------
+ [ 170s] -----------------------------------------------------------------
+ [ 170s] + exec rpmbuild -ba --define '_srcdefattr (-,root,root)' --nosignature --define 'disturl obs://build.opensuse.org/home:osynge:ceph:wip:wip_obs_fedora/Fedora_20/c0bbbc1e62228ca956ac3d367edc4fba-master' /home/abuild/rpmbuild/SOURCES/ceph.spec
+ [ 170s] error: Failed build dependencies:
+ [ 170s] sharutils is needed by ceph-1:2+git.1435043747.c1bd02c-1.1.x86_64
+
+ With this patch we can build fedora 22 and fedora 20 rpms fine.
+
+ Signed-off-by: Owen Synge <osynge@suse.com>
+ (cherry picked from commit 43c1784640538b813f0575c50f721ac911a30b3e)
+
+ Conflicts:
+ ceph.spec.in
+ _with_systemd -> trivial resolution
+
+commit a84376c68499845de01f9e3b194b16a698125b6a
+Author: Owen Synge <osynge@suse.com>
+Date: Wed Jun 10 12:11:50 2015 +0200
+
+ ceph.spec.in: fix:Add missing directories breaking build
+
+ SUSE builds on OBS are failing with the missing dir entries:
+
+ /usr/share/ceph
+ /usr/lib/ceph
+
+ On suse these correspond to:
+
+ %dir %{_datarootdir}/ceph/
+ %dir %{_libexecdir}/ceph/
+
+ Signed-off-by: Owen Synge <osynge@suse.com>
+ (cherry picked from commit f1ff3e4dcb5dd7eddd2c346a05cfa78d860a5ce6)
+
+commit 171fee1b82d2675e364da7f96dfb9dd286d9b6e6
+Author: Kefu Chai <kchai@redhat.com>
+Date: Tue Jul 21 00:33:19 2015 +0800
+
+ mon: track osd_epoch of all MonSessions
+
+ previously, we only track the osd_epoch for OSD peers. but other
+ MonClients who receives osdmaps can also benefit from osd_epoch.
+
+ Signed-off-by: Kefu Chai <kchai@redhat.com>
+ (cherry picked from commit de43a02e06650a552f048dc8acd17f255126fed9)
+
+ Conflicts:
+ src/mon/OSDMonitor.cc:
+ do not assume that the MonSession is always available when
+ OSDMonitor::send_incremental() is called. as when the
+ connection to the mon client is dropped, the Monitor is
+ aware of this, but not the OSDMonitor.
+
+commit cc7da674965c3f758469e18788dc0e106e54d5bc
+Author: Kefu Chai <kchai@redhat.com>
+Date: Tue Jul 21 00:24:52 2015 +0800
+
+ mon: track osd_epoch in MonSession
+
+ * remove osd_epoch<osd, epoch> from OSDMonitor
+ * add osd_epoch to MonSession to track the latest osdmap epoch
+ OSDMonitor sends to a mon client
+ * do not remove osd_epoch entries if an OSD is down, or
+ max_osd > osd_id
+
+ Fixes: #10930
+ Signed-off-by: Kefu Chai <kchai@redhat.com>
+ (cherry picked from commit c05753eacc26e90b2e3b56e641a71bffd5b39bd0)
+
+commit 3f33ce6132d5ce8b3454f30fbe14471ece39951d
+Author: Lu Shi <shi.lu@h3c.com>
+Date: Thu Sep 24 16:02:41 2015 +0800
+
+ librbd:reads larger than cache size hang.
+
+ Fixes:#13164
+
+ Signed-off-by: Lu Shi <shi.lu@h3c.com>
+ (cherry picked from commit 9c8200bb5d1ac9359803a182df03298b565b8479)
+
+commit 5e5b512189b809bef503c34b0a19e30ed81cfbfa
+Author: Radoslaw Zarzynski <rzarzynski@mirantis.com>
+Date: Wed Aug 19 20:32:39 2015 +0200
+
+ rgw: url_decode values from X-Object-Manifest during GET on Swift DLO.
+
+ Fixes: #12728
+ Signed-off-by: Radoslaw Zarzynski <rzarzynski@mirantis.com>
+ (cherry picked from commit 69cf089596a0e5d4da2826b5c276306316a00690)
+
+commit e693755a55e4da681a1947b1e1eb3bb537436cc0
+Author: Yehuda Sadeh <yehuda@redhat.com>
+Date: Tue Sep 22 14:53:42 2015 -0700
+
+ cls_rgw: fix bucket listing when dealing with invisible entries
+
+ Fixes: #12913
+
+ The bucket listing logic was broken when dealing with invisible entries.
+ Need to read keys until we can fetch all the requested entries, or
+ determine that there are no more entries. Anything else requires
+ a change to the protocol.
+
+ Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
+ (cherry picked from commit ef9730515e001d77637a77eb89950f70fd5e7f5a)
+
+commit 99b4d1df3f6867e5ff0dd74691203737f6de6974
+Author: Yehuda Sadeh <yehuda@redhat.com>
+Date: Tue Sep 22 15:49:27 2015 -0700
+
+ rgw: orphan tool shouldn't clean up head objects
+
+ Fixes: #12958
+
+ Head objects are mutable, so removing them can race with object removal
+ and a later recreation, so we might end up cleaning them up when we don't
+ need to.
+
+ Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
+ (cherry picked from commit 030f697d196df9963ecf4f05f727da4798c583dc)
+
+commit 6d89f4ba85063debe96734e9fdfcba247e770206
+Author: Yehuda Sadeh <yehuda@redhat.com>
+Date: Mon Oct 12 11:55:40 2015 -0700
+
+ rgw: location constraints should return api name
+
+ Fixes: #13458
+ The S3 location constraints request should return the api name,
+ not the region name.
+
+ Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
+ (cherry picked from commit 03078bab6ee8c617025902dbe52ec19e64653c33)
+
+commit 2bd5d0b835b546c80b5af503d2b9538835c768fd
+Author: Sebastien Ponce <sebastien.ponce@cern.ch>
+Date: Tue Oct 20 09:22:16 2015 +0200
+
+ radosstriper : Fixed broken Makefiles after integration of lttng
+
+ Fixes: #13210, backport of #6322 into hammer
+
+ Signed-off-by: Sebastien Ponce <sebastien.ponce@cern.ch>
+
+commit 7ffd072a8cc7e114d4d674d30333fea4db04dcdd
+Author: Sage Weil <sage@redhat.com>
+Date: Thu Oct 1 14:50:34 2015 -0400
+
+ osdc/Objecter: distinguish between multiple notify completions
+
+ We may send a notify to the cluster multiple times due to OSDMap
+ changes. In some cases, earlier notify attempts may complete with
+ an error, while later attempts succeed. We need to only pay
+ attention to the most-recently send notify's completion.
+
+ Do this by making note of the notify_id in the initial ACK (only
+ present when talking to newer OSDs). When we get a notify
+ completion, match it against our expected notify_id (if we have
+ one) or else discard it.
+
+ This is important because in some cases an early notify completion
+ may be an error while a later one succeeds.
+
+ Note that if we are talking to an old cluster we will simply not record a
+ notify_id and our behavior will be the same as before (we will trust any
+ notify completion we get).
+
+ Fixes: #13114
+ Signed-off-by: Sage Weil <sage@redhat.com>
+ (cherry picked from commit e86d033854c76f344c678e92016c4e5c5e0385e2)
+
+ Conflicts:
+ src/osdc/Objecter.cc
+ In Objecter::handle_watch_notify, a conflict was there due to a modified comment by commit 47277c51db7bb2725ea117e4e8834869ae93e006, which was not backported
+
+commit 647c91098e8517912c73e3f7d27954e6f340472c
+Author: Sage Weil <sage@redhat.com>
+Date: Thu Oct 1 14:50:00 2015 -0400
+
+ osd: reply to notify request with our unique notify_id
+
+ The OSD assigns a unique ID to each notify it queues for
+ processing. Include this in the reply to the notifier so that
+ they can match it up with the eventual completions they receive.
+
+ This is necessary to distinguish between multiple completions
+ they may receive if there is PG peering and the notify is resent.
+ In particular, an earlier notify may return an error when a later
+ attempt succeeds.
+
+ This is forwards and backwards compatible: new clients will make use of
+ this reply payload but older clients ignore it.
+
+ Signed-off-by: Sage Weil <sage@redhat.com>
+ (cherry picked from commit 049ea702b9bf4a8a62ae2770d9ba55c0730b3eef)
+
+commit 0ad9521944e0de5c135a066b0cda07f8976bdae1
+Author: David Zafman <dzafman@redhat.com>
+Date: Mon Oct 12 13:24:31 2015 -0700
+
+ osd: Correct the object_info_t::decode() version
+
+ Caused by: 13b9dc70
+
+ Fixes: #13462
+ Backport: Hammer, Firefly
+
+ Signed-off-by: David Zafman <dzafman@redhat.com>
+ (cherry picked from commit 2b7ddde685213f3908f2dd9545b35f1d97f35a79)
+
+commit af734e63f28ac5af414b6507c945ffd9e736d5cf
+Author: Jason Dillaman <dillaman@redhat.com>
+Date: Tue Oct 6 12:31:59 2015 -0400
+
+ librbd: invalidate object map on error even w/o holding lock
+
+ If there is a deep bug that prevents the object map from owning
+ the lock before objects are updated, flag the object map as invalid
+ regardless.
+
+ Fixes: #13372
+ Backport: hammer
+ Signed-off-by: Jason Dillaman <dillaman@redhat.com>
+ (cherry picked from commit e675400df7f8ba796d60e9bac4234857f0cb1392)
+
+ Conflicts:
+ src/librbd/ObjectMap.h/cc: hammer branch doesn't support rebuild
+
+commit 634d7f62486847846e3862091b8cb587d095cb52
+Author: Jason Dillaman <dillaman@redhat.com>
+Date: Thu Oct 8 13:28:04 2015 -0400
+
+ tests: removed obsolete rbd_replay test cases
+
+ Signed-off-by: Jason Dillaman <dillaman@redhat.com>
+ (cherry picked from commit e0d8cb1283e4bdbfc770684b173e477c22558524)
+
+commit 5c63d3c614189381cc169c64a3138c7abcb368c6
+Author: Jason Dillaman <dillaman@redhat.com>
+Date: Thu Oct 8 13:26:42 2015 -0400
+
+ ceph-dencoder: new rbd_replay trace file types
+
+ Signed-off-by: Jason Dillaman <dillaman@redhat.com>
+ (cherry picked from commit c2a83d0b518497dc8bcbbdea77b88febe52a3034)
+
+commit a145a1cd8e245505abae66f0497be0df0078cecb
+Author: Jason Dillaman <dillaman@redhat.com>
+Date: Thu Oct 8 13:21:29 2015 -0400
+
+ rbd-replay: added version control to trace output file
+
+ Signed-off-by: Jason Dillaman <dillaman@redhat.com>
+ (cherry picked from commit 3ecdae8388d69123b937a40ce614a0b795a757f1)
+
+commit a30ed76c34ecca6278112908871126e1730a22bc
+Author: Jason Dillaman <dillaman@redhat.com>
+Date: Wed Oct 7 15:39:18 2015 -0400
+
+ rbd-replay-prep: added --verbose command line option
+
+ This new command-line will dump all the processed events as they
+ are extracted from the trace file.
+
+ Signed-off-by: Jason Dillaman <dillaman@redhat.com>
+ (cherry picked from commit 646e50a771c3089121ec2f4369d1a8188001a3eb)
+
+commit adf31c88d3ed95d0c29c649e2642ee3ae758743b
+Author: Jason Dillaman <dillaman@redhat.com>
+Date: Wed Oct 7 15:22:25 2015 -0400
+
+ rbd-replay-prep: stream events to the prep file
+
+ Avoid building the entire prep event history in memory before
+ attempting to write the prepped trace file.
+
+ Signed-off-by: Jason Dillaman <dillaman@redhat.com>
+ (cherry picked from commit 98f513a113f4e8aff17c83991d2e6f0f3738a9c9)
+
+commit 8c9e67ad0b21629565a09f6b9b92723b98594f84
+Author: Jason Dillaman <dillaman@redhat.com>
+Date: Wed Oct 7 14:56:22 2015 -0400
+
+ rbd-replay-prep: simplify IO dependency calculation
+
+ Only track read-after-write and write-after-write IO dependencies
+ via the associated write completions. All IO events after a write
+ completion are considered to be dependent and can be pruned down
+ to at most the number of concurrent IOs. This reduces the prep
+ time from a simple 'rbd bench-write' from over 4 hrs down to seconds.
+
+ Fixes: #13378, #13384
+ Backport: hammer
+
+ Signed-off-by: Jason Dillaman <dillaman@redhat.com>
+ (cherry picked from commit 65fb1b86cbab65023f6207798c9e189bce55dcf6)
+
+commit e7406fcba86646a4c3fbac66ee54b52ce3d5a33d
+Author: Jason Dillaman <dillaman@redhat.com>
+Date: Tue Oct 6 13:16:51 2015 -0400
+
+ rbd-replay: improve error messages
+
+ Fixes: #13221
+ Backport: hammer
+ Signed-off-by: Jason Dillaman <dillaman@redhat.com>
+ (cherry picked from commit 4f436e10802d7b3c3949b592fec238c189a02c50)
+
+commit 9f81d28107bd82b7118d1521ade982ab179c5a7a
+Author: Jason Dillaman <dillaman@redhat.com>
+Date: Tue Oct 6 12:48:50 2015 -0400
+
+ rbd-replay-prep: support new read/write APIs
+
+ Added support for read2, write2, aio_read2, and aio_write2 APIs.
+
+ Fixes: 13325
+ Backport: hammer
+ Signed-off-by: Jason Dillaman <dillaman@redhat.com>
+ (cherry picked from commit b5b4a9dd6bfe10844327a457849a0dbf7ef597ea)
+
+commit a856bee2aa7e22f2bedf54b684c4d55452766b01
+Author: Jason Dillaman <dillaman@redhat.com>
+Date: Mon Oct 5 17:30:54 2015 -0400
+
+ rbd-replay-prep: avoid using assert statements on user inputs
+
+ Fixes: #13220
+ Backport: hammer
+ Signed-off-by: Jason Dillaman <dillaman@redhat.com>
+ (cherry picked from commit a1e99f06a78d7cf2ecc0c8e9fbc3331e4e4f18f7)
+
+commit 6a4734a7afecb359b8bc9c114332cd7321097c38
+Author: Samuel Just <sjust@redhat.com>
+Date: Mon Sep 21 11:16:49 2015 -0700
+
+ ReplicatedPG::hit_set_setup: fix hit_set_remove_all call
+
+ We only want to do it if the pool config changed AND we are
+ primary && active.
+
+ fd38902dd4693b9b72f7532833e78f5df2c9efa5 partially fixed a related
+ bug. This should be backported along with it.
+
+ Fixes: 13192
+ Signed-off-by: Samuel Just <sjust@redhat.com>
+ (cherry picked from commit 36e4a80c39f7daab2a35efc04650ae8b7b11c4e0)
+
+commit ab3877dd566f3951e76abaa6b7deeb5835a512b1
+Author: Samuel Just <sjust@redhat.com>
+Date: Tue Sep 22 11:13:44 2015 -0700
+
+ osd/: assert in HitSet constructor if type is TYPE_NONE as well
+
+ Otherwise impl is unpopulated and we risk segfaults in several
+ methods. It also seems like it would always indicate a bug.
+
+ Signed-off-by: Samuel Just <sjust@redhat.com>
+ (cherry picked from commit 8e5a801b43babf751b619ed9606d7be7e5b12837)
+
+commit 4fe07b7f69321535a985958fc761a54cb71136f6
+Author: Zhiqiang Wang <zhiqiang.wang@intel.com>
+Date: Thu Jul 23 09:26:44 2015 +0800
+
+ osd: only remove all the hit set objects on primary osd
+
+ Only the primary PG is allowed to remove all the hit set objects. And
+ the PG should be in the active or peered states.
+
+ Signed-off-by: Zhiqiang Wang <zhiqiang.wang@intel.com>
+ (cherry picked from commit fd38902dd4693b9b72f7532833e78f5df2c9efa5)
+
+commit 313a09b58b6aa6fe8999f4d5da07a04f00c64cd7
+Author: Zhiqiang Wang <zhiqiang.wang@intel.com>
+Date: Thu Jun 18 09:05:28 2015 +0800
+
+ osd: implement hit_set_remove_all
+
+ When hit set is not configured on startup or on a change, remove all
+ previous hitsets.
+
+ Signed-off-by: Zhiqiang Wang <zhiqiang.wang@intel.com>
+ (cherry picked from commit be28319bf3dc54b4b6f400d83405a29facfe3bd4)
+ Conflicts:
+ src/osd/ReplicatedPG.cc
+ pass the new argument of `p->using_gmt` to get_hit_set_archive_object()
+
+commit b632254252f56d3b2c0c32803593ba765b45b222
+Author: Kefu Chai <kchai@redhat.com>
+Date: Tue Sep 8 16:52:32 2015 +0800
+
+ mon: disable gmt_hitset if not supported
+
+ the gmt_hitset is enabled by default in the ctor of pg_pool_t, this
+ is intentional. because we want to remove this setting and make
+ gmt_hitset=true as a default in future. but this forces us to
+ disable it explicitly when preparing a new pool if any OSD does
+ not support gmt hitset.
+
+ Fixes: #12968
+ Signed-off-by: Kefu Chai <kchai@redhat.com>
+ (cherry picked from commit e48cec3dc93b3988dcd8924933deb1b3a43e1d0f)
+
+ Conflicts:
+ src/mon/OSDMonitor.cc
+ remove unrelated hunk
+
+commit 27fc9a3b2bd34bec8d5bb3954b873ce6344771f4
+Author: Kefu Chai <kchai@redhat.com>
+Date: Fri Aug 28 00:32:38 2015 +0800
+
+ osd: do not let OSD_HITSET_GMT reuse the feature bit
+
+ * to ease the backport to hammer
+
+ Signed-off-by: Kefu Chai <kchai@redhat.com>
+ (cherry picked from commit 5a4f6a866bb675195ad83c38fd23238d078c78ed)
+
+ Conflicts:
+ src/include/ceph_features.h
+ minor changes to resolve conflicts
+
+commit 7fcc61d26028eb417a0c224e8c9cd3cc95bc13d9
+Author: David Zafman <dzafman@redhat.com>
+Date: Thu Aug 27 11:24:25 2015 -0700
+
+ osd: Decode use_gmt_hitset with a unique version
+
+ Signed-off-by: David Zafman <dzafman@redhat.com>
+ (cherry picked from commit 2bc5a48f4c5d3667213be3a7b5a0e0f5ef9daf4f)
+
+ Conflicts:
+ src/osd/osd_types.cc
+ minor changes to resolve conflicts
+
+commit 26c7e968523ac09f608c4ed7c50681fbb741ca1f
+Author: Kefu Chai <kchai@redhat.com>
+Date: Tue Aug 18 16:53:50 2015 +0800
+
+ mon: print use_gmt_hitset in "ceph osd pool get"
+
+ Signed-off-by: Kefu Chai <kchai@redhat.com>
+ (cherry picked from commit cc2bcf760f2d2f20fc4a2fa78ba52475a23e55bf)
+
+ Conflicts:
+ src/mon/OSDMonitor.cc
+ use the old way to dump pool info
+
+commit e8e00dab1b064e77a997504f385b5d60ee8aca25
+Author: Kefu Chai <kchai@redhat.com>
+Date: Tue Aug 18 00:04:23 2015 +0800
+
+ mon: add "ceph osd pool set $pool use_gmt_hitset true" cmd
+
+ allow "ceph osd pool set $pool use_gmt_hitset <true|1>" as long as
+ the cluster supports gmt hitset.
+
+ Fixes: #9732
+ Signed-off-by: Kefu Chai <kchai@redhat.com>
+ (cherry picked from commit 03a1a3cf023a9aeb2fa26820e49e5efe3f3b3789)
+
+commit 040e390d29fc68dcefe48c59cccacf6258c6f690
+Author: Kefu Chai <kchai@redhat.com>
+Date: Fri Jun 5 21:06:48 2015 +0800
+
+ osd: use GMT time for the object name of hitsets
+
+ * bump the encoding version of pg_hit_set_info_t to 2, so we can
+ tell if the corresponding hit_set is named using localtime or
+ GMT
+ * bump the encoding version of pg_pool_t to 20, so we can know
+ if a pool is using GMT to name the hit_set archive or not. and
+ we can tell if current cluster allows OSDs not support GMT
+ mode or not.
+ * add an option named `osd_pool_use_gmt_hitset`. if enabled,
+ the cluster will try to use GMT mode when creating a new pool
+ if all the the up OSDs support GMT mode. if any of the
+ pools in the cluster is using GMT mode, then only OSDs
+ supporting GMT mode are allowed to join the cluster.
+
+ Fixes: #9732
+ Signed-off-by: Kefu Chai <kchai@redhat.com>
+ (cherry picked from commit 42f8c5daad16aa849a0b99871d50161673c0c370)
+
+ Conflicts:
+ src/include/ceph_features.h
+ src/osd/ReplicatedPG.cc
+ src/osd/osd_types.cc
+ src/osd/osd_types.h
+ fill pg_pool_t with default settings in master branch.
+
+commit 31b7864b4161221f6027c6cbe1e42ed598d42b6a
+Author: Nathan Cutler <ncutler@suse.com>
+Date: Sun Sep 27 21:55:00 2015 +0200
+
+ CephxServiceHandler.cc: fix get_auth conditional
+
+ The KeyServer class has a public method get_auth() that returns a boolean
+ value. This value is being checked here - fix the conditional so it triggers
+ when get_auth() returns false.
+
+ http://tracker.ceph.com/issues/9756 References: #9756
+
+ Signed-off-by: Nathan Cutler <ncutler@suse.com>
+ (cherry picked from commit 7250db62cb7ac1e9c0b1f5956d60b9d874496702)
+
+commit 0742177c767613d41bda0d260eebdd0087e3b392 (refs/remotes/me/wip-randomize-scrub-hammer)
+Author: Kefu Chai <kchai@redhat.com>
+Date: Sat May 16 00:07:27 2015 +0800
+
+ osd: use another name for randomize scrub option
+
+ s/osd_scrub_interval_limit/osd_scrub_interval_randomize_ratio/
+
+ Fixes: #10973
+ Signed-off-by: Kefu Chai <kchai@redhat.com>
+
+commit fad33861a87f2feb944ad5454775c95d09364b56
+Author: Kefu Chai <kchai@redhat.com>
+Date: Mon Mar 9 16:42:34 2015 +0800
+
+ osd: randomize scrub times to avoid scrub wave
+
+ - to avoid the scrub wave when the osd_scrub_max_interval reaches in a
+ high-load OSD, the scrub time is randomized.
+ - extract scrub_load_below_threshold() out of scrub_should_schedule()
+ - schedule an automatic scrub job at a time which is uniformly distributed
+ over [now+osd_scrub_min_interval,
+ now+osd_scrub_min_interval*(1+osd_scrub_time_limit]. before
+ this change this sort of scrubs will be performed once the hard interval
+ is end or system load is below the threshold, but with this change, the
+ jobs will be performed as long as the load is low or the interval of
+ the scheduled scrubs is longer than conf.osd_scrub_max_interval. all
+ automatic jobs should be performed in the configured time period, otherwise
+ they are postponed.
+ - the requested scrub job will be scheduled right away, before this change
+ it is queued with the timestamp of `now` and postponed after
+ osd_scrub_min_interval.
+
+ Fixes: #10973
+ Signed-off-by: Kefu Chai <kchai@redhat.com>
+ (cherry picked from commit 5e44040e8528bff06cc0a5a3f3293ab146e0e4e1)
+
+ Conflicts:
+ src/osd/OSD.cc
+
+commit 9c130336a1a1dcf2338d202914aeacbc194af0b0
+Author: Kefu Chai <kchai@redhat.com>
+Date: Mon Mar 9 16:47:30 2015 +0800
+
+ osd: use __func__ in log messages
+
+ Signed-off-by: Kefu Chai <kchai@redhat.com>
+ (cherry picked from commit 0f7f35670f03f3f58329c00d323963710e7e495d)
+
+commit 4a3dedff8693953944af3eeb40994f38befebf48
+Author: Kefu Chai <kchai@redhat.com>
+Date: Wed Apr 15 12:04:05 2015 +0800
+
+ osd: simplify OSD::scrub_load_below_threshold() a little bit
+
+ avoid unnecessary comparison
+
+ Signed-off-by: Kefu Chai <kchai@redhat.com>
+ (cherry picked from commit 2ab0e606dfd2847e1918be9f21f572d91befbf7b)
+
+commit 24268cf4309267a0a1e32e28379cf7eafac00bca
+Author: Jason Dillaman <dillaman@redhat.com>
+Date: Fri May 1 14:21:35 2015 -0400
+
+ librbd: invoking RBD::open twice will leak memory
+
+ Signed-off-by: Jason Dillaman <dillaman@redhat.com>
+ (cherry picked from commit a5e88fcf11ebb16d4a1405b21cf6f895b37f185e)
+
+commit 8610de81c8eeae763354a4133e160ccb3faa8dad
+Author: Josh Durgin <jdurgin@redhat.com>
+Date: Mon Sep 21 15:46:42 2015 -0700
+
+ use simplifed messenger constructor for clients
+
+ This is all mechanical except the calculation of the nonce, which is
+ now always randomized for clients.
+
+ Fixes: #13032
+ Signed-off-by: Josh Durgin <jdurgin@redhat.com>
+ (cherry picked from commit a3a8c85b79afef67681c32c57b591c0e0a87a349)
+
+commit 9d059c3f1b3aa0b1830b6f84694c850d36e8a77a
+Author: Josh Durgin <jdurgin@redhat.com>
+Date: Mon Sep 21 15:20:53 2015 -0700
+
+ msg: add simplified messenger constructor
+
+ Several callers create messengers using exactly the same parameters:
+
+ - reading the ms type from cct that is also passed in
+ - a default entity_name_t::CLIENT
+ - the default features
+
+ Additionally, the nonce should be randomized and not depend on
+ e.g. pid, as it does in several callers now. Clients running in
+ containers can easily have pid collisions, leading to hangs, so
+ randomize the nonce in this simplified constructor rather than
+ duplicating that logic in every caller.
+
+ Daemons have meaningful entity_name_ts, and monitors currently depend
+ on using 0 as a nonce, so make this simple constructer
+ client-specific.
+
+ Related: #13032
+ Signed-off-by: Josh Durgin <jdurgin@redhat.com>
+ (cherry picked from commit e3785b0b5fbff870adbd5f121021b671912386cf)
+
+ Conflicts:
+ src/msg/Messenger.cc: Messenger::create only has 5 arguments in
+ hammer. Since the last one is zero, it does not change the
+ semantic.
+
+commit 6e29e904ce8e7b3481fd3b318b070d326cd4a71a
+Author: Sage Weil <sage@redhat.com>
+Date: Wed Sep 30 08:29:05 2015 -0400
+
+ init-rbdmap: fix CMDPARAMS
+
+ Fixes: #13214
+ Reported-by: Wyllys Ingersoll <wyllys.ingersoll@keepertech.com>
+ Signed-off-by: Sage Weil <sage@redhat.com>
+ (cherry picked from commit 02113ac449cd7631f1c9a3840c94bbf253c052bd)
+
+commit 7161a2c927a6ded0d6ffe7d7621b7abd7f18acc3
+Author: Samuel Just <sjust@redhat.com>
+Date: Mon Sep 21 12:00:49 2015 -0700
+
+ PG: ignore info from down osd
+
+ Fixes: #12990
+ Backport: firefly, hammer
+ Signed-off-by: Samuel Just <sjust@redhat.com>
+ (cherry picked from commit 930d8eb1fb0daacd692d2e80b5ff473448bd4e8d)
+
+commit 9753551f9f4ea9a1638dd469ef536d895ca9bc3b
+Author: Samuel Just <sjust@redhat.com>
+Date: Mon Sep 21 12:01:03 2015 -0700
+
+ OSDMap.h: add has_been_up_since
+
+ Signed-off-by: Samuel Just <sjust@redhat.com>
+ (cherry picked from commit 4b00350870e3a43aee5fff7982b3785fe1876634)
+
+commit f1271eae0decf4d1fd9cfd83e5e54d3be6abfb17
+Author: zqkkqz <zheng.qiankun@h3c.com>
+Date: Fri Aug 7 10:49:45 2015 +0800
+
+ Common/Thread: pthread_attr_destroy(thread_attr) when done with it
+ When a thread attributes object is no longer required, it should be destroyed using the
+ pthread_attr_destroy() function. Destroying a thread attributes object has no effect on threads that were created using that object.
+
+ Fixes: #12570
+ Signed-off-by: zqkqkz zheng.qiankun@h3c.com
+ (cherry picked from commit 9471bb838a420ef5f439191d87e5388fecccb9e6)
+
+commit 9581f9f4446ed5838bb3de6e1d7cf5faca85df90
+Author: Piotr Dałek <piotr.dalek@ts.fujitsu.com>
+Date: Fri Jul 17 12:43:52 2015 +0200
+
+ Thread.cc: remove malloc/free pair
+
+ There's no need for mallocing pthread_attr_t in Thread::try_create(),
+ it can be located on stack as it is freed in same function. This reduces
+ pressure put on memory manager.
+
+ Signed-off-by: Piotr Dałek <piotr.dalek@ts.fujitsu.com>
+ (cherry picked from commit 614ac0f4e375f3dd008c8937d3f89f6005d6e0a0)
+
+commit a17f2a9a6600803a8b7f6dd306f7bafb6acc1af5
+Author: Jianpeng Ma <jianpeng.ma@intel.com>
+Date: Tue Sep 1 21:35:19 2015 +0800
+
+ osdc/Objecter: optimize Objecter::tick.
+
+ Set bool value is better than insert same value into set<>.
+
+ Signed-off-by: Jianpeng Ma <jianpeng.ma@intel.com>
+ (cherry picked from commit ee204044d9e69ea44b533c05cec154974039264c)
+
+commit f80d237decac775d82f1e276a1ea600a9f352ffe
+Author: Jianpeng Ma <jianpeng.ma@intel.com>
+Date: Tue Sep 1 19:32:32 2015 +0800
+
+ osdc/Objecter: remove the unuseful code.
+
+ Signed-off-by: Jianpeng Ma <jianpeng.ma@intel.com>
+ (cherry picked from commit 80f10e3e59dadda2dca4eb62c68af972b701b316)
+
+commit 8f76f4c467dc69cd2af75d9cbb134c26f2d04a84
+Author: Jianpeng Ma <jianpeng.ma@intel.com>
+Date: Tue Sep 1 15:39:29 2015 +0800
+
+ osdc/Objecter: Don't forget call _op_cancel_map_check when cancel linger op.
+
+ Signed-off-by: Jianpeng Ma <jianpeng.ma@intel.com>
+ (cherry picked from commit 7cc963b1c6ab37bf33638dc6eca7848d93f7908f)
+
+commit ba36caba5226a44c41fdd2b19074916b38af5fdf
+Author: Jianpeng Ma <jianpeng.ma@intel.com>
+Date: Tue Sep 1 15:12:02 2015 +0800
+
+ osdc/Objecter: In _cancel_linger_op, it should make num_unacked/num_committed decrease.
+
+ Signed-off-by: Jianpeng Ma <jianpeng.ma@intel.com>
+ (cherry picked from commit 36b62710ddef0ffaee25837a92ca1ac9b353ff05)
+
+commit 6ff7b02dc23b42a99c7136d1a55ead05c12e2b97
+Author: Jianpeng Ma <jianpeng.ma@intel.com>
+Date: Thu Aug 20 17:00:23 2015 +0800
+
+ osdc/Objeter: When cancel op, decrease num_unacked/num_uncommitted.
+
+ Signed-off-by: Jianpeng Ma <jianpeng.ma@intel.com>
+ (cherry picked from commit 064e8585a04edb3d87b38db6bed03e965cfcb359)
+
+commit d815e0aacb4a516f4bbbb59a2b2073b38759d9e8
+Author: Jianpeng Ma <jianpeng.ma@intel.com>
+Date: Thu Aug 20 15:38:58 2015 +0800
+
+ osdc/Objecter: For func op_cancel_writes it can directly call op_cancel.
+
+ Becasue we get write-lock of rwlock, so it is safe to call op_cancel
+ rather than _op_canchel(homeless_session for this case don't met).
+
+ Signed-off-by: Jianpeng Ma <jianpeng.ma@intel.com>
+ (cherry picked from commit e4ce619fe17a7a9dfc18e6af0b84928aa2d88c00)
+
+ Conflicts:
+ src/osdc/Objecter.cc: the last if (found) was incorrectly
+ implemented as if (to_cancel.size()) after hammer. The
+ conflict is because the patch tries to revert an incorrect
+ if (to_cancel.size()) which is not in hammer.
+
+commit 53316f3694c2a219541dcbdb0269ce97e2d2e9d7
+Author: Jianpeng Ma <jianpeng.ma@intel.com>
+Date: Wed Aug 19 14:54:21 2015 +0800
+
+ Objecter: Take RLocker when call is_active.
+
+ Signed-off-by: Jianpeng Ma <jianpeng.ma@intel.com>
+ (cherry picked from commit 89f0112e001a2561f9a5cd705898d43c8909501f)
+
+commit 684928883f5eaaec99a8cc8c43e81fae69f9fbfa
+Author: Kefu Chai <kchai@redhat.com>
+Date: Wed Sep 16 15:08:17 2015 +0800
+
+ mon/PGMap: calc min_last_epoch_clean when decode
+
+ Fixes: #13112
+ Signed-off-by: Kefu Chai <kchai@redhat.com>
+ (cherry picked from commit d0ac68bf1785b330f3202d924c2203ace9393fe6)
+
+commit 7d4b303b2d9649e2722a9b8f0be5c505776124df
+Author: Guang Yang <yguang@yahoo-inc.com>
+Date: Wed Sep 23 15:58:02 2015 +0000
+
+ osd: print min_last_epoch_clean along with pg dump
+
+ Fixes: 13198
+ Signed-off-by: Guang Yang <yguang@yahoo-inc.com>
+ (cherry picked from commit f5359f2314ce3e76ed446c01889dd23550c3ac36)
+
+commit d8ca88dd4b47b4956211d206b0d42112e5842d3f
+Author: Samuel Just <sjust@redhat.com>
+Date: Tue Sep 22 11:44:18 2015 -0700
+
+ OSDService::agent_entry: don't use PG::operator<< without pg lock
+
+ Fixes: #13199
+ Signed-off-by: Samuel Just <sjust@redhat.com>
+ (cherry picked from commit d422f2820d5beee15117e166546a6386120e0349)
+
+ Conflicts:
+ src/osd/OSD.cc: trivial resolution
+
+commit 397042a0cb2f4c628dd722192fee284359d2cbb3
+Author: Xinze Chi <xinze@xksy.com>
+Date: Wed Sep 23 19:26:00 2015 +0800
+
+ filestore: fix peek_queue for OpSequencer
+
+ Fixes: #13209
+ Signed-off-by: Xinze Chi <xinze@xsky.com>
+ (cherry picked from commit 5f7b3f5cde779f1300a35a04df2cdb1299f55472)
+
+commit d4e4d85c005ff68cb0461e9d7f0cbe5e6cf2f073
+Author: Sage Weil <sage@redhat.com>
+Date: Wed Sep 23 10:58:01 2015 -0400
+
+ mon/Elector: do a trivial write on every election cycle
+
+ Currently we already do a small write when the *first* election in
+ a round happens (to update the election epoch). If the backend
+ happens to fail while we are already in the midst of elections,
+ however, we may continue to call elections without verifying we
+ are still writeable.
+
+ Signed-off-by: Sage Weil <sage@redhat.com>
+ (cherry picked from commit ef909ccbdc303cce8a39edef255325127832ff16)
+
+commit 20a4c0c4831a9dcd49d8ad34b99369effbda9ab8
+Author: Sage Weil <sage@redhat.com>
+Date: Wed Sep 23 10:58:13 2015 -0400
+
+ mon/MonitorDBStore: assert/crash if there is a write error
+
+ Do this globally intead of relying on teh zillion mon callers to
+ check the error code. There are no cases where we want to
+ tolerate a commit failure.
+
+ Fixes: #13089
+ Signed-off-by: Sage Weil <sage@redhat.com>
+ (cherry picked from commit 2fb7b1f0e33ada7c9a1be3de2f7708eb0760fcef)
+
+commit 3c1f7cbc45c4744eea3c821f0343596756e05ab1
+Author: Samuel Just <sjust@redhat.com>
+Date: Thu Sep 24 18:35:39 2015 -0700
+
+ OSDMap: fill in known encode_features where possible
+
+ Otherwise, if we get an incremental from hammer (struct_v = 6) we will
+ encode the full map as if it were before CEPH_FEATURE_PGID64, which
+ was actually pre-argonaut. Similarly, if struct_v >= 7, we know it
+ was encoded with CEPH_FEATURE_OSDMAP_ENC.
+
+ Fixes: #13234
+ Backport: hammer
+ Signed-off-by: Samuel Just <sjust@redhat.com>
+ (cherry picked from commit 04679c5451e353c966f6ed00b33fa97be8072a79)
+
+commit 93c523c65c1f0b6f9a76b1d71acf9e8df57c0fc9
+Author: Jason Dillaman <dillaman@redhat.com>
+Date: Tue Sep 8 15:47:37 2015 -0400
+
+ librbd: diff_iterate needs to handle holes in parent images
+
+ If a clone's parent image snapshot includes a discarded extent,
+ this was previously causing an assert failure. Instead, ignore
+ any discard holes in the parent image.
+
+ Fixes: #12885
+ Backport: hammer
+ Signed-off-by: Jason Dillaman <dillaman@redhat.com>
+ (cherry picked from commit 3ccc3bb4bd35e57209852d460633e371b4d004e2)
+
+ Conflicts:
+ src/librbd/DiffIterate.cc : file doesn't exist in hammer, logic is in internal.cc
+
+commit 359b68447393980bb7cdd4acc23582e8046b186c
+Author: Jason Dillaman <dillaman@redhat.com>
+Date: Mon Sep 28 10:25:07 2015 -0400
+
+ tests: new test case for librbd diff_iterate over discard extents
+
+ Signed-off-by: Jason Dillaman <dillaman@redhat.com>
+ (cherry picked from commit d5650c9cf85188efa73b279c8f4e4723fa475308)
+
+ Conflicts:
+ src/test/librbd/test_librbd.cc : diff_iterate2 doesn't exist in hammer
+
+commit 71a42f7c3aa55de688ef16ea7e392573fa5a7e62
+Author: Xinze Chi <xmdxcxz@gmail.com>
+Date: Mon Jun 8 16:54:08 2015 +0800
+
+ bug fix: osd: avoid multi set osd_op.outdata in tier pool
+
+ There are two read op on the same object for ec pool. First op read
+ miss happend, calling do_proxy_read and promote_object, The second op only
+ do_proxy_read. but before first op process_copy_chunk finish, the second op
+ finish_proxy_read. first op receive reply from base pool
+ first and then second received. so the second op set the field "outdata"
+ in m->ops first. And then first op requeue_ops in process_copy_chunk,
+ At last in do_osd_ops, it append outdata field.
+
+ Fixes: 12540
+ Signed-off-by: Xinze Chi <xmdxcxz@gmail.com>
+ (cherry picked from commit 855ae1fd6e4557adba1cbd8ab532488b867cee2a)
+
+ Conflicts:
+ src/osd/ReplicatedPG.cc
+
+commit e8cce089102abd8ec1b8e916c6f2c4a5b339cbd3
+Author: Xinze Chi <xmdxcxz@gmail.com>
+Date: Wed Jul 29 16:28:33 2015 +0800
+
+ bug fix: osd: requeue_scrub when kick_object_context_blocked
+
+ when read miss in writeback cache pool, osd do_proxy_read first
+ and maybe promote it. but in this case, the op is not added to
+ waiting_for_blocked_object. pg scrub maybe block by this object
+ (_range_available_for_scrub). so after promote it, we should
+ requeue_scrub.
+
+ Fixes: 12515
+ Signed-off-by: Xinze Chi <xmdxcxz@gmail.com>
+ (cherry picked from commit f77949fedce3449befd74efeb5270579f5085b16)
+
+ Conflicts:
+ src/osd/ReplicatedPG.cc
+ in ReplicatedPG::kick_object_context_blocked, removed hobject_t::BitwiseComparator from map p
+
+commit 8ee93d5f661b303cafcb0134a0e9a1fce7b8e6b2
+Author: Samuel Just <sjust@redhat.com>
+Date: Thu Aug 27 11:08:33 2015 -0700
+
+ PG::handle_advance_map: on_pool_change after handling the map change
+
+ Otherwise, the is_active() checks in the hitset code can erroneously
+ return true firing off repops stamped with the new epoch which then get
+ cleared in the map change code. The filestore callbacks then pass the
+ interval check and call into a destroyed repop structure.
+
+ Fixes: 12809
+ Backport: hammer,firefly
+ Signed-off-by: Samuel Just <sjust@redhat.com>
+ (cherry picked from commit 14e02bc90a463805f4c3e2de210892067a52514b)
+
+commit cecd68d06d4d114b0b735155da5c2bac736714c3
+Author: Kefu Chai <kchai@redhat.com>
+Date: Fri Aug 28 11:36:49 2015 +0800
+
+ ceph_test_rados_api_aio: add a test for aio_sparse_read
+
+ Signed-off-by: Kefu Chai <kchai@redhat.com>
+ (cherry picked from commit 076bad955d374cbb37b77e2b0429f3c85f32abc0)
+
+commit 8849f9933fe0fc315da0981f9cd88ea108f686ed
+Author: Kefu Chai <kchai@redhat.com>
+Date: Thu Aug 27 22:57:16 2015 +0800
+
+ ceph_test_rados_api_io: add tests for sparse_read
+
+ Signed-off-by: Kefu Chai <kchai@redhat.com>
+ (cherry picked from commit 4d4920610ebfcb516630ed15678979c9e9292f5a)
+
+ Conflicts:
+ src/test/librados/test.cc
+ minor changes and remove C++11 stuff
+
+commit 64b22dcba316bf9ac5598c249e4fba47c157f588
+Author: Kefu Chai <kchai@redhat.com>
+Date: Wed Aug 26 15:41:13 2015 +0800
+
+ ceph_test_rados: also send sparse_read in ReadOp
+
+ Signed-off-by: Kefu Chai <kchai@redhat.com>
+ (cherry picked from commit 5ae2e7a185b5f95753a09a89d7110fc38848a083)
+
+ Conflicts:
+ src/test/osd/RadosModel.h
+ remove the piped-read test
+
+commit 6ca593026f81580ecbd02ad6140347f31086a87d
+Author: Kefu Chai <kchai@redhat.com>
+Date: Fri Aug 28 14:27:53 2015 +0800
+
+ osd: should use ec_pool() when checking for an ecpool
+
+ we were using pool.info.require_rollback() in do_osd_ops() when
+ handling OP_SPARSE_READ to tell if a pool is an ecpool. should
+ use pool.info.ec_pool() instead.
+
+ Signed-off-by: Kefu Chai <kchai@redhat.com>
+ (cherry picked from commit a5bfde69a9d14de67da1e3354173ec70ba089b37)
+
+commit 318049911445a3cc257db2b3beb3ab53e6f1d64e
+Author: Kefu Chai <kchai@redhat.com>
+Date: Thu Aug 27 22:57:49 2015 +0800
+
+ osd: translate sparse_read to read for ecpool
+
+ Fixes: #12012
+ Signed-off-by: Kefu Chai <kchai@redhat.com>
+ (cherry picked from commit 700d42ef1c82f5602249b96690ae881c1d259d54)
+
+commit d8ac5103e433f6649e28392b365d2e02b4ba1ffe
+Author: Jason Dillaman <dillaman@redhat.com>
+Date: Mon Aug 10 19:10:19 2015 -0400
+
+ WorkQueue: add/remove_work_queue methods now thread safe
+
+ These methods were not acquiring the ThreadPool lock when
+ manipulating the work_queue collection. This was causing
+ occasional crashes within librbd when opening and closing
+ images.
+
+ Fixes: #12662
+ Backport: hammer, firefly
+ Signed-off-by: Jason Dillaman <dillaman@redhat.com>
+ (cherry picked from commit 3e18449b01c1ab78d1bbfc1cf111aa9bdbef7b1f)
+
+commit e8d6d5a5f43b75f6aaec4c977221ad97d11e314c (refs/remotes/gh/wip-11786.hammer)
+Author: Joao Eduardo Luis <joao@suse.de>
+Date: Mon Sep 7 14:12:19 2015 +0100
+
+ mon: MonitorDBStore: make get_next_key() work properly
+
+ We introduced a significant bug with 2cc7aee, when we fixed issue #11786.
+ Although that patch would fix the problem described in #11786, we
+ managed to not increment the iterator upon returning the current key.
+ This would have the iterator iterating over the same key, forever and
+ ever.
+
+ Signed-off-by: Joao Eduardo Luis <joao@suse.de>
+ (cherry picked from commit 70d31082fd3dc8c7857994104577f1a3631c678c)
+
+commit dba8b5b113f585586fcbbc0acf05543262486328
+Author: Piotr Dałek <piotr.dalek@ts.fujitsu.com>
+Date: Tue May 19 13:44:21 2015 +0200
+
+ tools: Don't delete, recreate and re-fill buffers in rados bench.
+
+ Fixes the high CPU usage and corrects rados bench scores on fast SSDs
+ and ramdisks/memstore.
+ For bench run on SSD, on Intel(R) Xeon(R) CPU E5-2640 v2 @ 2.00GHz
+ before this patch, times are:
+ write: real 5m0.169s, user 2m33.565s, sys 4m39.791s
+ seq: real 4m28.642s, user 1m35.250s, sys 6m42.948s
+ rand: real 5m0.258s, user 1m19.656s, sys 6m47.145s
+
+ After this patch:
+ write: real 5m1.162s, user 0m27.788s, sys 3m11.707s
+ seq: real 5m1.149s, user 2m23.278s, sys 4m14.427s
+ rand: real 5m1.021s, user 2m30.514s, sys 4m20.347s
+
+ Bench run: rados -p ssd bench 300 write|seq|read --no-cleanup
+
+ Note the increase in user time cpu on seq/read tests,
+ along with decreased sys cpu time; this is because there's
+ additional memcmp() that compares read objects with expected
+ contents. With less time spent memory juggling, more time is
+ spent performing more reads per second, increasing memcmp call
+ count and increasing amount of user cpu time used.
+
+ Signed-off-by: Piotr Dałek <piotr.dalek@ts.fujitsu.com>
+ (cherry picked from commit b894fc7acf7dee7f7ec8c5c280e7a6be41133328)
+
+ Conflicts:
+ src/common/obj_bencher.cc
+ return -5 was replaced with return r
+
+commit fa72ecb509fa4ddd5f227b1e279eae390284a72c
+Author: Piotr Dałek <piotr.dalek@ts.fujitsu.com>
+Date: Fri May 15 15:44:18 2015 +0200
+
+ bufferlist: implement bufferlist::invalidate_crc()
+
+ This function iterates over all bufferlist internal buffers and calls
+ their invalidate_crc() method. Required for rados bench to work
+ correctly, because it modifies buffers outside buffer api, invalidating
+ internal CRC cache in the process - this method clears that cache, so
+ another call for buffer::get_crc() to return correct checksum.
+
+ Signed-off-by: Piotr Dałek <piotr.dalek@ts.fujitsu.com>
+ (cherry picked from commit 55a6f9efbee041d041742810ca4fa8874b6191a7)
+
+commit 50c82f2095add5ad75200a62081fd2f5fea8d8d9
+Author: Owen Synge <osynge@suse.com>
+Date: Mon Jun 1 15:57:03 2015 +0200
+
+ ceph.spec.in summary-ended-with-dot
+
+ RPM spec files summary should not end with a dot.
+ This was inconsistent across the ceph rpm packages
+ and creates errors with rpm lint.
+
+ Signed-off-by: Owen Synge <osynge@suse.com>
+ (cherry picked from commit 042e8ff4dc71795d957bbfac12fade2bc0fc4674)
+
+commit 94699e724b45a9a6de84a943c5b834d2f20f85ef
+Author: Owen Synge <osynge@suse.com>
+Date: Mon Jun 1 14:58:31 2015 +0200
+
+ ceph.spec.in libcephfs_jni1 has no %post and %postun
+
+ /usr/lib64/libcephfs_jni.so.1.0.0 requires /sbin/ldconfig to be
+ run after installing and after removing.
+
+ Signed-off-by: Owen Synge <osynge@suse.com>
+ (cherry picked from commit 0742d82b5561634a5f4ed73fc6cbe4d4f26b0d42)
+
+commit 7475a8fe3f31a46a949f051ded383cd6f396a0fa
+Author: Sage Weil <sage@redhat.com>
+Date: Tue Apr 21 16:08:09 2015 -0700
+
+ logrotate.conf: prefer service over invoke-rc.d
+
+ On trusty 14.04, service works but invoke-rc.d does not (but is present).
+
+ Fixes: #11330
+ Reported-by: Wim Heirman <wim@heirman.net>
+ Signed-off-by: Sage Weil <sage@redhat.com>
+ (cherry picked from commit 6063a21f9edbbf80e44d45ff52a9f4ba1a1cb2c9)
+
+commit 86f88dfce3c0e785d0ff48ec8892e53e6a53b080
+Author: John Spray <john.spray@redhat.com>
+Date: Thu Jul 23 10:15:56 2015 +0100
+
+ mon: fix checks on mds add_data_pool
+
+ Use same _check_pool helper as during fs creation.
+
+ Fixes: #12426
+
+ Signed-off-by: John Spray <john.spray@redhat.com>
+ (cherry picked from commit 329741ec238d6af4b69bc838ba667be232741b3d)
+
+commit a65c39852775b17323fa4efee54bde12ce22a512
+Author: Kefu Chai <kchai@redhat.com>
+Date: Wed Jul 29 15:52:19 2015 +0800
+
+ common/syncfs: fall back to sync(2) if syncfs(2) not available
+
+ Fixes: #12512
+ Signed-off-by: Kefu Chai <kchai@redhat.com>
+ (cherry picked from commit 08210d6a85527b0759f6dc4411f742bc13a4939f)
+
+ Conflicts:
+ src/common/sync_filesystem.h
+ - subtle difference in #if/#else/#endif structure
+
+commit e6eaa914d685f2a8f1f8cf3b01112a1b720e1358
+Author: Joao Eduardo Luis <joao@suse.de>
+Date: Wed May 27 22:28:49 2015 +0100
+
+ mon: MonitorDBStore: get_next_key() only if prefix matches
+
+ get_next_key() had a bug in which we would always return the first key
+ from the iterator, regardless of whether its prefix had been specified
+ to the iterator.
+
+ Fixes: #11786
+
+ Signed-off-by: Joao Eduardo Luis <joao@suse.de>
+ (cherry picked from commit 2cc7aee1abe40453093306c8fef2312b650dff5d)
--- /dev/null
+commit d56bdf93ced6b80b07397d57e3fa68fe68304432 (tag: refs/tags/v0.94.7)
+Author: Jenkins Build Slave User <jenkins-build@trusty-small--296081f3-e7b1-46b1-96c2-d6b655cf71d3.localdomain>
+Date: Tue May 10 14:47:39 2016 +0000
+
+ 0.94.7
+
+commit 6e6c85a0d71df7cd6207febc3e22d30617648abc
+Merge: 934ad41 76c33de
+Author: Sage Weil <sage@redhat.com>
+Date: Mon May 9 13:55:24 2016 -0400
+
+ Merge pull request #8979 from athanatos/wip-15655-hammer
+
+ OSDMonitor: avoid underflow in reweight-by-utilization if max_change=1
+
+ Reviewed-by: Sage Weil <sage@redhat.com>
+
+commit 934ad41dbf3f7004c93aa8f7660353329b7f3fad
+Merge: e219e85 3c03eee
+Author: Orit Wasserman <owasserm@redhat.com>
+Date: Wed May 4 11:37:33 2016 +0200
+
+ Merge pull request #8583 from Vicente-Cheng/wip-15089-hammer
+
+ hammer: Bucket owner isn't changed after unlink/link
+ Reviewed-by: Orit Wasserman <owasserm@redhat.com>
+
+commit 76c33decdeba83d4d977a9556e76e68fa964465f (refs/remotes/athanatos/wip-15655-hammer)
+Author: Samuel Just <sjust@redhat.com>
+Date: Thu Apr 28 13:47:48 2016 -0700
+
+ OSDMonitor: avoid underflow in reweight-by-utilization if max_change=1
+
+ Fixes: http://tracker.ceph.com/issues/15655
+ Signed-off-by: Samuel Just <sjust@redhat.com>
+ (cherry picked from commit c121bc51a5a877a49094cfbd3bd16af1f3ae5090)
+
+commit 3c03eee07e02b6b4d31f6a58a03253eff2d41324
+Author: Aran85 <zhangzengran@h3c.com>
+Date: Mon Sep 28 08:23:22 2015 +0800
+
+ rgw:bucket link now set the bucket.instance acl
+
+ Fixes: #11076
+
+ Signed-off-by: Zengran Zhang <zhangzengran@h3c.com>
+ (cherry picked from commit 4d59b1d36f8924290c3ecb5b7608747191470188)
+
+ Conflicts:
+
+ src/rgw/rgw_bucket.cc
+ 1. Do not use the rgw_user structure and remove the tenant parameter that describes as below
+ 2. user_id is not used so just remove the line
+ 3. instead of system_obj_set_attr you can use the method set_attr
+
+ Backport Change:
+ We do not use the rgw_user structure and remove the `tenant` parameter
+ because this feature is not introduced on hammer version.
+ The rgw multi-tenant feature is introduced on pr#6784 (https://github.com/ceph/ceph/pull/6784)
+ This feature is supported from v10.0.2 and later version.
+
+commit e219e85be00088eecde7b1f29d7699493a79bc4d
+Merge: eea2a77 f794ada
+Author: Sage Weil <sage@redhat.com>
+Date: Wed Apr 6 10:43:16 2016 -0400
+
+ Merge pull request #7922 from badone/wip-14961-hammer
+
+ hammer: PK11_DestroyContext() is called twice if PK11_DigestFinal() fails
+
+commit eea2a77ef0b242c295f2480349d8608273dfb184
+Merge: 815760d 38b9c0b
+Author: Sage Weil <sage@redhat.com>
+Date: Wed Apr 6 10:42:44 2016 -0400
+
+ Merge pull request #7992 from SUSE/wip-13807-hammer
+
+ hammer: segfault in Objecter::handle_watch_notify
+
+commit 815760dde45574f931e316f47c5990129375e9f2
+Merge: ba5c75a 01672b4
+Author: Sage Weil <sage@redhat.com>
+Date: Wed Apr 6 10:41:41 2016 -0400
+
+ Merge pull request #8051 from xiaoxichen/wip-15024-hammer
+
+ hammer: clock skew report is incorrect by ceph health detail command
+
+commit ba5c75a33ba10bbe7796715f2d8500ec1fe209fd
+Merge: dc09055 ac3569c
+Author: Sage Weil <sage@redhat.com>
+Date: Wed Apr 6 10:40:51 2016 -0400
+
+ Merge pull request #8398 from asheplyakov/hammer-wip-15336
+
+ hammer: monclient: avoid key renew storm on clock skew
+
+commit dc090558a3306feb2c50994950756e5599a92eaf
+Merge: 0f28a5b 744e9f8
+Author: Loic Dachary <loic@dachary.org>
+Date: Wed Apr 6 16:24:55 2016 +0200
+
+ Merge pull request #8272 from Yan-waller/yj-wip-fixbl
+
+ hammer: tests: bufferlist: do not expect !is_page_aligned() after unaligned rebuild
+
+ Reviewed-by: Kefu Chai <kchai@redhat.com>
+
+commit 0f28a5b033b47479ae6f1958d2f079bd6c57f1b4
+Merge: 374c3c1 f8d2abd
+Author: Loic Dachary <loic@dachary.org>
+Date: Wed Apr 6 16:20:15 2016 +0200
+
+ Merge pull request #7883 from tchaikov/wip-12848-hammer
+
+ hammer: osd: use GMT time for the object name of hitsets
+
+ Reviewed-by: Loic Dachary <ldachary@redhat.com>
+
+commit 374c3c1d8cde50a4503cbd41ee2204aa6761557d
+Merge: add1674 0830275
+Author: Loic Dachary <loic@dachary.org>
+Date: Wed Apr 6 16:18:11 2016 +0200
+
+ Merge pull request #7917 from ceph/wip-10794-hammer
+
+ hammer: ceph-objectstore-tool, osd: Fix import handling
+
+ Reviewed-by: Loic Dachary <ldachary@redhat.com>
+
+commit add1674c759f946c7c456e96e52b7ca1a45829ec
+Merge: d08bae2 be4a9fe
+Author: Loic Dachary <loic@dachary.org>
+Date: Wed Apr 6 16:13:32 2016 +0200
+
+ Merge pull request #8026 from liewegas/wip-reweight-hammer
+
+ hammer: mon: implement reweight-by-utilization feature
+
+ Reviewed-by: Loic Dachary <ldachary@redhat.com>
+
+commit d08bae217e50dfa19dce3bb58349149c4210361e
+Merge: f68697c d4cf190
+Author: Loic Dachary <loic@dachary.org>
+Date: Wed Apr 6 16:12:55 2016 +0200
+
+ Merge pull request #8049 from xiaoxichen/wip-15022-hammer
+
+ hammer: keyring permisions for mon deamon
+
+ Reviewed-by: Loic Dachary <ldachary@redhat.com>
+
+commit f68697c71ad4b6f49dae12a50fad73cacbcaf6e1
+Merge: e5beeef 57fd7f8
+Author: Loic Dachary <loic@dachary.org>
+Date: Wed Apr 6 16:09:42 2016 +0200
+
+ Merge pull request #8052 from xiaoxichen/wip-15051-hammer
+
+ hammer: test/librados/tier.cc doesn't completely clean up EC pools
+
+ Reviewed-by: Loic Dachary <ldachary@redhat.com>
+
+commit e5beeef1b142a86140791470785c69f865e5df5a
+Merge: 77fbf58 77a4ed0
+Author: Loic Dachary <loic@dachary.org>
+Date: Wed Apr 6 16:03:07 2016 +0200
+
+ Merge pull request #8440 from dachary/wip-15382-hammer
+
+ hammer: rpm package building fails if the build machine has lttng and babeltrace development packages installed locally
+
+ Reviewed-by: Kefu Chai <kchai@redhat.com>
+
+commit 77fbf581cb2259146938a737c299d6cf762303d1
+Merge: 92a96e1 97f474f
+Author: Loic Dachary <loic@dachary.org>
+Date: Wed Apr 6 15:05:11 2016 +0200
+
+ Merge pull request #8401 from Vicente-Cheng/wip-15129-hammer
+
+ hammer: Protect against excessively large object map sizes
+
+ Reviewed-by: Jason Dillaman <dillaman@redhat.com>
+
+commit 92a96e1b16d9cadf182d200dfef0de6c2b388202
+Merge: 7cfc739 281d63d
+Author: Loic Dachary <loic@dachary.org>
+Date: Wed Apr 6 13:44:09 2016 +0200
+
+ Merge pull request #8011 from dillaman/wip-15033-hammer
+
+ hammer: librbd: possible QEMU deadlock after creating image snapshots
+
+ Reviewed-by: Loic Dachary <ldachary@redhat.com>
+
+commit 77a4ed0a8986b2529edd8059dd3efa38f778c6f2
+Author: Loic Dachary <ldachary@redhat.com>
+Date: Tue Apr 5 11:53:54 2016 +0200
+
+ ceph.spec.in: disable lttng and babeltrace explicitly
+
+ before this change, we do not pacakge tracepoint probe shared libraries
+ on rhel7. but "configure" script enables them if lttng is detected. and
+ rpm complains at seeing installed but not pacakged files. as EPEL-7 now
+ includes lttng-ust-devel and libbabeltrace-devel, we'd better
+ BuildRequire them, and build with them unless disabled otherwise. so in
+ this change
+ * make "lttng" an rpm build option enabled by default
+ * BuildRequire lttng-ust-devel and libbabeltrace-devel if the "lttng"
+ "lttng" option is enabled
+ * --without-lttng --without-babeltrace if the "lttng" option is disabled
+
+ Fixes: #14844
+ Signed-off-by: Kefu Chai <kchai@redhat.com>
+ (cherry picked from commit f1a44907a2f83cb8080cd8ab5980a30306a33fbd)
+
+ Conflicts:
+ ceph.spec.in: trivial resolution, the context changed
+ (other packages, files etc.) but the semantic did not
+
+commit 97f474fb6b26ae7b7e2fdd21de4f4bd98cdd56ab
+Author: Jason Dillaman <dillaman@redhat.com>
+Date: Mon Mar 14 13:57:28 2016 -0400
+
+ cls_rbd: protect against excessively large object maps
+
+ Fixes: #15121
+
+ Signed-off-by: Jason Dillaman <dillaman@redhat.com>
+ (cherry picked from commit 4aff4ea3290dc7fb62c639bfc74fcfdde5fe9542)
+
+ Conflicts:
+ src/cls/rbd/cls_rbd.cc
+ `RBD_METADATA_KEY_PREFIX` is not introduced on hammer, so remove
+ it
+
+commit ac3569cd8bbb4b2b9a0edf298ce0b83bc18f1fea
+Author: Alexey Sheplyakov <asheplyakov@mirantis.com>
+Date: Mon Mar 21 18:20:18 2016 +0300
+
+ hammer: monclient: avoid key renew storm on clock skew
+
+ Refreshing rotating keys too often is a symptom of a clock skew, try to
+ detect it and don't cause extra problems:
+
+ * MonClient::_check_auth_rotating:
+ - detect and report premature keys expiration due to a time skew
+ - rate limit refreshing the keys to avoid excessive RAM and CPU usage
+ (both by OSD in question and monitors which have to process a lot
+ of auth messages)
+ * MonClient::wait_auth_rotating: wait for valid (not expired) keys
+ * OSD::init(): bail out after 10 attempts to obtain the rotating keys
+
+ Fixes: #15336
+
+ Signed-off-by: Alexey Sheplyakov <asheplyakov@mirantis.com>
+ (cherry picked from commit 918c12c2ab5d014d0623b1accf959b041aac5128)
+
+ Conflicts:
+ src/osd/OSD.cc
+ no loadavg checks in Hammer, hence the conflict. Move the
+ counter and max_attempts initialization to a suitable place.
+
+commit 7cfc739a513da84d76b959efc51dd21c1cc552d6
+Merge: 0418943 7eae05e
+Author: Loic Dachary <loic@dachary.org>
+Date: Thu Mar 31 13:50:23 2016 +0200
+
+ Merge pull request #8187 from liewegas/wip-15171
+
+ hammer: osd/ReplicatedPG: do not proxy read *and* process op locally
+
+ Reviewed-by: Samuel Just <sjust@redhat.com>
+ Reviewed-by: David Zafman <dzafman@redhat.com>
+ Reviewed-by: David Disseldorp <ddiss@suse.de>
+
+commit f8d2abd2e41c5dd04977f85cc1d6e65853c9a1b2
+Author: Kefu Chai <kchai@redhat.com>
+Date: Thu Mar 3 12:03:44 2016 +0800
+
+ osd/osd_types: encode pg_pool_t the old way
+
+ as a workaround of #12410
+
+ Fixes: #12968
+ Signed-off-by: Kefu Chai <kchai@redhat.com>
+
+commit 720a090eb67b3955b0cadb7633c5a28a934171a4
+Author: Kefu Chai <kchai@redhat.com>
+Date: Tue Sep 8 16:52:32 2015 +0800
+
+ mon: disable gmt_hitset if not supported
+
+ the gmt_hitset is enabled by default in the ctor of pg_pool_t, this
+ is intentional. because we want to remove this setting and make
+ gmt_hitset=true as a default in future. but this forces us to
+ disable it explicitly when preparing a new pool if any OSD does
+ not support gmt hitset.
+
+ Fixes: #12968
+ Signed-off-by: Kefu Chai <kchai@redhat.com>
+ (cherry picked from commit e48cec3dc93b3988dcd8924933deb1b3a43e1d0f)
+
+ Conflicts:
+ src/mon/OSDMonitor.cc
+ remove unrelated hunk
+
+commit 7aec079f8a1bbe75625c438a17bb87e45398568e
+Author: Kefu Chai <kchai@redhat.com>
+Date: Fri Aug 28 00:32:38 2015 +0800
+
+ osd: do not let OSD_HITSET_GMT reuse the feature bit
+
+ * to ease the backport to hammer
+
+ Signed-off-by: Kefu Chai <kchai@redhat.com>
+ (cherry picked from commit 5a4f6a866bb675195ad83c38fd23238d078c78ed)
+
+ Conflicts:
+ src/include/ceph_features.h
+ minor changes to resolve conflicts
+
+commit 370434136ef076c350db3db4fca6489f88f70453
+Author: David Zafman <dzafman@redhat.com>
+Date: Thu Aug 27 11:24:25 2015 -0700
+
+ osd: Decode use_gmt_hitset with a unique version
+
+ Signed-off-by: David Zafman <dzafman@redhat.com>
+ (cherry picked from commit 2bc5a48f4c5d3667213be3a7b5a0e0f5ef9daf4f)
+
+ Conflicts:
+ src/osd/osd_types.cc
+ minor changes to resolve conflicts
+
+commit 64bca2a43b34b265621bad2ec1fb980217223847
+Author: Kefu Chai <kchai@redhat.com>
+Date: Tue Aug 18 16:53:50 2015 +0800
+
+ mon: print use_gmt_hitset in "ceph osd pool get"
+
+ Signed-off-by: Kefu Chai <kchai@redhat.com>
+ (cherry picked from commit cc2bcf760f2d2f20fc4a2fa78ba52475a23e55bf)
+
+ Conflicts:
+ src/mon/OSDMonitor.cc
+ use the old way to dump pool info
+
+commit 87df212cfca33efbbee6376f528cb7d4895d1dc0
+Author: Kefu Chai <kchai@redhat.com>
+Date: Tue Aug 18 00:04:23 2015 +0800
+
+ mon: add "ceph osd pool set $pool use_gmt_hitset true" cmd
+
+ allow "ceph osd pool set $pool use_gmt_hitset <true|1>" as long as
+ the cluster supports gmt hitset.
+
+ Fixes: #9732
+ Signed-off-by: Kefu Chai <kchai@redhat.com>
+ (cherry picked from commit 03a1a3cf023a9aeb2fa26820e49e5efe3f3b3789)
+
+commit 039240418060c9a49298dacc0478772334526dce
+Author: Kefu Chai <kchai@redhat.com>
+Date: Fri Jun 5 21:06:48 2015 +0800
+
+ osd: use GMT time for the object name of hitsets
+
+ * bump the encoding version of pg_hit_set_info_t to 2, so we can
+ tell if the corresponding hit_set is named using localtime or
+ GMT
+ * bump the encoding version of pg_pool_t to 20, so we can know
+ if a pool is using GMT to name the hit_set archive or not. and
+ we can tell if current cluster allows OSDs not support GMT
+ mode or not.
+ * add an option named `osd_pool_use_gmt_hitset`. if enabled,
+ the cluster will try to use GMT mode when creating a new pool
+ if all the the up OSDs support GMT mode. if any of the
+ pools in the cluster is using GMT mode, then only OSDs
+ supporting GMT mode are allowed to join the cluster.
+
+ Fixes: #9732
+ Signed-off-by: Kefu Chai <kchai@redhat.com>
+ (cherry picked from commit 42f8c5daad16aa849a0b99871d50161673c0c370)
+
+ Conflicts:
+ src/include/ceph_features.h
+ src/osd/ReplicatedPG.cc
+ src/osd/osd_types.cc
+ src/osd/osd_types.h
+ fill pg_pool_t with default settings in master branch.
+
+commit 744e9f837a94f95c5e877f074fd1479f8da64e3c
+Author: Kefu Chai <kchai@redhat.com>
+Date: Fri Sep 4 01:23:31 2015 +0800
+
+ test/bufferlist: do not expect !is_page_aligned() after unaligned rebuild
+
+ if the size of a bufferlist is page aligned we allocate page aligned
+ memory chunk for it when rebuild() is called. otherwise we just call
+ the plain new() to allocate new memory chunk for holding the continuous
+ buffer. but we should not expect that `new` allocator always returns
+ unaligned memory chunks. instead, it *could* return page aligned
+ memory chunk as long as the allocator feels appropriate. so, the
+ `EXPECT_FALSE(bl.is_page_aligned())` after the `rebuild()` call is
+ removed.
+
+ Signed-off-by: Kefu Chai <kchai@redhat.com>
+ (cherry picked from commit 8ed724222651812c2ee8cc3804dc1f54c973897d)
+
+commit 0830275b39afc408573c2c468fa3b0e7b1d5cc4e
+Author: Sage Weil <sage@redhat.com>
+Date: Tue Oct 6 14:35:35 2015 -0400
+
+ osd/PG: fix generate_past_intervals
+
+ We may be only calculating older past intervals and have a valid
+ history.same_interval_since value, in which case the local
+ same_interval_since value will end at the newest old interval we had to
+ generate.
+
+ This was introduced by 70316541bbb115d9a35954bfba373cf1dc084b7e.
+
+ Signed-off-by: Sage Weil <sage@redhat.com>
+ (cherry picked from commit 98cbf0380e9ee848725fc87d61c31a734305a84f)
+
+commit 0418943c6ef8c9649a58003444daeb4b6224fbab
+Merge: 35eae5f 2072a53
+Author: Sage Weil <sage@redhat.com>
+Date: Fri Mar 18 10:13:40 2016 -0400
+
+ Merge pull request #8123 from liewegas/wip-15136-hammer
+
+ qa/workunits: remove 'mds setmap' from workunits
+
+commit 7eae05e14231cb3476d14bf74b15bf9646849d09 (refs/remotes/me/wip-15171)
+Author: Sage Weil <sage@redhat.com>
+Date: Thu Mar 17 13:28:40 2016 -0400
+
+ osd/ReplicatedPG: do not proxy read *and* process op locally
+
+ If we proxy the read, we cannot return false, even if we fail to also
+ trigger a promotion.
+
+ Fixes: #15171
+ Signed-off-by: Sage Weil <sage@redhat.com>
+
+commit be4a9feae4c5f33685cceb386717a5733553df10 (refs/remotes/me/wip-reweight-hammer)
+Author: Sage Weil <sage@redhat.com>
+Date: Mon Mar 14 08:07:19 2016 -0400
+
+ osd/OSDMap: fix typo in summarize_mapping_stats
+
+ From ea9abe53d0e777b7dc3b22af71639f77c4de08c8
+
+ Signed-off-by: Sage Weil <sage@redhat.com>
+ (cherry picked from commit cc7e2329046ef7c528f321092a464f6db6e7edb9)
+
+commit 2072a53dc920b79ed76265d6097e50d3d2994b1d
+Author: Sage Weil <sage@redhat.com>
+Date: Tue Mar 15 09:44:13 2016 -0400
+
+ qa/workunits: remove 'mds setmap' from workunits
+
+ Signed-off-by: Sage Weil <sage@redhat.com>
+ (cherry picked from commit 6a80e2df8b31802a39ef6f89136ed357dce50c20)
+
+commit 01672b4afd6f886d6bb8527427663e062ab9d100
+Author: Joao Eduardo Luis <joao@suse.de>
+Date: Thu Jan 7 11:20:36 2016 +0000
+
+ mon: Monitor: get rid of weighted clock skew reports
+
+ By weighting the reports we were making it really hard to get rid of a
+ clock skew warning once the cause had been fixed.
+
+ Instead, as soon as we get a clean bill of health, let's run a new round
+ and soon as possible and ascertain whether that was a transient fix or
+ for realsies. That should be better than the alternative of waiting for
+ an hour or something (for a large enough skew) for the warning to go
+ away - and with it, the admin's sanity ("WHAT AM I DOING WRONG???").
+
+ Fixes: #14175
+
+ Signed-off-by: Joao Eduardo Luis <joao@suse.de>
+
+ (cherry pick from commit 17d8ff429c7dca8fc1ada6e7cc8a7c4924a22e28)
+
+commit f90b8bc1a2b3ffa5ba52c0992c1c5ff52e5ea104
+Author: Joao Eduardo Luis <joao@suse.de>
+Date: Thu Jan 7 11:05:44 2016 +0000
+
+ mon: Monitor: adaptative clock skew detection interval
+
+ When in the presence of a clock skew, adjust the checking interval
+ according to how many rounds have gone by since the last clean check.
+
+ If a skew is detected, instead of waiting an additional 300 seconds we
+ will perform the check more frequently, gradually backing off the
+ frequency if the skew is still in place (up to a maximum of
+ 'mon_timecheck_interval', default: 300s). This will help with transient
+ skews.
+
+ Signed-off-by: Joao Eduardo Luis <joao@suse.de>
+
+ (cherry pick from commit 45e16d0d7407cf4e886dde9321bb91c1a087776d)
+
+ Conflicts:
+ src/common/config_opts.h
+ Merge the change line.
+ src/mon/Monitor.h
+ handle_timecheck_leader(MonOpRequestRef op) was replaced with handle_timecheck_leader(MTimeCheck *m)
+ also for handle_timecheck_peon and handle_timecheck.
+
+commit 57fd7f858c220af362b330d12db0e87de82b4346 (refs/remotes/gh/hammer-pr-8052)
+Author: Dan Mick <dan.mick@redhat.com>
+Date: Wed Nov 25 19:20:51 2015 -0800
+
+ test/librados/test.cc: clean up EC pools' crush rules too
+
+ SetUp was adding an erasure-coded pool, which automatically adds
+ a new crush rule named after the pool, but only removing the
+ pool. Remove the crush rule as well.
+
+ http://tracker.ceph.com/issues/13878 Fixes: #13878
+
+ Signed-off-by: Dan Mick <dan.mick@redhat.com>
+ Signed-off-by: Loic Dachary <loic@dachary.org>
+ (cherry picked from commit 04b4795f81c15bfcb62ba5807745470ce0e5e949)
+
+commit d4cf19049349678065195659bb287b899f92a686
+Author: Owen Synge <osynge@suse.com>
+Date: Wed Mar 2 12:15:48 2016 +0100
+
+ keyring permissions for mon daemon
+
+ The command:
+
+ sudo ceph-mon --cluster ceph --mkfs -i $NODE_NAME --keyring $PATH_MON_KEYRING
+
+ Writes a new keyring with permissions set to "0644".
+
+ Fixes: #14950
+ Signed-off-by: Owen Synge osynge@suse.com
+ (cherry picked from commit c2f91a8ce46974a72b960b7cb25af3d089fbb80d)
+
+commit 35eae5fbddd2b271a10db9a69d4c4e34029bca06
+Merge: c59b994 647723e
+Author: Loic Dachary <loic@dachary.org>
+Date: Fri Mar 11 10:05:42 2016 +0700
+
+ Merge pull request #7911 from dzafman/wip-meta-list-hammer
+
+ hammer: tools, test: Add ceph-objectstore-tool to operate on the meta collection
+
+ Reviewed-by: Loic Dachary <ldachary@redhat.com>
+
+commit c59b9944a61174c7e29a26f4abfd7839020578af
+Merge: dd66eb9 d875620
+Author: Loic Dachary <loic@dachary.org>
+Date: Fri Mar 11 10:03:43 2016 +0700
+
+ Merge pull request #7903 from branch-predictor/bp-hammer-force-bench-smoke
+
+ hammer: tools/rados: add bench smoke tests
+
+ Reviewed-by: Loic Dachary <ldachary@redhat.com>
+
+commit dd66eb91d0129163ecfc8105f043fd0f6926dad5
+Merge: de43aba 5726463
+Author: Loic Dachary <loic@dachary.org>
+Date: Fri Mar 11 10:02:18 2016 +0700
+
+ Merge pull request #7876 from SUSE/wip-14946-hammer
+
+ hammer: redhat-lsb-core dependency was dropped, but is still needed
+
+ Reviewed-by: Loic Dachary <ldachary@redhat.com>
+
+commit de43aba0015927cec5ebd8f98ad26a801b1353ff
+Merge: 48dfac6 6a6754f
+Author: Loic Dachary <loic@dachary.org>
+Date: Fri Mar 11 10:00:48 2016 +0700
+
+ Merge pull request #7817 from asheplyakov/hammer-bug-14873
+
+ hammer: tools: fix race condition in seq/rand bench (part 2)
+
+ Reviewed-by: Piotr Dałek <piotr.dalek@ts.fujitsu.com>
+ Reviewed-by: Loic Dachary <ldachary@redhat.com>
+
+commit 48dfac64ba37e5d0ec262798fbec011c1016a4f0
+Merge: 7083829 3a5b102
+Author: Loic Dachary <loic@dachary.org>
+Date: Fri Mar 11 10:00:18 2016 +0700
+
+ Merge pull request #7896 from asheplyakov/hammer-bug-14873-p1
+
+ hammer: tools: fix race condition in seq/rand bench (part 1)
+
+ Reviewed-by: Loic Dachary <ldachary@redhat.com>
+ Reviewed-by: Piotr Dałek <piotr.dalek@ts.fujitsu.com>
+
+commit 1b922e5431339d12e661de9fd4b16e8cf2c08ad5
+Author: Sage Weil <sage@redhat.com>
+Date: Thu Mar 10 08:50:57 2016 -0500
+
+ test/pybind/test_ceph_argparse: fix reweight-by-utilization tests
+
+ Signed-off-by: Sage Weil <sage@redhat.com>
+ (cherry picked from commit d0f87131962b26cef9e31fa11651771856c41164)
+
+commit 06a2a7596b876a5c2addb184a48222bcb6e23b9a
+Author: Kefu Chai <kchai@redhat.com>
+Date: Thu Mar 10 21:41:15 2016 +0800
+
+ man/8/ceph.rst: remove invalid option for reweight-by-*
+
+ --yes-i-really-mean-it is not valid option for reweight-by-*
+
+ Signed-off-by: Kefu Chai <kchai@redhat.com>
+ (cherry picked from commit 797f1d41d98738411079a7a16d8b1d5352359d33)
+
+commit 241f76262273bafd72e91fee3d46c412f7418767
+Author: Sage Weil <sage@redhat.com>
+Date: Wed Mar 9 13:25:55 2016 -0500
+
+ mon: remove range=100 from reweight-by-* commands
+
+ Specifying the range makes it skip instead of error when you give
+ it a bad value.
+
+ Signed-off-by: Sage Weil <sage@redhat.com>
+ (cherry picked from commit 661891aa28ca0600a62e25f6d10ce7fa94e32cce)
+
+commit 55ad2c7724e114728bb327a97726a6c9b660bb1d
+Author: Sage Weil <sage@redhat.com>
+Date: Thu Mar 3 13:46:12 2016 -0500
+
+ mon: make max_osds an optional arg
+
+ We keep the config option with the default (4), but let you
+ specify the max # of osds to reweight as a third optional arg.
+
+ Signed-off-by: Sage Weil <sage@redhat.com>
+ (cherry picked from commit 651f05b6e6bec41b54c0a8f8ca6641ce3aa5dff3)
+
+commit f13cdeaf6657577c21a5bb2985d46971aa084c3f
+Author: Sage Weil <sage@redhat.com>
+Date: Thu Mar 3 13:38:57 2016 -0500
+
+ mon: make reweight max_change default configurable
+
+ Signed-off-by: Sage Weil <sage@redhat.com>
+ (cherry picked from commit 8a9429d85bc99874dc9871b43b2d0c7ad1086803)
+
+commit f4b4ef76295d40753c6acffa3d92128f7ebe8733
+Author: Sage Weil <sage@redhat.com>
+Date: Thu Mar 3 13:38:19 2016 -0500
+
+ mon/OSDMonitor: fix indentation
+
+ Signed-off-by: Sage Weil <sage@redhat.com>
+ (cherry picked from commit 47b650c1497b8eaf37cfcb7e3b9fda12d8cf2d7a)
+
+commit 76eb3c8fbdb614a4cdde937a1dec680b4be82470
+Author: Sage Weil <sage@redhat.com>
+Date: Wed Mar 2 17:34:48 2016 -0500
+
+ qa/workunits/cephtool/test.sh: test reweight-by-x commands
+
+ Signed-off-by: Sage Weil <sage@redhat.com>
+ (cherry picked from commit 28b33a5b57e3f898808bd8ccc5e314667f84912a)
+
+commit 9a9d147aa14a637bbf8edddf85f6c36a29874694
+Author: Sage Weil <sage@redhat.com>
+Date: Thu Mar 10 08:28:59 2016 -0500
+
+ osd/MonCommand: add/fix up 'osd [test-]reweight-by-{pg,utilization}'
+
+ - show before/after pg placement stats
+ - add test- variants that don't do anything
+ - only allow --no-increasing on the -utilization versions (where
+ it won't conflict with the optional pool list and confuse the
+ arg parsing)
+
+ Signed-off-by: Sage Weil <sage@redhat.com>
+ (cherry picked from commit 1de7e47833f2d14c6915d7d071fe0005408c8da0)
+
+ - use non-C++11 sort
+
+ # Conflicts:
+ # src/mon/OSDMonitor.cc
+ # src/mon/OSDMonitor.h
+
+commit 6ec676df083ec3078f5efd8058d6fb6a491c9b04
+Author: Sage Weil <sage@redhat.com>
+Date: Wed Mar 2 14:00:15 2016 -0500
+
+ mon: add 'osd utilization' command
+
+ Signed-off-by: Sage Weil <sage@redhat.com>
+ (cherry picked from commit 5b757eff868dbce2393beadd9fe2522372288cc0)
+
+commit 94134d9148edfcc41d2d239db69d0b299fbf427f
+Author: Sage Weil <sage@redhat.com>
+Date: Thu Mar 10 08:30:45 2016 -0500
+
+ osd/OSDMap: add summarize_mapping_stats
+
+ Calculate some basic stats about the PG distribution.
+
+ Signed-off-by: Sage Weil <sage@redhat.com>
+ (cherry picked from commit ea9abe53d0e777b7dc3b22af71639f77c4de08c8)
+
+ - remove c++11 auto and range-based for loops
+
+commit 932f75d1f2105f296681b5fb02757087947e01f8
+Author: Sage Weil <sage@redhat.com>
+Date: Thu Mar 3 13:49:03 2016 -0500
+
+ mon: make reweight-by-* max_change an argument
+
+ Signed-off-by: Sage Weil <sage@redhat.com>
+ (cherry picked from commit a70eaabcfc1cc1dfb9b6ba2d7f71b3d76496eb55)
+
+commit d8372cea0c51db89cc48e5592236d53f7b01b6b3
+Author: Dan van der Ster <daniel.vanderster@cern.ch>
+Date: Fri Feb 26 22:29:46 2016 +0100
+
+ osd: add mon_reweight_max_osds to limit reweight-by-* commands
+
+ Add configurable mon_reweight_max_osds which limits the number
+ of OSDs modified each time reweight-by-* is called (by default
+ to 4 OSDs).
+
+ Also change the order in which we look at OSDs to go from most
+ to least utilized.
+
+ Signed-off-by: Dan van der Ster <daniel.vanderster@cern.ch>
+ (cherry picked from commit 3aa0ccefddc1790df5b808bfccd5da4857951220)
+
+commit 6a422b2626d48098c5a2c13de677814429263cba
+Author: Dan van der Ster <daniel.vanderster@cern.ch>
+Date: Fri Feb 26 22:28:46 2016 +0100
+
+ osd: add mon_reweight_max_change option which limits reweight-by-*
+
+ Add a configurable mon_reweight_max_change which limits be default
+ the reweight-by-* commands to only change an OSDs weight by 0.05.
+
+ Signed-off-by: Dan van der Ster <daniel.vanderster@cern.ch>
+ (cherry picked from commit 6f0a1fb69da84ee18bdb9b151772cef8f32413c5)
+
+commit d3635b796ae28e1bc6598daf4109bf371a1f4ed8
+Author: Dan van der Ster <daniel.vanderster@cern.ch>
+Date: Fri Feb 26 21:58:00 2016 +0100
+
+ test: add simple test for new reweight-by-* options
+
+ Test validity of --no-increasing and --yes-i-really-mean-it.
+
+ Signed-off-by: Dan van der Ster <daniel.vanderster@cern.ch>
+ (cherry picked from commit 1a6ad5053e7fc4f8942855a17ce4540e340e9d4f)
+
+commit e993851b7abf80fd793aa5b7188f1af7dbe03041
+Author: Dan van der Ster <daniel.vanderster@cern.ch>
+Date: Fri Feb 26 21:52:41 2016 +0100
+
+ osd: add sure and no-increasing options to reweight-by-*
+
+ Add a --no-increasing option to reweight-by-* which can be used to only decrease
+ OSD weights without increasing any. This is useful for example if you need to
+ urgently lower the weight of nearly full OSDs.
+
+ Also add a --yes-i-really-mean-it confirmation to reweight-by-*.
+
+ Signed-off-by: Dan van der Ster <daniel.vanderster@cern.ch>
+ (cherry picked from commit ddf5c2b62316bb69839f220fe2527d1467863421)
+
+commit 281d63df792c4cdf25cca5428969c65d2ae379e8
+Author: Jason Dillaman <dillaman@redhat.com>
+Date: Wed Mar 9 18:00:04 2016 -0500
+
+ librbd: complete cache reads on cache's dedicate thread
+
+ If a snapshot is created out-of-band, the next IO will result in the
+ cache being flushed. If pending writeback data performs a copy-on-write,
+ the read from the parent will be blocked.
+
+ Fixes: #15032
+
+ Signed-off-by: Jason Dillaman <dillaman@redhat.com>
+ (cherry picked from commit f9e5ae80e3b0799b5a7e1d3f93b2d85a4baff20f)
+
+commit 621e3aef85e4b720232ca9ee89a4620d58362047
+Author: Jason Dillaman <dillaman@redhat.com>
+Date: Wed Mar 9 17:31:06 2016 -0500
+
+ test: reproducer for writeback CoW deadlock
+
+ Refs: #14988
+
+ Signed-off-by: Jason Dillaman <dillaman@redhat.com>
+ (cherry picked from commit 16b6efdd24b25ba1f6bc658681afa3d0878eb397)
+ (cherry picked from commit 7ffbe4099c9367e7405e2196803a0d8b12253a06)
+
+commit 38b9c0b2fbbb056c29cd0485a9831edce020eaa6
+Author: Sage Weil <sage@redhat.com>
+Date: Mon Nov 16 11:32:34 2015 -0500
+
+ osdc/Objecter: call notify completion only once
+
+ If we race with a reconnect we could get a second notify message
+ before the notify linger op is torn down. Ensure we only ever
+ call the notify completion once to prevent a segfault.
+
+ Fixes: #13805
+ Signed-off-by: Sage Weil <sage@redhat.com>
+ (cherry picked from commit 987f68a8df292668ad241f4769d82792644454dd)
+
+commit 7083829c227403a77fcf35a2376dc02e4c9693c8 (refs/remotes/markhpc/hammer)
+Merge: 651e49e c4ba93a
+Author: Loic Dachary <loic@dachary.org>
+Date: Tue Mar 8 10:00:15 2016 +0700
+
+ Merge pull request #6604 from ukernel/hammer-13268
+
+ hammer: client: added permission check based on getgrouplist
+
+ Reviewed-by: Greg Farnum <gfarnum@redhat.com>
+
+commit 651e49ea2037834fbbf48e642a78075140e06782
+Merge: 522e3e8 b2393dc
+Author: Loic Dachary <loic@dachary.org>
+Date: Tue Mar 8 09:58:30 2016 +0700
+
+ Merge pull request #6551 from ceph/hammer-client-inoderef
+
+ hammer: client inoderef
+
+ Reviewed-by: Greg Farnum <gfarnum@redhat.com>
+
+commit f794adadd126bd77ae138794119725a046642712
+Author: Brad Hubbard <bhubbard@redhat.com>
+Date: Fri Mar 4 13:06:47 2016 +1000
+
+ tests: Add TEST_no_segfault_for_bad_keyring to test/mon/misc.sh
+
+ 94da46b6e31cac206cb32fc5bd3159209ee25e8c adds
+ TEST_no_segfault_for_bad_keyring which requires changes to run
+ in hammer since test/mon/misc.sh is not written to run multiple tests in
+ succession in the hammer version.
+
+ Refs: #14960
+
+ Signed-off-by: Brad Hubbard <bhubbard@redhat.com>
+
+commit 522e3e8d761a337796ed92868e00062b87e0f0a5
+Merge: d314849 e014ea8
+Author: Loic Dachary <loic@dachary.org>
+Date: Fri Mar 4 10:25:00 2016 +0700
+
+ Merge pull request #7797 from SUSE/wip-14861-hammer
+
+ hammer: ceph init script unconditionally sources /lib/lsb/init-functions
+
+ Reviewed-by: Ken Dreyer <kdreyer@redhat.com>
+
+commit 94da46b6e31cac206cb32fc5bd3159209ee25e8c
+Author: Dunrong Huang <riegamaths@gmail.com>
+Date: Tue Dec 8 00:22:02 2015 +0800
+
+ tests: make sure no segfault occurs when using some bad keyring
+
+ Signed-off-by: Dunrong Huang <riegamaths@gmail.com>
+ (cherry picked from commit 2eb0bf32244fc174d56cc42e2298c67d8b5299ac)
+ Signed-off-by: Brad Hubbard <bhubbard@redhat.com>
+
+commit a371c0f1d69fea131b56100492d3045c15ae072c
+Author: Dunrong Huang <riegamaths@gmail.com>
+Date: Wed Nov 25 19:03:03 2015 +0800
+
+ auth: fix a crash issue due to CryptoHandler::create() failed
+
+ In this case(e.g. user passes wrong key), attempts to call the CryptoKey.ckh will lead to a segfault.
+
+ This patch fixes crash issue like following:
+
+ Program received signal SIGSEGV, Segmentation fault.
+ [Switching to Thread 0x7fffed10e700 (LWP 25051)]
+ 0x00007ffff59896c6 in CryptoKey::encrypt (this=0x7fffed10d4f0, cct=0x555555829c30, in=..., out=..., error=0x7fffed10d440) at auth/cephx/../Crypto.h:110
+ 110 return ckh->encrypt(in, out, error);
+ (gdb) bt
+ at auth/cephx/../Crypto.h:110
+ at auth/cephx/CephxProtocol.h:464
+
+ Signed-off-by: Dunrong Huang <riegamaths@gmail.com>
+ (cherry picked from commit a7f520caabf997b3753f1200f19f21830531b3f5)
+ Signed-off-by: Brad Hubbard <bhubbard@redhat.com>
+
+commit af5da4f24d7c2ea5a1322450180099278dd0da7c
+Author: Dunrong Huang <riegamaths@gmail.com>
+Date: Wed Nov 25 18:24:30 2015 +0800
+
+ auth: fix double PK11_DestroyContext() if PK11_DigestFinal() failed
+
+ Signed-off-by: Dunrong Huang <riegamaths@gmail.com>
+ (cherry picked from commit e9e05333ac7c64758bf14d80f6179e001c0fdbfd)
+ Signed-off-by: Brad Hubbard <bhubbard@redhat.com>
+
+commit c3f031a32df5d434721a2b00f2c8961759b1a916 (refs/remotes/markhpc/wip-10794-hammer)
+Author: David Zafman <dzafman@redhat.com>
+Date: Wed May 20 14:09:02 2015 -0700
+
+ ceph-objectstore-tool, osd: Fix import handling
+
+ Use same_interval_since set to zero to communicate that an import has happened
+ and the correct value needs to be computed.
+
+ Fixes: #10794
+
+ Signed-off-by: David Zafman <dzafman@redhat.com>
+ (cherry picked from commit 70316541bbb115d9a35954bfba373cf1dc084b7e)
+
+ Conflicts:
+ src/osd/PG.cc (trivial)
+
+commit 647723ecd283273657bdb8b35dbb904e55c37add
+Author: David Zafman <dzafman@redhat.com>
+Date: Thu Jun 4 10:37:42 2015 -0700
+
+ tools, test: Add ceph-objectstore-tool to operate on the meta collection
+
+ Signed-off-by: David Zafman <dzafman@redhat.com>
+ (cherry picked from commit 31fa89f24997c3e9b4f8795ea28938ab65493d10)
+
+ Conflicts:
+ src/tools/ceph_objectstore_tool.cc
+ is_pg() still needs snap argument
+
+commit d8756208a3213e099574e57e9b654feab84b0497
+Author: Piotr Dałek <piotr.dalek@ts.fujitsu.com>
+Date: Thu Mar 3 11:30:53 2016 +0100
+
+ common/obj_bencher.cc: make verify error fatal
+
+ When run without "--no-verify", all verification errors are noted,
+ but they are not forwarded/reported anywhere else but to cerr, which
+ will cause automated testing to ignore them. Make seq_read_bench and
+ rand_read_bench return -EIO on any verification error which will,
+ in turn, return it back to caller.
+
+ Fixes: #14974
+ Signed-off-by: Piotr Dałek <piotr.dalek@ts.fujitsu.com>
+ (cherry picked from commit 658bba85c488a38e25bc598637258c263f711631)
+
+commit 04fe9517cd049e97b845cef848f19a8b8dc3976c
+Author: Piotr Dałek <piotr.dalek@ts.fujitsu.com>
+Date: Thu Mar 3 14:40:44 2016 +0100
+
+ test/test_rados_tool.sh: force rados bench rand and seq
+
+ This forces rados bench rand and seq to execute, so if there's
+ a regression in any of above, it won't go unnoticed.
+
+ Fixes: #14974
+ Signed-off-by: Piotr Dałek <piotr.dalek@ts.fujitsu.com>
+
+commit d314849ab9b59ae55c6a86b878d123eb1c13d88a
+Merge: 20b2a74 31a2fc4
+Author: Sage Weil <sage@redhat.com>
+Date: Thu Mar 3 08:35:37 2016 -0500
+
+ Merge pull request #7672 from dachary/wip-14783-hammer
+
+ hammer: test_bit_vector.cc uses magic numbers against #defines that vary
+
+commit 6a6754f8dc834dbb13144cebdeeea2ff29e09127
+Author: Alexey Sheplyakov <asheplyakov@mirantis.com>
+Date: Fri Feb 26 15:01:11 2016 +0300
+
+ hammer: tools: fix race condition in seq/rand bench (part 2)
+
+ Commit c2c6d02591519dfd15ddcb397ac440322a964deb which is intended to
+ cherry-pick 9bcf5f065c4ed4b10d8f98961d1f99493bcdc9b8 incorrectly resolved
+ a conflict by adding code where it should have been removed. The incorrect
+ conflict resolution can been displayed with
+
+ commit=c2c6d02591519dfd15ddcb397ac440322a964deb
+ picked_from=9bcf5f065c4ed4b10d8f98961d1f99493bcdc9b8
+ diff -u --ignore-matching-lines '^[^+-]' <(git show $picked_from) <(git show $commit)
+
+ --- /dev/fd/63 2016-03-03 14:09:51.354329129 +0700
+ +++ /dev/fd/62 2016-03-03 14:09:51.358329122 +0700
+ @@ -76,20 +79,18 @@
+ ++data.in_flight;
+ - if (!no_verify) {
+ - snprintf(data.object_contents, data.object_size, "I'm the %16dth object!", current_index);
+ -- lock.Unlock();
+ + lock.Unlock();
+ - if (memcmp(data.object_contents, cur_contents->c_str(), data.object_size) != 0) {
+ - cerr << name[slot] << " is not correct!" << std::endl;
+ - ++errors;
+ - }
+ -- } else {
+ -- lock.Unlock();
+ -- }
+ --
+ -+ lock.Unlock();
+ - name[slot] = newName;
+ - }
+ -
+ -@@ -789,11 +791,14 @@ int ObjBencher::rand_read_bench(int seconds_to_run, int num_objects, int concurr
+ ++ if (memcmp(data.object_contents, cur_contents->c_str(), data.object_size) != 0) {
+ ++ cerr << name[slot] << " is not correct!" << std::endl;
+ ++ ++errors;
+ + } else {
+ + lock.Unlock();
+ + }
+ +@@ -776,11 +785,14 @@ int ObjBencher::rand_read_bench(int seconds_to_run, int num_objects, int concurr
+ }
+ lc.cond.Wait(lock);
+ }
+
+ http://tracker.ceph.com/issues/14873 Fixes: #14873
+
+ Signed-off-by: Alexey Sheplyakov <asheplyakov@mirantis.com>
+
+commit 3a5b1029f8f30bca569b12195329224208855096
+Author: Alexey Sheplyakov <asheplyakov@mirantis.com>
+Date: Thu Mar 3 15:30:23 2016 +0300
+
+ hammer: tools: fix race condition in seq/rand bench (part 1)
+
+ src/common/obj_bencher.cc:601: the lock should be taken before calling completion_ret,
+ not after. Also note that if r < 0 the lock will be unlocked twice in a row.
+ As a result rados bench seq fails with assertion in Mutex::Unlock().
+
+ Signed-off-by: Piotr Dałek <piotr.dalek@ts.fujitsu.com>
+ Signed-off-by: Alexey Sheplyakov <asheplyakov@mirantis.com>
+ (cherry picked from commit 0c8faf7c9982c564002771c3a41362a833ace9bb)
+
+ Conflicts:
+ src/common/obj_bencher.cc
+ src/common/obj_bencher.h
+ Pick only the lock related part to unbreak seq bench. The failure due
+ to the missing (or wrong sized) objects can be easily worked around, and
+ the changes required to fix this problem are way too intrusive for hammer.
+
+ http://tracker.ceph.com/issues/14873 Related: #14873
+
+commit c4ba93a6529ab549d42b601432ec88d8243909bf
+Author: Yan, Zheng <zyan@redhat.com>
+Date: Tue Sep 29 15:24:41 2015 +0800
+
+ client: use fuse_req_getgroups() to get group list
+
+ Signed-off-by: Yan, Zheng <zyan@redhat.com>
+ (cherry picked from commit 0eb6d0ba1b65ac0aaffc72a82f07857cc65a6b88)
+
+commit a84ed87082076e1990fb79703aa5ac8eea5d34ea
+Author: Yan, Zheng <zyan@redhat.com>
+Date: Tue Sep 29 15:11:24 2015 +0800
+
+ client: use thread local data to track fuse request
+
+ When handling an operation, libcephfs code may want to access fuse
+ request for extra information. by tracking fuse request in thread
+ local data, we can avoid adding extra parameter to Client::ll_foo
+ functions.
+
+ Signed-off-by: Yan, Zheng <zyan@redhat.com>
+ (cherry picked from commit a9f91d7d70893cdc5f832a26a5be298941d00315)
+
+commit e7f299ace762c7d02cad1f7253dba87404d944f5
+Author: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
+Date: Tue Aug 18 12:34:01 2015 +0200
+
+ client/Client.cc: remove only once used variable
+
+ Fix for:
+ [src/client/Client.cc:4555]: (style) The scope of the variable
+ 'initial_group_count' can be reduced.
+
+ Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
+ Signed-off-by: Yan, Zheng <zyan@redhat.com>
+ (cherry picked from commit a29dd45dd89f59ff15018f541601ac5ede162174)
+
+commit 16e3e2f0a0dc465ed9079df051215f4758f0ee4d
+Author: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
+Date: Wed Aug 12 18:38:38 2015 +0200
+
+ client/Client.cc: fix realloc memory leak
+
+ Fix handling of realloc. If realloc() fails it returns NULL, assigning
+ the return value of realloc() directly to the pointer without checking
+ for the result will lead to a memory leak.
+
+ Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
+ Signed-off-by: Yan, Zheng <zyan@redhat.com>
+ (cherry picked from commit 4f98dab99c35663de89a06e2dfdbd874f56aed41)
+
+commit b13ddc0690742b11802e59f34b539987d632ac58
+Author: blinke <Burkhard.Linke@computational.bio.uni-giessen.de>
+Date: Mon Aug 10 17:43:10 2015 +0200
+
+ client: added permission check based on getgrouplist
+
+ Fixes: #13268
+ Signed-off-by: Yan, Zheng <zyan@redhat.com>
+ (cherry picked from commit f04c8da5432174874ca97d11a5b2fef56f95d73d)
+
+commit 562c0a962b291b90112ccea7d8c6f7c92a14851f
+Author: blinke <Burkhard.Linke@computational.bio.uni-giessen.de>
+Date: Mon Aug 10 15:31:44 2015 +0200
+
+ configure.ac: added autoconf check for getgrouplist
+
+ Signed-off-by: Yan, Zheng <zyan@redhat.com>
+ (cherry picked from commit 16b59c6cd68d532a47e8c0e7b1f088b41433f048)
+
+commit e014ea88861f4f27b4a5db14c32133a3b864411e
+Author: Yan, Zheng <zyan@redhat.com>
+Date: Thu Jul 23 15:07:45 2015 +0800
+
+ init-ceph: check if /lib/lsb/init-functions exists
+
+ On OSX/FreeBSD, /lib/lsb/init-functions does not exist
+
+ Signed-off-by: Yan, Zheng <zyan@redhat.com>
+ (cherry picked from commit bb1fa7f3993dfcd1243b2a9a0bb432c269df215f)
+
+commit 20b2a7413e8f7538ff0683313e7b19c41aaf69ad
+Merge: c1bc048 c63baeb
+Author: Loic Dachary <loic@dachary.org>
+Date: Thu Mar 3 12:05:58 2016 +0700
+
+ Merge pull request #7671 from tchaikov/wip-14583-hammer
+
+ hammer: global/pidfile: do not start two daemons with a single pid-file
+
+ Reviewed-by: Loic Dachary <ldachary@redhat.com>
+
+commit c1bc048dd708a729137e1d28e0ccfedfe5d90933
+Merge: 546a7b9 28d42dc
+Author: Loic Dachary <loic@dachary.org>
+Date: Thu Mar 3 11:51:33 2016 +0700
+
+ Merge pull request #7702 from ceph/wip-14077-hammer
+
+ hammer: scrub bogus results when missing a clone
+
+ Reviewed-by: Martin Palma <martin@palma.bz>
+ Reviewed-by: Wei-Chung Cheng <freeze.vicente.cheng@gmail.com>
+ Reviewed-by: Loic Dachary <ldachary@redhat.com>
+
+commit 5726463368ddcc688e6308d22992568ba4c0da32
+Author: Nathan Cutler <ncutler@suse.com>
+Date: Fri Feb 26 18:30:49 2016 +0100
+
+ packaging: lsb_release build and runtime dependency
+
+ The lsb_release executable is being run in multiple places, not least in
+ src/common/util.cc, which calls it via shell in the collect_sys_info() code
+ path.
+
+ This patch addresses this issue on SUSE- and Debian-derivatives, as well
+ as reinstating the dependency for RHEL/Fedora after it was dropped in
+ 15600572265bed397fbd80bdd2b7d83a0e9bd918.
+
+ http://tracker.ceph.com/issues/14906 Fixes: #14906
+
+ Signed-off-by: Nathan Cutler <ncutler@suse.com>
+ (cherry picked from commit b87f4efb5689a8db77e06baf4f469afcd9df3677)
+
+ Conflicts:
+ ceph.spec.in
+ The jewel specfile has diverged considerably from hammer:
+ systemd, package split, etc. This is more of a hand backport
+ than a cherry-pick.
+
+commit c63baebbb9bb5e6564955e920d0f658e5a3092af
+Author: Loic Dachary <ldachary@redhat.com>
+Date: Mon Feb 1 19:32:13 2016 +0700
+
+ global: do not start two daemons with a single pid-file (part 2)
+
+ Fixes the following bugs:
+
+ * the fd is open(O_WRONLY) and cannot be read from, safe_read
+ always fails and never removes the pid file.
+
+ * pidfile_open(g_conf) is close(STDOUT_FILENO) and there is a risk that
+ pidfile_open gets STDOUT_FILENO only to have it closed and redirected
+ to /dev/null.
+
+ * Before writing the file, ftruncate it so that overriding a file
+ containing the pid 1234 with the pid 89 does not end up being
+ a file with 8934.
+
+ * Before reading the file, lseek back to offset 0 otherwise it
+ will read nothing.
+
+ * tests_pidfile was missing an argument when failing
+ TEST_without_pidfile and killed all process with ceph in their name,
+ leading to chaos and no useful error message.
+
+ * lstat(fd) cannot possibly return a result different from the one
+ obtained right after the file was open, stat(path) must be used
+ instead.
+
+ In addition to fixing the bugs above, refactor the pidfile.cc
+ implementation to:
+
+ * be systematic about error reporting (using cerr for when removing
+ the pidfile because derr is not available at this point and derr
+ when creating the pidfile).
+
+ * replace pidfile_open / pidfile_write with just pidfile_write since
+ there never is a case when they are not used together.
+
+ More test cases are added to test_pidfile to verify the bugs above are
+ fixed.
+
+ http://tracker.ceph.com/issues/13422 Fixes: #13422
+
+ Signed-off-by: Loic Dachary <loic@dachary.org>
+ (cherry picked from commit 9828d49d6f3ccfc78d496153d263ea39b1722d4b)
+
+ Conflicts:
+ src/global/global_init.cc
+ - the `flag` argument of `global_init_prefork()` is not used, so
+ it was removed in master. but the cleanup commit was not
+ cherry-picked to hammer, thus the conflict. we can just keep it
+ around in hammer to minimize the code churn, although it may
+ stand in the way of future backports.)
+ - s/nullptr/NULL/ as hammer does not support c++11.
+
+commit 28d42dc8e0a0dd71d03c1b69fb7464b753bd4cc0
+Merge: 9144c38 9282c1d
+Author: David Zafman <dzafman@redhat.com>
+Date: Thu Feb 25 14:25:48 2016 -0800
+
+ Merge backport pull request #6545 into wip-14077-hammer
+
+ A commit skipped because remove_coll() still needed in Hammer
+
+commit 9144c3837f284ac2c922d2438b0e0f0cc7304d7a
+Merge: fd74fbf 3226615
+Author: David Zafman <dzafman@redhat.com>
+Date: Thu Feb 25 14:25:35 2016 -0800
+
+ Merge backport pull request #5783 into wip-14077-hammer
+
+commit fd74fbf04a965ca93dc9602f99e3cb7a3577340a
+Merge: 4309fa8 0fe3dfe
+Author: David Zafman <dzafman@redhat.com>
+Date: Thu Feb 25 14:25:17 2016 -0800
+
+ Merge backport pull request #5031 into wip-14077-hammer
+
+commit 4309fa87e13a20368ca34f7699436b628c9d7876
+Merge: de5e11e 1bc8882
+Author: David Zafman <dzafman@redhat.com>
+Date: Thu Feb 25 14:24:58 2016 -0800
+
+ Merge backport pull request #5842 into wip-14077-hammer
+
+commit de5e11ec69e7388a1a9c28614759b2e2d8b70ad8
+Merge: 7698e6c 6ff4217
+Author: David Zafman <dzafman@redhat.com>
+Date: Thu Feb 25 14:24:31 2016 -0800
+
+ Merge backport pull request #5127 into wip-14077-hammer
+
+commit 7698e6c54aae1d06664d8e8324595400e6087f24
+Merge: c8057c6 de80bbf
+Author: David Zafman <dzafman@redhat.com>
+Date: Thu Feb 25 14:23:14 2016 -0800
+
+ Merge backport 6 commits from pull request #5197 into wip-14077-hammer
+
+ Excludes the ceph-objectstore-tool meta-list op
+
+commit c8057c693bf0ae7bb01ef238f4ef9f23454a2e33
+Merge: ecbf6d2 df0e11e
+Author: David Zafman <dzafman@redhat.com>
+Date: Thu Feb 25 14:22:26 2016 -0800
+
+ Merge backport branch 'wip-temp' into wip-14077-hammer
+
+commit ecbf6d2882073363ca1ddc5209e1e9537f51fa77
+Merge: 3415312 6c8884b
+Author: David Zafman <dzafman@redhat.com>
+Date: Thu Feb 25 14:21:20 2016 -0800
+
+ Merge backport pull request #4932 into wip-14077-hammer
+
+commit 34153127963b5baec0c2b84f7aa19b29fc81d4fa
+Merge: e022b5b 87a7f99
+Author: David Zafman <dzafman@redhat.com>
+Date: Thu Feb 25 14:20:41 2016 -0800
+
+ Merge backport pull request #4915 into wip-14077-hammer
+
+commit e022b5b55facb359f6fd27884e2408fda70db30a
+Merge: 4ed44e1 9ca2f35
+Author: David Zafman <dzafman@redhat.com>
+Date: Thu Feb 25 14:20:00 2016 -0800
+
+ Merge backport 1 commit from pull request #4863 into wip-14077-hammer
+
+commit 4ed44e1e33df986468585d00a6dc401025263217
+Merge: 3f0fc84 78a59f8
+Author: David Zafman <dzafman@redhat.com>
+Date: Thu Feb 25 14:18:38 2016 -0800
+
+ Merge backport 8 commits from pull request #4784 into wip-14077-hammer
+
+ Only excludes actual fix for #10794
+
+commit 3f0fc84c4180473a87db01cb40d0488bcaa2c202
+Merge: db68c6c eab0f24
+Author: David Zafman <dzafman@redhat.com>
+Date: Thu Feb 25 14:15:05 2016 -0800
+
+ Merge backport 41 commits from pull request #4473 into wip-14077-hammer
+
+commit db68c6cb683870e68bf6143c6902b8ac89ecdc3a
+Merge: c3d938d 18c49b6
+Author: David Zafman <dzafman@redhat.com>
+Date: Thu Feb 25 14:13:37 2016 -0800
+
+ Merge backport branch 'wip-journal-header' of git://github.com/XinzeChi/ceph into wip-14077-hammer
+
+ Includes a change to the code in the original merge commit itself
+
+commit c3d938d81020072c2d2eecf58f4639e773181b1a
+Merge: 7abb6ae a1fc101
+Author: David Zafman <dzafman@redhat.com>
+Date: Thu Feb 25 14:13:02 2016 -0800
+
+ Merge backport 1 commit of pull request #3686 into wip-14077-hammer
+
+commit 9282c1d01c4f2d99fb3832a3cf495f99fdc6487e
+Author: David Zafman <dzafman@redhat.com>
+Date: Thu Nov 5 19:06:17 2015 -0800
+
+ ceph-objectstore-tool: Add dry-run checking to ops missing it
+
+ Update test to check most operations
+
+ Signed-off-by: David Zafman <dzafman@redhat.com>
+ (cherry picked from commit e89f0e1c5e8a378809bec7c705ea2c23235d4b28)
+
+ Conflicts:
+ src/tools/ceph_objectstore_tool.cc (trivial)
+
+commit efc2183bafacfcd29fbb1b42231d4c147199e528
+Author: David Zafman <dzafman@redhat.com>
+Date: Wed Nov 11 15:26:52 2015 -0800
+
+ test: Remove redundant test output
+
+ Signed-off-by: David Zafman <dzafman@redhat.com>
+ (cherry picked from commit e6f1bdcd310bd6417f0f695fba3430fd0edba43d)
+
+commit 322661547ec437a9cdb893fcd280a48cd60ec990
+Author: David Zafman <dzafman@redhat.com>
+Date: Wed Oct 28 21:34:44 2015 -0700
+
+ test: osd-scrub-snaps.sh uses ceph-helpers.sh and added to make check
+
+ Signed-off-by: David Zafman <dzafman@redhat.com>
+ (cherry picked from commit d712737be1aadb38ecc3882200999d79d748cdb8)
+
+ ceph-helpers.sh in different location in Hammer
+
+commit 995a0042a1b8ed04b77e6bc4757a10552450dc7f
+Author: David Zafman <dzafman@redhat.com>
+Date: Tue Nov 10 18:20:46 2015 -0800
+
+ test: Verify replicated PG beyond just data after vstart
+
+ Signed-off-by: David Zafman <dzafman@redhat.com>
+ (cherry picked from commit 9a29c5983cd392e4b479b6b685fb0c3797c10cd2)
+
+commit 6afb5d3be26931c670f22c892c925e2556c8e562
+Author: David Zafman <dzafman@redhat.com>
+Date: Mon Oct 26 11:36:43 2015 -0700
+
+ osd: Use boost::optional instead of snap 0 for "all_clones"
+
+ Signed-off-by: David Zafman <dzafman@redhat.com>
+ (cherry picked from commit 310bf784b7cd8d75f2ab7ee431bc764f5b312aa2)
+
+commit 750f81732bc803128a8a25c07e10e9f709dc2a1a
+Author: David Zafman <dzafman@redhat.com>
+Date: Tue Nov 10 17:57:59 2015 -0800
+
+ test: Fix verify() used after import to also check xattr and omap
+
+ Signed-off-by: David Zafman <dzafman@redhat.com>
+ (cherry picked from commit 92d00f22805599c519806c6ff6164847b5c33931)
+
+commit b8c9507f632510d7da8545d7afc49b618435ef3c
+Author: David Zafman <dzafman@redhat.com>
+Date: Sun Oct 25 18:57:18 2015 -0700
+
+ osd, test: When head missing a snapset, clones not an error
+
+ Fix log message for this case and make into "info"
+
+ Signed-off-by: David Zafman <dzafman@redhat.com>
+ (cherry picked from commit f508ddc6e9b40fe5c1c54e5faa569f2bc7b78c4b)
+
+commit 59fee8a65c1a39d7e3806852aabbf68d7ca37feb
+Author: David Zafman <dzafman@redhat.com>
+Date: Mon Nov 9 20:02:21 2015 -0800
+
+ test: Add test cases for xattr and omap ceph-objectstore-tool operations
+
+ Signed-off-by: David Zafman <dzafman@redhat.com>
+ (cherry picked from commit cbaed6a8c737f77e68a0eb7f1fca32ec4155f045)
+
+commit 0988b1238d43630ff0b05d321952021ede73c2ae
+Author: David Zafman <dzafman@redhat.com>
+Date: Sat Oct 24 16:23:13 2015 -0700
+
+ osd, test: Keep missing count and log number of missing clones
+
+ Signed-off-by: David Zafman <dzafman@redhat.com>
+ (cherry picked from commit 2e0bb0ae9498fd9a0c49f1b81bf0c86f7a7cac42)
+
+ Conflicts:
+ src/osd/ReplicatedPG.h (trivial)
+
+commit 37be95996494f72d4fa3ecc62b54ee9478903c6e
+Author: David Zafman <dzafman@redhat.com>
+Date: Wed Nov 11 08:28:01 2015 -0800
+
+ rados: Minor output changes for consistency across operations
+
+ Signed-off-by: David Zafman <dzafman@redhat.com>
+ (cherry picked from commit 016ed34ce85fa111f54857a8ca1002ae32b52b8e)
+
+commit 6c51e4831f34a67308e3f8190d9aad2c3d029bf7
+Author: David Zafman <dzafman@redhat.com>
+Date: Tue Oct 20 11:14:42 2015 -0700
+
+ test: Eliminate check for bogus "obj13/head snaps empty" error
+
+ Signed-off-by: David Zafman <dzafman@redhat.com>
+ (cherry picked from commit 8227b4b75c24b632e637decbe4b818606e8589ee)
+
+commit e92505bec093cb3070e4962bc86b82a257c64171
+Author: David Zafman <dzafman@redhat.com>
+Date: Wed Oct 14 20:34:28 2015 -0700
+
+ ceph-objectstore-tool: Add new remove-clone-metadata object op
+
+ Fixes: #12740
+
+ Signed-off-by: David Zafman <dzafman@redhat.com>
+ (cherry picked from commit c6d283f0f16347a13418d8a0ed136913e1161893)
+
+ No Sequencer in transactions in Hammer
+
+commit 8f88b442a26603cc321fccc7047cb8639b2a0f65
+Author: David Zafman <dzafman@redhat.com>
+Date: Wed Oct 14 20:42:48 2015 -0700
+
+ osd: Fix trim_object() to not crash on corrupt snapset
+
+ Add test case to check for trim_object() osd crash
+
+ Signed-off-by: David Zafman <dzafman@redhat.com>
+ (cherry picked from commit eb0ca424815e94c78a2d09dbf787d102172f4ddf)
+
+ Conflicts:
+ src/osd/ReplicatedPG.cc (trivial)
+
+commit 78b13f5d591d9d9676939abc4febeb7d2eebb1a3
+Author: David Zafman <dzafman@redhat.com>
+Date: Wed Oct 14 13:12:17 2015 -0700
+
+ ceph-objectstore-tool: Improve object spec error handling
+
+ Add test cases
+
+ Signed-off-by: David Zafman <dzafman@redhat.com>
+ (cherry picked from commit caf2d5970b0a3e3ce4ef941d1955b7821a0fc916)
+
+ Conflicts:
+ src/test/ceph_objectstore_tool.py (trivial)
+
+commit 7b800b7c3efb5403d03fc0c4386821b433b85268
+Author: David Zafman <dzafman@redhat.com>
+Date: Wed Oct 7 17:25:44 2015 -0700
+
+ ceph-objectstore-tool: Add undocumented clear-snapset command for testing
+
+ Add test cases using new feature to corrupt SnapSet
+
+ Signed-off-by: David Zafman <dzafman@redhat.com>
+ (cherry picked from commit b6302acdd344997aabdb426104de9f24e9990437)
+
+ No Sequencer in transactions in Hammer
+
+commit 7f398bd2a3264d1ac5bf40a5470c43454dbad571
+Author: David Zafman <dzafman@redhat.com>
+Date: Wed Oct 14 21:59:50 2015 -0700
+
+ ceph-objectstore-tool: Add set-size command for objects
+
+ Signed-off-by: David Zafman <dzafman@redhat.com>
+ (cherry picked from commit 138a33b8946e6fea1e09527b8bc45b7aa4bee1d6)
+
+ No Sequencer in transactions in Hammer
+
+commit 53dc87f82642de769a7ea11554552e6db06a3e65
+Author: David Zafman <dzafman@redhat.com>
+Date: Wed Oct 14 22:04:05 2015 -0700
+
+ ceph-objectstore-tool: Enhanced dump command replaces dump-info
+
+ Show object stat information from objectstore
+ Show SnapSet if present
+ Add --head for search by object name
+
+ Signed-off-by: David Zafman <dzafman@redhat.com>
+ (cherry picked from commit 1688debf7892d36c773c12d7d0b1b9b4cddc5f98)
+
+commit a46fc6613e1f1f6709184d68f23bccab0fd03bd6
+Author: David Zafman <dzafman@redhat.com>
+Date: Fri Oct 2 13:39:29 2015 -0700
+
+ test: Add some clones to ceph-objectstore-tool test
+
+ Signed-off-by: David Zafman <dzafman@redhat.com>
+ (cherry picked from commit b4ba3e66548a5dee58553df071b916c85d701caf)
+
+commit fd518e704e0e5c01f3b7efa8905ddde1e64cc842
+Author: David Zafman <dzafman@redhat.com>
+Date: Thu Oct 1 19:28:54 2015 -0700
+
+ ceph-objectstore-tool: For corrupt objectstores, don't abort listing on errors
+
+ Signed-off-by: David Zafman <dzafman@redhat.com>
+ (cherry picked from commit d276d3286504ea702ae561b91dff4121c99feb9a)
+
+ Conflicts:
+ src/tools/ceph_objectstore_tool.cc (trivial)
+
+commit ad7825a4beba879f6a38ef3eda0648f11f8783bd
+Author: David Zafman <dzafman@redhat.com>
+Date: Tue Oct 13 13:02:40 2015 -0700
+
+ ceph-objectstore-tool: Improve some error messages
+
+ Signed-off-by: David Zafman <dzafman@redhat.com>
+ (cherry picked from commit b0c884ba8b51eedf9def093c61f0f06398101ecc)
+
+commit 26cbf14ef1e44936f48fdb2be40b59ae2117666f
+Author: David Zafman <dzafman@redhat.com>
+Date: Thu Sep 3 14:22:20 2015 -0700
+
+ ceph-objectstore-tool: White space fixes
+
+ Signed-off-by: David Zafman <dzafman@redhat.com>
+ (cherry picked from commit 0564f398269d920d90f6d6ecb008ebcd6609d611)
+
+commit 0f785646d2f52522706835a2f1c8e0101db9a622
+Author: David Zafman <dzafman@redhat.com>
+Date: Tue Oct 13 15:33:26 2015 -0700
+
+ tools/rados: Improve xattr import handling so future internal xattrs ignored
+
+ Signed-off-by: David Zafman <dzafman@redhat.com>
+ (cherry picked from commit 9222f56403cf52ec161a38fc437a3f04c24d1625)
+
+ Conflicts:
+ src/tools/rados/RadosImport.cc (Code in ceph_objectstore_tool.cc in Hammer)
+
+commit c8e27725249cf587e65af323e3ae0ba43c740c10
+Author: David Zafman <dzafman@redhat.com>
+Date: Tue Sep 29 19:57:43 2015 -0700
+
+ test: Test scrubbing of snapshot problems
+
+ Signed-off-by: David Zafman <dzafman@redhat.com>
+ (cherry picked from commit e5ad33ec07ee9fffe862d84955a566261d101713)
+
+commit 113d5c75a5bd33b1b5fe399d83d94a671eb40658
+Author: David Zafman <dzafman@redhat.com>
+Date: Mon Sep 28 10:59:42 2015 -0700
+
+ osd: Don't crash if OI_ATTR attribute is missing or corrupt
+
+ Signed-off-by: David Zafman <dzafman@redhat.com>
+ (cherry picked from commit e0b39650028205e9d9e314b75c444cc8cf055a31)
+
+commit 3af8f9e8044fb1e126f208903c41cde065db304e
+Author: David Zafman <dzafman@redhat.com>
+Date: Tue Oct 13 18:02:32 2015 -0700
+
+ osd: Additional _scrub() check for snapset inconsistency
+
+ Signed-off-by: David Zafman <dzafman@redhat.com>
+ (cherry picked from commit 9e48e1801ea1a10ce495b3947da06676c2f5f72f)
+
+commit 7103e74e335652f2a28b1dad0a2f2028398a600d
+Author: David Zafman <dzafman@redhat.com>
+Date: Thu Sep 3 19:43:35 2015 -0700
+
+ osd: Better SnapSet scrub checking (find issues instead of asserting)
+
+ Signed-off-by: David Zafman <dzafman@redhat.com>
+ (cherry picked from commit 3b381caaad20c683a330e8b7a4e1c017abcb60df)
+
+commit 18af852a2c71b733ec5c6bd397b2e712b676c693
+Author: David Zafman <dzafman@redhat.com>
+Date: Wed Aug 26 13:58:09 2015 -0700
+
+ osd: Make the _scrub routine produce good output and detect errors properly
+
+ Catch decode errors so osd doesn't crash on corrupt OI_ATTR or SS_ATTR
+ Use boost::optional<> to make current state clearer
+ Create next_clone as needed using head/curclone
+ Add equivalent logic after getting to end of scrubmap.objects
+
+ Fixes: #12738
+
+ Signed-off-by: David Zafman <dzafman@redhat.com>
+ (cherry picked from commit a23036c6fd7de5d1dbc2bd30c967c0be51d94ca5)
+
+ Conflicts:
+ src/osd/ReplicatedPG.cc (no num_objects_pinned in hammer)
+ src/osd/ReplicatedPG.h (no get_temp_recovery_object() in hammer)
+
+commit 3a1b58838dba6bd482aa5786dc44962c4a977c17
+Author: David Zafman <dzafman@redhat.com>
+Date: Wed Sep 30 17:17:15 2015 -0700
+
+ osd: Fix log message name of ceph-objectstore-tool
+
+ Signed-off-by: David Zafman <dzafman@redhat.com>
+ (cherry picked from commit 545e4b2c582625f8b93502266ca59ee40e0d0e5f)
+
+commit 0fe3dfe8768b27743189add73cde9a44095f2a62
+Author: Mykola Golub <mgolub@mirantis.com>
+Date: Tue Jun 16 11:57:08 2015 +0300
+
+ ceph-objectstore-tool: add mark-complete operation
+
+ It is supposed to be used as a last resort to fix a cluster that has
+ PGs in 'incomplete' state, using the following procedure:
+
+ 1) stop the osd that is primary for the incomplete PG;
+ 2) run:
+ ceph-objectstore-tool --data-path ... --journal-path ... --pgid $PGID --op mark-complete
+ 3) start the osd.
+
+ Fixes: #10098
+ Signed-off-by: Mykola Golub <mgolub@mirantis.com>
+ (cherry picked from commit 6907778d767ba08bb80c495785056ed122b023fe)
+
+ Conflicts:
+ src/test/ceph_objectstore_tool.py (trivial)
+ src/tools/ceph_objectstore_tool.cc (trivial)
+
+commit 1bc88827fc40f124f570dd8b7865c687f1b1f5a8
+Author: David Zafman <dzafman@redhat.com>
+Date: Tue Sep 8 12:33:44 2015 -0700
+
+ test: Fix failure test to find message anywhere in stderr
+
+ Consolidate test_failure() and test_failure_tty()
+
+ Signed-off-by: David Zafman <dzafman@redhat.com>
+ (cherry picked from commit 95bd3c2c54312417b132ddb91c89fdbe63b01fd0)
+
+commit 6ff421738c93ff37521ccf67caf3d09d284e339c
+Author: Kefu Chai <kchai@redhat.com>
+Date: Fri Jul 17 14:46:16 2015 +0800
+
+ test: add test for {get,set}-inc-osdmap commands.
+
+ Signed-off-by: Kefu Chai <kchai@redhat.com>
+ (cherry picked from commit 818de1a2c89272d98610328a958fea06d1cc41cc)
+
+ Conflicts:
+ src/test/ceph_objectstore_tool.py (trivial)
+
+commit de80bbf4d7c1b78017cf447a7f511ceefac39e50
+Author: David Zafman <dzafman@redhat.com>
+Date: Tue Jun 23 16:51:27 2015 -0700
+
+ test: Add debug argument to the ceph-objectstore-tool test
+
+ Signed-off-by: David Zafman <dzafman@redhat.com>
+ (cherry picked from commit a3b14ede9e829ec85c49980ecbff11f584ca70ae)
+
+commit 0643797cb7a37b5601a7dd8da9a81f8194b8f25d
+Author: David Zafman <dzafman@redhat.com>
+Date: Tue Sep 8 13:41:31 2015 -0700
+
+ rados: Fix usage for "notify" command
+
+ Signed-off-by: David Zafman <dzafman@redhat.com>
+ (cherry picked from commit b968fb3bcefb0cdafb1e84d7c679b61a201a940f)
+
+commit 5ba8649423fd5a2d5c212273c901f9ddd5f44632
+Author: Kefu Chai <kchai@redhat.com>
+Date: Wed Jul 8 15:51:55 2015 +0800
+
+ test: add test for {get,set}-osdmap commands
+
+ Signed-off-by: Kefu Chai <kchai@redhat.com>
+ (cherry picked from commit 0257c150fe552300c0d9f5a22a27aaa49fb6cc64)
+
+ Conflicts:
+ src/test/ceph_objectstore_tool.py (trivial)
+
+commit 3276258b1a9123caec8d635aa1a2de3ef02201e6
+Author: David Zafman <dzafman@redhat.com>
+Date: Thu Jun 25 17:15:39 2015 -0700
+
+ tools, test: Some ceph-objectstore-tool error handling fixes
+
+ Improve various error messages generated with invalid syntax
+ Add test cases for most of these error messages
+
+ Signed-off-by: David Zafman <dzafman@redhat.com>
+ (cherry picked from commit 127a5f191d3d2442edd3a3fa820006bca3a08c93)
+
+ Conflicts:
+ src/test/ceph_objectstore_tool.py (trivial)
+
+commit cfabcc1066a06644b619fa027e27d338411120c9
+Author: Kefu Chai <kchai@redhat.com>
+Date: Tue Jul 14 10:33:47 2015 +0800
+
+ tools/ceph-objectstore-tool: add get-inc-osdmap command
+
+ Signed-off-by: Kefu Chai <kchai@redhat.com>
+ (cherry picked from commit 7801bb20d23ce83fc4093c23331bcb75e43c878f)
+
+ Conflicts:
+ src/tools/ceph_objectstore_tool.cc (trivial)
+
+commit c7d0fda01efc29d81723d4edfba2bfbbe6765760
+Author: David Zafman <dzafman@redhat.com>
+Date: Mon Jun 22 20:11:10 2015 -0700
+
+ tools: Check for valid --op earlier so we can get a better error message
+
+ Signed-off-by: David Zafman <dzafman@redhat.com>
+ (cherry picked from commit d8460714fab61d0a3092b3e7b290c0c19ad58beb)
+
+ Conflicts:
+ src/test/ceph_objectstore_tool.py (trivial)
+ src/tools/ceph_objectstore_tool.cc (meta-list op not in Hammer)
+
+commit be24c50bb74aa6cd7bb08519cdaf267d4107eef3
+Author: Kefu Chai <kchai@redhat.com>
+Date: Sat Jul 11 16:27:47 2015 +0800
+
+ tools/ceph-objectstore-tool: add set-inc-osdmap command
+
+ Signed-off-by: Kefu Chai <kchai@redhat.com>
+ (cherry picked from commit 95344d07c3a1a9a6b1246e5eca3f7daeb062dd06)
+
+ Conflicts:
+ src/tools/ceph_objectstore_tool.cc (trivial)
+
+commit 06dcf74374f57224536522ef46dba8a53a0d755d
+Author: David Zafman <dzafman@redhat.com>
+Date: Wed Jun 10 17:04:57 2015 -0700
+
+ tools: Fix newlines in output of --op list
+
+ Signed-off-by: David Zafman <dzafman@redhat.com>
+ (cherry picked from commit 6aec38b51f0c14684912b5ee28fb5b1375cb8f8a)
+
+commit e44c042c3dffc4ca396dbdfac24fa65914c0b73b
+Author: Kefu Chai <kchai@redhat.com>
+Date: Fri Jul 3 23:09:54 2015 +0800
+
+ tools/ceph-objectstore-tool: add "get-osdmap" command
+
+ Signed-off-by: Kefu Chai <kchai@redhat.com>
+ (cherry picked from commit f0c130d6b1bc2a8a0cce6d78a6e69995fe00a427)
+
+ Conflicts:
+ src/tools/ceph_objectstore_tool.cc (trivial)
+
+commit 3f9e46779addaa07d04d501113eb95cea95b802b
+Author: David Zafman <dzafman@redhat.com>
+Date: Mon Jun 22 18:38:01 2015 -0700
+
+ tools: Fix dump-super which doesn't require pgid
+
+ A valid pgid had to be specified in order for superblock to be displayed,
+ but it was otherwise ignored.
+ Fix message that didn't include dump-super
+
+ Signed-off-by: David Zafman <dzafman@redhat.com>
+ (cherry picked from commit fd1772e0ac4cb801d6f3b056645eeb4d3d6ef001)
+
+commit c60eee1dcd64d4452e96ed937f94a3ec41faf9fe
+Author: Kefu Chai <kchai@redhat.com>
+Date: Thu Jul 2 19:14:55 2015 +0800
+
+ tools/ceph-objectstore-tool: add "set-osdmap" command
+
+ Fixes: #12193
+ Signed-off-by: Kefu Chai <kchai@redhat.com>
+ (cherry picked from commit 3e30c1746fb8d90b04e4776849069db0b7737c87)
+
+ Conflicts:
+ src/tools/ceph_objectstore_tool.cc (trivial)
+
+commit cfe7d47d38fd103601c09eceb98b9c7365869fba
+Author: David Zafman <dzafman@redhat.com>
+Date: Mon Jun 22 19:16:22 2015 -0700
+
+ tools: Check and specify commands that require the pgid specification
+
+ Signed-off-by: David Zafman <dzafman@redhat.com>
+ (cherry picked from commit 5534bc864813d96a0d20791d79151c4f6695a013)
+
+commit df0e11e7783e239ae7be992b342df980d399ab95
+Author: Sage Weil <sage@redhat.com>
+Date: Thu Dec 11 16:25:49 2014 -0800
+
+ hobject_t: modify operator<<
+
+ Put the most significant fields to the left so that it matches the sort
+ order. Also use unambiguous separator when the nspace is present
+ (like we do with the key).
+
+ Signed-off-by: Sage Weil <sage@redhat.com>
+ (cherry picked from commit ecdc8f697acf1627b35a83663c219a3bb0ada453)
+
+commit 6c8884b11b8211642662bfd7d612872621ffd8ff
+Author: David Zafman <dzafman@redhat.com>
+Date: Thu Jun 11 12:57:10 2015 -0700
+
+ test, tools: Improve ceph-objectstore-tool import error handling and add tests
+
+ Signed-off-by: David Zafman <dzafman@redhat.com>
+ (cherry picked from commit ddc4d52782a04d99a4293c9fc278894dfe328515)
+
+commit 87a7f991d1f2f1a05fff18accc7e31ff393083f1
+Author: David Zafman <dzafman@redhat.com>
+Date: Tue Jun 9 18:14:09 2015 -0700
+
+ tools: For ec pools list objects in all shards if the pgid doesn't specify
+
+ Signed-off-by: David Zafman <dzafman@redhat.com>
+ (cherry picked from commit 1aa9655f10b0fcc42cb5114681b8b24a2ccb68f4)
+
+commit 9ca2f35d02169e6f82e3d45e00fe880c02cbd8ce
+Author: John Spray <john.spray@redhat.com>
+Date: Mon Apr 20 17:28:15 2015 +0100
+
+ tools: clean up errors in ceph-objectstore-tool
+
+ We use negative error codes everywhere else, should
+ use them here too. Also add a couple of strategically
+ placed prints.
+
+ Signed-off-by: John Spray <john.spray@redhat.com>
+ (cherry picked from commit 8e5594da29e782b6efd046ed03f313599dafa1c5)
+
+ Conflicts:
+ src/tools/RadosDump.cc (Excluded, not in Hammer)
+
+commit 78a59f8b0c43adbd9a7a1db68dafcbf7bd2ad74d
+Author: David Zafman <dzafman@redhat.com>
+Date: Mon Jun 1 17:22:18 2015 -0700
+
+ test/ceph-objectstore-tool: Don't need stderr noise
+
+ Signed-off-by: David Zafman <dzafman@redhat.com>
+ (cherry picked from commit d7858c66454093dd6f2fab60e33e5b2472bcd80a)
+
+commit eab0f2403ea025f4e659dc055323b227023448ab
+Author: David Zafman <dzafman@redhat.com>
+Date: Thu Apr 9 16:26:07 2015 -0700
+
+ osd: Show number of divergent_priors in log message
+
+ Report dirty_divergent_priors as true or false
+ Use dout(5) so tests can verify divergent_priors created
+
+ Signed-off-by: David Zafman <dzafman@redhat.com>
+ (cherry picked from commit 67da8feb0ff8659f1ff812be5a866ef5e97facf2)
+
+commit d58793d10d682fba2ceafa4d6a1668c4917be77f
+Author: David Zafman <dzafman@redhat.com>
+Date: Mon Jul 6 18:14:06 2015 -0700
+
+ osd, tools: Always filter temp objects since not being exported
+
+ Can't use object_locator_to_pg() directly with a temp object
+ because the pool is negative.
+
+ Signed-off-by: David Zafman <dzafman@redhat.com>
+ (cherry picked from commit 557c6530a515cffacbaec439cabff8a079edbf5b)
+
+commit efc402ea9846d3995bf3d4c98188842cb69870cf
+Author: David Zafman <dzafman@redhat.com>
+Date: Mon Jun 1 17:15:21 2015 -0700
+
+ test/ceph-objectstore-tool: Show command that should have failed
+
+ Signed-off-by: David Zafman <dzafman@redhat.com>
+ (cherry picked from commit 23551deea66673c35d7183d18b63b5a8438ebf00)
+
+commit 88ac5198f542cdea87d0f600a2201132c47f158d
+Author: David Zafman <dzafman@redhat.com>
+Date: Tue May 12 15:28:07 2015 -0700
+
+ test: Add config changes to all tests to avoid order dependency
+
+ ReplayCorrupt was crashing because journal_ignore_corruption wasn't set true
+ Improve ReplayCorrupt by checking setting of bool corrupt and use ASSERT_FALSE()
+
+ Signed-off-by: David Zafman <dzafman@redhat.com>
+ (cherry picked from commit 9016269a1c248da69a0e85df4ca3ba95011710c5)
+
+commit 3d99ecd6131f41ebe60c352266dca9193d61bbc9
+Author: David Zafman <dzafman@redhat.com>
+Date: Mon Jun 22 11:15:58 2015 -0700
+
+ tools: Don't export temporary objects until we have persistent-temp objects
+
+ Signed-off-by: David Zafman <dzafman@redhat.com>
+ (cherry picked from commit 4fcf5dd370e8cfac75fadbf709a785053eb26ad9)
+
+ Remove "assert(!i->hobj.is_meta());" since is_meta() is not in Hammer
+
+commit 13360d3a55818fc5b63a2bb9889a67f3fc98d286
+Author: David Zafman <dzafman@redhat.com>
+Date: Fri May 22 17:41:40 2015 -0700
+
+ test/ceph_objectstore_tool: Improve dump-journal testing
+
+ Fix false failure when journal has no entries
+ Test dump-journal on all osds in 2 places
+
+ Signed-off-by: David Zafman <dzafman@redhat.com>
+ (cherry picked from commit ce76f88777ec026521cce465095d6376efd460a8)
+
+commit 444ce0ac718e903b39c25cf58d0a503ead491790
+Author: David Zafman <dzafman@redhat.com>
+Date: Fri May 22 11:52:00 2015 -0700
+
+ ceph-objectstore-tool: Allow --pgid specified on import (for post split)
+
+ Revamp split import testing to use --pgid option post split
+
+ Signed-off-by: David Zafman <dzafman@redhat.com>
+ (cherry picked from commit 90202a70f8c32120625c99ef5131778b3c9f6303)
+
+commit aed1c49e7d3631d797776be1020f6df0f77ea1f3
+Author: David Zafman <dzafman@redhat.com>
+Date: Fri May 22 10:53:48 2015 -0700
+
+ ceph-objectstore-tool: Invalidate pg stats when objects were skipped during pg import
+
+ Signed-off-by: David Zafman <dzafman@redhat.com>
+ (cherry picked from commit 51e27984ec131fd21bbc26411ae1540b9047eb37)
+
+commit af3f8ae1d9e210499fd0165e473f9b5d87666f75
+Author: David Zafman <dzafman@redhat.com>
+Date: Mon May 18 20:22:03 2015 -0700
+
+ ceph-objectstore-tool: Add dump-super to show OSDSuperblock in format specified
+
+ Signed-off-by: David Zafman <dzafman@redhat.com>
+ (cherry picked from commit 99d7663f870abfa82711dbf0451334f7d6c883d8)
+
+commit 4dcf15bc71c815cfdb0f6bc6f90c9b603d18b37f
+Author: David Zafman <dzafman@redhat.com>
+Date: Mon May 18 20:25:23 2015 -0700
+
+ mds, include: Fix dump() numeric char array to include additional alpha chars
+
+ Caused by: c87f55b5a8b3e003726e1be22b9cb6894ef2f37d
+
+ Signed-off-by: David Zafman <dzafman@redhat.com>
+ (cherry picked from commit f1520061bba1e052a9be3ae11161122c1f6c3425)
+
+commit feecacfb34dfd831291fc736ea39dbcf69e7d765
+Author: David Zafman <dzafman@redhat.com>
+Date: Mon May 18 20:08:14 2015 -0700
+
+ ceph-objectstore-tool: Add dump-journal as not requiring --pgid in usage
+
+ Additional comment describes --pgid requirement checking
+
+ Signed-off-by: David Zafman <dzafman@redhat.com>
+ (cherry picked from commit bd2f62445be7153a9600bcf4399e8fc56f1efd3f)
+
+commit 5e8fbb1858f7a8dd65d1b9f873aaca05f3ddb1eb
+Author: David Zafman <dzafman@redhat.com>
+Date: Thu Mar 5 16:37:46 2015 -0800
+
+ test: ceph_test_filejournal: Conform to test infrastructure requirements
+
+ Only call RUN_ALL_TESTS() once
+
+ Signed-off-by: David Zafman <dzafman@redhat.com>
+ (cherry picked from commit e30efe6c15780a6239b9970297df1f2c1918c9b1)
+
+commit c161cbf81a29e523bb4ffb897f6d02112eb49b09
+Author: David Zafman <dzafman@redhat.com>
+Date: Thu Mar 5 16:13:50 2015 -0800
+
+ test: ceph_test_filejournal need to force aio because testing with a file
+
+ Signed-off-by: David Zafman <dzafman@redhat.com>
+ (cherry picked from commit d540dde1faee47d01ee358ae384fa301fa59f00f)
+
+commit 06d3f512149dc9aa38d959ac31891b81634d0ea4
+Author: David Zafman <dzafman@redhat.com>
+Date: Thu Mar 5 16:04:36 2015 -0800
+
+ test: ceph_test_filejournal fix missing argument to FileJournal constructor
+
+ Signed-off-by: David Zafman <dzafman@redhat.com>
+ (cherry picked from commit c94fe8db36e7d54227edde94a99bc1aa236b8ec8)
+
+commit 2078f639d91fbaa9b89832811315c7c41da25a4b
+Author: David Zafman <dzafman@redhat.com>
+Date: Thu Feb 19 19:48:11 2015 -0800
+
+ test: ceph_test_filejournal Add check of journalq in WriteTrim test
+
+ Commit all journal entries and check for empty journalq
+
+ Signed-off-by: David Zafman <dzafman@redhat.com>
+ (cherry picked from commit 8da4d9f6330c57d6b437ea44f54f147075e24195)
+
+commit ab893d769d2728368f94b035edde750a3fa5e617
+Author: David Zafman <dzafman@redhat.com>
+Date: Thu Jan 29 17:14:39 2015 -0800
+
+ test: Fix ceph-objectstore-tool test missing fd.close()
+
+ Signed-off-by: David Zafman <dzafman@redhat.com>
+ (cherry picked from commit ece630d5a741ba8c82f55f964f1887cb7fcaa493)
+
+commit b5f2ccd5bd77c7a473f38fdab183fd52577b7331
+Author: David Zafman <dzafman@redhat.com>
+Date: Thu Jan 29 17:13:41 2015 -0800
+
+ test: Fix ceph-objectstore-tool test error message
+
+ Signed-off-by: David Zafman <dzafman@redhat.com>
+ (cherry picked from commit 11c13eb7c182870727fbcb25a83f3348ac0bad13)
+
+commit 848822db38e000a7e7bfe49ae0fe03996bb7e8c1
+Author: David Zafman <dzafman@redhat.com>
+Date: Wed Apr 1 10:32:32 2015 -0700
+
+ test: ceph-objectstore-tool: Remove duplicate debug messages, keep cmd/log/call together
+
+ Signed-off-by: David Zafman <dzafman@redhat.com>
+ (cherry picked from commit 94b3d7632f2548c19beca5a2e024c95f601b61f3)
+
+commit 771dcd945281a091b165c0b1a90c1f6058dbf923
+Author: David Zafman <dzafman@redhat.com>
+Date: Fri Mar 27 19:47:01 2015 -0700
+
+ test: ceph-objectstore-tool import after split testing
+
+ Signed-off-by: David Zafman <dzafman@redhat.com>
+ (cherry picked from commit d80ce6668c1aa3c9898ab49e847c4dadafe256f0)
+
+commit 4f387b1e1c8dbfe9ed2a70fc02ff5ccf93ffb905
+Author: David Zafman <dzafman@redhat.com>
+Date: Tue Mar 31 08:16:03 2015 -0700
+
+ test: Use CEPH_DIR where appropriate
+
+ Signed-off-by: David Zafman <dzafman@redhat.com>
+ (cherry picked from commit 1e18e8a88f88809081684b09f36691cd724720b5)
+
+commit b337d677daf5b6098a2dbcf2d8966703cf8db449
+Author: David Zafman <dzafman@redhat.com>
+Date: Mon Mar 30 17:35:07 2015 -0700
+
+ test: Limit how long ceph-objectstore-tool test will wait for health
+
+ Signed-off-by: David Zafman <dzafman@redhat.com>
+ (cherry picked from commit 868cf457a3990ba9989aef55823630e3189acf4a)
+
+commit 09cb8a41ed6a9642978e399b426b21704c704f46
+Author: David Zafman <dzafman@redhat.com>
+Date: Mon Mar 30 17:33:46 2015 -0700
+
+ test: Add optional arg to vstart() to provide additional args to vstart
+
+ Signed-off-by: David Zafman <dzafman@redhat.com>
+ (cherry picked from commit dff17a800c9cc1cf0cc23d70479c031aa8e9cbfc)
+
+commit b4ac42be79bb11cb27282d97aec9e6ca8f658e5c
+Author: David Zafman <dzafman@redhat.com>
+Date: Thu Mar 5 19:35:27 2015 -0800
+
+ test: Test ceph-objectstore-tool --op dump-journal output
+
+ Signed-off-by: David Zafman <dzafman@redhat.com>
+ (cherry picked from commit 9b08bcf95caf77fb7f9bd293559534ed8ff3eded)
+
+ Conflicts:
+ src/test/ceph_objectstore_tool.py (trivial)
+
+commit 729abf5a83a656ac2a95ad147909bf7c8fa18999
+Author: David Zafman <dzafman@redhat.com>
+Date: Tue Mar 17 14:56:06 2015 -0700
+
+ test: Pep8 fixes for ceph-objectstore-tool test
+
+ Signed-off-by: David Zafman <dzafman@redhat.com>
+ (cherry picked from commit b0141108c0596b535d25792a9102787b1cd3eca3)
+
+commit 33813b66fa4402fe0d66d95d6f9b790b11c9f1f1
+Author: David Zafman <dzafman@redhat.com>
+Date: Thu Mar 5 18:37:44 2015 -0800
+
+ test: Fix ceph-objectstore-tool test, overwrite OTHERFILE so second check is meaningful
+
+ Signed-off-by: David Zafman <dzafman@redhat.com>
+ (cherry picked from commit 1b9f85befa1efff3b05b2af0e62d568eea37d790)
+
+commit f7ab316be9ce3592e0bc1c3a1012b0a83dfea2b4
+Author: David Zafman <dzafman@redhat.com>
+Date: Thu Mar 5 19:16:45 2015 -0800
+
+ osd: FileJournal: Add _fdump() that takes Formatter instead of ostream
+
+ Signed-off-by: David Zafman <dzafman@redhat.com>
+ (cherry picked from commit 130eba48495d0e6acd8a472cbf0c47ebbc7a038c)
+
+commit 99d3e17fe8c03eb30b18dee185623a9c16553d9e
+Author: David Zafman <dzafman@redhat.com>
+Date: Wed Feb 18 12:34:35 2015 -0800
+
+ osd: Add simple_dump() to FileJournal for unit testing
+
+ Allow a dump when entries aren't ObjectStore::Transaction's
+
+ Signed-off-by: David Zafman <dzafman@redhat.com>
+ (cherry picked from commit 8d5464c0f81aa9bb3be233a03bce64b505a265f4)
+
+commit 80fc57f79a9bd23e119be73fe01063e85c60ca83
+Author: David Zafman <dzafman@redhat.com>
+Date: Wed Feb 18 12:29:38 2015 -0800
+
+ osd: FileJournal clean-up
+
+ Move aio / directio adjustments to constructor
+ Indicate functions which only operate before journal is active
+ Make functions const when possible
+ Move push_back() of journalq to read_entry()
+ Change dump() to use do_read_entry() to minimize side effects
+
+ Signed-off-by: David Zafman <dzafman@redhat.com>
+ (cherry picked from commit 12fdf4ced0b2c17770c21204c8eccca8e4d0d2c9)
+
+ Conflicts:
+ src/os/FileJournal.cc (trivial)
+
+commit b8f4ea17274f9094efa169a28440701319c14516
+Author: David Zafman <dzafman@redhat.com>
+Date: Thu Feb 5 18:48:22 2015 -0800
+
+ osd: Dump header in FileJournal::dump()
+
+ Signed-off-by: David Zafman <dzafman@redhat.com>
+ (cherry picked from commit 3c97b32131e83c934b3d340eeb75284e898380c4)
+
+commit 21c3c18c7b25ddea664179797527ea9854c3f450
+Author: David Zafman <dzafman@redhat.com>
+Date: Thu Feb 5 18:40:25 2015 -0800
+
+ osd: FileJournal::read_entry() can't use a zero seq to check for corruption
+
+ Seen when using dump() on a journal which has all entries committed
+
+ Signed-off-by: David Zafman <dzafman@redhat.com>
+ (cherry picked from commit a7cda53d20eb6d35203fce6ec9f7ea1df432bf53)
+
+commit 288902fecd78b1926aa4a1d53587828fda63845d
+Author: David Zafman <dzafman@redhat.com>
+Date: Thu Feb 5 18:36:01 2015 -0800
+
+ osd: Fix flushing in FileJournal::dump()
+
+ Use ostream arg since caller is specifying
+ Move flush after last section close
+
+ Signed-off-by: David Zafman <dzafman@redhat.com>
+ (cherry picked from commit f2d83520f67fdc1b5a89b4ea742493a3df392989)
+
+commit a935ce501692f51be004f8cb20da29f18e649d44
+Author: David Zafman <dzafman@redhat.com>
+Date: Thu Apr 30 10:20:24 2015 -0700
+
+ osd: Add admin socket feature set_recovery_delay
+
+ Set the value of osd_recovery_delay_start to specified seconds
+
+ Signed-off-by: David Zafman <dzafman@redhat.com>
+ (cherry picked from commit 73b17319379d904ffdf9479ca476da8e8e34e935)
+
+ Conflicts:
+ src/osd/OSD.cc (trivial)
+
+commit 4ae3f88cc4493413c4aab54e21759507b0d572b0
+Author: David Zafman <dzafman@redhat.com>
+Date: Mon Apr 27 15:37:14 2015 -0700
+
+ ceph-objectstore-tool: For import/export --debug dump the log
+
+ Move log dumping code to common function dump_log()
+
+ Signed-off-by: David Zafman <dzafman@redhat.com>
+ (cherry picked from commit 545c78c65f33fcac60b5aa7ee2b574ceb0211fd5)
+
+commit cc5fa68c184f66d3ca6ff736eb308cba0a0d10b0
+Author: David Zafman <dzafman@redhat.com>
+Date: Fri Jan 30 16:56:10 2015 -0800
+
+ ceph-objectstore-tool: If object re-appears after removal, just skip it
+
+ Signed-off-by: David Zafman <dzafman@redhat.com>
+ (cherry picked from commit c6e41663e7434b4dcbb1abbe62ac008388da268a)
+
+commit d8ae1a9b842b6871225f0cc2d8a8dbdcf01238e4
+Author: David Zafman <dzafman@redhat.com>
+Date: Fri Jan 30 16:11:13 2015 -0800
+
+ ceph-objectstore-tool: Add --no-overwrite flag for import-rados
+
+ Signed-off-by: David Zafman <dzafman@redhat.com>
+ (cherry picked from commit 35cdcabbdad7dc7249029630c64022c822c67ddc)
+
+commit 2dbf843560de2b9b74d9b0d0baf2a303e6c4e86b
+Author: David Zafman <dzafman@redhat.com>
+Date: Mon Feb 2 16:23:18 2015 -0800
+
+ ceph-objectstore-tool: Remove list-lost because now we have --dry-run flag
+
+ Signed-off-by: David Zafman <dzafman@redhat.com>
+ (cherry picked from commit 3e7fe7e85716f80e055ffbc5305f406b3e020608)
+
+commit 35991747c4cf5c4f9c150aae128f63c7b8c8a5cd
+Author: David Zafman <dzafman@redhat.com>
+Date: Fri Jan 23 07:34:11 2015 -0800
+
+ ceph-objectstore-tool: Add --dry-run option
+
+ Fixes: #10290
+
+ Signed-off-by: David Zafman <dzafman@redhat.com>
+ (cherry picked from commit 2795161f470ab87cf4a82f455773c9b1b82946ef)
+
+commit 05d3b73ac6ef841af5037336996d1ed6bfdac4b5
+Author: David Zafman <dzafman@redhat.com>
+Date: Thu Jan 22 10:07:09 2015 -0800
+
+ ceph-objectstore-tool: Add dump-info command to show object info
+
+ Signed-off-by: David Zafman <dzafman@redhat.com>
+ (cherry picked from commit 244092d034781d2e980f9de7c6f9eea227967c5a)
+
+commit 2d764c54d4b028455be8b592712c6424f5f9f19e
+Author: David Zafman <dzafman@redhat.com>
+Date: Tue Jan 27 14:32:42 2015 -0800
+
+ ceph-objectstore-tool: Use empty string for <object> to specify pgmeta object
+
+ Signed-off-by: David Zafman <dzafman@redhat.com>
+ (cherry picked from commit c00290b836adba12212e8a57f13b0c9193ac0ef8)
+
+commit 3a533d767bafc466e653bdd89d064b5f2b9aa257
+Author: John Spray <john.spray@redhat.com>
+Date: Mon Apr 20 17:28:15 2015 +0100
+
+ ceph-objectstore-tool: Add a couple of strategically placed prints
+
+ Signed-off-by: John Spray <john.spray@redhat.com>
+ (cherry picked from commit fdb1a4b676765c5d3ca5d436f34230dd6996d7a7)
+
+commit 7947f4f72f4bb6441ea5c353757d9ea3f464cff4
+Author: David Zafman <dzafman@redhat.com>
+Date: Mon Apr 20 16:10:18 2015 -0700
+
+ ceph-objectstore-tool: Clean up error handling
+
+ Use negative errors throughout and positive error to specify exit status
+ cpp_strerror() handles negative errors
+ Clean up main() code to use local "ret"
+ Let end of main() decide how to treat the final value of "ret"
+
+ Signed-off-by: David Zafman <dzafman@redhat.com>
+ (cherry picked from commit a50679a1a3313e4090bf24f6e4dda28e7d67d731)
+
+ Adjust back cherry-pick f237ed97228839a1b412ad213945f0343df05bf5
+ Switched to use ret as in the original change from master
+
+commit 83de86e4e9dedc05fd65201715dadbd46074b7e0
+Author: David Zafman <dzafman@redhat.com>
+Date: Wed Apr 15 15:40:41 2015 -0700
+
+ ceph-objectstore-tool: Create section around log/missing/divergent_priors of --op log
+
+ Remove extra new lines in the output
+
+ Signed-off-by: David Zafman <dzafman@redhat.com>
+ (cherry picked from commit 548147b412eebe57861768e5fd66360c2582d2c6)
+
+commit ddfaa70ade3b6d7ff061083fcd610b588fbd4dd7
+Author: David Zafman <dzafman@redhat.com>
+Date: Tue Apr 14 13:49:26 2015 -0700
+
+ ceph-objectstore-tool: Add divergent_priors handling
+
+ Add to --op log output
+ Add to metadata_section for export
+ Add filtering of divergent_priors in case of splits
+
+ Fixes: #11237
+
+ Signed-off-by: David Zafman <dzafman@redhat.com>
+ (cherry picked from commit 6ad7e9b362f437fe028fe59639489efe87b3525f)
+
+commit add937c437a4bd86c932ef49525aff039d9bee90
+Author: David Zafman <dzafman@redhat.com>
+Date: Wed Mar 18 10:05:24 2015 -0700
+
+ ceph-objectstore-tool: Add --force option which is used for import only
+
+ Signed-off-by: David Zafman <dzafman@redhat.com>
+ (cherry picked from commit 2f4090daaea715b896e49f678933abb8a13b5c98)
+
+commit f33274894a83072a483b0646a91b5182a72c7c90
+Author: David Zafman <dzafman@redhat.com>
+Date: Fri Mar 13 00:41:39 2015 -0700
+
+ ceph-objectstore-tool: Fix pgid scan to skip snapdirs
+
+ Long standing bug where it wasn't skipping snapdirs if !debug
+ For debug output use stderr like all other cases
+
+ Signed-off-by: David Zafman <dzafman@redhat.com>
+ (cherry picked from commit 24f06598966319a62fa58a5831d9741fac1d471b)
+
+commit 3e68825e60a2e69a20198439347aadf8742d4ea6
+Author: David Zafman <dzafman@redhat.com>
+Date: Mon Feb 9 12:24:19 2015 -0800
+
+ ceph-objectstore-tool: Add dump-journal op
+
+ Have dump-journal op directly dump a filestore journal without
+ mounting or try to dump after mounting.
+
+ Fixes: #11135
+
+ Signed-off-by: David Zafman <dzafman@redhat.com>
+ (cherry picked from commit 381605e34a44edb9acfcfb5a56bd598b020e022f)
+
+commit aaff4d7bcbc3e48aa6c0342d66a9c30c93744064
+Author: David Zafman <dzafman@redhat.com>
+Date: Mon Feb 9 12:46:20 2015 -0800
+
+ ceph-objectstore-tool: On any exit release CephContext so logging can flush
+
+ Add myexit() which will put() the g_ceph_context if present before exit
+ Must umount() once the objectstore has been mounted
+
+ Fixes: #10809
+
+ Signed-off-by: David Zafman <dzafman@redhat.com>
+ (cherry picked from commit 409328bace0ffb3a457c0d384377bbbf37a2962d)
+
+commit 7445cf5a04d396dbc36e21aecd44bc4aadaff397
+Author: David Zafman <dzafman@redhat.com>
+Date: Mon Feb 9 17:28:04 2015 -0800
+
+ ceph-objectstore-tool: Check for keyvaluestore experimental feature
+
+ Don't list keyvaluestore as a valid type if feature not enabled
+
+ Signed-off-by: David Zafman <dzafman@redhat.com>
+ (cherry picked from commit fb2f9d500e52aa0834666550a684fe991701c9dd)
+
+commit 9da6c01b5e59e59a80d00e3d17cf5da05dd84f72
+Author: David Zafman <dzafman@redhat.com>
+Date: Mon Feb 9 17:14:50 2015 -0800
+
+ ceph-objectstore-tool: Eliminate obscure "Invalid params" error
+
+ Will fail later with "No such file or directory" for an empty data-path
+ because we've already checked for vm.count("data-path")
+
+ Signed-off-by: David Zafman <dzafman@redhat.com>
+ (cherry picked from commit cfca6835bd53d535bde2793551211845b0facebd)
+
+commit c5ac7ce09bc5b96722738a1884c6046aba6518f2
+Author: David Zafman <dzafman@redhat.com>
+Date: Mon Feb 9 15:37:57 2015 -0800
+
+ ceph-objectstore-tool: Check pgid validity earlier like we did before
+
+ This code was not doing the umount() even though it was moved after mount()
+
+ Signed-off-by: David Zafman <dzafman@redhat.com>
+ (cherry picked from commit 565b413df9c562a4071b9372d6362a9105c3538e)
+
+commit 18c49b6474a563b5f7f7cef671050d46ac4c3c4f
+Author: Sage Weil <sage@redhat.com>
+Date: Fri May 1 09:22:01 2015 -0700
+
+ Backport the merge commit of branch 'wip-journal-header' of git://github.com/XinzeChi/ceph
+
+ (cherry picked from commit 8d596bfa24c9c3e2aadbb87494284cb5fd824e55)
+
+ Conflicts:
+ src/os/FileJournal.cc (trivial)
+ src/os/FileJournal.h (trivial)
+
+ Renamed write_header() to write_header_sync() in a merge
+ Signed-off-by: David Zafman <dzafman@redhat.com>
+
+commit 546a7b988dac56770730ddc9395ee0d52a666fa3
+Merge: 6b7660c 3352b14
+Author: Loic Dachary <loic@dachary.org>
+Date: Thu Feb 25 22:39:06 2016 +0700
+
+ Merge pull request #7656 from dzafman/wip-14769-hammer
+
+ ceph.in: Notify user that 'tell' can't be used in interactive mode
+
+ Reviewed-by: Loic Dachary <ldachary@redhat.com>
+ Reviewed-by: Ken Dreyer <kdreyer@redhat.com>
+
+commit 6b7660c91d1837b585b365068da835127752ebfc
+Merge: e34c209 14b5fea
+Author: Loic Dachary <loic@dachary.org>
+Date: Thu Feb 25 22:37:58 2016 +0700
+
+ Merge pull request #7648 from tchaikov/wip-13783-hammer
+
+ mon/LogMonitor: use the configured facility if log to syslog
+
+ Reviewed-by: Loic Dachary <ldachary@redhat.com>
+
+commit cf433bac5b7bc6bdbb6fac56c420288544c79ef5
+Author: shun-s <songshun134@126.com>
+Date: Wed Dec 2 10:36:35 2015 +0800
+
+ global/pidfile: do not start two daemons with a single pid-file
+
+ add functions named pidfile_open and pidfile_verify to avoid starting two daemons by a single pid-file
+
+ Fixes: #13422
+ Signed-off-by: shun song <song.shun3@zte.com.cn>
+ (cherry picked from commit f2c0ef40fd674fecc6e3e97cd6155b976e6759b4)
+
+commit e34c2094ef44e6e52896820f4dd90a1c5d5bbfe8
+Merge: ec33aec b43c5b2
+Author: Loic Dachary <loic@dachary.org>
+Date: Thu Feb 25 19:39:49 2016 +0700
+
+ Merge pull request #7801 from dachary/wip-14863-hammer
+
+ hammer: unittest_crypto: benchmark 100,000 CryptoKey::encrypt() calls
+
+ Reviewed-by: Nathan Cutler <ncutler@suse.cz>
+
+commit b43c5b205f26198c79e21af3a6935a76f560a7fc
+Author: Sage Weil <sage@redhat.com>
+Date: Mon Jan 26 15:57:33 2015 -0800
+
+ unittest_crypto: benchmark 100,000 CryptoKey::encrypt() calls
+
+ Signed-off-by: Sage Weil <sage@redhat.com>
+ (cherry picked from commit fb4b6c52d8e31e8dedfa8aecc16c389f0e7d86cf)
+
+ Conflicts:
+ src/test/crypto.cc : complements the incorrect cherry-pick
+ df3f971eafda9c54881c13dcf47f996f18e17028 see
+ http://tracker.ceph.com/issues/14863 for more information
+
+commit ec33aec31fcac3b09bf06256b95c841a8c20d56f
+Merge: 4b46182 17d1b0d
+Author: Loic Dachary <loic@dachary.org>
+Date: Thu Feb 25 11:09:54 2016 +0700
+
+ Merge pull request #7185 from dachary/wip-14325-hammer
+
+ hammer: rgw: radosgw-admin bucket check --fix not work
+
+ Reviewed-by: Yehuda Sadeh <ysadehwe@redhat.com>
+
+commit 4b461829c24cd35656e86f507a78b0fff860c0b5
+Merge: 722ca62 5c92d1d
+Author: Loic Dachary <loic@dachary.org>
+Date: Thu Feb 25 11:09:28 2016 +0700
+
+ Merge pull request #7188 from dachary/wip-13799-hammer
+
+ hammer: rgw: default quota params
+
+ Reviewed-by: Yehuda Sadeh <ysadehwe@redhat.com>
+
+commit 722ca62e12ac977961d895dceaeb55f31d7b00ca
+Merge: 3c1e2d4 ad4df3b
+Author: Loic Dachary <loic@dachary.org>
+Date: Thu Feb 25 11:04:02 2016 +0700
+
+ Merge pull request #7414 from dachary/wip-14493-hammer
+
+ hammer: make rgw_fronends more forgiving of whitespace
+
+ Reviewed-by: Yehuda Sadeh <ysadehwe@redhat.com>
+
+commit 3c1e2d4216353c848f76b52d9c187e83574267a7
+Merge: b73a93d 3d84420
+Author: Sage Weil <sage@redhat.com>
+Date: Wed Feb 24 10:15:27 2016 -0800
+
+ Merge pull request #7415 from dachary/wip-14554-hammer
+
+ hammer: Unable to bring up OSD's after dealing with FULL cluster (OSD assert with /include/interval_set.h: 386: FAILED assert(_size >= 0))
+
+commit b73a93d8cd8bc8757a7a8960b2a9d448c7041515
+Merge: b3eac8e 5a450e6
+Author: Sage Weil <sage@redhat.com>
+Date: Wed Feb 24 10:15:03 2016 -0800
+
+ Merge pull request #7576 from dachary/wip-14579-hammer
+
+ hammer: mon sync does not copy config-key
+
+commit b3eac8e3dbb74ebcfdd22d10d6a6f2916d2bf127
+Merge: bf6dcc7 9e0a165
+Author: Sage Weil <sage@redhat.com>
+Date: Wed Feb 24 10:14:37 2016 -0800
+
+ Merge pull request #7577 from dachary/wip-14689-hammer
+
+ hammer: consume_maps clearing of waiting_for_pg needs to check the spg_t shard for acting set membership
+
+commit bf6dcc7c6da5d06b21e4a4fad3f7a65e8ca84f50
+Merge: 293e8c7 d5ba063
+Author: Sage Weil <sage@redhat.com>
+Date: Wed Feb 24 10:03:55 2016 -0800
+
+ Merge pull request #7590 from SUSE/wip-14720-hammer
+
+ hammer: OSDMap: reset osd_primary_affinity shared_ptr when deepish_copy_from
+
+commit 293e8c7b038a22e2135e7bf288a8ff4b8ce32a14
+Merge: 5b724fc 10d29da
+Author: Sage Weil <sage@redhat.com>
+Date: Wed Feb 24 10:03:18 2016 -0800
+
+ Merge pull request #7645 from dachary/wip-14760-hammer
+
+ hammer: OSD coredumps with leveldb compact on mount = true
+
+commit 5b724fcce0e260a04bd6889c3d4c6d9bf44971cf
+Merge: bb84692 1c8c708
+Author: Loic Dachary <loic@dachary.org>
+Date: Wed Feb 24 12:56:13 2016 +0700
+
+ Merge pull request #7485 from dillaman/wip-14611-hammer
+
+ librbd: flattening an rbd image with active IO can lead to hang
+
+ Reviewed-by: Loic Dachary <ldachary@redhat.com>
+
+commit bb84692e96569823e23fdd02356446577959f438
+Merge: ee014d8 df3f971
+Author: Loic Dachary <loic@dachary.org>
+Date: Wed Feb 24 12:55:18 2016 +0700
+
+ Merge pull request #7488 from ceph/wip-auth-hammer
+
+ hammer: auth: use libnss more safely
+
+ Reviewed-by: Loic Dachary <ldachary@redhat.com>
+
+commit ee014d8084c05ec3c876a9e46dcb6e558918a0e4
+Merge: 576225d 88ffcc2
+Author: Loic Dachary <loic@dachary.org>
+Date: Wed Feb 24 12:48:05 2016 +0700
+
+ Merge pull request #7475 from dachary/wip-14602-hammer
+
+ hammer: ceph-disk: use blkid instead of sgdisk -i
+
+ Reviewed-by: Loic Dachary <ldachary@redhat.com>
+
+commit 576225d6d5a64f0f43971ccca4d74b5dc44c5c63
+Merge: a6f7a2f eb048a3
+Author: Loic Dachary <loic@dachary.org>
+Date: Wed Feb 24 12:47:07 2016 +0700
+
+ Merge pull request #7456 from dachary/wip-14587-hammer
+
+ hammer: qa/workunits/post-file.sh: sudo
+
+ Reviewed-by: Loic Dachary <ldachary@redhat.com>
+
+commit a6f7a2f1347393c1cf7564a2ba8d1ba6aff2122c
+Merge: 74cfe5c f04e007
+Author: Loic Dachary <loic@dachary.org>
+Date: Wed Feb 24 12:38:47 2016 +0700
+
+ Merge pull request #6946 from dachary/wip-14087-shard-size
+
+ osd: log inconsistent shard sizes
+
+ Reviewed-by: David Zafman <dzafman@redhat.com>
+
+commit 74cfe5c5f49cb566224a3ff0ef8ab515eadc78ac
+Merge: e832001 f209819
+Author: Loic Dachary <loic@dachary.org>
+Date: Wed Feb 24 12:37:55 2016 +0700
+
+ Merge pull request #7110 from david-z/wip-hammer-fix-logrotate-ceph-fuse
+
+ [ceph-fuse] fix ceph-fuse writing to stale log file after log rotation
+
+ Reviewed-by: Sage Weil <sage@redhat.com>
+ Reviewed-by: Greg Farnum <gfarnum@redhat.com>
+
+commit a1fc101084c5aefeb64da344158783a186a28a93
+Author: Sage Weil <sage@redhat.com>
+Date: Sun Feb 8 07:47:23 2015 -0800
+
+ crushtool: send --tree to stdout
+
+ Signed-off-by: Sage Weil <sage@redhat.com>
+ (cherry picked from commit dca345280e4f6124a8b5aea73e6219488111c356)
+
+ Conflicts:
+ src/tools/crushtool.cc (trivial)
+
+commit 4fb688d15c40a9b9d5a54700b3c7695a97ffd03b
+Author: Xinze Chi <xmdxcxz@gmail.com>
+Date: Tue Mar 3 11:24:50 2015 +0000
+
+ osd: write journal header by force when journal write close
+
+ osd update the journal header when ceph call FileStore::sync_entry(
+ ApplyManager::commit_finish -> FileJournal::committed_thru).
+ But, it doesnot write the journal head until the next transaction
+ (calling do_write or do_aio_write).
+
+ So write jouranl header when journal write close, so that
+ committed_up_to in journal header is new enough. ceph may
+ not replay some transaction which has been writen to filestore.
+
+ Signed-off-by: Xinze Chi <xmdxcxz@gmail.com>
+ (cherry picked from commit 8f80ae3fbaba7b0e64b6e4df6c2dddd10ac50e5a)
+
+commit 31a2fc475a2de8a656048c85595049ec4548ec6a
+Author: Jason Dillaman <dillaman@redhat.com>
+Date: Thu Feb 11 10:33:40 2016 -0500
+
+ common/bit_vector: use hard-coded value for block size
+
+ The CEPH_PAGE_SIZE is not actually a constant. On aarch64 platforms
+ the page size is 64K instead of the assumed 4K. The CRC block
+ computations require a true constant.
+
+ Fixes: #14747
+ Signed-off-by: Jason Dillaman <dillaman@redhat.com>
+ (cherry picked from commit ba2e6ce46fb5f781ffaf6483db8ebd99238419c6)
+
+commit 3352b144e0b1500651d8a194c3ebe2aae2f078d0
+Author: David Zafman <dzafman@redhat.com>
+Date: Tue Oct 20 18:10:39 2015 -0700
+
+ ceph.in: Notify user that 'tell' can't be used in interactive mode
+
+ Signed-off-by: David Zafman <dzafman@redhat.com>
+ (cherry picked from commit a341d977d42a3010267b64e15cebae3085507297)
+
+ Conflicts:
+ src/ceph.in (trivial resolution)
+
+commit 14b5feab80f07b4ed2b8f6d77ea1fa920e98be05
+Author: Kefu Chai <kchai@redhat.com>
+Date: Mon Jul 6 12:17:21 2015 +0800
+
+ mon/LogMonitor: use the configured facility if log to syslog
+
+ Fixes: #13748
+ Signed-off-by: Kefu Chai <kchai@redhat.com>
+ (cherry picked from commit 4d2ca37d3b8f067d0cf0f7cfea24964ac181115d)
+
+commit 10d29dab3176ec945dc7272323df0028ef7f0274
+Author: Xiaoxi Chen <xiaoxi.chen@intel.com>
+Date: Thu Apr 16 13:42:42 2015 +0800
+
+ os/LevelDBStore:fix bug when compact_on_mount
+
+ Initialize the performance counter(l_rocksdb_compact)
+ before use it in compact().
+
+ Signed-off-by: Xiaoxi Chen <xiaoxi.chen@intel.com>
+ (cherry picked from commit 932d59d084090297c89cfa3ff7df0a952f807bab)
+
+commit d5ba063cdf3a8b92862ef6657001725d6192fe86
+Author: Xinze Chi <xinze@xsky.com>
+Date: Sun Feb 7 18:50:29 2016 +0800
+
+ OSDMap: reset osd_primary_affinity shared_ptr when deepish_copy_from
+
+ Base on current logic, OSDMonitor may call create_pending and
+ encode_pending twice for the some epoch.
+
+ In encode_pending:
+
+ tmp.deepish_copy_from(osdmap);
+ tmp.apply_incremental(pending_inc);
+
+ This Op would change the tmp osd_primary_affinity, but the osd_primary_affinity
+ is declared as ceph::shared_ptr, so this would change the osdmap too. When this
+ round encode_pending is proposed fail. We may call encode_pending again, but the
+ osdmap is changed last round, so the pending_inc would be wrong.
+
+ Fixes: #14686
+ Signed-off-by: Xinze Chi <xinze@xsky.com>
+ (cherry picked from commit 990b437f4e616a87f4f7438e51945d531170ca83)
+
+commit 9e0a1656200c2f91386215924304b495dd705dae
+Author: Samuel Just <sjust@redhat.com>
+Date: Thu Jan 7 08:09:46 2016 -0800
+
+ OSD::consume_map: correctly remove pg shards which are no longer acting
+
+ A particular shard may be non-active even if the osd is in the acting
+ set.
+
+ Fixes: 14278
+ Backport: hammer
+ Signed-off-by: Samuel Just <sjust@redhat.com>
+ (cherry picked from commit bd2fdf8c56c1aeed6cea3eb59046dbb6af470111)
+
+commit 5a450e6734b4ff9e5e483c74b67df385b9a3d640
+Author: shawn <cxwshawn@gmail.com>
+Date: Tue Jan 26 05:56:12 2016 -0500
+
+ mon: add mon_config_key prefix when sync full
+
+ Signed-off-by: Xiaowei Chen <chen.xiaowei@h3c.com>
+ (cherry picked from commit b77cd31b161e78467bbb6476776c0f1d43e615cf)
+
+commit eb048a393e7b54dcf5f2245e34a1aa0de281424d
+Author: Sage Weil <sage@redhat.com>
+Date: Sat Sep 5 09:28:17 2015 -0400
+
+ qa/workunits/post-file.sh: sudo
+
+ Only root can read the key in /usr/share/...
+
+ Signed-off-by: Sage Weil <sage@redhat.com>
+ (cherry picked from commit 82b0243ec318457e376288a6b32487fbea059705)
+
+commit e9039f4fd3dfe9a3083fcfe64d8012568e8db96f
+Author: Sage Weil <sage@redhat.com>
+Date: Tue Apr 28 17:40:20 2015 -0700
+
+ qa/workunits/post-file: pick a dir that's readable by world
+
+ Signed-off-by: Sage Weil <sage@redhat.com>
+ (cherry picked from commit 04b00029e16971abf1937facbbff8da00d6a3452)
+
+commit 902abe7373c150000d3fc4d66d9c989ed208d0bf
+Author: Sage Weil <sage@redhat.com>
+Date: Thu Apr 9 09:58:39 2015 -0700
+
+ qa/workunits/post-file.sh: use /etc/default
+
+ base-files doesn't existing on rhel. /etc/default is everywhere and it's
+ small.
+
+ Signed-off-by: Sage Weil <sage@redhat.com>
+ (cherry picked from commit 52235e32561ef3e91f07c59c8fd89c4df244f461)
+
+commit 1c8c708e43e4c97af17932027ae6b5d26c124c43
+Author: Jason Dillaman <dillaman@redhat.com>
+Date: Wed Dec 23 12:06:50 2015 -0500
+
+ librbd: ensure librados callbacks are flushed prior to destroying image
+
+ Fixes: #14092
+ Signed-off-by: Jason Dillaman <dillaman@redhat.com>
+ (cherry picked from commit 98157ab3274bd960e4487e34f5a83e9c921a6ac8)
+
+commit f892566fc9b78ab38702b75422321a6d0a5bbb7b
+Author: Jason Dillaman <dillaman@redhat.com>
+Date: Thu Jul 30 22:31:55 2015 -0400
+
+ librbd: simplify IO flush handling
+
+ Add a new convenience method to ImageCtx for handling flush
+ requests and cleanup flush handling with dealing with the cache.
+
+ Signed-off-by: Jason Dillaman <dillaman@redhat.com>
+ (cherry picked from commit e8d8096babaf15fe8af717297d512f580aff6c18)
+
+commit e5dfd3dd7a53bf79f1bfc17b8a4a720aba08d7c3
+Author: Jason Dillaman <dillaman@redhat.com>
+Date: Fri Aug 14 13:28:13 2015 -0400
+
+ WorkQueue: PointerWQ drain no longer waits for other queues
+
+ If another (independent) queue was processing, drain could
+ block waiting. Instead, allow drain to exit quickly if
+ no items are being processed and the queue is empty for
+ the current WQ.
+
+ Signed-off-by: Jason Dillaman <dillaman@redhat.com>
+ (cherry picked from commit b118d7df1e34387b6e5649a5b205cf061598d0d4)
+
+commit edf60b452de3c6eb22c75be2547f51812e6eaf1e
+Author: Jason Dillaman <dillaman@redhat.com>
+Date: Tue Feb 2 10:54:53 2016 -0500
+
+ test: new librbd flatten test case
+
+ AIO operations after a flatten operation were previously
+ hanging during the close of the parent image.
+
+ Signed-off-by: Jason Dillaman <dillaman@redhat.com>
+ (cherry picked from commit b59158d9f0c3dbe4b47be1dfd27aaa5ad92e6063)
+
+commit 88ffcc2cbd73602819ad653695de7e8718f6707d
+Author: Loic Dachary <ldachary@redhat.com>
+Date: Fri Dec 18 17:03:21 2015 +0100
+
+ ceph-disk: use blkid instead of sgdisk -i
+
+ sgdisk -i 1 /dev/vdb opens /dev/vdb in write mode which indirectly
+ triggers a BLKRRPART ioctl from udev (starting version 214 and up) when
+ the device is closed (see below for the udev release note). The
+ implementation of this ioctl by the kernel (even old kernels) removes
+ all partitions and adds them again (similar to what partprobe does
+ explicitly).
+
+ The side effects of partitions disappearing while ceph-disk is running
+ are devastating.
+
+ sgdisk is replaced by blkid which only opens the device in read mode and
+ will not trigger this unexpected behavior.
+
+ The problem does not show on Ubuntu 14.04 because it is running udev <
+ 214 but shows on CentOS 7 which is running udev > 214.
+
+ git clone git://anonscm.debian.org/pkg-systemd/systemd.git
+ systemd/NEWS:
+ CHANGES WITH 214:
+
+ * As an experimental feature, udev now tries to lock the
+ disk device node (flock(LOCK_SH|LOCK_NB)) while it
+ executes events for the disk or any of its partitions.
+ Applications like partitioning programs can lock the
+ disk device node (flock(LOCK_EX)) and claim temporary
+ device ownership that way; udev will entirely skip all event
+ handling for this disk and its partitions. If the disk
+ was opened for writing, the close will trigger a partition
+ table rescan in udev's "watch" facility, and if needed
+ synthesize "change" events for the disk and all its partitions.
+ This is now unconditionally enabled, and if it turns out to
+ cause major problems, we might turn it on only for specific
+ devices, or might need to disable it entirely. Device Mapper
+ devices are excluded from this logic.
+
+ http://tracker.ceph.com/issues/14094 Fixes: #14094
+
+ Signed-off-by: Ilya Dryomov <idryomov@redhat.com>
+ Signed-off-by: Loic Dachary <loic@dachary.org>
+ (cherry picked from commit 9dce05a8cdfc564c5162885bbb67a04ad7b95c5a)
+
+ Conflicts:
+ src/ceph-disk: keep get_partition_type as it is because
+ some hammer users may rely on the fact that it is able
+ to fallback to sgdisk if blkid is old. Chances are an
+ old blkid also means an old udev that does not have the
+ problem this fix is adressing. The get_partition_uuid
+ is modified to try blkid first, with the same rationale.
+
+commit f209819fb676eadf099cc764e3ed3b20fd17b688
+Author: Zhi Zhang <willzzhang@tencent.com>
+Date: Mon Feb 1 11:03:30 2016 +0800
+
+ [ceph-fuse] fix ceph-fuse writing to stale log file after log rotation
+
+ This fix should be applied to hammer branch. It can't be directly applied to master branch, because logrotate.conf is changed on matser since ceph-osd, ceph-mon, etc, is controlled by systemd with user/group as 'ceph' by default, while ceph-fuse might be started as root privilege by external users.
+
+ Signed-off-by: Zhi Zhang <zhangz.david@outlook.com>
+
+commit 3d84420847642e1cb4212f943ecf3ed479112d96
+Author: Alexey Sheplyakov <asheplyakov@mirantis.com>
+Date: Thu Jan 21 09:42:09 2016 +0300
+
+ PG::activate(): handle unexpected cached_removed_snaps more gracefully
+
+ PGPool::update(): ditto
+
+ Fixes: #14428
+ Backport: infernalis, hammer, firefly
+
+ Signed-off-by: Alexey Sheplyakov <asheplyakov@mirantis.com>
+ (cherry picked from commit aba6746b850e9397ff25570f08d0af8847a7162c)
+
+commit ad4df3be0f4adba5e8e14829be724fa3a92263c8
+Author: Matt Benjamin <mbenjamin@redhat.com>
+Date: Tue Dec 15 11:28:44 2015 -0500
+
+ rgw: warn on suspicious civetweb frontend parameters
+
+ Warns about incorrect spacing near 'port' (e.g., 'port = 80').
+
+ Fixes issue #12038.
+
+ Signed-off-by: Matt Benjamin <mbenjamin@redhat.com>
+ (cherry picked from commit 93497e576a946ed7e59f4a4299e447b65aa1774b)
+
+commit 5c92d1d2f11d59651eaa9c4ba6476b9f71990f1c
+Author: Daniel Gryniewicz <dang@redhat.com>
+Date: Fri Sep 25 11:02:20 2015 -0400
+
+ rgw: Add default quota config
+
+ Add a default quota config that is applied when no specific quota is
+ enabled. There are both per-bucket and per-user defaults. Defaults are
+ enabled if either max count or max size is enabled.
+
+ This fixes issues 12912 and 12997.
+
+ Signed-off-by: Daniel Gryniewicz <dang@redhat.com>
+ (cherry picked from commit 3047b5690eebb7fcd2d7a26acd20105e016a44c4)
+
+commit 17d1b0d859112dc9fb5b7a6e2140124790c5f260
+Author: Weijun Duan <duanweijun@h3c.com>
+Date: Sun Jan 3 20:12:04 2016 -0500
+
+ rgw: radosgw-admin bucket check --fix not work
+
+ Fixed:#14215
+
+ Signed-off-by: Weijun Duan <duanweijun@h3c.com>
+ (cherry picked from commit a17f4e27d608ef29cf499fe76246929ec7962783)
+
+commit df3f971eafda9c54881c13dcf47f996f18e17028 (refs/remotes/markhpc/wip-auth-hammer, refs/remotes/gh/wip-auth-hammer)
+Author: Sage Weil <sage@redhat.com>
+Date: Mon Feb 23 14:58:19 2015 -0800
+
+ auth: return error code from encrypt/decrypt; make error string optional
+
+ This is simpler for a lot of callers.
+
+ Signed-off-by: Sage Weil <sage@redhat.com>
+ (cherry picked from commit 40203f711dd59c7f61f5f8eb56a97842c3206494)
+
+ Conflicts:
+ src/test/crypto.cc (trivial)
+
+commit 224bb3928de048b13a96ee0377b6d279ce84ac0a
+Author: Sage Weil <sage@redhat.com>
+Date: Tue Jan 27 09:17:28 2015 -0800
+
+ auth: optimize crypto++ key context
+
+ The cbc appears to be stateful, but the key is not.
+
+ Signed-off-by: Sage Weil <sage@redhat.com>
+ (cherry picked from commit 7762f1886cab7f7b941851b0be4ec904723cb0e3)
+
+commit f11718de7873fe1fad1649358f208a4910837a7e
+Author: Sage Weil <sage@redhat.com>
+Date: Sun Feb 1 15:07:35 2015 -0800
+
+ auth/Crypto: optimize libnss key
+
+ Allocate the key and slot once per key instead of once per encrypt/
+ decrypt operation. This improves things by a factor of almost 4x
+ for my microbenchmark.
+
+ Signed-off-by: Sage Weil <sage@redhat.com>
+ (cherry picked from commit 973cd1c00a7811e95ff0406a90386f6ead5491c4)
+
+commit d1b6096c79164f8a5830dee6b5f186c405cf73ab
+Author: Sage Weil <sage@redhat.com>
+Date: Sun Feb 1 15:05:54 2015 -0800
+
+ auth: refactor crypto key context
+
+ Cache all of the crypto key context in a new CryptoKeyHandler struct that
+ is attached to CryptoKey.
+
+ Signed-off-by: Sage Weil <sage@redhat.com>
+ (cherry picked from commit 16b3515af3df439fba7d545587285b50e9814165)
+
+commit 3249f48a07391c98634aebd87f18fc2edbe95ca2
+Author: Sage Weil <sage@redhat.com>
+Date: Thu Jan 22 15:49:25 2015 -0800
+
+ auth/cephx: optimize signature check
+
+ The encode_encrypt() helper will generate a bufferlist with a simple
+ structure. Profiles seem to indicate this is taking a large amount of time
+ in the message receive path.
+
+ Avoid the encode overhead since we have a tiny buffer with a fixed and
+ known structure.
+
+ Reported-by: Andreas Bluemle <andreas.bluemle@itxperts.de>
+ Signed-off-by: Sage Weil <sage@redhat.com>
+ (cherry picked from commit 8d16d4ce14a82356007c14fb7535170933eb7812)
+
+commit 51eaf98e25287705c9c25d2d3a5df248ba066f2d
+Author: Sage Weil <sage@redhat.com>
+Date: Thu Jan 22 15:40:23 2015 -0800
+
+ auth/cephx: move signature calc into helper
+
+ Signed-off-by: Sage Weil <sage@redhat.com>
+ (cherry picked from commit 4e14a5fedbfacd164639f6a59a4d152404f3f9d1)
+
+ Conflicts:
+ src/auth/cephx/CephxSessionHandler.cc (trivial, const changes)
+
+commit c240da9e0693dc627162a0c70569dda519ec25e8
+Author: Sage Weil <sage@redhat.com>
+Date: Mon Jan 26 15:56:39 2015 -0800
+
+ auth/Crypto: avoid memcpy on libnss crypto operation
+
+ Signed-off-by: Sage Weil <sage@redhat.com>
+ (cherry picked from commit e972a6951142cbea3fe7c2e08933c808693d60c4)
+
+commit 86cc0f0c5e10262bb494ecee415789fd6815b1ff
+Author: Sage Weil <sage@redhat.com>
+Date: Mon Jan 26 15:49:10 2015 -0800
+
+ auth: make CryptoHandler implementations totally private
+
+ There is no need to expose these implementations outside Crypto.cc.
+
+ Signed-off-by: Sage Weil <sage@redhat.com>
+ (cherry picked from commit ad5a1549f401af3eae38f5c4de24e7b952e40f7f)
+
+commit f04e0075eabfb1b9d19c75761c321098546c4044
+Author: Loic Dachary <ldachary@redhat.com>
+Date: Tue Dec 15 18:28:29 2015 +0100
+
+ osd: log inconsistent shard sizes
+
+ When an OSD asserts because it cannot recover from an unexpected erasure
+ coded shard size, the object needs to be manually fixed (i.e. the shard
+ must be removed so it can be reconstructed). Unfortunately the assert
+ does not display the name of the object and it is not displayed unless
+ the OSD logs are >= 10, which is uncommon on an actual cluster because
+ it creates log files that are too big.
+
+ The problem has been fixed in infernalis as part of
+ https://github.com/ceph/ceph/pull/5173 and backporting it is non
+ trivial.
+
+ The error condition is modified to make it easy for the system
+ administrator to identify which object is causing the crash and what
+ steps must be taken to fix the issue.
+
+ http://tracker.ceph.com/issues/14009 Refs: #14009
+
+ Signed-off-by: Loic Dachary <loic@dachary.org>
+
+commit b2393dcea4ca02fe093481d6a2815b0c857fddc9 (refs/remotes/markhpc/hammer-client-inoderef)
+Author: Yan, Zheng <zyan@redhat.com>
+Date: Fri Nov 20 15:42:05 2015 +0800
+
+ client: add InodeRef.h to make dist
+
+ Signed-off-by: Yan, Zheng <zyan@redhat.com>
+
+commit fa79bd978f646001365b14009efe9fa5c562f681
+Author: Yan, Zheng <zyan@redhat.com>
+Date: Wed Jun 24 15:54:31 2015 +0800
+
+ client: use smart pointer to track 'cwd' and 'root_parents'
+
+ Signed-off-by: Yan, Zheng <zyan@redhat.com>
+ (cherry picked from commit 8c45ae1239c934b6727071398a1cfccb6277069e)
+
+commit fcafc65e042c0ed913b5b564812180cd29eefb43
+Author: Yan, Zheng <zyan@redhat.com>
+Date: Wed Jun 24 15:52:10 2015 +0800
+
+ client: convert Inode::snapdir_parent to smart pointer
+
+ Signed-off-by: Yan, Zheng <zyan@redhat.com>
+ (cherry picked from commit 89648e7ed56a1299a096b16080e4a52724893bdd)
+
+commit 78cca4e3b21308cc0a3f4838828a465482f619c7
+Author: Yan, Zheng <zyan@redhat.com>
+Date: Wed Jun 24 15:39:31 2015 +0800
+
+ client: use smart pointer to track temporary inode reference
+
+ Signed-off-by: Yan, Zheng <zyan@redhat.com>
+ (cherry picked from commit 217837b89f6adabcf686377a9b3d33d5008b1097)
+
+commit bad6f335ccd8d277f31a27f04d10683c73d0037a
+Author: Yan, Zheng <zyan@redhat.com>
+Date: Wed Jun 24 15:24:41 2015 +0800
+
+ client: convert CapSnap::in to smart pointer
+
+ Signed-off-by: Yan, Zheng <zyan@redhat.com>
+
+commit 4bb48ee4ae49355e3a4bcd7424545c04ce284f89
+Author: Yan, Zheng <zyan@redhat.com>
+Date: Wed Jun 24 15:50:10 2015 +0800
+
+ client: convert Fh::inode to smart pointer
+
+ Signed-off-by: Yan, Zheng <zyan@redhat.com>
+ (cherry picked from commit dac11e6b4b1e8766ee5165366cf021d9ee91d3ae)
+
+commit 5bebb3acf1fa85ab301aa8ca4e99542c9d34d173
+Author: Yan, Zheng <zyan@redhat.com>
+Date: Wed Jun 24 15:00:50 2015 +0800
+
+ client: use smart pointers in MetaRequest
+
+ Signed-off-by: Yan, Zheng <zyan@redhat.com>
+ (cherry picked from commit fd02f0f245ccdc1d33c6d24f57267c8fb102618b)
+
+commit e18f1aec94ec021a687317bab00c59d3d223c2bc
+Author: Yan, Zheng <zyan@redhat.com>
+Date: Wed Jun 24 11:21:23 2015 +0800
+
+ client: convert Dentry::inode to smart pointer
+
+ Signed-off-by: Yan, Zheng <zyan@redhat.com>
+ (cherry picked from commit 07f580977319110cbdd60c78fff892c85711ef3e)
+
+commit a7f6d2ffb84dee5bec4e373c1db723805e39a1bb
+Author: Yan, Zheng <zyan@redhat.com>
+Date: Sat May 23 20:01:46 2015 +0800
+
+ client: hold reference for returned inode
+
+ CLient::make_request() returns pointer of target inode, but it does not
+ increase reference count of the returned inode. The inode may get freed
+ when CLient::make_request() releases MetaRequest.
+
+ he fix is hold a reference for the returned inode. Since there are many
+ of places use CLient::make_request() directly or indirectly, it's easy
+ to leak reference. This patch uses intrusive_ptr to track the reference.
+
+ Signed-off-by: Yan, Zheng <zyan@redhat.com>
+ (cherry picked from commit ad9c22a4ca56d7ad3c1666795bd8c9785eaccf70)
--- /dev/null
+commit 838cd35201e4fe1339e16d987cc33e873524af90 (tag: refs/tags/v0.94.8, refs/remotes/gh/hammer)
+Author: Jenkins Build Slave User <jenkins-build@trusty-huge--349f4788-0128-42d9-aca5-78c0aad008e6.localdomain>
+Date: Fri Aug 26 00:02:49 2016 +0000
+
+ 0.94.8
+
+commit eb27865f268eaa4abc4e4b46354f1ea1556d1a5c
+Merge: 08277b7 5248929
+Author: Loic Dachary <loic@dachary.org>
+Date: Wed Aug 17 15:26:49 2016 +0200
+
+ Merge pull request #10750 from ceph/wip-14799-hammer
+
+ hammer: rocksdb do not link against tcmalloc if it's disabled
+
+ Reviewed-by: Loic Dachary <ldachary@redhat.com>
+
+commit 5248929c296d6130ee99fe94fbe69151d241efb8
+Author: Kefu Chai <kchai@redhat.com>
+Date: Tue Aug 16 23:45:18 2016 -0700
+
+ rocksdb: disable tcmalloc if disabled
+
+ the rocksdb/configure.ac does not support --with-tcmalloc before,
+ and the updated rocksdb commit has the change for '--with-tcmalloc'
+ option, so let's pick it up.
+
+ Fixes: http://tracker.ceph.com/issues/14799
+ Signed-off-by: Kefu Chai <kchai@redhat.com>
+
+commit fdfcd9b66cda1c637fbaad1c15d2ea04e426210d
+Author: Sage Weil <sage@redhat.com>
+Date: Sat Sep 12 14:12:20 2015 -0400
+
+ ceph.spec: respect CEPH_EXTRA_CONFIGURE_ARGS
+
+ Signed-off-by: Sage Weil <sage@redhat.com>
+ (cherry picked from commit 51abff11688f0201b8f4076ac515e4515929d4cb)
+ Signed-off-by: Brad Hubbard <bhubbard@redhat.com>
+
+commit 08277b7bc7c0e533c3fd56a0040dc0ddc74637d6
+Merge: bcab369 d5274a3
+Author: Orit Wasserman <owasserm@redhat.com>
+Date: Sat Aug 13 19:19:37 2016 +0200
+
+ Merge pull request #10718 from oritwas/wip-14328-hammer
+
+ hammer: rgw: the swift key remains after removing a subuser
+
+commit bcab36992580e5666afbf8e7bada4e850dfc84c6
+Merge: da2960f 699b7c8
+Author: Orit Wasserman <owasserm@redhat.com>
+Date: Sat Aug 13 18:22:19 2016 +0200
+
+ Merge pull request #10509 from yehudasa/wip-15557-hammer
+
+ rgw: Have a flavor of bucket deletion to bypass GC and to trigger
+
+commit d5274a3aeb7cc40f5ac04ac1ffcd6e3fc3019be3
+Author: Orit Wasserman <owasserm@redhat.com>
+Date: Wed Jan 20 17:24:38 2016 +0100
+
+ rgw: fix subuser rm command failure
+
+ Fixes: 14375
+ Signed-off-by: Orit Wasserman <owasserm@redhat.com>
+ (cherry picked from commit bbc06e70b49b2917ee63985727cb92724fb99209)
+
+commit f9637743efc7ba3164e3bb9ee7a768801e1599da
+Author: Sangdi Xu <xu.sangdi@h3c.com>
+Date: Wed Dec 16 09:09:16 2015 +0800
+
+ rgw: add a method to purge all associate keys when removing a subuser
+
+ Fixes: #12890
+
+ When removing a subuser, make sure all of its keys, including the swift key and possible s3 keys, are also deleted.
+
+ Signed-off-by: Sangdi Xu <xu.sangdi@h3c.com>
+ (cherry picked from commit e7b7e1afc7a81c3f97976f7442fbdc5118b532b5)
+
+commit da2960f974b9a64a683ac8b77faf08fda3a5d0ba
+Merge: 0f67539 3a30ffc
+Author: Nathan Cutler <presnypreklad@gmail.com>
+Date: Fri Aug 12 12:23:41 2016 +0200
+
+ Merge pull request #10291 from badone/wip-13829-hammer
+
+ hammer: config set with negative value results in "error setting 'filestore_merge_threshold' to '-40': (22) Invalid argument"
+
+ Reviewed-by: Samuel Just <sjust@redhat.com>
+ Reviewed-by: Josh Durgin <jdurgin@redhat.com>
+ Reviewed-by: Kefu Chai <kchai@redhat.com>
+ Reviewed-by: Nathan Cutler <ncutler@suse.com>
+
+commit 0f67539cf5efc46a92d7ea3ac031e0ce1c573a7a
+Merge: 1e01986 0d4b601
+Author: Loic Dachary <loic@dachary.org>
+Date: Fri Aug 12 09:46:30 2016 +0200
+
+ Merge pull request #10699 from ktdreyer/wip-15867-nroff
+
+ jewel: doc: fix by-parttypeuuid in ceph-disk(8) nroff
+
+ Reviewed-by: Loic Dachary <ldachary@redhat.com>
+
+commit 0d4b6013f0f130c93e2e488d1cd83527ad91274f
+Author: Ken Dreyer <kdreyer@redhat.com>
+Date: Thu Aug 11 17:11:41 2016 -0600
+
+ doc: fix by-parttypeuuid in ceph-disk(8) nroff
+
+ Commit 221efb0b893adbfd7a19df171cf967fee87afcc7 altered the rST source
+ for the ceph-disk man page. In Hammer, we also have to modify the nroff
+ sources, because static copies of the generated man pages are stored in
+ Git.
+
+ Fixes: http://tracker.ceph.com/issues/15867
+ Signed-off-by: Ken Dreyer <kdreyer@redhat.com>
+
+commit 1e01986e9550700a11adfc1b175eca042c9cb188
+Merge: de28029 187d308
+Author: Nathan Cutler <presnypreklad@gmail.com>
+Date: Thu Aug 11 22:58:33 2016 +0200
+
+ Merge pull request #9741 from SUSE/wip-16343-hammer
+
+ hammer: boost uuid makes valgrind complain
+
+ Reviewed-by: Samuel Just <sjust@redhat.com>
+ Reviewed-by: Sage Weil <sage@redhat.com>
+ Reviewed-by: Ken Dreyer <kdreyer@redhat.com>
+ Reviewed-by: Nathan Cutler <ncutler@suse.com>
+
+commit de28029c25e4ff527c6021488381022538331473
+Merge: cb0488c 64211fa
+Author: Orit Wasserman <owasserm@redhat.com>
+Date: Thu Aug 11 15:58:51 2016 +0200
+
+ Merge pull request #10554 from Vicente-Cheng/wip-16815-hammer
+
+ hammer: radosgw-admin region-map set is not reporting the bucket quota correctly
+ Reviewed-by: Orit Wasserman <owasserm@redhat.com>
+
+commit cb0488c181a122de13d63686b2a64e1aa00791ca
+Merge: 0bc2d66 a3003f6
+Author: Orit Wasserman <owasserm@redhat.com>
+Date: Thu Aug 11 15:56:39 2016 +0200
+
+ Merge pull request #10555 from Vicente-Cheng/wip-16317-hammer
+
+ hammer: rgw: bucket listing following object delete is partial
+ Reviewed-by: Orit Wasserman <owasserm@redhat.com>
+
+commit 0bc2d66db5feba6cd887d7c297839b231012b880
+Merge: 5866fef 81aef60
+Author: Orit Wasserman <owasserm@redhat.com>
+Date: Thu Aug 11 15:55:01 2016 +0200
+
+ Merge pull request #10530 from yehudasa/wip-16412-hammer
+
+ rgw: remove bucket index objects when deleting the bucket
+ Reviewed-by: Orit Wasserman <owasserm@redhat.com>
+
+commit 5866fefb32cc443549891754a97eb8a6b8dd2af0
+Merge: da4f735 300c111
+Author: Orit Wasserman <owasserm@redhat.com>
+Date: Thu Aug 11 11:14:53 2016 +0200
+
+ Merge pull request #8755 from kmroz/wip-hammer-convert-plain-object-to-versioned
+
+ hammer: rgw: convert plain object to versioned (with null version) when removing
+ Reviewed-by: Orit Wasserman <owasserm@redhat.com>
+
+commit da4f735d7937aa623dfef41f921ad9381b1a07d7
+Merge: 4a12a88 d3eae0a
+Author: Nathan Cutler <presnypreklad@gmail.com>
+Date: Thu Aug 4 21:41:15 2016 +0200
+
+ Merge pull request #9271 from XinzeChi/wip-fix-digest-hammer
+
+ osd: fix omap digest compare when scrub
+
+ Reviewed-by: Samuel Just <sjust@redhat.com>
+ Reviewed-by: David Zafman <dzafman@redhat.com>
+ Reviewed-by: Nathan Cutler <ncutler@suse.com>
+
+commit 4a12a88d7098c1f67365a82f3cf9a174dd5ada32
+Merge: 6f107f1 ec02d8b
+Author: Nathan Cutler <presnypreklad@gmail.com>
+Date: Thu Aug 4 21:38:57 2016 +0200
+
+ Merge pull request #8805 from SUSE/wip-15482-hammer
+
+ hammer: is_split crash in handle_pg_create
+
+ Reviewed-by: Kefu Chai <kchai@redhat.com>
+
+commit 6f107f1a7a42c070ef2da7f2b0b07d8bd2826429
+Merge: 3b9e73f 3cb72dd
+Author: Nathan Cutler <presnypreklad@gmail.com>
+Date: Thu Aug 4 21:37:24 2016 +0200
+
+ Merge pull request #8593 from renhwsky/wip-15478-hammer
+
+ hammer: Pool quota alarm is not in effect
+
+ Reviewed-by: Kefu Chai <kchai@redhat.com>
+ Reviewed-by: Nathan Cutler <ncutler@suse.com>
+
+commit 3b9e73f319b28c0403871c7d842304aca74f4c6a
+Merge: d34ac2a b9a4ad9
+Author: John Spray <jspray@redhat.com>
+Date: Wed Aug 3 13:31:41 2016 +0100
+
+ Merge pull request #7542 from SUSE/wip-14668-hammer
+
+ hammer: Wrong ceph get mdsmap assertion
+
+ Reviewed-by: John Spray <john.spray@redhat.com>
+
+commit d34ac2a4d76eda4a371cc16dbc6bfdc0223c81d8
+Merge: 8f51f14 3ecdedd
+Author: John Spray <jspray@redhat.com>
+Date: Wed Aug 3 13:31:30 2016 +0100
+
+ Merge pull request #8042 from ukernel/hammer-15050
+
+ hammer: mds: fix stray purging in 'stripe_count > 1' case
+
+ Reviewed-by: John Spray <john.spray@redhat.com>
+
+commit 8f51f146c98e281f065debdfdc4399624e0cce97
+Merge: 4773e9c 049bc8a
+Author: John Spray <jspray@redhat.com>
+Date: Wed Aug 3 13:31:22 2016 +0100
+
+ Merge pull request #8804 from SUSE/wip-15512-hammer
+
+ hammer: Double decreased the count to trim caps which will cause failing to respond to cache pressure
+
+ Reviewed-by: John Spray <john.spray@redhat.com>
+
+commit 4773e9c40849c2796aa16b7cacddbfe99536919c
+Merge: 85a25e4 f6076dd
+Author: John Spray <jspray@redhat.com>
+Date: Wed Aug 3 13:31:09 2016 +0100
+
+ Merge pull request #9404 from SUSE/wip-16082-hammer
+
+ hammer: mds: wrongly treat symlink inode as normal file/dir when symlink inode is stale on kcephfs
+
+ Reviewed-by: John Spray <john.spray@redhat.com>
+
+commit 85a25e43d4451b999ad517f089593d45895a7c59
+Merge: 3c4d14f 2633ec3
+Author: John Spray <jspray@redhat.com>
+Date: Wed Aug 3 13:30:58 2016 +0100
+
+ Merge pull request #10198 from SUSE/wip-16626-hammer
+
+ hammer: Failing file operations on kernel based cephfs mount point leaves unaccessible file behind on hammer 0.94.7
+
+ Reviewed-by: John Spray <john.spray@redhat.com>
+
+commit a3003f6f4f02e37cf96b6e243203d86ad2e39549
+Author: Orit Wasserman <owasserm@redhat.com>
+Date: Thu Feb 25 16:02:15 2016 +0100
+
+ rgw: reset return code in when iterating over the bucket the objects
+
+ Fixes: #14826
+
+ Signed-off-by: Orit Wasserman <owasserm@redhat.com>
+ (cherry picked from commit e23fdcbbce47aaf041b9f8a0812c8a729aa5014b)
+
+commit 64211fa78f872648aad2b2cec2b4b3cb8f2b9953
+Author: Yehuda Sadeh <yehuda@redhat.com>
+Date: Tue Oct 13 17:04:57 2015 -0700
+
+ rgw: fix compilation
+
+ Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
+ (cherry picked from commit 9dfbae6d65bf6f8ab7cdf8597d556505b81cedd9)
+
+commit 3e45c6bb431f7763a12a48daac30fbe7aa3047cd
+Author: Orit Wasserman <owasserm@redhat.com>
+Date: Mon Oct 12 11:14:19 2015 +0200
+
+ rgw: add bucket_quota to RGWRegionMap::encode_json
+
+ Signed-off-by: Orit Wasserman <owasserm@redhat.com>
+ (cherry picked from commit e18b72f7e97a65af681e368d3706a465603df89d)
+
+commit 699b7c8d5f51d895f5ff0578de5bf610436ee33b
+Author: root <root@ceph-node1.homeoffice.wal-mart.com>
+Date: Wed Apr 20 14:15:55 2016 +0530
+
+ rgw: Have a flavor of bucket deletion to bypass GC and to trigger
+ object deletions async.
+
+ Fixes: http://tracker.ceph.com/issues/15557
+ Signed-off-by: Pavan Rallabhandi <PRallabhandi@walmartlabs.com>
+ (cherry picked from commit b7a69fca248afeef1de1278890076693b16cf6d3)
+
+ Conflicts:
+ src/rgw/rgw_admin.cc
+ src/rgw/rgw_bucket.cc
+ src/rgw/rgw_bucket.h
+ src/test/cli/radosgw-admin/help.t
+
+commit 81aef600671f0fe523206cea16000e79bc6bb75c
+Author: Orit Wasserman <owasserm@redhat.com>
+Date: Mon Jul 4 15:01:51 2016 +0200
+
+ rgw: remove bucket index objects when deleting the bucket
+
+ Fixes: http://tracker.ceph.com/issues/16412
+ Signed-off-by: Orit Wasserman <owasserm@redhat.com>
+ (cherry picked from commit 3ae276390641ad5fc4fef0c03971db95948880b4)
+
+commit 3c4d14fe73a97c52345369e732e445c78fb656c8
+Merge: 79753ed 8a39e5e
+Author: Nathan Cutler <presnypreklad@gmail.com>
+Date: Fri Jul 29 23:51:47 2016 +0200
+
+ Merge pull request #10182 from gaurav36/wip-configure-xfs-issue-hammer
+
+ hammer: configure: Add -D_LARGEFILE64_SOURCE to Linux build.
+
+ Reviewed-by: Samuel Just <sjust@redhat.com>
+ Reviewed-by: Casey Bodley <cbodley@redhat.com>
+ Reviewed-by: Nathan Cutler <ncutler@suse.com>
+
+commit 79753edf9c4763ae15d82502b53c6f3c9cd24349
+Merge: 75271a2 7dbace5
+Author: Nathan Cutler <presnypreklad@gmail.com>
+Date: Fri Jul 29 09:40:46 2016 +0200
+
+ Merge pull request #7961 from dzafman/wip-15002
+
+ hammer: objects unfound after repair (fixed by repeering the pg)
+
+ Reviewed-by: Samuel Just <sjust@redhat.com>
+ Reviewed-by: Nathan Cutler <ncutler@suse.com>
+
+commit 75271a2529b1504d249b528fe3fafd4c5e90a9bc
+Merge: 76fa3b1 43d1b92
+Author: Nathan Cutler <presnypreklad@gmail.com>
+Date: Fri Jul 29 09:38:15 2016 +0200
+
+ Merge pull request #9125 from dzafman/wip-15635
+
+ hammer: [MON] Fixed calculation of %USED
+
+ Reviewed-by: Samuel Just <sjust@redhat.com>
+ Reviewed-by: Nathan Cutler <ncutler@suse.com>
+
+commit 76fa3b1097b3711ef75bd36aa2a4074e7a8fa9e6
+Merge: cf5f111 ca0beef
+Author: Nathan Cutler <presnypreklad@gmail.com>
+Date: Fri Jul 29 09:36:05 2016 +0200
+
+ Merge pull request #8464 from dzafman/wip-13039-15315
+
+ hammer: "FAILED assert(pg->info.history.same_interval_since == p.same_interval_since)" in upgrade:hammer-x-jewel-distro-basic-openstack
+
+ Reviewed-by: Samuel Just <sjust@redhat.com>
+ Reviewed-by: Nathan Cutler <ncutler@suse.com>
+
+commit cf5f1117afe9e03c683fd40e5af964eaf5975e2b
+Merge: 76ce775 488a787
+Author: Nathan Cutler <presnypreklad@gmail.com>
+Date: Fri Jul 29 09:32:47 2016 +0200
+
+ Merge pull request #8573 from Vicente-Cheng/wip-15293-hammer
+
+ hammer: ECBackend: send write and read sub ops on behalf of client ops at normal priority
+
+ Reviewed-by: Samuel Just <sjust@redhat.com>
+ Reviewed-by: Nathan Cutler <ncutler@suse.com>
+
+commit 76ce775761f755bd3085ba22cf088c3a46b78d3a
+Merge: 8629d37 e20df80
+Author: Nathan Cutler <presnypreklad@gmail.com>
+Date: Fri Jul 29 09:31:16 2016 +0200
+
+ Merge pull request #8665 from Vicente-Cheng/wip-15525-hammer
+
+ hammer: ReplicatedPG.cc: 430: FAILED assert(!actingbackfill.empty()): old watch timeout tries to queue repop on replica
+
+ Reviewed-by: Samuel Just <sjust@redhat.com>
+ Reviewed-by: Nathan Cutler <ncutler@suse.com>
+
+commit 8629d378b05d4f0374436373a0c972360bae7273
+Merge: 79fc401 7b3f1da
+Author: Nathan Cutler <presnypreklad@gmail.com>
+Date: Fri Jul 29 09:29:58 2016 +0200
+
+ Merge pull request #8806 from SUSE/wip-15320-hammer
+
+ hammer: LibRadosMiscConnectFailure.ConnectFailure (not so intermittent) failure in upgrade/hammer-x
+
+ Reviewed-by: Samuel Just <sjust@redhat.com>
+ Reviewed-by: Nathan Cutler <ncutler@suse.com>
+
+commit 79fc401844c935283f43fbea83e113e298a830ba
+Merge: f4d56b0 cbd5aaf
+Author: Nathan Cutler <presnypreklad@gmail.com>
+Date: Fri Jul 29 09:28:32 2016 +0200
+
+ Merge pull request #9001 from Vicente-Cheng/wip-15730-hammer
+
+ hammer: osd: acting_primary not updated on split
+
+ Reviewed-by: Samuel Just <sjust@redhat.com>
+ Reviewed-by: Nathan Cutler <ncutler@suse.com>
+
+commit f4d56b03b1decf83bebbf6996909ee89783068f0
+Merge: f71c9e6 410ff15
+Author: Nathan Cutler <presnypreklad@gmail.com>
+Date: Fri Jul 29 09:26:55 2016 +0200
+
+ Merge pull request #9400 from Vicente-Cheng/wip-15796-hammer
+
+ hammer: LibRadosWatchNotifyPPTests/LibRadosWatchNotifyPP.WatchNotify2Timeout/1 segv
+
+ Reviewed-by: Samuel Just <sjust@redhat.com>
+ Reviewed-by: Nathan Cutler <ncutler@suse.com>
+
+commit f71c9e658d6f5af3cfa48a0dfb9a063f4965e7ce
+Merge: fdb730e 23498a9
+Author: Nathan Cutler <presnypreklad@gmail.com>
+Date: Fri Jul 29 09:24:42 2016 +0200
+
+ Merge pull request #9416 from chardan/wip-15770-hammer
+
+ hammer: mon/OSDMonistor: improve reweight_by_utilization() logic
+
+ Reviewed-by: Samuel Just <sjust@redhat.com>
+ Reviewed-by: Nathan Cutler <ncutler@suse.com>
+
+commit fdb730e169d8885ccd72e140c31797179c0a2c75
+Merge: f9e8dc8 2c18015
+Author: Nathan Cutler <presnypreklad@gmail.com>
+Date: Fri Jul 29 09:21:25 2016 +0200
+
+ Merge pull request #10189 from dreamhost/wip-16618-hammer
+
+ rgw: fix multi-delete query param parsing.
+
+ Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
+ Reviewed-by: Nathan Cutler <ncutler@suse.com>
+
+commit f9e8dc824a5aa89e24ef12fc8fcfdbdd4f926aef
+Merge: f3cbf5f 24cc4f9
+Author: Nathan Cutler <presnypreklad@gmail.com>
+Date: Fri Jul 29 09:17:57 2016 +0200
+
+ Merge pull request #8379 from Vicente-Cheng/wip-15283-hammer
+
+ hammer: RGW shouldn't send Content-Type nor Content-Length for 304 responses
+
+ Reviewed-by: Orit Wasserman <owasserm@redhat.com>
+ Reviewed-by: Nathan Cutler <ncutler@suse.com>
+
+commit f3cbf5f891029975f4f5a915366fce28fcabd196
+Merge: ba8de3a f28477c
+Author: Nathan Cutler <presnypreklad@gmail.com>
+Date: Fri Jul 29 09:14:39 2016 +0200
+
+ Merge pull request #8313 from SUSE/wip-15257-hammer
+
+ hammer: rgw: radosgw server abort when user passed bad parameters to set quota
+
+ Reviewed-by: Orit Wasserman <owasserm@redhat.com>
+
+commit ba8de3ab31567c8179b72fb1dc8dbf7ccd1f5f38
+Merge: 9562198 ed4ca7c
+Author: Nathan Cutler <presnypreklad@gmail.com>
+Date: Fri Jul 29 09:13:09 2016 +0200
+
+ Merge pull request #8528 from wido/hammer-issue-15348
+
+ rgw: Set Access-Control-Allow-Origin to a Asterisk if allowed in a rule
+
+ Reviewed-by: Orit Wasserman <owasserm@redhat.com>
+ Reviewed-by: Nathan Cutler <ncutler@suse.com>
+
+commit 95621986d893029bc0a4a686c7da5cd6e0fa6f2b
+Merge: 28107d3 1ac920b
+Author: Nathan Cutler <presnypreklad@gmail.com>
+Date: Fri Jul 29 09:10:57 2016 +0200
+
+ Merge pull request #9671 from ceph/hammer-rgw-copy-if-newer
+
+ hammer: rgw: backport rgwx-copy-if-newer for radosgw-agent
+
+ Reviewed-by: Orit Wasserman <owasserm@redhat.com>
+ Reviewed-by: Nathan Cutler <ncutler@suse.com>
+
+commit 28107d3ebfded3cd9046e5a23ab83d4e0252cce2
+Merge: 5e1a57a 850881c
+Author: Nathan Cutler <presnypreklad@gmail.com>
+Date: Fri Jul 29 09:09:14 2016 +0200
+
+ Merge pull request #9961 from SUSE/wip-16190-hammer
+
+ hammer: subuser rm fails with status 125
+
+ Reviewed-by: Orit Wasserman <owasserm@redhat.com>
+
+commit 5e1a57a6f9c2afbdfc6d3e73d438551202c68229
+Merge: 91889db ce313cd
+Author: Nathan Cutler <presnypreklad@gmail.com>
+Date: Fri Jul 29 09:07:10 2016 +0200
+
+ Merge pull request #9402 from SUSE/wip-15966-hammer
+
+ hammer: No Last-Modified, Content-Size and X-Object-Manifest headers if no segments in DLO manifest
+
+ Reviewed-by: Orit Wasserman <owasserm@redhat.com>
+ Reviewed-by: Nathan Cutler <ncutler@suse.com>
+
+commit 23498a9620f792cd099dba028c5bdf96b1a625be
+Author: xie xingguo <xie.xingguo@zte.com.cn>
+Date: Tue May 31 15:40:05 2016 -0700
+
+ mon/OSDMonitor: avoid potential expensive grace calculation
+
+ The grace calculation during check_failure() is now very complicated
+ and time-consuming. Therefore we shall skip this when it is possible.
+
+ Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
+ (cherry picked from commit 3557903d5d57642179b2ae137bedc389974b1956)
+
+ Conflicts:
+ src/mon/OSDMonitor.cc
+
+ Resolved by choosing the move-to-top implementation. Removed unused vars.
+
+commit 1b6f6f27b77803727a523b4337cbad411e8321ed
+Author: xie xingguo <xie.xingguo@zte.com.cn>
+Date: Tue Apr 26 11:13:32 2016 +0800
+
+ mon/OSDMonitor: improve reweight_by_utilization() logic
+
+ By calling reweight_by_utilization() method, we are aiming at an evener result
+ of utilization among all osds. To achieve this, we shall decrease weights of
+ osds which are currently overloaded, and try to increase weights of osds which
+ are currently underloaded when it is possible.
+ However, we can't do this all at a time in order to avoid a massive pg migrations
+ between osds. Thus we introduce a max_osds limit to smooth the progress.
+
+ The problem here is that we have sorted the utilization of all osds in a descending
+ manner and we always try to decrease the weights of the most overloaded osds
+ since they are most likely to encounter a nearfull/full transition soon, but
+ we won't increase the weights from the most underloaded(least utilized by contrast)
+ at the same time, which I think is not quite reasonable.
+
+ Actually, the best thing would probably be to iterate over teh low and high osds
+ in parallel, and do the ones that are furthest from the average first.
+
+ Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
+ (cherry picked from commit e7a32534ebc9e27f955ff2d7a8d1db511383301e)
+
+ Conflicts:
+ src/mon/OSDMonitor.cc
+
+ Resolved by picking the lambda implemenation.
+ NOTE: Because hammer does not support C++11, the lambda functionality from the
+ current master has been moved into the "Sorter" function object.
+
+commit 91889db73ab097502615b208c6e9f3b40411e682
+Merge: f3c4f7b b78a1be
+Author: Nathan Cutler <presnypreklad@gmail.com>
+Date: Wed Jul 27 08:28:38 2016 +0200
+
+ Merge pull request #10038 from tchaikov/wip-16297-hammer
+
+ mon: Monitor: validate prefix on handle_command()
+
+ Reviewed-by: Samuel Just <sjust@redhat.com>
+ Reviewed-by: Nathan Cutler <ncutler@suse.com>
+
+commit f3c4f7b61ab519c532a2218a11c5472daaaf5fa9
+Merge: 2fe8edb b31ac2d
+Author: Nathan Cutler <presnypreklad@gmail.com>
+Date: Tue Jul 26 19:08:23 2016 +0200
+
+ Merge pull request #9090 from tchaikov/wip-13990-hammer
+
+ hammer: osd: remove all stale osdmaps in handle_osd_map()
+
+ Reviewed-by: Samuel Just <sjust@redhat.com>
+ Reviewed-by: Nathan Cutler <ncutler@suse.com>
+
+commit 2fe8edb87e7384f206414db8a49e909e51f48de3
+Merge: 67b7f11 0498969
+Author: Nathan Cutler <presnypreklad@gmail.com>
+Date: Mon Jul 25 21:44:14 2016 +0200
+
+ Merge pull request #10227 from SUSE/wip-15081-hammer
+
+ hammer: When logging to a file fails, ceph logs excessively to stderr
+
+ Reviewed-by: Samuel Just <sjust@redhat.com>
+
+commit 67b7f11c63313a5dcdf34b904137ef7a4673f4ec
+Merge: bd59c96 474abb8
+Author: Nathan Cutler <presnypreklad@gmail.com>
+Date: Mon Jul 25 21:43:49 2016 +0200
+
+ Merge pull request #9893 from Vicente-Cheng/wip-16430-hammer
+
+ hammer: OSDMonitor: drop pg temps from not the current primary
+
+ Reviewed-by: Samuel Just <sjust@redhat.com>
+ Reviewed-by: Nathan Cutler <ncutler@suse.com>
+
+commit bd59c9695fadedef89b77166f60f5a8cf85825ff
+Merge: 3794e3a 055427c
+Author: Nathan Cutler <presnypreklad@gmail.com>
+Date: Mon Jul 25 21:42:54 2016 +0200
+
+ Merge pull request #9238 from SUSE/wip-15962-hammer
+
+ hammer: ceph-osd valgrind invalid reads/writes
+
+ Reviewed-by: Samuel Just <sjust@redhat.com>
+
+commit 3794e3ad44d1e429f110abe71fb2d2319567bcd1
+Merge: 89233e3 d96086a
+Author: Nathan Cutler <presnypreklad@gmail.com>
+Date: Mon Jul 25 21:42:06 2016 +0200
+
+ Merge pull request #8849 from SUSE/wip-14326-hammer
+
+ hammer: osd/PGLog.h: 88: FAILED assert(rollback_info_trimmed_to == head)
+
+ Reviewed-by: Samuel Just <sjust@redhat.com>
+
+commit 89233e32ffcdd7f795873771859caba1ce3ad23f
+Merge: 253143b fb1b40f
+Author: Nathan Cutler <presnypreklad@gmail.com>
+Date: Mon Jul 25 21:40:57 2016 +0200
+
+ Merge pull request #8845 from SUSE/wip-15647-hammer
+
+ hammer: osd: rados cppool omap to ec pool crashes osd
+
+ Reviewed-by: Samuel Just <sjust@redhat.com>
+ Reviewed-by: Nathan Cutler <ncutler@suse.com>
+
+commit 253143b559001eadb73ed9945abe2d0b8d946b65
+Merge: 81133dd 365f21b
+Author: Loic Dachary <loic@dachary.org>
+Date: Mon Jul 25 15:05:54 2016 +0200
+
+ Merge pull request #8470 from dachary/wip-15403-api-test-timeout-hammer
+
+ hammer: tests: be more generous with test timeout
+
+ Reviewed-by: Loic Dachary <ldachary@redhat.com>
+
+commit 81133dd6e2724ee78cc69bda8e89ca35b20b6b23
+Merge: d71845c 3bb248b
+Author: Nathan Cutler <presnypreklad@gmail.com>
+Date: Mon Jul 25 15:05:31 2016 +0200
+
+ Merge pull request #9977 from shun-s/hammer
+
+ replcatedBackend: delete one of the repeated op->mark_started in ReplicatedBackend::sub_op_modify_impl
+
+ Reviewed-by: Kefu Chai <kchai@redhat.com>
+ Reviewed-by: Nathan Cutler <ncutler@suse.com>
+
+commit d71845cec169c660c180a4c0313e0cdbc25329dc
+Merge: 387d5c1 5057c34
+Author: Nathan Cutler <presnypreklad@gmail.com>
+Date: Mon Jul 25 12:51:45 2016 +0200
+
+ Merge pull request #8960 from badone/wip-hammer-rados-bench-units
+
+ hammer: Add units to rados bench output and clean up formatting
+
+ Reviewed-by: Nathan Cutler <ncutler@suse.com>
+
+commit 474abb8275cd7507d7c7eae0d0e5647612fc177e
+Author: Samuel Just <sjust@redhat.com>
+Date: Thu Jun 2 10:43:17 2016 -0700
+
+ OSDMonitor: drop pg temp from sources other than the current primary
+
+ Fixes: http://tracker.ceph.com/issues/16127
+ Signed-off-by: Samuel Just <sjust@redhat.com>
+ (cherry picked from commit 1a07123c38e3fecb3fb2e43bbbae962d8411d287)
+
+ change:
+ use NULL to replace the nullptr because we don't have C++11
+
+commit b31ac2d37ecb68ed9661923fbaeaedeac241ba4a
+Author: Kefu Chai <kchai@redhat.com>
+Date: Thu May 12 20:28:11 2016 +0800
+
+ osd: reset session->osdmap if session is not waiting for a map anymore
+
+ we should release the osdmap reference once we are done with it,
+ otherwise we might need to wait very long to update that reference with
+ a newer osdmap ref. this appears to be an OSDMap leak: it is held by an
+ quiet OSD::Session forever.
+
+ the osdmap is not reset in OSD::session_notify_pg_create(), because its
+ only caller is wake_pg_waiters(), which will call
+ dispatch_session_waiting() later. and dispatch_session_waiting() will
+ check the session->osdmap, and will also reset the osdmap if
+ session->waiting_for_pg.empty().
+
+ Fixes: http://tracker.ceph.com/issues/13990
+ Signed-off-by: Kefu Chai <kchai@redhat.com>
+ (cherry picked from commit 82b0af7cedc3071cd83ee53479f834c23c62b7d0)
+
+commit 3a30ffc21a5edd52726867302da6b358f93aa8dc
+Author: Brad Hubbard <bhubbard@redhat.com>
+Date: Wed Jan 27 11:34:47 2016 +1000
+
+ qa: Add test for #13829
+
+ qa/workunits/cephtool/test.sh: add test for setting negative int options
+ src/test/daemon_config.cc: remove tests for failed negative values
+
+ Fixes: #13829
+
+ Signed-off-by: Brad Hubbard <bhubbard@redhat.com>
+ (cherry picked from commit 994ac2942d04584d1617e6d4bbd5b880b1ea0448)
+
+commit f70e4adf8682ed82b267e21e5e63039048893243
+Author: Brad Hubbard <bhubbard@redhat.com>
+Date: Wed Jan 27 11:18:16 2016 +1000
+
+ common: Allow config set with negative value
+
+ A recent commit disabled negative values but they are required for variables
+ such as filestore_merge_threshold.
+
+ Modified patch to remove C++11 specific elements so it will build for hammer
+
+ Fixes: #13829
+
+ Signed-off-by: Kefu Chai <kchai@redhat.com>
+ Signed-off-by: Brad Hubbard <bhubbard@redhat.com>
+ (cherry picked from commit 8b777a0c346bc70fd10d07e89368b3785b58f10e)
+
+commit 04989695915fd7ee5ef85ae34ede1fd680514f9d
+Author: Sage Weil <sage@redhat.com>
+Date: Thu Mar 10 09:50:07 2016 -0500
+
+ log: do not repeat errors to stderr
+
+ If we get an error writing to the log, log it only once to stderr.
+ This avoids generating, say, 72 GB of ENOSPC errors in
+ teuthology.log when /var/log fills up.
+
+ Fixes: #14616
+ Signed-off-by: Sage Weil <sage@redhat.com>
+ (cherry picked from commit d9ac0474b864afda58a44b9012cca4bbc6aaf509)
+
+ Conflicts:
+ src/log/Log.cc (drop m_uid and m_gid which are not used in hammer;
+ order of do_stderr, do_syslog, do_fd conditional blocks is reversed in
+ hammer; drop irrelevant speed optimization code from
+ 5bfe05aebfefdff9022f0eb990805758e0edb1dc)
+
+commit 2633ec3934ad8f7629c55b4345f426cacfb7b140
+Author: Yan, Zheng <zyan@redhat.com>
+Date: Fri Apr 15 20:15:14 2016 +0800
+
+ mds: disallow 'open truncate' non-regular inode
+
+ Signed-off-by: Yan, Zheng <zyan@redhat.com>
+ (cherry picked from commit 0e4b6f2332bb4822cf324587a94144f1c98e4b97)
+
+ Conflicts:
+ src/mds/Server.cc (hammer has cur->inode.inline_version - in master
+ this has been changed to cur->inode.inline_data.version)
+
+commit 3f0fb20ed08dfde614cff6c056d41b59af200c2c
+Author: Yan, Zheng <zyan@redhat.com>
+Date: Fri Apr 15 19:45:23 2016 +0800
+
+ mds: only open non-regular inode with mode FILE_MODE_PIN
+
+ ceph_atomic_open() in kernel client does lookup and open at the same
+ time. So it can open a symlink inode with mode CEPH_FILE_MODE_WR.
+ Open a symlink inode with mode CEPH_FILE_MODE_WR triggers assertion
+ in Locker::check_inode_max_size();
+
+ Signed-off-by: Yan, Zheng <zyan@redhat.com>
+ (cherry picked from commit 4d15eb12298e007744486e28924a6f0ae071bd06)
+
+commit 2c180159c00aa184e1fe8b051b1aa1e9f0f332fc
+Author: Robin H. Johnson <robin.johnson@dreamhost.com>
+Date: Thu Jul 7 14:14:36 2016 -0700
+
+ rgw: fix multi-delete query param parsing.
+
+ Multi-delete is triggered by a query parameter on POST, but there are
+ multiple valid ways of representing it, and Ceph should accept ANY way
+ that has the query parameter set, regardless of what value or absence of
+ value.
+
+ This caused the RubyGem aws-sdk-v1 to break, and has been present since
+ multi-delete was first added in commit 0a1f4a97da, for the bobtail
+ release.
+
+ Fixes: http://tracker.ceph.com/issues/16618
+ Signed-off-by: Robin H. Johnson <robin.johnson@dreamhost.com>
+ (cherry picked from commit a7016e1b67e82641f0702fda4eae799e953063e6)
+
+commit 387d5c1ba836833a0cf11ddf9a4fb8690a532878
+Merge: 2fd75cc 4eea92b
+Author: Yehuda Sadeh <yehuda@redhat.com>
+Date: Thu Jul 7 10:16:31 2016 -0700
+
+ Merge pull request #9407 from SUSE/wip-15833-hammer
+
+ hammer: RGW :: Subset of uploaded objects via radosgw are unretrievable when using erasure coded pool
+
+commit 8a39e5e67bc9a93cadb6c13f25c7ccd57421af6b
+Author: Ira Cooper <ira@redhat.com>
+Date: Thu Mar 31 12:30:45 2016 -0400
+
+ configure: Add -D_LARGEFILE64_SOURCE to Linux build.
+
+ Fixes: http://tracker.ceph.com/issues/16612
+
+ Without -D_LARGEFILE64_SOURCE we can't build against libxfs,
+ because off64_t must be defined.
+
+ Signed-off-by: Ira Cooper <ira@redhat.com>
+ (cherry picked from commit 602425a)
+
+commit 2fd75cced9dbcfdfdcba979eae90a6f4fb384758
+Merge: dac65d0 2c97cb3
+Author: Orit Wasserman <owasserm@redhat.com>
+Date: Wed Jul 6 20:25:20 2016 +0200
+
+ Merge pull request #8475 from Vicente-Cheng/wip-15343-hammer
+
+ hammer: Multipart ListPartsResult has missing quotes on ETag
+ Reviewed-bu: Orit Wasserman <owasserm@redhat.com>
+
+commit 3bb248b7d530403b347e3ff68a8996b624fc1c98
+Author: shun-s <song.shun3@zte.com.cn>
+Date: Tue Jun 28 15:30:16 2016 +0800
+
+ replcatedBackend: delete one useless op->mark_started as there are two in ReplicatedBackend::sub_op_modify_impl
+ delete one mark_start event as there are two same op->mark_started in ReplicatedBackend::sub_op_modify_impl
+ Fixes: http://tracker.ceph.com/issues/16572
+
+ Signed-off-by: shun-s <song.shun3@zte.com.cn>
+
+commit ed4ca7c92cdf7404754dab6f9d58c64b647136c5
+Author: Wido den Hollander <wido@42on.com>
+Date: Tue Apr 5 11:14:16 2016 +0200
+
+ rgw: Set Access-Control-Allow-Origin to a Asterisk if allowed in a rule
+
+ Before this patch the RGW would respond with the Origin send by the client in the request
+ if a wildcard/asterisk was specified as a valid Origin.
+
+ This patch makes sure we respond with a header like this:
+
+ Access-Control-Allow-Origin: *
+
+ This way a resource can be used on different Origins by the same browser and that browser
+ will use the content as the asterisk.
+
+ We also keep in mind that when Authorization is send by the client different rules apply.
+ In the case of Authorization we may not respond with an Asterisk, but we do have to
+ add the Vary header with 'Origin' as a value to let the browser know that for different
+ Origins it has to perform a new request.
+
+ More information: https://developer.mozilla.org/en-US/docs/Web/HTTP/Access_control_CORS
+
+ Fixes: #15348
+
+ Signed-off-by: Wido den Hollander <wido@42on.com>
+ (cherry picked from commit 0021e224480c7164330eaa7cc1078bb8795169bf)
+
+ Conflicts:
+ src/rgw/rgw_rest.cc
+ hammer still uses s->cio->print() where master uses STREAM_IO(s)->print()
+
+commit b78a1be835706e7dabc505be343945d0ac05697d
+Author: Kefu Chai <kchai@redhat.com>
+Date: Thu Jun 30 13:24:22 2016 +0800
+
+ mon: Monitor: validate prefix on handle_command()
+
+ Fixes: http://tracker.ceph.com/issues/16297
+
+ Signed-off-by: You Ji <youji@ebay.com>
+ (cherry picked from commit 7cb3434fed03a5497abfd00bcec7276b70df0654)
+
+ Conflicts:
+ src/mon/Monitor.cc (the signature of Monitor::reply_command()
+ changed a little bit in master, so adapt the
+ commit to work with the old method)
+
+commit dac65d048919f701877de96d3271131853e532ed (refs/remotes/gh/wip-optracker-4354)
+Merge: 2e156d7 a2e7ca1
+Author: Nathan Cutler <presnypreklad@gmail.com>
+Date: Mon Jun 27 17:51:19 2016 +0200
+
+ Merge pull request #8538 from Vicente-Cheng/wip-15360-hammer
+
+ hammer: Linking to -lrbd causes process startup times to balloon
+
+ Reviewed-by: Josh Durgin <jdurgin@redhat.com>
+
+commit 850881cf787ccb23eca989861a6688f3a4de1a7c
+Author: Orit Wasserman <owasserm@redhat.com>
+Date: Wed Jan 20 17:24:38 2016 +0100
+
+ rgw: fix subuser rm command failure
+
+ Fixes: 14375
+ Signed-off-by: Orit Wasserman <owasserm@redhat.com>
+ (cherry picked from commit bbc06e70b49b2917ee63985727cb92724fb99209)
+
+ Conflicts:
+ src/rgw/rgw_user.cc The "if (op_state.will_purge_keys())" block was
+ later changed to "always purge all associated keys" by
+ e7b7e1afc7a81c3f97976f7442fbdc5118b532b5 - keep the hammer version
+
+commit 055427cf58857eeadda11ed1b3381e84e384bc85
+Author: Samuel Just <sjust@redhat.com>
+Date: Thu May 12 16:57:49 2016 -0700
+
+ Pipe: take a ref to existing while we are waiting
+
+ Otherwise, if it is reaped while we are waiting, it'll be a
+ use-after-free.
+
+ Fixes: http://tracker.ceph.com/issues/15870
+ Signed-off-by: Samuel Just <sjust@redhat.com>
+ (cherry picked from commit b224912d249453d754fc0478d3680f8cfa1a5c22)
+
+ Conflicts:
+ src/msg/simple/Pipe.cc: nullptr changed to 0 because hammer is not compiled
+ with -std=c++11
+
+commit 24cc4f9e67d9c61f68ccc8f7d80ac227d67aeda1
+Author: Nathan Cutler <ncutler@suse.com>
+Date: Wed Jun 15 16:53:16 2016 +0200
+
+ rgw: check for -ERR_NOT_MODIFIED in rgw_rest_s3.cc
+
+ Fixes: http://tracker.ceph.com/issues/16327
+ Signed-off-by: Nathan Cutler <ncutler@suse.com>
+ (cherry picked from commit fc38346c596d8b0bc156183970d6a327943cb577)
+
+ Conflicts:
+ src/rgw/rgw_rest_s3.cc
+ use ret instead of op_ret to check op result
+
+commit 7dbace59b83a059fcb364b78fc78d4e38164df6c
+Author: Loic Dachary <ldachary@redhat.com>
+Date: Thu May 28 22:35:08 2015 +0200
+
+ erasure-code: s/unreocvery/unfound/
+
+ Signed-off-by: Loic Dachary <ldachary@redhat.com>
+ (cherry picked from commit 28820d1cd630ec466ed1069a437d740a025fb9aa)
+
+commit e726f211107cd84cc722744c38213b96dc59cdc7
+Author: Jianpeng Ma <jianpeng.ma@intel.com>
+Date: Wed Apr 22 09:45:04 2015 +0800
+
+ test: add test-case for repair unrecovery-ec pg.
+
+ Signed-off-by: Jianpeng Ma <jianpeng.ma@intel.com>
+ (cherry picked from commit 8f30db85219a6c57cb2fc03f4049a3f57446ca55)
+
+commit 40b1c2b231b62471d4f3cfba3ba2c3d596c9e170
+Author: Jianpeng Ma <jianpeng.ma@intel.com>
+Date: Tue Apr 14 13:29:54 2015 +0800
+
+ osd: Remove the duplicated func MissingLoc::get_all_missing.
+
+ It is the same as MissingLoc::get_needs_recovery.
+
+ Signed-off-by: Jianpeng Ma <jianpeng.ma@intel.com>
+ (cherry picked from commit bdd6205408cf20e039496728052a36c1a7d758c6)
+
+commit 47d5dfc0323e8d7614ad5793d85c1476b63c18e6
+Author: Jianpeng Ma <jianpeng.ma@intel.com>
+Date: Tue Apr 14 09:11:58 2015 +0800
+
+ osd: Fix ec pg repair endless when met unrecover object.
+
+ In repair_object, if bad_peer is replica, it don't add soid in
+ MissingLoc for ec pool. If there are more bad replica for ec pool
+ which cause object can't recover, the later recoverying will endless.
+
+ Signed-off-by: Jianpeng Ma <jianpeng.ma@intel.com>
+ Signed-off-by: Kefu Chai <kchai@redhat.com>
+ (cherry picked from commit d51806f5b330d5f112281fbb95ea6addf994324e)
+
+commit 187d308b5b0cb0512b442bbad1bddfda8ef9203f
+Author: Sage Weil <sage@redhat.com>
+Date: Mon Aug 24 14:51:47 2015 -0400
+
+ uuid: use boost::random:random_device
+
+ The boost mt code uses uninitialized memory for extra randomness,
+ which is a bad idea in general but more importantly makes valgrind
+ unhappy. Use /dev/urandom instead.
+
+ Unfortunately this introduces a link time dependency.. meh!
+
+ Fixes: #12736
+ Signed-off-by: Sage Weil <sage@redhat.com>
+ (cherry picked from commit dbcaa544856fcc99ab912a101c4a28e1eb3fb94e)
+
+ Conflicts:
+ ceph.spec.in (trivial resolution)
+
+commit 174de7fce8080df6e02b363e7821e8cca6f8157f
+Author: Rohan Mars <code@rohanmars.com>
+Date: Wed Aug 12 21:19:31 2015 -0700
+
+ moved to use boost uuid implementation, based on commit 4fe89a7b14c97b2ed7f357132901beb2bdcec551
+
+ Signed-off-by: Rohan Mars <code@rohanmars.com>
+ Reviewed-by: Casey Bodley <cbodley@redhat.com>
+ (cherry picked from commit 62bfc7a1ab1587e81ed3bff0ddfbb1aa69d1c299)
+
+ Conflicts:
+ debian/control (trivial resolution)
+ src/common/Makefile.am (trivial resolution)
+ src/common/blkdev.cc (no get_device_by_uuid() function in hammer)
+
+commit 2e156d7ad4b9f4ffd6028df3a460b50b30c8b0d3
+Merge: 054a90e 5cd922c
+Author: Mykola Golub <to.my.trociny@gmail.com>
+Date: Thu Jun 16 08:26:00 2016 +0300
+
+ Merge pull request #9722 from trociny/wip-16289-hammer
+
+ hammer: qa/workunits/rbd: respect RBD_CREATE_ARGS environment variable
+
+ Reviewed-by: Jason Dillaman <dillaman@redhat.com>
+
+commit 5cd922ca31d2eb987992b2afcbd45d5d92aeac69
+Author: Mykola Golub <mgolub@mirantis.com>
+Date: Tue Jun 14 15:28:06 2016 +0300
+
+ qa/workunits/rbd: respect RBD_CREATE_ARGS environment variable
+
+ Fixes: http://tracker.ceph.com/issues/16289
+ Signed-off-by: Mykola Golub <mgolub@mirantis.com>
+ (cherry picked from commit 3048d3c7ce800a6174c54946b838e4e4079ec609)
+
+commit 1ac920bf291a58cf680108f8dc738197e9bae44d
+Author: Yehuda Sadeh <yehuda@redhat.com>
+Date: Fri Sep 18 17:34:51 2015 -0700
+
+ rgw: fix identification of canceled operation
+
+ Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
+ (cherry picked from commit 9f63b15b3a7c4cc633ff90f529934f071aea7c62)
+
+commit a38f157a09097d1eaef64813fc947aac19e3844a
+Author: Yehuda Sadeh <yehuda@redhat.com>
+Date: Wed Mar 25 17:35:40 2015 -0700
+
+ rgw: identify racing writes when using copy-if-newer
+
+ When copying an object from a different zone, and copy-if-newer is
+ specified, if the final meta write is canceled check whether the
+ destinatioin that was created is actually newer than our mtime,
+ otherwise retry.
+
+ Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
+ (cherry picked from commit fe9c64b75caf3f53ce2dfdea5e39d794528dfc33)
+
+commit 02f6d8aaa86f4fdb9912763883d079d02589e5be
+Author: Yehuda Sadeh <yehuda@redhat.com>
+Date: Tue Mar 24 22:48:03 2015 -0700
+
+ rgw: translate http error 304 to appropriate status
+
+ So that we can return the appropriate response on a conditioinal multi
+ zone copy operation.
+
+ Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
+ (cherry picked from commit 20d24e965884af440f94c7e3093587c7b8643cb9)
+
+commit 7319d76b269d541249124f46890f1b04279ba2ea
+Author: Yehuda Sadeh <yehuda@redhat.com>
+Date: Tue Mar 24 20:24:55 2015 -0700
+
+ rgw: fix if-modified-since boundary
+
+ Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
+ (cherry picked from commit 27946e8ba4bc5dbfec2da319fa23266d5885d655)
+
+commit 5e4de5ad66dc24b059ef19664d1eef22be6890f7
+Author: Yehuda Sadeh <yehuda@redhat.com>
+Date: Tue Mar 24 20:16:02 2015 -0700
+
+ rgw: add rgwx-copy-if-newer http header
+
+ Similar to IF_MOD_SINCE, but does not take a time argument, and should
+ protected against races (not there yet).
+
+ Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
+ (cherry picked from commit 8813a4401198636e0f4d3a220a0f726625a5c5d4)
+
+commit 054a90edb2812f78426b8cb1dac2e768b2e7fc51
+Merge: 785ffd1 c722d00
+Author: Orit Wasserman <owasserm@redhat.com>
+Date: Tue Jun 7 15:48:00 2016 +0200
+
+ Merge pull request #8113 from Vicente-Cheng/wip-15023-hammer
+
+ hammer: rgw: user quota may not adjust on bucket removal
+ Reviewed-by: Orit Wasserman <owasserm@redhat.com>
+
+commit 785ffd1f616864909b24314c803d12566c885d14
+Merge: e0a3589 139691c
+Author: Samuel Just <sjust@redhat.com>
+Date: Mon Jun 6 12:42:14 2016 -0700
+
+ Merge pull request #9277 from ceph/wip-split-lfn-hammer
+
+ Hammer LFN collection split fix: backport of http://tracker.ceph.com/issues/14766
+
+ Reviewed-by: Sage Weil <sage@redhat.com>
+
+commit e0a358972644d3718c80970fd7236a4df8e61afe
+Merge: 735c524 006ea56
+Author: Josh Durgin <jdurgin@redhat.com>
+Date: Mon Jun 6 08:19:23 2016 -0700
+
+ Merge pull request #9521 from ceph/revert-9496-wip-16149-hammer
+
+ Revert "hammer: Scrub error: 0/1 pinned"
+
+ Reviewed-by: Josh Durgin <jdurgin@redhat.com>
+
+commit 006ea56f603e160c83c8b1fe35ee8022321bf3b2
+Author: Sage Weil <sage@redhat.com>
+Date: Mon Jun 6 11:15:54 2016 -0400
+
+ Revert "hammer: Scrub error: 0/1 pinned"
+
+commit 735c52423305d4ad548464e986ff88e57333b8ca
+Merge: a1a5f57 c294bd3
+Author: Sage Weil <sage@redhat.com>
+Date: Mon Jun 6 08:46:45 2016 -0400
+
+ Merge pull request #9496 from Vicente-Cheng/wip-16149-hammer
+
+ hammer: Scrub error: 0/1 pinned
+
+commit a1a5f57558e30fc0fd581756a75da5abee3e897b
+Merge: a336291 d1ab71f
+Author: Orit Wasserman <owasserm@redhat.com>
+Date: Mon Jun 6 11:39:34 2016 +0200
+
+ Merge pull request #8987 from dreamhost/hammer-wip-pr7712
+
+ hammer: rgw: S3: set EncodingType in ListBucketResult
+ Reviewed-by: Orit Wasserman <owasserm@redhat.com>
+
+commit c294bd34e7e29f2c96e3277491c02ea26bf6da5c
+Author: Samuel Just <sjust@redhat.com>
+Date: Fri May 20 13:59:10 2016 -0700
+
+ ReplicatedPG: adjust num_pinned in _delete_oid
+
+ Fixes: http://tracker.ceph.com/issues/15952
+ Signed-off-by: Samuel Just <sjust@redhat.com>
+ (cherry picked from commit 907d4e25c676fd3e1c2be90ce8ab5b64b362b0bc)
+
+commit 43d1b92b97e0bb1c419341ba3c740fa632cafef0
+Author: David Zafman <dzafman@redhat.com>
+Date: Tue May 17 17:14:07 2016 -0700
+
+ test: Fix grouping of mon_cephdf_commands by moving to MON_TESTS
+
+ Signed-off-by: David Zafman <dzafman@redhat.com>
+ (cherry picked from commit 2fb0530a5650bcdb9c89d8bdd2504a7dd1642678)
+
+ Conflicts:
+ qa/workunits/cephtool/test.sh (trivial)
+
+commit 300c11179290d9b119ff6f310efd1cf5b559b3e1
+Author: Yehuda Sadeh <yehuda@redhat.com>
+Date: Tue Mar 22 18:14:57 2016 -0700
+
+ rgw: convert plain object to versioned (with null version) when removing
+
+ Fixes #15243
+
+ When removing a plain null versioned object (was created prior to bucket versioning
+ enabled), need to convert the bucket index representation to a versioned one. This
+ is needed so that all the versioning mechanics play together.
+
+ Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
+ (cherry picked from commit c6334d430b17739fed2df2b4481ae395ef6568d9)
+
+ Conflicts:
+ src/rgw/rgw_rados.cc
+ - hammer is missing get_zone() API from which log_data can be
+ obtained. Needed to fall back to zone_public_config
+ structure in bucket_index_unlink_instance() definition.
+ - olh_tag string parameter added to
+ bucket_index_unlink_instance() definition.
+ src/rgw/rgw_rados.h
+ - olh_tag string parameter added to
+ bucket_index_unlink_instance() declaration.
+
+commit 4eea92b4a50e06d850c39009d122f8bbbd48c857
+Author: Yehuda Sadeh <yehuda@redhat.com>
+Date: Thu May 5 14:02:25 2016 -0700
+
+ rgw: handle stripe transition when flushing final pending_data_bl
+
+ Fixes: http://tracker.ceph.com/issues/15745
+
+ When complete_writing_data() is called, if pending_data_bl is not empty
+ we still need to handle stripe transition correctly. If pending_data_bl
+ has more data that we can allow in current stripe, move to the next one.
+
+ Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
+ (cherry picked from commit b7a7d41839558b1a8786a66e27d9d80e606f61c7)
+
+ Conflicts:
+ src/rgw/rgw_rados.cc (hammer write_data() takes rgw_obj reference as
+ 4th argument, hammer throttle_data() takes rgw_obj as 2nd argument)
+
+commit f6076dd0416dd4464955f208d8964ef136b6142b
+Author: Zhi Zhang <willzzhang@tencent.com>
+Date: Tue May 3 17:12:26 2016 +0800
+
+ mds: wrongly treat symlink inode as normal file/dir when symlink inode is stale on kcephfs
+
+ Signed-off-by: Zhi Zhang <zhangz.david@outlook.com>
+ (cherry picked from commit 88b6d669e37924536152a552db46ef43a7353562)
+
+ Conflicts:
+ src/mds/Server.cc (hammer has req->head.args.open.flags instead of just flags)
+
+commit ce313cd89e29c0cfc6b7c600a82bdea7b351cdbd
+Author: Radoslaw Zarzynski <rzarzynski@mirantis.com>
+Date: Tue May 10 17:45:20 2016 +0200
+
+ rgw: handle errors properly during GET on Swift's DLO.
+
+ Backport: Jewel, Hammer
+ Fixes: http://tracker.ceph.com/issues/15812
+ Signed-off-by: Radoslaw Zarzynski <rzarzynski@mirantis.com>
+ (cherry picked from commit 5ef0202a86a1e4cb56bd29d926555f114a1acdd8)
+
+ Conflicts:
+ src/rgw/rgw_op.cc (hammer uses ret instead of op_ret; enclosing if
+ block in hammer does not check skip_manifest)
+
+commit 410ff1528caafaec0cfd9ea6ee4b86ed6788b09d
+Author: Sage Weil <sage@redhat.com>
+Date: Fri May 6 09:09:43 2016 -0400
+
+ osdc/Objecter: upper bound watch_check result
+
+ This way we always return a safe upper bound on the amount of time
+ since we did a check. Among other things, this prevents us from
+ returning a value of 0, which is confusing.
+
+ Fixes: http://tracker.ceph.com/issues/15760
+ Signed-off-by: Sage Weil <sage@redhat.com>
+ (cherry picked from commit 2e2ce365866a7569b55aff338a82c132aa927089)
+
+ Conflicts:
+ src/osdc/Objecter.cc
+ By https://github.com/ceph/ceph/pull/8967, simply add 1 to return vaule.
+
+commit d3eae0a01ae8d33988ffccee1f0af145aa10fa33
+Author: Xinze Chi <xinze@xsky.com>
+Date: Mon May 23 21:38:39 2016 +0800
+
+ osd: fix omap digest compare when scrub
+
+ Introduce by fe1c28dea4e5607a0c72eab1f046074616cd55a7.
+
+ Fixes: http://tracker.ceph.com/issues/16000
+ Signed-off-by: Xinze Chi <xinze@xsky.com>
+
+commit a33629106ec64acdaba45bf9db18d2402a926b8e
+Merge: b9b5f96 dd29310
+Author: Sage Weil <sage@redhat.com>
+Date: Sat May 21 14:18:25 2016 -0400
+
+ Merge pull request #9240 from yehudasa/wip-15886-hammer
+
+ rgw: keep track of written_objs correctly
+
+commit dd29310bd6273ec3643bf90e51f7cae4801629c7
+Author: Yehuda Sadeh <yehuda@redhat.com>
+Date: Mon May 16 14:35:12 2016 -0700
+
+ rgw: keep track of written_objs correctly
+
+ Fixes: http://tracker.ceph.com/issues/15886
+
+ Only add a rados object to the written_objs list if the write
+ was successful. Otherwise if the write will be canceled for some
+ reason, we'd remove an object that we didn't write to. This was
+ a problem in a case where there's multiple writes that went to
+ the same part. The second writer should fail the write, since
+ we do an exclusive write. However, we added the object's name
+ to the written_objs list anyway, which was a real problem when
+ the old processor was disposed (as it was clearing the objects).
+
+ Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
+ (cherry picked from commit 8fd74d11682f9d0c9085d2dc445fc3eb5631f6e0)
+
+commit c2ea6dbd652782bb227b7787c486660871b2d950
+Author: Kefu Chai <kchai@redhat.com>
+Date: Mon May 9 15:01:46 2016 +0800
+
+ osd: remove all stale osdmaps in handle_osd_map()
+
+ in a large cluster, there are better chances that the OSD fails to trim
+ the cached osdmap in a timely manner. and sometimes, it is just unable
+ to keep up with the incoming osdmap if skip_maps, so the osdmap cache
+ can keep building up to over 250GB in size. in this change
+
+ * publish_superblock() before trimming the osdmaps, so other osdmap
+ consumers of OSDService.superblock won't access the osdmaps being
+ removed.
+ * trim all stale osdmaps in batch of conf->osd_target_transaction_size
+ if skip_maps is true. in my test, it happens when the osd only
+ receives the osdmap from monitor occasionally because the osd happens
+ to be chosen when monitor wants to share a new osdmap with a random
+ osd.
+ * always use dedicated transaction(s) for trimming osdmaps. so even in
+ the normal case where we are able to trim all stale osdmaps in a
+ single batch, a separated transaction is used. we can piggy back
+ the commits for removing maps, but we keep it this way for simplicity.
+ * use std::min() instead MIN() for type safety
+
+ Fixes: http://tracker.ceph.com/issues/13990
+ Signed-off-by: Kefu Chai <kchai@redhat.com>
+ (cherry picked from commit 369db9930887d75b498927da9c97733bff4472b6)
+
+ Conflicts:
+ remove the C++11ism
+
+commit ac0340ad30329df7919ce82938ad49d0a2e2d160
+Author: Kefu Chai <kchai@redhat.com>
+Date: Wed Mar 16 21:15:35 2016 +0800
+
+ osd: populate the trim_thru epoch using MOSDMap.oldest_map
+
+ instead of filling MOSDMap with the local oldest_map, we share
+ the maximum MOSDMap.oldest_map received so far with peers. That
+ way one OSD's failure to trim won't prevent it from sharing with
+ others that they are allowed to trim.
+
+ Fixes: #13990
+ Signed-off-by: Kefu Chai <kchai@redhat.com>
+ (cherry picked from commit 9789c29fe0f82b236703f7ae4d356251fde3a46f)
+
+ Conflict: use atomic_t instead of std::atomic<>
+
+commit b9b5f966ddfe7e706c038db204271ee662e0d825
+Merge: b90c097 bb5e015
+Author: Sage Weil <sage@redhat.com>
+Date: Wed May 18 17:02:26 2016 -0400
+
+ Merge pull request #9164 from liewegas/wip-osdmapcrc-hammer
+
+ osd: dump full map bl at 20 when crc doesn't match
+
+commit bb5e015d50cb50361dd6ce258c720fe798b3835a
+Author: Sage Weil <sage@redhat.com>
+Date: Sun Sep 6 13:56:38 2015 -0400
+
+ osd: dump full map bl at 20 when crc doesn't match
+
+ This will help us debug cases where the encoding doesn't match due
+ to a bug.
+
+ Signed-off-by: Sage Weil <sage@redhat.com>
+ (cherry picked from commit bfe359af0b80f44ca04847f74d5a2d81097ce4e6)
+
+commit 5057c34ebe4f93792f058ea5f2e3c7e0a29b3d3d
+Author: Dmitry Yatsushkevich <dyatsushkevich@mirantis.com>
+Date: Mon Mar 23 11:05:44 2015 -0700
+
+ obj_bencher: cosmetic display fixes
+
+ fix indents in output
+ change `snprintf' to `setprecision'
+
+ Signed-off-by: Dmitry Yatsushkevich <dyatsushkevich@mirantis.com>
+ (cherry picked from commit ddb422f40394ec2f4fc4a6a6cff49e43538121a9)
+ Signed-off-by: Brad Hubbard <bhubbard@redhat.com>
+
+commit 6d8ad0edf6bae57a6e8ca5cc1a7add1659a92691
+Author: Brad Hubbard <bhubbard@redhat.com>
+Date: Fri May 6 15:05:42 2016 +1000
+
+ common: Add space between timestamp and "min lat:" in bench output
+
+ This change is taken from 069d95eaf49cadaa9a8fa1fa186455944a50ec7d
+ but I did not want to cherry-pick that patch since the rest of it
+ is purely cosmetic and would be unlikely to apply cleanly.
+
+ Signed-off-by: Brad Hubbard <bhubbard@redhat.com>
+
+commit b90c097ddd3e172df4534509309a554cb3bc3917
+Merge: aefe2cb aab3a40
+Author: Loic Dachary <loic@dachary.org>
+Date: Mon May 16 13:02:44 2016 +0200
+
+ Merge pull request #8535 from asheplyakov/bug-14512-hammer
+
+ hammer: rbd snap rollback: restore the link to parent
+
+ Reviewed-by: Jason Dillaman <dillaman@redhat.com>
+
+commit 31849986896ba6b5fd2b0b13023b50f67842fd28
+Author: Adam Kupczyk <akupczyk@mirantis.com>
+Date: Wed Mar 2 12:31:01 2016 +0100
+
+ [MON] Fixed calculation of %USED. Now it is shows (space used by all replicas)/(raw space available on OSDs). Before it was (size of pool)/(raw space available on OSDs).
+
+ Signed-off-by: Adam Kupczyk akupczyk@mirantis.com
+ (cherry picked from commit 71c4e525f27b8efd2aa4f3b5e95f4a13f123d41a)
+
+commit fed256e40f5465959384735be957dec88733aeb7
+Author: Ruifeng Yang <yangruifeng.09209@h3c.com>
+Date: Tue Jan 12 22:08:41 2016 +0800
+
+ mon: add a column 'RAW USED' for ceph df detail
+
+ Signed-off-by: Ruifeng Yang <yangruifeng.09209@h3c.com>
+ (cherry picked from commit 2b597ae6d4d53974f28a2da090232577daf09979)
+
+ Conflicts:
+ qa/workunits/cephtool/test.sh (trivial)
+ src/mon/PGMonitor.cc (trivial)
+ src/mon/PGMonitor.h (trivial)
+
+commit aefe2cb4f262112f0a028797733f868b83da7bd2
+Merge: d56bdf9 221efb0
+Author: Loic Dachary <loic@dachary.org>
+Date: Thu May 12 23:17:51 2016 +0200
+
+ Merge pull request #9107 from SUSE/wip-15867-hammer
+
+ hammer: ceph-disk s/by-parttype-uuid/by-parttypeuuid/
+
+ Reviewed-by: Loic Dachary <ldachary@redhat.com>
+
+commit 139691c646809f6c25d72c8de064f26b3c036197
+Author: Samuel Just <sjust@redhat.com>
+Date: Thu May 12 13:50:58 2016 -0700
+
+ src/test/objectstore/store_test.cc: fix shards for new tests
+
+ This didn't matter on master/jewel, but in hammer, keyvaluestore
+ asserts that gen != NO_GEN => shard != NO_SHARD.
+
+ Signed-off-by: Samuel Just <sjust@redhat.com>
+
+commit 221efb0b893adbfd7a19df171cf967fee87afcc7
+Author: Nathan Cutler <ncutler@suse.com>
+Date: Thu May 12 20:06:06 2016 +0200
+
+ doc: s/by-parttype-uuid/by-parttypeuuid/ in ceph-disk
+
+ Fixes: http://tracker.ceph.com/issues/15867
+ Signed-off-by: Nathan Cutler <ncutler@suse.com>
+
+commit 62f4fbe66f8af79fb874125743df0433aa92b731
+Author: Samuel Just <sjust@redhat.com>
+Date: Fri Mar 11 17:02:15 2016 -0800
+
+ store_test: improve synthetic coverage of the ec stash case
+
+ Signed-off-by: Samuel Just <sjust@redhat.com>
+ (cherry picked from commit f3a78e046d54260de01a4d1db8e104130e35cf42)
+
+ Conflicts:
+ src/test/objectstore/store_test.cc
+
+commit b6bc9cbaef99670bc0fc55936ab02a3656ec8bfd
+Author: Samuel Just <sjust@redhat.com>
+Date: Fri Mar 11 14:05:37 2016 -0800
+
+ store_test: improve synthetic test coverage of long object names
+
+ 1/2 of objects will now have long names, and we'll shift the region
+ of the hash space where new objects are created every 1024 objects
+ created.
+
+ Signed-off-by: Samuel Just <sjust@redhat.com>
+ (cherry picked from commit 4b44720f752ebac63454ecd338e2b0c77c8fe501)
+
+ Conflicts:
+ src/test/objectstore/store_test.cc
+
+commit ec74c1281e641a45de039f2c168b50902e514729
+Author: Samuel Just <sjust@redhat.com>
+Date: Thu Mar 10 15:38:26 2016 -0800
+
+ TestRados: make half the objects have long names
+
+ Signed-off-by: Samuel Just <sjust@redhat.com>
+ (cherry picked from commit 8b64432d07a14df9dfd2ed1314783de16530b1d1)
+
+commit 9d1ee7cf390154c5939a01ff439e33d303a952c2
+Author: Samuel Just <sjust@redhat.com>
+Date: Thu Mar 10 15:19:15 2016 -0800
+
+ LFNIndex::lfn_translate: consider alt attr as well
+
+ If the file has an alt attr, there are two possible matching
+ ghobjects. We want to make sure we choose the right one for
+ the short name we have. If we don't, a split while there are
+ two objects linking to the same inode will result in one of
+ the links being orphaned in the source directory, resulting
+ in #14766.
+
+ Signed-off-by: Samuel Just <sjust@redhat.com>
+ (cherry picked from commit 850ce11ea3c4dacc6ff1a3ce7ff37000818267c2)
+
+commit 6b821cc8f394e59760e3d58d27f382976bb69e13
+Author: Samuel Just <sjust@redhat.com>
+Date: Thu Mar 10 11:06:06 2016 -0800
+
+ LFNIndex::created: fix return value with failure injection
+
+ See comment for explanation.
+
+ Signed-off-by: Samuel Just <sjust@redhat.com>
+ (cherry picked from commit aec5560887a1c1dbbb5aba822280e2c1e05d5d8f)
+
+commit f500435da3ddf750cf0770c0f63e9cff0cebd7a7
+Author: Samuel Just <sjust@redhat.com>
+Date: Thu Mar 10 11:03:13 2016 -0800
+
+ store_test: add reproducer for #14766
+
+ Signed-off-by: Samuel Just <sjust@redhat.com>
+ (cherry picked from commit 0fb67c772561aaca9261ac9094b74d7524498f6f)
+
+ Conflicts:
+ src/test/objectstore/store_test.cc
+
+commit cbd5aafe93a5c85392a460a183862f62af2836b8
+Author: Sage Weil <sage@redhat.com>
+Date: Fri Apr 29 15:24:09 2016 -0400
+
+ osd/PG: update info.stats.* mappings on split
+
+ These are updated in the init and start_peering_interval paths, but not
+ on split.
+
+ Fixes: http://tracker.ceph.com/issues/15523
+ Signed-off-by: Sage Weil <sage@redhat.com>
+ (cherry picked from commit 8b42294d98dd70715184991da5ba495fbe93d009)
+
+commit d1ab71ff6084719e86e07a447f3054af73e40868
+Author: Vitja Makarov <vitja.makarov@gmail.com>
+Date: Wed Feb 17 13:46:18 2016 +0300
+
+ hammer: rgw: S3: set EncodingType in ListBucketResult
+
+ Signed-off-by: Victor Makarov <vitja.makarov@gmail.com>
+ (cherry picked from commit d2e281d2beb0a49aae0fd939f9387cb2af2692c8)
+ X-Github-PR: 7712
+ Backport: hammer
+ Signed-off-by: Robin H. Johnson <robin.johnson@dreamhost.com>
+
+commit df4eadc2376bb4a53210e2fe176520887b840f2f
+Author: Gu Zhongyan <guzhongyan@360.cn>
+Date: Wed Dec 30 16:42:07 2015 +0800
+
+ rados: Add units to rados bench output
+
+ Fixes: #12248
+ Signed-off-by: Gu Zhongyan <guzhongyan@360.com>
+ Reviewed-by: Sage Weil <sage@redhat.com>
+ (cherry picked from commit 669b932934d60bbfa751cebd9340f11bd95e2853)
+ Signed-off-by: Brad Hubbard <bhubbard@redhat.com>
+
+commit d96086af5d54a7450f3823210323b9fe08fc075a
+Author: Samuel Just <sjust@redhat.com>
+Date: Wed Dec 2 17:20:19 2015 -0800
+
+ PGLog::rewind_divergent_log: fix rollback_info_trimmed_to before index()
+
+ Fixes: #13965
+ Signed-off-by: Samuel Just <sjust@redhat.com>
+ (cherry picked from commit 053ee919059b2671d40110e8dff8615dc13d34e0)
+
+commit e79162de4cb418576ca633d5c7ea6fb766706962
+Author: Samuel Just <sjust@redhat.com>
+Date: Wed Dec 2 17:17:57 2015 -0800
+
+ TestPGLog: add test for 13965
+
+ Signed-off-by: Samuel Just <sjust@redhat.com>
+ (cherry picked from commit 66c7246491f4b6e5b95d80cc93c9157725a1a778)
+
+commit fb1b40f5e2da1b70d9ff026a75196c79d09cf0c6
+Author: Jianpeng Ma <jianpeng.ma@intel.com>
+Date: Sun Mar 22 22:07:24 2015 +0800
+
+ osd/Replicated: For CEPH_OSD_OP_WRITE, set data digest.
+
+ Add two cases which can add data digest for OP_WRITE:
+ a: offset = 0, and length > original size
+ b: offset = original size, and original has data_digest.
+
+ Signed-off-by: Jianpeng Ma <jianpeng.ma@intel.com>
+ (cherry picked from commit c7702bf85d3617b3e1c6619b8ebeff34932fc3e4)
+
+commit f0242598ea7c990aef2d00f3dc6a0cd65656332c
+Author: Jianpeng Ma <jianpeng.ma@intel.com>
+Date: Mon Mar 23 09:54:52 2015 +0800
+
+ osd/ReplicatedPG: For obj has omap, it mean have omap data or omap header or have both.
+
+ Signed-off-by: Jianpeng Ma <jianpeng.ma@intel.com>
+ (cherry picked from commit fc51ce2a837e8e878d46d8ca54531aa7bd5d01b2)
+
+commit 7b3f1da0ab7f60705b6bc802ddb1bfbce10c8738
+Author: Sage Weil <sage@redhat.com>
+Date: Mon Mar 28 10:33:53 2016 -0400
+
+ mon/MonClient: fix shutdown race
+
+ While we are shutting down, we should drop all subsequent mon
+ messages. Currently it is possible to finish the authentication
+ sequence *while* we are shutting down, such that a subsequent
+ attempt to authenticate succeeds.
+
+ Fix this by resetting cur_con early in the sequence, as this
+ makes us drop all incoming messages.
+
+ Fixes: http://tracker.ceph.com/issues/13992
+ Signed-off-by: Sage Weil <sage@redhat.com>
+ (cherry picked from commit 5b44a348bfe4978446bbc7acf58eb8f60a47c965)
+
+commit ec02d8b7b1610bd7fd00c201fb01ef80d3b9f05b
+Author: Kefu Chai <kchai@redhat.com>
+Date: Tue Apr 12 17:31:27 2016 +0800
+
+ PG: set epoch_created and parent_split_bits for child pg
+
+ if we have a wrong "created", OSD receiving an osd_pg_create message
+ could fail to project its history and crash. a bad split_bits could
+ mislead the monitor and osd, and hence cause problems.
+ * set child.info.history.epoch_created to osdmap.get_epoch() instead of
+ using the parent's epoch_created
+ * set child.info.stats.parent_split_bits to the calculated split_bits
+ instead using the parent's split_bits
+
+ Fixes: http://tracker.ceph.com/issues/15426
+ Signed-off-by: Kefu Chai <kchai@redhat.com>
+ (cherry picked from commit 8b985561ba08d4ed2d7751a8e09f9d9067c5fbd3)
+
+commit 049bc8a498d4ab516c2daded8ac44699aa72c982
+Author: Zhi Zhang <willzzhang@tencent.com>
+Date: Thu Jan 14 11:04:42 2016 +0800
+
+ ceph-fuse: double decreased the count to trim caps
+
+ Signed-off-by: Zhi Zhang zhangz.david@outlook.com
+ (cherry picked from commit d8a3f6d839649243b12cd6f73e6cb8aec1f955c1)
+
+commit e20df8020458a7b7679d0105183f870220ed0ce7
+Author: Sage Weil <sage@redhat.com>
+Date: Fri Apr 8 10:35:29 2016 -0400
+
+ osd/ReplicatedPG: make handle_watch_timeout no-op if !active
+
+ During on_change, we clean up old events on the obcs. This can
+ include a queued watch timeout:
+
+ 3: (ReplicatedPG::handle_watch_timeout(std::shared_ptr<Watch>)+0x125) [0x7f1fc21fe375]
+ 4: (HandleDelayedWatchTimeout::finish(int)+0xd3) [0x7f1fc213e2e3]
+ 5: (Context::complete(int)+0x9) [0x7f1fc20ead29]
+ 6: (ReplicatedPG::finish_degraded_object(hobject_t const&)+0x354) [0x7f1fc22429e4]
+ 7: (ReplicatedPG::on_change(ObjectStore::Transaction*)+0x2ba) [0x7f1fc224353a]
+ 8: (PG::start_peering_interval(std::shared_ptr<OSDMap const>, std::vector<int, std::allocator<int> > const&, int, std::vector<int, std::allocator<int> > const&, int, ObjectStore::Transaction*)+0x7bd) [0x7f1fc219a0bd]
+
+ In this case, handle_watch_timeout should not assume that we are
+ active and primary.
+
+ Fixes: http://tracker.ceph.com/issues/15391
+ Signed-off-by: Sage Weil <sage@redhat.com>
+ (cherry picked from commit 4b0e39ee11e7bd5079ff6704bc74627d3ba8ba44)
+
+commit 3cb72dd57f901f400d19022269fb098c06318d6b
+Author: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
+Date: Tue Jun 9 14:57:54 2015 +0200
+
+ mon/OSDMonitor.cc: fix UNINTENDED_INTEGER_DIVISION
+
+ Fix for:
+
+ CID 1297885 (#1 of 2): Result is not floating-point (UNINTENDED_INTEGER_DIVISION)
+ integer_division: Dividing integer expressions g_conf->mon_pool_quota_warn_threshold
+ and 100, and then converting the integer quotient to type float. Any remainder,
+ or fractional part of the quotient, is ignored.
+
+ CID 1297885 (#2 of 2): Result is not floating-point (UNINTENDED_INTEGER_DIVISION)
+ integer_division: Dividing integer expressions g_conf->mon_pool_quota_crit_threshold
+ and 100, and then converting the integer quotient to type float. Any remainder,
+ or fractional part of the quotient, is ignored.
+
+ Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
+ (cherry picked from commit be7e07a52871e16e8a46accde6171077cca8db5a)
+
+commit aab3a40f95dafab34a7eadc2159d142a5f0f88f1
+Author: Alexey Sheplyakov <asheplyakov@mirantis.com>
+Date: Mon Apr 11 14:16:48 2016 +0300
+
+ hammer: rbd snap rollback: restore the link to parent
+
+ So snapshot, flatten, rollback of a cloned image does not loose any data
+
+ Fixes: #14512
+ Signed-off-by: Alexey Sheplyakov <asheplyakov@mirantis.com>
+
+commit 488a78794d800312f79f7a8cd75dfda3bf3d6ed0
+Author: Samuel Just <sjust@redhat.com>
+Date: Fri Jan 8 13:26:39 2016 -0800
+
+ ECBackend: send subop writes and reads at normal priority
+
+ We want these to be processed ahead of new client ops since
+ there are resources being held.
+
+ Fixes: 14313
+ Backport: hammer
+ Signed-off-by: Samuel Just <sjust@redhat.com>
+ (cherry picked from commit b1151c4b8b7f22c7ac067da059d087007b0bc8ea)
+
+commit a2e7ca15d6fd0326526b77f443c15067eb1840ac
+Author: Richard W.M. Jones <rjones@redhat.com>
+Date: Mon Mar 21 14:24:35 2016 +0000
+
+ common/Cycles: Do not initialize Cycles globally.
+
+ Move initialization to the few tests that actually use it.
+
+ Fixes: http://tracker.ceph.com/issues/15225
+ Signed-off-by: Richard W.M. Jones <rjones@redhat.com>
+ (cherry picked from commit 1c2831a2c1277c69f9649200d74a75c04a4b0296)
+
+ Conflicts:
+ src/test/msgr/perf_msgr_client.cc
+ src/test/msgr/perf_msgr_server.cc
+ src/test/perf_local.cc
+ These three files were not introduced on hammer, just remove
+
+commit ca0beef84812b09f1ab224e4796fd44c8fe37989
+Author: David Zafman <dzafman@redhat.com>
+Date: Fri Mar 18 10:42:40 2016 -0700
+
+ osd/OSD: fix build_past_intervals_parallel
+
+ We may be only calculating older past intervals and have a valid
+ history.same_interval_since value, in which case the local
+ same_interval_since value will end at the newest old interval we had to
+ generate.
+
+ Same as 0830275b39afc408573c2c468fa3b0e7b1d5cc4e change in generate_past_intervals()
+ This was introduced by 70316541bbb115d9a35954bfba373cf1dc084b7e.
+
+ Signed-off-by: David Zafman <dzafman@redhat.com>
+ (cherry picked from commit 0fd674bbf0c17a673be40123645adee3d64375a0)
+
+commit fce79027034bef0cfedbecd9d2601589495f86e6
+Author: David Zafman <dzafman@redhat.com>
+Date: Mon Jul 20 17:48:15 2015 -0700
+
+ osd: When generating past intervals due to an import end at pg epoch
+
+ Add assert() to make sure same_interval_since isn't too far forward
+
+ Fixes: #12387
+
+ Signed-off-by: David Zafman <dzafman@redhat.com>
+ (cherry picked from commit 65dcc2da76750d0b6dd2cf0031c44f32749f33e5)
+
+commit 2c97cb33c8aa3f53af8a331075a3f79e70113cea
+Author: xie xingguo <xie.xingguo@zte.com.cn>
+Date: Thu Mar 31 19:48:38 2016 +0800
+
+ rgw: fix compiling error
+
+ Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
+ (cherry picked from commit 535eb0e608f3bf6b7c561f277e9977b91ab97b48)
+
+commit 2aa1ea6b505c768323abb99dcc8c8f24e594a898
+Author: Robin H. Johnson <robin.johnson@dreamhost.com>
+Date: Thu Mar 31 06:24:40 2016 +0000
+
+ rgw: Multipart ListPartsResult ETag quotes
+
+ ListPartsResult output has always missed quotes on the ETag since it was
+ first committed.
+
+ Fixes: #15334
+ Backports: hammer, infernalis
+ Signed-off-by: Robin H. Johnson <robin.johnson@dreamhost.com>
+ (cherry picked from commit a58b774e72cc1613d62e10b25322d6d15e9d2899)
+
+commit 365f21b1181b08e0bb89b916833301228e7c9efc
+Author: Loic Dachary <ldachary@redhat.com>
+Date: Wed Apr 6 15:39:23 2016 +0200
+
+ tests: be more generous with test timeout
+
+ When the thrasher is in action together with a validater (lockdep or
+ valgrind), a single test may hang for more than 360 seconds. Increase to
+ 1200: it does not matter if the value is large, only that it prevents
+ the test from hanging forever.
+
+ Fixes: http://tracker.ceph.com/issues/15403
+
+ Signed-off-by: Loic Dachary <loic@dachary.org>
+ (cherry picked from commit af89474b3fb2c4aa63680aa6b30d71fad2fdd373)
+
+commit c722d00af5286785ad23c574359220e47fd15076
+Author: Vicente Cheng <freeze.bilsted@gmail.com>
+Date: Tue Feb 9 12:03:24 2016 -0800
+
+ rgw: user quota may not adjust on bucket removal
+
+ Description:
+ If the user/admin removes a bucket using --force/--purge-objects options with s3cmd/radosgw-admin respectively, the user stats will continue to reflect the deleted objects for quota purposes, and there seems to be no way to reset them. User stats need to be sync'ed prior to bucket removal.
+
+ Solution:
+ Sync user stats before removing a bucket.
+
+ Fixes: #14507
+ Signed-off-by: Edward Yang <eyang@us.fujitsu.com>
+ (cherry picked from commit 06507992e3fad837c4667f467d59fc026a2ca0e8)
+
+ Conflicts:
+
+ src/rgw/rgw_op.cc
+ reordering the check seqence and replace some op_ret to ret
+
+ Backport Change:
+ We remove the `tenant` parameter because this feature is not introduced on hammer version.
+ The rgw multi-tenant feature is introduced on pr#6784 (https://github.com/ceph/ceph/pull/6784)
+ This feature is supported from v10.0.2 and later version.
+
+commit 20f300e2900ff123974312143c10dca59ee1a64a
+Author: Wido den Hollander <wido@42on.com>
+Date: Tue Mar 22 11:35:05 2016 +0100
+
+ rgw: Do not send a Content-Length header on a 304 response
+
+ We tell the client that the content has not changed. If we
+ send a Content-Length header RFC2616 describes that the client
+ MUST use that new value:
+
+ "If a cache uses a received 304 response to update a cache entry,
+ the cache MUST update the entry to reflect any new field values
+ given in the response."
+
+ Therefor we should not send a Content-Length header
+
+ Fixes: #15119
+
+ Signed-off-by: Wido den Hollander <wido@42on.com>
+ (cherry picked from commit fb4e5cc5d6adc82423d294496855f56e43e8c11d)
+
+commit e53751d0e52f6fb611d9bd81fe2115cd7ce533b3
+Author: Wido den Hollander <wido@42on.com>
+Date: Mon Mar 21 16:50:49 2016 +0100
+
+ rgw: Do not send a Content-Type on a '304 Not Modified' response
+
+ When we say the Content has not changed we should not respond
+ with a content type which defaults to binary/octet stream.
+
+ Fixes: #15119
+
+ Signed-off-by: Wido den Hollander <wido@42on.com>
+ (cherry picked from commit 471fa29e643fcfd5e1383fb987f99b5b21038ed7)
+
+commit 19dbc2598d15d0676017abe4fb75f7ddc3248119
+Author: Yehuda Sadeh <yehuda@redhat.com>
+Date: Fri Dec 18 10:18:22 2015 -0800
+
+ rgw: dump_status() uses integer
+
+ so that we can avoid atoi() later
+
+ Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
+ (cherry picked from commit 744a29a34b72d2a709a58a5ea5fb6223a39c676a)
+
+ Conflicts:
+ src/rgw/rgw_rest.cc
+ rename the input parameter from `err` to `http_ret`
+
+commit c79b481311b3cd992794abc6e2f194f350d43531
+Author: Yehuda Sadeh <yehuda@redhat.com>
+Date: Fri Dec 18 10:07:27 2015 -0800
+
+ rgw: move status_num initialization into constructor
+
+ Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
+ (cherry picked from commit 2a12ffc3d7f98504ece8906a6fcb5dac8fd81aba)
+
+commit ceb8e19096f7d4ef35ed3ad8fad508aecbfa78ef
+Author: Wido den Hollander <wido@42on.com>
+Date: Wed Nov 11 19:01:15 2015 +0100
+
+ rgw: Do not send a Content-Length header on status 204
+
+ RFC7230 says:
+ A server MUST NOT send a Content-Length header field in any response with a
+ status code of 1xx (Informational) or 204 (No Content).
+
+ Fixes: #13582
+ Signed-off-by: Wido den Hollander <wido@42on.com>
+ (cherry picked from commit 4e5921dbc7d1c51feb4cc5c03aa59a432742765e)
+
+commit 3ecdedd5cfe67d85530123ed6684688b43910aa6
+Author: Yan, Zheng <zyan@redhat.com>
+Date: Fri Mar 11 11:13:43 2016 +0800
+
+ mds: fix stray purging in 'stripe_count > 1' case
+
+ Fixes: #15050
+ Signed-off-by: Yan, Zheng <zyan@redhat.com>
+ (cherry picked from commit 99ec183973e0f4686673d93df02e5381543be51f)
+
+commit f28477c9cf904e9b27e6ad6bb38fbeeb80db5017
+Author: Dunrong Huang <riegamaths@gmail.com>
+Date: Mon Dec 28 18:55:37 2015 +0800
+
+ rgw: do not abort when user passed bad parameters to set quota
+
+ when user passes bad parameter(e.g. pass "null" to bool parameter), the ceph_json.cc::decode_json_obj()
+ will raise a exception with type of JSONDecoder::err(). If we do not catch this exception, the radosgw
+ server will abort.
+
+ Fixes: #14191
+
+ $ curl -X PUT http://ceph1:9090/admin/user?quota&uid=test5"a-type=user -d '{"enabled": "null"}'
+
+ 0> 2015-12-28 11:25:20.864091 7f0d46fb5700 -1 *** Caught signal (Aborted) **
+ in thread 7f0d46fb5700
+
+ ceph version 10.0.1-787-gc485d29 (c485d29a53f6a2c1a3b561c54632dbac1c4e9473)
+ 1: (ceph::BackTrace::BackTrace(int)+0x2d) [0x7f0e13ef88c5]
+ 2: (()+0x8fbfb7) [0x7f0e13ef7fb7]
+ 3: (()+0xf100) [0x7f0e082c3100]
+ 4: (gsignal()+0x37) [0x7f0e072fd5f7]
+ 5: (abort()+0x148) [0x7f0e072fece8]
+ 6: (__gnu_cxx::__verbose_terminate_handler()+0x165) [0x7f0e07c019b5]
+ 7: (()+0x5e926) [0x7f0e07bff926]
+ 8: (()+0x5e953) [0x7f0e07bff953]
+ 9: (()+0x5eb73) [0x7f0e07bffb73]
+ 10: (bool JSONDecoder::decode_json<bool>(char const*, bool&, JSONObj*, bool)+0x288) [0x7f0e13d74c2c]
+ 11: (RGWQuotaInfo::decode_json(JSONObj*)+0x6c) [0x7f0e13d71128]
+ 12: (void decode_json_obj<RGWQuotaInfo>(RGWQuotaInfo&, JSONObj*)+0x23) [0x7f0e13d21f16]
+ 13: (int rgw_rest_get_json_input<RGWQuotaInfo>(CephContext*, req_state*, RGWQuotaInfo&, int, bool*)+0x11e) [0x7f0e13d21e48]
+ 14: (RGWOp_Quota_Set::execute()+0x8c9) [0x7f0e13d1ed6d]
+ 15: (()+0x7532d2) [0x7f0e13d4f2d2
+
+ Reported-by: Coffee Chou <coffee.zyr@gmail.com>
+ Signed-off-by: Dunrong Huang <riegamaths@gmail.com>
+ (cherry picked from commit 59f9058467480d21bd98e0e90aa97313a92478a1)
+
+ Conflicts:
+ src/rgw/rgw_rest.h
+ hammer version lacks rgw_rest_get_json_input_keep_data()
+ template
+
+commit 9786394b2f75d883505125bc45c95fb685b96531
+Author: Dunrong Huang <riegamaths@gmail.com>
+Date: Mon Dec 28 18:14:22 2015 +0800
+
+ rgw: do not abort when user passed bad parameters to set metadata
+
+ Fixes: #14190
+
+ when user passes bad parameter(e.g. pass "null" to bool parameter), the ceph_json.cc::decode_json_obj()
+ will raise a exception with type of JSONDecoder::err(). If we do not catch this exception, the radosgw
+ server will abort.
+
+ $ curl -X PUT http://ceph1:9090/admin/metadata?user&format=json -d 'data = { "mtime": "null"}'
+
+ terminate called after throwing an instance of 'JSONDecoder::err'
+ *** Caught signal (Aborted) **
+ in thread 7ff982f55700
+ ceph version 10.0.1-787-gc485d29 (c485d29a53f6a2c1a3b561c54632dbac1c4e9473)
+ 1: (ceph::BackTrace::BackTrace(int)+0x2d) [0x7ffa814db8c5]
+ 2: (()+0x8fbfb7) [0x7ffa814dafb7]
+ 3: (()+0xf100) [0x7ffa758a6100]
+ 4: (gsignal()+0x37) [0x7ffa748e05f7]
+ 5: (abort()+0x148) [0x7ffa748e1ce8]
+ 6: (__gnu_cxx::__verbose_terminate_handler()+0x165) [0x7ffa751e49b5]
+ 7: (()+0x5e926) [0x7ffa751e2926]
+ 8: (()+0x5e953) [0x7ffa751e2953]
+ 9: (()+0x5eb73) [0x7ffa751e2b73]
+ 10: (bool JSONDecoder::decode_json<long>(char const*, long&, JSONObj*, bool)+0x28c) [0x7ffa8135920a]
+ 11: (RGWMetadataManager::put(std::string&, ceph::buffer::list&, RGWMetadataHandler::sync_type_t, obj_version*)+0x173) [0x7ffa81468029]
+ 12: (RGWOp_Metadata_Put::execute()+0x172) [0x7ffa81308dcc]
+ 13: (()+0x7532d2) [0x7ffa813322d2]
+ 14: (RGWFCGXProcess::handle_request(RGWRequest*)+0x90) [0x7ffa813328a4]
+
+ Reported-by: Coffee Chou <coffee.zyr@gmail.com>
+ Signed-off-by: Dunrong Huang <riegamaths@gmail.com>
+ (cherry picked from commit 83503239c81573232429a5fe98381f1a8f1357e9)
+
+ Conflicts:
+ src/rgw/rgw_user.cc
+ hammer version uses RGWUserInfo instead of RGWUserCompleteInfo
+
+commit b9a4ad9da99d82bd247e5d39108840f19535fa5e
+Author: Vicente Cheng <freeze.bilsted@gmail.com>
+Date: Fri Mar 27 18:49:28 2015 +0800
+
+ Fixed the ceph get mdsmap assertion.
+
+ When we want to get mdsmap, we try to get_version()
+ and the return value err = 0 means success.
+
+ The assert verified r == 0. r would not change in this flow.
+ It always meet assert and lead mon failure.
+
+ I think this verify should be:
+ assert(err == 0)
+ It will help to check return value of get_version().
+
+ If you have any questions, feel free to let me know.
+ Thanks!
+
+ Signed-off-by: Vicente Cheng <freeze.bilsted@gmail.com>
+ (cherry picked from commit f4398d2e6c245e3f81a6038425e1b8372b265b8c)
projects / ceph.git / commitdiff