]> git.apps.os.sepia.ceph.com Git - ceph.git/log
ceph.git
4 years agopybind/cephfs: DT_REG and DT_LNK values are wrong 40704/head
Varsha Rao [Wed, 24 Feb 2021 11:16:47 +0000 (16:46 +0530)]
pybind/cephfs: DT_REG and DT_LNK values are wrong

DT_REG and DT_LNK don't match with values defined in
/usr/include/dirent.h

define DT_REG 8
define DT_LNK 10

This patch corrects them.

Fixes: https://tracker.ceph.com/issues/49459
Signed-off-by: Varsha Rao <varao@redhat.com>
(cherry picked from commit 91e2275f4cd6a72bc3a78418236db009f5c9c547)

4 years agoMerge pull request #40590 from rhcs-dashboard/wip-50069-nautilus
Ernesto Puerta [Thu, 8 Apr 2021 10:44:04 +0000 (12:44 +0200)]
Merge pull request #40590 from rhcs-dashboard/wip-50069-nautilus

nautilus: mgr/dashboard: Fix for alert notification message being undefined

Reviewed-by: Avan Thakkar <athakkar@redhat.com>
Reviewed-by: Laura Paduano <lpaduano@suse.com>
Reviewed-by: Ernesto Puerta <epuertat@redhat.com>
4 years agoMerge pull request #40356 from tchaikov/wip-49537-nautilus
Yuri Weinstein [Tue, 6 Apr 2021 17:41:26 +0000 (10:41 -0700)]
Merge pull request #40356 from tchaikov/wip-49537-nautilus

nautilus: rgw : catch non int exception

Reviewed-by: Daniel Gryniewicz <dang@redhat.com>
Reviewed-by: Yuri Weinstein <yweinste@redhat.com>
4 years agoMerge pull request #40547 from rhcs-dashboard/nautilus-decouple-tests-from-build
Ernesto Puerta [Tue, 6 Apr 2021 17:19:08 +0000 (19:19 +0200)]
Merge pull request #40547 from rhcs-dashboard/nautilus-decouple-tests-from-build

mgr/dashboard: decouple unit tests from build artifacts

Reviewed-by: Ernesto Puerta <epuertat@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
4 years agoMerge pull request #40610 from rhcs-dashboard/nautilus-fix-py2-unicode-password
Ernesto Puerta [Tue, 6 Apr 2021 16:24:29 +0000 (18:24 +0200)]
Merge pull request #40610 from rhcs-dashboard/nautilus-fix-py2-unicode-password

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

Reviewed-by: Alfonso Martínez <almartin@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
4 years agoMerge pull request #40621 from tchaikov/nautilus-osd-scrub-dst
Kefu Chai [Tue, 6 Apr 2021 14:19:10 +0000 (22:19 +0800)]
Merge pull request #40621 from tchaikov/nautilus-osd-scrub-dst

nautilus: test/TestOSDScrub: fix mktime() error

Reviewed-by: Alfonso Martínez <almartin@redhat.com>
4 years agotest/TestOSDScrub: fix mktime() error 40621/head
luo rixin [Thu, 20 Feb 2020 12:07:39 +0000 (20:07 +0800)]
test/TestOSDScrub: fix mktime() error

The var tm tm isn't initialized, when the tm.tm_isdst is a
positive value, mktime(&tm) return -1 result in test failed
in ubuntu 19.10 for aarch64 GLIBC2.30.

Signed-off-by: luo rixin <luorixin@huawei.com>
(cherry picked from commit 4806fce7f46899499549d9235ca87625d806f2da)

4 years agonautilus: mgr/dashboard: decouple unit tests from build artifacts 40547/head
Alfonso Martínez [Tue, 6 Apr 2021 10:34:02 +0000 (12:34 +0200)]
nautilus: mgr/dashboard: decouple unit tests from build artifacts

Signed-off-by: Alfonso Martínez <almartin@redhat.com>
4 years agonautilus: mgr/dashboard: python 2: fix error when setting non-ASCII password 40610/head
Alfonso Martínez [Tue, 6 Apr 2021 07:42:27 +0000 (09:42 +0200)]
nautilus: mgr/dashboard: python 2: fix error when setting non-ASCII password

Fixes: https://tracker.ceph.com/issues/50155
Signed-off-by: Alfonso Martínez <almartin@redhat.com>
4 years agoMerge pull request #40299 from tchaikov/nautilus-48381
Yuri Weinstein [Mon, 5 Apr 2021 15:54:31 +0000 (08:54 -0700)]
Merge pull request #40299 from tchaikov/nautilus-48381

nautilus: mon/ConfigMap: fix stray option leak

Reviewed-by: Sage Weil <sage@redhat.com>
4 years agoMerge pull request #40128 from neha-ojha/wip-49759-nautilus
Yuri Weinstein [Mon, 5 Apr 2021 15:22:33 +0000 (08:22 -0700)]
Merge pull request #40128 from neha-ojha/wip-49759-nautilus

nautilus: pybind/mgr/balancer/module.py: assign weight-sets to all buckets before balancing

Reviewed-by: Deepika Upadhyay <dupadhya@redhat.com>
4 years agoMerge pull request #40283 from smithfarm/wip-39489-nautilus
Yuri Weinstein [Mon, 5 Apr 2021 15:14:11 +0000 (08:14 -0700)]
Merge pull request #40283 from smithfarm/wip-39489-nautilus

nautilus: ceph.spec.in: Enable tcmalloc on IBM Power and Z

Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Ken Dreyer <kdreyer@redhat.com>
4 years agoMerge pull request #40047 from pponnuvel/wip-48713-nautilus
Yuri Weinstein [Mon, 5 Apr 2021 15:13:06 +0000 (08:13 -0700)]
Merge pull request #40047 from pponnuvel/wip-48713-nautilus

nautilus: mgr/ActivePyModules.cc: always release GIL before attempting to acquire a lock

Reviewed-by: Kefu Chai <kchai@redhat.com>
4 years agoMerge pull request #40014 from mfoliveira/wip-49682-nautilus
Yuri Weinstein [Mon, 5 Apr 2021 15:12:26 +0000 (08:12 -0700)]
Merge pull request #40014 from mfoliveira/wip-49682-nautilus

nautilus: osd: add osd_fast_shutdown_notify_mon option (default false)

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
4 years agoMerge pull request #39942 from smithfarm/wip-49664-nautilus
Yuri Weinstein [Mon, 5 Apr 2021 15:11:54 +0000 (08:11 -0700)]
Merge pull request #39942 from smithfarm/wip-49664-nautilus

nautilus: src/global/signal_handler.h: fix preprocessor logic for alpine

Reviewed-by: Kefu Chai <kchai@redhat.com>
4 years agoMerge pull request #39923 from smithfarm/wip-49637-nautilus
Yuri Weinstein [Mon, 5 Apr 2021 15:11:25 +0000 (08:11 -0700)]
Merge pull request #39923 from smithfarm/wip-49637-nautilus

nautilus: mgr/telemetry: check if 'ident' channel is active

Reviewed-by: Yaarit Hatuka <yaarithatuka@gmail.com>
4 years agoMerge pull request #39883 from singuliere/wip-49385-nautilus
Yuri Weinstein [Mon, 5 Apr 2021 15:10:49 +0000 (08:10 -0700)]
Merge pull request #39883 from singuliere/wip-49385-nautilus

nautilus: os/bluestore/BlueFS: use iterator_impl::copy instead of bufferlist::c_str() to avoid bufferlist rebuild

Reviewed-by: Igor Fedotov <ifedotov@suse.com>
Reviewed-by: Neha Ojha <nojha@redhat.com>
4 years agomgr/dashboard: Fix for alert notification message being undefined 40590/head
Nizamudeen A [Tue, 23 Mar 2021 07:10:46 +0000 (12:40 +0530)]
mgr/dashboard: Fix for alert notification message being undefined

Prometheus alert notification message in the dashboard always comes up
as undefined. Its because we were showing the alert.summary instead of
alert.description for displaying the message. I couldn't find the
summary field in the ceph_default_alerts.yml file. So removed all the
Summary fields from the dashboard code.

Fixes: https://tracker.ceph.com/issues/49342
Signed-off-by: Nizamudeen A <nia@redhat.com>
(cherry picked from commit 2921b2e9a939e1ad52b07327fdf84885568384b9)

4 years agoMerge pull request #40536 from tchaikov/nautilus-nose-py3
Kefu Chai [Thu, 1 Apr 2021 09:36:48 +0000 (17:36 +0800)]
Merge pull request #40536 from tchaikov/nautilus-nose-py3

nautilus: test/pybind: s/nosetests/python3/

Reviewed-by: Brad Hubbard <bhubbard@redhat.com>
Reviewed-by: Alfonso Martínez <almartin@redhat.com>
4 years agopybind/mgr/dashboard/.pylintrc: silence more pylint warnings 40536/head
Kefu Chai [Thu, 1 Apr 2021 05:45:08 +0000 (13:45 +0800)]
pybind/mgr/dashboard/.pylintrc: silence more pylint warnings

this change is not cherry-picked from master, as we don't have following
warnings in master, like:

************* Module dashboard.controllers.saml2
        intern-builtin,
controllers/saml2.py:57:8: R1720: Unnecessary "else" after "raise" (no-else-raise)

also bump up the versions of pylint and astroid, so they
can work with python3.8.

see
https://github.com/PyCQA/astroid/commit/28fc86f260f0cd9433d0603da81ee52045f9e4c3

Signed-off-by: Kefu Chai <kchai@redhat.com>
4 years agomgr/dashboard: do not import tools in access_control
Kefu Chai [Thu, 1 Apr 2021 04:14:31 +0000 (12:14 +0800)]
mgr/dashboard: do not import tools in access_control

this addresses a regression introduced by
2cd94293268116838c3ddcebdedde4fbd9cb93aa. which

from ..tools import ensure_str

and it causes recursive import.

so, in this change, an copy of ensure_str() is added
to access_control.py

this change is not cherry-picked from master, as the offending commit
which is fixed by this change is not included in master.

Signed-off-by: Kefu Chai <kchai@redhat.com>
4 years agotest/pybind: s/nosetests/python3/
Kefu Chai [Thu, 19 Dec 2019 03:36:59 +0000 (11:36 +0800)]
test/pybind: s/nosetests/python3/

different distros package python3-nose in different ways by adding
different postfix to "/usr/bin/nosetests" to differentiate it from
its python2 counterpart.

* on bionic, python3-nose offers "nosetests3"
* on el8, python3-nose offers "nosetests-3" and "nosetests-3.6"

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

4 years agoMerge pull request #40516 from tchaikov/nautilus-zstd
Kefu Chai [Wed, 31 Mar 2021 15:20:31 +0000 (23:20 +0800)]
Merge pull request #40516 from tchaikov/nautilus-zstd

nautilus: cmake,zstd,debian: allow use libzstd in system

Reviewed-by: Brad Hubbard <bhubbard@redhat.com>
4 years agoMerge pull request #40522 from tchaikov/nautilus-dashboard-unicode-password
Kefu Chai [Wed, 31 Mar 2021 15:14:52 +0000 (23:14 +0800)]
Merge pull request #40522 from tchaikov/nautilus-dashboard-unicode-password

nautilus: mgr/dashboard: encode non-ascii string before passing it to exec_cmd()

Reviewed-by: Alfonso Martínez <almartin@redhat.com>
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 agoscript/run-make: enable WITH_SYSTEM_ZSTD on focal 40516/head
Kefu Chai [Wed, 31 Mar 2021 04:27:44 +0000 (12:27 +0800)]
script/run-make: enable WITH_SYSTEM_ZSTD on focal

to speed up the build for "make check"

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

Conflicts:
debian/control
src/script/run-make.sh: trivial resolution

4 years agocmake: allow use libzstd in system
Kefu Chai [Wed, 31 Mar 2021 04:15:17 +0000 (12:15 +0800)]
cmake: allow use libzstd in system

since we are moving the test nodes from bionic to focal, we are able to
use the prebuilt libzstd libraries when running "make check". to speed
up the build and test, in this change:

* add FindZstd.cmake which allows us to use the libzstd in system
* extract BuildZstd.cmake for better readability
* add an option named "WITH_SYSTEM_ZSTD", which defaults to "OFF",
  so user can enable it on demand.

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

Conflicts:
src/compressor/zstd/CMakeLists.txt: minor resolution

4 years agozstd: upgrade to v1.4.5
Bryan Stillwell [Fri, 11 Sep 2020 21:49:39 +0000 (15:49 -0600)]
zstd: upgrade to v1.4.5

Since the v1.4.0 release there have been a few improvements to Zstandard
including improved compression ratios, faster compression, and faster
decompression.

Signed-off-by: Bryan Stillwell <bstillwell@godaddy.com>
(cherry picked from commit 7f23cd611f61f41f9c439b7a6dfc91109df741de)

4 years agozstd: compat with v1.4.0
Dan van der Ster [Wed, 19 Jun 2019 14:57:13 +0000 (16:57 +0200)]
zstd: compat with v1.4.0

In zstd d8e215cbee03b038fffe74aebad63b625c42f23c
ZSTD_compress_generic() is renamed to ZSTD_compressStream2().

Signed-off-by: Dan van der Ster <daniel.vanderster@cern.ch>
(cherry picked from commit fa9cd3faad689898a12d10d86df6e06dd736497f)

4 years agozstd: upgrade to v1.4.0
Dan van der Ster [Wed, 19 Jun 2019 13:58:13 +0000 (15:58 +0200)]
zstd: upgrade to v1.4.0

Signed-off-by: Dan van der Ster <daniel.vanderster@cern.ch>
(cherry picked from commit 2c2797a71f7aca8f86a758237f1ecbc8966e1b51)

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 agoPendingReleaseNotes: document option osd_fast_shutdown_notify_mon 40014/head
Mauricio Faria de Oliveira [Tue, 26 Jan 2021 16:14:38 +0000 (13:14 -0300)]
PendingReleaseNotes: document option osd_fast_shutdown_notify_mon

Let's add the ``osd_fast_shutdown_notify_mon`` option to PendingReleaseNotes
so it is documented.

Signed-off-by: Mauricio Faria de Oliveira <mfo@canonical.com>
(cherry picked from commit 7f5aaef5d4585d74535192192c56549bd023bc1f)

 Conflicts:
PendingReleaseNotes
 - Move snippet into the new 14.2.19 section

4 years agoosd: add osd_fast_shutdown_notify_mon option (default false)
Mauricio Faria de Oliveira [Thu, 7 Jan 2021 22:44:44 +0000 (19:44 -0300)]
osd: add osd_fast_shutdown_notify_mon option (default false)

The osd_fast_shutdown option may cause the cluster log to receive
too many entries of 'osd.X reported immediately failed by osd.Y',
depending on cluster scale.

This might be an issue for LMA stacks/tools that check ceph logs
for failed lines, and then require additional logic to filter on
an intended OSD (fast) shutdown; might not be an option/possible,
and require an admin to analyze.

So, add osd_fast_shutdown_notify_mon option for OSD to also tell
the monitor it is shutting down (done in slow/non-fast shutdown)
under osd_fast_shutdown.

This introduces minimal delay (the ack from the mon is required
to prevent the messages), and addresses the cluster log issue.
Note: the osd_mon_shutdown_timeout option can be used to control
the maximum amount of time waiting for the monitor ack to arrive.

Fixes: http://tracker.ceph.com/issues/46978
Signed-off-by: Mauricio Faria de Oliveira <mfo@canonical.com>
(cherry picked from commit c75734729764868c5c501722fc8de08dac9ebd4a)

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 agorpm: re-disable SUSE lttng build on z390x 40283/head
Nathan Cutler [Thu, 25 Feb 2021 18:01:18 +0000 (19:01 +0100)]
rpm: re-disable SUSE lttng build on z390x

This partially reverts 2b1e646f7aade3135a98c505111ac7ebef5e93a6 which
mistakenly changed a line inside an "%if 0%{?suse_version}" conditional.

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

Conflicts:
ceph.spec.in

4 years agoceph.spec.in: enable tcmalloc and lttng on s390x
Yaakov Selkowitz [Tue, 9 Feb 2021 16:03:42 +0000 (11:03 -0500)]
ceph.spec.in: enable tcmalloc and lttng on s390x

The necessary prerequisites are already in RHEL+EPEL 8.

Signed-off-by: Yaakov Selkowitz <yselkowi@redhat.com>
(cherry picked from commit 2b1e646f7aade3135a98c505111ac7ebef5e93a6)

Conflicts:
ceph.spec.in

4 years agomon/ConfigMap: fix stray option leak 40299/head
Sage Weil [Tue, 16 Feb 2021 21:50:18 +0000 (16:50 -0500)]
mon/ConfigMap: fix stray option leak

The const Option* needs to remain alive only until the next clear().  Keep
the reference in ConfigMap and clean it up then.

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

Fixes: https://tracker.ceph.com/issues/48381
Conflicts:
src/mon/ConfigMap.h: trivial resolution

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 agopybind/mgr/balancer/module.py: assign weight-sets to all buckets before balancing 40128/head
Neha Ojha [Tue, 9 Mar 2021 00:48:58 +0000 (00:48 +0000)]
pybind/mgr/balancer/module.py: assign weight-sets to all buckets before balancing

Add an additional check to make sure that the choose_args section has the same
number of buckets as the crushmap. If not, ensure that
get_compat_weight_set_weights assigns weight-sets to all buckets.

Without this change, if we end up with an orig_ws, which has fewer buckets
than the crushmap, the mgr will crash due a KeyError in do_crush_compat().

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

 Conflicts:
src/pybind/mgr/balancer/module.py - trivial resolution

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 agomgr/ActivePyModules.cc: use wrappers for acquiring/releasing GIL 40047/head
Kefu Chai [Thu, 24 Dec 2020 07:27:41 +0000 (15:27 +0800)]
mgr/ActivePyModules.cc: use wrappers for acquiring/releasing GIL

this change is a follow-up of
0601b31a53a455f0b67c981460d198cb3a97f3de, for couple reasons

- document the guideline for locking when working with python GIL
- add primitives to extract the patterns for acquiring/releasing
  GIL. so they can be reused.

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

 Conflicts:
src/mgr/ActivePyModules.cc
src/mgr/DaemonState.cc
 - convert std::pair to DaemonKey::type-name in a few places
 - Removed "mds_metadata" which doesn't exist in latest Nautilus

4 years agomgr: use a struct for DaemonKey
Kefu Chai [Sun, 29 Sep 2019 09:28:28 +0000 (17:28 +0800)]
mgr: use a struct for DaemonKey

instead of using `std::pair<>` for presenting it. there are three
advantages:

1. better names for readability: `type` and `name` are better names
   than `first` and `second`
2. so we can specliaze its behavior by its type: define
   `operator<<` once, and use it everywhere. no need to worry
   about ADL to pickup the generic operator of `operator<< (..., pair<>)`
   anymore. so we can safely use `<< key`, and no need to
   use `<< key.first << '.' << key.second`. kill the printed form of
   `osd,1` once and for all, all of them are now "osd.1".
3. consolidate the print/parse in a single place

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

 Conflicts:
src/mgr/DaemonServer.cc
src/mgr/Mgr.cc
 - convert/edit std::pair to DaemonKey:name-value in a few places

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 agosrc/global/signal_handler.h: fix preprocessor logic for alpine 39942/head
Duncan Bellamy [Thu, 25 Feb 2021 12:05:56 +0000 (12:05 +0000)]
src/global/signal_handler.h: fix preprocessor logic for alpine
Fixes: https://tracker.ceph.com/issues/49494
Co-authored-by: Kefu Chai <tchaikov@gmail.com>
Signed-off-by: Duncan Bellamy <dunk@denkimushi.com>
(cherry picked from commit 387f33e7265825ae4cdd3580289f5154e250b05b)

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 agomgr/telemetry: check if 'ident' channel is active 39923/head
Yaarit Hatuka [Wed, 17 Feb 2021 22:26:59 +0000 (22:26 +0000)]
mgr/telemetry: check if 'ident' channel is active

When compiling the telemetry reports we check for active channels. The
'ident' channel check was missing, hence even if users turned this
channel on, its content could not be appended to the report.

Fixes: https://tracker.ceph.com/issues/49349
Signed-off-by: Yaarit Hatuka <yaarit@redhat.com>
(cherry picked from commit 24849196bed042a122c98f07fa9889c7184a2265)

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>