]> git.apps.os.sepia.ceph.com Git - ceph.git/log
ceph.git
4 years agoqa/suites/krbd: don't require CEPHX_V2 for unmap subsuite 40826/head
Ilya Dryomov [Sat, 3 Apr 2021 09:13:56 +0000 (11:13 +0200)]
qa/suites/krbd: don't require CEPHX_V2 for unmap subsuite

Starting with pacific, CEPHX_V2 is required by default but
pre-single-major.yaml kernel doesn't support it.

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

4 years agoMerge pull request #40805 from tchaikov/pacific-pr-40738
Kefu Chai [Mon, 12 Apr 2021 13:42:07 +0000 (21:42 +0800)]
Merge pull request #40805 from tchaikov/pacific-pr-40738

pacific: include/librados: fix doxygen syntax for docs build

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
4 years agoMerge pull request #40648 from rhcs-dashboard/wip-50203-pacific
Ernesto Puerta [Mon, 12 Apr 2021 09:36:37 +0000 (11:36 +0200)]
Merge pull request #40648 from rhcs-dashboard/wip-50203-pacific

pacific: mgr/dashboard: Revoke read-only user's access to Manager modules

Reviewed-by: Waadkh7 <walkhour@redhat.com>
Reviewed-by: Avan Thakkar <athakkar@redhat.com>
Reviewed-by: Ernesto Puerta <epuertat@redhat.com>
4 years agoinclude/librados: fix doxygen syntax for docs build 40805/head
Josh Durgin [Fri, 9 Apr 2021 22:01:32 +0000 (18:01 -0400)]
include/librados: fix doxygen syntax for docs build

The docs build is now warning about these like:

WARNING: Unparseable C cross-reference: '[in]'
Invalid C declaration: Expected identifier in nested name.

Signed-off-by: Josh Durgin <jdurgin@redhat.com>
(cherry picked from commit 70b8f16a2c9fe2375457bf66bf46e4296a86e31d)

4 years agoMerge PR #40663 into pacific
Sage Weil [Fri, 9 Apr 2021 23:04:33 +0000 (18:04 -0500)]
Merge PR #40663 into pacific

* refs/pull/40663/head:
qa/tasks/ceph.conf: shorten cephx TTL for testing

Reviewed-by: Sage Weil <sage@redhat.com>
4 years agoMerge pull request #40645 from batrick/i50015
Yuri Weinstein [Fri, 9 Apr 2021 15:41:42 +0000 (08:41 -0700)]
Merge pull request #40645 from batrick/i50015

pacific: qa: "AttributeError: 'NoneType' object has no attribute 'mon_manager'"

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
4 years agoMerge pull request #40706 from cbodley/wip-50247
Ilya Dryomov [Fri, 9 Apr 2021 04:42:25 +0000 (06:42 +0200)]
Merge pull request #40706 from cbodley/wip-50247

pacific: cmake: define BOOST_ASIO_USE_TS_EXECUTOR_AS_DEFAULT globally

Reviewed-by: Neha Ojha <nojha@redhat.com>
Reviewed-by: Ilya Dryomov <idryomov@gmail.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
4 years agoMerge pull request #40629 from batrick/i50025
Yuri Weinstein [Thu, 8 Apr 2021 22:22:11 +0000 (15:22 -0700)]
Merge pull request #40629 from batrick/i50025

pacific: client: items pinned in cache preventing unmount

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
4 years agoMerge pull request #40628 from batrick/i49936
Yuri Weinstein [Thu, 8 Apr 2021 22:21:30 +0000 (15:21 -0700)]
Merge pull request #40628 from batrick/i49936

pacific: ceph-fuse: src/include/buffer.h: 1187: FAILED ceph_assert(_num <= 1024)

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
4 years agoMerge pull request #40528 from batrick/i50030
Yuri Weinstein [Thu, 8 Apr 2021 22:20:54 +0000 (15:20 -0700)]
Merge pull request #40528 from batrick/i50030

pacific: qa: fs:cephadm mount does not wait for mds to be created

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
4 years agocmake: define BOOST_ASIO_USE_TS_EXECUTOR_AS_DEFAULT globaly 40706/head
Kefu Chai [Sun, 21 Mar 2021 15:06:00 +0000 (23:06 +0800)]
cmake: define BOOST_ASIO_USE_TS_EXECUTOR_AS_DEFAULT globaly

turns out we also need it for compiling librados tests with libboost
1.75, so just define it globally

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

4 years agocmake: use list(APPEND..) when appropriate
Kefu Chai [Sun, 21 Mar 2021 15:06:43 +0000 (23:06 +0800)]
cmake: use list(APPEND..) when appropriate

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

4 years agocmake: define BOOST_ASIO_USE_TS_EXECUTOR_AS_DEFAULT for rgw tests
Kefu Chai [Fri, 19 Mar 2021 04:46:17 +0000 (12:46 +0800)]
cmake: define BOOST_ASIO_USE_TS_EXECUTOR_AS_DEFAULT for rgw tests

otherwise unittest_rgw_iam_policy does not compile with boost v1.75

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

4 years agoMerge pull request #40588 from rhcs-dashboard/wip-50068-pacific
Ernesto Puerta [Thu, 8 Apr 2021 10:46:27 +0000 (12:46 +0200)]
Merge pull request #40588 from rhcs-dashboard/wip-50068-pacific

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

Reviewed-by: Waadkh7 <walkhour@redhat.com>
Reviewed-by: pereman2 <pdiazbou@redhat.com>
Reviewed-by: Avan Thakkar <athakkar@redhat.com>
4 years agoqa/tasks/ceph.conf: shorten cephx TTL for testing 40663/head
Sage Weil [Mon, 5 Apr 2021 18:08:30 +0000 (13:08 -0500)]
qa/tasks/ceph.conf: shorten cephx TTL for testing

Rotate tickets frequently to exercise those code paths during testing.

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

4 years agomgr/dashboard: Revoke read-only user's access to Manager modules 40648/head
Nizamudeen A [Tue, 6 Apr 2021 15:54:51 +0000 (21:24 +0530)]
mgr/dashboard: Revoke read-only user's access to Manager modules

This will disable read only user to read/open Manager Modules page in
Ceph Dashboard where some of the security related informations are
shown.

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

4 years agoqa/cephfs: move is_blocklisted() to filesystem.CephCluster 40645/head
Rishabh Dave [Wed, 3 Mar 2021 11:44:22 +0000 (17:14 +0530)]
qa/cephfs: move is_blocklisted() to filesystem.CephCluster

Using self.fs.mon_manager in mount.py can lead to a crash since self.fs
can be None. Move is_blocklisted() to tasks.filesystem.CephCluster where
it can get access to mon_manager without depending on objects
representing Ceph FSs.

Fixes: https://tracker.ceph.com/issues/49511
Signed-off-by: Rishabh Dave <ridave@redhat.com>
(cherry picked from commit 4d0f56fcc524cfe328d89d0b3706ca22a68a268f)

4 years agoMerge pull request #40398 from rhcs-dashboard/wip-49945-pacific
Ernesto Puerta [Wed, 7 Apr 2021 09:10:00 +0000 (11:10 +0200)]
Merge pull request #40398 from rhcs-dashboard/wip-49945-pacific

pacific: mgr/dashboard: Fix for broken User management role cloning

Reviewed-by: Alfonso Martínez <almartin@redhat.com>
Reviewed-by: Avan Thakkar <athakkar@redhat.com>
Reviewed-by: Laura Paduano <lpaduano@suse.com>
4 years agoMerge pull request #40586 from rhcs-dashboard/wip-50067-pacific
Ernesto Puerta [Wed, 7 Apr 2021 09:06:25 +0000 (11:06 +0200)]
Merge pull request #40586 from rhcs-dashboard/wip-50067-pacific

pacific: mgr/dashboard: Unable to login to ceph dashboard until clearing cookies manually

Reviewed-by: Alfonso Martínez <almartin@redhat.com>
Reviewed-by: Ernesto Puerta <epuertat@redhat.com>
Reviewed-by: Nizamudeen A <nia@redhat.com>
4 years agoclient: fire the finish_cap_snap() after buffer being flushed 40629/head
Xiubo Li [Wed, 30 Dec 2020 01:41:01 +0000 (09:41 +0800)]
client: fire the finish_cap_snap() after buffer being flushed

When the inode has Fb cap and the used reference is none zero, the
cap snap flushing will be delayed, so we need to make sure it will
be invoked after the dirty buffer is flushed to osd.

Fixes: https://tracker.ceph.com/issues/48679
Signed-off-by: Xiubo Li <xiubli@redhat.com>
(cherry picked from commit a34d0c242a73d7c29956b6894a430d9979225632)

4 years agoclient: simplify the iterating code
Xiubo Li [Wed, 30 Dec 2020 09:17:56 +0000 (17:17 +0800)]
client: simplify the iterating code

Signed-off-by: Xiubo Li <xiubli@redhat.com>
(cherry picked from commit 1bea6e5135148169baaf656563bb1acbe6a593b6)

4 years agoclient: remove unused _flushed_cap_snap
Xiubo Li [Wed, 30 Dec 2020 08:40:23 +0000 (16:40 +0800)]
client: remove unused _flushed_cap_snap

Signed-off-by: Xiubo Li <xiubli@redhat.com>
(cherry picked from commit f60329bf1c5f9ad051387dbee10a210822620254)

4 years agoclient: clean up the code
Xiubo Li [Wed, 30 Dec 2020 01:14:25 +0000 (09:14 +0800)]
client: clean up the code

Signed-off-by: Xiubo Li <xiubli@redhat.com>
(cherry picked from commit 820d39da39e65e99c1d58d56afc415186c1ae933)

4 years agoclient: rebuild bl to avoid too many vector(> IOV_MAX) 40628/head
Yanhu Cao [Tue, 23 Mar 2021 03:29:33 +0000 (11:29 +0800)]
client: rebuild bl to avoid too many vector(> IOV_MAX)

Fixes: https://tracker.ceph.com/issues/49936
Signed-off-by: Yanhu Cao <gmayyyha@gmail.com>
(cherry picked from commit 463dda7251aec1528f5796ea47956fba6e80fae1)

4 years agoMerge pull request #40559 from adamemerson/wip-50104-pacific
Adam C. Emerson [Tue, 6 Apr 2021 16:26:07 +0000 (12:26 -0400)]
Merge pull request #40559 from adamemerson/wip-50104-pacific

rgw: Backport of datalog improvements to Pacific

Reviewed-By: Casey Bodley <cbodley@redhat.com>
4 years agoMerge pull request #40494 from aaSharma14/wip-50053-pacific
Yuri Weinstein [Mon, 5 Apr 2021 21:19:55 +0000 (14:19 -0700)]
Merge pull request #40494 from aaSharma14/wip-50053-pacific

pacific: mgr/dashboard: Device health status is not getting listed under hosts section

Reviewed-by: Alfonso Martínez <almartin@redhat.com>
Reviewed-by: Laura Paduano <lpaduano@suse.com>
Reviewed-by: Nizamudeen A <nia@redhat.com>
4 years agoMerge pull request #40474 from rhcs-dashboard/wip-50038-pacific
Yuri Weinstein [Mon, 5 Apr 2021 21:18:49 +0000 (14:18 -0700)]
Merge pull request #40474 from rhcs-dashboard/wip-50038-pacific

pacific: mgr/dashboard: fix broken feature toggles

Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Laura Paduano <lpaduano@suse.com>
Reviewed-by: Aashish Sharma <aasharma@redhat.com>
Reviewed-by: Nizamudeen A <nia@redhat.com>
4 years agoMerge pull request #40461 from sseshasa/wip-50018-pacific
Yuri Weinstein [Mon, 5 Apr 2021 21:14:14 +0000 (14:14 -0700)]
Merge pull request #40461 from sseshasa/wip-50018-pacific

pacific: qa/tasks: Add wait_for_clean() check prior to initiating scrubbing.

Reviewed-by: Neha Ojha <nojha@redhat.com>
4 years agoMerge PR #40554 into pacific
Sage Weil [Mon, 5 Apr 2021 19:39:37 +0000 (14:39 -0500)]
Merge PR #40554 into pacific

* refs/pull/40554/head:
cephadm: specify addr on bootstrap's host add

Reviewed-by: Michael Fritch <mfritch@suse.com>
4 years agoMerge pull request #40448 from alimaredia/wip-rgw-log-req-latency-pacific
Casey Bodley [Mon, 5 Apr 2021 18:11:53 +0000 (14:11 -0400)]
Merge pull request #40448 from alimaredia/wip-rgw-log-req-latency-pacific

pacific: rgw: add latency to the request summary of an op

Reviewed-by: Casey Bodley <cbodley@redhat.com>
4 years agorgw/multisite: handle case when empty marker is provided 40559/head
Yuval Lifshitz [Sun, 4 Apr 2021 14:19:03 +0000 (17:19 +0300)]
rgw/multisite: handle case when empty marker is provided

marker is potional, however, it may also be provided empty

Fixes: https://tracker.ceph.com/issues/50135
Signed-off-by: Yuval Lifshitz <ylifshit@redhat.com>
(cherry picked from commit fccf75eee3750a3654d2a2b1e3aa379edcfd8c8d)
Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
4 years agorgw: Fix probe failure on OSDs not suporting FIFO.
Adam C. Emerson [Mon, 8 Mar 2021 20:17:53 +0000 (15:17 -0500)]
rgw: Fix probe failure on OSDs not suporting FIFO.

Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
(cherry picked from commit 4e9ec426b15fe60c5b0154980f808076e166dd02)
Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
4 years agorgw: Make empty datalog fifo markers empty strings
Adam C. Emerson [Thu, 11 Feb 2021 23:27:33 +0000 (18:27 -0500)]
rgw: Make empty datalog fifo markers empty strings

Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
(cherry picked from commit 4e3a7d5476fa2dd4b9825f4d546c42819f93c7cc)
Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
4 years agorgw: Try to prune empties even if no empties found
Adam C. Emerson [Wed, 10 Feb 2021 22:09:02 +0000 (17:09 -0500)]
rgw: Try to prune empties even if no empties found

Since we won't actually delete empties until much later.

Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
(cherry picked from commit 9bd9b7659fdb7a1a01d5e1523f0d461dbf5eaafe)
Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
4 years agorgw: Wait until a generation has been empty for an hour to delete
Adam C. Emerson [Wed, 10 Feb 2021 21:18:09 +0000 (16:18 -0500)]
rgw: Wait until a generation has been empty for an hour to delete

This fixes a problem where, while the backing handle remains allocated
while a call completes, the objects it depends on may be deleted
behind it.

Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
(cherry picked from commit 7018c25d47edf7e12b581f7f28c2549fe73bde15)
Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
4 years agorgw: Leave the zero'th shard of the zero'th generation for cls_lock
Adam C. Emerson [Tue, 9 Feb 2021 23:10:50 +0000 (18:10 -0500)]
rgw: Leave the zero'th shard of the zero'th generation for cls_lock

Since data sync locks that object, instead of deleting it, truncate
the object and clear the omap.

(cls_lock uses xattrs.)

Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
(cherry picked from commit 0d4e0abb8a699417ea75a6cd390786189ab964eb)
Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
4 years agorgw: Don't swallow errors in datalog async trim
Adam C. Emerson [Thu, 4 Feb 2021 20:48:56 +0000 (15:48 -0500)]
rgw: Don't swallow errors in datalog async trim

Typo and misleading indentation.

Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
(cherry picked from commit e97de55f46bbe67b523abfb4c30c50f1547f2601)
Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
4 years agorgw: Fix cursor handling in DataLogBackends::list
Adam C. Emerson [Tue, 2 Feb 2021 19:09:52 +0000 (14:09 -0500)]
rgw: Fix cursor handling in DataLogBackends::list

Don't assume that the lowest generation not greater than the requested
generation actually is the requested generation.

(Also don't hold the lock after we get a backend.)

Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
(cherry picked from commit d7739178e994ce84886d297a29f2250e4bd78daa)
Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
4 years agorgw: Prune datalog generations in the renew loop
Adam C. Emerson [Wed, 27 Jan 2021 01:30:58 +0000 (20:30 -0500)]
rgw: Prune datalog generations in the renew loop

Every 150 times through, which is a bit less than an hour between runs
by default.

Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
(cherry picked from commit 8f4291291b0dea4b4701894da0775149266a1373)
Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
Conflicts:
src/rgw/rgw_datalog.cc

4 years agorgw: Use LazyFIFO in data changes log
Adam C. Emerson [Sun, 22 Nov 2020 04:06:38 +0000 (23:06 -0500)]
rgw: Use LazyFIFO in data changes log

That way we don't start sending ops to open a FIFO until we need it.

Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
(cherry picked from commit 12939a258f8c627d1b7b23c0b9d7c22e98e69d89)
Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
4 years agorgw: Add LazyFIFO to keep from blasting an op-per-shard on startup
Adam C. Emerson [Sun, 22 Nov 2020 00:34:07 +0000 (19:34 -0500)]
rgw: Add LazyFIFO to keep from blasting an op-per-shard on startup

LazyFIFO opens the FIFO on first access.

Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
(cherry picked from commit 1cc4a0a4e274700b4ae044db125a8cb3a64253a2)
Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
4 years agocls/fifo: Don't error in the log if we're being probed for existence
Adam C. Emerson [Tue, 26 Jan 2021 17:24:41 +0000 (12:24 -0500)]
cls/fifo: Don't error in the log if we're being probed for existence

Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
(cherry picked from commit 4a2575783a050f27b22b7bfe4364520bf29fc6a5)
Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
4 years agorgw: Add and trim datalog generations
Adam C. Emerson [Sat, 23 Jan 2021 01:48:39 +0000 (20:48 -0500)]
rgw: Add and trim datalog generations

This lets us actually change type in mid-stream.

Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
(cherry picked from commit 32b100d797cdf88648530e0162fd103cf279df31)
Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
4 years agorgw: Actually pull logbacking_generations into datalog
Adam C. Emerson [Wed, 27 Jan 2021 01:07:45 +0000 (20:07 -0500)]
rgw: Actually pull logbacking_generations into datalog

Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
(cherry picked from commit eb0f8ffcc785146a1fb249f4531620787be216ba)
Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
4 years agorgw: Clamp FIFO trim to head
Adam C. Emerson [Tue, 26 Jan 2021 06:27:24 +0000 (01:27 -0500)]
rgw: Clamp FIFO trim to head

Don't try to trim a bunch of parts that don't exist.

Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
(cherry picked from commit 60b729e32602b7401e15957cef976386281c4ccb)
Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
4 years agorgw: Lay groundwork for multigenerational datalog
Adam C. Emerson [Wed, 6 Jan 2021 08:40:50 +0000 (03:40 -0500)]
rgw: Lay groundwork for multigenerational datalog

Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
(cherry picked from commit 27ca609755a2c0e8fd501be46bc20026aa33b93c)
Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
4 years agorgw: Add rgw_complete_aio_completion()
Adam C. Emerson [Mon, 23 Nov 2020 20:29:35 +0000 (15:29 -0500)]
rgw: Add rgw_complete_aio_completion()

To manually complete an asynchronous librados call.

Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
(cherry picked from commit 97c3f2b4e6d0a8d0c2366d6dca4570e063af7953)
Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
4 years agorgw: Generational support for logback switching
Adam C. Emerson [Wed, 6 Jan 2021 01:00:07 +0000 (20:00 -0500)]
rgw: Generational support for logback switching

Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
(cherry picked from commit 6b50f6d6def59e3c4b2db2d5311a887127b4804b)
Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
4 years agorgw: Logback generation data structures
Adam C. Emerson [Mon, 4 Jan 2021 00:08:09 +0000 (19:08 -0500)]
rgw: Logback generation data structures

Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
(cherry picked from commit b97b207928c60b48fe405ab38be15ba55f927d5c)
Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
4 years agorgw/datalog: make get_oid take generation
Adam C. Emerson [Sun, 3 Jan 2021 23:32:50 +0000 (18:32 -0500)]
rgw/datalog: make get_oid take generation

Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
(cherry picked from commit f7b850f7aa84d9cf24b4eaebbe51c7ee221bbd44)
Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
4 years agorgw: Move get_oid back to RGWDataChangesLog
Adam C. Emerson [Sat, 21 Nov 2020 23:20:57 +0000 (18:20 -0500)]
rgw: Move get_oid back to RGWDataChangesLog

Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
(cherry picked from commit bdd3528e54e399135f602e1f7e94d070d89b8c99)
Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
4 years agorgw/datalog: Pass IoCtx in, don't have each backend make its own
Adam C. Emerson [Sat, 21 Nov 2020 22:05:04 +0000 (17:05 -0500)]
rgw/datalog: Pass IoCtx in, don't have each backend make its own

Also don't use svc_cls.

Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
(cherry picked from commit 7f097cf8db433bb4c82a9bafc44e43b84f79bca4)
Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
4 years agorgw: Use refactored log backing tools
Adam C. Emerson [Sat, 21 Nov 2020 20:45:12 +0000 (15:45 -0500)]
rgw: Use refactored log backing tools

Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
(cherry picked from commit da6223d281e33e43fa74c50f4d0eedb5ac25ace4)
Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
4 years agorgw: Factor out tool to deal with different log backing
Adam C. Emerson [Sat, 21 Nov 2020 06:44:36 +0000 (01:44 -0500)]
rgw: Factor out tool to deal with different log backing

Read through the shards of a log and find out what kind it is.

Also remove a log.

Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
(cherry picked from commit ed15d03f068c6f6e959f04d9d8f99eac82ebbd29)
Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
4 years agorgw: Add AioCompletion* versions for the rest of the FIFO methods
Adam C. Emerson [Tue, 3 Nov 2020 21:02:26 +0000 (16:02 -0500)]
rgw: Add AioCompletion* versions for the rest of the FIFO methods

Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
(cherry picked from commit 665573ab8905bfa2e1ede6fc3be9bc80a625cb49)
Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
4 years agocls/log: Take const references of things you won't modify
Adam C. Emerson [Sat, 21 Nov 2020 22:04:12 +0000 (17:04 -0500)]
cls/log: Take const references of things you won't modify

Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
(cherry picked from commit 73ea8cec06addc6af2ba354321f1099f657f13c5)
Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
4 years agomgr/dashboard: Fix for alert notification message being undefined 40588/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 agomgr/dashboard: Unable to login to ceph dashboard until clearing cookies 40586/head
Avan Thakkar [Fri, 19 Mar 2021 12:59:22 +0000 (18:29 +0530)]
mgr/dashboard: Unable to login to ceph dashboard until clearing cookies

Fixes: https://tracker.ceph.com/issues/49897
Signed-off-by: Avan Thakkar <athakkar@redhat.com>
Clears the cookie for token after logout.

(cherry picked from commit 7eb59c0250d69ea05d87276f47299f91e4069b30)

4 years agoMerge PR #39488 into pacific
Sage Weil [Sat, 3 Apr 2021 13:58:33 +0000 (08:58 -0500)]
Merge PR #39488 into pacific

* refs/pull/39488/head:
rpm: re-disable SUSE lttng build on z390x
ceph.spec.in: bump gperftools requirement for ppc64le
ceph.spec.in: enable tcmalloc and lttng on s390x

Reviewed-by: Nathan Cutler <ncutler@suse.com>
Reviewed-by: Ken Dreyer <kdreyer@redhat.com>
4 years agoMerge PR #40489 into pacific
Sage Weil [Sat, 3 Apr 2021 13:58:02 +0000 (08:58 -0500)]
Merge PR #40489 into pacific

* refs/pull/40489/head:
mgr/dashboard: Remove username, password fileds from -Cluster/Manager Modules/dashboard

Reviewed-by: Alfonso Martínez <almartin@redhat.com>
Reviewed-by: Nizamudeen A <nia@redhat.com>
4 years agoMerge PR #40545 into pacific
Sage Weil [Sat, 3 Apr 2021 13:56:52 +0000 (08:56 -0500)]
Merge PR #40545 into pacific

* refs/pull/40545/head:
mgr/dashboard: Improve descriptions in some parts of the dashboard

Reviewed-by: Waad Alkhoury <walkhour@redhat.com>
Reviewed-by: Pere Diaz Bou <pere-altea@hotmail.com>
4 years agoMerge pull request #40568 from tchaikov/pacific-49229
Kefu Chai [Sat, 3 Apr 2021 01:55:29 +0000 (09:55 +0800)]
Merge pull request #40568 from tchaikov/pacific-49229

pacific: cmake: use --smp 1 --memory 256M to crimson tests

Reviewed-by: Sage Weil <sage@redhat.com>
4 years agocmake: use --smp 1 --memory 256M to crimson tests 40568/head
Jenkins Build Slave User [Fri, 19 Mar 2021 08:32:59 +0000 (08:32 +0000)]
cmake: use --smp 1 --memory 256M to crimson tests

to reduce the resource usage when running tests

there is an exception though, as we want to test test_config.cc with
multiple reactors.

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

Conflicts:
src/test/crimson/CMakeLists.txt
src/test/crimson/seastore/CMakeLists.txt
src/test/crimson/seastore/onode_tree/CMakeLists.txt

4 years agoMerge PR #40512 into pacific
Sage Weil [Fri, 2 Apr 2021 14:59:23 +0000 (09:59 -0500)]
Merge PR #40512 into pacific

* refs/pull/40512/head:
qa/suites/rados/cephadm: stop testing on broken focal kubic podman

Reviewed-by: Kefu Chai <kchai@redhat.com>
4 years agoMerge PR #40544 into pacific
Sage Weil [Fri, 2 Apr 2021 14:58:51 +0000 (09:58 -0500)]
Merge PR #40544 into pacific

* refs/pull/40544/head:
mgr/orchestrator: move PORTS column in 'orch ps' output
cephadm: fix failure when using --apply-spec and --shh-user
cephadm: specify addr on bootstrap's host add
mgr/cephadm: don't have upgrade fail if "." in patch section of version

Reviewed-by: Michael Fritch <mfritch@suse.com>
4 years agocephadm: specify addr on bootstrap's host add 40554/head
Joao Eduardo Luis [Mon, 29 Mar 2021 06:27:06 +0000 (06:27 +0000)]
cephadm: specify addr on bootstrap's host add

Signed-off-by: Joao Eduardo Luis <joao@suse.com>
(cherry picked from commit df13888255e47ad2c66fa8da11f0e9e4ef624071)

4 years agomgr/orchestrator: move PORTS column in 'orch ps' output 40544/head
Sage Weil [Mon, 22 Mar 2021 19:22:21 +0000 (15:22 -0400)]
mgr/orchestrator: move PORTS column in 'orch ps' output

Put it next to HOST.

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

4 years agomgr/dashboard: Improve descriptions in some parts of the dashboard 40545/head
Nizamudeen A [Thu, 25 Mar 2021 08:07:34 +0000 (13:37 +0530)]
mgr/dashboard: Improve descriptions in some parts of the dashboard

Improves the description in some parts of the dashboard code.

Fixes: https://tracker.ceph.com/issues/49829
Fixes: https://tracker.ceph.com/issues/49969
Signed-off-by: Nizamudeen A <nia@redhat.com>
(cherry picked from commit 82235fd7567f974890e884f873f8de0fb226ada1)

4 years agocephadm: fix failure when using --apply-spec and --shh-user
Daniel Pivonka [Mon, 29 Mar 2021 17:47:11 +0000 (13:47 -0400)]
cephadm: fix failure when using --apply-spec and --shh-user

ssh-copy-id was being run as the root user because cephadm requires sudo
so it was trying to use the root users ssh keys to copy the cephadm ssh key to the hosts in the spec
this would fail if the root user did not has passwordless ssh to the host being added
solution run ssh-copy-id as the user ssh-user

additionally fix the check to not copy the cephadm ssh key to the bootstrap host

Signed-off-by: Daniel Pivonka <dpivonka@redhat.com>
(cherry picked from commit 33c843f8a275d6f01d824c6fa066fbd771b6e9fc)

4 years agocephadm: specify addr on bootstrap's host add
Joao Eduardo Luis [Mon, 29 Mar 2021 06:27:06 +0000 (06:27 +0000)]
cephadm: specify addr on bootstrap's host add

Signed-off-by: Joao Eduardo Luis <joao@suse.com>
(cherry picked from commit df13888255e47ad2c66fa8da11f0e9e4ef624071)

4 years agomgr/cephadm: don't have upgrade fail if "." in patch section of version
Adam King [Mon, 29 Mar 2021 19:01:23 +0000 (15:01 -0400)]
mgr/cephadm: don't have upgrade fail if "." in patch section of version

Fixes: https://tracker.ceph.com/issues/50043
Signed-off-by: Adam King <adking@redhat.com>
(cherry picked from commit e03f0fff5032314eb08059403c44bac3a5037f57)

4 years agoMerge pull request #40523 from tchaikov/pacific-pr-40496
Kefu Chai [Thu, 1 Apr 2021 02:38:32 +0000 (10:38 +0800)]
Merge pull request #40523 from tchaikov/pacific-pr-40496

pacific: cmake: pass unparsed args to add_ceph_test()

Reviewed-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
Reviewed-by: Ronen Friedman <rfriedma@redhat.com>
4 years agoMerge pull request #40517 from tchaikov/pacific-pr-40505
Kefu Chai [Thu, 1 Apr 2021 02:28:58 +0000 (10:28 +0800)]
Merge pull request #40517 from tchaikov/pacific-pr-40505

pacific: mgr/PyModule: put mgr_module_path before Py_GetPath()

Reviewed-by: Neha Ojha <nojha@redhat.com>
4 years agoqa: wait for daemons to come up via cephadm 40528/head
Patrick Donnelly [Tue, 9 Mar 2021 21:54:34 +0000 (13:54 -0800)]
qa: wait for daemons to come up via cephadm

Rather than waiting for a set amount of time.

Fixes: https://tracker.ceph.com/issues/49684
Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
(cherry picked from commit d06689e16e3264b21b33326db5e328faef0da799)

4 years agoqa: reduce dependence on teuthology role list for mds
Patrick Donnelly [Wed, 10 Mar 2021 22:46:27 +0000 (14:46 -0800)]
qa: reduce dependence on teuthology role list for mds

It's not yet possible to completely remove the dependency on
mds_ids/mds_daemons in the CephFS tests but this commit reduces it
enough for most code paths to work with cephadm.

The main change here is use of CephManager.do_rados, with some
improvements.

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

4 years agoqa: improve usability of do_rados helper
Patrick Donnelly [Wed, 10 Mar 2021 22:30:32 +0000 (14:30 -0800)]
qa: improve usability of do_rados helper

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

4 years agoqa: remove get_lone_mds_id
Patrick Donnelly [Thu, 11 Mar 2021 18:31:05 +0000 (10:31 -0800)]
qa: remove get_lone_mds_id

This helps remove a dependence on the list of mds_daemons from
teuthology/cephadm.

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

4 years agoqa: simplify tests which stop MDS ranks
Patrick Donnelly [Thu, 11 Mar 2021 19:06:23 +0000 (11:06 -0800)]
qa: simplify tests which stop MDS ranks

Instead of stopping MDS daemons and individually failing MDS daemons,
just fail the ranks or the entire file system, where possible.

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

4 years agoqa: use mds_tell for getting mds status
Patrick Donnelly [Thu, 11 Mar 2021 15:31:25 +0000 (07:31 -0800)]
qa: use mds_tell for getting mds status

mds_asok is broken with cephadm currently due to [1].

[1] https://tracker.ceph.com/issues/48019#note-5

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

4 years agoqa: remove shutdown lockdep not relevant to unit test
Patrick Donnelly [Fri, 12 Mar 2021 04:58:53 +0000 (20:58 -0800)]
qa: remove shutdown lockdep not relevant to unit test

This is part of a fleet of commits trying to remove unnecessary mds_stop
calls in testing.

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

4 years agoqa: remove fallback for non-multifs ceph version
Patrick Donnelly [Thu, 11 Mar 2021 15:30:40 +0000 (07:30 -0800)]
qa: remove fallback for non-multifs ceph version

This code was for jewel (IIRC) or older.

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

4 years agoqa: add Filesystem.reset helper
Patrick Donnelly [Fri, 12 Mar 2021 05:04:39 +0000 (21:04 -0800)]
qa: add Filesystem.reset helper

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

4 years agocmake: pass unparsed args to add_ceph_test() 40523/head
Kefu Chai [Tue, 30 Mar 2021 08:18:48 +0000 (16:18 +0800)]
cmake: pass unparsed args to add_ceph_test()

this allows us to pass extra argument to the script or executable to
further customize its behavior when testing.

also fix all the callers of add_ceph_unittest(), as there is no need to
repeat the executable, which is also used as the name of the test.

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

Conflicts:
src/test/crimson/CMakeLists.txt
src/test/crimson/seastore/CMakeLists.txt: trivial resolution

4 years agocmake: pass PARALLEL to add_ceph_unittest()
Kefu Chai [Tue, 30 Mar 2021 08:17:14 +0000 (16:17 +0800)]
cmake: pass PARALLEL to add_ceph_unittest()

and parse it using cmake_parse_arguments(), more flexible this way.

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

4 years agomgr/PyModule: put mgr_module_path before Py_GetPath() 40517/head
Kefu Chai [Tue, 30 Mar 2021 18:32:38 +0000 (02:32 +0800)]
mgr/PyModule: put mgr_module_path before Py_GetPath()

pip comes with _vendor/progress. so there is chance to import the vendored
version of "progress" module instead of the "progress" mgr module, and
fail to import the latter.

in this change, the order of paths are rearranged so the configured
`mgr_module_path` is put before the return value of `Py_GetPath()`.

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

4 years agoqa/suites/rados/cephadm: stop testing on broken focal kubic podman 40512/head
Sage Weil [Mon, 29 Mar 2021 12:51:08 +0000 (07:51 -0500)]
qa/suites/rados/cephadm: stop testing on broken focal kubic podman

See https://tracker.ceph.com/issues/49633

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

4 years ago16.2.0 v16.2.0
Jenkins Build Slave User [Tue, 30 Mar 2021 21:13:28 +0000 (21:13 +0000)]
16.2.0

4 years agoMerge pull request #40452 from smithfarm/wip-50029-pacific
Josh Durgin [Tue, 30 Mar 2021 21:00:12 +0000 (14:00 -0700)]
Merge pull request #40452 from smithfarm/wip-50029-pacific

pacific: rpm: drop extraneous explicit sqlite-libs runtime dependency

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Ken Dreyer <kdreyer@redhat.com>
4 years agoMerge pull request #40455 from liewegas/pacific-final-status
Josh Durgin [Tue, 30 Mar 2021 20:12:01 +0000 (13:12 -0700)]
Merge pull request #40455 from liewegas/pacific-final-status

pacific: ceph_release: rc -> stable

Reviewed-by: Neha Ojha <nojha@redhat.com>
4 years agoMerge pull request #40217 from liewegas/cephadm-default-image-pacific
Josh Durgin [Tue, 30 Mar 2021 20:11:36 +0000 (13:11 -0700)]
Merge pull request #40217 from liewegas/cephadm-default-image-pacific

pacific: cephadm: update default image (DNM until right before final release)

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
4 years agomgr/dashboard: Device health status is not getting listed under hosts section 40494/head
Aashish Sharma [Thu, 11 Mar 2021 06:06:22 +0000 (11:36 +0530)]
mgr/dashboard: Device health status is not getting listed under hosts section

Device health is shown as failed to retrieve data under Hosts > Device Health section. This PR intends to fix this issue.

Fixes: https://tracker.ceph.com/issues/49354
Signed-off-by: Aashish Sharma <aasharma@redhat.com>
(cherry picked from commit 8f4574696c5272de4be6cbcbd3a8fc713d6b604e)

4 years agomgr/dashboard: Remove username, password fileds from -Cluster/Manager Modules/dashboard 40489/head
Aashish Sharma [Mon, 8 Mar 2021 09:44:00 +0000 (15:14 +0530)]
mgr/dashboard: Remove username, password fileds from -Cluster/Manager Modules/dashboard

Username, password fields are empty in Cluster/Manager Modules/dashboard.Since this functionality is when dashboard supported single user-password, now we need to remove these fields from here.

Fixes: https://tracker.ceph.com/issues/49645
Signed-off-by: Aashish Sharma <aasharma@redhat.com>
(cherry picked from commit d8fba40d982bb1ad824961aa210475bd7aa51524)

4 years agoMerge PR #40473 into pacific
Sage Weil [Tue, 30 Mar 2021 00:25:54 +0000 (19:25 -0500)]
Merge PR #40473 into pacific

* refs/pull/40473/head:
mgr/cephadm/upgrade: ignore deployed_by until mgr is upgraded

Reviewed-by: Adam King <adking@redhat.com>
4 years agorgw: add latency to the request summary of an op 40448/head
Ali Maredia [Tue, 2 Mar 2021 05:24:14 +0000 (00:24 -0500)]
rgw: add latency to the request summary of an op

Latency of a request added at the end of request
summary rgw log line. This summary line also contains
information about the request like the op, bucket,
object, http status.

Signed-off-by: Ali Maredia <amaredia@redhat.com>
(cherry picked from commit 91e720d37c73719ab66be0947e6b828bb2853d7b)

4 years agomgr/dashboard: fix broken feature toggles 40474/head
Ernesto Puerta [Wed, 17 Mar 2021 16:31:53 +0000 (17:31 +0100)]
mgr/dashboard: fix broken feature toggles

Fixes the feature toggles functionality broken in the refactoring of the
CLI commands (3c431a54d96ebc9bdb911161468d0f6bedbbcbfe, PR #38722).

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

4 years agomgr/cephadm/upgrade: ignore deployed_by until mgr is upgraded 40473/head
Sage Weil [Mon, 29 Mar 2021 13:42:03 +0000 (08:42 -0500)]
mgr/cephadm/upgrade: ignore deployed_by until mgr is upgraded

Until we upgrade the mgr itself, we will never be able to make our
deployed daemons have a deployed_by == target_digests.  Ignore those
daemons until the mgr is the right version.

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

4 years agoqa/tasks: Add wait_for_clean() check prior to initiating scrubbing. 40461/head
Sridhar Seshasayee [Thu, 25 Mar 2021 12:37:49 +0000 (18:07 +0530)]
qa/tasks: Add wait_for_clean() check prior to initiating scrubbing.

Fixes: https://tracker.ceph.com/issues/49983
Signed-off-by: Sridhar Seshasayee <sseshasa@redhat.com>
(cherry picked from commit b5570238b68af378c6c1bf7cc315e443b785e147)

4 years agoceph_release: rc -> stable 40455/head
Sage Weil [Sun, 28 Mar 2021 21:37:26 +0000 (16:37 -0500)]
ceph_release: rc -> stable

Signed-off-by: Sage Weil <sage@newdream.net>
4 years agoMerge PR #40437 into pacific
Sage Weil [Sun, 28 Mar 2021 18:07:27 +0000 (13:07 -0500)]
Merge PR #40437 into pacific

* refs/pull/40437/head:
mgr/cephadm: make upgrade progress bar mention target version, not repo digest
doc/cephadm: fix rgw realm and zone flags
mgr/volumes: do not overwrite existant mds specs
mgr/cephadm: no-overwite flag for apply command
mgr/orchestrator: remove image name field from 'orch ps' and 'orch ls'
cephadm: fix parsing of keepalived version (drop leading 'v')
cephadm: keepalived needs --cap-add=NET_RAW
cephadm: fix --cap-add=NET_ADMIN
cephadm: fix quoting for keepalived env var
mgr/cephadm: ha-rgw: use correct port
cephadm: validate fsid during cephadm shell command

Reviewed-by: Juan Miguel Olmo <jolmomar@redhat.com>
4 years agoMerge PR #40436 into pacific
Sage Weil [Sun, 28 Mar 2021 14:28:19 +0000 (09:28 -0500)]
Merge PR #40436 into pacific

* refs/pull/40436/head:
auth: require CEPHX_V2 by default

Reviewed-by: Ilya Dryomov <idryomov@redhat.com>