]> git.apps.os.sepia.ceph.com Git - ceph.git/log
ceph.git
7 years agocommon: avoid statically allocating configuration options 16735/head
Jason Dillaman [Tue, 1 Aug 2017 16:02:06 +0000 (12:02 -0400)]
common: avoid statically allocating configuration options

This was resulting in seg faults within rbd-fuse during shutdown. This also
fixes the "variable tracking size limit exceeded with -fvar-tracking-assignments,
retrying without" compiler warning".

Fixes: http://tracker.ceph.com/issues/20869
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
7 years agorbd-fuse: remove dependency on ceph-common
Jason Dillaman [Tue, 1 Aug 2017 15:54:34 +0000 (11:54 -0400)]
rbd-fuse: remove dependency on ceph-common

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
7 years agoMerge pull request #16652 from shangzhong/wip-update-quick-guide
Kefu Chai [Tue, 1 Aug 2017 13:50:52 +0000 (21:50 +0800)]
Merge pull request #16652 from shangzhong/wip-update-quick-guide

doc: update the pool names created by vstart.sh by default

Reviewed-by: Kefu Chai <kchai@redhat.com>
7 years agoMerge pull request #16637 from ceph/wip-doc-links
Sage Weil [Tue, 1 Aug 2017 13:50:02 +0000 (08:50 -0500)]
Merge pull request #16637 from ceph/wip-doc-links

doc: upmap docs; various missing links for release notes

Reviewed-by: Kefu Chai <kchai@redhat.com>
7 years agodoc/release-notes: add various links to docs 16637/head
Sage Weil [Thu, 27 Jul 2017 19:11:52 +0000 (15:11 -0400)]
doc/release-notes: add various links to docs

Signed-off-by: Sage Weil <sage@redhat.com>
7 years agodoc/rados/operations/upmap: document new upmap feature
Sage Weil [Thu, 27 Jul 2017 19:11:44 +0000 (15:11 -0400)]
doc/rados/operations/upmap: document new upmap feature

Signed-off-by: Sage Weil <sage@redhat.com>
7 years agoMerge pull request #15838 from theanalyst/doc-pool-ns-update
Sage Weil [Tue, 1 Aug 2017 13:39:18 +0000 (08:39 -0500)]
Merge pull request #15838 from theanalyst/doc-pool-ns-update

doc: update the rados namespace docs

Reviewed-by: Casey Bodley <cbodley@redhat.com>
7 years agoMerge pull request #16623 from xiexingguo/wip-weightset
Sage Weil [Tue, 1 Aug 2017 13:29:29 +0000 (08:29 -0500)]
Merge pull request #16623 from xiexingguo/wip-weightset

crush: a couple of weight-set fixes

Reviewed-by: Sage Weil <sage@redhat.com>
7 years agoMerge pull request #16611 from liewegas/wip-doc-health
Sage Weil [Tue, 1 Aug 2017 13:26:24 +0000 (08:26 -0500)]
Merge pull request #16611 from liewegas/wip-doc-health

doc/rados/operations/health-checks: osd section

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: John Spray <john.spray@redhat.com>
Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
7 years agodoc/rados/operations/health-checks: add PG health check commentary 16611/head
Sage Weil [Tue, 1 Aug 2017 13:25:27 +0000 (09:25 -0400)]
doc/rados/operations/health-checks: add PG health check commentary

Include a link to pg-repair.rst, although there is no
content there yet.

Signed-off-by: Sage Weil <sage@redhat.com>
7 years agomon/PGMap: include which pgs have unfound objects in detail
Sage Weil [Thu, 27 Jul 2017 18:28:14 +0000 (14:28 -0400)]
mon/PGMap: include which pgs have unfound objects in detail

Signed-off-by: Sage Weil <sage@redhat.com>
7 years agomon/PGMap: put the _toofull states under DEGRADED_FULL
Sage Weil [Thu, 27 Jul 2017 17:54:46 +0000 (13:54 -0400)]
mon/PGMap: put the _toofull states under DEGRADED_FULL

I think this was an oversight?

Signed-off-by: Sage Weil <sage@redhat.com>
7 years agomon/PGMap: 'incomplete' means data is unavailable
Sage Weil [Thu, 27 Jul 2017 17:54:29 +0000 (13:54 -0400)]
mon/PGMap: 'incomplete' means data is unavailable

Well, data is certainly unavailable, and may also be
degraded in the sense that we can't peer.  I think
unavailable is the more severe of the two, though, so
let's put it there!

Signed-off-by: Sage Weil <sage@redhat.com>
7 years agodoc/rados/operations/health-checks: osd section
Sage Weil [Thu, 27 Jul 2017 02:05:35 +0000 (22:05 -0400)]
doc/rados/operations/health-checks: osd section

First paragraph: explain what the error means.

Second or later paragraph: describe steps to fix or mitigate.

Signed-off-by: Sage Weil <sage@redhat.com>
7 years agodoc: change the default filesystem/pool names 16652/head
Zhu Shangzhong [Fri, 28 Jul 2017 12:20:33 +0000 (20:20 +0800)]
doc: change the default filesystem/pool names
- s/cephfs_data/cephfs_data_a
- s/cephfs_metadata/cephfs_metadata_a
- s#./rados df#bin/rados df
- update the 'bin/rados df' output
- remove the rbd pool, it isn't created by default anymore.

Signed-off-by: Zhu Shangzhong <zhu.shangzhong@zte.com.cn>
7 years agoMerge pull request #16721 from joscollin/wip-config-rst-typo
Jos Collin [Tue, 1 Aug 2017 11:21:59 +0000 (11:21 +0000)]
Merge pull request #16721 from joscollin/wip-config-rst-typo

doc: fix typo in config.rst

Reviewed-by: Xie Xingguo <xie.xingguo@zte.com.cn>
7 years agoMerge pull request #16723 from tchaikov/wip-doc-kill-warnings
John Spray [Tue, 1 Aug 2017 11:06:36 +0000 (12:06 +0100)]
Merge pull request #16723 from tchaikov/wip-doc-kill-warnings

doc: various fixes

7 years agoMerge pull request #16471 from jan--f/janf-mds-deactivate-doc
Kefu Chai [Tue, 1 Aug 2017 10:52:59 +0000 (18:52 +0800)]
Merge pull request #16471 from jan--f/janf-mds-deactivate-doc

doc: reword mds deactivate docs; add optional fs_name argument

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
7 years agoMerge pull request #16620 from cfanz/master
Kefu Chai [Tue, 1 Aug 2017 09:45:06 +0000 (17:45 +0800)]
Merge pull request #16620 from cfanz/master

common: use std::move() for better performance

Reviewed-by: Jos Collin <jcollin@redhat.com>
7 years agoMerge pull request #16526 from TsaiJin/wip-fix-msg-typo
Kefu Chai [Tue, 1 Aug 2017 09:40:27 +0000 (17:40 +0800)]
Merge pull request #16526 from TsaiJin/wip-fix-msg-typo

msg/async: fix the bug of inaccurate calculation of l_msgr_send_bytes

Reviewed-by: Pan Liu <wanjun.lp@alibaba-inc.com>
Reviewed-by: Jos Collin <jcollin@redhat.com>
Reviewed-by: Haomai Wang <haomai@xsky.com>
7 years agoMerge pull request #16666 from scienceluo/wip-luo-auth-branch
Kefu Chai [Tue, 1 Aug 2017 09:38:08 +0000 (17:38 +0800)]
Merge pull request #16666 from scienceluo/wip-luo-auth-branch

auth: Remove unused function in AuthSessionHandler

Reviewed-by: Jos Collin <jcollin@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
7 years agodoc: various fixes 16723/head
Kefu Chai [Tue, 1 Aug 2017 09:16:39 +0000 (17:16 +0800)]
doc: various fixes

- radosgw/s3/bucketops.rst: fix Malformed table.
- operations/health-checks.rst: Title underline too short
- rbd/rados-rbd-cmds.rst: Title underline too short
- rados/operations/index.rst: include health-checks in toc

Signed-off-by: Kefu Chai <kchai@redhat.com>
7 years agodoc: fix typo in config.rst 16721/head
Jos Collin [Tue, 1 Aug 2017 08:40:42 +0000 (14:10 +0530)]
doc: fix typo in config.rst

Fixed the typo introduced by PR#16681

Signed-off-by: Jos Collin <jcollin@redhat.com>
7 years agoMerge pull request #16622 from dillaman/wip-cmpext-dne
Josh Durgin [Tue, 1 Aug 2017 06:52:43 +0000 (23:52 -0700)]
Merge pull request #16622 from dillaman/wip-cmpext-dne

osd: cmpext operator should ignore -ENOENT on read

Reviewed-by: David Zafman <dzafman@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
7 years agoMerge pull request #16677 from tchaikov/wip-20785
Kefu Chai [Tue, 1 Aug 2017 05:12:53 +0000 (13:12 +0800)]
Merge pull request #16677 from tchaikov/wip-20785

osd: do not send pg_created unless luminous

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
7 years agoMerge pull request #16663 from dzafman/wip-ec-enoent
David Zafman [Tue, 1 Aug 2017 01:19:02 +0000 (18:19 -0700)]
Merge pull request #16663 from dzafman/wip-ec-enoent

osd: EC read handling: don't grab an objectstore error to use as the read error

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
7 years agoMerge pull request #16681 from shun-s/wip-doc-config
Jos Collin [Tue, 1 Aug 2017 00:59:06 +0000 (00:59 +0000)]
Merge pull request #16681 from shun-s/wip-doc-config

doc: fix typos in config.rst

Reviewed-by: Jos Collin <jcollin@redhat.com>
7 years agoMerge pull request #16695 from tchaikov/wip-cmake-disable-vta
Gregory Farnum [Mon, 31 Jul 2017 22:05:23 +0000 (15:05 -0700)]
Merge pull request #16695 from tchaikov/wip-cmake-disable-vta

cmake: disable -fvar-tracking-assignments for config.cc

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
7 years agoMerge pull request #16697 from wjwithagen/wip-wjw-ENODATA-HashIndex.cc
Gregory Farnum [Mon, 31 Jul 2017 21:59:43 +0000 (14:59 -0700)]
Merge pull request #16697 from wjwithagen/wip-wjw-ENODATA-HashIndex.cc

HashIndex.cc: add compat.h for ENODATA

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
7 years agoMerge pull request #16689 from pritha-srivastava:wip-rgw-policy-parse-error
Adam C. Emerson [Mon, 31 Jul 2017 18:43:58 +0000 (14:43 -0400)]
Merge pull request #16689 from pritha-srivastava:wip-rgw-policy-parse-error

rgw: Fix for Policy Parse exception in case of multiple statements.

Reviewed-by: Adam C. Emerson <aemerson@redhat.com>
7 years agoMerge pull request #16661 from adamemerson/wip-throttle-minimal
Adam C. Emerson [Mon, 31 Jul 2017 18:08:20 +0000 (14:08 -0400)]
Merge pull request #16661 from adamemerson/wip-throttle-minimal

throttle: Minimal destructor fix for Luminous

Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Greg Farnum <gfarnum@redhat.com>
7 years agothrottle: Minimal destructor fix for Luminous 16661/head
Adam C. Emerson [Fri, 28 Jul 2017 18:14:48 +0000 (14:14 -0400)]
throttle: Minimal destructor fix for Luminous

Get rid of the undefined behavior of destroying condition variables
while they're being waited on.

Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
7 years agoMerge pull request #16547 from dillaman/wip-dashboard-iscsi
Jason Dillaman [Mon, 31 Jul 2017 14:22:21 +0000 (10:22 -0400)]
Merge pull request #16547 from dillaman/wip-dashboard-iscsi

mgr/dashboard: RBD iSCSI daemon status page

Reviewed-by: John Spray <john.spray@redhat.com>
7 years agodoc: fix sevral typos 16681/head
Song Shun [Sun, 30 Jul 2017 10:25:01 +0000 (18:25 +0800)]
doc: fix sevral typos

  fix sevral typos

Signed-off-by: Song Shun <song.shun3@zte.com.cn>
7 years agoMerge pull request #16670 from Yan-waller/wip-walle-0729rbdcompile
Jason Dillaman [Mon, 31 Jul 2017 14:07:45 +0000 (10:07 -0400)]
Merge pull request #16670 from Yan-waller/wip-walle-0729rbdcompile

cls/rbd: silence warning from -Wunused-variable

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
7 years agoMerge pull request #16583 from lxbsz/ws_macro
Jason Dillaman [Mon, 31 Jul 2017 13:49:13 +0000 (09:49 -0400)]
Merge pull request #16583 from lxbsz/ws_macro

librbd: add LIBRBD_SUPPORTS_WRITESAME support

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
7 years agocls/rbd: silence warning from -Wunused-variable 16670/head
Yan Jun [Mon, 31 Jul 2017 13:26:13 +0000 (21:26 +0800)]
cls/rbd: silence warning from -Wunused-variable

Signed-off-by: Yan Jun <yan.jun8@zte.com.cn>
7 years agoMerge pull request #16694 from Songweibin/wip-doc-rbd
Jason Dillaman [Mon, 31 Jul 2017 13:12:27 +0000 (09:12 -0400)]
Merge pull request #16694 from Songweibin/wip-doc-rbd

rbd: modified some commands' description into imperative sentence

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
7 years agoHashIndex.cc: add compat.h for ENODATA 16697/head
Willem Jan Withagen [Mon, 31 Jul 2017 13:02:53 +0000 (15:02 +0200)]
HashIndex.cc: add compat.h for ENODATA

Signed-off-by: Willem Jan Withagen <wjw@digiware.nl>
7 years agomon/OSDMonitor: assert(pg in creating_pgs.pg) in send_pg_creates() 16677/head
Kefu Chai [Sun, 30 Jul 2017 05:07:02 +0000 (13:07 +0800)]
mon/OSDMonitor: assert(pg in creating_pgs.pg) in send_pg_creates()

and mark OSDMonitor::send_pg_creates() a const method.

See-also: http://tracker.ceph.com/issues/20785
Signed-off-by: Kefu Chai <kchai@redhat.com>
7 years agoMerge pull request #16686 from amitkumar50/cov-1351525-1
Jason Dillaman [Mon, 31 Jul 2017 12:53:40 +0000 (08:53 -0400)]
Merge pull request #16686 from amitkumar50/cov-1351525-1

rbd: fixed coverity 'Argument cannot be negative' warning

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
7 years agocmake: disable -fvar-tracking-assignments for config.cc 16695/head
Kefu Chai [Mon, 31 Jul 2017 12:32:18 +0000 (20:32 +0800)]
cmake: disable -fvar-tracking-assignments for config.cc

there are too many variables involved in config.cc, but
-fvar-tracking-assignments is enabled by default, when the compiler
finds that the number of variables exceeds the limit
"max-vartrack-size", it gives up, and tries again disabling this
option.

this change avoids the recompilation of config.cc and also
silences the warning of

src/common/config.cc:77:1: note: variable tracking size limit exceeded
with -fvar-tracking-assignments, retrying without
 md_config_t::md_config_t(bool is_daemon)
 ^

Signed-off-by: Kefu Chai <kchai@redhat.com>
7 years agorbd: 1351525 Argument cannot be negative 16686/head
amitkuma [Mon, 31 Jul 2017 12:28:32 +0000 (17:58 +0530)]
rbd: 1351525 Argument cannot be negative

Fixed:

** CID 1351525 (#1 of 1): Argument cannot be negative (NEGATIVE_RETURNS)
7. negative_returns: sd is passed to a parameter that cannot be negative.

Signed-off-by: Amit Kumar amitkuma@redhat.com
7 years agorbd: modified some commands' description into imperative sentence 16694/head
songweibin [Mon, 31 Jul 2017 12:25:30 +0000 (20:25 +0800)]
rbd: modified some commands' description into imperative sentence

Signed-off-by: songweibin <song.weibin@zte.com.cn>
7 years agoMerge pull request #16660 from nrdmn/patch-2
John Spray [Mon, 31 Jul 2017 10:53:53 +0000 (11:53 +0100)]
Merge pull request #16660 from nrdmn/patch-2

doc: added mgr caps to manual deployment documentation

Reviewed-by: John Spray <john.spray@redhat.com>
7 years agorgw: Fix for Policy Parse exception in case of multiple statements. 16689/head
Pritha Srivastava [Mon, 31 Jul 2017 05:19:07 +0000 (10:49 +0530)]
rgw: Fix for Policy Parse exception in case of multiple statements.

Signed-off-by: Pritha Srivastava <prsrivas@redhat.com>
7 years agoauth: Remove unused function in AuthSessionHandler 16666/head
Luo Kexue [Sat, 29 Jul 2017 02:09:37 +0000 (10:09 +0800)]
auth: Remove unused function in AuthSessionHandler

Signed-off-by: Luo Kexue <luo.kexue@zte.com.cn>
7 years agoMerge pull request #16627 from liewegas/wip-objecter-eagain
Kefu Chai [Sun, 30 Jul 2017 07:33:52 +0000 (15:33 +0800)]
Merge pull request #16627 from liewegas/wip-objecter-eagain

osdc/Objecter: unify disparate EAGAIN handling paths into one

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
7 years agoMerge pull request #16668 from Yan-waller/wip-walle-0729configoption
Kefu Chai [Sun, 30 Jul 2017 05:18:10 +0000 (13:18 +0800)]
Merge pull request #16668 from Yan-waller/wip-walle-0729configoption

common: fix Option set_long_description

Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
Reviewed-by: Kefu Chai <kchai@redhat.com>
7 years agomon/OSDMonitor: more verbose message for pg creation
Kefu Chai [Sun, 30 Jul 2017 03:16:36 +0000 (11:16 +0800)]
mon/OSDMonitor: more verbose message for pg creation

See-also: http://tracker.ceph.com/issues/20785
Signed-off-by: Kefu Chai <kchai@redhat.com>
7 years agoosd: do not send pg_created unless luminous
Kefu Chai [Sun, 30 Jul 2017 03:16:08 +0000 (11:16 +0800)]
osd: do not send pg_created unless luminous

See-also: http://tracker.ceph.com/issues/20785
Signed-off-by: Kefu Chai <kchai@redhat.com>
7 years agocrush: clean up get_immediate_parent_id() 16623/head
xie xingguo [Thu, 27 Jul 2017 00:08:41 +0000 (08:08 +0800)]
crush: clean up get_immediate_parent_id()

This is a follow-up cleanup of 9d908c14f606239d291cd3551e8f716943e0badf

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
7 years agocrush: avoid implicitly cast
xie xingguo [Thu, 27 Jul 2017 03:07:53 +0000 (11:07 +0800)]
crush: avoid implicitly cast

pool-id may overflow(though actually can not happen...)

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
7 years agomon/OSDMonitor: make error output more human-readable
xie xingguo [Thu, 27 Jul 2017 11:53:49 +0000 (19:53 +0800)]
mon/OSDMonitor: make error output more human-readable

Was:

./bin/ceph osd crush weight-set reweight rbd osd.0  1 2 3 4 5
Error ENOENT: weight_set_size != 5 for bucket -1weight_set_size != 5 for bucket -2weight_set_size != 5 for bucket -3weight_set_size != 5 for bucket -4item 0 not found in crush map

Now:
./bin/ceph osd crush weight-set reweight rbd osd.0  1 2 3 4 5
Error EINVAL: must specify exact 3 weight values

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
7 years agoMerge pull request #16669 from Yan-waller/wip-walle-0729testpglogcompile
Xie Xingguo [Sat, 29 Jul 2017 05:44:31 +0000 (13:44 +0800)]
Merge pull request #16669 from Yan-waller/wip-walle-0729testpglogcompile

test/osd: kill compile warning

Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
7 years agotest/osd: kill compile warning 16669/head
Yan Jun [Sat, 29 Jul 2017 03:23:11 +0000 (11:23 +0800)]
test/osd: kill compile warning

Signed-off-by: Yan Jun <yan.jun8@zte.com.cn>
7 years agoMerge pull request #16667 from tchaikov/wip-objclass-omap
Kefu Chai [Sat, 29 Jul 2017 03:10:38 +0000 (11:10 +0800)]
Merge pull request #16667 from tchaikov/wip-objclass-omap

objclass: modify omap_get_{keys,vals} api

Reviewed-by: Sage Weil <sage@redhat.com>
7 years agocommon: fix Option set_long_description 16668/head
Yan Jun [Sat, 29 Jul 2017 02:21:43 +0000 (10:21 +0800)]
common: fix Option set_long_description

Signed-off-by: Yan Jun <yan.jun8@zte.com.cn>
7 years agolibrados_test_stub: use omap_get_vals2() and modify stubs 16667/head
Yehuda Sadeh [Fri, 14 Jul 2017 23:57:43 +0000 (16:57 -0700)]
librados_test_stub: use omap_get_vals2() and modify stubs

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
Signed-off-by: Casey Bodley <cbodley@redhat.com>
7 years agocls_kvs: adjust objclass api
Yehuda Sadeh [Fri, 14 Jul 2017 23:19:31 +0000 (16:19 -0700)]
cls_kvs: adjust objclass api

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
7 years agocls_{rbd, journal, lua}: adjust api
Yehuda Sadeh [Fri, 14 Jul 2017 23:11:09 +0000 (16:11 -0700)]
cls_{rbd, journal, lua}: adjust api

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
7 years agocls/lua: add 'more' param for cls_cxx_map_get_vals()
Yehuda Sadeh [Fri, 14 Jul 2017 22:33:45 +0000 (15:33 -0700)]
cls/lua: add 'more' param for cls_cxx_map_get_vals()

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
7 years agocls/*: adjust use of cls_cxx_map_get_vals()
Yehuda Sadeh [Fri, 14 Jul 2017 22:28:09 +0000 (15:28 -0700)]
cls/*: adjust use of cls_cxx_map_get_vals()

Now that objclass call gets a new 'more' param.

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
7 years agoobjclass: add 'more' param to omap listing
Yehuda Sadeh [Fri, 14 Jul 2017 16:37:38 +0000 (09:37 -0700)]
objclass: add 'more' param to omap listing

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
7 years agoosd: cmpext operator should ignore -ENOENT on read 16622/head
Jason Dillaman [Thu, 27 Jul 2017 11:48:59 +0000 (07:48 -0400)]
osd: cmpext operator should ignore -ENOENT on read

The operator already handles the case where the object is truncated. If
an RBD user performs a read + cmpext/write of a sparse image, the read
of the missing object would return a zeroed buffer. Using that zeroed
buffer for the cmpext test would fail since it wasn't ignoring the
-ENOENT read failure.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
7 years agoosd: EC read handling: don't grab an objectstore error to use as the read error 16663/head
David Zafman [Fri, 28 Jul 2017 18:48:28 +0000 (11:48 -0700)]
osd: EC read handling: don't grab an objectstore error to use as the read error

Signed-off-by: David Zafman <dzafman@redhat.com>
7 years agoMerge pull request #16617 from dillaman/wip-20783
Josh Durgin [Fri, 28 Jul 2017 22:07:17 +0000 (15:07 -0700)]
Merge pull request #16617 from dillaman/wip-20783

osd: moved OpFinisher logic from OSDOp to OpContext

Reviewed-by: Kefu Chai <kchai@redhat.com>
7 years agoMerge pull request #16590 from LianneWang/master
Yuri Weinstein [Fri, 28 Jul 2017 22:02:13 +0000 (15:02 -0700)]
Merge pull request #16590 from LianneWang/master

ceph_test_rados: max_stride_size must be more than min_stride_size

Reviewed-by: Sage Weil <sage@redhat.com>
7 years agoMerge pull request #16615 from tchaikov/wip-no-vla-in-cxx
Yuri Weinstein [Fri, 28 Jul 2017 22:01:46 +0000 (15:01 -0700)]
Merge pull request #16615 from tchaikov/wip-no-vla-in-cxx

kv/RocksDBStore: use vector instead of VLA for holding slices

Reviewed-by: Haomai Wang <haomai@xsky.com>
Reviewed-by: Willem Jan Withagen <wjw@digiware.nl>
7 years agoMerge pull request #16655 from liewegas/wip-osd-warning
Gregory Farnum [Fri, 28 Jul 2017 19:52:39 +0000 (12:52 -0700)]
Merge pull request #16655 from liewegas/wip-osd-warning

osd/PG: fix warning so we discard_event() on a no-op state change

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
7 years agoadded mgr caps to manual deployment documentation 16660/head
Nick Erdmann [Fri, 28 Jul 2017 17:16:27 +0000 (19:16 +0200)]
added mgr caps to manual deployment documentation

Signed-off-by: Nick Erdmann <n@nirf.de>
7 years agoMerge PR #16640 into master
Patrick Donnelly [Fri, 28 Jul 2017 16:55:29 +0000 (09:55 -0700)]
Merge PR #16640 into master

* refs/remotes/upstream/pull/16640/head:
qa: fix wait for wrong health message

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
7 years agoMerge PR #16550 into master
Patrick Donnelly [Fri, 28 Jul 2017 16:55:26 +0000 (09:55 -0700)]
Merge PR #16550 into master

* refs/remotes/upstream/pull/16550/head:
cephfs/ceph-fuse: add and modify ceph-fuse mount hint

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
7 years agoMerge PR #16413 into master
Patrick Donnelly [Fri, 28 Jul 2017 16:55:23 +0000 (09:55 -0700)]
Merge PR #16413 into master

* refs/remotes/upstream/pull/16413/head:
qa/cephfs: lsof if umount fails

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
7 years agoMerge PR #16410 into master
Patrick Donnelly [Fri, 28 Jul 2017 16:55:21 +0000 (09:55 -0700)]
Merge PR #16410 into master

* refs/remotes/upstream/pull/16410/head:
mds: refuse 'export dir' request when mds is stopping

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
7 years agoosd/PG: fix warning 16655/head
Sage Weil [Fri, 28 Jul 2017 14:07:23 +0000 (10:07 -0400)]
osd/PG: fix warning

Introduced by 4af49a886679ceb8e8afba47f04e828e5911e325

Signed-off-by: Sage Weil <sage@redhat.com>
7 years agoMerge pull request #16645 from tchaikov/wip-bluefs-allocator-is-dev-only-option
Sage Weil [Fri, 28 Jul 2017 14:01:33 +0000 (09:01 -0500)]
Merge pull request #16645 from tchaikov/wip-bluefs-allocator-is-dev-only-option

common/options: make "blue{fs,store}_allocator" LEVEL_DEV

Reviewed-by: Sage Weil <sage@redhat.com>
7 years agoMerge pull request #16489 from liewegas/wip-bluestore-options
Sage Weil [Fri, 28 Jul 2017 14:01:16 +0000 (09:01 -0500)]
Merge pull request #16489 from liewegas/wip-bluestore-options

common/options.cc: document bluestore config options

7 years agoMerge pull request #16520 from xiexingguo/wip-application-warn
Sage Weil [Fri, 28 Jul 2017 14:01:08 +0000 (09:01 -0500)]
Merge pull request #16520 from xiexingguo/wip-application-warn

mon/OSDMonitor: issue pool application related warning

Reviewed-by: Sage Weil <sage@redhat.com>
7 years agoMerge pull request #16568 from liewegas/wip-application-warn
Sage Weil [Fri, 28 Jul 2017 14:00:46 +0000 (09:00 -0500)]
Merge pull request #16568 from liewegas/wip-application-warn

qa,doc: document and fix tests for pool application warnings

7 years agoMerge pull request #16634 from neha-ojha/wip-default-device-class
Sage Weil [Fri, 28 Jul 2017 13:59:43 +0000 (08:59 -0500)]
Merge pull request #16634 from neha-ojha/wip-default-device-class

osd: add default_device_class to metadata

Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
Reviewed-by: Sage Weil <sage@redhat.com>
7 years agoMerge pull request #16638 from liewegas/wip-20804
Sage Weil [Fri, 28 Jul 2017 13:59:06 +0000 (08:59 -0500)]
Merge pull request #16638 from liewegas/wip-20804

osd/PG: ignore CancelRecovery in NotRecovering

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
7 years agoMerge pull request #16646 from tchaikov/wip-qa-run-standalone-work-with-gnu-find
Sage Weil [Fri, 28 Jul 2017 13:41:49 +0000 (08:41 -0500)]
Merge pull request #16646 from tchaikov/wip-qa-run-standalone-work-with-gnu-find

qa/run-standalone.sh: fix the find option to be compatible with GNU find

Reviewed-by: Willem Jan Withagen <wjw@digiware.nl>
7 years agoMerge pull request #16487 from liewegas/wip-mgr-module-health
John Spray [Fri, 28 Jul 2017 12:24:41 +0000 (13:24 +0100)]
Merge pull request #16487 from liewegas/wip-mgr-module-health

mgr: mgr_module interface to report health alerts

Reviewed-by: John Spray <john.spray@redhat.com>
7 years agoMerge pull request #16641 from liewegas/wip-mgr-configs
John Spray [Fri, 28 Jul 2017 12:19:57 +0000 (13:19 +0100)]
Merge pull request #16641 from liewegas/wip-mgr-configs

mgr/PyState: shut up about get_config on nonexistent keys

Reviewed-by: John Spray <john.spray@redhat.com>
7 years agoMerge pull request #16582 from liewegas/wip-20633
Kefu Chai [Fri, 28 Jul 2017 09:12:46 +0000 (17:12 +0800)]
Merge pull request #16582 from liewegas/wip-20633

mon/MgrMonitor: reset mgrdigest timer with new subscription

Reviewed-by: Kefu Chai <kchai@redhat.com>
7 years agoqa/run-standalone.sh: fix the find option to be compatible with GNU find 16646/head
Kefu Chai [Fri, 28 Jul 2017 06:18:09 +0000 (14:18 +0800)]
qa/run-standalone.sh: fix the find option to be compatible with GNU find

also re-indent to be consistent with other part of this script

Signed-off-by: Kefu Chai <kchai@redhat.com>
7 years agocommon/options: make "blue{fs,store}_allocator" LEVEL_DEV 16645/head
Kefu Chai [Fri, 28 Jul 2017 05:09:12 +0000 (13:09 +0800)]
common/options: make "blue{fs,store}_allocator" LEVEL_DEV

See-also: http://tracker.ceph.com/issues/20660
Signed-off-by: Kefu Chai <kchai@redhat.com>
7 years agoMerge pull request #16599 from liewegas/wip-standalone-fixes
Kefu Chai [Fri, 28 Jul 2017 05:18:47 +0000 (13:18 +0800)]
Merge pull request #16599 from liewegas/wip-standalone-fixes

qa/workunits: adjust path to ceph-helpers.sh

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
7 years agoMerge pull request #16482 from tchaikov/wip-opt
Kefu Chai [Fri, 28 Jul 2017 05:15:33 +0000 (13:15 +0800)]
Merge pull request #16482 from tchaikov/wip-opt

common/options: refactors to set the properties in a more structured way

Reviewed-by: John Spray <john.spray@redhat.com>
7 years agoMerge pull request #16589 from Yan-waller/wip-walle-0726testwatchnotify
Kefu Chai [Fri, 28 Jul 2017 05:14:07 +0000 (13:14 +0800)]
Merge pull request #16589 from Yan-waller/wip-walle-0726testwatchnotify

test/rados: fix wrong parameter order of RETURN1_IF_NOT_VAL

Reviewed-by: Kefu Chai <kchai@redhat.com>
7 years agoMerge pull request #16609 from wjwithagen/wip-wjw-FreeBSD-group-wheel
Kefu Chai [Fri, 28 Jul 2017 05:13:28 +0000 (13:13 +0800)]
Merge pull request #16609 from wjwithagen/wip-wjw-FreeBSD-group-wheel

ceph_disk/main.py: FreeBSD root has wheel for group

Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
7 years agoMerge pull request #16593 from shangzhong/wip-20660
Kefu Chai [Fri, 28 Jul 2017 05:07:06 +0000 (13:07 +0800)]
Merge pull request #16593 from shangzhong/wip-20660

os/bluestore/StupidAllocator: rounded down len to an align boundary

Reviewed-by: Sage Weil <sage@redhat.com>
7 years agocommon/options: document bluestore options 16489/head
Sage Weil [Mon, 24 Jul 2017 18:34:07 +0000 (14:34 -0400)]
common/options: document bluestore options

Signed-off-by: Sage Weil <sage@redhat.com>
7 years agocompressor: accept 'none' or '' for none
Sage Weil [Sat, 22 Jul 2017 18:56:28 +0000 (14:56 -0400)]
compressor: accept 'none' or '' for none

This makes the parse and output methods match up.

Signed-off-by: Sage Weil <sage@redhat.com>
7 years agoos/bluestore: observe bluestore_compression_required_ratio
Sage Weil [Sat, 22 Jul 2017 18:10:44 +0000 (14:10 -0400)]
os/bluestore: observe bluestore_compression_required_ratio

Signed-off-by: Sage Weil <sage@redhat.com>
7 years agodoc/dev/config: some guidance around defining config options
Sage Weil [Fri, 21 Jul 2017 19:09:58 +0000 (15:09 -0400)]
doc/dev/config: some guidance around defining config options

Signed-off-by: Sage Weil <sage@redhat.com>
7 years agoMerge PR #16435 into master
Patrick Donnelly [Fri, 28 Jul 2017 00:54:59 +0000 (17:54 -0700)]
Merge PR #16435 into master

* refs/remotes/upstream/pull/16435/head:
qa: whitelist trim error during powercycle tests

Reviewed-by: Kefu Chai <kchai@redhat.com>
7 years agomgr/PyState: shut up about get_config on nonexistent keys 16641/head
Sage Weil [Thu, 27 Jul 2017 22:06:22 +0000 (18:06 -0400)]
mgr/PyState: shut up about get_config on nonexistent keys

Signed-off-by: Sage Weil <sage@redhat.com>
7 years agoqa: fix wait for wrong health message 16640/head
Patrick Donnelly [Thu, 27 Jul 2017 21:35:47 +0000 (14:35 -0700)]
qa: fix wait for wrong health message

Fixes: http://tracker.ceph.com/issues/20805
Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>