]> git.apps.os.sepia.ceph.com Git - ceph.git/log
ceph.git
6 years agoMerge PR #27197 into nautilus
Sage Weil [Sat, 30 Mar 2019 13:36:14 +0000 (08:36 -0500)]
Merge PR #27197 into nautilus

* refs/pull/27197/head:
msg: default to debug_ms=0

Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
6 years agoMerge PR #27139 into nautilus
Sage Weil [Sat, 30 Mar 2019 13:35:23 +0000 (08:35 -0500)]
Merge PR #27139 into nautilus

* refs/pull/27139/head:
os/bluestore: unconditionally cap chunks returned by allocator to 2^31
os/bluestore: start using 64-bit intervals for bitmap allocator
os/bluestore: make bluestore interval base template.
tests/fastbmap_alloc: UT to reproduce 4G allocation bug
os/bluestore: os/bluestore: implement dump for bitmap allocator
os/bluestore be more tolerant to lack of space for bluefs.

Reviewed-by: Sage Weil <sage@redhat.com>
6 years agoMerge pull request #27161 from cbodley/wip-qa-rgw-nautilus
Casey Bodley [Thu, 28 Mar 2019 19:35:36 +0000 (15:35 -0400)]
Merge pull request #27161 from cbodley/wip-qa-rgw-nautilus

nautilus: qa/rgw: point test repos at ceph-nautilus branch

Reviewed-by: Yuri Weinstein <yweins@redhat.com>
6 years agoMerge pull request #27189 from smithfarm/wip-38903-nautilus
Nathan Cutler [Thu, 28 Mar 2019 11:06:41 +0000 (12:06 +0100)]
Merge pull request #27189 from smithfarm/wip-38903-nautilus

nautilus: doc: Minor rados related documentation fixes

Reviewed-by: Neha Ojha <nojha@redhat.com>
6 years agoMerge pull request #27219 from LenzGr/wip-38871-nautilus
Ernesto Puerta [Thu, 28 Mar 2019 10:07:07 +0000 (11:07 +0100)]
Merge pull request #27219 from LenzGr/wip-38871-nautilus

nautilus: mgr/dashboard: dashboard giving 401 unauthorized

6 years agoMerge pull request #27171 from yuriw/wip-yuriw-38819-nautilus_2
Yuri Weinstein [Wed, 27 Mar 2019 01:06:01 +0000 (18:06 -0700)]
Merge pull request #27171 from yuriw/wip-yuriw-38819-nautilus_2

qa/tests: initial checkin for nautilus-p2p

6 years agoqa/tests: initial checkin for nautilus-p2p 27171/head
Yuri Weinstein [Mon, 25 Mar 2019 20:31:13 +0000 (13:31 -0700)]
qa/tests: initial checkin for nautilus-p2p
symlinked `objectstore` folder

Signed-off-by: Yuri Weinstein <yweinste@redhat.com>
6 years agomsg: default to debug_ms=0 27197/head
Sage Weil [Wed, 13 Mar 2019 18:53:52 +0000 (13:53 -0500)]
msg: default to debug_ms=0

These have a measurable impact on performance and have a limited (although
not non-existent!) track record of providing debugging value.

Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit 3ebd59b872e3a77430b93bb51f9232868975b3bb)

6 years agomgr/dashboard: auth ttl expired error 27219/head
ming416 [Fri, 22 Mar 2019 08:56:10 +0000 (16:56 +0800)]
mgr/dashboard: auth ttl expired error

Fixes: https://tracker.ceph.com/issues/38428
Signed-off-by: ming416 <geenature@163.com>
(cherry picked from commit 780bdf541ad7230347f2197651c616c217b1ed95)

6 years agodoc: Fix the pg states and auto repair config options 27189/head
David Zafman [Fri, 22 Mar 2019 23:47:23 +0000 (16:47 -0700)]
doc: Fix the pg states and auto repair config options

Fixes: http://tracker.ceph.com/issues/38896
Signed-off-by: David Zafman <dzafman@redhat.com>
(cherry picked from commit 9fd4b062f1a22de61c37457a32d0d7cefc0e8fcf)

6 years agoMerge PR #27168 into nautilus
Sage Weil [Mon, 25 Mar 2019 18:47:47 +0000 (13:47 -0500)]
Merge PR #27168 into nautilus

* refs/pull/27168/head:
mon/Monitor.cc: print min_mon_release correctly

Reviewed-by: Sage Weil <sage@redhat.com>
6 years agomon/Monitor.cc: print min_mon_release correctly 27168/head
Neha Ojha [Fri, 22 Mar 2019 01:43:14 +0000 (18:43 -0700)]
mon/Monitor.cc: print min_mon_release correctly

Signed-off-by: Neha Ojha <nojha@redhat.com>
(cherry picked from commit 21ca604a22eacbf5e1dbeffffa0dd38f84647505)

6 years agoMerge PR #27158 into nautilus
Sage Weil [Mon, 25 Mar 2019 18:10:27 +0000 (13:10 -0500)]
Merge PR #27158 into nautilus

* refs/pull/27158/head:
common/blkdev: get_device_id: behave if model is lvm and id_model_enc isn't there

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
6 years agoqa/rgw: point test repos at ceph-nautilus branch 27161/head
Casey Bodley [Mon, 25 Mar 2019 15:11:16 +0000 (11:11 -0400)]
qa/rgw: point test repos at ceph-nautilus branch

Signed-off-by: Casey Bodley <cbodley@redhat.com>
6 years agocommon/blkdev: get_device_id: behave if model is lvm and id_model_enc isn't there 27158/head
Sage Weil [Mon, 25 Mar 2019 12:10:21 +0000 (07:10 -0500)]
common/blkdev: get_device_id: behave if model is lvm and id_model_enc isn't there

If that happens, leave ID_MODEL blank and we'll fall back to something
else, like ID_SERIAL (which is present in each case I've seen this).

Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit ec4434a65f2248fb823ccfb5d2e150bb4da71da1)

6 years agoMerge pull request #27116 from liewegas/wip-38839-nautilus
Kefu Chai [Sun, 24 Mar 2019 15:36:56 +0000 (23:36 +0800)]
Merge pull request #27116 from liewegas/wip-38839-nautilus

nautilus: mon/MgrStatMonitor: ensure only one copy of initial service map

Reviewed-by: Kefu Chai <kchai@redhat.com>
6 years agoMerge PR #26972 into nautilus
Sage Weil [Sun, 24 Mar 2019 15:30:33 +0000 (10:30 -0500)]
Merge PR #26972 into nautilus

* refs/pull/26972/head:
rgw: ldap: fix LDAPAuthEngine::init() when uri !empty()

Reviewed-by: Casey Bodley <cbodley@redhat.com>
6 years agoMerge PR #27060 into nautilus
Sage Weil [Sun, 24 Mar 2019 15:30:12 +0000 (10:30 -0500)]
Merge PR #27060 into nautilus

* refs/pull/27060/head:
mon/OSDMonitor: allow 'osd pool set pgp_num_actual'

Reviewed-by: Neha Ojha <nojha@redhat.com>
6 years agoMerge PR #27095 into nautilus
Sage Weil [Sun, 24 Mar 2019 15:29:52 +0000 (10:29 -0500)]
Merge PR #27095 into nautilus

* refs/pull/27095/head:
mgr/orchestrator: Add error handling to interface

6 years agoMerge PR #27096 into nautilus
Sage Weil [Sun, 24 Mar 2019 15:29:34 +0000 (10:29 -0500)]
Merge PR #27096 into nautilus

* refs/pull/27096/head:
common/blkdev: handle devices with ID_MODEL as "LVM PV ..." but valid ID_MODEL_ENC

Reviewed-by: Neha Ojha <nojha@redhat.com>
6 years agoMerge PR #27117 into nautilus
Sage Weil [Sun, 24 Mar 2019 15:28:59 +0000 (10:28 -0500)]
Merge PR #27117 into nautilus

* refs/pull/27117/head:
osd/OSDMap: add 'zone' to default crush map

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
6 years agoMerge PR #27119 into nautilus
Sage Weil [Sun, 24 Mar 2019 15:28:42 +0000 (10:28 -0500)]
Merge PR #27119 into nautilus

* refs/pull/27119/head:
crush/CrushWrapper: make update_choose_args less chatty
qa/standalone/crush/crush-choose-args: add weight-set tests
qa/standalone/crush/crush-choose-args: fix test
crush/CrushWrapper: move_item: do not clobber weight-set weights
crush/CrushWrapper: create_or_move: make weight-set update optional
mon/OSDMonitor: apply osd_crush_update_weight_set for reweight, create-or-move
crush/CrushWrapper: insert_item: make weight-set update optional (for leaves only)
crush/CrushWrapper: use adjust_item_weight_in_bucket for subtree reweight
crush/CrushWrapper: fix detach_bucket, remove_item[_under] vs weight-sets
crush/CrushWrapper: add update_weight_sets arg to adjust_item_weight_*
crush/CrushWrapper: refactor adjust_weight_* into per-bucket helper
crush/CrushWrapper: pass cct down into more places

Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
6 years agoos/bluestore: unconditionally cap chunks returned by allocator to 2^31 27139/head
Igor Fedotov [Wed, 20 Mar 2019 18:10:04 +0000 (21:10 +0300)]
os/bluestore: unconditionally cap chunks returned by allocator to 2^31

Signed-off-by: Igor Fedotov <ifedotov@suse.com>
(cherry picked from commit 1337443e37ffbfcaf494bdb2bb80db4cf41b97f9)

6 years agoos/bluestore: start using 64-bit intervals for bitmap allocator
Igor Fedotov [Wed, 13 Mar 2019 16:09:40 +0000 (19:09 +0300)]
os/bluestore: start using 64-bit intervals for bitmap allocator

This helps to avoid 4Gb+ values wrapping which resulted in
allocation failures.

Fixes: https://tracker.ceph.com/issues/38761
Signed-off-by: Igor Fedotov <ifedotov@suse.com>
(cherry picked from commit d1466963a60ed2345a6fc159071ec09ce422b656)

6 years agoos/bluestore: make bluestore interval base template.
Igor Fedotov [Wed, 13 Mar 2019 15:51:46 +0000 (18:51 +0300)]
os/bluestore: make bluestore interval base template.

We might need intervals at BlueStore with both 32-bit and 64-bit
lengths. Having base template eliminates the need for copy/paste

Signed-off-by: Igor Fedotov <ifedotov@suse.com>
(cherry picked from commit f775d4227fb9432840c795115669766565c5e718)

6 years agotests/fastbmap_alloc: UT to reproduce 4G allocation bug
Igor Fedotov [Wed, 13 Mar 2019 14:02:13 +0000 (17:02 +0300)]
tests/fastbmap_alloc: UT to reproduce 4G allocation bug

Signed-off-by: Igor Fedotov <ifedotov@suse.com>
(cherry picked from commit ed8a93ba387458961444913a8695f538595efacf)

6 years agoos/bluestore: os/bluestore: implement dump for bitmap allocator
Igor Fedotov [Tue, 12 Mar 2019 11:04:17 +0000 (14:04 +0300)]
os/bluestore: os/bluestore: implement dump for bitmap allocator

Signed-off-by: Igor Fedotov <ifedotov@suse.com>
(cherry picked from commit 80310d98a7456afdb2002eaf2891853ea21eaf68)

6 years agoos/bluestore be more tolerant to lack of space for bluefs.
Igor Fedotov [Mon, 11 Mar 2019 16:13:19 +0000 (19:13 +0300)]
os/bluestore be more tolerant to lack of space for bluefs.

'gift' space is just advisory for allocation, part of it actually requested
from BlueFS is mandatory only. Hence do not fail when unable to allocate
the whole space.

Fixes: https://tracker.ceph.com/issues/38760
Signed-off-by: Igor Fedotov <ifedotov@suse.com>
(cherry picked from commit dbc1a78787baacd7bbc98ff8bbb72e609def2ad6)

6 years agocrush/CrushWrapper: make update_choose_args less chatty 27119/head
Sage Weil [Fri, 15 Mar 2019 12:10:41 +0000 (07:10 -0500)]
crush/CrushWrapper: make update_choose_args less chatty

These were now exposed due to cct being passed down to more
places.

Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit ef8b347fd0b74ca2da6d7c5cc70fa584fd3d36dc)

6 years agoqa/standalone/crush/crush-choose-args: add weight-set tests
Sage Weil [Thu, 14 Mar 2019 19:19:47 +0000 (14:19 -0500)]
qa/standalone/crush/crush-choose-args: add weight-set tests

Verify we have the expected behavior for creates and moves that
maintain bucket summation, both with and without the
osd_crush_update_weight_set option enabled.

Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit 4c741c109df2eb8c35b7b895ba88b1d8e882a4e2)

6 years agoqa/standalone/crush/crush-choose-args: fix test
Sage Weil [Thu, 14 Mar 2019 18:36:31 +0000 (13:36 -0500)]
qa/standalone/crush/crush-choose-args: fix test

- Make the initial weight-set actually consistent (summing)
- Fix the intermediate state so that it reflects a correctly
  maintained summation.

Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit f20c736e990f967804768a3e75a05c077a591595)

6 years agocrush/CrushWrapper: move_item: do not clobber weight-set weights
Sage Weil [Thu, 14 Mar 2019 18:07:44 +0000 (13:07 -0500)]
crush/CrushWrapper: move_item: do not clobber weight-set weights

Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit c4eefb0b66be57bddbc888ed2b5d2e2a19452b37)

6 years agocrush/CrushWrapper: create_or_move: make weight-set update optional
Sage Weil [Thu, 14 Mar 2019 18:07:29 +0000 (13:07 -0500)]
crush/CrushWrapper: create_or_move: make weight-set update optional

Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit 07bb2020376294067d3df1423c2a3e835870f9f3)

6 years agomon/OSDMonitor: apply osd_crush_update_weight_set for reweight, create-or-move
Sage Weil [Thu, 14 Mar 2019 16:29:10 +0000 (11:29 -0500)]
mon/OSDMonitor: apply osd_crush_update_weight_set for reweight, create-or-move

Since CrushWrapper no longer applies this setting at a low level,
where it can't tell what the real intention is, we instead apply
it at the top command level where we do.

Specifically, we use it to control whether the weight-set weights
are set for the commands

 osd crush reweight
 osd crush reweight-subtree
 osd crush move
 osd crush create-or-move

Note that this (indirectly) affects the way weight-set weights
are initialized for newly created OSDs, since those are added to
the crush map via the 'osd crush create-or-move' command.

Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit 50e4b818eac7d67e3307fdde90420334ecad512e)

6 years agocrush/CrushWrapper: insert_item: make weight-set update optional (for leaves only)
Sage Weil [Thu, 14 Mar 2019 17:40:23 +0000 (12:40 -0500)]
crush/CrushWrapper: insert_item: make weight-set update optional (for leaves only)

If it is a bucket, we should sum the weight-set values to weight
the bucket in the subtrees.  It only makes sense to reset the
weight-set weights for leaf items.

Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit 5579f388af18c55d03cbf32c244488ee38169fc2)

6 years agocrush/CrushWrapper: use adjust_item_weight_in_bucket for subtree reweight
Sage Weil [Thu, 14 Mar 2019 17:38:26 +0000 (12:38 -0500)]
crush/CrushWrapper: use adjust_item_weight_in_bucket for subtree reweight

This avoids clobbering weight-sets when you reweight, if the
adjust_weight_sets=false.

Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit 46b72611f3e59ec24d944ba907ece4659180c0c5)

6 years agocrush/CrushWrapper: fix detach_bucket, remove_item[_under] vs weight-sets
Sage Weil [Thu, 14 Mar 2019 17:37:49 +0000 (12:37 -0500)]
crush/CrushWrapper: fix detach_bucket, remove_item[_under] vs weight-sets

Fix detach_bucket and remove_item[_under] so that they do not
clobber the buckets' weight-set summations.

Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit c5d75e3426499fcf4660e414c48a741b18cb68a3)

6 years agocrush/CrushWrapper: add update_weight_sets arg to adjust_item_weight_*
Sage Weil [Thu, 14 Mar 2019 16:29:10 +0000 (11:29 -0500)]
crush/CrushWrapper: add update_weight_sets arg to adjust_item_weight_*

- Make it optional whether the weight-set weights are adjusted to
  match the weight.

- Fix the adjustment of the parent bucket(s) so that the
  summations in weight-sets are correctly maintained.  Prior to
  this change, if I adjust any weight, all parent buckets'
  weight-set weights are reset to the bucket's primary weight.

Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit d2f1440d7ae4635eaff8c75d38db454ab55f9d22)

6 years agocrush/CrushWrapper: refactor adjust_weight_* into per-bucket helper
Sage Weil [Wed, 13 Mar 2019 21:22:00 +0000 (16:22 -0500)]
crush/CrushWrapper: refactor adjust_weight_* into per-bucket helper

This unifies the regular and _in_loc variants.

Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit 937da65265e81090ec6e4ae8b14184c4f175564a)

6 years agocrush/CrushWrapper: pass cct down into more places
Sage Weil [Fri, 8 Mar 2019 23:23:29 +0000 (17:23 -0600)]
crush/CrushWrapper: pass cct down into more places

Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit 96968487b48c38eb396ff97df4e78cb1df5212ff)

6 years agocommon/blkdev: handle devices with ID_MODEL as "LVM PV ..." but valid ID_MODEL_ENC 27096/head
Sage Weil [Fri, 15 Mar 2019 22:12:34 +0000 (17:12 -0500)]
common/blkdev: handle devices with ID_MODEL as "LVM PV ..." but valid ID_MODEL_ENC

Some devices appear like so:

E: ID_MODEL=LVM PV LUClYG-Oyte-jcM6-npfZ-ncsl-ycL0-bkOH0m on /dev/sdn
E: ID_MODEL_ENC=WDC\x20WDS200T2B0A-00SM50\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20
E: ID_SERIAL=WDC_WDS200T2B0A-00SM50_183503800168
E: ID_SERIAL_SHORT=183503800168

To avoid upsetting our prioritization, defer to ID_MODEL_ENC over ID_MODEL
if ID_MODEL has "LVM PV" in it (as opposed to just using ID_SERIAL).

Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit de565dd2420f2d2a4a4f6fd12b0bc48af87a4e7d)

6 years agoosd/OSDMap: add 'zone' to default crush map 27117/head
Sage Weil [Wed, 20 Mar 2019 09:29:23 +0000 (04:29 -0500)]
osd/OSDMap: add 'zone' to default crush map

This lets use have a root -> region -> zone -> host hierarchy, like you
will see in the public cloud.

Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit 39f4e77d13377763a579f2afcd9341c00ca5b319)

6 years agomon/MgrStatMonitor: ensure only one copy of initial service map 27116/head
Sage Weil [Thu, 21 Mar 2019 16:58:29 +0000 (11:58 -0500)]
mon/MgrStatMonitor: ensure only one copy of initial service map

It's possible for create_pending to be called multiple times.

Fixes: http://tracker.ceph.com/issues/38839
Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit 204a8deacd2068989bd52eb130f4aac434b45f35)

6 years agoMerge pull request #27080 from dillaman/wip-38834
Mykola Golub [Thu, 21 Mar 2019 14:54:01 +0000 (16:54 +0200)]
Merge pull request #27080 from dillaman/wip-38834

nautilus: librbd: ignore -EOPNOTSUPP errors when retrieving image group membership

Reviewed-by: Mykola Golub <mgolub@suse.com>
6 years agomgr/orchestrator: Add error handling to interface 27095/head
Sebastian Wagner [Wed, 13 Feb 2019 14:01:25 +0000 (15:01 +0100)]
mgr/orchestrator: Add error handling to interface

Also:

* Small test_orchestrator refactorization
* Improved Docstring in MgrModule.remote
* Added `raise_if_exception` that raises Exceptions
* Added `OrchestratorError` and `OrchestratorValidationError`
* `_orchestrator_wait` no longer raises anything
* `volumes` model also calls `raise_if_exception`

Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
(cherry picked from commit 61d53ed70e2deafd6bebdf0a8e569cdc46b89e97)

6 years agolibrbd: ignore -EOPNOTSUPP errors when retrieving image group membership 27080/head
Jason Dillaman [Wed, 20 Mar 2019 18:40:50 +0000 (14:40 -0400)]
librbd: ignore -EOPNOTSUPP errors when retrieving image group membership

The Luminous release did not support adding images to a group (it only
included the bare-minimum support for creating groups). Commit f76df32666b
incorrectly dropped support for ignoring this possible failure. This
prevents Nautilus-release clients from opening images contained within
a Luminous-release cluster.

Fixes: http://tracker.ceph.com/issues/38834
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
6 years agomon/OSDMonitor: allow 'osd pool set pgp_num_actual' 27060/head
Sage Weil [Sat, 16 Mar 2019 20:06:00 +0000 (15:06 -0500)]
mon/OSDMonitor: allow 'osd pool set pgp_num_actual'

Normally we let the mgr control pgp_num_actual for us in a nice, safe, controlled
way.  However, it is very conservative, and only makes changes if all PGs are healthy.
There are situations where the user wants to be move aggressive than this.

For example, if you have a pool with many PGs (say, 4096) and set pg_num_target to a
small number like 4, the mgr will adjust pgp_num way down.  This can lead to an OSD
hitting max_pgs_per_osd.  That prevents the PGs from being active+clean, however,
which prevents the mgr adjusting pgp_num back up even if the user sets the target to
a larger value.

This patch lets the user directly adjust pgp_num_actual.  Note that we still do
not expose access to pg_num_actual, since there are much stricter conditions that
must be true in order to safely make downward adjustments.

Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit 0c6840e219cda053e137a8de8dd04dd348b6ed45)

6 years ago14.2.0 v14.2.0
Jenkins Build Slave User [Mon, 18 Mar 2019 10:08:29 +0000 (10:08 +0000)]
14.2.0

6 years agoMerge PR #26956 into nautilus
Sage Weil [Mon, 18 Mar 2019 04:09:34 +0000 (23:09 -0500)]
Merge PR #26956 into nautilus

* refs/pull/26956/head:
doc/releases/nautilus: more detail around ceph-volume step

Reviewed-by: Alfredo Deza <adeza@redhat.com>
6 years agoMerge pull request #27011 from liewegas/wip-redirect-mimic
Kefu Chai [Sun, 17 Mar 2019 17:22:44 +0000 (01:22 +0800)]
Merge pull request #27011 from liewegas/wip-redirect-mimic

qa/suites/upgrade/mimic-x/parallel: enable all classes

Reviewed-by: Myoungwon Oh <omwmw@sk.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
6 years agoMerge pull request #27018 from liewegas/wip-38294
Kefu Chai [Sun, 17 Mar 2019 17:22:01 +0000 (01:22 +0800)]
Merge pull request #27018 from liewegas/wip-38294

qa/suites/upgrade/luminous-x: disable c-o-t import/export tests between versions

Reviewed-by: Kefu Chai <kchai@redhat.com>
6 years agoMerge PR #26960 into nautilus
Sage Weil [Sun, 17 Mar 2019 13:32:11 +0000 (08:32 -0500)]
Merge PR #26960 into nautilus

* refs/pull/26960/head:
ceph_release: nautilus is will be 'stable' for v14.2.0

Reviewed-by: Alfredo Deza <adeza@redhat.com>
Reviewed-by: Abhishek Lekshmanan <abhishek.lekshmanan@gmail.com>
6 years agoqa/suitse/upgrade/luminous-x/stress-split-erasure-code: disable c-o-t tests 27018/head
Sage Weil [Sun, 17 Mar 2019 09:59:36 +0000 (04:59 -0500)]
qa/suitse/upgrade/luminous-x/stress-split-erasure-code: disable c-o-t tests

The stress-split thrasher already had this off, but the ec variant did
not.  We don't support ceph-objectstore-tool exports/imports between major
versions.

Fixes: http://tracker.ceph.com/issues/38294
Signed-off-by: Sage Weil <sage@redhat.com>
6 years agoceph_test_rados_api_tier_cxx: remove mimic checks 27011/head
Sage Weil [Sat, 16 Mar 2019 22:12:01 +0000 (17:12 -0500)]
ceph_test_rados_api_tier_cxx: remove mimic checks

These checks don't work when the cluster is newer than mimic.

Instead, let's just try not to run this test on a pre-mimic cluster.

Signed-off-by: Sage Weil <sage@redhat.com>
6 years agoMerge PR #27002 into nautilus
Sage Weil [Sat, 16 Mar 2019 20:47:29 +0000 (15:47 -0500)]
Merge PR #27002 into nautilus

* refs/pull/27002/head:
mgr/telemetry: check for errors when sending report

Reviewed-by: Sage Weil <sage@redhat.com>
6 years agoqa/suites/upgrade/mimic-x/parallel: enable all classes
Sage Weil [Sat, 16 Mar 2019 20:27:29 +0000 (15:27 -0500)]
qa/suites/upgrade/mimic-x/parallel: enable all classes

This fixes the redirect tiering tests, which need the 'cas' class.

Signed-off-by: Sage Weil <sage@redhat.com>
6 years agoceph_test_rados_api_tier_cxx: remove luminous check
Sage Weil [Sat, 16 Mar 2019 20:21:37 +0000 (15:21 -0500)]
ceph_test_rados_api_tier_cxx: remove luminous check

It was a flawed check, since it would fail for anything newer than
luminous.  And in any case, we don't need it anymore.

Signed-off-by: Sage Weil <sage@redhat.com>
6 years agoMerge PR #27000 into nautilus
Sage Weil [Sat, 16 Mar 2019 18:03:54 +0000 (13:03 -0500)]
Merge PR #27000 into nautilus

* refs/pull/27000/head:
osd: stringify as int

Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
Reviewed-by: Neha Ojha <nojha@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
6 years agomgr/telemetry: check for errors when sending report 27002/head
Dan Mick [Sat, 16 Mar 2019 03:05:46 +0000 (20:05 -0700)]
mgr/telemetry: check for errors when sending report

There was no error checking, and the server has been failing for
some time, but no one noticed.  Oops.

Signed-off-by: Dan Mick <dan.mick@redhat.com>
6 years agoMerge PR #26563 into nautilus
Sage Weil [Fri, 15 Mar 2019 21:49:02 +0000 (16:49 -0500)]
Merge PR #26563 into nautilus

* refs/pull/26563/head:
doc/ceph-volume/lvm/batch: fix typos

Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Sage Weil <sage@redhat.com>
6 years agoMerge PR #26994 into nautilus
Sage Weil [Fri, 15 Mar 2019 21:48:27 +0000 (16:48 -0500)]
Merge PR #26994 into nautilus

* refs/pull/26994/head:
doc: add scrub link for nautilus release notes

Reviewed-by: Sage Weil <sage@redhat.com>
6 years agoMerge PR #26822 into nautilus
Sage Weil [Fri, 15 Mar 2019 21:45:53 +0000 (16:45 -0500)]
Merge PR #26822 into nautilus

* refs/pull/26822/head:
osd/PG: adjust pg history on fabricated merge target if necessary

Reviewed-by: Neha Ojha <nojha@redhat.com>
6 years agoMerge PR #26986 into nautilus
Sage Weil [Fri, 15 Mar 2019 21:43:33 +0000 (16:43 -0500)]
Merge PR #26986 into nautilus

* refs/pull/26986/head:
mgr: Make 3rd parameter optional in ceph_get_module_option

Reviewed-by: Ricardo Dias <rdias@suse.com>
Reviewed-by: Sage Weil <sage@redhat.com>
6 years agoMerge PR #26949 into nautilus
Sage Weil [Fri, 15 Mar 2019 21:43:17 +0000 (16:43 -0500)]
Merge PR #26949 into nautilus

* refs/pull/26949/head:
mgr/dashboard: add test_module_selftest to API tests

Reviewed-by: Volker Theile <vtheile@suse.com>
6 years agoosd: stringify as int 27000/head
Sage Weil [Fri, 15 Mar 2019 21:41:53 +0000 (16:41 -0500)]
osd: stringify as int

Otherwise we get

$ hexdump -C require_osd_release
00000000  0e 0a                                             |..|
00000002

Signed-off-by: Sage Weil <sage@redhat.com>
6 years agodoc/releases/nautilus: more detail around ceph-volume step 26956/head
Sage Weil [Thu, 14 Mar 2019 19:43:08 +0000 (14:43 -0500)]
doc/releases/nautilus: more detail around ceph-volume step

Recommend host reboots to verify ceph-volume adoption worked.

Signed-off-by: Sage Weil <sage@redhat.com>
6 years agoMerge pull request #26997 from cbodley/wip-38008
Casey Bodley [Fri, 15 Mar 2019 21:06:34 +0000 (17:06 -0400)]
Merge pull request #26997 from cbodley/wip-38008

doc/rgw: document placement targets and storage classes

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
6 years agoMerge PR #26995 into nautilus
Sage Weil [Fri, 15 Mar 2019 20:29:04 +0000 (15:29 -0500)]
Merge PR #26995 into nautilus

* refs/pull/26995/head:
osd/PG: fix pg merge check for rc clusters

Reviewed-by: Neha Ojha <nojha@redhat.com>
6 years agodoc/rgw: document storage class configuration 26997/head
Casey Bodley [Fri, 15 Mar 2019 18:29:43 +0000 (14:29 -0400)]
doc/rgw: document storage class configuration

Fixes: http://tracker.ceph.com/issues/38008
Signed-off-by: Casey Bodley <cbodley@redhat.com>
6 years agodoc/rgw: document placement target configuration
Casey Bodley [Fri, 15 Mar 2019 18:35:13 +0000 (14:35 -0400)]
doc/rgw: document placement target configuration

Fixes: http://tracker.ceph.com/issues/24508
Signed-off-by: Casey Bodley <cbodley@redhat.com>
6 years agoosd/PG: fix pg merge check for rc clusters 26995/head
Sage Weil [Fri, 15 Mar 2019 17:24:52 +0000 (12:24 -0500)]
osd/PG: fix pg merge check for rc clusters

If a cluster had a pg merge pending before last_pg_merge_meta was
introduced then the source_pgid will be pg_t().  If that's the case,
skip these new checks.

Likewise, if we decode a legacy pg_pool_t, put the old merge les/lec
values into the correct location.

Signed-off-by: Sage Weil <sage@redhat.com>
6 years agodoc: add scrub link for nautilus release notes 26994/head
Patrick Donnelly [Fri, 15 Mar 2019 17:15:58 +0000 (10:15 -0700)]
doc: add scrub link for nautilus release notes

Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
6 years agoMerge PR #26958 into nautilus
Sage Weil [Fri, 15 Mar 2019 17:09:35 +0000 (12:09 -0500)]
Merge PR #26958 into nautilus

* refs/pull/26958/head:
mon: avoid using naked pointer
msg/async: do not "return std::move(local_var)"
mon: do not assert on bad auth payload

Reviewed-by: Ricardo Dias <rdias@suse.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: João Eduardo Luís <joao@suse.de>
Reviewed-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
6 years agoMerge PR #26959 into nautilus
Sage Weil [Fri, 15 Mar 2019 17:09:18 +0000 (12:09 -0500)]
Merge PR #26959 into nautilus

* refs/pull/26959/head:
mgr/crash: include entity (instead of daemon) in 'crash ls'

Reviewed-by: Dan Mick <dmick@redhat.com>
6 years agoMerge PR #26965 into nautilus
Sage Weil [Fri, 15 Mar 2019 17:08:34 +0000 (12:08 -0500)]
Merge PR #26965 into nautilus

* refs/pull/26965/head:
ms/async/ProtocolV2: add ms_die_on_bug and assert rxbuf/txbuf don't get big
msg/async/ProtocolV2: do not reenable pre_auth buffering on from reset_recv_state

Reviewed-by: Ricardo Dias <rdias@suse.com>
6 years agoMerge PR #26974 into nautilus
Patrick Donnelly [Fri, 15 Mar 2019 16:36:57 +0000 (09:36 -0700)]
Merge PR #26974 into nautilus

* refs/pull/26974/head:
doc: add cephfs scrub related admin document

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
6 years agoMerge pull request #26984 from ricardoasmarques/remove-iscsi-gateway-param-nautilus
Lenz Grimmer [Fri, 15 Mar 2019 15:40:40 +0000 (16:40 +0100)]
Merge pull request #26984 from ricardoasmarques/remove-iscsi-gateway-param-nautilus

mgr/dashboard: Drop iSCSI gateway name parameter

Reviewed-by: Ricardo Dias <rdias@suse.com>
6 years agomgr: Make 3rd parameter optional in ceph_get_module_option 26986/head
Volker Theile [Fri, 15 Mar 2019 14:42:44 +0000 (15:42 +0100)]
mgr: Make 3rd parameter optional in ceph_get_module_option

Fixes: https://tracker.ceph.com/issues/38766
File "/usr/share/ceph/mgr/mgr_module.py", line 863, in _handle_command
2019-03-15T11:28:31.324 INFO:tasks.ceph.mgr.x.mira117.stderr:    return self.handle_command(inbuf, cmd)
2019-03-15T11:28:31.324 INFO:tasks.ceph.mgr.x.mira117.stderr:  File "/usr/share/ceph/mgr/selftest/module.py", line 114, in handle_command
2019-03-15T11:28:31.324 INFO:tasks.ceph.mgr.x.mira117.stderr:    self._self_test()
2019-03-15T11:28:31.325 INFO:tasks.ceph.mgr.x.mira117.stderr:  File "/usr/share/ceph/mgr/selftest/module.py", line 213, in _self_test
2019-03-15T11:28:31.325 INFO:tasks.ceph.mgr.x.mira117.stderr:    self._self_test_config()
2019-03-15T11:28:31.325 INFO:tasks.ceph.mgr.x.mira117.stderr:  File "/usr/share/ceph/mgr/selftest/module.py", line 313, in _self_test_config
2019-03-15T11:28:31.325 INFO:tasks.ceph.mgr.x.mira117.stderr:    assert self.get_module_option_ex("foo", "bar") is None
2019-03-15T11:28:31.325 INFO:tasks.ceph.mgr.x.mira117.stderr:  File "/usr/share/ceph/mgr/mgr_module.py", line 942, in get_module_option_ex
2019-03-15T11:28:31.325 INFO:tasks.ceph.mgr.x.mira117.stderr:    r = self._ceph_get_module_option(module, key)
2019-03-15T11:28:31.325 INFO:tasks.ceph.mgr.x.mira117.stderr:TypeError: ceph_get_module_option() takes exactly 3 arguments (2 given)

Signed-off-by: Volker Theile <vtheile@suse.com>
6 years agomgr/dashboard: Drop iSCSI gateway name parameter 26984/head
Ricardo Marques [Fri, 15 Mar 2019 13:50:09 +0000 (13:50 +0000)]
mgr/dashboard: Drop iSCSI gateway name parameter

iSCSI gateway name will now be obtained from the
ceph-iscsi `/api/sysinfo/hostname` endpoint

Signed-off-by: Ricardo Marques <rimarques@suse.com>
6 years agoMerge pull request #26971 from theanalyst/nautilus-rgw-enoent-mdlog
Casey Bodley [Fri, 15 Mar 2019 13:31:34 +0000 (09:31 -0400)]
Merge pull request #26971 from theanalyst/nautilus-rgw-enoent-mdlog

rgw_sync: drop ENOENT error logs from mdlog

Reviewed-by: Nathan Cutler <ncutler@suse.com>
Reviewed-by: Casey Bodley <cbodley@redhat.com>
6 years agomon: avoid using naked pointer 26958/head
Kefu Chai [Fri, 15 Mar 2019 03:27:53 +0000 (11:27 +0800)]
mon: avoid using naked pointer

to save our trouble to delete auth_handler in the error handling paths

Signed-off-by: Kefu Chai <kchai@redhat.com>
6 years agomsg/async: do not "return std::move(local_var)"
Kefu Chai [Fri, 15 Mar 2019 03:22:13 +0000 (11:22 +0800)]
msg/async: do not "return std::move(local_var)"

it prevents copy elision. and both GCC and Clang warn like

warning: moving a local object in a return statement prevents copy
elision [-Wpessimizing-move]

Signed-off-by: Kefu Chai <kchai@redhat.com>
6 years agomon: do not assert on bad auth payload
Sage Weil [Thu, 14 Mar 2019 21:46:21 +0000 (16:46 -0500)]
mon: do not assert on bad auth payload

If we get garbage, fail to authenticate--do not assert out and crash.

Signed-off-by: Sage Weil <sage@redhat.com>
6 years agoms/async/ProtocolV2: add ms_die_on_bug and assert rxbuf/txbuf don't get big 26965/head
Sage Weil [Fri, 15 Mar 2019 11:27:17 +0000 (06:27 -0500)]
ms/async/ProtocolV2: add ms_die_on_bug and assert rxbuf/txbuf don't get big

Signed-off-by: Sage Weil <sage@redhat.com>
6 years agomsg/async/ProtocolV2: do not reenable pre_auth buffering on from reset_recv_state
Sage Weil [Fri, 15 Mar 2019 03:50:29 +0000 (22:50 -0500)]
msg/async/ProtocolV2: do not reenable pre_auth buffering on from reset_recv_state

This is specifically bad because we call reset_recv_state from
reuse_connection, which turns buffering back on on an already-authenticated
session.

Instead, reenable it only when we set the state to START_CONNECT.  (On
the accepting side, it is a fresh connection, so it starts out true.)
Also, we want to *disable* it on the connection we are reusing, which
might be in a pre-auth state, while we are in a post-auth state.

Fixes: http://tracker.ceph.com/issues/38746
Signed-off-by: Sage Weil <sage@redhat.com>
6 years agoMerge pull request #26738 from votdev/fix_docs
Lenz Grimmer [Fri, 15 Mar 2019 09:38:00 +0000 (10:38 +0100)]
Merge pull request #26738 from votdev/fix_docs

mgr/dashboard: Fix issues in controllers/docs

Reviewed-by: Ernesto Puerta <epuertat@redhat.com>
Reviewed-by: Patrick Nawracay <pnawracay@suse.com>
Reviewed-by: Tatjana Dehler <tdehler@suse.com>
Reviewed-by: Tina Kallio <tina.kallio@gmail.com>
6 years agodoc: add cephfs scrub related admin document 26974/head
Venky Shankar [Fri, 15 Mar 2019 09:26:47 +0000 (14:56 +0530)]
doc: add cephfs scrub related admin document

Fixes: http://tracker.ceph.com/issues/38728
Signed-off-by: Venky Shankar <vshankar@redhat.com>
6 years agorgw: ldap: fix LDAPAuthEngine::init() when uri !empty() 26972/head
Matt Benjamin [Tue, 12 Mar 2019 12:58:53 +0000 (08:58 -0400)]
rgw: ldap: fix LDAPAuthEngine::init() when uri !empty()

Fixes: https://tracker.ceph.com/issues/38699
Signed-off-by: Matt Benjamin <mbenjamin@redhat.com>
(cherry picked from commit 6ef98c6e0fcf4f9b6e431b3409975e0966c5c21a)

6 years agorgw_sync: drop ENOENT error logs from mdlog 26971/head
Abhishek Lekshmanan [Tue, 12 Mar 2019 10:09:03 +0000 (11:09 +0100)]
rgw_sync: drop ENOENT error logs from mdlog

Since this commonly occurs and isn't an error of concern at level 1.

Signed-off-by: Abhishek Lekshmanan <abhishek@suse.com>
(cherry picked from commit c246abb3935266f9335cab97e52ab489cc7ebfd6)

6 years agoMerge PR #26898 into nautilus
Sage Weil [Fri, 15 Mar 2019 03:37:18 +0000 (22:37 -0500)]
Merge PR #26898 into nautilus

* refs/pull/26898/head:
osd/PG: invalidate PG if merging with unexpected version
osd,mon: include more pg merge metadata in pg_pool_t
qa/standalone/osd/pg-split-merge.sh: reproduce pg merge problem with empty pgs
osd: add osd_debug_no_{acting_change,purge_strays}

Reviewed-by: Neha Ojha <nojha@redhat.com>
6 years agomgr/crash: include entity (instead of daemon) in 'crash ls' 26959/head
Sage Weil [Thu, 14 Mar 2019 22:12:11 +0000 (17:12 -0500)]
mgr/crash: include entity (instead of daemon) in 'crash ls'

The daemon name is implied by the entity, and the entity is more useful.

Signed-off-by: Sage Weil <sage@redhat.com>
6 years agoceph_release: nautilus is will be 'stable' for v14.2.0 26960/head
Sage Weil [Thu, 14 Mar 2019 22:54:28 +0000 (17:54 -0500)]
ceph_release: nautilus is will be 'stable' for v14.2.0

Signed-off-by: Sage Weil <sage@redhat.com>
6 years agoMerge PR #26905 into nautilus
Sage Weil [Thu, 14 Mar 2019 22:17:25 +0000 (17:17 -0500)]
Merge PR #26905 into nautilus

* refs/pull/26905/head:
mgr: Cleanup get_localized_module_option function

Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Ernesto Puerta <epuertat@redhat.com>
6 years agoMerge PR #26875 into nautilus
Sage Weil [Thu, 14 Mar 2019 15:04:14 +0000 (10:04 -0500)]
Merge PR #26875 into nautilus

* refs/pull/26875/head:
common: implement HMACs on top of OpenSSL.
msg/async, v2: switch the pre-auth mechanism to HMAC-SHA256.
include/types: beef sha_digest_t up with encode and compare.
auth: add hmac_sha256() to CryptoKey.
msg/async, v2: introduce pre_auth exchanges with CRC32.
msg/async, v2: introduce pre_auth buffers.
msg/async, v2: rectify the encapsulation of rx_segments_{desc,data}.
msg/async, v2: rework decoding of MessageFrame.
msg/async, v2: limit the num_segments to non-empty segments.
msg/async, v2: drop the bl onwire space optimization in ControlFrames.
msg/async, v2: clean up ret handling in ProtocolV2::write().
msg/async, v2: drop next_payload_len as we don't need anymore.
msg/async, v2: drop temp_buffer and limitations driven by it.
msg/async, v2: switch to rx_buffer_t entirely.
msg/async, v2: rx continuations use buffer::ptr_node.
msg/async, v2: use bptr continuation for segment reading.
msg/async: introduce bptr-carrying continuations.
msg/async: replace CONTINUATION_PARAM() with specialized types.
msg/async, v2: ::_banner_exchange() takes CtRef instead of CtPtr.
msg/async: avoid extra pointers in continuation definitions.
msg/async, v2: dissect setting stream handlers into ::finish_auth().
msg/async, v2: drop ceph_msg_header2 handling from ControlFrames.
msg/async, v2: drop the SignedEncryptedFrame entirely.
msg/async, v2: reintroduce segment aligment. It's compile-time now.
msg/async, v2: generalize Frame about number of segments.
msg/async, v2: rework and generalize Frame encryption.
msg/async, v2: rework the class hierarchy - introduce MessageFrame.
msg/async, v2: rework the class hierarchy - introduce ControlFrame.
msg/async/ProtocolV2: remove obsolete AuthFlags

Reviewed-by: Sage Weil <sage@redhat.com>
6 years agoMerge pull request #26918 from trociny/wip-rbd-bench-wait-on-interrupted
Jason Dillaman [Thu, 14 Mar 2019 14:27:03 +0000 (10:27 -0400)]
Merge pull request #26918 from trociny/wip-rbd-bench-wait-on-interrupted

rbd: wait for all io complete when bench is interrupted

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
6 years agomgr: Cleanup get_localized_module_option function 26905/head
Volker Theile [Tue, 12 Mar 2019 09:06:01 +0000 (10:06 +0100)]
mgr: Cleanup get_localized_module_option function

Address comments from https://github.com/ceph/ceph/pull/26736.

Signed-off-by: Volker Theile <vtheile@suse.com>
6 years agoMerge PR #26948 into nautilus
Sage Weil [Thu, 14 Mar 2019 12:22:30 +0000 (07:22 -0500)]
Merge PR #26948 into nautilus

* refs/pull/26948/head:
rbd-nbd: fix segfault for list-mapped command

Reviewed-by: Sage Weil <sage@redhat.com>
6 years agoMerge PR #26864 into nautilus
Sage Weil [Thu, 14 Mar 2019 12:07:26 +0000 (07:07 -0500)]
Merge PR #26864 into nautilus

* refs/pull/26864/head:
rados: update to latest ver. of dmclock lib w performance enhancements

Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
Reviewed-by: yanjun <yan.jun8@zte.com.cn>
Reviewed-by: Abhishek Lekshmanan <abhishek.lekshmanan@gmail.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
6 years agoMerge PR #26921 into nautilus
Sage Weil [Thu, 14 Mar 2019 12:01:46 +0000 (07:01 -0500)]
Merge PR #26921 into nautilus

* refs/pull/26921/head:
mgr/telemetry: fix 'telemetry {on,off}'

Reviewed-by: Volker Theile <vtheile@suse.com>
Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
Reviewed-by: Ernesto Puerta <epuertat@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
6 years agoMerge PR #26924 into nautilus
Sage Weil [Thu, 14 Mar 2019 11:59:05 +0000 (06:59 -0500)]
Merge PR #26924 into nautilus

* refs/pull/26924/head:
auth/cephx: fix decode_encrypt error handling
auth/cephx: fix encode_encrypt error handling

Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Sage Weil <sage@redhat.com>