]> git.apps.os.sepia.ceph.com Git - ceph.git/log
ceph.git
3 years agostop.sh: Fix umount in stop.sh 46888/head
Kotresh HR [Wed, 29 Jun 2022 06:50:23 +0000 (12:20 +0530)]
stop.sh: Fix umount in stop.sh

Introduced-by: 8a4a432e8b6e41ff13c33698cc053079f6786aa2
Signed-off-by: Kotresh HR <khiremat@redhat.com>
3 years agoMerge pull request #46643 from ronen-fr/wip-rf-blocked
Ronen Friedman [Thu, 23 Jun 2022 15:29:27 +0000 (18:29 +0300)]
Merge pull request #46643 from ronen-fr/wip-rf-blocked

scrub/osd: add clearer reminders that a scrub is blocked

Reviewed-by: Laura Flores <lflores@redhat.com>
Reviewed-by: Matan Breizman <mbreizma@redhat.com>
3 years agoMerge pull request #46435 from liu-chunmei/crimson-error-log
Liu-Chunmei [Wed, 22 Jun 2022 22:28:48 +0000 (15:28 -0700)]
Merge pull request #46435 from liu-chunmei/crimson-error-log

Crimson/osd:  add error log

Reviewed-by: Samuel Just <sjust@redhat.com>
3 years agoMerge pull request #46613 from liu-chunmei/crimson-cmp-ext
Liu-Chunmei [Wed, 22 Jun 2022 22:26:53 +0000 (15:26 -0700)]
Merge pull request #46613 from liu-chunmei/crimson-cmp-ext

crimson/osd: return error code to break next op in cmp_ext

Reviewed-by: Samuel Just <sjust@redhat.com>
3 years agoMerge pull request #46795 from xxhdx1985126/wip-seastore-backref-trim-bug-fix
Samuel Just [Wed, 22 Jun 2022 18:32:44 +0000 (11:32 -0700)]
Merge pull request #46795 from xxhdx1985126/wip-seastore-backref-trim-bug-fix

crimson/os/seastore/cache: trim backref cache before preparing record

Reviewed-by: Samuel Just <sjust@redhat.com>
3 years agoMerge pull request #46788 from ivancich/wip-superfluous-struct
J. Eric Ivancich [Wed, 22 Jun 2022 16:56:52 +0000 (12:56 -0400)]
Merge pull request #46788 from ivancich/wip-superfluous-struct

rgw: remove unnecessary "struct" from req_state declarations

Reviewed-by: Adam C. Emerson <aemerson@redhat.com>
3 years agoMerge pull request #46707 from adamemerson/wip-timestamp-status
Casey Bodley [Wed, 22 Jun 2022 16:51:28 +0000 (12:51 -0400)]
Merge pull request #46707 from adamemerson/wip-timestamp-status

rgw: radosgw-admin includes current time in most status commands

Reviewed-by: Shilpa Jagannath <smanjara@redhat.com>
Reviewed-by: Casey Bodley <cbodley@redhat.com>
3 years agoMerge pull request #46640 from xxhdx1985126/wip-seastore-count-tree-size
Samuel Just [Wed, 22 Jun 2022 16:20:43 +0000 (09:20 -0700)]
Merge pull request #46640 from xxhdx1985126/wip-seastore-count-tree-size

crimson/os/seastore: count tree sizes

Reviewed-by: Samuel Just <sjust@redhat.com>
Reviewed-by: Yingxin Cheng <yingxin.cheng@intel.com>
3 years agoMerge pull request #46816 from cbodley/wip-54405-again
Casey Bodley [Wed, 22 Jun 2022 15:27:38 +0000 (11:27 -0400)]
Merge pull request #46816 from cbodley/wip-54405-again

rgw: fix frontend's use of rgw_access log subsystem

Reviewed-by: Matt Benjamin <mbenjami@redhat.com>
3 years agoMerge pull request #46769 from zdover23/wip-doc-2022-06-21-dev-guide-config-local...
zdover23 [Wed, 22 Jun 2022 14:03:14 +0000 (00:03 +1000)]
Merge pull request #46769 from zdover23/wip-doc-2022-06-21-dev-guide-config-local-env-add-context-note

doc/dev: add context note to dev guide config

Reviewed-by: Anthony D'Atri <anthony.datri@gmail.com>
3 years agoMerge pull request #46369 from rkachach/fix_issue_55357
Adam King [Wed, 22 Jun 2022 13:46:25 +0000 (09:46 -0400)]
Merge pull request #46369 from rkachach/fix_issue_55357

doc/cephadm: document the new per-fsid cephadm conf location

Reviewed-by: Adam King <adking@redhat.com>
Reviewed-by: Anthony D'Atri <anthonyeleven@users.noreply.github.com>
3 years agorgw: fix frontend's use of rgw_access log subsystem 46816/head
Casey Bodley [Wed, 22 Jun 2022 13:07:36 +0000 (09:07 -0400)]
rgw: fix frontend's use of rgw_access log subsystem

Signed-off-by: Casey Bodley <cbodley@redhat.com>
3 years agoMerge pull request #46759 from idryomov/wip-rbd-mirror-remote-not-primary
Ilya Dryomov [Wed, 22 Jun 2022 11:51:20 +0000 (13:51 +0200)]
Merge pull request #46759 from idryomov/wip-rbd-mirror-remote-not-primary

rbd-mirror: generally skip replay/resync if remote image is not primary

Reviewed-by: Arthur Outhenin-Chalandre <arthur.outhenin-chalandre@cern.ch>
Reviewed-by: Mykola Golub <mgolub@suse.com>
Reviewed-by: Deepika Upadhyay <dupadhya@redhat.com>
3 years agoMerge pull request #46765 from rhcs-dashboard/login-banner-cli-bug
Ernesto Puerta [Wed, 22 Jun 2022 11:38:03 +0000 (13:38 +0200)]
Merge pull request #46765 from rhcs-dashboard/login-banner-cli-bug

mgr/dashboard: dashboard help command showing wrong syntax for login-banner

Reviewed-by: Ernesto Puerta <epuertat@redhat.com>
Reviewed-by: sunilangadi2 <NOT@FOUND>
3 years agoMerge pull request #46733 from rhcs-dashboard/rbd-mirroring-snapshot-ui
Ernesto Puerta [Wed, 22 Jun 2022 11:05:26 +0000 (13:05 +0200)]
Merge pull request #46733 from rhcs-dashboard/rbd-mirroring-snapshot-ui

mgr/dashboard: rbd mirroring promotion/demotion UI

Reviewed-by: Sarthak Gupta <sarthak.dev.0702@gmail.com>
Reviewed-by: Ernesto Puerta <epuertat@redhat.com>
3 years agocrimson/osd: create and send error log when has error 46435/head
chunmei-liu [Wed, 25 May 2022 05:55:42 +0000 (22:55 -0700)]
crimson/osd: create and send error log when has error

Signed-off-by: chunmei-liu <chunmei.liu@intel.com>
3 years agodoc/cephadm: document the new per-fsid cephadm conf location 46369/head
Redouane Kachach [Mon, 23 May 2022 09:14:05 +0000 (11:14 +0200)]
doc/cephadm: document the new per-fsid cephadm conf location
Fixes: https://tracker.ceph.com/issues/55357
Signed-off-by: Redouane Kachach <rkachach@redhat.com>
3 years agoscrub/osd: disable blocked-scrub warnings during some tests 46643/head
Ronen Friedman [Mon, 20 Jun 2022 12:47:57 +0000 (12:47 +0000)]
scrub/osd: disable blocked-scrub warnings during some tests

As some Teuthology tests seem to block objects for long minutes,
we must not issue the "scrub is blocked for too long" warning
(that warning causes the tests to fail).

A new configuration parameter now controls the grace period before
the warning is issued. Some tests were modified to set this
configuration parameter to a large value.

Signed-off-by: Ronen Friedman <rfriedma@redhat.com>
3 years agoMerge pull request #46587 from liu-chunmei/crimson-check-truncate
Liu-Chunmei [Wed, 22 Jun 2022 05:07:46 +0000 (22:07 -0700)]
Merge pull request #46587 from liu-chunmei/crimson-check-truncate

crimson/osd: check truncate size in sparse_read

Reviewed-by: Samuel Just <sjust@redhat.com>
3 years agocrimson/os/seastore/cache: count tree size during OSD startup 46640/head
Xuehan Xu [Fri, 17 Jun 2022 04:33:28 +0000 (12:33 +0800)]
crimson/os/seastore/cache: count tree size during OSD startup

Signed-off-by: Xuehan Xu <xxhdx1985126@gmail.com>
3 years agocrimson/os/seastore/cache: trim backref cache before preparing record 46795/head
Xuehan Xu [Fri, 17 Jun 2022 07:58:33 +0000 (15:58 +0800)]
crimson/os/seastore/cache: trim backref cache before preparing record

Otherwise, the transaction record would contain backrefs that has been
merged into the backref tree

Signed-off-by: Xuehan Xu <xxhdx1985126@gmail.com>
3 years agocrimson/osd: check truncate size in sparse_read 46587/head
chunmei-liu [Thu, 9 Jun 2022 07:44:01 +0000 (00:44 -0700)]
crimson/osd: check truncate size in sparse_read

Signed-off-by: chunmei-liu <chunmei.liu@intel.com>
3 years agocrimson/osd: return error code to break next op in cmp_ext 46613/head
chunmei-liu [Fri, 10 Jun 2022 01:30:20 +0000 (18:30 -0700)]
crimson/osd: return error code to break next op in cmp_ext

Signed-off-by: chunmei-liu <chunmei.liu@intel.com>
3 years agoMerge pull request #46616 from xxhdx1985126/wip-seastore-lba-wrong-lba-node-size
Samuel Just [Tue, 21 Jun 2022 23:18:27 +0000 (16:18 -0700)]
Merge pull request #46616 from xxhdx1985126/wip-seastore-lba-wrong-lba-node-size

crimson/os/seastore/lba_manager: correct btree node sizes

Reviewed-by: Yingxin Cheng <yingxin.cheng@intel.com>
Reviewed-by: Samuel Just <sjust@redhat.com>
3 years agoMerge pull request #46614 from xxhdx1985126/wip-backref-bug-fixes
Samuel Just [Tue, 21 Jun 2022 23:17:21 +0000 (16:17 -0700)]
Merge pull request #46614 from xxhdx1985126/wip-backref-bug-fixes

crimson/os/seastore: bug fixes

Reviewed-by: Yingxin Cheng <yingxin.cheng@intel.com>
3 years agorgw: remove unnecessary "struct" from req_state declarations 46788/head
J. Eric Ivancich [Tue, 21 Jun 2022 22:12:32 +0000 (18:12 -0400)]
rgw: remove unnecessary "struct" from req_state declarations

The "struct" is superfluous and makes it harder for those looking for
the definition.

Signed-off-by: J. Eric Ivancich <ivancich@redhat.com>
3 years agoMerge pull request #46786 from ljflores/wip-doc-fix
Laura Flores [Tue, 21 Jun 2022 22:58:41 +0000 (17:58 -0500)]
Merge pull request #46786 from ljflores/wip-doc-fix

doc/dev/developer_guide: fix small typo

3 years agoMerge pull request #46716 from rkachach/fix_issue_54474
Adam King [Tue, 21 Jun 2022 22:07:07 +0000 (18:07 -0400)]
Merge pull request #46716 from rkachach/fix_issue_54474

doc/cephadm: Add post-upgrade section

Reviewed-by: Adam King <adking@redhat.com>
Reviewed-by: Anthony D'Atri <anthonyeleven@users.noreply.github.com>
3 years agodoc/dev/developer_guide: fix small typo 46786/head
Laura Flores [Tue, 21 Jun 2022 20:52:39 +0000 (15:52 -0500)]
doc/dev/developer_guide: fix small typo

Introduced in 682b806efa39784c8ef67b46f4ac628f40aa15d9.

Signed-off-by: Laura Flores <lflores@redhat.com>
3 years agoMerge pull request #46773 from tchaikov/wip-libpmem
David Galloway [Tue, 21 Jun 2022 20:21:54 +0000 (16:21 -0400)]
Merge pull request #46773 from tchaikov/wip-libpmem

install-deps.sh: do not install libpmem from chacra

3 years agomgr/dashboard: dashboard help command showing wrong syntax for login-banner 46765/head
Sarthak0702 [Tue, 21 Jun 2022 09:52:12 +0000 (15:22 +0530)]
mgr/dashboard: dashboard help command showing wrong syntax for login-banner

Signed-off-by: Sarthak0702 <sarthak.dev.0702@gmail.com>
3 years agoinstall-deps.sh: do not install libpmem from chacra 46773/head
Kefu Chai [Tue, 21 Jun 2022 15:28:23 +0000 (23:28 +0800)]
install-deps.sh: do not install libpmem from chacra

this change reverts 17d2bc3707bb0078e2fa1b4eef31b39804e45135, before
we recreate a chacra repo hosting libpmem packages, we are not able
to query the repo from shaman or pull the dependencies from chacra.

in future, we should be able to get the libpmem dependencies from
offical ubuntu package repo and fedora, CentOS Stream and RHEL repos.

Signed-off-by: Kefu Chai <tchaikov@gmail.com>
3 years agomgr/dashboard: rbd image primary ui 46733/head
Pedro Gonzalez Gomez [Fri, 3 Jun 2022 10:13:44 +0000 (12:13 +0200)]
mgr/dashboard: rbd image primary ui

Signed-off-by: Pedro Gonzalez Gomez <pegonzal@redhat.com>
Signed-off-by: Pere Diaz Bou <pdiazbou@redhat.com>
3 years agoMerge pull request #46743 from idryomov/wip-rbd-mirror-schedule-watchless
Ilya Dryomov [Tue, 21 Jun 2022 14:19:35 +0000 (16:19 +0200)]
Merge pull request #46743 from idryomov/wip-rbd-mirror-schedule-watchless

mgr/rbd_support: always rescan image mirror snapshots on refresh

Reviewed-by: Deepika Upadhyay <dupadhya@redhat.com>
Reviewed-by: Sunny Kumar <sunkumar@redhat.com>
Reviewed-by: Mykola Golub <mgolub@suse.com>
3 years agodoc/dev: add context note to dev guide config 46769/head
Zac Dover [Tue, 21 Jun 2022 14:09:05 +0000 (00:09 +1000)]
doc/dev: add context note to dev guide config

This PR adds a note directing first-time cloners of
their Ceph git forks to make sure to cd into the ceph/
directory before trying to run the "git config" commands.

Signed-off-by: Zac Dover <zac.dover@gmail.com>
3 years agomgr/rbd_support: always rescan image mirror snapshots on refresh 46743/head
Ilya Dryomov [Sun, 19 Jun 2022 10:12:01 +0000 (12:12 +0200)]
mgr/rbd_support: always rescan image mirror snapshots on refresh

Establishing a watch on rbd_mirroring object and skipping rescanning
image mirror snapshots on periodic refresh unless rbd_mirroring object
gets notified in the interim is flawed.  rbd_mirroring object is
notified when mirroring is enabled or disabled on some image (including
when the image is removed), but it is not notified when images are
promoted or demoted.  However, load_pool_images() discards images that
are not primary at the time of the scan.  If the image is promoted
later, no snapshots are created even if the schedule is in place.  This
happens regardless of whether the schedule is added before or after the
promotion.

This effectively reverts commit 69259c8d3722 ("mgr/rbd_support: make
mirror_snapshot_schedule rescan only updated pools").  An alternative
fix could be to stop discarding non-primary images (i.e. drop

    if not info['primary']:
        continue

check added in commit d39eb283c5ce ("mgr/rbd_support: mirror snapshot
schedule should skip non-primary images")), but that would clutter the
queue and therefore "rbd mirror snapshot schedule status" output with
bogus entries.  Performing a rescan roughly every 60 seconds should be
manageable: currently it amounts to a single mirror_image_status_list
request, followed by mirror_image_get, get_snapcontext and snapshot_get
requests for each snapshot-based mirroring enabled image and concluded
by a single dir_list request.  Among these, per-image get_snapcontext
and snapshot_get requests are necessary for determining primaryness.

Fixes: https://tracker.ceph.com/issues/53914
Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
3 years agoMerge pull request #46734 from idryomov/wip-rbd-schedule-load-race
Ilya Dryomov [Tue, 21 Jun 2022 10:43:53 +0000 (12:43 +0200)]
Merge pull request #46734 from idryomov/wip-rbd-schedule-load-race

mgr/rbd_support: avoid losing a schedule on load vs add race

Reviewed-by: Deepika Upadhyay <dupadhya@redhat.com>
Reviewed-by: Mykola Golub <mgolub@suse.com>
3 years agoMerge pull request #46527 from rhcs-dashboard/mirroring-workflow
Ernesto Puerta [Tue, 21 Jun 2022 10:05:07 +0000 (12:05 +0200)]
Merge pull request #46527 from rhcs-dashboard/mirroring-workflow

mgr/dashboard: configure rbd mirroring

Reviewed-by: Avan Thakkar <athakkar@redhat.com>
Reviewed-by: Ernesto Puerta <epuertat@redhat.com>
Reviewed-by: Ilya Dryomov <idryomov@redhat.com>
Reviewed-by: Pere Diaz Bou <pdiazbou@redhat.com>
3 years agomgr/dashboard: fix linting issues 46527/head
Pere Diaz Bou [Tue, 21 Jun 2022 08:34:56 +0000 (10:34 +0200)]
mgr/dashboard: fix linting issues

Signed-off-by: Pere Diaz Bou <pdiazbou@redhat.com>
3 years agoMerge pull request #46760 from idryomov/wip-wnbd-main-branch
Ilya Dryomov [Tue, 21 Jun 2022 07:57:37 +0000 (09:57 +0200)]
Merge pull request #46760 from idryomov/wip-wnbd-main-branch

win32_deps_build.sh: master -> main for wnbd

Reviewed-by: Kefu Chai <tchaikov@gmail.com>
3 years agowin32_deps_build.sh: master -> main for wnbd 46760/head
Ilya Dryomov [Mon, 20 Jun 2022 20:23:27 +0000 (22:23 +0200)]
win32_deps_build.sh: master -> main for wnbd

wnbd is switching, see https://github.com/cloudbase/wnbd/pull/67.

Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
3 years agorbd-mirror: spell out "remote image is not primary" status correctly 46759/head
Ilya Dryomov [Sat, 18 Jun 2022 13:25:49 +0000 (15:25 +0200)]
rbd-mirror: spell out "remote image is not primary" status correctly

There is a difference: non-primary means NON_PRIMARY promotion state,
while "not primary" can refer to any of NON_PRIMARY, ORPHAN or UNKNOWN
promotion states.

Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
3 years agorbd-mirror: fix up "error preparing image for replay" messages
Ilya Dryomov [Sat, 18 Jun 2022 11:15:02 +0000 (13:15 +0200)]
rbd-mirror: fix up "error preparing image for replay" messages

Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
3 years agorbd-mirror: fix up PrepareReplayDisconnected test case
Ilya Dryomov [Sat, 18 Jun 2022 11:00:34 +0000 (13:00 +0200)]
rbd-mirror: fix up PrepareReplayDisconnected test case

It was botched in commit 2bca9ee96c65 ("rbd-mirror: consolidate
prepare local/remote image steps to bootstrap") and went unnoticed
because currently no special handling is needed for disconnected
clients -- is_disconnected() check happens to be the last step
and it doesn't generate an error.

Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
3 years agorbd-mirror: drop m_remote_promotion_state from PrepareReplayRequest
Ilya Dryomov [Mon, 20 Jun 2022 15:21:08 +0000 (17:21 +0200)]
rbd-mirror: drop m_remote_promotion_state from PrepareReplayRequest

Now unused (and if it was used, the entire StateBuilder is passed in
anyway).

Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
3 years agorbd-mirror: generally skip replay/resync if remote image is not primary
Ilya Dryomov [Mon, 20 Jun 2022 12:19:41 +0000 (14:19 +0200)]
rbd-mirror: generally skip replay/resync if remote image is not primary

Replay and resync should generally be skipped if the remote image is
not primary.

If this is not done for replay, snapshot-based mirroring can run into
a livelock if the primary image is demoted while a mirror snapshot is
being synced.  On the demote site, rbd-mirror would pick up the just
demoted image, grab the exclusive lock on it and idle waiting for a new
mirror snapshot to be created.  On the (still) non-primary site,
rbd-mirror would eventually finish syncing that mirror snapshot and
attempt to unlink from it on the demote site.  These attempts would
fail with EROFS due to exclusive lock being held in the "refuse proxied
maintenance operations" mode, blocking forward progress (syncing of the
demotion snapshot so that the non-primary image can be orderly promoted
to primary, etc).

If this is not done for resync, data loss can ensue as the just demoted
image would be immediately trashed, underneath the non-primary site that
is still syncing.

Currently this is done in PrepareReplayRequest only for journal-based
mirroring.  Note that it is conditional: if the local image is linked
to the remote image, proceeding is desirable.

Generalize this check, consolidate it with a related check in
PrepareRemoteImageRequest and move the result to BootstrapRequest to
cover both "local image does not exist" and "local image is unlinked"
cases for both modes.

Fixes: https://tracker.ceph.com/issues/54448
Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
3 years agorbd-mirror: strengthen is_local_primary() and is_linked()
Ilya Dryomov [Sat, 18 Jun 2022 10:35:51 +0000 (12:35 +0200)]
rbd-mirror: strengthen is_local_primary() and is_linked()

Initialize local_promotion_state and remote_promotion_state to UNKNOWN
instead of counterintuitive PRIMARY and NON_PRIMARY -- half the time the
final values are flipped.  Then is_local_primary() and is_linked() can
be strengthened as a non-existent image should stay in UNKNOWN.

Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
3 years agoMerge pull request #45012 from nSedrickm/grafana-iframe-ux-update
Ernesto Puerta [Mon, 20 Jun 2022 09:34:50 +0000 (11:34 +0200)]
Merge pull request #45012 from nSedrickm/grafana-iframe-ux-update

mgr/dashboard: display helpfull message when the iframe-embedded Grafana dashboard failed to load

Reviewed-by: Sarthak Gupta <sarthak.dev.0702@gmail.com>
Reviewed-by: Avan Thakkar <athakkar@redhat.com>
Reviewed-by: Ernesto Puerta <epuertat@redhat.com>
Reviewed-by: Laura Flores <lflores@redhat.com>
Reviewed-by: Nizamudeen A <nia@redhat.com>
Reviewed-by: Pere Diaz Bou <pdiazbou@redhat.com>
Reviewed-by: sunilangadi2 <NOT@FOUND>
3 years agoMerge pull request #46512 from rhcs-dashboard/rbd-mirroring-force-resync
Ernesto Puerta [Mon, 20 Jun 2022 09:32:38 +0000 (11:32 +0200)]
Merge pull request #46512 from rhcs-dashboard/rbd-mirroring-force-resync

mgr/dashboard: rbd force resync from front-end

Reviewed-by: Avan Thakkar <athakkar@redhat.com>
Reviewed-by: Ernesto Puerta <epuertat@redhat.com>
Reviewed-by: Pere Diaz Bou <pdiazbou@redhat.com>
3 years agoMerge pull request #46639 from rhcs-dashboard/mirroring-page-fixes
Ernesto Puerta [Mon, 20 Jun 2022 09:17:00 +0000 (11:17 +0200)]
Merge pull request #46639 from rhcs-dashboard/mirroring-page-fixes

mgr/dashboard: improve edit site name action in rbd-mirroring

Reviewed-by: Sarthak Gupta <sarthak.dev.0702@gmail.com>
Reviewed-by: Aashish Sharma <aasharma@redhat.com>
Reviewed-by: Avan Thakkar <athakkar@redhat.com>
Reviewed-by: Ernesto Puerta <epuertat@redhat.com>
3 years agoMerge pull request #46533 from rhcs-dashboard/dictionaryIscsi
Ernesto Puerta [Mon, 20 Jun 2022 09:13:24 +0000 (11:13 +0200)]
Merge pull request #46533 from rhcs-dashboard/dictionaryIscsi

mgr/dashboard: iterate through copy of items

Reviewed-by: Avan Thakkar <athakkar@redhat.com>
Reviewed-by: Ernesto Puerta <epuertat@redhat.com>
3 years agoMerge pull request #44900 from nmshelke/fix-54111
Venky Shankar [Mon, 20 Jun 2022 04:32:41 +0000 (10:02 +0530)]
Merge pull request #44900 from nmshelke/fix-54111

mon: verify data pool is already not in use by any file system

Reviewed-by: Venky Shankar <vshankar@redhat.com>
Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
Reviewed-by: Anthony D'Atri <anthony.datri@gmail.com>
Reviewed-by: Jos Collin <jcollin@redhat.com>
Reviewed-by: Neeraj Pratap Singh <neesingh@redhat.com>
Reviewed-by: Milind Changire <mchangir@redhat.com>
Reviewed-by: Xiubo Li <xiubli@redhat.com>
3 years agoMerge pull request #46295 from dparmar18/tracker3998
Venky Shankar [Mon, 20 Jun 2022 04:29:53 +0000 (09:59 +0530)]
Merge pull request #46295 from dparmar18/tracker3998

mds: split up mdstypes

Reviewed-by: Venky Shankar <vshankar@redhat.com>
Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
Reviewed-by: Neeraj Pratap Singh <neesingh@redhat.com>
Reviewed-by: Greg Farnum <gfarnum@redhat.com>
Reviewed-by: Xiubo Li <xiubli@redhat.com>
Reviewed-by: Nikhilkumar Shelke <nshelke@redhat.com>
Reviewed-by: Rishabh Dave <ridave@redhat.com>
3 years agoMerge pull request #46363 from dparmar18/tracker_55548
Venky Shankar [Mon, 20 Jun 2022 04:27:26 +0000 (09:57 +0530)]
Merge pull request #46363 from dparmar18/tracker_55548

qa/cephfs: fallback to older way of get_op_read_count

Reviewed-by: Venky Shankar <vshankar@redhat.com>
Reviewed-by: Kotresh HR <khiremat@redhat.com>
3 years agoMerge pull request #46412 from lxbsz/wip-55778
Venky Shankar [Mon, 20 Jun 2022 04:25:06 +0000 (09:55 +0530)]
Merge pull request #46412 from lxbsz/wip-55778

client: choose auth MDS for getxattr with the Xs caps

Reviewed-by: Venky Shankar <vshankar@redhat.com>
Reviewed-by: Kotresh HR <khiremat@redhat.com>
3 years agoMerge pull request #46560 from lxbsz/wip-55824
Venky Shankar [Mon, 20 Jun 2022 04:22:32 +0000 (09:52 +0530)]
Merge pull request #46560 from lxbsz/wip-55824

qa: wait rank 0 to become up:active state before mounting fuse client

Reviewed-by: Venky Shankar <vshankar@redhat.com>
Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
Reviewed-by: Dhairya Parmar <dparmar@redhat.com>
Reviewed-by: Kotresh HR <khiremat@redhat.com>
Reviewed-by: Jos Collin <jcollin@redhat.com>
Reviewed-by: Neeraj Pratap Singh <neesingh@redhat.com>
3 years agoMerge pull request #46635 from nmshelke/fix-55822
Venky Shankar [Mon, 20 Jun 2022 04:20:20 +0000 (09:50 +0530)]
Merge pull request #46635 from nmshelke/fix-55822

mgr/volumes: remove incorrect 'size' from output of 'snapshot info'

Reviewed-by: Venky Shankar <vshankar@redhat.com>
Reviewed-by: Ramana Raja <rraja@redhat.com>
Reviewed-by: Kotresh HR <khiremat@redhat.com>
Reviewed-by: Anthony D'Atri <anthony.datri@gmail.com>
3 years agoMerge pull request #46636 from nmshelke/fix-55759
Venky Shankar [Mon, 20 Jun 2022 04:18:35 +0000 (09:48 +0530)]
Merge pull request #46636 from nmshelke/fix-55759

mgr/volumes: subvolume ls command crashes if groupname as '_nogroup'

Reviewed-by: Venky Shankar <vshankar@redhat.com>
Reviewed-by: Ramana Raja <rraja@redhat.com>
Reviewed-by: Kotresh HR <khiremat@redhat.com>
3 years agoMerge pull request #46699 from neesingh-rh/wip-56065
Venky Shankar [Mon, 20 Jun 2022 04:17:09 +0000 (09:47 +0530)]
Merge pull request #46699 from neesingh-rh/wip-56065

qa: TestMDSMetrics.test_delayed_metrics failure

Reviewed-by: Venky Shankar <vshankar@redhat.com>
Reviewed-by: Nikhilkumar Shelke <nshelke@redhat.com>
3 years agocrimson/os/seastore/lba_manager: drop scan_mapped_space method
Xuehan Xu [Fri, 17 Jun 2022 04:33:01 +0000 (12:33 +0800)]
crimson/os/seastore/lba_manager: drop scan_mapped_space method

Signed-off-by: Xuehan Xu <xxhdx1985126@gmail.com>
3 years agocrimson/os/seastore/omap_manager: count omap/onode tree extents
Xuehan Xu [Mon, 13 Jun 2022 02:52:34 +0000 (10:52 +0800)]
crimson/os/seastore/omap_manager: count omap/onode tree extents

Signed-off-by: Xuehan Xu <xxhdx1985126@gmail.com>
3 years agocrimson/os/seastore/btree: count fixed kv btrees' extents num
Xuehan Xu [Fri, 10 Jun 2022 07:54:30 +0000 (15:54 +0800)]
crimson/os/seastore/btree: count fixed kv btrees' extents num

Signed-off-by: Xuehan Xu <xxhdx1985126@gmail.com>
3 years agocrimson/os/seastore: add metrics for count btree extents
Xuehan Xu [Fri, 10 Jun 2022 07:52:02 +0000 (15:52 +0800)]
crimson/os/seastore: add metrics for count btree extents

Signed-off-by: Xuehan Xu <xxhdx1985126@gmail.com>
3 years agoMerge pull request #45144 from dvanders/doc_overrides
Kefu Chai [Sat, 18 Jun 2022 04:30:23 +0000 (12:30 +0800)]
Merge pull request #45144 from dvanders/doc_overrides

common/options/osd: clarify the non-zero overrides

Reviewed-by: Kefu Chai <tchaikov@gmail.com>
3 years agoMerge pull request #46630 from rzarzynski/wip-pglog-trim-dups
Yuri Weinstein [Fri, 17 Jun 2022 20:47:33 +0000 (13:47 -0700)]
Merge pull request #46630 from rzarzynski/wip-pglog-trim-dups

tools: ceph-objectstore-tool is able to trim solely pg log dups' entries

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
3 years agoMerge pull request #46433 from rhcs-dashboard/rbd-mirroring-replay
Ernesto Puerta [Fri, 17 Jun 2022 15:33:49 +0000 (17:33 +0200)]
Merge pull request #46433 from rhcs-dashboard/rbd-mirroring-replay

mgr/dashboard: move replaying images to Syncing tab

Reviewed-by: Avan Thakkar <athakkar@redhat.com>
Reviewed-by: Ernesto Puerta <epuertat@redhat.com>
Reviewed-by: Ilya Dryomov <idryomov@redhat.com>
Reviewed-by: nSedrickm <NOT@FOUND>
3 years agoMerge pull request #39980 from badone/wip-ceph_test_lazy_omap_stats-improve-scrubbing...
Josh Durgin [Fri, 17 Jun 2022 14:53:40 +0000 (07:53 -0700)]
Merge pull request #39980 from badone/wip-ceph_test_lazy_omap_stats-improve-scrubbing-calls-2

test/lazy-omap-stats: Various enhancements

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
3 years agomgr/rbd_support: avoid losing a schedule on load vs add race 46734/head
Ilya Dryomov [Fri, 17 Jun 2022 12:03:20 +0000 (14:03 +0200)]
mgr/rbd_support: avoid losing a schedule on load vs add race

If load_schedules() (i.e. periodic refresh) races with add_schedule()
invoked by the user for a fresh image, that image's schedule may get
lost until the next rebuild (not refresh!) of the queue:

1. periodic refresh invokes load_schedules()
2. load_schedules() creates a new Schedules instance and loads
   schedules from rbd_mirror_snapshot_schedule object
3. add_schedule() is invoked for a new image (an image that isn't
   present in self.images) by the user
4. before load_schedules() can grab self.lock, add_schedule() commits
   the new schedule to rbd_mirror_snapshot_schedule object and adds it
   to self.schedules
5. load_schedules() grabs self.lock and reassigns self.schedules with
   Schedules instance that is now stale
6. periodic refresh invokes load_pool_images() which discovers the new
   image; eventually it is added to self.images
7. periodic refresh invokes refresh_queue() which attempts to enqueue()
   the new image; this fails because a matching schedule isn't present

The next periodic refresh recovers the discarded schedule from
rbd_mirror_snapshot_schedule object but no attempt to enqueue() that
image is made since it is already "known" at that point.  Despite the
schedule being in place, no snapshots are created until the queue is
rebuilt from scratch or rbd_support module is reloaded.

To fix that, extend self.lock critical sections so that add_schedule()
and remove_schedule() can't get stepped on by load_schedules().

Fixes: https://tracker.ceph.com/issues/56090
Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
3 years agomgr/rbd_support: refresh schedule queue immediately after delay elapses
Ilya Dryomov [Fri, 17 Jun 2022 08:28:55 +0000 (10:28 +0200)]
mgr/rbd_support: refresh schedule queue immediately after delay elapses

The existing logic often leads to refresh_pools() and refresh_images()
being invoked after a 120 second delay instead of after an intended 60
second delay.

Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
3 years agomgr/rbd_support: bail from refresh_pools() when there is no schedule
Ilya Dryomov [Thu, 16 Jun 2022 17:23:58 +0000 (19:23 +0200)]
mgr/rbd_support: bail from refresh_pools() when there is no schedule

Make refresh_pools() behave the same as refresh_images().

Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
3 years agomgr/rbd_support: add logs for when there is no schedule and for descheduling
Ilya Dryomov [Thu, 16 Jun 2022 17:10:32 +0000 (19:10 +0200)]
mgr/rbd_support: add logs for when there is no schedule and for descheduling

Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
3 years agomgr/rbd_support: disambiguate mirror snapshot and trash purge schedule logs
Ilya Dryomov [Thu, 16 Jun 2022 16:15:26 +0000 (18:15 +0200)]
mgr/rbd_support: disambiguate mirror snapshot and trash purge schedule logs

Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
3 years agomgr/dashboard: rbd force resync from fornt-end 46512/head
Sarthak0702 [Thu, 2 Jun 2022 22:58:31 +0000 (04:28 +0530)]
mgr/dashboard: rbd force resync from fornt-end

Signed-off-by: Sarthak0702 <sarthak.dev.0702@gmail.com>
3 years agomgr/dashboard: rbd force resync from fornt-end
Sarthak0702 [Thu, 2 Jun 2022 22:58:31 +0000 (04:28 +0530)]
mgr/dashboard: rbd force resync from fornt-end

Signed-off-by: Sarthak0702 <sarthak.dev.0702@gmail.com>
3 years agoMerge pull request #46698 from guits/cv-hide-luks-key-in-log
Guillaume Abrioux [Fri, 17 Jun 2022 12:03:48 +0000 (14:03 +0200)]
Merge pull request #46698 from guits/cv-hide-luks-key-in-log

ceph-volume: do not log sensitive details

3 years agodoc/cephadm: Add post-upgrade section 46716/head
Redouane Kachach [Thu, 16 Jun 2022 14:28:30 +0000 (16:28 +0200)]
doc/cephadm: Add post-upgrade section
Fixes: https://tracker.ceph.com/issues/54474
Signed-off-by: Redouane Kachach <rkachach@redhat.com>
3 years agomgr/dashboard: Error page cleanup
Nizamudeen A [Wed, 15 Jun 2022 17:22:39 +0000 (22:52 +0530)]
mgr/dashboard: Error page cleanup

Some error page cleanups

Signed-off-by: Nizamudeen A <nia@redhat.com>
3 years agomgr/dashboard: configure rbd mirroring
Nizamudeen A [Mon, 6 Jun 2022 05:51:29 +0000 (11:21 +0530)]
mgr/dashboard: configure rbd mirroring

One-click button in the case of an orch cluster for configuring the
rbd-mirroring when its not properly setup. This button will create an
rbd-mirror service and also an rbd labelled pool(replicated: size-3) (if they are not
existing)

Fixes: https://tracker.ceph.com/issues/55646
Signed-off-by: Nizamudeen A <nia@redhat.com>
3 years agoMerge pull request #45284 from tobias-urdin/doc-memory-profiling-valgrind-massif
Josh Durgin [Thu, 16 Jun 2022 22:17:53 +0000 (15:17 -0700)]
Merge pull request #45284 from tobias-urdin/doc-memory-profiling-valgrind-massif

doc: Add alternative memory profiling to doc

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
3 years agoMerge pull request #46712 from zdover23/wip-doc-2022-06-15--master-to-main-dev-guide...
zdover23 [Thu, 16 Jun 2022 22:09:54 +0000 (08:09 +1000)]
Merge pull request #46712 from zdover23/wip-doc-2022-06-15--master-to-main-dev-guide-basic-workflow-title

doc/dev: s/master/main/ in title

Reviewed-by: Anthony D'Atri <anthony.datri@gmail.com>
3 years agoMerge pull request #45690 from sleepinging/fix-fio-windows-crash
Yuri Weinstein [Thu, 16 Jun 2022 21:24:49 +0000 (14:24 -0700)]
Merge pull request #45690 from sleepinging/fix-fio-windows-crash

test/fio/fio_ceph_messenger: fix str_to_ptr() crash at windows

Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Ilya Dryomov <idryomov@redhat.com>
3 years agoceph-volume: do not print the secret of osd keyring 46698/head
Guillaume Abrioux [Thu, 16 Jun 2022 07:22:18 +0000 (09:22 +0200)]
ceph-volume: do not print the secret of osd keyring

during osd preparation, ceph-volume logs the secret of the osd keyring to file
```
[2022-06-15 12:31:17,466][ceph_volume.process][INFO  ] Running command: /usr/bin/ceph-authtool /var/lib/ceph/osd/ceph-0/keyring --create-keyring --name osd.0 --add-key AQAM0aliR5JvDRAAQBu0stWl9ZhZrcjijg2BIQ==
[2022-06-15 12:31:17,481][ceph_volume.process][INFO  ] stdout creating /var/lib/ceph/osd/ceph-0/keyring
added entity osd.0 auth(key=AQAM0aliR5JvDRAAQBu0stWl9ZhZrcjijg2BIQ==)
```

This shouldn't be logged nor printed on terminal.

Fixes: https://tracker.ceph.com/issues/56071
Signed-off-by: Guillaume Abrioux <gabrioux@redhat.com>
3 years agoceph-volume: do not print luks key encryption
Guillaume Abrioux [Wed, 15 Jun 2022 13:46:32 +0000 (15:46 +0200)]
ceph-volume: do not print luks key encryption

During osd activation, ceph-volume logs the luks key to its log file.

```
[2022-06-15 12:50:35,180][ceph_volume.process][INFO  ] Running command: /usr/bin/ceph --cluster ceph --name client.osd-lockbox.51d0770d-403d-4f81-93e6-e99f627f246c --keyring /var/lib/ceph/osd/ceph-0/lockbox.keyring config-key get dm-crypt/osd/51d0770d-403d-4f81-93e6-e99f627f246c/luks
[2022-06-15 12:50:35,522][ceph_volume.process][INFO  ] stdout ut9NjMK6YtMh1BLMJZ/mE2A7zTNyrp9pW1kHV8F2ipfz1BIX9MkEWhdYB2Azm1JPZ1d7ahIjBMUbrC/Iqqr2jQhP3MIsDzUYj1enw+sw7LeVvGPf0qNUdKmEGu5tUmvtQ+5pbk4T/9PF36kT6vCHKfNML/3fL6nnY8FDySrI4LY=
[2022-06-15 12:50:35,522][ceph_volume.process][INFO  ] Running command: /usr/sbin/cryptsetup --key-size 512 --key-file - --allow-discards luksOpen /dev/ceph-83c307d3-710b-4197-8ecd-0484e17395e3/osd-block-51d0770d-403d-4f81-93e6-e99f627f246c a9HhDO-MiYD-DtYm-SKJf-nO1d-5O3u-FmcCrd
```

Fixes: https://tracker.ceph.com/issues/56066
Signed-off-by: Guillaume Abrioux <gabrioux@redhat.com>
3 years agoscrub/osd: add clearer reminders that a scrub is blocked
Ronen Friedman [Sat, 11 Jun 2022 07:27:47 +0000 (07:27 +0000)]
scrub/osd: add clearer reminders that a scrub is blocked

Whenever a scrub session is waiting for an excessive length
of time for a locked object to be unlocked, the total
number of concurrent scrubs in the system is reduced.

The existing cluster warning issued on such occurrences is
easily overlooked. Here we add a constant reminder each time
the OSD tries to schedule scrubs.

Signed-off-by: Ronen Friedman <rfriedma@redhat.com>
3 years agoMerge pull request #45926 from ceph/dependabot-npm_and_yarn-src-pybind-mgr-dashboard...
Ernesto Puerta [Thu, 16 Jun 2022 11:19:08 +0000 (13:19 +0200)]
Merge pull request #45926 from ceph/dependabot-npm_and_yarn-src-pybind-mgr-dashboard-frontend-moment-2.29.3

mgr/dashboard: bump moment from 2.29.1 to 2.29.3 in /src/pybind/mgr/dashboard/frontend

Reviewed-by: Ernesto Puerta <epuertat@redhat.com>
3 years agomgr/dashboard: improve edit site name action in rbd-mirroring 46639/head
Nizamudeen A [Mon, 13 Jun 2022 08:24:15 +0000 (13:54 +0530)]
mgr/dashboard: improve edit site name action in rbd-mirroring

Fixes: https://tracker.ceph.com/issues/55896
Signed-off-by: Nizamudeen A <nia@redhat.com>
3 years agodoc/dev: s/master/main/ in title 46712/head
Zac Dover [Thu, 16 Jun 2022 05:57:16 +0000 (15:57 +1000)]
doc/dev: s/master/main/ in title

This changes "master" to "main" in a title. If we lived in an
ideal world, this would have been a part of PR#46678.

Signed-off-by: Zac Dover <zac.dover@gmail.com>
3 years agoMerge pull request #46705 from zdover23/wip-doc-2022-06-15--master-to-main-dev-guide...
zdover23 [Thu, 16 Jun 2022 01:50:31 +0000 (11:50 +1000)]
Merge pull request #46705 from zdover23/wip-doc-2022-06-15--master-to-main-dev-guide-merging

doc/dev_guide: s/master/main in merging.rst

Reviewed-by: Anthony D'Atri <anthony.datri@gmail.com>
3 years agoMerge pull request #46678 from zdover23/wip-doc-2022-06-14-dev-guide-basic-workflow...
zdover23 [Thu, 16 Jun 2022 01:13:05 +0000 (11:13 +1000)]
Merge pull request #46678 from zdover23/wip-doc-2022-06-14-dev-guide-basic-workflow-master-to-main

doc/dev: s/master/main/ in basic workflow

Reviewed-by: Anthony D'Atri <anthony.datri@gmail.com>
3 years agorgw: radosgw-admin includes current time in most status commands 46707/head
Adam C. Emerson [Wed, 15 Jun 2022 23:39:59 +0000 (19:39 -0400)]
rgw: radosgw-admin includes current time in most status commands

Support folk have asked if we can have a timestamp on the output of
multisite status commands so they can see at a glance how they relate
to other events and changes.

As such, we now have a status command added to any outputs where it
doesn't disrupt things. In practice this means anything whose output
isn't a single JSON array.

Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
3 years agoMerge pull request #46632 from anthonyeleven/anthonyeleven/osd-activate-typos
Anthony D'Atri [Wed, 15 Jun 2022 22:58:13 +0000 (15:58 -0700)]
Merge pull request #46632 from anthonyeleven/anthonyeleven/osd-activate-typos

src/ceph-volume/ceph_volume/activate: Improve usage message text

3 years agodoc/dev_guide: s/master/main in merging.rst 46705/head
Zac Dover [Wed, 15 Jun 2022 21:54:31 +0000 (07:54 +1000)]
doc/dev_guide: s/master/main in merging.rst

This changes the branch name "master" to the branch name
"main" in merging.rst.

Signed-off-by: Zac Dover <zac.dover@gmail.com>
3 years agoMerge pull request #44861 from Matan-B/wip-matanb-doc-gdb
Laura Flores [Wed, 15 Jun 2022 21:14:30 +0000 (16:14 -0500)]
Merge pull request #44861 from Matan-B/wip-matanb-doc-gdb

doc/dev: Debuggging with gdb

3 years agoMerge pull request #46582 from ceph/rhel86
Zack Cerza [Wed, 15 Jun 2022 21:05:55 +0000 (15:05 -0600)]
Merge pull request #46582 from ceph/rhel86

qa: Default to RHEL8.6 instead of 8.5

3 years agoMerge pull request #46029 from kamoltat/wip-ksirivad-fix-notify-rank-removed
Yuri Weinstein [Wed, 15 Jun 2022 20:27:13 +0000 (13:27 -0700)]
Merge pull request #46029 from kamoltat/wip-ksirivad-fix-notify-rank-removed

mon/Elector: notify_rank_removed erase rank from both live_pinging and dead_pinging sets for highest ranked MON

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
3 years agoMerge pull request #45858 from ganeshmaharaj/ganeshma/gcc-12-libcephsqlite
Yuri Weinstein [Wed, 15 Jun 2022 20:26:45 +0000 (13:26 -0700)]
Merge pull request #45858 from ganeshmaharaj/ganeshma/gcc-12-libcephsqlite

libcephsqlite: ceph-mgr crashes when compiled with gcc12

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
3 years agoMerge pull request #45750 from m-ildefons/boost-b2-jobs
Yuri Weinstein [Wed, 15 Jun 2022 20:25:56 +0000 (13:25 -0700)]
Merge pull request #45750 from m-ildefons/boost-b2-jobs

cmake: configure boost build with concurrent jobs

Reviewed-by: Kefu Chai <kchai@redhat.com>
3 years agoqa: Default to RHEL8.6 instead of 8.5 46582/head
David Galloway [Wed, 8 Jun 2022 19:07:09 +0000 (15:07 -0400)]
qa: Default to RHEL8.6 instead of 8.5

Signed-off-by: David Galloway <dgallowa@redhat.com>
3 years agoMerge pull request #46364 from rkachach/fix_issue_54581
Adam King [Wed, 15 Jun 2022 17:47:28 +0000 (13:47 -0400)]
Merge pull request #46364 from rkachach/fix_issue_54581

mgr/nfs: validate virtual_ip parameter

Reviewed-by: John Mulligan <jmulligan@redhat.com>
3 years agodoc/dev: Debuggging with gdb 44861/head
Matan Breizman [Wed, 2 Feb 2022 10:11:53 +0000 (10:11 +0000)]
doc/dev: Debuggging with gdb

Signed-off-by: Matan Breizman <mbreizma@redhat.com>