]> git.apps.os.sepia.ceph.com Git - ceph.git/log
ceph.git
4 years agomgr/dashboard: ensure password is a string before encoding it 40522/head
Kefu Chai [Wed, 31 Mar 2021 11:09:56 +0000 (19:09 +0800)]
mgr/dashboard: ensure password is a string before encoding it

otherwise we have following failure:

AttributeError: 'bytes' object has no attribute 'encode'

this change is not cherry-picked from master, as master has dropped
python2 support.

Signed-off-by: Kefu Chai <kchai@redhat.com>
4 years agomgr/dashboard: encode non-ascii string before passing it to exec_cmd()
Kefu Chai [Wed, 31 Mar 2021 11:00:59 +0000 (19:00 +0800)]
mgr/dashboard: encode non-ascii string before passing it to exec_cmd()

because on Python3, tempfile.TemporaryFile() is opened in binary mode by
default, we need to encode non-ascii string before write to it.
otherwise, we have following failure:

self = <dashboard.tests.test_access_control.AccessControlTest testMethod=test_unicode_password>

    def test_unicode_password(self):
        self.test_create_user()
        password = '\u7ae0\u9c7c\u4e0d\u662f\u5bc6\u7801'
        with tempfile.TemporaryFile(mode='w+') as pwd_file:
>           pwd_file.write(password)
E           UnicodeEncodeError: 'latin-1' codec can't encode characters in position 0-5: ordinal not in range(256)

tests/test_access_control.py:576: UnicodeEncodeError

this change is not cherry-picked from master, as master has dropped
python2 support.

Signed-off-by: Kefu Chai <kchai@redhat.com>
4 years agoMerge branch 'nautilus-saved' into nautilus
Josh Durgin [Tue, 30 Mar 2021 18:38:17 +0000 (14:38 -0400)]
Merge branch 'nautilus-saved' into nautilus

4 years ago14.2.19 v14.2.19
Jenkins Build Slave User [Tue, 30 Mar 2021 16:19:18 +0000 (16:19 +0000)]
14.2.19

4 years agocommon/ipaddr: also skip just `lo`
Dan van der Ster [Tue, 23 Mar 2021 08:00:11 +0000 (09:00 +0100)]
common/ipaddr: also skip just `lo`

Skip iface's with name like 'lo' or of the form 'lo:0', 'lo:1'. This
brings back the original behavior from b6d0fc9e0e515e50894c08217d688a8c94db7570

Signed-off-by: Dan van der Ster <daniel.vanderster@cern.ch>
Fixes: https://tracker.ceph.com/issues/49938
(cherry picked from commit 6147c0917157efd2d35610e759685656a4989abb)
(cherry picked from commit bed79d5bea3183b153ffb223d049074912947516)

4 years agoMerge pull request #40485 from tchaikov/nautilus-pr-focal
Kefu Chai [Tue, 30 Mar 2021 09:22:15 +0000 (17:22 +0800)]
Merge pull request #40485 from tchaikov/nautilus-pr-focal

debian/control: add missing commas, use python3 packages for "make check" on focal

Reviewed-by: Brad Hubbard <bhubbard@redhat.com>
4 years agodo_cmake: always pass -DWITH_PYTHON3 to cmake 40485/head
Kefu Chai [Thu, 4 Mar 2021 06:30:17 +0000 (14:30 +0800)]
do_cmake: always pass -DWITH_PYTHON3 to cmake

do not pretend that we support python2 anymore.

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

Conflicts:
do_cmake.sh: nautilus still supports python2. so, to
run "make check" with python3 only, we should disable it explicitly.

4 years agodebian/control: install python3-* packages for "make check"
Kefu Chai [Tue, 30 Mar 2021 02:38:43 +0000 (10:38 +0800)]
debian/control: install python3-* packages for "make check"

Signed-off-by: Kefu Chai <kchai@redhat.com>
Conflicts:
debian/control: this change is not cherry-picked from master,
the corresponding commit in master is
50162091461e42939375475f70ecfd0817f2551c, but that commit also includes
the changes to update the runtime dependencies to python3. but we only
need to update the dependencies for running "make check". so instead
of cherry-picking from master, a separated change is made here.

4 years agodebian: remove python >= 2.7 requirement
Alfredo Deza [Mon, 21 Oct 2019 17:06:25 +0000 (13:06 -0400)]
debian: remove python >= 2.7 requirement

Signed-off-by: Alfredo Deza <adeza@redhat.com>
(cherry picked from commit 68025b633567f0d7ec680d94021ae723618683a3)

Conflicts:
       debian/control: we still need python 2.7 at runtime
         so ignore that change, but we need to use tox instead of
         python-tox for running "make check" on focal, so we
         need the tox change in this commit.

4 years agodebian/control: fix Build-Depends
Kefu Chai [Tue, 27 Aug 2019 02:05:15 +0000 (10:05 +0800)]
debian/control: fix Build-Depends

it's a regression introduced by 5d6d770e

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

 Conflicts:
debian/control: Additional package in HEAD

4 years agoMerge pull request #40423 from k0ste/wip-49996-nautilus
Yuri Weinstein [Mon, 29 Mar 2021 15:47:52 +0000 (08:47 -0700)]
Merge pull request #40423 from k0ste/wip-49996-nautilus

nautilus: common/ipaddr: skip loopback interfaces named 'lo' and test it

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
4 years agotest_ipaddr: check that we correctly skip loopback 40423/head
Dan van der Ster [Tue, 23 Mar 2021 10:28:37 +0000 (11:28 +0100)]
test_ipaddr: check that we correctly skip loopback

We should skip devices named 'lo' or of the form 'lo:0' regardless
of their IP address.

Signed-off-by: Dan van der Ster <daniel.vanderster@cern.ch>
Related-to: https://tracker.ceph.com/issues/49938
(cherry picked from commit 780125d1ed93cd7b17172752b3e76186a524103b)

4 years agocommon/ipaddr: also skip just `lo`
Dan van der Ster [Tue, 23 Mar 2021 08:00:11 +0000 (09:00 +0100)]
common/ipaddr: also skip just `lo`

Skip iface's with name like 'lo' or of the form 'lo:0', 'lo:1'. This
brings back the original behavior from b6d0fc9e0e515e50894c08217d688a8c94db7570

Signed-off-by: Dan van der Ster <daniel.vanderster@cern.ch>
Fixes: https://tracker.ceph.com/issues/49938
(cherry picked from commit 6147c0917157efd2d35610e759685656a4989abb)

4 years agoMerge pull request #40335 from tchaikov/nautilus-prettytable
Kefu Chai [Sat, 27 Mar 2021 18:03:22 +0000 (02:03 +0800)]
Merge pull request #40335 from tchaikov/nautilus-prettytable

nautilus: pybind/ceph_daemon: do not fail if prettytable is not available

Reviewed-by: Ernesto Puerta <epuertat@redhat.com>
Reviewed-by: Neha Ojha <nojha@redhat.com>
4 years agoMerge pull request #40407 from tchaikov/nautilus-pr-40400
Kefu Chai [Fri, 26 Mar 2021 01:27:16 +0000 (09:27 +0800)]
Merge pull request #40407 from tchaikov/nautilus-pr-40400

nautilus: run-make-check.sh: let ctest generate XML output

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
4 years agorun-make-check.sh: let ctest generate XML output 40407/head
Kefu Chai [Thu, 25 Mar 2021 09:08:48 +0000 (17:08 +0800)]
run-make-check.sh: let ctest generate XML output

to enable XUnit plugin of jenkins to consume the ctest output and
publish it in the dashboard, we need to

* let ctest generate XML output instead of plain text output
* do not fail the test if any test case fails. this allows the publisher
  to do its job by checking the XML output.
* prevent ctest from compressing the output. see
  https://issues.jenkins.io/browse/JENKINS-21737

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

4 years agoMerge pull request #39947 from mfoliveira/wip-43921-nautilus
Casey Bodley [Wed, 24 Mar 2021 18:50:44 +0000 (14:50 -0400)]
Merge pull request #39947 from mfoliveira/wip-43921-nautilus

nautilus: rgw: beast frontend uses 512k mprotected coroutine stacks

Reviewed-by: Casey Bodley <cbodley@redhat.com>
Reviewed-by: Daniel Gryniewicz <dang@redhat.com>
4 years agoMerge pull request #39767 from ivancich/wip-49195-nautilus
Yuri Weinstein [Wed, 24 Mar 2021 18:19:19 +0000 (11:19 -0700)]
Merge pull request #39767 from ivancich/wip-49195-nautilus

nautilus: rgw: allow rgw-orphan-list to handle intermediate files w/ binary data

Reviewed-by: Adam Emerson <aemerson@redhat.com>
Reviewed-by: Ali Maredia <amaredia@redhat.com>
4 years agoMerge pull request #39869 from rhcs-dashboard/wip-49084-nautilus
Yuri Weinstein [Tue, 23 Mar 2021 18:56:57 +0000 (11:56 -0700)]
Merge pull request #39869 from rhcs-dashboard/wip-49084-nautilus

nautilus: mgr/dashboard: Fix missing root path of each session for CephFS

Reviewed-by: Nizamudeen A <nia@redhat.com>
Reviewed-by: Laura Paduano <lpaduano@suse.com>
Reviewed-by: Tatjana Dehler <tdehler@suse.com>
4 years agoMerge pull request #39853 from rhcs-dashboard/wip-49600-nautilus
Yuri Weinstein [Tue, 23 Mar 2021 18:55:56 +0000 (11:55 -0700)]
Merge pull request #39853 from rhcs-dashboard/wip-49600-nautilus

nautilus: mgr/dashboard: report mgr fsid

Reviewed-by: Laura Paduano <lpaduano@suse.com>
Reviewed-by: Nizamudeen A <nia@redhat.com>
4 years agoMerge pull request #40003 from rhcs-dashboard/wip-49704-nautilus
Ernesto Puerta [Tue, 23 Mar 2021 17:25:23 +0000 (18:25 +0100)]
Merge pull request #40003 from rhcs-dashboard/wip-49704-nautilus

nautilus: mgr/dashboard: fix dashboard instance ssl certificate functionality

Reviewed-by: Nizamudeen A <nia@redhat.com>
4 years agoMerge pull request #39511 from rhcs-dashboard/wip-48861-nautilus
Ernesto Puerta [Tue, 23 Mar 2021 17:00:54 +0000 (18:00 +0100)]
Merge pull request #39511 from rhcs-dashboard/wip-48861-nautilus

nautilus: mgr/dashboard: Monitoring alert badge includes suppressed alerts

Reviewed-by: Aashish Sharma <aasharma@redhat.com>
Reviewed-by: Alfonso Martínez <almartin@redhat.com>
Reviewed-by: Nizamudeen A <nia@redhat.com>
4 years agoMerge pull request #39920 from smithfarm/wip-49529-nautilus
Yuri Weinstein [Tue, 23 Mar 2021 16:55:37 +0000 (09:55 -0700)]
Merge pull request #39920 from smithfarm/wip-49529-nautilus

nautilus: crush/CrushWrapper: update shadow trees on update_item()

Reviewed-by: Neha Ojha <nojha@redhat.com>
4 years agoMerge pull request #40333 from tchaikov/nautilus-44163
Kefu Chai [Tue, 23 Mar 2021 09:44:54 +0000 (17:44 +0800)]
Merge pull request #40333 from tchaikov/nautilus-44163

nautilus: cmake: detect gettid() presense

Reviewed-by: Igor Fedotov <ifedotov@suse.com>
4 years agopybind/ceph_daemon: do not fail if prettytable is not available 40335/head
Kefu Chai [Tue, 23 Mar 2021 08:06:45 +0000 (16:06 +0800)]
pybind/ceph_daemon: do not fail if prettytable is not available

ubuntu focal does not package python-prettytable. but we need to run
"make check" on focal. it turns out the prettytable is not a must have
for running "make check", so just skip it if it is not around.

this change is not cherry-picked from master, as we have dropped python2
support in master, and python3-prettytable is packged fro python3 on
ubuntu focal. also nautilus is the latest release which has python2
support.

Signed-off-by: Kefu Chai <kchai@redhat.com>
4 years agocmake: detect gettid() presense 40333/head
Igor Fedotov [Mon, 11 Nov 2019 22:20:12 +0000 (01:20 +0300)]
cmake: detect gettid() presense

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

Conflicts:
cmake/modules/CephChecks.cmake
src/test/fio/CMakeLists.txt: check gettid() in /CMakeLists.txt
instead, as nautilus does not have cmake/modules/CephChecks.cmake by
then.

4 years agoMerge pull request #40121 from jdurgin/wip-nautilus-release-note
Nathan Cutler [Mon, 22 Mar 2021 11:00:18 +0000 (12:00 +0100)]
Merge pull request #40121 from jdurgin/wip-nautilus-release-note

PendingReleaseNotes: note about 14.2.18 mgr fixes

Reviewed-by: Ernesto Puertat <epuertat@redhat.com>
Reviewed-by: Nathan Cutler <ncutler@suse.com>
4 years agoMerge pull request #40287 from tchaikov/nautilus-pr-40272 40302/head
Kefu Chai [Sun, 21 Mar 2021 17:20:04 +0000 (01:20 +0800)]
Merge pull request #40287 from tchaikov/nautilus-pr-40272

nautilus: install-deps.sh: remove existing ceph-libboost of different version

Reviewed-by: David Galloway <dgallowa@redhat.com>
4 years agoinstall-deps.sh: remove existing ceph-libboost of different version 40287/head
Kefu Chai [Sat, 20 Mar 2021 05:00:01 +0000 (13:00 +0800)]
install-deps.sh: remove existing ceph-libboost of different version

we install different versions of precompiled ceph-libboost packages
for different branches when building and testing them on ubuntu test
nodes. for instance,

- nautilus, octopus: v1.72
- pacific: v1.73

they share the same set of test nodes. and these ceph-libboost packages
conflict with each other, because they install files to the same places.

in order to avoid the confliction, we should uninstall existing packages
before installing a different version of ceph-libboost packages.

ceph-libboost${version}-dev is a package providing the shared headers of
boost library, so, in this change we check if it is installed before
returning or removing the existing packages.

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

Conflicts:
install-deps.sh: trivial resolution

4 years agoMerge pull request #40212 from idryomov/wip-krbd-blkroset-5.12-nautilus
Ilya Dryomov [Thu, 18 Mar 2021 20:22:12 +0000 (21:22 +0100)]
Merge pull request #40212 from idryomov/wip-krbd-blkroset-5.12-nautilus

nautilus: qa: krbd_blkroset.t: update for separate hw and user read-only flags

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
4 years agoqa: krbd_blkroset.t: update for separate hw and user read-only flags 40212/head
Ilya Dryomov [Wed, 17 Mar 2021 10:00:33 +0000 (11:00 +0100)]
qa: krbd_blkroset.t: update for separate hw and user read-only flags

Since kernel 5.12, hardware read-only state and user read-only
policy (BLKROGET/SET ioctls) are tracked separately in the block
layer.  As the purpose of our ->set_read_only() method was exactly
that, it was removed.

As a side effect, BLKROSET no longer returns EROFS on an attempt
to make a read-only mapping read-write with "blockdev --setrw".
The policy gets updated, but the device remains read-only as before
because the hardware (== mapping) state is controlled by the driver.

Fixes: https://tracker.ceph.com/issues/49858
Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
(cherry picked from commit d72fca26edcff49d203ed6fb940e0cf331e943dd)

4 years ago14.2.18 v14.2.18
Jenkins Build Slave User [Mon, 15 Mar 2021 17:46:20 +0000 (17:46 +0000)]
14.2.18

4 years agoPendingReleaseNotes: note about 14.2.18 mgr fixes 40121/head
Josh Durgin [Mon, 15 Mar 2021 15:51:04 +0000 (11:51 -0400)]
PendingReleaseNotes: note about 14.2.18 mgr fixes

Signed-off-by: Josh Durgin <jdurgin@redhat.com>
4 years agoMerge pull request #40116 from votdev/issue_49802
Josh Durgin [Mon, 15 Mar 2021 17:21:30 +0000 (10:21 -0700)]
Merge pull request #40116 from votdev/issue_49802

nautilus: mgr/dashboard: Python2 Cookie module import fails on Python3

Reviewed-by: Avan Thakkar <athakkar@redhat.com>
Reviewed-by: Tatjana Dehler <tdehler@suse.com>
Reviewed-by: Aashish Sharma <aasharma@redhat.com>
Reviewed-by: Ernesto Puerta <epuertat@redhat.com>
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Reviewed-by: Nathan Cutler <ncutler@suse.com>
Reviewed-by: Laura Paduano <lpaduano@suse.com>
4 years agoMerge pull request #40095 from jdurgin/wip-typing-nautilus
Josh Durgin [Mon, 15 Mar 2021 13:57:47 +0000 (06:57 -0700)]
Merge pull request #40095 from jdurgin/wip-typing-nautilus

nautilus: mgr/volumes: don't require typing

Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
4 years agomgr/dashboard: Python2 Cookie module import fails on Python3 40116/head
Volker Theile [Mon, 15 Mar 2021 12:10:53 +0000 (13:10 +0100)]
mgr/dashboard: Python2 Cookie module import fails on Python3

This fix only affects Nautilus because all successor versions are based on Python3 only.

Fixes: https://tracker.ceph.com/issues/49802
Signed-off-by: Volker Theile <vtheile@suse.com>
4 years agomgr/volumes: don't require typing 40095/head
Josh Durgin [Fri, 12 Mar 2021 21:53:04 +0000 (16:53 -0500)]
mgr/volumes: don't require typing

This isn't available for python2 on centos 7. This is only needed
for nautilus because that's the last release using python 2 and centos 7.

Fixes: https://tracker.ceph.com/issues/49762
Signed-off-by: Josh Durgin <jdurgin@redhat.com>
4 years agoMerge pull request #40064 from idryomov/wip-krbd-xfstests-fixes-nautilus
Ilya Dryomov [Fri, 12 Mar 2021 15:27:34 +0000 (16:27 +0100)]
Merge pull request #40064 from idryomov/wip-krbd-xfstests-fixes-nautilus

nautilus: qa/suites/krbd: address recent issues caused by newer kernels

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
4 years agoMerge pull request #39926 from tchaikov/nautilus-pr-triage
Kefu Chai [Fri, 12 Mar 2021 05:47:12 +0000 (13:47 +0800)]
Merge pull request #39926 from tchaikov/nautilus-pr-triage

nautilus: .github: add workflow for adding labels and milestone

Reviewed-by: Ernesto Puerta <epuertat@redhat.com>
4 years ago14.2.17 v14.2.17
Jenkins Build Slave User [Thu, 11 Mar 2021 17:07:32 +0000 (17:07 +0000)]
14.2.17

4 years agomgr/dashboard: fix dashboard instance ssl certificate functionality 40003/head
Avan Thakkar [Tue, 16 Feb 2021 22:25:29 +0000 (03:55 +0530)]
mgr/dashboard: fix dashboard instance ssl certificate functionality

Fixes: https://tracker.ceph.com/issues/46542
Signed-off-by: Avan Thakkar <athakkar@redhat.com>
(cherry picked from commit 0a88c62e76f80a4ad9c01a91161b77ac6f073ed4)

 Conflicts:
src/pybind/mgr/dashboard/module.py
src/pybind/mgr/mgr_module.py
  - Adopting required master branch changes.

4 years agoqa/suites/krbd: bump scratch image size to 15G 40064/head
Ilya Dryomov [Wed, 24 Feb 2021 10:41:24 +0000 (11:41 +0100)]
qa/suites/krbd: bump scratch image size to 15G

Allow generic/038 and generic/048 to run.

Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
(cherry picked from commit 37d56e13544fa06b88196b1a4d6edd1b3425325e)

4 years agoqa/suites/krbd: exclude ext4/002
Ilya Dryomov [Fri, 26 Feb 2021 12:54:49 +0000 (13:54 +0100)]
qa/suites/krbd: exclude ext4/002

ext4/002 exercises obsolete EXT4_EOFBLOCKS_FL feature that was removed
in kernel 5.7 and therefore always fails.

Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
(cherry picked from commit d2bdf0ac43a35f755ea70103f497625d882a4592)

4 years agoqa/tasks/rbd: fix xfstests_branch/url example
Ilya Dryomov [Sat, 27 Feb 2021 13:58:45 +0000 (14:58 +0100)]
qa/tasks/rbd: fix xfstests_branch/url example

- don't mention xfstests_branch together with xfstests_url as
  xfstests_branch gets superseded by xfstests_url
- make xfstests_url example more clear

Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
(cherry picked from commit ec36d501ed5f875d26d1362ec097187697170a4d)

4 years agoMerge pull request #39960 from neha-ojha/wip-49672-nautilus
Yuri Weinstein [Tue, 9 Mar 2021 22:22:45 +0000 (14:22 -0800)]
Merge pull request #39960 from neha-ojha/wip-49672-nautilus

nautilus: qa/tasks/ceph_manager.py: don't use log-early in raw_cluster_cmd

Reviewed-by: Yuri Weinstein <yweinste@redhat.com>
Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
4 years agoqa/tasks/ceph_manager.py: don't use log-early in raw_cluster_cmd 39960/head
Neha Ojha [Tue, 9 Mar 2021 19:40:31 +0000 (19:40 +0000)]
qa/tasks/ceph_manager.py: don't use log-early in raw_cluster_cmd

This option is not present in older versions due to which upgrade tests
using the nautilus version of the task will fail.

Caused by https://github.com/ceph/ceph/pull/37906

Fixes: https://tracker.ceph.com/issues/49672
Signed-off-by: Neha Ojha <nojha@redhat.com>
4 years ago.github/workflows: use a released sha1 39926/head
Kefu Chai [Tue, 9 Mar 2021 04:16:26 +0000 (12:16 +0800)]
.github/workflows: use a released sha1

otherwise the action cannot be found

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

4 years ago.github/workflows: rename labeler.yml to pr-triage.yml
Kefu Chai [Mon, 8 Mar 2021 18:46:46 +0000 (02:46 +0800)]
.github/workflows: rename labeler.yml to pr-triage.yml

to reflect the change in the actions in it.

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

4 years ago.github/workflows: use @{sha1} for actions
Kefu Chai [Mon, 8 Mar 2021 18:26:34 +0000 (02:26 +0800)]
.github/workflows: use @{sha1} for actions

more secure this way. see also https://julienrenaux.fr/2019/12/20/github-actions-security-risk/

point the sha1 to

* labeler@v3
* milestone@main HEAD

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

4 years ago.github/workflows: move milestone.yml into labeler.yml
Kefu Chai [Sun, 7 Mar 2021 11:21:25 +0000 (19:21 +0800)]
.github/workflows: move milestone.yml into labeler.yml

no need to have two actions triggered by the same event.

we could backport this labeler.yml to LTS branches.

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

4 years ago.github: correct the regex in mileston workflow
Kefu Chai [Sat, 6 Mar 2021 16:32:42 +0000 (00:32 +0800)]
.github: correct the regex in mileston workflow

also use pull_request_target event so the action is run in the
context of the base of the pull request. this helps us to overcome
the "Resource not accessible by integration" issue where the action
is run in the context of the pull request.

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

4 years ago.github: add workflow for adding milestone
Kefu Chai [Sat, 6 Mar 2021 13:18:13 +0000 (21:18 +0800)]
.github: add workflow for adding milestone

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

4 years agogithub/labeler: disable sync-labels
Ernesto Puerta [Wed, 18 Nov 2020 12:00:00 +0000 (13:00 +0100)]
github/labeler: disable sync-labels

Yaml syntax cleaned too.

Fixes: https://github.com/ceph/ceph/pull/38107#issuecomment-729300615
Signed-off-by: Ernesto Puerta <epuertat@redhat.com>
(cherry picked from commit 59702b6198c59b84f1695e37256ae351b331b604)

4 years agogithub: autolabel PRs
Ernesto Puerta [Thu, 12 Nov 2020 17:07:44 +0000 (18:07 +0100)]
github: autolabel PRs

... starting with dashboard ones.

Requires https://github.com/marketplace/actions/labeler

Signed-off-by: Ernesto Puerta <epuertat@redhat.com>
(cherry picked from commit 298bc67f7b8d1c64520b543f4749b29f7be67379)

Conflicts:
.github/CODEOWNERS: drop change in .github/CODEOWNERS
          as we don't have this file in nautilus.

4 years agocrush/CrushWrapper: rebuild shadow tree on 'osd crush reweight-subtree' 39920/head
Sage Weil [Tue, 23 Feb 2021 15:15:01 +0000 (09:15 -0600)]
crush/CrushWrapper: rebuild shadow tree on 'osd crush reweight-subtree'

Signed-off-by: Sage Weil <sage@newdream.net>
(cherry picked from commit 9115c62ad2239d5122d8cd73cece54c1b122487a)

4 years agocrush/CrushWrapper: update shadow trees on update_item()
Sage Weil [Mon, 22 Feb 2021 20:06:00 +0000 (14:06 -0600)]
crush/CrushWrapper: update shadow trees on update_item()

insert_item() already does this, but update_item did not.

Fixes: https://tracker.ceph.com/issues/48065
Signed-off-by: Sage Weil <sage@newdream.net>
(cherry picked from commit 33dee7d7bf26e675ae2783de9c25ccce53cdb321)

4 years agomgr/dashboard: Fix missing root path of each session for CephFS 39869/head
Yongseok Oh [Fri, 7 Aug 2020 11:20:17 +0000 (20:20 +0900)]
mgr/dashboard: Fix missing root path of each session for CephFS

Signed-off-by: Yongseok Oh <yongseok.oh@linecorp.com>
(cherry picked from commit 7c3cadd09645575898a85d2b50b95808b334de69)

 Conflicts:
src/pybind/mgr/dashboard/controllers/cephfs.py
      - Adopting the master branch changes.

4 years agotest/rgw: fix test_rgw_reshard_wait with -DHAVE_BOOST_CONTEXT=OFF 39947/head
Yaakov Selkowitz [Thu, 23 Jan 2020 18:26:16 +0000 (13:26 -0500)]
test/rgw: fix test_rgw_reshard_wait with -DHAVE_BOOST_CONTEXT=OFF

This include, like the code which calls it, should have been
conditionalized in commit 069dd7af3923cded76cbbd96f4b1020397ea6f11.

Signed-off-by: Yaakov Selkowitz <yselkowi@redhat.com>
(cherry picked from commit a96849df84f3141bb012b3d7f37fe1e2ffb95f99)
Signed-off-by: Mauricio Faria de Oliveira <mfo@canonical.com>
4 years agoCMake - Workaround set Boost_component_FOUND
Daniel Gryniewicz [Thu, 12 Dec 2019 15:41:08 +0000 (10:41 -0500)]
CMake - Workaround set Boost_component_FOUND

BuildBoost.cmake (used when we're building the submodule) doesn't
provide parity with FindBoost.cmake (used with system Boost).
Specifically, it doesn't set the _FOUND variables for the various
components, making it hard to depend on finding those features.

Set Boost_<component>_FOUND for all the components we're building in
BuildBoost.cmake to make using these variables possible.

Signed-off-by: Daniel Gryniewicz <dang@redhat.com>
(cherry picked from commit 0f4cb207bb4a9905619894286edd41a89379a747)
Signed-off-by: Mauricio Faria de Oliveira <mfo@canonical.com>
4 years agorgw: Add more spawn linking
Daniel Gryniewicz [Wed, 11 Dec 2019 18:41:15 +0000 (13:41 -0500)]
rgw: Add more spawn linking

Signed-off-by: Daniel Gryniewicz <dang@redhat.com>
(cherry picked from commit 4ca4201b7fe3e0ca172548204b4b888a0908d162)
Signed-off-by: Mauricio Faria de Oliveira <mfo@canonical.com>
Conflicts:
        src/cls/CMakeLists.txt
        src/test/rgw/CMakeLists.txt

- Add spawn headers to includes to fix the two build errors below.
  No linking is needed since the files don't use 'spawn::' at all.

  In file included from /git/ceph/src/rgw/rgw_common.h:31:0,
                   from /git/ceph/src/cls/otp/cls_otp_client.cc:25:
  /git/ceph/src/common/async/yield_context.h:31:10: fatal error: spawn/spawn.hpp: No such file or directory
   #include <spawn/spawn.hpp>
            ^~~~~~~~~~~~~~~~~
  compilation terminated.
  src/cls/CMakeFiles/cls_otp_client.dir/build.make:62: recipe for target 'src/cls/CMakeFiles/cls_otp_client.dir/otp/cls_otp_client.cc.o' failed

  In file included from /git/ceph/src/rgw/rgw_dmclock_scheduler.h:21:0,
                   from /git/ceph/src/rgw/rgw_dmclock_sync_scheduler.h:18,
                   from /git/ceph/src/test/rgw/test_rgw_dmclock_scheduler.cc:17:
  /git/ceph/src/common/async/yield_context.h:31:10: fatal error: spawn/spawn.hpp: No such file or directory
   #include <spawn/spawn.hpp>
            ^~~~~~~~~~~~~~~~~
  compilation terminated.
  src/test/rgw/CMakeFiles/unittest_rgw_dmclock_scheduler.dir/build.make:62: recipe for target 'src/test/rgw/CMakeFiles/unittest_rgw_dmclock_scheduler.dir/test_rgw_dmclock_scheduler.cc.o' failed

4 years agocmake/rgw: move {rgw_libs} dependency into test_rgw_a target
Casey Bodley [Wed, 11 Dec 2019 17:56:22 +0000 (12:56 -0500)]
cmake/rgw: move {rgw_libs} dependency into test_rgw_a target

Signed-off-by: Casey Bodley <cbodley@redhat.com>
(cherry picked from commit 3310cbc653486be89bc7a1d28f235d0ede748378)
Signed-off-by: Mauricio Faria de Oliveira <mfo@canonical.com>
4 years agotest/rgw: unittest_rgw_reshard_wait uses spawn library
Casey Bodley [Thu, 5 Dec 2019 22:08:44 +0000 (17:08 -0500)]
test/rgw: unittest_rgw_reshard_wait uses spawn library

Signed-off-by: Casey Bodley <cbodley@redhat.com>
(cherry picked from commit 069dd7af3923cded76cbbd96f4b1020397ea6f11)
Signed-off-by: Mauricio Faria de Oliveira <mfo@canonical.com>
4 years agorgw: beast frontend uses 512k mprotected coroutine stacks
Casey Bodley [Tue, 12 Nov 2019 20:08:51 +0000 (15:08 -0500)]
rgw: beast frontend uses 512k mprotected coroutine stacks

Signed-off-by: Casey Bodley <cbodley@redhat.com>
(cherry picked from commit 3af8231cab07b731a2d5158a1aa9ec6b524158da)
Signed-off-by: Mauricio Faria de Oliveira <mfo@canonical.com>
4 years agorgw: use new spawn() implementation
Casey Bodley [Wed, 6 Nov 2019 20:57:01 +0000 (15:57 -0500)]
rgw: use new spawn() implementation

Signed-off-by: Casey Bodley <cbodley@redhat.com>
(cherry picked from commit 769841a08c3e79985d9634f06c9ff4d62647dcda)
Signed-off-by: Mauricio Faria de Oliveira <mfo@canonical.com>
Conflicts:
src/rgw/CMakeLists.txt
- Remove changes for 'rgw_schedulers' cmake target, not in Nautilus.
- Link 'radosgw_a' against 'spawn'; transitivity from 'rgw_schedulers'
  (which is public) is lost, and 'rgw_a'/'rgw_libs' (which is private
  to 'radosgw_a') isn't enough to build 'rgw_main.cc' ( error below.)
src/rgw/rgw_aio.cc
- This file doesn't exist in Nautilus; similar changes are done in
  other files.
src/rgw/rgw_aio_throttle.h
- No changes required; the base for the changes (e.g., class, variables)
  are not in Nautilus.
src/rgw/rgw_asio_frontend.cc
- Less changes required, similarly; commit dd4350b not in Nautilus.

Build error:

  In file included from /git/ceph/src/rgw/rgw_common.h:31:0,
                   from /git/ceph/src/rgw/rgw_main.cc:15:
  /git/ceph/src/common/async/yield_context.h:31:10: fatal error: spawn/spawn.hpp: No such file or directory
   #include <spawn/spawn.hpp>
            ^~~~~~~~~~~~~~~~~
  compilation terminated.
  src/rgw/CMakeFiles/radosgw.dir/build.make:62: recipe for target 'src/rgw/CMakeFiles/radosgw.dir/rgw_main.cc.o' failed

4 years agogit: add submodule for spawn library
Casey Bodley [Wed, 6 Nov 2019 20:55:46 +0000 (15:55 -0500)]
git: add submodule for spawn library

Signed-off-by: Casey Bodley <cbodley@redhat.com>
(cherry picked from commit c84fc4036ea9481e47687f1a212419b6f83c3c94)
Signed-off-by: Mauricio Faria de Oliveira <mfo@canonical.com>
4 years agoMerge pull request #39837 from rhcs-dashboard/wip-49596-nautilus
Yuri Weinstein [Fri, 5 Mar 2021 20:41:05 +0000 (12:41 -0800)]
Merge pull request #39837 from rhcs-dashboard/wip-49596-nautilus

nautilus: mgr/dashboard: fix issues related with PyJWT versions >=2.0.0

Reviewed-by: Yuri Weinstein <yweinste@redhat.com>
Reviewed-by: Avan Thakkar <athakkar@redhat.com>
Reviewed-by: Ernesto Puerta <epuertat@redhat.com>
4 years agomgr/dashboard: report mgr fsid 39853/head
Ernesto Puerta [Fri, 12 Feb 2021 18:46:20 +0000 (19:46 +0100)]
mgr/dashboard: report mgr fsid

Add mgr fsid from the ceph mgr API.

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

 Conflicts:
src/pybind/mgr/dashboard/frontend/cypress/integration/cluster/configuration.e2e-spec.ts
      - This file doesn't exist in nautilus.

4 years agomgr/dashboard: fix issues related with PyJWT versions >=2.0.0 39837/head
Alfonso Martínez [Fri, 5 Mar 2021 07:52:59 +0000 (08:52 +0100)]
mgr/dashboard: fix issues related with PyJWT versions >=2.0.0

Fixes: https://tracker.ceph.com/issues/49574
Signed-off-by: Alfonso Martínez <almartin@redhat.com>
(cherry picked from commit 4b96bb51e8f133badd7bc651bcb4dcd755b43d75)

Conflicts:
       src/pybind/mgr/dashboard/controllers/auth.py
         - Resolved branch divergence conflicts.
       src/pybind/mgr/dashboard/services/auth.py
         - Resolved branch divergence  conflicts.
       src/pybind/mgr/dashboard/requirements.txt
         - Removed specific version (already done in master branch).

4 years agoMerge pull request #39720 from ifed01/wip-ifed-fix-no-cache-trim-nau
Yuri Weinstein [Thu, 4 Mar 2021 17:54:56 +0000 (09:54 -0800)]
Merge pull request #39720 from ifed01/wip-ifed-fix-no-cache-trim-nau

nautilus: os/bluestore: go beyond pinned onodes while trimming the cache.

Reviewed-by: Adam Kupczyk <akupczyk@redhat.com>
4 years agoMerge pull request #39747 from pcuzner/wip-49540-nautilus
Yuri Weinstein [Thu, 4 Mar 2021 17:54:15 +0000 (09:54 -0800)]
Merge pull request #39747 from pcuzner/wip-49540-nautilus

nautilus: mgr/prometheus: Add SLOW_OPS healthcheck as a metric

Reviewed-by: Neha Ojha <nojha@redhat.com>
4 years agoMerge pull request #39756 from ifed01/wip-ifed-zero-read-retry-nau
Yuri Weinstein [Thu, 4 Mar 2021 16:11:27 +0000 (08:11 -0800)]
Merge pull request #39756 from ifed01/wip-ifed-zero-read-retry-nau

nautilus: os/bluestore: Add option to check BlueFS reads

Reviewed-by: Adam Kupczyk <akupczyk@redhat.com>
4 years agoMerge pull request #39646 from rhcs-dashboard/wip-49389-nautilus
Ernesto Puerta [Thu, 4 Mar 2021 12:57:57 +0000 (13:57 +0100)]
Merge pull request #39646 from rhcs-dashboard/wip-49389-nautilus

nautilus: mgr/dashboard: fix tooltip for Provisioned/Total Provisioned fields

Reviewed-by: Aashish Sharma <aasharma@redhat.com>
Reviewed-by: Nizamudeen A <nia@redhat.com>
4 years agoMerge pull request #39526 from rhcs-dashboard/wip-49327-nautilus
Ernesto Puerta [Thu, 4 Mar 2021 12:56:48 +0000 (13:56 +0100)]
Merge pull request #39526 from rhcs-dashboard/wip-49327-nautilus

nautilus: mgr/dashboard: avoid using document.write()

Reviewed-by: Laura Paduano <lpaduano@suse.com>
Reviewed-by: Nizamudeen A <nia@redhat.com>
4 years agoMerge pull request #39342 from smithfarm/wip-49202-nautilus
Yuri Weinstein [Wed, 3 Mar 2021 16:09:38 +0000 (08:09 -0800)]
Merge pull request #39342 from smithfarm/wip-49202-nautilus

nautilus: common: skip interfaces starting with "lo" in find_ipv{4,6}_in_subnet()

Reviewed-by: Kefu Chai <kchai@redhat.com>
4 years agoMerge pull request #39340 from smithfarm/wip-48897-nautilus
Yuri Weinstein [Wed, 3 Mar 2021 16:09:11 +0000 (08:09 -0800)]
Merge pull request #39340 from smithfarm/wip-48897-nautilus

nautilus: mgr: fix deadlock in ActivePyModules::get_osdmap()

Reviewed-by: Kefu Chai <kchai@redhat.com>
4 years agoMerge pull request #39339 from smithfarm/wip-48558-nautilus
Yuri Weinstein [Wed, 3 Mar 2021 16:08:19 +0000 (08:08 -0800)]
Merge pull request #39339 from smithfarm/wip-48558-nautilus

nautilus: mgr/restful: fix TypeError occurring in _gather_osds()

Reviewed-by: Boris Ranto <branto@redhat.com>
4 years agoMerge pull request #39338 from smithfarm/wip-48575-nautilus
Yuri Weinstein [Wed, 3 Mar 2021 16:07:57 +0000 (08:07 -0800)]
Merge pull request #39338 from smithfarm/wip-48575-nautilus

nautilus: mgr/crash: Serialize command handling

Reviewed-by: Brad Hubbard <bhubbard@redhat.com>
Reviewed-by: Boris Ranto <branto@redhat.com>
4 years agoMerge pull request #39255 from ifed01/wip-ifed-fsck-spanning-nau
Yuri Weinstein [Wed, 3 Mar 2021 16:07:02 +0000 (08:07 -0800)]
Merge pull request #39255 from ifed01/wip-ifed-fsck-spanning-nau

nautilus: os/bluestore: detect and fix "zombie" spanning blobs using fsck.

Reviewed-by: Adam Kupczyk <akupczyk@redhat.com>
Reviewed-by: Neha Ojha <nojha@redhat.com>
4 years agoMerge pull request #39126 from smithfarm/wip-48987-nautilus
Yuri Weinstein [Wed, 3 Mar 2021 16:04:50 +0000 (08:04 -0800)]
Merge pull request #39126 from smithfarm/wip-48987-nautilus

nautilus: core: osd: An empty bucket or OSD is not an error

Reviewed-by: Brad Hubbard <bhubbard@redhat.com>
4 years agoMerge pull request #39543 from aaSharma14/wip-48588-nautilus
Ernesto Puerta [Tue, 2 Mar 2021 09:46:55 +0000 (10:46 +0100)]
Merge pull request #39543 from aaSharma14/wip-48588-nautilus

nautilus: mgr/dashboard: RGW User Form is validating disabled fields

Reviewed-by: Avan Thakkar <athakkar@redhat.com>
Reviewed-by: Ernesto Puerta <epuertat@redhat.com>
Reviewed-by: Nizamudeen A <nia@redhat.com>
4 years agoMerge pull request #39470 from jan--f/wip-49290-nautilus
Guillaume Abrioux [Tue, 2 Mar 2021 07:29:58 +0000 (08:29 +0100)]
Merge pull request #39470 from jan--f/wip-49290-nautilus

nautilus: ceph-volume: Update batch.py

4 years agoos/bluestore: go beyond pinned onodes while trimming the cache. 39720/head
Igor Fedotov [Fri, 26 Feb 2021 14:16:11 +0000 (17:16 +0300)]
os/bluestore: go beyond pinned onodes while trimming the cache.

One might face lack of cache trimming when there is a bunch of pinned entries on the top of Onode's cache LRU list. If these pinned entries stay in the state for a long time cache might start using too much memory causing OSD to go out of osd-memory-target limit. Pinned state tend to happen to osdmap onodes.
The proposed patch preserves last trim position in the LRU list (if it pointed to a pinned entry) and proceeds trimming from that position if it wasn't invalidated. LRU nature of the list enables to do that safely since no new entries appear above the previously present entry while it's not touched.

Fixes: https://tracker.ceph.com/issues/48729
Signed-off-by: Igor Fedotov <ifedotov@suse.com>
4 years agorgw: allow rgw-orphan-list to handle intermediate files w/ binary data 39767/head
J. Eric Ivancich [Thu, 4 Feb 2021 21:19:17 +0000 (16:19 -0500)]
rgw: allow rgw-orphan-list to handle intermediate files w/ binary data

Updates the grep commands with the --text command-line option since
there are cases where rados object names contain NUL characters.

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

4 years agoMerge pull request #39706 from batrick/i48286
Yuri Weinstein [Mon, 1 Mar 2021 17:56:49 +0000 (09:56 -0800)]
Merge pull request #39706 from batrick/i48286

nautilus: rados/upgrade/nautilus-x-singleton fails due to cluster [WRN] evicting unresponsive client

Reviewed-by: Yuri Weinstein <yweinste@redhat.com>
4 years agoMerge pull request #39276 from smithfarm/wip-49130-nautilus
Yuri Weinstein [Mon, 1 Mar 2021 17:39:32 +0000 (09:39 -0800)]
Merge pull request #39276 from smithfarm/wip-49130-nautilus

nautilus: rgw: fix trailing null in object names of multipart reuploads

Reviewed-by: Casey Bodley <cbodley@redhat.com>
4 years agoMerge pull request #39661 from pponnuvel/wip-49440-nautilus
Yuri Weinstein [Mon, 1 Mar 2021 17:16:05 +0000 (09:16 -0800)]
Merge pull request #39661 from pponnuvel/wip-49440-nautilus

nautilus: rgw: radosgw-admin: clarify error when email address already in use

Reviewed-by: Casey Bodley <cbodley@redhat.com>
4 years agoMerge pull request #39651 from smithfarm/wip-49055-nautilus
Yuri Weinstein [Mon, 1 Mar 2021 17:15:14 +0000 (09:15 -0800)]
Merge pull request #39651 from smithfarm/wip-49055-nautilus

nautilus: common/mempool: Improve mempool shard selection

Reviewed-by: Deepika Upadhyay <dupadhya@redhat.com>
4 years agoMerge pull request #39698 from ifed01/wip-ifed-fix-huge-bluefs-nau
Yuri Weinstein [Mon, 1 Mar 2021 17:11:10 +0000 (09:11 -0800)]
Merge pull request #39698 from ifed01/wip-ifed-fix-huge-bluefs-nau

nautilus: os/bluestore: fix huge read/writes in BlueFS

Reviewed-by: Jianpeng Ma <jianpeng.ma@intel.com>
Reviewed-by: Deepika Upadhyay <dupadhya@redhat.com>
4 years agoMerge pull request #39650 from smithfarm/wip-49182-nautilus
Yuri Weinstein [Mon, 1 Mar 2021 17:07:52 +0000 (09:07 -0800)]
Merge pull request #39650 from smithfarm/wip-49182-nautilus

nautilus: test/rbd-mirror: fix broken ceph_test_rbd_mirror_random_write

Reviewed-by: Mykola Golub <mgolub@mirantis.com>
4 years agoMerge pull request #39324 from rzarzynski/wip-librados-nul-objname-nautilus
Yuri Weinstein [Mon, 1 Mar 2021 16:32:41 +0000 (08:32 -0800)]
Merge pull request #39324 from rzarzynski/wip-librados-nul-objname-nautilus

nautilus: librados, tests: allow to list objects with the NUL character in names

Reviewed-by: J. Eric Ivancich <ivancich@redhat.com>
4 years agoMerge pull request #39708 from smithfarm/wip-48282-nautilus
Yuri Weinstein [Mon, 1 Mar 2021 16:30:10 +0000 (08:30 -0800)]
Merge pull request #39708 from smithfarm/wip-48282-nautilus

nautilus: osd: fix bluestore bitmap allocator calculate wrong last_pos with hint

Reviewed-by: Igor Fedotov <ifedotov@suse.com>
Reviewed-by: Neha Ojha <nojha@redhat.com>
4 years agoMerge pull request #39509 from k0ste/wip-49314-nautilus
Yuri Weinstein [Mon, 1 Mar 2021 16:28:28 +0000 (08:28 -0800)]
Merge pull request #39509 from k0ste/wip-49314-nautilus

nautilus: mgr/dashboard: prometheus alerting: add some leeway for package drops and errors

Reviewed-by: Patrick Seidensal <pnawracay@suse.com>
4 years agoMerge pull request #39329 from rzarzynski/wip-tool-nul-in-rados-nautilus
Yuri Weinstein [Mon, 1 Mar 2021 16:27:49 +0000 (08:27 -0800)]
Merge pull request #39329 from rzarzynski/wip-tool-nul-in-rados-nautilus

nautilus: tools/rados: add support for binary object names in the rados CLI

Reviewed-by: J. Eric Ivancich <ivancich@redhat.com>
4 years agoos/bluestore: Add option to check BlueFS reads 39756/head
Adam Kupczyk [Sat, 30 Jan 2021 11:57:05 +0000 (12:57 +0100)]
os/bluestore: Add option to check BlueFS reads

Add option "bluefs_check_for_zeros" to check if there are any zero-filled page.
If so, reread data. It is known that sometimes BlueStore gets such pages.
See "bluestore_retry_disk_reads".

Signed-off-by: Adam Kupczyk <akupczyk@redhat.com>
(cherry picked from commit 7e495c57fe0ec8d8bdb1dbff90b177e656a22cbe)

 Conflicts:
 (lack of fresh stuff in bufferlist) src/os/bluestore/BlueFS.cc

4 years agomgr: add doc to describe relationship to prometheus 39747/head
Paul Cuzner [Thu, 8 Oct 2020 03:35:45 +0000 (16:35 +1300)]
mgr: add doc to describe relationship to prometheus

The healthcheck for slow_ops is used by the mgr/prometheus
module so it's important the alert generated matches the
format expected in mgr/prometheus.

Signed-off-by: Paul Cuzner <pcuzner@redhat.com>
(cherry picked from commit fc1905b4a74aedc6bdbc928b6d6e514183bbf090)

Conflicts:
src/mgr/DaemonHealthMetricCollector.cc

- docstring added to describe the link to mgr/prometheus conflicted with the
  const fmt definition for the message. resolved by adding doc under the const
  definition.

4 years agomgr/prometheus: Add healthcheck metric for SLOW_OPS
Paul Cuzner [Thu, 8 Oct 2020 03:30:56 +0000 (16:30 +1300)]
mgr/prometheus: Add healthcheck metric for SLOW_OPS

SLOW_OPS is triggered by op tracker, and generates a health
alert but healthchecks do not create metrics for prometheus to
use as alert triggers. This change adds SLOW_OPS metric, and
provides a simple means to extend to other relevant health
checks in the future

If the extract of the value from the health check message fails
we log an error and remove the metric from the metric set. In
addition the metric description has changed to better reflect
the scenarios where SLOW_OPS can be triggered.

Signed-off-by: Paul Cuzner <pcuzner@redhat.com>
(cherry picked from commit 2010432b5045c8f1dd0c052def497e590a1bf2fe)

Conflicts:
src/pybind/mgr/prometheus/module.py
- Nautilus doesn't have the profile_method decorator, so needed to be removed

4 years agoMerge pull request #39441 from rhcs-dashboard/49278-py2-unicode-password
Yuri Weinstein [Fri, 26 Feb 2021 17:28:26 +0000 (09:28 -0800)]
Merge pull request #39441 from rhcs-dashboard/49278-py2-unicode-password

nautilus: mgr/dashboard: python 2: error when setting non-ASCII password

Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Ernesto Puerta <epuertat@redhat.com>
4 years agoMerge pull request #39129 from smithfarm/wip-48376-nautilus
Yuri Weinstein [Fri, 26 Feb 2021 01:11:01 +0000 (17:11 -0800)]
Merge pull request #39129 from smithfarm/wip-48376-nautilus

nautilus: cephfs: client: check rdonly file handle on truncate

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
4 years agoMerge pull request #37906 from ideepika/backport-a7f18e4
Yuri Weinstein [Fri, 26 Feb 2021 01:09:56 +0000 (17:09 -0800)]
Merge pull request #37906 from ideepika/backport-a7f18e4

nautilus: qa/tasks/{ceph,ceph_manager}: drop py2 support

Reviewed-by: Ramana Raja <rraja@redhat.com>
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Reviewed-by: Yuri Weinstein <yweinste@redhat.com>
4 years agoosd: fix bluestore bitmap allocator calculated wrong last_pos with hint 39708/head
jhonxue [Thu, 12 Nov 2020 15:17:13 +0000 (23:17 +0800)]
osd: fix bluestore bitmap allocator calculated wrong last_pos with hint

Fixes: https://tracker.ceph.com/issues/48214
Signed-off-by: Xue Yantao <jhonxue@tencent.com>
(cherry picked from commit ad3c7cdf6fabbb4a8b542b793d632cae87ee3640)