]> git.apps.os.sepia.ceph.com Git - ceph.git/log
ceph.git
6 years agoMerge pull request #26509 from p-na/wip-pna-fix-ganesha-pylint
Lenz Grimmer [Wed, 20 Feb 2019 08:35:48 +0000 (09:35 +0100)]
Merge pull request #26509 from p-na/wip-pna-fix-ganesha-pylint

mgr/dashboard: Clean up pylint's `disable:no-else-return`

Reviewed-by: Alfonso Martínez <almartin@redhat.com>
Reviewed-by: Ricardo Dias <rdias@suse.com>
Reviewed-by: Volker Theile <vtheile@suse.com>
6 years agoMerge pull request #26478 from xiexingguo/wip-calc-upmap-vec-reserve
Xie Xingguo [Wed, 20 Feb 2019 06:13:41 +0000 (14:13 +0800)]
Merge pull request #26478 from xiexingguo/wip-calc-upmap-vec-reserve

osd/OSDMap: using std::vector::reserve to reduce memory reallocation

Reviewed-by: Yan Jun <yan.jun8@zte.com.cn>
6 years agoMerge pull request #26505 from xiexingguo/wip-balancer-weekday-range
Xie Xingguo [Wed, 20 Feb 2019 06:12:59 +0000 (14:12 +0800)]
Merge pull request #26505 from xiexingguo/wip-balancer-weekday-range

mgr/balancer: add min/max fields for weekday and be compatible with C

Reviewed-by: Volker Theile <vtheile@suse.com>
Reviewed-by: Sage Weil <sage@redhat.com>
6 years agoMerge pull request #25138 from stackhpc/rdma-cm
Kefu Chai [Wed, 20 Feb 2019 05:08:01 +0000 (13:08 +0800)]
Merge pull request #25138 from stackhpc/rdma-cm

msgr/async/rdma: Return from poll system call with EINTR should be retried

Reviewed-by: Kefu Chai <kchai@redhat.com>
6 years agomsg/async/rdma: retry if poll() returns EINTR 25138/head
Stig Telfer [Sat, 10 Nov 2018 21:01:53 +0000 (22:01 +0100)]
msg/async/rdma: retry if poll() returns EINTR

Fixes: https://tracker.ceph.com/issues/37292
Signed-off-by: Stig Telfer <stig@stackhpc.com>
6 years agoMerge pull request #26328 from badone/wip-update-ceph_stable_release-to-mimic
vasukulkarni [Wed, 20 Feb 2019 02:11:59 +0000 (18:11 -0800)]
Merge pull request #26328 from badone/wip-update-ceph_stable_release-to-mimic

qa/ceph-ansible: Set ceph_stable_release to mimic

6 years agoMerge pull request #25945 from trociny/wip-migration-parent
Jason Dillaman [Tue, 19 Feb 2019 19:52:03 +0000 (14:52 -0500)]
Merge pull request #25945 from trociny/wip-migration-parent

librbd: make it possible to migrate parent images

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
6 years agoMerge PR #26469 into master
Sage Weil [Tue, 19 Feb 2019 14:31:39 +0000 (08:31 -0600)]
Merge PR #26469 into master

* refs/pull/26469/head:
common/ceph_timer: stop timer's thread when it is suspended

Reviewed-by: Neha Ojha <nojha@redhat.com>
6 years agoMerge PR #26470 into master
Sage Weil [Tue, 19 Feb 2019 14:31:23 +0000 (08:31 -0600)]
Merge PR #26470 into master

* refs/pull/26470/head:
mgr/MgrStandby: include addrs in metadata

Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
6 years agoMerge PR #26479 into master
Sage Weil [Tue, 19 Feb 2019 14:31:03 +0000 (08:31 -0600)]
Merge PR #26479 into master

* refs/pull/26479/head:
pybind: move FLAGS into Flag class

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
6 years agoMerge PR #26485 into master
Sage Weil [Tue, 19 Feb 2019 14:30:41 +0000 (08:30 -0600)]
Merge PR #26485 into master

* refs/pull/26485/head:
qa/suites/upgrade/luminous-x: force clone v1 format for final rbd python test

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
6 years agoMerge pull request #26452 from tchaikov/wip-crimson-send-known-addresses
Kefu Chai [Tue, 19 Feb 2019 12:23:26 +0000 (20:23 +0800)]
Merge pull request #26452 from tchaikov/wip-crimson-send-known-addresses

crimson/osd: send known addresses at boot

Reviewed-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
6 years agoMerge pull request #26450 from s0nea/wip-dashboard-readonly-config-options-2
Lenz Grimmer [Tue, 19 Feb 2019 11:50:30 +0000 (12:50 +0100)]
Merge pull request #26450 from s0nea/wip-dashboard-readonly-config-options-2

mgr/dashboard: disallow editing read-only config options (part 2)

Reviewed-by: Volker Theile <vtheile@suse.com>
6 years agoMerge pull request #25233 from p-na/wip-pna-qos-pr
Lenz Grimmer [Tue, 19 Feb 2019 11:43:40 +0000 (12:43 +0100)]
Merge pull request #25233 from p-na/wip-pna-qos-pr

mgr/dashboard: Add support for managing RBD QoS

Reviewed-by: Alfonso Martínez <almartin@redhat.com>
Reviewed-by: Laura Paduano <lpaduano@suse.com>
Reviewed-by: Ricardo Dias <rdias@suse.com>
Reviewed-by: Stephan Müller <smueller@suse.com>
Reviewed-by: Tatjana Dehler <tdehler@suse.com>
6 years agomgr/balancer: make weekday be compatible with C 26505/head
xie xingguo [Tue, 19 Feb 2019 10:36:25 +0000 (18:36 +0800)]
mgr/balancer: make weekday be compatible with C

The __desc__ field of **begin[end]_weekend** suggests
sunday is the prevailing start of the week, whereas the
Python implementation says no.

See https://stackoverflow.com/questions/21045569/why-is-pythons-weekday-different-from-tm-wday-in-c

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
6 years agomgr/balancer: add min/max fields for begin[end]_weekday
xie xingguo [Tue, 19 Feb 2019 10:30:52 +0000 (18:30 +0800)]
mgr/balancer: add min/max fields for begin[end]_weekday

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
6 years agomgr/dashboard: Clean up pylint's `disable:no-else-return` 26509/head
Patrick Nawracay [Tue, 19 Feb 2019 11:15:24 +0000 (12:15 +0100)]
mgr/dashboard: Clean up pylint's `disable:no-else-return`

Signed-off-by: Patrick Nawracay <pnawracay@suse.com>
6 years agomgr/dashboard: Render error in pool edit dialog 25233/head
Patrick Nawracay [Mon, 4 Feb 2019 13:47:23 +0000 (14:47 +0100)]
mgr/dashboard: Render error in pool edit dialog

Fixes: http://tracker.ceph.com/issues/38004
Signed-off-by: Patrick Nawracay <pnawracay@suse.com>
6 years agomgr/dashboard: Add support for managing RBD QoS
Patrick Nawracay [Mon, 29 Oct 2018 08:59:59 +0000 (09:59 +0100)]
mgr/dashboard: Add support for managing RBD QoS

Fixes: http://tracker.ceph.com/issues/36191
Signed-off-by: Patrick Nawracay <pnawracay@suse.com>
6 years agoMerge pull request #26405 from jtlayton/wip-jlayton-orch
Sebastian Wagner [Tue, 19 Feb 2019 09:29:04 +0000 (10:29 +0100)]
Merge pull request #26405 from jtlayton/wip-jlayton-orch

Allow rook to scale the mon count

Reviewed-by: Noah Watkins <noahwatkins@gmail.com>
Reviewed-by: Sebastian Wagner <sebastian.wagner@suse.com>
Reviewed-by: Travis Nielsen <tnielsen@redhat.com>
6 years agoMerge pull request #23221 from baixueyu/wip-rgw-cleanup-regex
Kefu Chai [Tue, 19 Feb 2019 09:18:17 +0000 (17:18 +0800)]
Merge pull request #23221 from baixueyu/wip-rgw-cleanup-regex

rgw: delete some unused code about std::regex

Reviewed-by: Adam C. Emerson <aemerson@redhat.com>
6 years agoobjclass: fix cls_get_snapset_seq for cache tier case 25945/head
Mykola Golub [Mon, 18 Feb 2019 17:11:03 +0000 (17:11 +0000)]
objclass: fix cls_get_snapset_seq for cache tier case

Signed-off-by: Mykola Golub <mgolub@suse.com>
6 years agoqa/workunits/rbd: add parent migration case
Mykola Golub [Thu, 7 Feb 2019 10:12:07 +0000 (10:12 +0000)]
qa/workunits/rbd: add parent migration case

Signed-off-by: Mykola Golub <mgolub@suse.com>
6 years agorbd: allow to migrate parent if force flag set
Mykola Golub [Mon, 4 Feb 2019 12:06:36 +0000 (12:06 +0000)]
rbd: allow to migrate parent if force flag set

Signed-off-by: Mykola Golub <mgolub@suse.com>
6 years agorbd: add option to list all descendant images
Mykola Golub [Fri, 8 Feb 2019 17:54:23 +0000 (17:54 +0000)]
rbd: add option to list all descendant images

Signed-off-by: Mykola Golub <mgolub@suse.com>
6 years agorbd: use 'namespace' instead of 'namespace-name' in specs
Mykola Golub [Mon, 11 Feb 2019 20:55:35 +0000 (20:55 +0000)]
rbd: use 'namespace' instead of 'namespace-name' in specs

to make them fit the screen

Signed-off-by: Mykola Golub <mgolub@suse.com>
6 years agocrimson/osd: send known addresses in MOSDBoot 26452/head
Kefu Chai [Fri, 15 Feb 2019 17:02:18 +0000 (01:02 +0800)]
crimson/osd: send known addresses in MOSDBoot

otherwise, the peers will drop the connection at seeing unmatched
address in banner.

Signed-off-by: Kefu Chai <kchai@redhat.com>
6 years agocrimson/osd: populate crc settings
Kefu Chai [Fri, 15 Feb 2019 17:00:02 +0000 (01:00 +0800)]
crimson/osd: populate crc settings

we should populate messenger related settings before starting
messengers.

Signed-off-by: Kefu Chai <kchai@redhat.com>
6 years agocrimson/osd: listen on v1 addresses
Kefu Chai [Fri, 15 Feb 2019 15:10:28 +0000 (23:10 +0800)]
crimson/osd: listen on v1 addresses

Signed-off-by: Kefu Chai <kchai@redhat.com>
6 years agoMerge pull request #26254 from tchaikov/wip-crimson-cache
Kefu Chai [Tue, 19 Feb 2019 08:51:19 +0000 (16:51 +0800)]
Merge pull request #26254 from tchaikov/wip-crimson-cache

crimson: cache osdmap using LRU cache

Reviewed-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
6 years agorbd: allow 'children' command work if no snap specified
Mykola Golub [Thu, 7 Feb 2019 10:06:55 +0000 (10:06 +0000)]
rbd: allow 'children' command work if no snap specified

Signed-off-by: Mykola Golub <mgolub@suse.com>
6 years agolibrbd: add list_descendants API method
Mykola Golub [Fri, 8 Feb 2019 17:53:59 +0000 (17:53 +0000)]
librbd: add list_descendants API method

Signed-off-by: Mykola Golub <mgolub@suse.com>
6 years agolibrbd: make list_children work if parent snap is head
Mykola Golub [Thu, 7 Feb 2019 10:03:08 +0000 (10:03 +0000)]
librbd: make list_children work if parent snap is head

(returning children for all the image snaps in this case)

Signed-off-by: Mykola Golub <mgolub@suse.com>
6 years agolibrbd: make it possible to migrate parent images
Mykola Golub [Mon, 4 Feb 2019 12:09:02 +0000 (12:09 +0000)]
librbd: make it possible to migrate parent images

Signed-off-by: Mykola Golub <mgolub@suse.com>
6 years agolibrbd: replace attach child call with new state machine
Mykola Golub [Wed, 16 Jan 2019 11:58:55 +0000 (11:58 +0000)]
librbd: replace attach child call with new state machine

Signed-off-by: Mykola Golub <mgolub@suse.com>
6 years agolibrbd: new attach child state machine
Mykola Golub [Wed, 16 Jan 2019 11:58:04 +0000 (11:58 +0000)]
librbd: new attach child state machine

Signed-off-by: Mykola Golub <mgolub@suse.com>
6 years agolibrbd: make AttachParentRequest support reattach
Mykola Golub [Mon, 21 Jan 2019 08:29:14 +0000 (08:29 +0000)]
librbd: make AttachParentRequest support reattach

Signed-off-by: Mykola Golub <mgolub@suse.com>
6 years agocls/rbd: extend parent_attach to support reattach
Mykola Golub [Mon, 21 Jan 2019 08:27:14 +0000 (08:27 +0000)]
cls/rbd: extend parent_attach to support reattach

Signed-off-by: Mykola Golub <mgolub@suse.com>
6 years agoMerge pull request #26378 from votdev/issue_38267
Lenz Grimmer [Tue, 19 Feb 2019 08:23:58 +0000 (09:23 +0100)]
Merge pull request #26378 from votdev/issue_38267

mgr/dashboard: Module dashboard.services.ganesha has several lint issues

Reviewed-by: Tatjana Dehler <tdehler@suse.com>
6 years agorgw: delete some unused code about std::regex 23221/head
baixueyu78@126.com [Wed, 25 Jul 2018 05:49:55 +0000 (13:49 +0800)]
rgw: delete some unused code about std::regex

Signed-off-by: Xueyu Bai <baixueyu@inspur.com>
6 years agocmake: add PGMap.cc to crimson-common 26254/head
Kefu Chai [Thu, 14 Feb 2019 09:27:57 +0000 (17:27 +0800)]
cmake: add PGMap.cc to crimson-common

otherwise we have failures like:

/usr/bin/ld: ../../../lib/libcrimson-common.a(Message.cc.o): in function
`PGMapDigest::~PGMapDigest()':
/var/ssd/ceph/src/mon/PGMap.h:37: undefined reference to `vtable for
PGMapDigest'
/usr/bin/ld: ../../../lib/libcrimson-common.a(Message.cc.o): in function
`PGMapDigest::~PGMapDigest()':

Signed-off-by: Kefu Chai <kchai@redhat.com>
6 years agocrimson/osd: set_callback in ctor
Kefu Chai [Tue, 12 Feb 2019 13:40:15 +0000 (21:40 +0800)]
crimson/osd: set_callback in ctor

there is no need to do so in `start()`.

Signed-off-by: Kefu Chai <kchai@redhat.com>
6 years agocrimson/common: lookup using unordered_map first
Kefu Chai [Sun, 3 Feb 2019 12:32:04 +0000 (20:32 +0800)]
crimson/common: lookup using unordered_map first

assuming the unordered_map in LRU cache is faster.

inspired by #25480 by Radoslaw Zarzynski

Signed-off-by: Kefu Chai <kchai@redhat.com>
6 years agocrimson/osd: cache osdmaps using LRU cache
Kefu Chai [Sun, 3 Feb 2019 05:31:27 +0000 (13:31 +0800)]
crimson/osd: cache osdmaps using LRU cache

Signed-off-by: Kefu Chai <kchai@redhat.com>
6 years agoMerge pull request #25570 from cbodley/wip-rgw-cls-bi-list-log-level
Casey Bodley [Tue, 19 Feb 2019 00:06:16 +0000 (19:06 -0500)]
Merge pull request #25570 from cbodley/wip-rgw-cls-bi-list-log-level

cls/rgw: raise debug level of bi_log_iterate_entries output

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
6 years agoMerge pull request #26491 from ceph/revert-25926-wip-rgw-lc-prefix
Matt Benjamin [Mon, 18 Feb 2019 23:10:18 +0000 (18:10 -0500)]
Merge pull request #26491 from ceph/revert-25926-wip-rgw-lc-prefix

Revert "rgw: lifcycle: don't reject compound rules with empty prefix"

6 years agoRevert "rgw: lifcycle: don't reject compound rules with empty prefix" 26491/head
Matt Benjamin [Mon, 18 Feb 2019 21:14:52 +0000 (16:14 -0500)]
Revert "rgw: lifcycle: don't reject compound rules with empty prefix"

Signed-off-by: Matt Benjamin <mbenjamin@redhat.com>
6 years agoMerge pull request #26399 from jan--f/c-v-fix-hashable-py3
Andrew Schoen [Mon, 18 Feb 2019 20:38:21 +0000 (14:38 -0600)]
Merge pull request #26399 from jan--f/c-v-fix-hashable-py3

ceph-volume: make Device hashable to allow set of Device list in py3

Reviewed-by: Andrew Schoen <aschoen@redhat.com>
6 years agoMerge pull request #26401 from jan--f/c-v-fix-siez-format-py3
Andrew Schoen [Mon, 18 Feb 2019 20:37:35 +0000 (14:37 -0600)]
Merge pull request #26401 from jan--f/c-v-fix-siez-format-py3

ceph-volume: implement __format__ in Size to format sizes in py3

Reviewed-by: Andrew Schoen <aschoen@redhat.com>
6 years agoMerge pull request #26403 from jan--f/c-v-no-iteritems-py3
Andrew Schoen [Mon, 18 Feb 2019 20:36:57 +0000 (14:36 -0600)]
Merge pull request #26403 from jan--f/c-v-no-iteritems-py3

ceph-volume: remove iteritems instances

Reviewed-by: Andrew Schoen <aschoen@redhat.com>
6 years agoMerge PR #26463 into master
Sage Weil [Mon, 18 Feb 2019 19:39:35 +0000 (13:39 -0600)]
Merge PR #26463 into master

* refs/pull/26463/head:
script/ptl-tool: allow invocation within a subdirectory

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
6 years agoMerge pull request #26272 from ivancich/wip-log-excl-lock-busy-info
J. Eric Ivancich [Mon, 18 Feb 2019 17:48:09 +0000 (12:48 -0500)]
Merge pull request #26272 from ivancich/wip-log-excl-lock-busy-info

rgw: when exclusive lock fails due existing lock, log add'l info

Reviewed-By: Abhishek Lekshmanan <abhishek@suse.com>
6 years agoqa/suites/upgrade/luminous-x: force clone v1 format for final rbd python test 26485/head
Mykola Golub [Mon, 18 Feb 2019 11:37:27 +0000 (11:37 +0000)]
qa/suites/upgrade/luminous-x: force clone v1 format for final rbd python test

Fixes: https://tracker.ceph.com/issues/38346
Signed-off-by: Mykola Golub <mgolub@suse.com>
6 years agoMerge pull request #25926 from linuxbox2/wip-rgw-lc-prefix
Matt Benjamin [Mon, 18 Feb 2019 16:15:27 +0000 (11:15 -0500)]
Merge pull request #25926 from linuxbox2/wip-rgw-lc-prefix

rgw: lifcycle: don't reject compound rules with empty prefix

6 years agoMerge pull request #26386 from votdev/improve_dashboard_module_opts
Lenz Grimmer [Mon, 18 Feb 2019 15:03:59 +0000 (16:03 +0100)]
Merge pull request #26386 from votdev/improve_dashboard_module_opts

mgr/dashboard: Set MODULE_OPTIONS types and defaults

Reviewed-by: Ernesto Puerta <epuertat@redhat.com>
Reviewed-by: Patrick Nawracay <pnawracay@suse.com>
Reviewed-by: Ricardo Dias <rdias@suse.com>
Reviewed-by: Tatjana Dehler <tdehler@suse.com>
6 years agoMerge pull request #26226 from trociny/wip-rbd-re-sparsify
Jason Dillaman [Mon, 18 Feb 2019 14:24:21 +0000 (09:24 -0500)]
Merge pull request #26226 from trociny/wip-rbd-re-sparsify

rbd: online re-sparsify of images

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
6 years agoMerge pull request #26242 from p-na/wip-pna-osd-purge
Lenz Grimmer [Mon, 18 Feb 2019 13:15:48 +0000 (14:15 +0100)]
Merge pull request #26242 from p-na/wip-pna-osd-purge

mgr/dashboard: Implement OSD purge

Reviewed-by: Stephan Müller <smueller@suse.com>
Reviewed-by: Tatjana Dehler <tdehler@suse.com>
6 years agopybind: move FLAGS into Flag class 26479/head
Kefu Chai [Mon, 18 Feb 2019 09:32:42 +0000 (17:32 +0800)]
pybind: move FLAGS into Flag class

so we have shorter names, and don't need to import ceph_argparse
only for accessing the flags

Signed-off-by: Kefu Chai <kchai@redhat.com>
6 years agoMerge pull request #26431 from wjwithagen/wjw-fix-src_os_bluestore_KernelDevice.cc
Kefu Chai [Mon, 18 Feb 2019 09:17:27 +0000 (17:17 +0800)]
Merge pull request #26431 from wjwithagen/wjw-fix-src_os_bluestore_KernelDevice.cc

os/bluestore: Only use F_SET_FILE_RW_HINT when available

Reviewed-by: Kefu Chai <kchai@redhat.com>
6 years agoosd/OSDMap: using std::vector::reserve to reduce memory reallocation 26478/head
xie xingguo [Mon, 18 Feb 2019 07:40:22 +0000 (15:40 +0800)]
osd/OSDMap: using std::vector::reserve to reduce memory reallocation

In C++ vectors are dynamic arrays.
Vectors are assigned memory in blocks of contiguous locations.
When the memory allocated for the vector falls short of storing
new elements, a new memory block is allocated to vector and all
elements are copied from the old location to the new location.
This reallocation of elements helps vectors to grow when required.
However, it is a costly operation and time complexity is involved
in this step is linear.
Try to use std::vector::reserve whenever possible if performance
matters.

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
6 years agomgr/dashboard: Implement OSD purge 26242/head
Patrick Nawracay [Fri, 1 Feb 2019 10:58:22 +0000 (11:58 +0100)]
mgr/dashboard: Implement OSD purge

Removes the `remove` functionality from the UI.

Fixes: http://tracker.ceph.com/issues/35811
Signed-off-by: Patrick Nawracay <pnawracay@suse.com>
6 years agoMerge pull request #26440 from xiexingguo/wip-balancer-week
Xie Xingguo [Mon, 18 Feb 2019 04:14:46 +0000 (12:14 +0800)]
Merge pull request #26440 from xiexingguo/wip-balancer-week

mgr/balancer: restrict automatic balancing to specific weekdays

Reviewed-by: Sage Weil <sage@redhat.com>
6 years agoMerge pull request #26425 from trociny/wip-38315
Jason Dillaman [Mon, 18 Feb 2019 02:25:24 +0000 (21:25 -0500)]
Merge pull request #26425 from trociny/wip-38315

journal: fix potential race when closing object recorder

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
6 years agomgr/balancer: restrict automatic balancing to specific weekdays 26440/head
xie xingguo [Fri, 15 Feb 2019 05:35:53 +0000 (13:35 +0800)]
mgr/balancer: restrict automatic balancing to specific weekdays

We have implemented similar semantics for the scrub behaviour.
Let's try to keep pace with that.

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
6 years agoMerge PR #26353 into master
Sage Weil [Sun, 17 Feb 2019 16:44:33 +0000 (10:44 -0600)]
Merge PR #26353 into master

* refs/pull/26353/head:
osd/PG: print get/put under debug_refs
osd: clear priv on heartbeat_reset

Reviewed-by: Kefu Chai <kchai@redhat.com>
6 years agomgr/MgrStandby: include addrs in metadata 26470/head
Sage Weil [Sun, 17 Feb 2019 15:26:44 +0000 (09:26 -0600)]
mgr/MgrStandby: include addrs in metadata

Signed-off-by: Sage Weil <sage@redhat.com>
6 years agoosd/PG: print get/put under debug_refs 26353/head
Sage Weil [Sun, 17 Feb 2019 14:18:34 +0000 (08:18 -0600)]
osd/PG: print get/put under debug_refs

Signed-off-by: Sage Weil <sage@redhat.com>
6 years agoMerge PR #24805 into master
Sage Weil [Sun, 17 Feb 2019 14:18:06 +0000 (08:18 -0600)]
Merge PR #24805 into master

* refs/pull/24805/head:
qa/suite: add dedup test
src/tools: fix compile error (master version issue)
src/tools: add stats (fixed objects,total objects)
src/tools: make room for cdc
src/tools: make enhacned stats and interface class
src/tools: set timelimit and add signal handler to check progress
src/tools: use the slice thing and make parallel (chunk_scrub)
src/test: add max-thread test in test_dedup_tool.sh
src/tools: use the slice thing and make parallel
src/test: add chunk-scrub test in test_dedup_tool.sh
src/tools: add chunk-scrub op in dedup tool
src/cls/cas: add has_chunk op
src/test: add test_dedup_tool.sh
src/tools: initial works for dedup tool

Reviewed-by: Sage Weil <sage@redhat.com>
6 years agoMerge PR #26462 into master
Sage Weil [Sun, 17 Feb 2019 14:16:57 +0000 (08:16 -0600)]
Merge PR #26462 into master

* refs/pull/26462/head:
options: update some descriptions and see_also fields.

Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
Reviewed-by: Sage Weil <sage@redhat.com>
6 years agocommon/ceph_timer: stop timer's thread when it is suspended 26469/head
Peng Wang [Sun, 17 Feb 2019 09:47:52 +0000 (17:47 +0800)]
common/ceph_timer: stop timer's thread when it is suspended

otherwise the client could hang when shutting down

Fixes: https://tracker.ceph.com/issues/37766
Signed-off-by: Peng Wang <wp389@126.com>
6 years agoscript/ptl-tool: allow invocation within a subdirectory 26463/head
Sage Weil [Sat, 16 Feb 2019 19:05:35 +0000 (13:05 -0600)]
script/ptl-tool: allow invocation within a subdirectory

Make ptl-tool.py work from a subdirectory inside the repo (e.g., build/).

Signed-off-by: Sage Weil <sage@redhat.com>
6 years agoMerge PR #26187 into master
Sage Weil [Sat, 16 Feb 2019 15:39:59 +0000 (09:39 -0600)]
Merge PR #26187 into master

* refs/pull/26187/head:
mgr/balancer: balance pools with same crush_rule in batch
osd/OSDMap: more improvements to upmap

Reviewed-by: Sage Weil <sage@redhat.com>
6 years agoMerge PR #26435 into master
Sage Weil [Sat, 16 Feb 2019 15:30:48 +0000 (09:30 -0600)]
Merge PR #26435 into master

* refs/pull/26435/head:
msg/async/ProtocolV2: assume peer has SERVER_NAUTILUS for encoding v2 frame

Reviewed-by: Ricardo Dias <rdias@suse.com>
6 years agoMerge pull request #26275 from trociny/wip-mksnap-errmsg
Kefu Chai [Sat, 16 Feb 2019 15:29:09 +0000 (23:29 +0800)]
Merge pull request #26275 from trociny/wip-mksnap-errmsg

rados: provide user with more meaningful error message

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
6 years agoMerge pull request #26454 from batrick/i37955-followup
Kefu Chai [Sat, 16 Feb 2019 15:26:49 +0000 (23:26 +0800)]
Merge pull request #26454 from batrick/i37955-followup

ceph.in: use correct module for cmd flags

Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
6 years agoMerge pull request #26446 from tchaikov/wip-mgr-plugins-are-arch-indep
Kefu Chai [Sat, 16 Feb 2019 15:20:27 +0000 (23:20 +0800)]
Merge pull request #26446 from tchaikov/wip-mgr-plugins-are-arch-indep

cmake,rpm,deb: install mgr plugins into /usr/share/ceph/mgr

Reviewed-by: Boris Ranto <branto@redhat.com>
6 years agoMerge pull request #26449 from tchaikov/wip-monc-cleanup
Kefu Chai [Sat, 16 Feb 2019 15:16:09 +0000 (23:16 +0800)]
Merge pull request #26449 from tchaikov/wip-monc-cleanup

mon/MonClient: drop my_addr

Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Neha Ojha <nojha@redhat.com>
6 years agooptions: update some descriptions and see_also fields. 26462/head
Mark Nelson [Fri, 4 Aug 2017 15:03:05 +0000 (10:03 -0500)]
options: update some descriptions and see_also fields.

Signed-off-by: Mark Nelson <mnelson@redhat.com>
6 years agorpm: mark mgr plugins "noarch" 26446/head
Kefu Chai [Fri, 15 Feb 2019 13:02:23 +0000 (21:02 +0800)]
rpm: mark mgr plugins "noarch"

as they are architecture independent.

Signed-off-by: Kefu Chai <kchai@redhat.com>
6 years agodebian: s|lib/ceph/mgr|share/ceph/mgr|
Kefu Chai [Fri, 15 Feb 2019 13:00:10 +0000 (21:00 +0800)]
debian: s|lib/ceph/mgr|share/ceph/mgr|

as the mgr plugins are installed into $prefix/share/ceph/mgr now.

Signed-off-by: Kefu Chai <kchai@redhat.com>
6 years agorpm: s|lib/ceph/mgr|share/ceph/mgr|
Kefu Chai [Fri, 15 Feb 2019 12:54:51 +0000 (20:54 +0800)]
rpm: s|lib/ceph/mgr|share/ceph/mgr|

as the mgr plugins are installed into $prefix/share/ceph/mgr now.

Signed-off-by: Kefu Chai <kchai@redhat.com>
6 years agocmake: rename CMAKE_INSTALL_{FULL_}?PKGLIBDIR
Kefu Chai [Fri, 15 Feb 2019 12:23:32 +0000 (20:23 +0800)]
cmake: rename CMAKE_INSTALL_{FULL_}?PKGLIBDIR

rename CMAKE_INSTALL_{FULL_}?PKGLIBDIR to
CEPH_INSTALL_{FULL_}?PKGLIBDIR. in order to differentiate them from the
paths not ended with "ceph".

Signed-off-by: Kefu Chai <kchai@redhat.com>
6 years agocmake: install mgr plugins into $prefix/share/ceph
Kefu Chai [Fri, 15 Feb 2019 12:14:53 +0000 (20:14 +0800)]
cmake: install mgr plugins into $prefix/share/ceph

as mgr plugins are architecture independent source files. see also
/usr/share/cmake-*/

Signed-off-by: Kefu Chai <kchai@redhat.com>
6 years agoMerge PR #26455 into master
Sage Weil [Sat, 16 Feb 2019 00:14:05 +0000 (18:14 -0600)]
Merge PR #26455 into master

* refs/pull/26455/head:
qa/suites/upgrade/mimic-x/stress-split: drop pglog_hardlimit test
qa/suites/upgrade/mimic-x/stress-split: update for msgr2
qa/suites/upgrade/mimic-x/parallel: update for msgr v2

Reviewed-by: Neha Ojha <nojha@redhat.com>
6 years agoMerge pull request #26416 from dzafman/wip-fix-test-loops
David Zafman [Fri, 15 Feb 2019 22:25:59 +0000 (14:25 -0800)]
Merge pull request #26416 from dzafman/wip-fix-test-loops

test: Limit loops waiting for force-backfill/force-recovery to happen

Reviewed-by: Neha Ojha <nojha@redhat.com>
6 years agoMerge PR #26448 into master
Sage Weil [Fri, 15 Feb 2019 22:22:14 +0000 (16:22 -0600)]
Merge PR #26448 into master

* refs/pull/26448/head:
osd: do not send peers really old maps
osd: build_incremental_map_msg: recover if we are missing an incremental
osd: build_incremental_map_msg: behave if we have latest full but not incremental

Reviewed-by: Neha Ojha <nojha@redhat.com>
6 years agoMerge PR #26345 into master
Sage Weil [Fri, 15 Feb 2019 22:08:55 +0000 (16:08 -0600)]
Merge PR #26345 into master

* refs/pull/26345/head:
ceph-osd: be helpful about upgrade gate
mon: record 'min_mon_release' file and prevent startup if it's too old
mon/Monitor: do not join cluster that is >2 releases old
mon/Elector: respect monmap min_mon_release
mon: check min_mon_release during probe
mon/MonmapMonitor: increase min_mon_release when full quorum is upgraded
mon: maintain quorum_min_mon_release
mon/MonMapMonitor: set initial min_mon_release
monmaptool: add --set-min-mon-release
monmaptool: don't spew usage on any error
mon/MonMap: add min_mon_release field

Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
6 years agoMerge PR #26456 into master
Sage Weil [Fri, 15 Feb 2019 22:07:25 +0000 (16:07 -0600)]
Merge PR #26456 into master

* refs/pull/26456/head:
mgr/PyModuleRegistry: avoid null deref from get_progress_events

Reviewed-by: Ernesto Puerta <epuertat@redhat.com>
6 years agoqa/suites/upgrade/mimic-x/stress-split: drop pglog_hardlimit test 26455/head
Sage Weil [Fri, 15 Feb 2019 02:16:12 +0000 (20:16 -0600)]
qa/suites/upgrade/mimic-x/stress-split: drop pglog_hardlimit test

Signed-off-by: Sage Weil <sage@redhat.com>
6 years agoqa/suites/upgrade/mimic-x/stress-split: update for msgr2
Sage Weil [Thu, 14 Feb 2019 23:01:06 +0000 (17:01 -0600)]
qa/suites/upgrade/mimic-x/stress-split: update for msgr2

Signed-off-by: Sage Weil <sage@redhat.com>
6 years agoqa/suites/upgrade/mimic-x/parallel: update for msgr v2
Sage Weil [Thu, 14 Feb 2019 22:54:37 +0000 (16:54 -0600)]
qa/suites/upgrade/mimic-x/parallel: update for msgr v2

Signed-off-by: Sage Weil <sage@redhat.com>
6 years agoMerge pull request #26212 from linuxbox2/wip-rgw-master-nosuch
Matt Benjamin [Fri, 15 Feb 2019 21:40:21 +0000 (16:40 -0500)]
Merge pull request #26212 from linuxbox2/wip-rgw-master-nosuch

rgw: check for non-existent bucket in RGWGetACLs

6 years agoosd: clear priv on heartbeat_reset
Sage Weil [Mon, 11 Feb 2019 14:44:12 +0000 (08:44 -0600)]
osd: clear priv on heartbeat_reset

Signed-off-by: Sage Weil <sage@redhat.com>
6 years agoMerge PR #25739 into master
Patrick Donnelly [Fri, 15 Feb 2019 18:37:13 +0000 (10:37 -0800)]
Merge PR #25739 into master

* refs/pull/25739/head:
mds: handle leftover reconnect information
client: split large reconnect into multiple messages
mds: update MClientReconnect encoding

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
6 years agoMerge PR #26423 into master
Patrick Donnelly [Fri, 15 Feb 2019 18:36:32 +0000 (10:36 -0800)]
Merge PR #26423 into master

* refs/pull/26423/head:
mgr/volumes: create/delete fs subvolumes
pybind/ceph_volume_client: allow volume_client to

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
6 years agoMerge PR #26434 into master
Patrick Donnelly [Fri, 15 Feb 2019 18:26:30 +0000 (10:26 -0800)]
Merge PR #26434 into master

* refs/pull/26434/head:
mds: return string_view for type
mds: reorg LogEvent def
mds: pass LogEvent as unique_ptr

Reviewed-by: Zheng Yan <zyan@redhat.com>
6 years agoceph.in: use correct module for cmd flags 26454/head
Patrick Donnelly [Fri, 15 Feb 2019 18:14:22 +0000 (10:14 -0800)]
ceph.in: use correct module for cmd flags

argparse != ceph_argparse

Introduced-by: 19fbdb3ffde5bcb73792b1d822fe3f8d0407d490
Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
6 years agomgr/PyModuleRegistry: avoid null deref from get_progress_events 26456/head
Sage Weil [Fri, 15 Feb 2019 18:14:13 +0000 (12:14 -0600)]
mgr/PyModuleRegistry: avoid null deref from get_progress_events

active_modules may be null.

Signed-off-by: Sage Weil <sage@redhat.com>
6 years agoMerge PR #26445 into master
Sage Weil [Fri, 15 Feb 2019 16:36:03 +0000 (10:36 -0600)]
Merge PR #26445 into master

* refs/pull/26445/head:
mgr: hold GIL while generating a typed option value
mgr/ActivePyModules: do not touch PyFormatter without the GIL

Reviewed-by: Ernesto Puerta <epuertat@redhat.com>
6 years agomgr/dashboard: check config option updatability also for bulk create 26450/head
Tatjana Dehler [Fri, 15 Feb 2019 15:55:20 +0000 (16:55 +0100)]
mgr/dashboard: check config option updatability also for bulk create

Fixes: https://tracker.ceph.com/issues/34528
Signed-off-by: Tatjana Dehler <tdehler@suse.com>