]> git.apps.os.sepia.ceph.com Git - ceph.git/log
ceph.git
4 years agoMerge pull request #39397 from kamoltat/wip-nautilus-del-period-arg
Yuri Weinstein [Mon, 12 Apr 2021 15:22:34 +0000 (08:22 -0700)]
Merge pull request #39397 from kamoltat/wip-nautilus-del-period-arg

nautilus: qa/tasks/mgr/test_progress: fix wait_until_equal

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

nautilus: cmake: set empty RPATH for some test executables

Reviewed-by: Deepika Upadhyay <dupadhya@redhat.com>
4 years agoMerge pull request #40393 from neha-ojha/wip-49966-nautilus
Yuri Weinstein [Mon, 12 Apr 2021 15:21:05 +0000 (08:21 -0700)]
Merge pull request #40393 from neha-ojha/wip-49966-nautilus

nautilus: common/options: bluefs_buffered_io=true by default

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

nautilus: librbd: allow interrupted trash move request to be restarted

Reviewed-by: Mykola Golub <mgolub@mirantis.com>
4 years agoMerge pull request #40567 from singuliere/wip-49991-nautilus
Yuri Weinstein [Mon, 12 Apr 2021 15:18:00 +0000 (08:18 -0700)]
Merge pull request #40567 from singuliere/wip-49991-nautilus

nautilus: common/mempool: only fail tests if sharding is very bad

Reviewed-by: Deepika Upadhyay <dupadhya@redhat.com>
4 years agoMerge pull request #40549 from idryomov/wip-remove-log-early-nautilus
Yuri Weinstein [Mon, 12 Apr 2021 15:17:33 +0000 (08:17 -0700)]
Merge pull request #40549 from idryomov/wip-remove-log-early-nautilus

nautilus: common: remove log_early configuration option

Reviewed-by: Sage Weil <sage@redhat.com>
4 years agoMerge pull request #40674 from smithfarm/wip-50158-nautilus
Yuri Weinstein [Fri, 9 Apr 2021 14:49:52 +0000 (07:49 -0700)]
Merge pull request #40674 from smithfarm/wip-50158-nautilus

nautilus: test/rgw: test_datalog_autotrim filters out new entries

Reviewed-by: Casey Bodley <cbodley@redhat.com>
4 years agoMerge pull request #40671 from smithfarm/wip-50095-nautilus
Yuri Weinstein [Fri, 9 Apr 2021 14:49:26 +0000 (07:49 -0700)]
Merge pull request #40671 from smithfarm/wip-50095-nautilus

nautilus: rgw: return error when trying to copy encrypted object without key

Reviewed-by: J. Eric Ivancich <ivancich@redhat.com>
4 years agoMerge pull request #40670 from smithfarm/wip-49744-nautilus
Yuri Weinstein [Fri, 9 Apr 2021 14:48:57 +0000 (07:48 -0700)]
Merge pull request #40670 from smithfarm/wip-49744-nautilus

nautilus: rgw: limit rgw_gc_max_objs to RGW_SHARDS_PRIME_1

Reviewed-by: Casey Bodley <cbodley@redhat.com>
4 years agoMerge pull request #40668 from smithfarm/wip-50233-nautilus
Yuri Weinstein [Fri, 9 Apr 2021 14:48:27 +0000 (07:48 -0700)]
Merge pull request #40668 from smithfarm/wip-50233-nautilus

nautilus: rgw: return ERR_NO_SUCH_BUCKET early while evaluating bucket policy

Reviewed-by: Matt Benjamin <mbenjami@redhat.com>
4 years agorbd: clarify trash remove error code from interrupted move 40675/head
Jason Dillaman [Wed, 10 Mar 2021 20:31:22 +0000 (15:31 -0500)]
rbd: clarify trash remove error code from interrupted move

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

4 years agolibrbd/trash: don't return -ENOENT error from move state machine
Jason Dillaman [Wed, 10 Mar 2021 20:37:39 +0000 (15:37 -0500)]
librbd/trash: don't return -ENOENT error from move state machine

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit f6ed98d682e562de1cad301696e918c52a4dba5d)

4 years agolibrbd/api: trash remove/purge should indicate interrupted move
Jason Dillaman [Wed, 10 Mar 2021 20:29:11 +0000 (15:29 -0500)]
librbd/api: trash remove/purge should indicate interrupted move

This will help the user self-diagnose that a trash move operation
was interrupted and therefore the state is invalid.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit c808abea64f00e25c6fd3bcaa7ebf9bc763e7ca0)

4 years agolibrbd/api: allow an interrupted trash move to be restarted
Jason Dillaman [Wed, 10 Mar 2021 20:15:26 +0000 (15:15 -0500)]
librbd/api: allow an interrupted trash move to be restarted

Search the trash entries for a matching image name that is
still in the moving state and allow the operation to be
restarted.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit ed2d696e1eafaa59d29ce6fac952e4e5f4f1e920)

4 years agolibrbd/api: helper method for natively listing the trash
Jason Dillaman [Wed, 10 Mar 2021 19:44:36 +0000 (14:44 -0500)]
librbd/api: helper method for natively listing the trash

The existing list method converts the native TrashImageSpec to the
API's rbd_trash_image_info_t which is missing the source field.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit 21adc927fe50ae37069d77482edd4c4e098433c9)

4 years agotest/rgw: test_datalog_autotrim filters out new entries 40674/head
Casey Bodley [Mon, 15 Jun 2020 15:45:11 +0000 (11:45 -0400)]
test/rgw: test_datalog_autotrim filters out new entries

if other sync activity is racing with test_datalog_autotrim, it can
create new datalog entries after the 'datalog autotrim' command runs

instead of asserting that the datalog is empty after trim, assert that
any entries have a marker larger than the max-marker reported by
'datalog status' before the trim

Fixes: https://tracker.ceph.com/issues/45626
Signed-off-by: Casey Bodley <cbodley@redhat.com>
(cherry picked from commit abd08f1843642e318d74dfadb0f9cf1f6b86d827)

4 years agorgw: return error when trying to copy encrypted object without key 40671/head
Ilsoo Byun [Fri, 11 Dec 2020 00:57:49 +0000 (09:57 +0900)]
rgw: return error when trying to copy encrypted object without key

Fixes: https://tracker.ceph.com/issues/48554
Signed-off-by: Ilsoo Byun <ilsoobyun@linecorp.com>
(cherry picked from commit dde1303c92b39daa2d760a110f48dc9655e7765f)

4 years agorgw: limit rgw_gc_max_objs to RGW_SHARDS_PRIME_1 40670/head
Rafał Wądołowski [Wed, 17 Feb 2021 11:47:07 +0000 (12:47 +0100)]
rgw: limit rgw_gc_max_objs to RGW_SHARDS_PRIME_1

Don't allow GC to process more gc ojects than RGW_SHARDS_PRIME_1

Fixes: https://tracker.ceph.com/issues/49321
Signed-off-by: Rafał Wądołowski <rwadolowski@cloudferro.com>
(cherry picked from commit 7b163048d93a078e2354665488a27225042d3f1a)

4 years agorgw: return ERR_NO_SUCH_BUCKET early while evaluating bucket policy 40668/head
Abhishek Lekshmanan [Thu, 21 Feb 2019 16:06:52 +0000 (17:06 +0100)]
rgw: return ERR_NO_SUCH_BUCKET early while evaluating bucket policy

Right now we create a ERR_NO_SUCH_BUCKET ret code but continue further
processing. Since this ret code isn't returned at any stage we end up creating a
bucket instance anyway which shouldn't happen and then succeeding the client
call in cases like put bucket versioning. Return an error code early in these
cases

Fixes: http://tracker.ceph.com/issues/38420
Signed-off-by: Abhishek Lekshmanan <abhishek@suse.com>
(cherry picked from commit cf66a6d5a7eee294313a1a08d0524daf939747e5)

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 agoqa/tasks/mgr/test_progress: fix wait_until_equal 39397/head
Kamoltat [Mon, 8 Feb 2021 15:45:06 +0000 (15:45 +0000)]
qa/tasks/mgr/test_progress: fix wait_until_equal

Octopus ceph_test_case doesn't have period arg
so remove that in wait_until_equal. Also increase
time to wait for complete events by using RECOVERY_PERIOD
instead of EVENT_CREATION_PERIOD

Not needed in masters because only octopus and nautilus
doesn't have a period argument in qa/tasks/mgr/test_progress.py
wait_until_equals() function

Fixes: https://tracker.ceph.com/issues/48824
Signed-off-by: Kamoltat <ksirivad@redhat.com>
(cherry picked from commit df41ea7467db3b40776030865896af0102129283)

 Conflicts:
qa/tasks/mgr/test_progress.py - trivial fix

4 years agoqa/mgr/progress: fix timeout error when waiting for osd in event
Ricardo Dias [Tue, 3 Sep 2019 10:44:05 +0000 (11:44 +0100)]
qa/mgr/progress: fix timeout error when waiting for osd in event

Fixes: https://tracker.ceph.com/issues/40618
Signed-off-by: Ricardo Dias <rdias@suse.com>
(cherry picked from commit b03537949abd8d453aa06c1580a4578868904bd1)

 Conflicts:
qa/tasks/mgr/test_progress.py - trivial fix

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 agobuild/ops: set empty RPATH for some test executables 40619/head
Nathan Cutler [Tue, 27 Aug 2019 08:24:11 +0000 (10:24 +0200)]
build/ops: set empty RPATH for some test executables

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

4 years agocmake: SKIP_RPATH if RPATH is not necessary
Kefu Chai [Fri, 30 Aug 2019 08:21:03 +0000 (16:21 +0800)]
cmake: SKIP_RPATH if RPATH is not necessary

some executables like ceph_test_mon_memory_target do not link against
libraries built from source tree, like librados and libceph-common. so
cmake does not set RPATH for them. hence cmake complains like:

before this change, `CMAKE_INSTALL_RPATH` is set globally. so cmake is
asked to rewrite the RPATH for all installed targets. but this is not
needed. as some executables do not link against libceph-common. hence,
cmake complains when installing them, like:

CMake Error at src/test/mon/cmake_install.cmake:90 (file):
  file RPATH_CHANGE could not write new RPATH:
    /usr/lib64/ceph
   to the file:
    /home/abuild/rpmbuild/BUILDROOT/ceph-15.0.0-4347.g85a07b9.x86_64/usr/bin/ceph_test_log_rss_usage
   No valid ELF RPATH or RUNPATH entry exists in the file;

after this change, `SKIP_RPATH` is set for those executables which do
not link against any libraries created from ceph source tree. so we can
avoid setting the RPATH for these executables when `make install`.

the same applies to libceph-common.

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

4 years agocmake: only link against necessary libs
Kefu Chai [Mon, 2 Sep 2019 08:07:49 +0000 (16:07 +0800)]
cmake: only link against necessary libs

some executables like ceph_test_mon_memory_target does not link against
gtest or gmock, so no need to link agains them.

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

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 agocommon/mempool: only fail tests if sharding is very bad 40567/head
singuliere [Wed, 17 Mar 2021 06:35:04 +0000 (07:35 +0100)]
common/mempool: only fail tests if sharding is very bad

Fixes: https://tracker.ceph.com/issues/49781
Signed-off-by: singuliere <singuliere@autistici.org>
(cherry picked from commit db79769d6d557acc021a434ff285db2d69458d0a)

4 years agocommon: remove log_early configuration option 40549/head
Changcheng Liu [Tue, 13 Oct 2020 01:47:16 +0000 (09:47 +0800)]
common: remove log_early configuration option

After deciding to always enable tracking log in early phase, there's no
need to keep "log_early" option here and remove it directly.

Suggested-by: Kefu Chai <kefu@redhat.com>
Signed-off-by: Changcheng Liu <changcheng.liu@aliyun.com>
(cherry picked from commit dbdcb2535d0d463d92d90169175e0776a0ee58e3)

Conflicts:
qa/tasks/ceph_manager.py [ already dropped in nautilus, commit
  b8dd87424ecb ("qa/tasks/ceph_manager.py: don't use log-early
  in raw_cluster_cmd") ]

4 years agocommon: remove useless log_early check condition here
Changcheng Liu [Wed, 16 Sep 2020 01:50:54 +0000 (09:50 +0800)]
common: remove useless log_early check condition here

The code logic shows that Log thread needs to be started even
log_early is false.

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

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 agocommon/options: bluefs_buffered_io=true by default 40393/head
Dan van der Ster [Thu, 12 Nov 2020 16:14:37 +0000 (17:14 +0100)]
common/options: bluefs_buffered_io=true by default

Enable bluefs_buffered_io again because it makes a huge user-visible
improvement in metadata intensive scenarios, such as but not limited to
PG deletion.

In our environment, deleting PGs from 4 hybrid OSDs (sharing one SATA SSD block.db) saturates
the block.db at 350MB/s reads and causes slow reqs and flapping on the OSDs.
Those OSDs have 3GB osd_target_memory.
Enabling bluefs_buffered_io drops the SSD IO down to <1MBps and the OSDs
are performant again. (The underlying PG deletion inefficiency is being
solved separately, but the page cache is so much more effective than
the bluestore cache in this scenario).

Lastly, remove the comment about swap. We should separately advise
operators to disable swap on OSD machines, as it is much better in
our experience to OOM and restart than to chug along swapping.

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

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