]> git.apps.os.sepia.ceph.com Git - ceph.git/log
ceph.git
6 years agorbd_mirror: assert no requests on destroying InstanceWatcher 25666/head
Mykola Golub [Fri, 21 Dec 2018 11:18:49 +0000 (13:18 +0200)]
rbd_mirror: assert no requests on destroying InstanceWatcher

Signed-off-by: Mykola Golub <mgolub@suse.com>
6 years agoMerge PR #25630 into master
Sage Weil [Thu, 20 Dec 2018 12:48:41 +0000 (06:48 -0600)]
Merge PR #25630 into master

* refs/pull/25630/head:
osd/OSDMap: cancel mapping if target osd is out

Reviewed-by: Sage Weil <sage@redhat.com>
6 years agoMerge PR #25598 into master
Sage Weil [Thu, 20 Dec 2018 12:48:24 +0000 (06:48 -0600)]
Merge PR #25598 into master

* refs/pull/25598/head:
common: avoid bl::get_current_ptr()-driven ref counting in denc.h.

Reviewed-by: Sage Weil <sage@redhat.com>
6 years agoMerge pull request #25585 from SUSE/wip-remove-cython-subinterpreter-check
Kefu Chai [Thu, 20 Dec 2018 11:30:08 +0000 (19:30 +0800)]
Merge pull request #25585 from SUSE/wip-remove-cython-subinterpreter-check

cmake,deb,rpm: remove cython 0.29's subinterpreter check, re-enable build with cython 0.29+

Reviewed-by: Brad Hubbard <bhubbard@redhat.com>
Reviewed-by: Ricardo Dias <rdias@suse.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
6 years agoMerge PR #25622 into master
Sage Weil [Thu, 20 Dec 2018 03:23:26 +0000 (21:23 -0600)]
Merge PR #25622 into master

* refs/pull/25622/head:
Objecter.cc: make op resend logic more readable

Reviewed-by: Gregory Farnum <gfarnum@redhat.com>
Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
Reviewed-by: Greg Farnum <gfarnum@redhat.com>
6 years agoMerge PR #25360 into master
Sage Weil [Thu, 20 Dec 2018 03:22:35 +0000 (21:22 -0600)]
Merge PR #25360 into master

* refs/pull/25360/head:
qa/workunits/mon/pg_autoscaler: clean up pools afterwards
qa/suites/rados/singletone/all/pg-autoscaler: whitelist health warnings
qa/tasks/ceph: wait for splits/merges before final scrub
mon/OSDMonitor: be tidy with target_size_ratio and pre-nautilus code
mgr/pg_autoscaler: simplify conditions
qa/suites/rados: add simple pg-autoscaler test
qa/workunits/cephtool/test.sh: pg_autoscale_mode=off while testing pg_num etc
doc/rados/operations: document autoscaler and its health warnings
mgr/pg_autoscaler: add pg autoscaler module
pybind/mgr/mgr_util: move format_ helpers out of status module
mon/OSDMonitor: accept optional target_size_{bytes,ratio} to 'osd pool create'
mon/OSDMonitor: remove max_split_count configurable
osd/osd_types: pool_opts_t: int -> int64_t
osd/osd_types: pool_opts: fix whitespace
osd/osd_types: pool_opts_t: make encoding feature-dependent
mgr/devicehealth: pg_num_min 1 for device_health_metrics pool
mon/OSDMonitor: accept optional pg_num_min to 'osd pool create'
mon/OSDMonitor: apply osd_pool_default_pg_autoscale_mode to new pools
pybind/mgr/mgr_module: some accessors
mon/MgrMonitor: enable progress module by default
osd/osd_types: add pool pg_autoscale_mode, pg_num_min, target_size_{bytes,ratio} properties
osdc/Objecter: revise get_latest_version locking
os/memstore: ignore OP_COLL_SET_BITS
qa: generalise REQUIRE_MEMSTORE
mgr: drop GIL in get_config
mon: add 'size' arg to `osd pool create`
mon: use pg_num_target for checks during creation
mgr: revise locking in getter paths
common/options: add `mon_target_pg_per_osd`
mgr: expose OSDMap.pool_raw_used_rate

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Reviewed-by: Neha Ojha <nojha@redhat.com>
6 years agoqa/workunits/mon/pg_autoscaler: clean up pools afterwards 25360/head
Sage Weil [Wed, 19 Dec 2018 20:36:38 +0000 (14:36 -0600)]
qa/workunits/mon/pg_autoscaler: clean up pools afterwards

This avoids a huge pg merge from 100s to 4, which takes a long time and
makes the teuthology scrub cleanup time out.

Signed-off-by: Sage Weil <sage@redhat.com>
6 years agoqa/suites/rados/singletone/all/pg-autoscaler: whitelist health warnings
Sage Weil [Wed, 19 Dec 2018 13:16:27 +0000 (07:16 -0600)]
qa/suites/rados/singletone/all/pg-autoscaler: whitelist health warnings

Signed-off-by: Sage Weil <sage@redhat.com>
6 years agoqa/tasks/ceph: wait for splits/merges before final scrub
Sage Weil [Wed, 19 Dec 2018 13:14:30 +0000 (07:14 -0600)]
qa/tasks/ceph: wait for splits/merges before final scrub

Signed-off-by: Sage Weil <sage@redhat.com>
6 years agoMerge pull request #25056 from fghaas/doc-rgw-openstack
Yehuda Sadeh [Wed, 19 Dec 2018 20:28:55 +0000 (12:28 -0800)]
Merge pull request #25056 from fghaas/doc-rgw-openstack

doc: Improve OpenStack integration and multitenancy docs for radosgw

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
Reviewed-by: Abhishek Lekshmanan <abhishek@suse.com>
Reviewed-by: Kai Wagner <kwagner@suse.com>
Reviewed-by: Maxime Guyot <maxime@root314.com>
6 years agoMerge pull request #25610 from jtlayton/wip-orchestrator
jtlayton [Wed, 19 Dec 2018 19:11:46 +0000 (14:11 -0500)]
Merge pull request #25610 from jtlayton/wip-orchestrator

mgr/orchestrator: fix _list_services display

6 years agoMerge PR #25614 into master
Sage Weil [Wed, 19 Dec 2018 17:45:29 +0000 (11:45 -0600)]
Merge PR #25614 into master

* refs/pull/25614/head:
cls/rgw: update rgw_cls_usage_log_trim_op encode version

Reviewed-by: Sage Weil <sage@redhat.com>
6 years agoImprove OpenStack integration and multitenancy docs for radosgw 25056/head
Florian Haas [Mon, 12 Nov 2018 12:49:15 +0000 (13:49 +0100)]
Improve OpenStack integration and multitenancy docs for radosgw

Add explanatory information on:

* "rgw swift account in url" (including the Swift account in the Swift
  API url and Keystone endpoint)
* "rgw swift versioning enabled" (enabling Swift object versioning)
* "rgw s3 auth use keystone" (enabling S3 authentication against
  Keystone)
* "rgw keystone implicit tenants" (multi-tenancy via Keystone, including
  its implications for the Swift and S3 APIs)

Fixes: http://tracker.ceph.com/issues/36765
Signed-off-by: Florian Haas <florian@citynetwork.eu>
6 years agoMerge pull request #25629 from tchaikov/wip-37707
Kefu Chai [Wed, 19 Dec 2018 12:46:23 +0000 (20:46 +0800)]
Merge pull request #25629 from tchaikov/wip-37707

install-deps.sh: disable centos-sclo-rh-source

Reviewed-by: Sage Weil <sage@redhat.com>
6 years agoMerge pull request #25628 from rhcs-dashboard/masthead-changes
Lenz Grimmer [Wed, 19 Dec 2018 12:30:31 +0000 (13:30 +0100)]
Merge pull request #25628 from rhcs-dashboard/masthead-changes

mgr/dashboard: Changed background color of Masthead to brand gray

Reviewed-by: Ernesto Puerta <epuertat@redhat.com>
Reviewed-by: Volker Theile <vtheile@suse.com>
6 years agomgr/orchestrator: fix _list_services display 25610/head
Jeff Layton [Wed, 19 Dec 2018 11:12:02 +0000 (06:12 -0500)]
mgr/orchestrator: fix _list_services display

I see this error when using "ceph orchestrator service ls":

Error EINVAL: Traceback (most recent call last):
  File "/usr/lib64/ceph/mgr/orchestrator_cli/module.py", line 318, in handle_command
    return self._handle_command(inbuf, cmd)
  File "/usr/lib64/ceph/mgr/orchestrator_cli/module.py", line 330, in _handle_command
    return self._list_services(cmd)
  File "/usr/lib64/ceph/mgr/orchestrator_cli/module.py", line 165, in _list_services
    s.config_location))
AttributeError: 'ServiceDescription' object has no attribute 'config_location'

The config_locations field should be rados_config_location.

Signed-off-by: Jeff Layton <jlayton@redhat.com>
6 years agoosd/OSDMap: cancel mapping if target osd is out 25630/head
xie xingguo [Wed, 19 Dec 2018 09:01:23 +0000 (17:01 +0800)]
osd/OSDMap: cancel mapping if target osd is out

Suppose we have a bad pg_upmap_item, say:
```
pg_upmap_items 2.0 [0,8,5,4,6,12]
```
which maps osd.6 to osd.12 that is currently marked as out.

It turns out **maybe_remove_pg_upmaps** can not handle the
above case well because **_apply_upmap** will silently discard
any bad mappings whenver they try to target at some current
__out__ OSDs. So if you call **pg_to_raw_up(2.0)**, you'll probably
get something like: ```up [8,4,6] ``` (e.g., the last mapping pair 6->12
is simply ignored by **_apply_upmap**).

Make **clean_pg_upmaps** do the tidy-up check instead, since it
already has __bare__ access to those pg_upmaps and pg_upmap_items.

Fixes: http://tracker.ceph.com/issues/37501
Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
Signed-off-by: ningtao <ningtao@sangfor.com.cn>
6 years agoinstall-deps.sh: skip unavailable repos 25629/head
Kefu Chai [Wed, 19 Dec 2018 08:37:55 +0000 (16:37 +0800)]
install-deps.sh: skip unavailable repos

as centos-sclo-rh-source leads us to 404 at this moment. and we are not
using the source repo for building ceph. so we can just skip any
unavailable repo.

Fixes: http://tracker.ceph.com/issues/37707
Signed-off-by: Brad Hubbard <bhubbard@redhat.com>
6 years agomgr/dashboard: Changed background color of Masthead to brand gray 25628/head
Neha Gupta [Wed, 19 Dec 2018 08:21:00 +0000 (17:21 +0900)]
mgr/dashboard: Changed background color of Masthead to brand gray

Fixes: http://tracker.ceph.com/issues/35690
Signed-off-by: Neha Gupta <gnehapk@gmail.com>
6 years agomon/OSDMonitor: be tidy with target_size_ratio and pre-nautilus code
Sage Weil [Wed, 19 Dec 2018 03:41:09 +0000 (21:41 -0600)]
mon/OSDMonitor: be tidy with target_size_ratio and pre-nautilus code

Signed-off-by: Sage Weil <sage@redhat.com>
6 years agoObjecter.cc: make op resend logic more readable 25622/head
Song Shun [Wed, 19 Dec 2018 02:55:43 +0000 (10:55 +0800)]
Objecter.cc: make op resend logic more readable

  make op resend logic more readable
  according to discussion at https://github.com/ceph/ceph/pull/25243

Signed-off-by: Song Shun <song.shun3@zte.com.cn>
6 years agomgr/pg_autoscaler: simplify conditions
Sage Weil [Tue, 18 Dec 2018 22:22:39 +0000 (16:22 -0600)]
mgr/pg_autoscaler: simplify conditions

Signed-off-by: Sage Weil <sage@redhat.com>
6 years agoMerge PR #25470 into master
Sage Weil [Tue, 18 Dec 2018 22:21:27 +0000 (16:21 -0600)]
Merge PR #25470 into master

* refs/pull/25470/head:
mon: CephBool -> CephChoices in command map for pre-nautilus mons
mon/MonCommand: populate 'availability' field for compat

Reviewed-by: Gregory Farnum <gfarnum@redhat.com>
Reviewed-by: Greg Farnum <gfarnum@redhat.com>
6 years agoqa/suites/rados: add simple pg-autoscaler test
Sage Weil [Fri, 7 Dec 2018 23:46:59 +0000 (17:46 -0600)]
qa/suites/rados: add simple pg-autoscaler test

Signed-off-by: Sage Weil <sage@redhat.com>
6 years agoqa/workunits/cephtool/test.sh: pg_autoscale_mode=off while testing pg_num etc
Sage Weil [Thu, 6 Dec 2018 19:49:04 +0000 (13:49 -0600)]
qa/workunits/cephtool/test.sh: pg_autoscale_mode=off while testing pg_num etc

Signed-off-by: Sage Weil <sage@redhat.com>
6 years agodoc/rados/operations: document autoscaler and its health warnings
Sage Weil [Sun, 2 Dec 2018 22:43:43 +0000 (16:43 -0600)]
doc/rados/operations: document autoscaler and its health warnings

Signed-off-by: Sage Weil <sage@redhat.com>
6 years agomgr/pg_autoscaler: add pg autoscaler module
Sage Weil [Mon, 3 Dec 2018 22:11:59 +0000 (16:11 -0600)]
mgr/pg_autoscaler: add pg autoscaler module

Suggest or make changes to pool pg_num based on either current
utilization or administrator-provided target_size_{bytes,ratio}
expected utilization.

Signed-off-by: Sage Weil <sage@redhat.com>
6 years agopybind/mgr/mgr_util: move format_ helpers out of status module
Sage Weil [Fri, 30 Nov 2018 14:28:21 +0000 (08:28 -0600)]
pybind/mgr/mgr_util: move format_ helpers out of status module

Signed-off-by: Sage Weil <sage@redhat.com>
6 years agomon/OSDMonitor: accept optional target_size_{bytes,ratio} to 'osd pool create'
Sage Weil [Wed, 28 Nov 2018 22:55:49 +0000 (16:55 -0600)]
mon/OSDMonitor: accept optional target_size_{bytes,ratio} to 'osd pool create'

Signed-off-by: Sage Weil <sage@redhat.com>
6 years agomon/OSDMonitor: remove max_split_count configurable
Sage Weil [Wed, 28 Nov 2018 22:55:07 +0000 (16:55 -0600)]
mon/OSDMonitor: remove max_split_count configurable

This isn't really relevant or useful now that the mgr is throttling the
actual pg_num adjustment based on pg_num_target, % misplaced, etc.

Signed-off-by: Sage Weil <sage@redhat.com>
6 years agoosd/osd_types: pool_opts_t: int -> int64_t
Sage Weil [Wed, 28 Nov 2018 22:27:14 +0000 (16:27 -0600)]
osd/osd_types: pool_opts_t: int -> int64_t

Encode int32_t for pre-nautilus maps.

Fix up accessors.

Signed-off-by: Sage Weil <sage@redhat.com>
6 years agoosd/osd_types: pool_opts: fix whitespace
Sage Weil [Wed, 28 Nov 2018 22:15:06 +0000 (16:15 -0600)]
osd/osd_types: pool_opts: fix whitespace

Signed-off-by: Sage Weil <sage@redhat.com>
6 years agoosd/osd_types: pool_opts_t: make encoding feature-dependent
Sage Weil [Wed, 28 Nov 2018 22:11:25 +0000 (16:11 -0600)]
osd/osd_types: pool_opts_t: make encoding feature-dependent

No functional change (yet).

Signed-off-by: Sage Weil <sage@redhat.com>
6 years agomgr/devicehealth: pg_num_min 1 for device_health_metrics pool
Sage Weil [Wed, 28 Nov 2018 21:29:18 +0000 (15:29 -0600)]
mgr/devicehealth: pg_num_min 1 for device_health_metrics pool

Signed-off-by: Sage Weil <sage@redhat.com>
6 years agomon/OSDMonitor: accept optional pg_num_min to 'osd pool create'
Sage Weil [Wed, 28 Nov 2018 21:28:56 +0000 (15:28 -0600)]
mon/OSDMonitor: accept optional pg_num_min to 'osd pool create'

Signed-off-by: Sage Weil <sage@redhat.com>
6 years agomon/OSDMonitor: apply osd_pool_default_pg_autoscale_mode to new pools
Sage Weil [Wed, 28 Nov 2018 21:09:22 +0000 (15:09 -0600)]
mon/OSDMonitor: apply osd_pool_default_pg_autoscale_mode to new pools

Default to 'warn' for now.

Signed-off-by: Sage Weil <sage@redhat.com>
6 years agopybind/mgr/mgr_module: some accessors
John Spray [Wed, 28 Feb 2018 14:58:30 +0000 (14:58 +0000)]
pybind/mgr/mgr_module: some accessors

Signed-off-by: John Spray <john.spray@redhat.com>
6 years agomon/MgrMonitor: enable progress module by default
Sage Weil [Tue, 27 Nov 2018 19:31:44 +0000 (13:31 -0600)]
mon/MgrMonitor: enable progress module by default

Signed-off-by: Sage Weil <sage@redhat.com>
6 years agoosd/osd_types: add pool pg_autoscale_mode, pg_num_min, target_size_{bytes,ratio}...
Sage Weil [Mon, 26 Nov 2018 23:32:55 +0000 (17:32 -0600)]
osd/osd_types: add pool pg_autoscale_mode, pg_num_min, target_size_{bytes,ratio} properties

These will direct PG autoscaling.

Signed-off-by: Sage Weil <sage@redhat.com>
6 years agoosdc/Objecter: revise get_latest_version locking
John Spray [Wed, 14 Nov 2018 19:14:07 +0000 (14:14 -0500)]
osdc/Objecter: revise get_latest_version locking

Avoid holding Objecter lock while calling back
into completion.

Signed-off-by: John Spray <john.spray@redhat.com>
6 years agoos/memstore: ignore OP_COLL_SET_BITS
John Spray [Wed, 14 Nov 2018 19:13:39 +0000 (14:13 -0500)]
os/memstore: ignore OP_COLL_SET_BITS

...rather than crashing out on it.

Signed-off-by: John Spray <john.spray@redhat.com>
6 years agoqa: generalise REQUIRE_MEMSTORE
John Spray [Wed, 14 Nov 2018 14:10:56 +0000 (09:10 -0500)]
qa: generalise REQUIRE_MEMSTORE

Move it up into CephTestCase so that mgr tests can
use it too, and pick it up in vstart_runner.py so
that these tests will work neatly there.

Signed-off-by: John Spray <john.spray@redhat.com>
6 years agomgr: drop GIL in get_config
John Spray [Wed, 14 Nov 2018 11:19:14 +0000 (06:19 -0500)]
mgr: drop GIL in get_config

Signed-off-by: John Spray <john.spray@redhat.com>
6 years agomon: add 'size' arg to `osd pool create`
Sage Weil [Mon, 26 Nov 2018 20:55:06 +0000 (14:55 -0600)]
mon: add 'size' arg to `osd pool create`

Take advantage of keyword arguments to extend
what we can do in a single command during pool creation.

Signed-off-by: John Spray <john.spray@redhat.com>
6 years agomon: use pg_num_target for checks during creation
John Spray [Wed, 26 Sep 2018 16:45:31 +0000 (12:45 -0400)]
mon: use pg_num_target for checks during creation

This way, someone creating pools can proceed
as long as they've decreased the pg_num_target
of other pools, even if the adjustment hasn't
fully completed yet.

Signed-off-by: John Spray <john.spray@redhat.com>
6 years agomgr: revise locking in getter paths
Sage Weil [Mon, 26 Nov 2018 20:54:00 +0000 (14:54 -0600)]
mgr: revise locking in getter paths

There were many places where with_* methods
were blocking on locks while holding the GIL.

Signed-off-by: John Spray <john.spray@redhat.com>
6 years agoMerge PR #25613 into master
Sage Weil [Tue, 18 Dec 2018 18:21:25 +0000 (12:21 -0600)]
Merge PR #25613 into master

* refs/pull/25613/head:
qa/suites/upgrade/mimic-x: add missing .qa

Reviewed-by: João Eduardo Luís <joao@suse.de>
6 years agocommon/options: add `mon_target_pg_per_osd`
John Spray [Wed, 19 Sep 2018 22:09:41 +0000 (18:09 -0400)]
common/options: add `mon_target_pg_per_osd`

This is the partner to mon_max_pg_per_osd, where
this is a more conservative target for PG auto adjustment,
leaving some breathing room for situations where we
might temporarily exceed our target PG count (but not
want to exceed our maximum PG count)

Signed-off-by: John Spray <john.spray@redhat.com>
6 years agomgr: expose OSDMap.pool_raw_used_rate
John Spray [Tue, 3 Apr 2018 11:19:43 +0000 (12:19 +0100)]
mgr: expose OSDMap.pool_raw_used_rate

Signed-off-by: John Spray <john.spray@redhat.com>
6 years agoMerge PR #25190 into master
Sage Weil [Tue, 18 Dec 2018 16:47:52 +0000 (10:47 -0600)]
Merge PR #25190 into master

* refs/pull/25190/head:
mgr/prometheus: adjust to new 'df' fields
mon/Monitor: fix newline between df section
doc: update docs for new ceph df output
mon/PGMap: break down RAW usage by device class
mon/PGMap: tweak df headers
mon/PGMap: GLOBAL -> RAW STORAGE in 'df' output
mon/PGMap: dump_fs_stats -> dump_cluster_stats

Reviewed-by: Kefu Chai <kchai@redhat.com>
6 years agoMerge PR #25615 into master
Sage Weil [Tue, 18 Dec 2018 16:22:36 +0000 (10:22 -0600)]
Merge PR #25615 into master

* refs/pull/25615/head:
common/options: fix bad default

Reviewed-by: Neha Ojha <nojha@redhat.com>
6 years agocommon/options: fix bad default 25615/head
Sage Weil [Tue, 18 Dec 2018 15:16:29 +0000 (09:16 -0600)]
common/options: fix bad default

Got the fields wrong.

Fixes ff75a0b4f21eb14b11702ab2df82ed594f650fcd

Signed-off-by: Sage Weil <sage@redhat.com>
6 years agocls/rgw: update rgw_cls_usage_log_trim_op encode version 25614/head
Casey Bodley [Tue, 18 Dec 2018 14:33:27 +0000 (09:33 -0500)]
cls/rgw: update rgw_cls_usage_log_trim_op encode version

commit 7b17da691f3bee8118ac69a7419519017030a4c9 added a 'bucket' field
to this op without bumping the encode version, and is causing failures
on upgrade

Fixes: http://tracker.ceph.com/issues/37703
Signed-off-by: Casey Bodley <cbodley@redhat.com>
6 years agoqa/suites/upgrade/mimic-x: add missing .qa 25613/head
Sage Weil [Tue, 18 Dec 2018 14:17:31 +0000 (08:17 -0600)]
qa/suites/upgrade/mimic-x: add missing .qa

Signed-off-by: Sage Weil <sage@redhat.com>
6 years agoMerge PR #25596 into master
Sage Weil [Tue, 18 Dec 2018 13:24:03 +0000 (07:24 -0600)]
Merge PR #25596 into master

* refs/pull/25596/head:
qa/suites/upgrade: fix wrt librados3

Reviewed-by: Kefu Chai <kchai@redhat.com>
6 years agoMerge PR #25486 into master
Sage Weil [Tue, 18 Dec 2018 12:42:37 +0000 (06:42 -0600)]
Merge PR #25486 into master

* refs/pull/25486/head:
common: enhance debug macro

Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
6 years agoMerge PR #25456 into master
Sage Weil [Tue, 18 Dec 2018 12:42:02 +0000 (06:42 -0600)]
Merge PR #25456 into master

* refs/pull/25456/head:
common/options: set mon or mgr service on these options
common/options: more mon options
common/options: kill old mon_max_pgmap_epochs option
common/options: mon options
mon: remove dead option mon_pg_min_inactive
mon: mon_osd_pool_ec_fast_read -> osd_pool_default_ec_fast_read
common/options: document mon options
common/options: messenger options
common/options: document misc
common/options: compression options
common/options: document monitor log options

Reviewed-by: Lenz Grimmer <lgrimmer@suse.com>
6 years agoMerge pull request #25563 from rhcs-dashboard/bugfix-read-write-chart
Lenz Grimmer [Tue, 18 Dec 2018 12:16:53 +0000 (13:16 +0100)]
Merge pull request #25563 from rhcs-dashboard/bugfix-read-write-chart

mgr/dashboard: avoid blank content in Read/Write Card

Reviewed-by: Ernesto Puerta <epuertat@redhat.com>
6 years agoMerge PR #25110 into master
Patrick Donnelly [Tue, 18 Dec 2018 04:17:41 +0000 (20:17 -0800)]
Merge PR #25110 into master

* refs/pull/25110/head:
client: fix failure in quota size limitation when using samba

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
Reviewed-by: Zheng Yan <zyan@redhat.com>
6 years agoMerge PR #25174 into master
Patrick Donnelly [Tue, 18 Dec 2018 04:16:51 +0000 (20:16 -0800)]
Merge PR #25174 into master

* refs/pull/25174/head:
mds: fix bug filelock stuck at LOCK_XSYN leading client can't read data

Reviewed-by: Zheng Yan <zyan@redhat.com>
6 years agoMerge PR #25481 into master
Patrick Donnelly [Tue, 18 Dec 2018 04:12:24 +0000 (20:12 -0800)]
Merge PR #25481 into master

* refs/pull/25481/head:
mon: mark REMOVE_SNAPS messages as no_reply

Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
6 years agoMerge pull request #25548 from dzafman/wip-37653
Josh Durgin [Mon, 17 Dec 2018 21:36:36 +0000 (13:36 -0800)]
Merge pull request #25548 from dzafman/wip-37653

osd: fix shard_info_wrapper encode

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
6 years agocommon: avoid bl::get_current_ptr()-driven ref counting in denc.h. 25598/head
Radoslaw Zarzynski [Mon, 17 Dec 2018 20:06:38 +0000 (21:06 +0100)]
common: avoid bl::get_current_ptr()-driven ref counting in denc.h.

Signed-off-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
6 years agoqa/suites/upgrade: fix wrt librados3 25596/head
Sage Weil [Mon, 17 Dec 2018 19:25:34 +0000 (13:25 -0600)]
qa/suites/upgrade: fix wrt librados3

Signed-off-by: Sage Weil <sage@redhat.com>
6 years agoMerge pull request #25594 from alfredodeza/wip-rm37675
Alfredo Deza [Mon, 17 Dec 2018 19:08:41 +0000 (14:08 -0500)]
Merge pull request #25594 from alfredodeza/wip-rm37675

ceph-volume tests.functional fix typo when stopping osd.0 in filestore

Reviewed-by: Andrew Schoen <aschoen@redhat.com>
6 years agoceph-volume lvm.strategies remove unused import 25594/head
Alfredo Deza [Mon, 17 Dec 2018 18:34:58 +0000 (13:34 -0500)]
ceph-volume lvm.strategies remove unused import

Signed-off-by: Alfredo Deza <adeza@redhat.com>
6 years agoMerge pull request #25483 from dzafman/wip-hashinfo
David Zafman [Mon, 17 Dec 2018 17:38:42 +0000 (09:38 -0800)]
Merge pull request #25483 from dzafman/wip-hashinfo

ceph-objectstore-tool: Dump hashinfo

Reviewed-by: Neha Ojha <nojha@redhat.com>
6 years agoceph-volume tests.functional fix typo when stopping osd.0 in filestore
Alfredo Deza [Mon, 17 Dec 2018 17:35:27 +0000 (12:35 -0500)]
ceph-volume tests.functional fix typo when stopping osd.0 in filestore

Signed-off-by: Alfredo Deza <adeza@redhat.com>
6 years agoMerge pull request #25377 from aclamk/wip-kv-remove-validate
Kefu Chai [Mon, 17 Dec 2018 16:58:28 +0000 (00:58 +0800)]
Merge pull request #25377 from aclamk/wip-kv-remove-validate

common/KeyValueDB: Get rid of validate parameter.

Reviewed-by: Kefu Chai <kchai@redhat.com>
6 years agomgr/dashboard: avoid blank content in Read/Write Card 25563/head
alfonsomthd [Fri, 14 Dec 2018 11:43:57 +0000 (12:43 +0100)]
mgr/dashboard: avoid blank content in Read/Write Card

The card has to show either a chart or 'N/A', but no blank content.

Signed-off-by: Alfonso Martínez <almartin@redhat.com>
6 years agoMerge pull request #25489 from rhcs-dashboard/36740-add-info-to-pools-table
Lenz Grimmer [Mon, 17 Dec 2018 15:23:41 +0000 (16:23 +0100)]
Merge pull request #25489 from rhcs-dashboard/36740-add-info-to-pools-table

mgr/dashboard: Add info to Pools table

Reviewed-by: Laura Paduano <lpaduano@suse.com>
Reviewed-by: Stephan Müller <smueller@suse.com>
6 years agomon: CephBool -> CephChoices in command map for pre-nautilus mons 25470/head
Sage Weil [Mon, 10 Dec 2018 14:19:27 +0000 (08:19 -0600)]
mon: CephBool -> CephChoices in command map for pre-nautilus mons

If pre-nautilus mons are in quorum, send out a pre-nautilus compatible
set of commands.  Although nautilus mons can do this same translation on
the fly for pre-nautilus clients, pre-nautilus mons can't, so do it for
all mons.  This means the new CephBool behavior will only start working
once you upgrade all mons to nautilus.

Fixes: http://tracker.ceph.com/issues/37583
Signed-off-by: Sage Weil <sage@redhat.com>
6 years agoMerge PR #25405 into master
Sage Weil [Mon, 17 Dec 2018 15:00:34 +0000 (09:00 -0600)]
Merge PR #25405 into master

* refs/pull/25405/head:
msg/async: truly use first addr if multiple incoming addrs provided

Reviewed-by: Sage Weil <sage@redhat.com>
6 years agoMerge pull request #25421 from xiexingguo/wip-37507
Yuri Weinstein [Mon, 17 Dec 2018 14:44:20 +0000 (06:44 -0800)]
Merge pull request #25421 from xiexingguo/wip-37507

os/bluestore: add boundary check for cache-autotune related settings

6 years agoMerge pull request #25422 from rzarzynski/wip-bl-drop-at_buffer_headtail
Yuri Weinstein [Mon, 17 Dec 2018 14:43:00 +0000 (06:43 -0800)]
Merge pull request #25422 from rzarzynski/wip-bl-drop-at_buffer_headtail

common: drop at_buffer_{head,tail} from buffer::ptr.

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
6 years agoMerge pull request #25474 from tchaikov/wip-update-seastar
Kefu Chai [Mon, 17 Dec 2018 14:41:47 +0000 (22:41 +0800)]
Merge pull request #25474 from tchaikov/wip-update-seastar

cmake,seastar: pick up latest seastar

Reviewed-by: Casey Bodley <cbodley@redhat.com>
6 years agoMerge PR #25564 into master
Sage Weil [Mon, 17 Dec 2018 14:20:11 +0000 (08:20 -0600)]
Merge PR #25564 into master

* refs/pull/25564/head:
qa/rados/upgrade: align thrashing with upgrade suite, don't import/export pgs

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
6 years agoMerge pull request #25468 from rjfd/wip-orch-service-descriptor
Sebastian Wagner [Mon, 17 Dec 2018 13:49:17 +0000 (14:49 +0100)]
Merge pull request #25468 from rjfd/wip-orch-service-descriptor

mgr/orchestrator: added useful attributes to ServiceDescription

Reviewed-by: Jeff Layton <jlayton@redhat.com>
Reviewed-by: Sebastian Wagner <sebastian.wagner@suse.com>
6 years agomgr/dashboard: Add info to Pools table 25489/head
alfonsomthd [Fri, 14 Dec 2018 16:21:42 +0000 (17:21 +0100)]
mgr/dashboard: Add info to Pools table

- Column 'Placement Groups' renamed to 'Pg Status':
It shows PG states.
- Created 'CephSharedModule' for shared services within ceph module.
- Created PgCategoryService & PgCategory model (logic encapsulation).
- Color consistency: PG chart (landing page) and cell text color are similar.

Fixes: https://tracker.ceph.com/issues/36740
Signed-off-by: Alfonso Martínez <almartin@redhat.com>
6 years agofmt: remove fmt submodule 25474/head
Kefu Chai [Mon, 10 Dec 2018 14:57:21 +0000 (22:57 +0800)]
fmt: remove fmt submodule

since seastar contains fmt 5.2.1 as a submodule. there is no need
to have our own copy.

Signed-off-by: Kefu Chai <kchai@redhat.com>
6 years agocmake: update to accommodate seastar changes
Kefu Chai [Mon, 10 Dec 2018 14:55:08 +0000 (22:55 +0800)]
cmake: update to accommodate seastar changes

- seastar now works with fmt 5.2.1
- seastar now contains fmt as a submodule, so use it instead of
  using our own submodule
- seastar now create include directory under gen/include
- we use std::option<> when using seastar, so enable
  Seastar_STD_OPTIONAL_VARIANT_STRINGVIEW accordingly.

Signed-off-by: Kefu Chai <kchai@redhat.com>
6 years agoseastar: pickup latest seastar
Kefu Chai [Mon, 10 Dec 2018 14:59:28 +0000 (22:59 +0800)]
seastar: pickup latest seastar

we have quite a few hacks to get seastar's cmake to play with the distro
we support, and since seastar's cmake now is completely rewritten. we
can now use the upstream's cmake without having to maintain our patches.

Signed-off-by: Kefu Chai <kchai@redhat.com>
6 years agoMerge PR #25573 into master
Sage Weil [Mon, 17 Dec 2018 13:02:15 +0000 (07:02 -0600)]
Merge PR #25573 into master

* refs/pull/25573/head:
osd: kill obsolete comments

Reviewed-by: Sage Weil <sage@redhat.com>
6 years agoRevert "spec: fix cython package version to less than 0.29" 25585/head
Tim Serong [Mon, 17 Dec 2018 11:16:31 +0000 (22:16 +1100)]
Revert "spec: fix cython package version to less than 0.29"

This reverts commit 088fbff7df5f77168d3e06a1430d3628bd982d7b.

Signed-off-by: Tim Serong <tserong@suse.com>
6 years agocmake: remove cython 0.29's subinterpreter check
Tim Serong [Mon, 17 Dec 2018 11:01:25 +0000 (22:01 +1100)]
cmake: remove cython 0.29's subinterpreter check

cython 0.29 introduced a check which prevents multiple python
subinterpreters from loading the same module:

https://github.com/cython/cython/commit/7e27c7c

Unfortunately, this completely breaks ceph-mgr.  Until we can
figure out a better long term solution, this commit removes
cython's subinterpreter check, via some careful abuse of the
C preprocessor.

This works because when cython is invoked, it first generates
some C code, then compiles it.  We know it's going to generate
C code including:

  int __Pyx_check_single_interpreter(void) { ... }

and:

  if (__Pyx_check_single_interpreter())
      return NULL;

So, we can do the following:

  #define void0 dead_function(void)
  #define __Pyx_check_single_interpreter(ARG)=ARG ## 0

This replaces the call to __Pyx_check_single_interpreter()
with a literal 0, removing the subinterpreter check.

The void0 dead_function(void) thing is necessary because
the __Pyx_check_single_interpreter() macro also clobbers
that function definition, so we need to make sure it's
replaced with something that works as a function definition.

Fixes: https://tracker.ceph.com/issues/37472
Signed-off-by: Tim Serong <tserong@suse.com>
6 years agoMerge pull request #23362 from luhp/master
Kefu Chai [Mon, 17 Dec 2018 12:00:33 +0000 (20:00 +0800)]
Merge pull request #23362 from luhp/master

common: fix a racing in PerfCounters::perf_counter_data_any_d::read_avg

Reviewed-by: Kefu Chai <kchai@redhat.com>
6 years agomgr/orchestrator: added service status attributes to service descriptor 25468/head
Ricardo Dias [Mon, 17 Dec 2018 09:38:19 +0000 (09:38 +0000)]
mgr/orchestrator: added service status attributes to service descriptor

Signed-off-by: Ricardo Dias <rdias@suse.com>
6 years agoosd: kill obsolete comments 25573/head
xie xingguo [Mon, 17 Dec 2018 01:27:40 +0000 (09:27 +0800)]
osd: kill obsolete comments

I added these comments a few years ago.
Since bluestore can read things that aren't committed and
https://github.com/ceph/ceph/pull/20177 should have made it work for
filestore too, this shouldn't matter any more.

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
6 years agoMerge pull request #25488 from trociny/wip-osd-perf-query-rbd-regex
Jason Dillaman [Sun, 16 Dec 2018 17:50:13 +0000 (12:50 -0500)]
Merge pull request #25488 from trociny/wip-osd-perf-query-rbd-regex

mgr: improvements for dynamic osd perf counters

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
6 years agoMerge pull request #25509 from trociny/wip-37596
Jason Dillaman [Sun, 16 Dec 2018 17:49:35 +0000 (12:49 -0500)]
Merge pull request #25509 from trociny/wip-37596

librbd: disable image mirroring when moving to trash

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
6 years agoinclude/rados: s/requires/req/
Kefu Chai [Mon, 10 Dec 2018 14:58:20 +0000 (22:58 +0800)]
include/rados: s/requires/req/

requires is a keyword in C++20. which is close =)

Signed-off-by: Kefu Chai <kchai@redhat.com>
6 years agoMerge pull request #25462 from Songweibin/wip-rbd-invalid-pointer
Jason Dillaman [Sat, 15 Dec 2018 13:53:54 +0000 (08:53 -0500)]
Merge pull request #25462 from Songweibin/wip-rbd-invalid-pointer

 librbd: misc fix potential invalid pointer

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
6 years agoMerge pull request #25568 from cbodley/wip-rgw-pubsub-const-realm
Casey Bodley [Fri, 14 Dec 2018 20:01:43 +0000 (15:01 -0500)]
Merge pull request #25568 from cbodley/wip-rgw-pubsub-const-realm

rgw: fix compilation after pubsub conflict

Reviewed-by: Adam C. Emerson <aemerson@redhat.com>
6 years agorgw: pubsub uses const RGWRealm 25568/head
Casey Bodley [Fri, 14 Dec 2018 18:56:18 +0000 (13:56 -0500)]
rgw: pubsub uses const RGWRealm

Signed-off-by: Casey Bodley <cbodley@redhat.com>
6 years agorgw: remove unused get_tier_config()
Casey Bodley [Fri, 14 Dec 2018 18:55:56 +0000 (13:55 -0500)]
rgw: remove unused get_tier_config()

Signed-off-by: Casey Bodley <cbodley@redhat.com>
6 years agoMerge pull request #23298 from yehudasa/wip-rgw-ps-3
Matt Benjamin [Fri, 14 Dec 2018 17:52:39 +0000 (12:52 -0500)]
Merge pull request #23298 from yehudasa/wip-rgw-ps-3

rgw: pub-sub

6 years agoqa/workunits/rbd: add trash move/restore mirror test 25509/head
Mykola Golub [Fri, 14 Dec 2018 16:47:00 +0000 (16:47 +0000)]
qa/workunits/rbd: add trash move/restore mirror test

Signed-off-by: Mykola Golub <mgolub@suse.com>
6 years agolibrbd: disable image mirroring when moving to trash
Mykola Golub [Wed, 12 Dec 2018 15:42:49 +0000 (15:42 +0000)]
librbd: disable image mirroring when moving to trash

And enable when restoring if mirror pool mode set.

Fixes: https://tracker.ceph.com/issues/37596
Signed-off-by: Mykola Golub <mgolub@suse.com>
6 years agoMerge pull request #25357 from cbodley/wip-rgw-reshard-yield
Casey Bodley [Fri, 14 Dec 2018 16:00:20 +0000 (11:00 -0500)]
Merge pull request #25357 from cbodley/wip-rgw-reshard-yield

rgw: add optional_yield to block_while_resharding()

Reviewed-by: J. Eric Ivancich <ivancich@redhat.com>
6 years agomgr/osd_perf_query: generalize rbd regex for journal and data pool objects 25488/head
Mykola Golub [Tue, 27 Nov 2018 09:42:52 +0000 (11:42 +0200)]
mgr/osd_perf_query: generalize rbd regex for journal and data pool objects

And process collected stats accordingly.

Signed-off-by: Mykola Golub <mgolub@suse.com>