]>
git.apps.os.sepia.ceph.com Git - ceph-ci.git/log 
Josh Durgin  [Fri, 6 Apr 2018 06:43:13 +0000  (02:43  -0400)] 
osd/ECBackend: only check required shards when finishing recovery reads
1235810c2ad08ccb7ef5946686eb2b85798f5bca  allowed recovery to use
multiple passes of reads to handle EIO, but the end condition for
checking whether we finished reading requires the full data to be
decodable (this is what get_want_to_read_shards returns).
This is just a loss of efficiency normally, since when there is only
one object the subsequent read works, and grabs all the data
necessary. The crash comes from having multiple objects in the same
ReadOp - in this case the sequence of events is:
- start recovery of two objects (osd_recovery_max_single_start > 1)
- read object a shard 3
- read object b shard 3
- fail minimum_to_decode because shard 3 can't reconstruct all of object a
- re-read all of object a, marking more reads in progress
- fail minimum_to_decode because shard 3 can't reconstruct all of object b
- skip re-reading object because there are now reads in progress
- finish reading k shards of object a
- still fail minimum_to_decode for object b, so no extra data was read
- send_all_remaining_reads tries to lookup object b in ReadOp object
- crash dereferencing to_read[object b], since this was cleared after handling the original object b read reply
This patch fixes the immediate inefficiency and crash by only checking
for the missing shards that were requested, rather than the entire
object, for recovery reads.
Fixes: http://tracker.ceph.com/issues/23195 (first crash) 
Signed-off-by: Josh Durgin <jdurgin@redhat.com> 
Josh Durgin  [Tue, 10 Apr 2018 01:47:46 +0000  (21:47 -0400)] 
osd/ECBackend: store the original needed shards in a ReadOpSigned-off-by: Josh Durgin <jdurgin@redhat.com> 
Nathan Cutler  [Fri, 6 Apr 2018 02:00:46 +0000  (04:00  +0200)] 
Merge pull request #21127 from smithfarm/wip-make-dist-py3Reviewed-by: Kefu Chai <kchai@redhat.com> Reviewed-by: Ricardo Dias <rdias@suse.com> 
Patrick Donnelly  [Fri, 6 Apr 2018 00:03:18 +0000  (17:03 -0700)] 
Merge PR #21238 into masterReviewed-by: Patrick Donnelly <pdonnell@redhat.com> 
Patrick Donnelly  [Fri, 6 Apr 2018 00:02:20 +0000  (17:02 -0700)] 
Merge PR #21204 into masterReviewed-by: Patrick Donnelly <pdonnell@redhat.com> 
Matt Benjamin  [Thu, 5 Apr 2018 18:57:41 +0000  (14:57 -0400)] 
Merge pull request #20992 from cbodley/wip-dmclock-remove-by-ptr
Sage Weil  [Thu, 5 Apr 2018 17:55:18 +0000  (12:55 -0500)] 
Merge pull request #21261 from batrick/ceph-update-ceph-object-corpus
Patrick Donnelly  [Thu, 5 Apr 2018 17:50:32 +0000  (10:50 -0700)] 
ceph-object-corpus: update to fix make checkSigned-off-by: Patrick Donnelly <pdonnell@redhat.com> 
Nathan Cutler  [Thu, 5 Apr 2018 13:14:13 +0000  (15:14 +0200)] 
Merge pull request #21148 from wjwithagen/wjw-setup-virtualenvReviewed-by: Nathan Cutler <ncutler@suse.com> 
John Spray  [Thu, 5 Apr 2018 11:00:40 +0000  (12:00 +0100)] 
Merge pull request #21237 from guzhongyan/zabbix-fixReviewed-by: John Spray <john.spray@redhat.com> 
Kefu Chai  [Thu, 5 Apr 2018 07:04:02 +0000  (15:04 +0800)] 
Merge pull request #21253 from ceph/wip-yuriw-crontabReviewed-by: Vasu Kulkarni <vasu@redhat.com> 
Patrick Donnelly  [Thu, 5 Apr 2018 04:13:35 +0000  (21:13 -0700)] 
Merge PR #21254 into masterReviewed-by: Zheng Yan <zyan@redhat.com> 
Josh Durgin  [Thu, 5 Apr 2018 00:50:07 +0000  (17:50 -0700)] 
Merge pull request #21252 from neha-ojha/wip-modify-crontabReviewed-by: Yuri Weinstein <yweins@redhat.com> 
Patrick Donnelly  [Wed, 4 Apr 2018 23:47:06 +0000  (16:47 -0700)] 
mds: bump mds_log_max_segments for trim bufferFixes: http://tracker.ceph.com/issues/23560 Signed-off-by: Patrick Donnelly <pdonnell@redhat.com> 
Yuri Weinstein  [Wed, 4 Apr 2018 23:18:41 +0000  (16:18 -0700)] 
tests/qa - enabled `ceph-deploy` runs on `mira` nodesSigned-off-by: Yuri Weinstein <yweinste@redhat.com> 
Neha Ojha  [Wed, 4 Apr 2018 21:33:11 +0000  (14:33 -0700)] 
qa/crontab: run the perf-basic suite every daySigned-off-by: Neha Ojha <nojha@redhat.com> 
Josh Durgin  [Wed, 4 Apr 2018 21:06:46 +0000  (14:06 -0700)] 
Merge pull request #21101 from dzafman/wip-23267Reviewed-by: Josh Durgin <jdurgin@redhat.com> 
Nathan Cutler  [Thu, 29 Mar 2018 15:23:40 +0000  (17:23 +0200)] 
build/ops: make-dist: fall back to python3Signed-off-by: Nathan Cutler <ncutler@suse.com> 
vasukulkarni  [Wed, 4 Apr 2018 15:28:57 +0000  (08:28 -0700)] 
Merge pull request #21146 from zmc/wip-cephmetrics
Sage Weil  [Wed, 4 Apr 2018 15:18:21 +0000  (10:18 -0500)] 
Merge pull request #21244 from ifed01/wip-ifed-min-blob-descrReviewed-by: Sage Weil <sage@redhat.com> 
Igor Fedotov  [Wed, 4 Apr 2018 14:01:51 +0000  (17:01 +0300)] 
os/bluestore: update description forSigned-off-by: Igor Fedotov <ifedotov@suse.com> 
Ramana Raja  [Wed, 4 Apr 2018 09:42:02 +0000  (15:12 +0530)] 
doc: fix typos and other minor errors in cephfs-nfs docSigned-off-by: Ramana Raja <rraja@redhat.com> 
Gu Zhongyan  [Wed, 4 Apr 2018 09:29:49 +0000  (17:29 +0800)] 
mgr/zabbix: Fix wrong log messageSigned-off-by: Gu Zhongyan <guzhongyan@360.cn> 
Lenz Grimmer  [Wed, 4 Apr 2018 09:29:44 +0000  (11:29 +0200)] 
Merge pull request #21087 from ricardoasmarques/wip-date-pipeReviewed-by: Volker Theile <vtheile@suse.com> 
Ricardo Dias  [Wed, 4 Apr 2018 06:52:39 +0000  (07:52 +0100)] 
Merge pull request #21060 from ricardoasmarques/wip-view-cache-status-forReviewed-by: Lenz Grimmer <lgrimmer@suse.com> Reviewed-by: Tiago Melo <tmelo@suse.com> 
Ricardo Dias  [Wed, 4 Apr 2018 06:33:01 +0000  (07:33 +0100)] 
Merge pull request #21045 from votdev/remove_useless_codeReviewed-by: Sebastian Wagner <sebastian.wagner@suse.com> Reviewed-by: Tatjana Dehler <tdehler@suse.com> 
Patrick Donnelly  [Tue, 3 Apr 2018 22:41:19 +0000  (15:41 -0700)] 
Merge PR #16779 into masterReviewed-by: Patrick Donnelly <pdonnell@redhat.com> 
Zack Cerza  [Wed, 21 Mar 2018 22:00:58 +0000  (16:00 -0600)] 
qa/suites/cephmetrics: Add new facetsSigned-off-by: Zack Cerza <zack@redhat.com> 
Zack Cerza  [Wed, 21 Mar 2018 21:02:52 +0000  (15:02 -0600)] 
qa/suites/cephmetrics: Update ceph-ansible configSigned-off-by: Zack Cerza <zack@redhat.com> 
Patrick Donnelly  [Tue, 3 Apr 2018 19:52:48 +0000  (12:52 -0700)] 
Merge PR #20915 into masterReviewed-by: Jeff Layton <jlayton@redhat.com> 
David Zafman  [Wed, 28 Mar 2018 17:21:39 +0000  (10:21 -0700)] 
osd: Fix stale scrub stats when a primary takes overFixes: http://tracker.ceph.com/issues/23267 Signed-off-by: David Zafman <dzafman@redhat.com> 
Patrick Donnelly  [Tue, 3 Apr 2018 18:38:43 +0000  (11:38 -0700)] 
Merge PR #21003 into masterReviewed-by: Patrick Donnelly <pdonnell@redhat.com> Reviewed-by: Zheng Yan <zyan@redhat.com> 
Patrick Donnelly  [Tue, 3 Apr 2018 18:36:58 +0000  (11:36 -0700)] 
Merge PR #21221 into masterReviewed-by: Patrick Donnelly <pdonnell@redhat.com> 
Patrick Donnelly  [Tue, 3 Apr 2018 04:33:07 +0000  (21:33 -0700)] 
client: fix _read return for invalid offsetSigned-off-by: Patrick Donnelly <pdonnell@redhat.com> 
Patrick Donnelly  [Tue, 3 Apr 2018 18:33:55 +0000  (11:33 -0700)] 
Merge PR #21088 into masterReviewed-by: Patrick Donnelly <pdonnell@redhat.com> 
John Wilkins  [Tue, 3 Apr 2018 16:55:06 +0000  (09:55 -0700)] 
Merge pull request #21050 from falcon78921/wip-doc-falcon78921
David Galloway  [Tue, 3 Apr 2018 16:27:34 +0000  (12:27 -0400)] 
Merge pull request #21218 from ceph/wip-dgall-crontab
David Galloway  [Tue, 3 Apr 2018 15:39:13 +0000  (11:39 -0400)] 
test:qa:infra - Run update daily and use bashSigned-off-by: David Galloway <dgallowa@redhat.com> 
Sage Weil  [Tue, 3 Apr 2018 15:08:22 +0000  (10:08 -0500)] 
Merge tag 'v13.0.2'
Ricardo Marques  [Wed, 28 Mar 2018 06:47:37 +0000  (07:47 +0100)] 
mgr/dashboard: Add CdDatePipeSigned-off-by: Ricardo Marques <rimarques@suse.com> 
Patrick Donnelly  [Tue, 3 Apr 2018 13:51:18 +0000  (06:51 -0700)] 
Merge PR #21180 into masterReviewed-by: John Spray <john.spray@redhat.com> 
Jason Dillaman  [Tue, 3 Apr 2018 13:17:21 +0000  (09:17 -0400)] 
Merge pull request #20460 from colletj/v1_image_creation_disallowReviewed-by: Jason Dillaman <dillaman@redhat.com> 
Jason Dillaman  [Tue, 3 Apr 2018 13:14:39 +0000  (09:14 -0400)] 
Merge pull request #21202 from tchaikov/wip-rbd-replayReviewed-by: Jason Dillaman <dillaman@redhat.com> 
Jason Dillaman  [Tue, 3 Apr 2018 11:39:15 +0000  (07:39 -0400)] 
Merge pull request #21142 from dragonylffly/wip-fix-ebusyReviewed-by: Jason Dillaman <dillaman@redhat.com> 
Jason Dillaman  [Tue, 3 Apr 2018 11:38:40 +0000  (07:38 -0400)] 
Merge pull request #21157 from trociny/wip-23526Reviewed-by: Jason Dillaman <dillaman@redhat.com> 
Yan, Zheng  [Tue, 3 Apr 2018 09:01:52 +0000  (17:01 +0800)] 
mds: PendingReleaseNotes and dev doc for open file tableFixes: http://tracker.ceph.com/issues/23532 Signed-off-by: "Yan, Zheng" <zyan@redhat.com> 
Kefu Chai  [Sun, 9 Aug 2015 07:40:53 +0000  (00:40  -0700)] 
rbd-replay: remove boost dependencySigned-off-by: Kefu Chai <kchai@redhat.com> 
Volker Theile  [Mon, 26 Mar 2018 13:13:48 +0000  (15:13 +0200)] 
mgr/dashboard: Remove useless codeSigned-off-by: Volker Theile <vtheile@suse.com> 
Patrick Donnelly  [Tue, 3 Apr 2018 04:15:20 +0000  (21:15 -0700)] 
Merge PR #20855 into masterReviewed-by: Patrick Donnelly <pdonnell@redhat.com> 
Patrick Donnelly  [Tue, 3 Apr 2018 04:10:56 +0000  (21:10 -0700)] 
Merge PR #21096 into masterReviewed-by: Patrick Donnelly <pdonnell@redhat.com> 
Yuri Weinstein  [Mon, 2 Apr 2018 20:56:08 +0000  (13:56 -0700)] 
Merge pull request #21183 from neha-ojha/wip-minor-fix-perf-suiteReviewed-by: Yuri Weinstein <yweins@redhat.com> 
David Galloway  [Mon, 2 Apr 2018 20:08:02 +0000  (16:08 -0400)] 
Merge pull request #21075 from ceph/wip-yuriw-try-crontab
Neha Ojha  [Mon, 2 Apr 2018 19:43:20 +0000  (12:43 -0700)] 
qa/suites/perf-basic: add desc regarding test machinesSigned-off-by: Neha Ojha <nojha@redhat.com> 
Mykola Golub  [Sat, 24 Mar 2018 06:22:53 +0000  (08:22 +0200)] 
journal: limit number of appends sent in one librados opFixes: http://tracker.ceph.com/issues/23526 Signed-off-by: Mykola Golub <mgolub@suse.com> 
Jason Dillaman  [Mon, 2 Apr 2018 15:17:04 +0000  (11:17 -0400)] 
Merge pull request #21165 from Songweibin/wip-drop-redefine-funcReviewed-by: Jason Dillaman <dillaman@redhat.com> 
Patrick Donnelly  [Mon, 2 Apr 2018 15:05:53 +0000  (08:05 -0700)] 
vstart_runner: examine check_status before errorSigned-off-by: Patrick Donnelly <pdonnell@redhat.com> 
Sage Weil  [Mon, 2 Apr 2018 15:03:02 +0000  (10:03 -0500)] 
CMakeLists: v13.0.2Signed-off-by: Sage Weil <sage@redhat.com> 
Kefu Chai  [Mon, 2 Apr 2018 14:10:30 +0000  (22:10 +0800)] 
Merge pull request #21143 from wjwithagen/wjw-ipaddr-ipv6Reviewed-by: Kefu Chai <kchai@redhat.com> 
Kefu Chai  [Mon, 2 Apr 2018 14:08:17 +0000  (22:08 +0800)] 
Merge pull request #21136 from kungf/io_eventsReviewed-by: Dongsheng Yang <dongsheng.yang@easystack.cn> Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn> Reviewed-by: Kefu Chai <kchai@redhat.com> 
Kefu Chai  [Mon, 2 Apr 2018 14:06:49 +0000  (22:06 +0800)] 
Merge pull request #20820 from guzhongyan/nodels-improveReviewed-by: John Spray <john.spray@redhat.com> 
Kefu Chai  [Mon, 2 Apr 2018 14:05:57 +0000  (22:05 +0800)] 
Merge pull request #20298 from markhpc/wip-osd-check_fullReviewed-by: xie xingguo <xie.xingguo@zte.com.cn> Reviewed-by: Kefu Chai <kchai@redhat.com> Reviewed-by: David Zafman <dzafman@redhat.com> 
Ramana Raja  [Thu, 15 Mar 2018 12:47:17 +0000  (18:17 +0530)] 
Add config doc for exporting CephFS over NFSFixes: https://tracker.ceph.com/issues/23271 Signed-off-by: Ramana raja <rraja@redhat.com> 
Kefu Chai  [Mon, 2 Apr 2018 12:00:51 +0000  (20:00 +0800)] 
Merge pull request #21159 from tchaikov/wip-no-more-use-wheelReviewed-by: Nathan Cutler <ncutler@suse.com> 
songweibin  [Mon, 2 Apr 2018 03:31:04 +0000  (11:31 +0800)] 
pybind/rbd: normalize errno exceptionSigned-off-by: songweibin <song.weibin@zte.com.cn> 
songweibin  [Mon, 2 Apr 2018 03:09:26 +0000  (11:09 +0800)] 
librbd: return error when r < 0Signed-off-by: songweibin <song.weibin@zte.com.cn> 
songweibin  [Mon, 2 Apr 2018 01:29:26 +0000  (09:29 +0800)] 
librbd: drop a duplicate definition functionSigned-off-by: songweibin <song.weibin@zte.com.cn> 
Kefu Chai  [Sun, 1 Apr 2018 12:27:24 +0000  (20:27 +0800)] 
src: s/--use-wheel//Signed-off-by: Kefu Chai <kchai@redhat.com> 
Willem Jan Withagen  [Sat, 31 Mar 2018 00:01:01 +0000  (02:01  +0200)] 
tools: FreeBSD basic getopt does not use --optionsSigned-off-by: Willem Jan Withagen <wjw@digiware.nl> 
Patrick Donnelly  [Sat, 31 Mar 2018 05:25:10 +0000  (22:25 -0700)] 
Merge PR #20132 into masterReviewed-by: Patrick Donnelly <pdonnell@redhat.com> 
Kefu Chai  [Sat, 31 Mar 2018 00:59:07 +0000  (08:59 +0800)] 
Merge pull request #21147 from rjfd/wip-dashboard-fix-notification-queue-testReviewed-by: Kefu Chai <kchai@redhat.com> 
Ricardo Dias  [Fri, 30 Mar 2018 22:18:05 +0000  (23:18 +0100)] 
mgr/dashboard: notification queue: fix priority testsSigned-off-by: Ricardo Dias <rdias@suse.com> 
vasukulkarni  [Fri, 30 Mar 2018 19:20:09 +0000  (12:20 -0700)] 
Merge pull request #20979 from ceph/wip-cd-smoke-fix
Vasu Kulkarni  [Fri, 16 Mar 2018 23:25:09 +0000  (16:25 -0700)] 
qa/tests: use stable branch for single node testsSigned-off-by: Vasu Kulkarni <vasu@redhat.com> 
Willem Jan Withagen  [Fri, 30 Mar 2018 14:53:48 +0000  (16:53 +0200)] 
common: FreeBSD wants the correct struct selection for ipv6Fixes: http://tracker.ceph.com/issues/21813 Signed-off-by: Willem Jan Withagen <wjw@digiware.nl> 
Li Wang  [Thu, 7 Dec 2017 14:03:45 +0000  (22:03 +0800)] 
rbd-nbd: fix ebusy when do mapFixes: http://tracker.ceph.com/issues/23528 Signed-off-by: Li Wang <laurence.liwang@gmail.com> 
Julien COLLET  [Tue, 27 Mar 2018 13:53:32 +0000  (15:53 +0200)] 
librbd/cli-integration: Permit V1 image creationSigned-off-by: Julien COLLET <julien.collet@cern.ch> 
Jason Dillaman  [Fri, 30 Mar 2018 12:45:15 +0000  (08:45 -0400)] 
Merge pull request #18317 from hitoshikamei/master-rbdReviewed-by: Jason Dillaman <dillaman@redhat.com> 
Jason Dillaman  [Fri, 30 Mar 2018 12:44:49 +0000  (08:44 -0400)] 
Merge pull request #20868 from shun-s/fix-same-cookieReviewed-by: Jason Dillaman <dillaman@redhat.com> 
Jason Dillaman  [Fri, 30 Mar 2018 12:44:28 +0000  (08:44 -0400)] 
Merge pull request #20935 from trociny/wip-get-nameReviewed-by: Jason Dillaman <dillaman@redhat.com> 
kungf  [Fri, 30 Mar 2018 12:15:42 +0000  (20:15 +0800)] 
os/bluestore: change the type of aio_t:res to longFixes: http://tracker.ceph.com/issues/23527 Signed-off-by: kungf <yang.wang@easystack.cn> 
Kefu Chai  [Fri, 30 Mar 2018 01:45:44 +0000  (09:45 +0800)] 
Merge pull request #21117 from smithfarm/wip-23504Reviewed-by: Brad Hubbard <bhubbard@redhat.com> Reviewed-by: Adam C. Emerson <aemerson@redhat.com> Reviewed-by: Josh Durgin <jdurgin@redhat.com> Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn> Reviewed-by: Kefu Chai <kchai@redhat.com> 
Patrick Donnelly  [Thu, 29 Mar 2018 21:03:36 +0000  (14:03 -0700)] 
Merge PR #20927 into masterReviewed-by: Patrick Donnelly <pdonnell@redhat.com> 
Jason Dillaman  [Thu, 29 Mar 2018 19:45:07 +0000  (15:45 -0400)] 
Merge pull request #21131 from trociny/wip-23502Reviewed-by: Jason Dillaman <dillaman@redhat.com> 
John Wilkins  [Tue, 27 Mar 2018 17:55:13 +0000  (10:55 -0700)] 
doc: EditsSigned-off-by: John Wilkins <jowilkin@redhat.com> 
falcon78921  [Mon, 26 Mar 2018 19:44:11 +0000  (15:44 -0400)] 
doc: Updated add primary storage documentation for latest CloudStack release (4.11)Signed-off-by: James McClune <jmcclune@mcclunetechnologies.net> 
Mark Nelson  [Thu, 29 Mar 2018 17:47:19 +0000  (12:47 -0500)] 
osd/OSD: make dout in _check_full conditionalSigned-off-by: Mark Nelson <mnelson@redhat.com> 
Patrick Donnelly  [Thu, 29 Mar 2018 16:47:59 +0000  (09:47 -0700)] 
Merge PR #20983 into masterReviewed-by: Patrick Donnelly <pdonnell@redhat.com> 
Sébastien Han  [Fri, 23 Jun 2017 13:45:57 +0000  (15:45 +0200)] 
ceph_authtool: add mode optionCloses: http://tracker.ceph.com/issues/23513 Signed-off-by: Sébastien Han <seb@redhat.com> 
Mykola Golub  [Thu, 29 Mar 2018 11:10:58 +0000  (14:10 +0300)] 
qa/suites/rbd: set qemu task time_wait paramFixes: https://tracker.ceph.com/issues/23502 Signed-off-by: Mykola Golub <mgolub@suse.com> 
Mykola Golub  [Thu, 29 Mar 2018 11:06:13 +0000  (14:06 +0300)] 
qa/tasks/qemu: add a parameter to wait for workloads detect qemu finishedSigned-off-by: Mykola Golub <mgolub@suse.com> 
Yuri Weinstein  [Sun, 25 Mar 2018 00:42:36 +0000  (17:42 -0700)] 
test:qa:infra - teuthology crontab items as of 3/27/18Signed-off-by: Yuri Weinstein <yweinste@redhat.com> 
Kefu Chai  [Thu, 29 Mar 2018 13:21:49 +0000  (21:21 +0800)] 
Merge pull request #21121 from tchaikov/wip-no-relicensingReviewed-by: Haomai Wang <haomai@xsky.com> 
Casey Bodley  [Thu, 29 Mar 2018 13:19:22 +0000  (09:19 -0400)] 
Merge pull request #21105 from ashitakasam/wip-bugReviewed-by: Casey Bodley <cbodley@redhat.com> 
Jason Dillaman  [Thu, 29 Mar 2018 12:18:32 +0000  (08:18 -0400)] 
Merge pull request #21074 from trociny/wip-librados_test_stub-appendReviewed-by: Jason Dillaman <dillaman@redhat.com> 
Jason Dillaman  [Thu, 29 Mar 2018 12:17:51 +0000  (08:17 -0400)] 
Merge pull request #21116 from trociny/wip-23499Reviewed-by: Jason Dillaman <dillaman@redhat.com> 
Kefu Chai  [Thu, 29 Mar 2018 11:33:44 +0000  (19:33 +0800)] 
msg/async/dpdk: remove xsky copyright and LGPL copyingSigned-off-by: Kefu Chai <kchai@redhat.com> 
Kefu Chai  [Thu, 29 Mar 2018 10:54:56 +0000  (18:54 +0800)] 
Merge pull request #21107 from tchaikov/wip-pg-stat-cap-trimqReviewed-by: xie xingguo <xie.xingguo@zte.com.cn> 
Kefu Chai  [Thu, 29 Mar 2018 10:54:22 +0000  (18:54 +0800)] 
Merge pull request #21106 from tchaikov/wip-compressor-zstdReviewed-by: xie xingguo <xie.xingguo@zte.com.cn> Reviewed-by: Ricardo Dias <rdias@suse.com> 
Kefu Chai  [Thu, 29 Mar 2018 10:53:07 +0000  (18:53 +0800)] 
Merge pull request #21097 from ceph/wip-ifed-fix-reclaim-cap-bugReviewed-by: Kefu Chai <kchai@redhat.com> 
Kefu Chai  [Thu, 29 Mar 2018 10:44:39 +0000  (18:44 +0800)] 
Merge pull request #20556 from yanghonggang/masterReviewed-by: Casey Bodley <cbodley@redhat.com>