]> git.apps.os.sepia.ceph.com Git - ceph.git/log
ceph.git
7 years agoradosgw: fix awsv4 header line sort order. 18046/head
Marcus Watts [Fri, 29 Sep 2017 21:04:08 +0000 (17:04 -0400)]
radosgw: fix awsv4 header line sort order.

The awsv4 signature calculation includes a list of header lines, which
are supposed to be sorted.  The existing code sorts by header name, but
it appears that in fact it is necessary to sort the whole header *line*,
not just the field name.  Sorting by just the field name usually works,
but not always.  The s3-tests teuthology suite includes
s3tests.functional.test_s3.test_object_header_acl_grants
s3tests.functional.test_s3.test_bucket_header_acl_grants
which include the following header lines,

x-amz-grant-read-acp:id=56789abcdef0123456789abcdef0123456789abcdef0123456789abcdef01234
x-amz-grant-read:id=56789abcdef0123456789abcdef0123456789abcdef0123456789abcdef01234
x-amz-grant-write-acp:id=56789abcdef0123456789abcdef0123456789abcdef0123456789abcdef01234
x-amz-grant-write:id=56789abcdef0123456789abcdef0123456789abcdef0123456789abcdef01234

in this case, note that ':' needs to sort after '-'.

Fixes: http://tracker.ceph.com/issues/21607
Signed-off-by: Marcus Watts <mwatts@redhat.com>
7 years agoMerge pull request #17839 from liewegas/wip-recovery-preemption
Sage Weil [Thu, 28 Sep 2017 19:14:01 +0000 (14:14 -0500)]
Merge pull request #17839 from liewegas/wip-recovery-preemption

osd: allow PG recovery scheduling preemption

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
7 years agoqa/suites/rados/singleton/all/recovery-preemption: add test 17839/head
Sage Weil [Wed, 27 Sep 2017 21:42:07 +0000 (17:42 -0400)]
qa/suites/rados/singleton/all/recovery-preemption: add test

This mirrors what I was testing locally.

Signed-off-by: Sage Weil <sage@redhat.com>
7 years agoMerge pull request #18014 from theanalyst/doc-12.2.1
Sage Weil [Thu, 28 Sep 2017 17:06:15 +0000 (12:06 -0500)]
Merge pull request #18014 from theanalyst/doc-12.2.1

doc: 12.2.1 release notes

7 years agoMerge pull request #17973 from ligne/patch-1
Jos Collin [Thu, 28 Sep 2017 15:55:09 +0000 (15:55 +0000)]
Merge pull request #17973 from ligne/patch-1

doc: Fix typos in placement-groups.rst

Reviewed-by: Jos Collin <jcollin@redhat.com>
7 years agodoc: add 12.2.1 to releases table 18014/head
Abhishek Lekshmanan [Thu, 28 Sep 2017 13:02:35 +0000 (15:02 +0200)]
doc: add 12.2.1 to releases table

Signed-off-by: Abhishek Lekshmanan <alekshmanan@suse.com>
7 years agodoc: 12.2.1 release notes
Abhishek Lekshmanan [Thu, 28 Sep 2017 07:38:54 +0000 (09:38 +0200)]
doc: 12.2.1 release notes

Signed-off-by: Abhishek Lekshmanan <alekshmanan@suse.com>
7 years agoMerge pull request #18000 from adamemerson/wip-21578
Matt Benjamin [Thu, 28 Sep 2017 15:20:31 +0000 (11:20 -0400)]
Merge pull request #18000 from adamemerson/wip-21578

rgw: Check bucket CORS operations in policy

7 years agoMerge pull request #17684 from majianpeng/bluefs-release-extents
Sage Weil [Thu, 28 Sep 2017 14:42:39 +0000 (09:42 -0500)]
Merge pull request #17684 from majianpeng/bluefs-release-extents

os/bluestore/BlueFS: move release unused extents work in _flush_and_syn_log

Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
Reviewed-by: Sage Weil <sage@redhat.com>
7 years agoMerge pull request #18020 from theanalyst/doc-changelog-12.2.1
Sage Weil [Thu, 28 Sep 2017 13:56:12 +0000 (08:56 -0500)]
Merge pull request #18020 from theanalyst/doc-changelog-12.2.1

doc: add changelog for 12.2.1

Reviewed-by: Sage Weil <sage@redhat.com>
7 years agodoc: add changelog for 12.2.1 18020/head
Abhishek Lekshmanan [Thu, 28 Sep 2017 13:53:35 +0000 (15:53 +0200)]
doc: add changelog for 12.2.1

Signed-off-by: Abhishek Lekshmanan <alekshmanan@suse.com>
7 years agoMerge pull request #17769 from optimistyzy/97_new_opt
Sage Weil [Thu, 28 Sep 2017 13:30:44 +0000 (08:30 -0500)]
Merge pull request #17769 from optimistyzy/97_new_opt

os/bluestore/NVMEDevice: Remove using dpdk thread

Reviewed-by: Haomai Wang <haomai@xsky.com>
7 years agoMerge pull request #18001 from liewegas/wip-21417
Sage Weil [Thu, 28 Sep 2017 13:30:11 +0000 (08:30 -0500)]
Merge pull request #18001 from liewegas/wip-21417

os/bluestore: put cached attrs in correct mempool

Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
Reviewed-by: Varada Kari <varada.kari@gmail.com>
7 years agoMerge pull request #17755 from dillaman/wip-21353
Abhishek L [Thu, 28 Sep 2017 12:56:20 +0000 (14:56 +0200)]
Merge pull request #17755 from dillaman/wip-21353

doc/release-notes: ensure RBD users can blacklist prior to upgrade

Reviewed-By: Nathan Cutler <ncutler@suse.com>
7 years agoos/bluestore: move several buffer{ptr,list}s into cache_other mempool 18001/head
Sage Weil [Thu, 28 Sep 2017 12:02:50 +0000 (08:02 -0400)]
os/bluestore: move several buffer{ptr,list}s into cache_other mempool

Signed-off-by: Sage Weil <sage@redhat.com>
7 years agoos/bluestore: put new attrs in correct mempool too
Sage Weil [Thu, 28 Sep 2017 12:14:37 +0000 (08:14 -0400)]
os/bluestore: put new attrs in correct mempool too

Signed-off-by: Sage Weil <sage@redhat.com>
7 years agoMerge pull request #17966 from xiexingguo/wip-bluefs-kill-block-total
Xie Xingguo [Thu, 28 Sep 2017 11:04:31 +0000 (19:04 +0800)]
Merge pull request #17966 from xiexingguo/wip-bluefs-kill-block-total

os/bluestore/BlueFS: several cleanups

Reviewed-by: Sage Weil <sage@redhat.com>
7 years agoMerge pull request #18013 from tchaikov/wip-dashboard-favicon
John Spray [Thu, 28 Sep 2017 08:32:17 +0000 (09:32 +0100)]
Merge pull request #18013 from tchaikov/wip-dashboard-favicon

mgr/dashboard: use rel="icon" for favicon

Reviewed-by: John Spray <john.spray@redhat.com>
7 years agoMerge pull request #17993 from jcsp/wip-21572
Kefu Chai [Thu, 28 Sep 2017 06:38:26 +0000 (14:38 +0800)]
Merge pull request #17993 from jcsp/wip-21572

mgr/dashboard: sort servers and OSDs in OSD list

Reviewed-by: Kefu Chai <kchai@redhat.com>
7 years agoMerge pull request #17937 from tchaikov/wip-automake-cleanup
Kefu Chai [Thu, 28 Sep 2017 06:05:16 +0000 (14:05 +0800)]
Merge pull request #17937 from tchaikov/wip-automake-cleanup

automake: remove files required by automake

Reviewed-by: Gregory Farnum <gfarnum@redhat.com>
7 years agomgr/dashboard: use rel="icon" for favicon 18013/head
Kefu Chai [Thu, 28 Sep 2017 05:46:31 +0000 (13:46 +0800)]
mgr/dashboard: use rel="icon" for favicon

shortcut is not a standard compliant link type, see
https://www.w3.org/TR/html5/links.html#linkTypes.

Signed-off-by: Kefu Chai <kchai@redhat.com>
7 years agoMerge pull request #17991 from jcsp/wip-21570
Kefu Chai [Thu, 28 Sep 2017 05:22:22 +0000 (13:22 +0800)]
Merge pull request #17991 from jcsp/wip-21570

mgr/dashboard: handle null in format_number

Reviewed-by: Kefu Chai <kchai@redhat.com>
7 years agoMerge pull request #17986 from tchaikov/wip-doc-rgw-config
Kefu Chai [Thu, 28 Sep 2017 01:57:07 +0000 (09:57 +0800)]
Merge pull request #17986 from tchaikov/wip-doc-rgw-config

doc: fix hyper link to radosgw/config-ref

Reviewed-by: Casey Bodley <cbodley@redhat.com>
7 years agoMerge pull request #17926 from batrick/ptl-tool
Yuri Weinstein [Wed, 27 Sep 2017 22:06:10 +0000 (15:06 -0700)]
Merge pull request #17926 from batrick/ptl-tool

scripts: add ptl-tool for scripting merges

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Reviewed-by: Yuri Weinstein <yweins@redhat.com>
7 years agoos/bluestore: put attrs in mempool
Sage Weil [Fri, 22 Sep 2017 12:09:37 +0000 (08:09 -0400)]
os/bluestore: put attrs in mempool

Signed-off-by: Sage Weil <sage@redhat.com>
7 years agobuffer: add ptr::[try_]reassign_to_mempool
Sage Weil [Fri, 22 Sep 2017 12:08:52 +0000 (08:08 -0400)]
buffer: add ptr::[try_]reassign_to_mempool

Signed-off-by: Sage Weil <sage@redhat.com>
7 years agorgw: Check bucket CORS operations in policy 18000/head
Adam C. Emerson [Wed, 27 Sep 2017 19:42:27 +0000 (15:42 -0400)]
rgw: Check bucket CORS operations in policy

Add code to check s3:GetCORS and s3:PutCORS operations against bucket
policy.

Fixes: http://tracker.ceph.com/issues/21578
Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1494140
Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
7 years agoosd/PG: handle racy preemption
Sage Weil [Thu, 21 Sep 2017 16:37:13 +0000 (12:37 -0400)]
osd/PG: handle racy preemption

If we finish recovery/backfill and go active, but also get
preempted at the same time, we can ignore the event.

Signed-off-by: Sage Weil <sage@redhat.com>
7 years agoosd/PG: allow local recovery reservations to be preempted
Sage Weil [Tue, 19 Sep 2017 20:26:40 +0000 (15:26 -0500)]
osd/PG: allow local recovery reservations to be preempted

If a PG has a higher recovery priority and a lower-priority item is in
progress, allow it to be preempted.  This triggers the RecoveryCancel
or BackfillCancel event with a 0 delay, which means it will immediately
re-request a reservation (and presumably wait).

Signed-off-by: Sage Weil <sage@redhat.com>
7 years agocommon/AsyncReserver: support preemption
Sage Weil [Tue, 19 Sep 2017 20:25:05 +0000 (15:25 -0500)]
common/AsyncReserver: support preemption

If an (optional) preemption context is provided, use that to preempt
and existing reservation and grant a higher-priority one.

Signed-off-by: Sage Weil <sage@redhat.com>
7 years agoMerge pull request #17978 from alram/rbdmap-fix
Sage Weil [Wed, 27 Sep 2017 17:57:33 +0000 (12:57 -0500)]
Merge pull request #17978 from alram/rbdmap-fix

rbdmap: fix umount when multiple mounts use the same RBD

Reviewed-by: Dan Mick <dmick@redhat.com>
Reviewed-by: Sage Weil <sage@redhat.com>
7 years agoMerge pull request #17962 from joscollin/wip-test-signed-unsigned-warning
Casey Bodley [Wed, 27 Sep 2017 14:26:49 +0000 (10:26 -0400)]
Merge pull request #17962 from joscollin/wip-test-signed-unsigned-warning

test: silence warnings from -Wsign-compare

Reviewed-by: Amit Kumar <amitkuma@redhat.com>
Reviewed-by: Casey Bodley <cbodley@redhat.com>
7 years agomgr/dashboard: sort servers and OSDs in OSD list 17993/head
John Spray [Wed, 27 Sep 2017 14:13:48 +0000 (15:13 +0100)]
mgr/dashboard: sort servers and OSDs in OSD list

Fixes: http://tracker.ceph.com/issues/21572
Signed-off-by: John Spray <john.spray@redhat.com>
7 years agomgr/dashboard: handle null in format_number 17991/head
John Spray [Wed, 27 Sep 2017 13:33:58 +0000 (14:33 +0100)]
mgr/dashboard: handle null in format_number

Fixes: http://tracker.ceph.com/issues/21570
Signed-off-by: John Spray <john.spray@redhat.com>
7 years agomgr/dashboard: remove ceph.com ref to favicon
John Spray [Wed, 27 Sep 2017 13:30:07 +0000 (14:30 +0100)]
mgr/dashboard: remove ceph.com ref to favicon

We have a local copy referenced in the very next line.

Signed-off-by: John Spray <john.spray@redhat.com>
7 years agodoc: Fix typos in placement-groups.rst 17973/head
Matt Boyle [Wed, 27 Sep 2017 10:11:23 +0000 (11:11 +0100)]
doc: Fix typos in placement-groups.rst

Signed-off-by: Matt Boyle <matt.boyle@gmail.com>
7 years agoMerge pull request #17988 from wumingqiao/wip-rados-update
Jos Collin [Wed, 27 Sep 2017 09:07:29 +0000 (09:07 +0000)]
Merge pull request #17988 from wumingqiao/wip-rados-update

include/rados: fix typo in librados.h

Reviewed-by: Jos Collin <jcollin@redhat.com>
7 years agoinclude/rados: fix typo in librados.h 17988/head
wumingqiao [Wed, 27 Sep 2017 08:31:14 +0000 (16:31 +0800)]
include/rados: fix typo in librados.h

opeprate -> operate

Signed-off-by: wumingqiao <wumingqiao@inspur.com>
7 years agodoc: fix hyper link to radosgw/config-ref 17986/head
Kefu Chai [Wed, 27 Sep 2017 03:13:33 +0000 (11:13 +0800)]
doc: fix hyper link to radosgw/config-ref

Signed-off-by: Kefu Chai <kchai@redhat.com>
7 years agorbdmap: fix umount when multiple mounts use the same RBD 17978/head
Alexandre Marangone [Tue, 26 Sep 2017 18:35:04 +0000 (11:35 -0700)]
rbdmap: fix umount when multiple mounts use the same RBD

When a Kubernetes Pod consumes a RBD it is mounted two
times on the same host. When the host shutdown umount will
fail leading to a hung system

Signed-off-by: Alexandre Marangone <amarango@redhat.com>
7 years agoMerge pull request #17063 from bspark8/wip-dynamic-cli-info-f
Yuri Weinstein [Tue, 26 Sep 2017 23:02:19 +0000 (16:02 -0700)]
Merge pull request #17063 from bspark8/wip-dynamic-cli-info-f

osd: use dmclock library client_info_f function dynamically

Reviewed-by: J. Eric Ivancich <ivancich@redhat.com>
7 years agoMerge pull request #17335 from Carudy/cxw
Yuri Weinstein [Tue, 26 Sep 2017 23:01:14 +0000 (16:01 -0700)]
Merge pull request #17335 from Carudy/cxw

crush: safe check for 'ceph osd crush swap-bucket'

Reviewed-by: Kefu Chai <kchai@redhat.com>
7 years agoMerge pull request #17410 from zmedico/PGPool-update-optimize-removed_snaps-compariso...
Yuri Weinstein [Tue, 26 Sep 2017 22:59:59 +0000 (15:59 -0700)]
Merge pull request #17410 from zmedico/PGPool-update-optimize-removed_snaps-comparison-when-possible

PGPool::update: optimize removed_snaps comparison when possible

Reviewed-by: Gregory Farnum <gfarnum@redhat.com>
7 years agoMerge pull request #17980 from liewegas/wip-boost-url
Sage Weil [Tue, 26 Sep 2017 22:07:03 +0000 (17:07 -0500)]
Merge pull request #17980 from liewegas/wip-boost-url

make-dist,cmake: move boost tarball location to download.ceph.com

Reviewed-by: Jeff Layton <jlayton@redhat.com>
7 years agomake-dist,cmake: move boost tarball location to download.ceph.com 17980/head
Sage Weil [Tue, 26 Sep 2017 21:15:17 +0000 (17:15 -0400)]
make-dist,cmake: move boost tarball location to download.ceph.com

Sourceforge is down.  Also, we can hammer our servers instead of
theirs.

Signed-off-by: Sage Weil <sage@redhat.com>
7 years agoMerge pull request #17589 from myENA/feature/20883-adminapi_sync_stats_master
Matt Benjamin [Tue, 26 Sep 2017 16:45:24 +0000 (12:45 -0400)]
Merge pull request #17589 from myENA/feature/20883-adminapi_sync_stats_master

rgw: admin api - add ability to sync user stats from admin api

7 years agoMerge pull request #17433 from C2python/check_action
Matt Benjamin [Tue, 26 Sep 2017 16:40:08 +0000 (12:40 -0400)]
Merge pull request #17433 from C2python/check_action

rgw: Return Error if Bucket Policy Contians Undefined Action

7 years agoMerge pull request #17969 from ceph/rbd-mirror-reboot
Jason Dillaman [Tue, 26 Sep 2017 16:10:16 +0000 (12:10 -0400)]
Merge pull request #17969 from ceph/rbd-mirror-reboot

systemd: rbd-mirror does not start on reboot

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
7 years agoos/bluestore/BlueFS: check device id before using hint 17966/head
xie xingguo [Tue, 26 Sep 2017 11:35:10 +0000 (19:35 +0800)]
os/bluestore/BlueFS: check device id before using hint

As we might be allocating space from different devices (though
the chance is rare).

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
7 years agoos/bluestore/BlueFS: drop redundant merge logic of pextents
xie xingguo [Tue, 26 Sep 2017 11:28:04 +0000 (19:28 +0800)]
os/bluestore/BlueFS: drop redundant merge logic of pextents

As Allocator will handle it automatically and efficiently!

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
7 years agoos/bluestore/BlueFS: kill block_total
xie xingguo [Tue, 26 Sep 2017 08:52:08 +0000 (16:52 +0800)]
os/bluestore/BlueFS: kill block_total

As block_all will suffice for the same purpose.

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
7 years agoMerge pull request #17929 from renhwztetecs/renhw-wip-mgrmon-command_descs_prefix
Sage Weil [Tue, 26 Sep 2017 13:38:14 +0000 (08:38 -0500)]
Merge pull request #17929 from renhwztetecs/renhw-wip-mgrmon-command_descs_prefix

mon/mgr: sync "mgr_command_descs","osd_metadata" and "mgr_metadata" prefixes to new mons

Reviewed-by: Kefu Chai <kchai@redhat.com>
7 years agoMerge pull request #17932 from jcsp/wip-21197
Sage Weil [Tue, 26 Sep 2017 13:36:24 +0000 (08:36 -0500)]
Merge pull request #17932 from jcsp/wip-21197

mgr: store declared_types in MgrSession

Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Sage Weil <sage@redhat.com>
7 years agoMerge pull request #17933 from jcsp/wip-17737
Sage Weil [Tue, 26 Sep 2017 13:35:52 +0000 (08:35 -0500)]
Merge pull request #17933 from jcsp/wip-17737

mgr: fix crashable DaemonStateIndex::get calls

Reviewed-by: Kefu Chai <kchai@redhat.com>
7 years agoMerge pull request #17944 from thmour/tmour_upmap
Sage Weil [Tue, 26 Sep 2017 13:35:07 +0000 (08:35 -0500)]
Merge pull request #17944 from thmour/tmour_upmap

osd/OSDMap: upmap should respect the osd reweights

Reviewed-by: Sage Weil <sage@redhat.com>
7 years agoMerge pull request #17880 from amitkumar50/cov-rgw-9
Matt Benjamin [Tue, 26 Sep 2017 12:29:09 +0000 (08:29 -0400)]
Merge pull request #17880 from amitkumar50/cov-rgw-9

rgw: Error check on return of read_line()

7 years agorbd-mirorr: does not start on reboot 17969/head
Sébastien Han [Tue, 26 Sep 2017 12:05:37 +0000 (14:05 +0200)]
rbd-mirorr: does not start on reboot

The current systemd unit file misses 'PartOf=ceph-rbd-mirror.target',
which results in the unit not starting after reboot.
If you have ceph-rbd-mirror@rbd-mirror.ceph-rbd-mirror0, it won't start
after reboot even if enabled.
Adding 'PartOf=ceph-rbd-mirror.target' will enable
ceph-rbd-mirror.target when ceph-rbd-mirror@rbd-mirror.ceph-rbd-mirror0
gets enabled.

Signed-off-by: Sébastien Han <seb@redhat.com>
7 years agoMerge pull request #17961 from tchaikov/wip-doc-local-pool-in-toc
John Spray [Tue, 26 Sep 2017 10:31:09 +0000 (11:31 +0100)]
Merge pull request #17961 from tchaikov/wip-doc-local-pool-in-toc

doc/mgr: add "local pool" plugin to toc

Reviewed-by: John Spray <john.spray@redhat.com>
7 years agoMerge pull request #17949 from asomers/nproc_freebsd
Kefu Chai [Tue, 26 Sep 2017 09:45:56 +0000 (17:45 +0800)]
Merge pull request #17949 from asomers/nproc_freebsd

do_{cmake,freebsd}: Don't invoke nproc(1) on FreeBSD

Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Willem Jan Withagen <wjw@digiware.nl>
Reviewed-by: Kefu Chai <kchai@redhat.com>
7 years agoMerge pull request #17940 from jcsp/wip-21534
Kefu Chai [Tue, 26 Sep 2017 09:09:54 +0000 (17:09 +0800)]
Merge pull request #17940 from jcsp/wip-21534

mon: update get_store_prefixes implementations

Reviewed-by: Joao Eduardo Luis <joao@suse.de>
Reviewed-by: Kefu Chai <kchai@redhat.com>
7 years agotest: silence warnings from -Wsign-compare 17962/head
Jos Collin [Tue, 26 Sep 2017 04:54:08 +0000 (10:24 +0530)]
test: silence warnings from -Wsign-compare

Fixed the warnings:

ceph/src/test/bufferlist.cc:2150:3:   required from here
ceph/src/googletest/googletest/include/gtest/gtest.h:1392:11: warning: comparison between signed and unsigned integer expressions [-Wsign-compare]
   if (lhs == rhs) {

ceph/src/test/bufferlist.cc:2151:3:   required from here
ceph/src/googletest/googletest/include/gtest/gtest.h:1392:11: warning: comparison between signed and unsigned integer expressions [-Wsign-compare]
   if (lhs == rhs) {

Signed-off-by: Jos Collin <jcollin@redhat.com>
7 years agodoc/mgr: add "local pool" plugin to toc 17961/head
Kefu Chai [Tue, 26 Sep 2017 04:10:28 +0000 (12:10 +0800)]
doc/mgr: add "local pool" plugin to toc

Signed-off-by: Kefu Chai <kchai@redhat.com>
7 years agoautomake: remove files required by automake 17937/head
Kefu Chai [Mon, 25 Sep 2017 04:29:59 +0000 (12:29 +0800)]
automake: remove files required by automake

INSTALL, NEWS, README, AUTHORS, and ChangeLog are required by automake,
since we've switched to cmake, remove the empty ones.

Signed-off-by: Kefu Chai <kchai@redhat.com>
7 years agoMerge pull request #17842 from MahatiC/fix_example
Kefu Chai [Tue, 26 Sep 2017 03:15:14 +0000 (11:15 +0800)]
Merge pull request #17842 from MahatiC/fix_example

examples: fix link order in librados example Makefile

Reviewed-by: Kefu Chai <kchai@redhat.com>
7 years agoMerge pull request #17633 from yonghengdexin735/wip-zzz-doc
Jason Dillaman [Tue, 26 Sep 2017 01:40:32 +0000 (21:40 -0400)]
Merge pull request #17633 from yonghengdexin735/wip-zzz-doc

doc/rbd: add info for rbd group

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
7 years agoMerge pull request #17803 from amitkumar50/cov-librbd-5
Jason Dillaman [Tue, 26 Sep 2017 01:33:36 +0000 (21:33 -0400)]
Merge pull request #17803 from amitkumar50/cov-librbd-5

test: address coverity false positives

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
7 years agoMerge pull request #17800 from amitkumar50/cov-misc-8
Jason Dillaman [Tue, 26 Sep 2017 01:31:58 +0000 (21:31 -0400)]
Merge pull request #17800 from amitkumar50/cov-misc-8

test/librbd: initialize on_finish,locker,force,snap_id

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
7 years agodo_{cmake,freebsd}: Don't invoke nproc(1) on FreeBSD 17949/head
Alan Somers [Mon, 25 Sep 2017 21:01:49 +0000 (15:01 -0600)]
do_{cmake,freebsd}: Don't invoke nproc(1) on FreeBSD

Use sysctl(8) instead.  Also, there's no longer any need for /bin/bash
on FreeBSD.

Signed-off-by: Alan Somers <asomers@gmail.com>
7 years agoMerge pull request #17813 from liewegas/wip-21410-note
Sage Weil [Mon, 25 Sep 2017 21:36:36 +0000 (16:36 -0500)]
Merge pull request #17813 from liewegas/wip-21410-note

PendingReleaseNotes: note about upmap mapping change in luminous release notes

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
7 years agoPendingReleaseNotes: note about upmap mapping change in luminous release notes 17813/head
Sage Weil [Tue, 19 Sep 2017 17:51:13 +0000 (12:51 -0500)]
PendingReleaseNotes: note about upmap mapping change in luminous release notes

Signed-off-by: Sage Weil <sage@redhat.com>
7 years agoMerge pull request #17809 from yaozongyou/fix-rgw-file-write-error
Matt Benjamin [Mon, 25 Sep 2017 18:45:57 +0000 (14:45 -0400)]
Merge pull request #17809 from yaozongyou/fix-rgw-file-write-error

rgw_file: fix write error when the write offset overlaps

7 years agoMerge pull request #17947 from batrick/ceph-osd-core-dbg
Sage Weil [Mon, 25 Sep 2017 18:37:22 +0000 (13:37 -0500)]
Merge pull request #17947 from batrick/ceph-osd-core-dbg

ceph-debug-docker.sh: add ceph-osd-dbg package

Reviewed-by: Sage Weil <sage@redhat.com>
7 years agoceph-debug-docker.sh: add ceph-osd-dbg package 17947/head
Patrick Donnelly [Mon, 25 Sep 2017 18:28:47 +0000 (11:28 -0700)]
ceph-debug-docker.sh: add ceph-osd-dbg package

So we can debug ceph-osd cores.

Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
7 years agoosd: upmap should respect osd reweights 17944/head
Theofilos Mouratidis [Mon, 25 Sep 2017 14:17:47 +0000 (16:17 +0200)]
osd: upmap should respect osd reweights

Modify OSDMap::calc_pg_upmaps to take the osd reweight into account when
computing the size of each OSD.

Signed-off-by: Theofilos Mouratidis <t.mour@cern.ch>
Fixes: http://tracker.ceph.com/issues/21538
7 years agotest/cli/osdmaptool: test upmap with an out osd
Theofilos Mouratidis [Mon, 25 Sep 2017 14:15:45 +0000 (16:15 +0200)]
test/cli/osdmaptool: test upmap with an out osd

Test upmap with one osd marked out.

Signed-off-by: Theofilos Mouratidis <t.mour@cern.ch>
7 years agoMerge pull request #17810 from hjwsm1989/wip-21294
Sage Weil [Mon, 25 Sep 2017 17:33:34 +0000 (12:33 -0500)]
Merge pull request #17810 from hjwsm1989/wip-21294

qa/ceph_manager: check pg state again before timedout

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
7 years agoMerge pull request #17661 from yunfeiguan/master
Sage Weil [Mon, 25 Sep 2017 17:33:18 +0000 (12:33 -0500)]
Merge pull request #17661 from yunfeiguan/master

librados: Fix a potential risk of buffer::list::claim_prepend(list& b…

Reviewed-by: Kefu Chai <kchai@redhat.com>
7 years agoMerge pull request #17790 from joscollin/wip-test-warning-signed-unsigned
Sage Weil [Mon, 25 Sep 2017 17:32:53 +0000 (12:32 -0500)]
Merge pull request #17790 from joscollin/wip-test-warning-signed-unsigned

test: silence warning from -Wsign-compare

Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
7 years agoMerge pull request #17928 from xiexingguo/wip-more-interval-set-size
Sage Weil [Mon, 25 Sep 2017 17:32:29 +0000 (12:32 -0500)]
Merge pull request #17928 from xiexingguo/wip-more-interval-set-size

osd/PrimaryLogPG: calc clone_overlap size in a more efficient and concise way

Reviewed-by: Sage Weil <sage@redhat.com>
7 years agoMerge pull request #17528 from liewegas/wip-mgr-localpool
Sage Weil [Mon, 25 Sep 2017 17:30:05 +0000 (12:30 -0500)]
Merge pull request #17528 from liewegas/wip-mgr-localpool

pybind/mgr/localpool: module to automagically create localized pools

Reviewed-by: John Spray <john.spray@redhat.com>
7 years agoqa/workunits/mgr/test_localpool: simple test for localpool mode 17528/head
Sage Weil [Sun, 24 Sep 2017 18:05:14 +0000 (14:05 -0400)]
qa/workunits/mgr/test_localpool: simple test for localpool mode

Signed-off-by: Sage Weil <sage@redhat.com>
7 years agoosdmaptool: add --mark-out option
Theofilos Mouratidis [Mon, 25 Sep 2017 14:14:09 +0000 (16:14 +0200)]
osdmaptool: add --mark-out option

Add a --mark-down <id> option which sets the reweight for a given
osd id to 0.0.

Signed-off-by: Theofilos Mouratidis <t.mour@cern.ch>
7 years agoexamples: fix link order in librados example Makefile 17842/head
Mahati Chamarthy [Wed, 20 Sep 2017 14:09:55 +0000 (19:39 +0530)]
examples: fix link order in librados example Makefile

The library link order in librados example Makefile is incorrect
and as a result 'make' throws an error. This change fixes the order.

Signed-off-by: Mahati Chamarthy <mahati.chamarthy@intel.com>
7 years agomon/mgr: sync mgr_command_descs table and mgr_metadata table 17929/head
huanwen ren [Mon, 25 Sep 2017 07:01:02 +0000 (15:01 +0800)]
mon/mgr: sync mgr_command_descs table and mgr_metadata table

sync mgr_command_descs table and mgr_metadata table to new mons

Fixes: http://tracker.ceph.com/issues/21527
Signed-off-by: huanwen ren <ren.huanwen@zte.com.cn>
7 years agomon/osd_metadata: sync osd_metadata table
huanwen ren [Mon, 25 Sep 2017 06:55:55 +0000 (14:55 +0800)]
mon/osd_metadata: sync osd_metadata table

sync osd_metadata table to new mons when add new mons

Signed-off-by: huanwen ren <ren.huanwen@zte.com.cn>
7 years agomgr: fix crashable DaemonStateIndex::get calls 17933/head
John Spray [Sat, 23 Sep 2017 17:21:47 +0000 (13:21 -0400)]
mgr: fix crashable DaemonStateIndex::get calls

This function was recently fixed to return null
on missing entries: handle that properly.

Fixes: http://tracker.ceph.com/issues/17737
Signed-off-by: John Spray <john.spray@redhat.com>
7 years agomon: implement MDSMonitor::get_store_prefixes 17940/head
John Spray [Mon, 25 Sep 2017 09:44:28 +0000 (10:44 +0100)]
mon: implement MDSMonitor::get_store_prefixes

Fixes: http://tracker.ceph.com/issues/21534
Signed-off-by: John Spray <john.spray@redhat.com>
7 years agomon/OSDMonitor: tidy prefix definitions
John Spray [Mon, 25 Sep 2017 09:37:18 +0000 (10:37 +0100)]
mon/OSDMonitor: tidy prefix definitions

We should define them in one place to make it easy
when updating get_store_prefixes.

Fixes: http://tracker.ceph.com/issues/21534
Signed-off-by: John Spray <john.spray@redhat.com>
7 years agomon/osd_metadata: sync osd_metadata table
huanwen ren [Mon, 25 Sep 2017 06:55:55 +0000 (14:55 +0800)]
mon/osd_metadata: sync osd_metadata table

sync osd_metadata table to new mons when add new mons

Signed-off-by: huanwen ren <ren.huanwen@zte.com.cn>
7 years agoMerge pull request #17831 from badone/wip-require-osd-release-with-no-up-osds
Sage Weil [Mon, 25 Sep 2017 02:18:51 +0000 (21:18 -0500)]
Merge pull request #17831 from badone/wip-require-osd-release-with-no-up-osds

mon: osd feature checks with 0 up osds

Reviewed-by: Sage Weil <sage@redhat.com>
7 years agoMerge pull request #17848 from liewegas/wip-ruleset-errors
Sage Weil [Mon, 25 Sep 2017 02:15:42 +0000 (21:15 -0500)]
Merge pull request #17848 from liewegas/wip-ruleset-errors

mon/OSDMonitor: error out if setting ruleset-* ec profile property

Reviewed-by: Joao Eduardo Luis <joao@suse.de>
7 years agoMerge pull request #17902 from tchaikov/wip-21474
Sage Weil [Mon, 25 Sep 2017 02:14:58 +0000 (21:14 -0500)]
Merge pull request #17902 from tchaikov/wip-21474

qa/tasks: prolong revive_osd() timeout to 6 min

Reviewed-by: Sage Weil <sage@redhat.com>
7 years agoMerge pull request #17903 from lixiaoy1/add_func_log
Sage Weil [Mon, 25 Sep 2017 02:14:35 +0000 (21:14 -0500)]
Merge pull request #17903 from lixiaoy1/add_func_log

os/bluestore: Add missing __func__ in dout

Reviewed-by: Jos Collin <jcollin@redhat.com>
7 years agoMerge pull request #17905 from tchaikov/wip-osd_types-cleanup
Sage Weil [Mon, 25 Sep 2017 02:14:09 +0000 (21:14 -0500)]
Merge pull request #17905 from tchaikov/wip-osd_types-cleanup

osd/osd_types: object_info_t: remove unused function

Reviewed-by: Amit Kumar <amitkuma@redhat.com>
Reviewed-by: Sage Weil <sage@redhat.com>
7 years agoMerge pull request #17927 from liewegas/wip-21511
Sage Weil [Mon, 25 Sep 2017 02:13:03 +0000 (21:13 -0500)]
Merge pull request #17927 from liewegas/wip-21511

qa/standalone/scrub/osd-scrub-snaps: adjust test for lack of snapdir objects

Reviewed-by: David Zafman <dzafman@redhat.com>
7 years agoMerge PR #17919 into master
Patrick Donnelly [Mon, 25 Sep 2017 00:07:34 +0000 (17:07 -0700)]
Merge PR #17919 into master

* refs/remotes/upstream/pull/17919/head:
qa: whitelist cache too large in client-limits

Reviewed-by: Zheng Yan <zyan@redhat.com>
7 years agoMerge PR #17918 into master
Patrick Donnelly [Mon, 25 Sep 2017 00:07:32 +0000 (17:07 -0700)]
Merge PR #17918 into master

* refs/remotes/upstream/pull/17918/head:
qa: whitelist failover log warnings

Reviewed-by: Zheng Yan <zyan@redhat.com>
7 years agoMerge PR #17917 into master
Patrick Donnelly [Mon, 25 Sep 2017 00:07:27 +0000 (17:07 -0700)]
Merge PR #17917 into master

* refs/remotes/upstream/pull/17917/head:
qa: ignore evicted client in client-recovery

Reviewed-by: Zheng Yan <zyan@redhat.com>
7 years agomon/OSDMonitor: error out if setting ruleset-* ec profile property 17848/head
Sage Weil [Wed, 20 Sep 2017 20:42:01 +0000 (16:42 -0400)]
mon/OSDMonitor: error out if setting ruleset-* ec profile property

We change ruleset -> crush back in dc7a2aaf7a34b1e6af0c7b79dc44a69974c1da23.
If someone tries to use the old property, error out early, instead of
silently not doing the thing they thought they told us to do.

Signed-off-by: Sage Weil <sage@redhat.com>
7 years agorgw_file: fix write error when the write offset overlaps. 17809/head
Yao Zongyou [Sun, 24 Sep 2017 14:11:22 +0000 (22:11 +0800)]
rgw_file: fix write error when the write offset overlaps.

Signed-off-by: Yao Zongyou <yaozongyou@vip.qq.com>