]> git.apps.os.sepia.ceph.com Git - ceph.git/log
ceph.git
5 years agodoc: fix parameter to set pg autoscale mode 34518/head
Changcheng Liu [Mon, 8 Apr 2019 02:40:47 +0000 (10:40 +0800)]
doc: fix parameter to set pg autoscale mode

osd_pool_default_pg_autoscale_mode is the right parameter to
set placement-group autoscale mode.

Signed-off-by: Changcheng Liu <changcheng.liu@intel.com>
(cherry picked from commit c0df98fc7e78bbd366333d810f78ddbeed0e6729)

5 years agoMerge pull request #34736 from smithfarm/wip-44648-nautilus
Yuri Weinstein [Tue, 28 Apr 2020 18:39:31 +0000 (11:39 -0700)]
Merge pull request #34736 from smithfarm/wip-44648-nautilus

nautilus: qa/workunits/rbd: wait for nbd map to close after unmap

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
5 years agoMerge pull request #34735 from smithfarm/wip-45260-nautilus
Yuri Weinstein [Tue, 28 Apr 2020 16:09:14 +0000 (09:09 -0700)]
Merge pull request #34735 from smithfarm/wip-45260-nautilus

nautilus: rgw: reshard: skip stale bucket id entries from reshard queue

Reviewed-by: Casey Bodley <cbodley@redhat.com>
5 years agoMerge pull request #34628 from shyukri/wip-45070-nautilus
Yuri Weinstein [Mon, 27 Apr 2020 21:33:10 +0000 (14:33 -0700)]
Merge pull request #34628 from shyukri/wip-45070-nautilus

nautilus: mgr/telegraf: catch FileNotFoundError exception

Reviewed-by: Kefu Chai <kchai@redhat.com>
5 years agoMerge pull request #34512 from Vicente-Cheng/wip-44324-nautilus
Yuri Weinstein [Mon, 27 Apr 2020 21:32:26 +0000 (14:32 -0700)]
Merge pull request #34512 from Vicente-Cheng/wip-44324-nautilus

nautilus: osd/PeeringState.h: ignore RemoteBackfillReserved in WaitLocalBackfillReserved

Reviewed-by: Neha Ojha <nojha@redhat.com>
Reviewed-by: David Zafman <dzafman@redhat.com>
5 years agoMerge pull request #34500 from Vicente-Cheng/wip-44289-nautilus
Yuri Weinstein [Mon, 27 Apr 2020 21:30:46 +0000 (14:30 -0700)]
Merge pull request #34500 from Vicente-Cheng/wip-44289-nautilus

nautilus: mon: stash newer map on bootstrap when addr doesn't match

Reviewed-by: Neha Ojha <nojha@redhat.com>
5 years agoMerge pull request #34419 from votdev/wip-44954-nautilus
Yuri Weinstein [Mon, 27 Apr 2020 21:29:34 +0000 (14:29 -0700)]
Merge pull request #34419 from votdev/wip-44954-nautilus

nautilus: monitoring: root volume full alert fires false positives

Reviewed-by: Lenz Grimmer <lgrimmer@suse.com>
Reviewed-by: Tatjana Dehler <tdehler@suse.com>
Reviewed-by: Laura Paduano <lpaduano@suse.com>
5 years agoMerge pull request #34662 from votdev/wip-45157-nautilus
Kefu Chai [Mon, 27 Apr 2020 07:00:16 +0000 (15:00 +0800)]
Merge pull request #34662 from votdev/wip-45157-nautilus

nautilus: mgr/dashboard: Refactor Python unittests and controller

Reviewed-by: Alfonso Martínez <almartin@redhat.com>
Reviewed-by: Tatjana Dehler <tdehler@suse.com>
Reviewed-by: Laura Paduano <lpaduano@suse.com>
Reviewed-by: Ernesto Puerta <epuertat@redhat.com>
5 years agoMerge pull request #34627 from shyukri/wip-45043-nautilus
Yuri Weinstein [Fri, 24 Apr 2020 18:56:11 +0000 (11:56 -0700)]
Merge pull request #34627 from shyukri/wip-45043-nautilus

nautilus: mgr/PyModule: fix missing tracebacks in handle_pyerror()

Reviewed-by: Neha Ojha <nojha@redhat.com>
5 years agoMerge pull request #34542 from smithfarm/wip-44486-nautilus
Nathan Cutler [Fri, 24 Apr 2020 18:31:05 +0000 (20:31 +0200)]
Merge pull request #34542 from smithfarm/wip-44486-nautilus

nautilus: common/ceph_time: tolerate mono time going backwards

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
5 years agoMerge pull request #34539 from smithfarm/wip-45073-nautilus
Yuri Weinstein [Fri, 24 Apr 2020 13:28:42 +0000 (06:28 -0700)]
Merge pull request #34539 from smithfarm/wip-45073-nautilus

nautilus: build/ops: address SElinux denials observed in rgw/multisite test run

Reviewed-by: Kefu Chai <kchai@redhat.com>
5 years agoMerge pull request #34527 from smithfarm/wip-45035-nautilus
Yuri Weinstein [Fri, 24 Apr 2020 13:27:28 +0000 (06:27 -0700)]
Merge pull request #34527 from smithfarm/wip-45035-nautilus

nautilus: spec: address some warnings raised by RPM 4.15.1

Reviewed-by: Kefu Chai <kchai@redhat.com>
5 years agoMerge pull request #34256 from smithfarm/wip-44793-nautilus
Yuri Weinstein [Fri, 24 Apr 2020 13:26:47 +0000 (06:26 -0700)]
Merge pull request #34256 from smithfarm/wip-44793-nautilus

nautilus: tests: qa/tasks/ceph.py: fail if any osd role doesn't get a device

Reviewed-by: Kefu Chai <kchai@redhat.com>
5 years agoqa/workunits/rbd: wait for nbd map to close after unmap 34736/head
Jason Dillaman [Wed, 11 Mar 2020 19:11:10 +0000 (15:11 -0400)]
qa/workunits/rbd: wait for nbd map to close after unmap

The unmap action only sends a signal to the kernel to notify the
rbd-nbd daemon to disconnect. Therefore, it's possible that an
unmap followed by an immediate re-map to the same device might
fail since the unmap is still in-progress.

Fixes: https://tracker.ceph.com/issues/44567
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit 80a3f18cafb4add1624cc690bba436a1284dc634)

5 years agorgw: reshard: skip stale bucket id entries from reshard queue 34735/head
Abhishek Lekshmanan [Fri, 17 Apr 2020 15:11:01 +0000 (17:11 +0200)]
rgw: reshard: skip stale bucket id entries from reshard queue

If we encounter a reshard queue entry that has an older ID compared to the
bucket's current ID, it'd mean that some other process or a manual reshard has
already processed this entry, skip processing the entry this time. An
alternative is to verify the num_shards that we have in queue >= the current
shards, but this would mean that we may reshard a recently manual resharded
bucket again which might not be intended

Fixes: https://tracker.ceph.com/issues/45134
Signed-off-by: Abhishek Lekshmanan <abhishek@suse.com>
(cherry picked from commit 02664fc091674e28233559cd1c42f954d5776d86)

Conflicts:
src/rgw/rgw_reshard.cc
- immediately preceding "get_bucket_info" call looks different in
  nautilus

5 years agoMerge pull request #34551 from tspmelo/wip-45085-nautilus
Lenz Grimmer [Thu, 23 Apr 2020 11:45:17 +0000 (13:45 +0200)]
Merge pull request #34551 from tspmelo/wip-45085-nautilus

Reviewed-by: Laura Paduano <lpaduano@suse.com>
Reviewed-by: Ricardo Marques <rimarques@suse.com>
5 years agoMerge pull request #34550 from tspmelo/wip-45082-nautilus
Lenz Grimmer [Thu, 23 Apr 2020 08:28:35 +0000 (10:28 +0200)]
Merge pull request #34550 from tspmelo/wip-45082-nautilus

Reviewed-by: Laura Paduano <lpaduano@suse.com>
Reviewed-by: Ricardo Marques <rimarques@suse.com>
Reviewed-by: Stephan Müller <smueller@suse.com>
5 years agoMerge pull request #34497 from votdev/wip-45019-nautilus
Lenz Grimmer [Thu, 23 Apr 2020 08:27:48 +0000 (10:27 +0200)]
Merge pull request #34497 from votdev/wip-45019-nautilus

Reviewed-by: Alfonso Martínez <almartin@redhat.com>
Reviewed-by: Laura Paduano <lpaduano@suse.com>
Reviewed-by: Stephan Müller <smueller@suse.com>
5 years agoMerge pull request #34399 from votdev/wip-44920-nautilus
Lenz Grimmer [Wed, 22 Apr 2020 15:03:02 +0000 (17:03 +0200)]
Merge pull request #34399 from votdev/wip-44920-nautilus

Reviewed-by: Laura Paduano <lpaduano@suse.com>
Reviewed-by: Sebastian Krah <skrah@suse.com>
Reviewed-by: Stephan Müller <smueller@suse.com>
5 years agoMerge pull request #34597 from smithfarm/wip-43134-nautilus
Yuri Weinstein [Tue, 21 Apr 2020 23:44:01 +0000 (16:44 -0700)]
Merge pull request #34597 from smithfarm/wip-43134-nautilus

nautilus: rgw: find oldest period and update RGWMetadataLogHistory()

Reviewed-by: Casey Bodley <cbodley@redhat.com>
5 years agoMerge pull request #34585 from smithfarm/wip-45040-nautilus
Yuri Weinstein [Tue, 21 Apr 2020 23:09:42 +0000 (16:09 -0700)]
Merge pull request #34585 from smithfarm/wip-45040-nautilus

nautilus: mon: calculate min_size on osd pool set size

Reviewed-by: Neha Ojha <nojha@redhat.com>
5 years agoMerge pull request #34489 from rhcs-dashboard/nautilus-fix-coverage-path
Yuri Weinstein [Tue, 21 Apr 2020 23:09:18 +0000 (16:09 -0700)]
Merge pull request #34489 from rhcs-dashboard/nautilus-fix-coverage-path

nautilus: mgr/dashboard: fix COVERAGE_PATH in run-backend-api-tests.sh

Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Laura Paduano <lpaduano@suse.com>
5 years agoMerge pull request #34394 from votdev/wip-44917-nautilus
Yuri Weinstein [Tue, 21 Apr 2020 23:07:13 +0000 (16:07 -0700)]
Merge pull request #34394 from votdev/wip-44917-nautilus

nautilus: monitoring: alert for prediction of disk and pool fill up broken

Reviewed-by: Patrick Seidensal <pnawracay@suse.com>
5 years agoMerge pull request #34392 from tchaikov/nautilus-cbt
Yuri Weinstein [Tue, 21 Apr 2020 20:52:20 +0000 (13:52 -0700)]
Merge pull request #34392 from tchaikov/nautilus-cbt

nautilus: qa/suites: use "nautilus" branch for cbt based testing

Reviewed-by: Neha Ojha <nojha@redhat.com>
Reviewed-by: Yuri Weinstein <yweinste@redhat.com>
5 years agoMerge pull request #34609 from smithfarm/wip-44267-nautilus
Yuri Weinstein [Tue, 21 Apr 2020 18:30:05 +0000 (11:30 -0700)]
Merge pull request #34609 from smithfarm/wip-44267-nautilus

nautilus: rgw: fix bug with (un)ordered bucket listing and marker w/ namespace

Reviewed-by: Casey Bodley <cbodley@redhat.com>
5 years agoMerge pull request #34599 from smithfarm/wip-44232-nautilus
Yuri Weinstein [Tue, 21 Apr 2020 18:29:40 +0000 (11:29 -0700)]
Merge pull request #34599 from smithfarm/wip-44232-nautilus

nautilus: rgw: ReplaceKeyPrefixWith and ReplaceKeyWith can not set at the same …

Reviewed-by: Casey Bodley <cbodley@redhat.com>
5 years agoMerge pull request #34598 from smithfarm/wip-44136-nautilus
Yuri Weinstein [Tue, 21 Apr 2020 18:29:00 +0000 (11:29 -0700)]
Merge pull request #34598 from smithfarm/wip-44136-nautilus

nautilus: rgw: set bucket attr twice when delete lifecycle config.

Reviewed-by: Casey Bodley <cbodley@redhat.com>
5 years agoMerge pull request #34278 from jan--f/wip-44688-nautilus
Jan Fajerski [Tue, 21 Apr 2020 13:50:12 +0000 (15:50 +0200)]
Merge pull request #34278 from jan--f/wip-44688-nautilus

nautilus: ceph-volume: prepare: use *-slots arguments for implicit sizing

5 years agoMerge pull request #34478 from jan--f/wip-44998-nautilus
Jan Fajerski [Tue, 21 Apr 2020 13:49:29 +0000 (15:49 +0200)]
Merge pull request #34478 from jan--f/wip-44998-nautilus

nautilus: ceph-volume/batch: return success when all devices are filtered

5 years agoMerge pull request #34481 from jan--f/wip-45002-nautilus
Jan Fajerski [Tue, 21 Apr 2020 11:30:06 +0000 (13:30 +0200)]
Merge pull request #34481 from jan--f/wip-45002-nautilus

nautilus: ceph-volume/batch: check lvs list before access

5 years agoMerge pull request #34445 from jan--f/wip-44974-nautilus
Jan Fajerski [Tue, 21 Apr 2020 11:29:47 +0000 (13:29 +0200)]
Merge pull request #34445 from jan--f/wip-44974-nautilus

nautilus: devices/simple/scan: Fix string in log statement

5 years agoMerge pull request #33616 from jan--f/wip-44325-nautilus
Jan Fajerski [Tue, 21 Apr 2020 11:22:17 +0000 (13:22 +0200)]
Merge pull request #33616 from jan--f/wip-44325-nautilus

nautilus: ceph-volume: lvm: get_device_vgs() filter by provided prefix

5 years agoceph-volume: pass *-slots arguments to LV creation 34278/head
Jan Fajerski [Mon, 2 Mar 2020 14:16:39 +0000 (15:16 +0100)]
ceph-volume: pass *-slots arguments to LV creation

Fixes: https://tracker.ceph.com/issues/44494
Signed-off-by: Jan Fajerski <jfajerski@suse.com>
(cherry picked from commit 61f0c3af0b0f36a03748733b16de1b11048342e6)

5 years agouse extent count for slots conversion instead of free count
Jan Fajerski [Wed, 4 Mar 2020 12:28:46 +0000 (13:28 +0100)]
use extent count for slots conversion instead of free count

Signed-off-by: Jan Fajerski <jfajerski@suse.com>
(cherry picked from commit 4a81b4a2fbb4cafe45a8fe8cceeece636e51adb6)

5 years agoceph-volume: available_lvm: vg space takes precedence
Jan Fajerski [Wed, 4 Mar 2020 10:39:40 +0000 (11:39 +0100)]
ceph-volume: available_lvm: vg space takes precedence

This changes available_lvm to check for generic reasons only if no VGs
were found. A VG can contain a (mounted) lv, which triggers the
ro/locked test, despite the VG having space available.

Signed-off-by: Jan Fajerski <jfajerski@suse.com>
(cherry picked from commit c6d71eb0022935731bb9380098c975d9c5f27a86)

5 years agomgr/dashboard: Refactor Python unittests 34662/head
Volker Theile [Wed, 6 Nov 2019 14:02:49 +0000 (15:02 +0100)]
mgr/dashboard: Refactor Python unittests

* Make use of the KVStoreMockMixin class to get rid off duplicate code.
* Fake the index.html file to be able to run tests/test_home.py locally without building the frontend in production mode.
* Encapsulate helper functions in controllers/home.py, otherwise tests/test_feature_toggles.py need to fake the filesystem because load_controllers() will load the home.py controller and fail due missing files in the filesystem.

Signed-off-by: Volker Theile <vtheile@suse.com>
(cherry picked from commit e542255b04457df269587bc5639b14a935a125d3)

# Conflicts:
src/pybind/mgr/dashboard/requirements.txt
src/pybind/mgr/dashboard/tests/test_home.py
src/pybind/mgr/dashboard/tests/test_rgw_client.py

5 years agoceph-volume: don't create Volume/VolumeGroup objects with empty name 33616/head
Jan Fajerski [Tue, 25 Feb 2020 15:18:57 +0000 (16:18 +0100)]
ceph-volume: don't create Volume/VolumeGroup objects with empty name

Signed-off-by: Jan Fajerski <jfajerski@suse.com>
(cherry picked from commit 235b19eb66b9ba9beab99508f2fdf7b6afe26f31)

5 years agoceph-volume: get_device_lvs filter by provided prefix
Jan Fajerski [Tue, 25 Feb 2020 15:18:24 +0000 (16:18 +0100)]
ceph-volume: get_device_lvs filter by provided prefix

Fixes: https://tracker.ceph.com/issues/44124
Signed-off-by: Jan Fajerski <jfajerski@suse.com>
(cherry picked from commit ac43d37f581510d1854e76afb634a142ad9a0fc0)

5 years agoceph-volume: lvm.get_device_vgs: don't create VolumeGroup with empty name
Jan Fajerski [Tue, 25 Feb 2020 15:27:08 +0000 (16:27 +0100)]
ceph-volume: lvm.get_device_vgs: don't create VolumeGroup with empty name

Signed-off-by: Jan Fajerski <jfajerski@suse.com>
(cherry picked from commit 3c4c8c5e4a242985389c8d1c85b45cac89b2dc89)

5 years agoceph-volume: lvm: get_device_vgs() filter by provided prefix
Yehuda Sadeh [Sat, 22 Feb 2020 01:44:11 +0000 (17:44 -0800)]
ceph-volume: lvm: get_device_vgs() filter by provided prefix

Fixes: https://tracker.ceph.com/issues/44246
Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
(cherry picked from commit b48caf4873c11690d36a88760504f98b46101995)

5 years agoMerge pull request #34282 from votdev/issue_44809_select_tab
Yuri Weinstein [Mon, 20 Apr 2020 13:48:36 +0000 (06:48 -0700)]
Merge pull request #34282 from votdev/issue_44809_select_tab

nautilus: mgr/dashboard: Tabs does not handle click events

Reviewed-by: Stephan Müller <smueller@suse.com>
Reviewed-by: Laura Paduano <lpaduano@suse.com>
5 years agoMerge pull request #34424 from smithfarm/wip-44838-nautilus
Yuri Weinstein [Mon, 20 Apr 2020 13:25:22 +0000 (06:25 -0700)]
Merge pull request #34424 from smithfarm/wip-44838-nautilus

nautilus: pybind/rbd: ensure image is open before permitting operations

Reviewed-by: Mykola Golub <mgolub@mirantis.com>
5 years agomgr/dashboard: Fix iSCSI's username and password validation 34550/head
Tiago Melo [Mon, 16 Mar 2020 21:23:47 +0000 (20:23 -0100)]
mgr/dashboard: Fix iSCSI's username and password validation

When using regex, instead of strings, angular doesn't assume the pattern must
validate the entire string.

Add validation to the backend.

Fixes: https://tracker.ceph.com/issues/44624
Signed-off-by: Tiago Melo <tmelo@suse.com>
(cherry picked from commit 532b271572f7b6410c099362dc046148f5a686a1)

5 years agoMerge pull request #34618 from neha-ojha/wip-45135-nautilus
Yuri Weinstein [Sat, 18 Apr 2020 16:35:30 +0000 (09:35 -0700)]
Merge pull request #34618 from neha-ojha/wip-45135-nautilus

nautilus: mon: disable min pg per osd warning

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Reviewed-by: Yuri Weinstein <yweinste@redhat.com>
5 years agomgr/telegraf: catch FileNotFoundError exception 34628/head
Kefu Chai [Wed, 8 Apr 2020 12:21:25 +0000 (20:21 +0800)]
mgr/telegraf: catch FileNotFoundError exception

in tasks/module_selftest.yaml, `TestModuleSelftest.test_telegraf()` is
called. but we fail to prepare a unix domain socket to which the telegraf
module can send stats. and telegraf module does not catch
FileNotFoundError exception, so the exception is populated to ceph-mgr
and is found by the test, hence the test is marked a failure whenever
telegraf is tested.

in this change,

* catch this exception, so it won't be caught by ceph-mgr
* whitelist the error message, so the test can pass

Signed-off-by: Kefu Chai <kchai@redhat.com>
(cherry picked from commit f6d028dfa0c24d43c33670f1bb4547a6310963ea)

5 years agomgr/PyModule: fix missing tracebacks in handle_pyerror() 34627/head
Tim Serong [Thu, 2 Apr 2020 05:46:57 +0000 (16:46 +1100)]
mgr/PyModule: fix missing tracebacks in handle_pyerror()

In certain cases, errors raised in mgr modules don't actually result in a
proper traceback in the mgr log; all you see is a message like "'Hello'
object has no a ttribute 'dneasdfasdf'", but you have no idea where that
came from, which is a complete PITA to debug.

Here's what's going on: handle_pyerror() calls PyErr_Fetch() to get
information about the error that occurred, then passes that information
back to python's traceback.format_exception() function to get the traceback.
If we write code in an mgr module that explicitly raises an exception
(e.g.: 'raise RuntimeError("that didn't work")'), the error value returned
by PyErr_Fetch() is of type RuntimeError, and traceback.format_exception()
does the right thing.  If however we accidentally write code that's just
broken (e.g.: 'self.dneasdfasdf += 1'), the error value returned is not
an actual exception, it's just a string.  So traceback.format_exception()
freaks out with something like "'str' object has no attribute '__cause__'"
(which we don't actually ever see in the logs), which in turn dumps us in a
"catch (error_already_set const &)" block, which just prints out the
single line error string.

https://docs.python.org/3/c-api/exceptions.html#c.PyErr_NormalizeException
tells us that "Under certain circumstances, the values returned by
PyErr_Fetch() below can be “unnormalized”, meaning that *exc is a class
object but *val is not an instance of the same class.".  And that's exactly
the problem we're having here.  We're getting a 'str', not an Exception.
Adding a call to PyErr_NormalizeException() turns the value back into a
proper Exception type and traceback.format_exception() now always does the
right thing.

I've also added calls to peek_pyerror() in the catch blocks, so if anything
else ever somehow causes traceback.format_exception to fail, we'll at least
have an idea of what it is in the log.

Fixes: https://tracker.ceph.com/issues/44799
Signed-off-by: Tim Serong <tserong@suse.com>
(cherry picked from commit dee598087a37623238c35d7595348a4c674c43f3)

5 years agoMerge pull request #34520 from smithfarm/wip-45060-nautilus
Yuri Weinstein [Fri, 17 Apr 2020 19:12:08 +0000 (12:12 -0700)]
Merge pull request #34520 from smithfarm/wip-45060-nautilus

nautilus: qa/suites/rados/rest: don't pass empty dict as data arg

Reviewed-by: Brad Hubbard <bhubbard@redhat.com>
5 years agoMerge pull request #34326 from rzarzynski/wip-bug-24995-nautilus
Yuri Weinstein [Fri, 17 Apr 2020 19:11:21 +0000 (12:11 -0700)]
Merge pull request #34326 from rzarzynski/wip-bug-24995-nautilus

nautilus: mgr: synchronize ClusterState's health and mon_status.

Reviewed-by: Neha Ojha <nojha@redhat.com>
5 years agomon: disable min pg per osd warning 34618/head
Sage Weil [Wed, 11 Sep 2019 22:26:52 +0000 (17:26 -0500)]
mon: disable min pg per osd warning

Now that the pg_autoscaler is on by default, it is "normal" (and okay) to
have a small number of PGs in the cluster if the overall cluster usage is
also low.  This setting just results in a health warning out of the box
when you create a pool and haven't written any data yet.

Fixes: https://tracker.ceph.com/issues/41735
Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit 1ac34a5ea3d1aca299b02e574b295dd4bf6167f4)

5 years agorgw: fix bug with (un)ordered bucket listing and marker w/ namespace 34609/head
J. Eric Ivancich [Fri, 31 Jan 2020 20:01:40 +0000 (15:01 -0500)]
rgw: fix bug with (un)ordered bucket listing and marker w/ namespace

When listing without specifying a namespace, the returned entries
could be in one or more namespaces. The marker used to continue the
listing may therefore contain a namespace, and that needs to be
preserved. This fixes a bug in both ordered and unordered listings
where it was not preserved.

Signed-off-by: J. Eric Ivancich <ivancich@redhat.com>
(cherry picked from commit 9457abb729754458aafc07a9ee514407906a1011)

Conflicts:
src/rgw/rgw_rados.cc
- trivial (nautilus is missing some whitespace-finessing that happened in master)

5 years agorgw: when a period lookup for oldest_realm_epoch returns an ENOENT, 34597/head
Shilpa Jagannath [Tue, 26 Nov 2019 08:03:52 +0000 (13:33 +0530)]
rgw: when a period lookup for oldest_realm_epoch returns an ENOENT,
find the oldest one and update RGWMetadataLogHistory. This is to avoid an
empty cursor being passed in to ceph_assert() in PurgePeriodLogsCR::operate()
in case of incomplete period history.

Fixes: https://tracker.ceph.com/issues/40341
Signed-off-by: Shilpa Jagannath <smanjara@redhat.com>
(cherry picked from commit 0ea65d81d4d5431ca22340149dbd714e395ecdc3)

Conflicts:
src/rgw/services/svc_mdlog.cc
- file does not exist in nautilus; made the changes manually to
  src/rgw/rgw_metadata.cc

5 years agorgw: ReplaceKeyPrefixWith and ReplaceKeyWith can not set at the same time. 34599/head
yuliyang [Mon, 13 Jan 2020 08:31:33 +0000 (16:31 +0800)]
rgw: ReplaceKeyPrefixWith and ReplaceKeyWith can not set at the same time.
and support some HttpErrorCodeReturnedEquals and HttpRedirectCode limit.

fix https://tracker.ceph.com/issues/43563

Signed-off-by: yuliyang <yuliyang@cmss.chinamobile.com>
(cherry picked from commit 0b4689865db3ab8efc39a73070a5d60bd9992fbd)

5 years agorgw: set bucket attr twice when delete lifecycle config. 34598/head
zhang Shaowen [Fri, 11 Oct 2019 07:14:15 +0000 (15:14 +0800)]
rgw: set bucket attr twice when delete lifecycle config.

Fixes: https://tracker.ceph.com/issues/44093
Signed-off-by: zhang Shaowen <zhangshaowen@cmss.chinamobile.com>
(cherry picked from commit c480b029f205c417935df2478a6aa66211f13658)

Conflicts:
src/rgw/rgw_op.cc
- set_bucket_instance_attrs call looks different in nautilus, presumably
  due to post-nautilus refactoring

5 years agoMerge pull request #34343 from Vicente-Cheng/wip-44480-nautilus
Yuri Weinstein [Thu, 16 Apr 2020 18:54:45 +0000 (11:54 -0700)]
Merge pull request #34343 from Vicente-Cheng/wip-44480-nautilus

nautilus: mds: just delete MDSIOContextBase during shutdown

Reviewed-by: Ramana Raja <rraja@redhat.com>
Reviewed-by: Yan, Zheng <zyan@redhat.com>
5 years agoMerge pull request #34308 from Vicente-Cheng/wip-44328-nautilus
Yuri Weinstein [Thu, 16 Apr 2020 18:53:53 +0000 (11:53 -0700)]
Merge pull request #34308 from Vicente-Cheng/wip-44328-nautilus

nautilus: client: fix bad error handling in lseek SEEK_HOLE / SEEK_DATA

Reviewed-by: Ramana Raja <rraja@redhat.com>
5 years agoMerge pull request #34307 from Vicente-Cheng/wip-44337-nautilus
Yuri Weinstein [Thu, 16 Apr 2020 18:53:11 +0000 (11:53 -0700)]
Merge pull request #34307 from Vicente-Cheng/wip-44337-nautilus

nautilus: mds: handle bad purge queue item encoding

Reviewed-by: Ramana Raja <rraja@redhat.com>
Reviewed-by: Ramana Raja <rraja@redhat.com>
5 years agoqa/workunits/mon: add check for min_size 34585/head
Deepika Upadhyay [Thu, 2 Apr 2020 07:01:16 +0000 (12:31 +0530)]
qa/workunits/mon: add check for min_size

verify whether min_size is recalculated when osd
pool size is changed.

fixes: https://tracker.ceph.com/issues/44862
Signed-off-by: Deepika Upadhyay <dupadhya@redhat.com>
(cherry picked from commit 0a7325a2b2ee82752b4191c240e7c7a6f14a2b3e)

Conflicts:
qa/workunits/mon/pool_ops.sh
- in nautilus, "ceph osd pool set foo size 1" does not take
  a "--yes-i-really-mean-it" option

5 years agomon: calculate min_size on osd pool set size
Deepika Upadhyay [Wed, 1 Apr 2020 09:22:03 +0000 (14:52 +0530)]
mon: calculate min_size on osd pool set size

currently `osd pool set size` only modifies min_size when it is above new size,
while it should be recalculated unconditionally.

fixes: https://tracker.ceph.com/issues/44862
Signed-off-by: Deepika Upadhyay <dupadhya@redhat.com>
(cherry picked from commit b69dcaa18cc30d3091630606b981290c91091ce5)

5 years agomgr/dashboard: Add more debug information to Dashboard RGW backend 34399/head
Volker Theile [Thu, 2 Apr 2020 14:01:53 +0000 (16:01 +0200)]
mgr/dashboard: Add more debug information to Dashboard RGW backend

Fixes: https://tracker.ceph.com/issues/44914
Signed-off-by: Volker Theile <vtheile@suse.com>
(cherry picked from commit 4febdd6ddaddebd2a8d07f44c8d0f79524305766)

5 years agomonitoring: root volume full alert fires false positives 34419/head
Patrick Seidensal [Fri, 27 Mar 2020 10:06:08 +0000 (11:06 +0100)]
monitoring: root volume full alert fires false positives

Fixes: https://tracker.ceph.com/issues/44780
Signed-off-by: Patrick Seidensal <pseidensal@suse.com>
(cherry picked from commit f8e347f771cdd1df512507685efb5300e1dc87d0)

5 years agomgr/dashboard: use FQDN for failover redirection 34497/head
Ernesto Puerta [Tue, 7 Apr 2020 17:02:09 +0000 (19:02 +0200)]
mgr/dashboard: use FQDN for failover redirection

Fixes: https://tracker.ceph.com/issues/44923
Signed-off-by: Ernesto Puerta <epuertat@redhat.com>
(cherry picked from commit 2e790c1fbcbb67dfb1c433b80ee3261b5453d72c)

5 years agomgr/dashboard: Update bootstrap 34282/head
Volker Theile [Fri, 3 Apr 2020 08:23:37 +0000 (10:23 +0200)]
mgr/dashboard: Update bootstrap

Fixes: http://tracker.ceph.com/issues/39326
Signed-off-by: Tiago Melo <tmelo@suse.com>
(cherry picked from commit 07f28050dba61b851f149a2ed3b63cf5349c04cd)

nautilus: mgr/dashboard: Tabs does not handle click events
Fixes: https://tracker.ceph.com/issues/44809
Conflicts:
src/pybind/mgr/dashboard/frontend/angular.json
src/pybind/mgr/dashboard/frontend/package-lock.json
src/pybind/mgr/dashboard/frontend/package.json
src/pybind/mgr/dashboard/frontend/src/app/ceph/block/iscsi-target-details/iscsi-target-details.component.spec.ts
src/pybind/mgr/dashboard/frontend/src/app/ceph/block/iscsi-target-details/iscsi-target-details.component.ts
src/pybind/mgr/dashboard/frontend/src/app/ceph/block/iscsi-target-form/iscsi-target-form.component.html
src/pybind/mgr/dashboard/frontend/src/app/ceph/block/iscsi-target-image-settings-modal/iscsi-target-image-settings-modal.component.html
src/pybind/mgr/dashboard/frontend/src/app/ceph/block/iscsi-target-iqn-settings-modal/iscsi-target-iqn-settings-modal.component.html
src/pybind/mgr/dashboard/frontend/src/app/ceph/block/iscsi-target-list/iscsi-target-list.component.html
src/pybind/mgr/dashboard/frontend/src/app/ceph/block/rbd-snapshot-form/rbd-snapshot-form.component.html
src/pybind/mgr/dashboard/frontend/src/app/ceph/block/rbd-trash-list/rbd-trash-list.component.html
src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/configuration/configuration-form/configuration-form.component.html
src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/configuration/configuration.component.html
src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/crushmap/crushmap.component.html
src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/crushmap/crushmap.component.spec.ts
src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/logs/logs.component.html
src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/osd/osd-list/osd-list.component.html
src/pybind/mgr/dashboard/frontend/src/app/ceph/nfs/nfs-form-client/nfs-form-client.component.html
src/pybind/mgr/dashboard/frontend/src/app/ceph/nfs/nfs-form/nfs-form.component.html
src/pybind/mgr/dashboard/frontend/src/app/ceph/pool/pool-form/pool-form.component.html
src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-user-details/rgw-user-details.component.html
src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-user-form/rgw-user-form.component.html
src/pybind/mgr/dashboard/frontend/src/app/core/auth/sso/sso-not-found/sso-not-found.component.html
src/pybind/mgr/dashboard/frontend/src/app/core/auth/user-form/user-form.component.html
src/pybind/mgr/dashboard/frontend/src/app/core/navigation/administration/administration.component.html
src/pybind/mgr/dashboard/frontend/src/app/core/navigation/dashboard-help/dashboard-help.component.html
src/pybind/mgr/dashboard/frontend/src/app/core/navigation/identity/identity.component.html
src/pybind/mgr/dashboard/frontend/src/app/core/navigation/navigation/navigation.component.html
src/pybind/mgr/dashboard/frontend/src/app/core/navigation/notifications/notifications.component.html
src/pybind/mgr/dashboard/frontend/src/app/core/navigation/task-manager/task-manager.component.html
src/pybind/mgr/dashboard/frontend/src/app/core/not-found/not-found.component.html
src/pybind/mgr/dashboard/frontend/src/app/shared/components/critical-confirmation-modal/critical-confirmation-modal.component.html
src/pybind/mgr/dashboard/frontend/src/app/shared/components/critical-confirmation-modal/critical-confirmation-modal.component.scss
src/pybind/mgr/dashboard/frontend/src/app/shared/components/grafana/grafana.component.html
src/pybind/mgr/dashboard/frontend/src/app/shared/components/loading-panel/loading-panel.component.html
src/pybind/mgr/dashboard/frontend/src/app/shared/components/select-badges/select-badges.component.html
src/pybind/mgr/dashboard/frontend/src/app/shared/components/submit-button/submit-button.component.html
src/pybind/mgr/dashboard/frontend/src/app/shared/datatable/table-actions/table-actions.component.html
src/pybind/mgr/dashboard/frontend/src/app/shared/datatable/table-actions/table-actions.component.ts
src/pybind/mgr/dashboard/frontend/src/app/shared/datatable/table-key-value/table-key-value.component.spec.ts
src/pybind/mgr/dashboard/frontend/src/app/shared/datatable/table/table.component.html
src/pybind/mgr/dashboard/frontend/src/app/shared/datatable/table/table.component.spec.ts
src/pybind/mgr/dashboard/frontend/src/app/shared/models/cd-notification.ts
src/pybind/mgr/dashboard/frontend/src/styles.scss
- all those files are not needed to fix the tab select issue.

5 years agomonitoring: alert for prediction of disk and pool fill up broken 34394/head
Patrick Seidensal [Thu, 26 Mar 2020 21:49:57 +0000 (22:49 +0100)]
monitoring: alert for prediction of disk and pool fill up broken

Fixes: https://tracker.ceph.com/issues/44776
Signed-off-by: Patrick Seidensal <pseidensal@suse.com>
(cherry picked from commit 6935dc55921ef533e939719bad7dc12324450bbb)

Conflicts:
  monitoring/prometheus/alerts/ceph_default_alerts.yml

5 years agomgr/dashboard: fix COVERAGE_PATH in run-backend-api-tests.sh 34489/head
Alfonso Martínez [Thu, 9 Apr 2020 07:14:24 +0000 (09:14 +0200)]
mgr/dashboard: fix COVERAGE_PATH in run-backend-api-tests.sh

As we cannot backport directly https://github.com/ceph/ceph/pull/33407
to nautilus and COVERAGE_PATH is invalid for CentOS7 + py2,
this fix is applied directly to nautilus.

Signed-off-by: Alfonso Martínez <almartin@redhat.com>
5 years agoMerge pull request #34388 from smithfarm/wip-44896-nautilus
Nathan Cutler [Thu, 16 Apr 2020 07:35:22 +0000 (09:35 +0200)]
Merge pull request #34388 from smithfarm/wip-44896-nautilus

nautilus: pybind/rbd: fix no lockers are obtained, ImageNotFound exception will be output

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
5 years agomds: handle bad purge queue item encoding 34307/head
Yan, Zheng [Tue, 9 Oct 2018 03:46:56 +0000 (11:46 +0800)]
mds: handle bad purge queue item encoding

The bad encoding was introduced by commit a88f8d5eb4

Signed-off-by: "Yan, Zheng" <zyan@redhat.com>
(cherry picked from commit ba06fcbe3e8345dc2c4c4c3dc3bcc18acf5ab076)
Conflicts:
        src/mds/PurgeQueue.cc: advance changed to +=
Fixes: https://tracker.ceph.com/issues/36635
Note: This commit from v13.2.3 fixes a bad backport in v13.2.2. It is
      also required in Octopus/Nautilus to handle upgrades.
(cherry picked from commit b73d1989bcbea227017607f8dd6e79633ec11f8f)
Conflicts:
            src/mds/PurgeQueue.cc: += changed to advance

5 years agoclient: fix error handling in lseek SEEK_HOLE/SEEK_DATA cases 34308/head
Jeff Layton [Thu, 6 Feb 2020 17:00:07 +0000 (12:00 -0500)]
client: fix error handling in lseek SEEK_HOLE/SEEK_DATA cases

The error handling here looks quite wrong. If the offset represents
an area outside the file, then we want to just return -ENXIO
immediately.

Fixes: https://tracker.ceph.com/issues/44021
Signed-off-by: Jeff Layton <jlayton@redhat.com>
(cherry picked from commit 2ca8db71364698e05c3a6ac9a5aa4da5421a35bc)

Conflicts:
src/client/Client.cc
  - minor modification for nautilus code flow

5 years agotest: add new ceph_lseek test
Jeff Layton [Fri, 21 Feb 2020 20:13:10 +0000 (15:13 -0500)]
test: add new ceph_lseek test

Signed-off-by: Jeff Layton <jlayton@redhat.com>
(cherry picked from commit 339b09dc5921f81621f76faa55c56c31c16d4937)

5 years agomds: don't assert empty io context list when shutting down 34343/head
Yan, Zheng [Mon, 23 Mar 2020 09:09:26 +0000 (17:09 +0800)]
mds: don't assert empty io context list when shutting down

Fixes: https://tracker.ceph.com/issues/44680
Signed-off-by: "Yan, Zheng" <zyan@redhat.com>
(cherry picked from commit 7f26bb7bb768a90177601915050b4f5020902943)

5 years agoRevert "mds: make MDSIOContextBase delete itself when shutting down"
Yan, Zheng [Mon, 23 Mar 2020 09:05:44 +0000 (17:05 +0800)]
Revert "mds: make MDSIOContextBase delete itself when shutting down"

This reverts commit 73436961512bd87981244fa48212085faf7028c4.

Signed-off-by: "Yan, Zheng" <zyan@redhat.com>
(cherry picked from commit 18118974294ee1286b4cbae2f5e6578a5a68f6d6)

5 years agoRevert "mds: just delete MDSIOContextBase during shutdown"
Yan, Zheng [Mon, 23 Mar 2020 09:03:56 +0000 (17:03 +0800)]
Revert "mds: just delete MDSIOContextBase during shutdown"

This reverts commit 79f5052a1ddb61043de4e1cbec19ede2a6b4f53b.

Signed-off-by: "Yan, Zheng" <zyan@redhat.com>
(cherry picked from commit 02658de9eeb700364af02f2c7710c3819e776fb2)

5 years agomds: just delete MDSIOContextBase during shutdown
Patrick Donnelly [Tue, 25 Feb 2020 18:36:11 +0000 (10:36 -0800)]
mds: just delete MDSIOContextBase during shutdown

We don't want the finisher called during shutdown.

Fixes: https://tracker.ceph.com/issues/44295
Fixes: 73436961512bd87981244fa48212085faf7028c4
Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
(cherry picked from commit 79f5052a1ddb61043de4e1cbec19ede2a6b4f53b)

5 years agomds: add comment explaining unusual locking for MDSIOContextBase
Patrick Donnelly [Tue, 25 Feb 2020 18:32:59 +0000 (10:32 -0800)]
mds: add comment explaining unusual locking for MDSIOContextBase

Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
(cherry picked from commit c2a079084c7653b6ed7e0912d4e737fe10a36836)

5 years agomgr/dashboard: Prevent iSCSI target recreation when editing controls 34551/head
Tiago Melo [Thu, 19 Mar 2020 12:51:24 +0000 (11:51 -0100)]
mgr/dashboard: Prevent iSCSI target recreation when editing controls

Also prevents updating target auth, when this was not modified.

Fixes: https://tracker.ceph.com/issues/44659
Signed-off-by: Tiago Melo <tmelo@suse.com>
(cherry picked from commit 7d370ce22259a5b6a6c25995a1857d960dc5d27d)

5 years agomgr/dashboard: Remove duplicate code in iscsi.py
Tiago Melo [Wed, 18 Mar 2020 13:25:42 +0000 (12:25 -0100)]
mgr/dashboard: Remove duplicate code in iscsi.py

Signed-off-by: Tiago Melo <tmelo@suse.com>
(cherry picked from commit 7291e82ffc878394debbbb00e81dd565c6f6a128)

5 years agoMerge pull request #34524 from smithfarm/wip-45054-nautilus
Nathan Cutler [Wed, 15 Apr 2020 21:16:36 +0000 (23:16 +0200)]
Merge pull request #34524 from smithfarm/wip-45054-nautilus

nautilus: doc/releases/nautilus: restart OSDs to make them bind to v2 addr

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
5 years agocommon/ceph_time: tolerate mono time going backwards 34542/head
Sage Weil [Tue, 3 Mar 2020 16:09:06 +0000 (10:09 -0600)]
common/ceph_time: tolerate mono time going backwards

Some kernels (and possibly some hardware?) can trigger a monotonic clock
that goes back in time.  That, in turn, can lead to a negative monotonic
time span.  This would trigger an assert.

This this problem seems to be widespread, tolerate the case and interpret
it as a 0-length interval (vs something negative).

Fixes: https://tracker.ceph.com/issues/44078
Fixes: https://tracker.ceph.com/issues/43365
Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit cd00378720459d92394697e2cb8086f30c220312)

5 years agoselinux: add "type http_cache_port_t" in require section 34539/head
Kefu Chai [Fri, 10 Apr 2020 06:27:48 +0000 (14:27 +0800)]
selinux: add "type http_cache_port_t" in require section

this addresses the regression introduced by
611a2a7ce1713cf92797b19d8a9a93a7dfc68fa5

Fixes: https://tracker.ceph.com/issues/45022
Signed-off-by: Kefu Chai <kchai@redhat.com>
(cherry picked from commit 4ca9ef4d276a38a5807b7767e7a3c06858d90e40)

5 years agoUpdate ceph.te
kalebskeithley [Thu, 9 Apr 2020 17:00:57 +0000 (13:00 -0400)]
Update ceph.te

Fixes: https://tracker.ceph.com/issues/45022
Signed-off-by: Kaleb S. KEITHLEY <kkeithle@redhat.com>
(cherry picked from commit 611a2a7ce1713cf92797b19d8a9a93a7dfc68fa5)

5 years agoceph.spec.in: remove extra tokens at end of %endif directive 34527/head
Nathan Cutler [Mon, 6 Apr 2020 21:00:43 +0000 (23:00 +0200)]
ceph.spec.in: remove extra tokens at end of %endif directive

RPM 4.15.1 warns: extra tokens at the end of %endif directive

Heed the warning.

Signed-off-by: Nathan Cutler <ncutler@suse.com>
(cherry picked from commit 853ff61805ed8bdd281fa594d45bc85f205a8e42)

5 years agoceph.spec.in: version an Obsoletes
Nathan Cutler [Mon, 6 Apr 2020 20:59:51 +0000 (22:59 +0200)]
ceph.spec.in: version an Obsoletes

RPM 4.15.1 warns: It's not recommended to have unversioned Obsoletes.

Heed the warning.

Signed-off-by: Nathan Cutler <ncutler@suse.com>
(cherry picked from commit 48c79c11026e3b2c4a370f7780d1f38efc833052)

5 years agodoc/releases/nautilus: restart OSDs to make them bind to v2 addr 34524/head
Nathan Cutler [Thu, 2 Apr 2020 11:03:31 +0000 (13:03 +0200)]
doc/releases/nautilus: restart OSDs to make them bind to v2 addr

Fixes: https://tracker.ceph.com/issues/43896
Signed-off-by: Nathan Cutler <ncutler@suse.com>
(cherry picked from commit 4facd9daa524f1e2d77511ee6b1a18e108c07d31)

Conflicts:
doc/releases/nautilus.rst
- nautilus does not have 98ae20c2c874

5 years agoqa/suites/rados/rest: Don't pass empty dict as data arg 34520/head
Brad Hubbard [Tue, 31 Mar 2020 02:49:26 +0000 (12:49 +1000)]
qa/suites/rados/rest: Don't pass empty dict as data arg

Passing an empty 'args' dict as a data argument when calling
requests.get somehow confuses the transaction, causing it to fail. Pass
'None' instead.

Fixes: https://tracker.ceph.com/issues/43720
Signed-off-by: Brad Hubbard <bhubbard@redhat.com>
(cherry picked from commit e20e6fc3295da836fb5f098d46d6190ab28195d5)

5 years agopybind/rbd: ensure image is open before permitting operations 34424/head
Mykola Golub [Mon, 23 Mar 2020 10:28:52 +0000 (10:28 +0000)]
pybind/rbd: ensure image is open before permitting operations

Fixes: https://tracker.ceph.com/issues/44610
Signed-off-by: Mykola Golub <mgolub@suse.com>
(cherry picked from commit 99287a1e552387f8eec505bffdffae7f4674cc8b)

Conflicts:
src/pybind/rbd/rbd.pyx
- no "snap_exists", "snap_get_name", "snap_get_id",
  "mirror_image_create_snapshot", "mirror_image_get_mode", "config_set",
  "config_get", "config_remove", "snap_get_mirror_namespace",  in nautilus
- nautilus "mirror_image_enable" does not take any argument

5 years agopybind/rbd: fix no lockers are obtained, ImageNotFound exception will be output 34388/head
zhangdaolong [Tue, 24 Mar 2020 00:51:44 +0000 (08:51 +0800)]
pybind/rbd: fix no lockers are obtained, ImageNotFound exception will be output

No lockers are obtained, ImageNotFound exception will be output,
but tht image is always exist.when lockers number is zero,
Should not output any exceptions。

Fixes: https://tracker.ceph.com/issues/44613
Signed-off-by: zhangdaolong <zhangdaolong@fiberhome.com>
(cherry picked from commit a183aac978dac69f996250324975073a78cb476b)

5 years agoMerge remote-tracking branch 'origin/nautilus' into nautilus
Josh Durgin [Wed, 15 Apr 2020 17:12:49 +0000 (13:12 -0400)]
Merge remote-tracking branch 'origin/nautilus' into nautilus

Conflicts:
src/msg/async/ProtocolV2.cc - rename of outcoming_bl to outgoing_bl

5 years agoqa/tasks/ceph.py: fail test if osd devices not found 34256/head
Nathan Cutler [Tue, 22 Oct 2019 14:45:04 +0000 (16:45 +0200)]
qa/tasks/ceph.py: fail test if osd devices not found

Fixes: https://tracker.ceph.com/issues/42357
Signed-off-by: Nathan Cutler <ncutler@suse.com>
(cherry picked from commit bc76b39a30ba1301132b14dd65f0f9ee935c508b)

5 years agoqa/tasks/ceph.py: use .format to log dicts
Nathan Cutler [Tue, 22 Oct 2019 14:35:27 +0000 (16:35 +0200)]
qa/tasks/ceph.py: use .format to log dicts

The ".format" builtin logs dicts nicely right out of the box.

Also, some of the log messages were too cryptic - fixed them in this commit as
well.

Signed-off-by: Nathan Cutler <ncutler@suse.com>
(cherry picked from commit 9abebf28a8c519053bf2e89a944a0b1fdc167ddd)

5 years agoqa/tasks/ceph.py: drop roles_to_journals and remote_to_roles_to_journals
Nathan Cutler [Tue, 22 Oct 2019 14:31:14 +0000 (16:31 +0200)]
qa/tasks/ceph.py: drop roles_to_journals and remote_to_roles_to_journals

These do not seem to get any use anymore.

Signed-off-by: Nathan Cutler <ncutler@suse.com>
(cherry picked from commit ad477be286e373aa00cbf0ab02f9bc9b1321663e)

Conflicts:
qa/tasks/ceph.py
- conflict caused by missing py3-ization in nautilus

5 years agoqa/tasks/ceph.py: drop block_journal, tmpfs_journal
Nathan Cutler [Tue, 22 Oct 2019 13:59:12 +0000 (15:59 +0200)]
qa/tasks/ceph.py: drop block_journal, tmpfs_journal

I looked, but did not find any tests that actually use these options.

Signed-off-by: Nathan Cutler <ncutler@suse.com>
(cherry picked from commit 13933171297da0e35461e0c7420751867a645b5b)

Conflicts:
qa/tasks/ceph.py
- when tmpfs journal was enabled, something slightly different was
  happening in nautilus compared to master, but this commit is ripping
  out the whole thing

5 years agoqa/tasks/ceph.py: cleanup: stop calling get_wwn_id_map()
Nathan Cutler [Tue, 22 Oct 2019 13:42:48 +0000 (15:42 +0200)]
qa/tasks/ceph.py: cleanup: stop calling get_wwn_id_map()

Nowadays, get_wwn_id_map is essentially a noop - it does:

    return dict((d, d) for d in devs)

This reverts another bit of 8f720454cbb536ac6f410fb6c18b2b0945b70160 from 2013.

References: https://tracker.ceph.com/issues/42313
Signed-off-by: Nathan Cutler <ncutler@suse.com>
(cherry picked from commit 51c714d9b29402f21b25b5754d42f917964079e2)

Conflicts:
qa/tasks/ceph.py
- trivial conflict caused by missing py3-ization in nautilus

5 years agoosd/PeeringState.h: ignore RemoteBackfillReserved in WaitLocalBackfillReserved 34512/head
Neha [Tue, 25 Feb 2020 03:01:41 +0000 (03:01 +0000)]
osd/PeeringState.h: ignore RemoteBackfillReserved in WaitLocalBackfillReserved

It is possible to dequeue an outstanding RemoteBackfillReserved, though we may have
already released reservations for that backfill target. Currently, if this happens
while we are in WaitLocalBackfillReserved, it can lead to a crash on the primary.
Prevent this by treating this condition as a no-op.

The longer term fix is to add a RELEASE_ACK mechanism, which prevents the primary
from scheduling a backfill retry until all the RELEASE_ACKs have been received.

Fixes: https://tracker.ceph.com/issues/44248
Signed-off-by: Neha Ojha <nojha@redhat.com>
(cherry picked from commit 61152ac29654a819eb961e5fc2d7f63b706e15c9)

Conflicts:
src/osd/PeeringState.h
  - The RemoteBackfillReserved still in src/osd/PG.h in nautilus.
            Manually backport this fix to src/osd/PG.h

5 years agomon: stash newer map on bootstrap when addr doesn't match 34500/head
Sage Weil [Wed, 19 Feb 2020 23:42:09 +0000 (17:42 -0600)]
mon: stash newer map on bootstrap when addr doesn't match

If we have to respawn because a newer monmap comes along where our addr or
rank changes, we need to use that on restart in order to make progress.
Stash the newer map in a temporary location and use it when we restart.

Don't bother cleaning up.  Having this map here is harmless, since we
only use it if it is newer than what is in paxos.

Fixes: https://tracker.ceph.com/issues/44076
Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit 71befa298658925555841a2a98802210954358ce)

5 years ago14.2.9 v14.2.9
Jenkins Build Slave User [Thu, 9 Apr 2020 16:17:28 +0000 (16:17 +0000)]
14.2.9

5 years agoMerge pull request #34473 from Vicente-Cheng/wip-44995-nautilus
Lenz Grimmer [Thu, 9 Apr 2020 10:19:14 +0000 (12:19 +0200)]
Merge pull request #34473 from Vicente-Cheng/wip-44995-nautilus

nautilus: mgr/dashboard: Fix error in unit test caused by timezone

Reviewed-by: Kiefer Chang <kiefer.chang@suse.com>
Reviewed-by: Volker Theile <vtheile@suse.com>
5 years agoMerge pull request #34055 from callithea/wip-44668-nautilus
Lenz Grimmer [Thu, 9 Apr 2020 09:40:43 +0000 (11:40 +0200)]
Merge pull request #34055 from callithea/wip-44668-nautilus

nautilus: qa: use small default pg count for CephFS pools

Reviewed-by: Alfonso Martínez <almartin@redhat.com>
Reviewed-by: Volker Theile <vtheile@suse.com>
5 years agoMerge pull request #34354 from smithfarm/wip-44711-nautilus
Yuri Weinstein [Wed, 8 Apr 2020 22:53:07 +0000 (15:53 -0700)]
Merge pull request #34354 from smithfarm/wip-44711-nautilus

nautilus: mgr/DaemonServer: fix pg merge checks

Reviewed-by: Neha Ojha <nojha@redhat.com>
Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Xiaoxi Chen <xiaoxi.chen@intel.com>
5 years agoMerge pull request #34297 from vumrao/wip-vumrao-44818
Yuri Weinstein [Wed, 8 Apr 2020 22:52:07 +0000 (15:52 -0700)]
Merge pull request #34297 from vumrao/wip-vumrao-44818

nautilus: common/options: Disable bluefs_buffered_io by default again.

Reviewed-by: Neha Ojha <nojha@redhat.com>
Reviewed-by: Mark Nelson <mnelson@redhat.com>
5 years agoMerge pull request #33889 from ifed01/wip-ifed-flexible-bluefs-nautilus
Yuri Weinstein [Wed, 8 Apr 2020 22:49:51 +0000 (15:49 -0700)]
Merge pull request #33889 from ifed01/wip-ifed-flexible-bluefs-nautilus

nautilus: os/bluestore: more flexible DB volume space usage

Reviewed-by: Adam Kupczyk <akupczyk@redhat.com>
Reviewed-by: Neha Ojha <nojha@redhat.com>
5 years agomgr/dashboard: fix tests in order to match pg num conventions 34055/head
Tatjana Dehler [Fri, 8 Nov 2019 12:51:40 +0000 (13:51 +0100)]
mgr/dashboard: fix tests in order to match pg num conventions

Update the tests test_ganesha and test_rbd_mirroring in order
to match the PG num conventions. It prevents the health warning
'POOL_PG_NUM_NOT_POWER_OF_TWO' from being shown.

Signed-off-by: Tatjana Dehler <tdehler@suse.com>
(cherry picked from commit ee46e58e5dc779418492ef6b8c5e687f36ecb3f6)