]> git.apps.os.sepia.ceph.com Git - ceph.git/log
ceph.git
2 years agocephadm: require --image is passed to inspect-image 51649/head
Adam King [Fri, 21 Apr 2023 14:07:09 +0000 (10:07 -0400)]
cephadm: require --image is passed to inspect-image

The selection of an image by default was likely unused and
has always been a bit of a flaky thing, especially if multiple
clusters are making use of the host where this is run. It seems
preferable to just require this argument. Additionally, the
command without the image specified is currently untested
and prone to being broken. All uses of inspect-image done
through the cephadm mgr module specify the image.

Signed-off-by: Adam King <adking@redhat.com>
(cherry picked from commit 110fcb04adf31881f2f41bd0c27f7ce25438f3b9)

2 years agoMerge pull request #51619 from zdover23/wip-doc-2023-05-21-backport-51618-to-reef
Anthony D'Atri [Sat, 20 May 2023 22:17:12 +0000 (18:17 -0400)]
Merge pull request #51619 from zdover23/wip-doc-2023-05-21-backport-51618-to-reef

reef: doc: Add missing `ceph` command in documentation section `REPLACING A…

2 years agodoc: Add missing `ceph` command in documentation section `REPLACING AN OSD` 51619/head
Alexander Proschek [Sat, 20 May 2023 21:06:09 +0000 (14:06 -0700)]
doc: Add missing `ceph` command in documentation section `REPLACING AN OSD`

Signed-off-by: Alexander Proschek <alexander.proschek@protonmail.com>
Signed-off-by: Alexander Proschek <alexander.proschek@protonmail.com>
(cherry picked from commit 0557d5e465556adba6d25db62a40ba55a5dd2400)

2 years agoMerge pull request #51231 from rishabh-d-dave/wip-59559-reef
Venky Shankar [Sat, 20 May 2023 09:39:07 +0000 (15:09 +0530)]
Merge pull request #51231 from rishabh-d-dave/wip-59559-reef

reef: qa: check each fs for health

Reviewed-by: Venky Shankar <vshankar@redhat.com>
2 years agoMerge pull request #51595 from zdover23/wip-doc-2023-05-20-backport-51594-to-reef
zdover23 [Fri, 19 May 2023 20:19:40 +0000 (06:19 +1000)]
Merge pull request #51595 from zdover23/wip-doc-2023-05-20-backport-51594-to-reef

reef: doc/rados: edit data-placement.rst

Reviewed-by: Anthony D'Atri <anthony.datri@gmail.com>
2 years agoMerge pull request #51328 from trociny/wip-59617-reef
Yuri Weinstein [Fri, 19 May 2023 20:15:42 +0000 (16:15 -0400)]
Merge pull request #51328 from trociny/wip-59617-reef

reef: rgw/rados: check_quota() uses real bucket owner

Reviewed-by: Casey Bodley <cbodley@redhat.com>
2 years agoMerge pull request #51514 from galsalomon66/wip-61156-reef
Casey Bodley [Fri, 19 May 2023 18:13:39 +0000 (14:13 -0400)]
Merge pull request #51514 from galsalomon66/wip-61156-reef

reef: Trino/RGW alignments & adding JSON queries to s3tests

Reviewed-by: Casey Bodley <cbodley@redhat.com>
2 years agodoc/rados: edit data-placement.rst 51595/head
Zac Dover [Fri, 19 May 2023 16:26:45 +0000 (02:26 +1000)]
doc/rados: edit data-placement.rst

Edit doc/rados/data-placement.rst.

Co-authored-by: Cole Mitchell <cole.mitchell@gmail.com>
Signed-off-by: Zac Dover <zac.dover@proton.me>
(cherry picked from commit 32600c27c4dca6b9d5fae9892c0a1660b672781c)

2 years agoMerge pull request #51585 from zdover23/wip-doc-2023-05-19-backport-51580-to-reef
Anthony D'Atri [Fri, 19 May 2023 12:13:15 +0000 (08:13 -0400)]
Merge pull request #51585 from zdover23/wip-doc-2023-05-19-backport-51580-to-reef

reef: doc/radosgw: explain multisite dynamic sharding

2 years agoMerge pull request #51518 from idryomov/wip-rbd-reef-backports-2
Ilya Dryomov [Fri, 19 May 2023 10:34:28 +0000 (12:34 +0200)]
Merge pull request #51518 from idryomov/wip-rbd-reef-backports-2

reef: RBD backports (batch 2)

Reviewed-by: Christopher Hoffman <choffman@redhat.com>
2 years agodoc/radosgw: explain multisite dynamic sharding 51585/head
Zac Dover [Thu, 18 May 2023 21:07:02 +0000 (07:07 +1000)]
doc/radosgw: explain multisite dynamic sharding

Add a note to doc/radosgw/dynamicresharding.rst and a note to
doc/radosgw/multisite.rst that explains that dynamic resharding is not
supported in releases prior to Reef.

This commit is made in response to a request from Mathias Chapelain.

Co-authored-by: Anthony D'Atri <anthony.datri@gmail.com>
Signed-off-by: Zac Dover <zac.dover@proton.me>
(cherry picked from commit d4ed4223d914328361528990f89f1ee4acd30e79)

2 years agoMerge pull request #51524 from aaSharma14/wip-61178-reef
Nizamudeen A [Fri, 19 May 2023 06:38:52 +0000 (12:08 +0530)]
Merge pull request #51524 from aaSharma14/wip-61178-reef

reef: mgr/dashboard: fix regression caused by cephPgImabalance alert

Reviewed-by: Avan Thakkar <athakkar@redhat.com>
2 years agoMerge pull request #51576 from zdover23/wip-doc-2023-05-19-backport-51572-to-reef
Anthony D'Atri [Thu, 18 May 2023 22:42:34 +0000 (18:42 -0400)]
Merge pull request #51576 from zdover23/wip-doc-2023-05-19-backport-51572-to-reef

reef: doc/rados: line-edit devices.rst

2 years agodoc/rados: line-edit devices.rst 51576/head
Zac Dover [Thu, 18 May 2023 14:13:41 +0000 (00:13 +1000)]
doc/rados: line-edit devices.rst

Edit doc/rados/operations/devices.rst.

Co-authored-by: Cole Mitchell <cole.mitchell@gmail.com>
Signed-off-by: Zac Dover <zac.dover@proton.me>
(cherry picked from commit 8d589b43d76a4e291c96c3750d068dba18eb9309)

2 years agoMerge pull request #51489 from zdover23/wip-doc-2023-05-16-backport-51485-to-reef
zdover23 [Thu, 18 May 2023 14:50:11 +0000 (00:50 +1000)]
Merge pull request #51489 from zdover23/wip-doc-2023-05-16-backport-51485-to-reef

reef: doc/start/os-recommendations: drop 4.14 kernel and reword guidance

Reviewed-by: Anthony D'Atri <anthony.datri@gmail.com>
2 years agoMerge pull request #51483 from cbodley/wip-59609-reef
Yuri Weinstein [Thu, 18 May 2023 14:26:41 +0000 (07:26 -0700)]
Merge pull request #51483 from cbodley/wip-59609-reef

reef: rgw: add crypt attrs for iam policy to PostObj and Init/CompleteMultipart

Reviewed-by: Daniel Gryniewicz <dang@redhat.com>
2 years agoMerge pull request #51482 from cbodley/wip-59614-reef
Yuri Weinstein [Thu, 18 May 2023 14:26:07 +0000 (07:26 -0700)]
Merge pull request #51482 from cbodley/wip-59614-reef

reef: rgw/s3: dump Message field in Error response even if empty

Reviewed-by: Daniel Gryniewicz <dang@redhat.com>
2 years agoMerge pull request #51481 from cbodley/wip-59611-reef
Yuri Weinstein [Thu, 18 May 2023 14:25:09 +0000 (07:25 -0700)]
Merge pull request #51481 from cbodley/wip-59611-reef

reef: rgw/sts: AssumeRole no longer writes to user metadata

Reviewed-by: Casey Bodley <cbodley@redhat.com>
2 years agoMerge pull request #51542 from zdover23/wip-doc-2023-05-18-backport-51534-to-reef
Anthony D'Atri [Wed, 17 May 2023 22:43:32 +0000 (18:43 -0400)]
Merge pull request #51542 from zdover23/wip-doc-2023-05-18-backport-51534-to-reef

reef: doc/cephfs: line-edit "Mirroring Module"

2 years agodoc/cephfs: line-edit "Mirroring Module" 51542/head
Zac Dover [Wed, 17 May 2023 12:25:38 +0000 (22:25 +1000)]
doc/cephfs: line-edit "Mirroring Module"

Line-edit the "Mirroring Module" section of
doc/cephfs/cephfs-mirroring.rst. Add prompts and formatting where such
things contribute to the realization of adequate sentences.

This commit is a follow-up to https://github.com/ceph/ceph/pull/51505.

Co-authored-by: Anthony D'Atri <anthony.datri@gmail.com>
Signed-off-by: Zac Dover <zac.dover@proton.me>
(cherry picked from commit dd8855d9a934bcdd6a026f1308ba7410b1e143e3)

2 years agoMerge pull request #51042 from kotreshhr/wip-59415-reef
Yuri Weinstein [Wed, 17 May 2023 15:33:39 +0000 (08:33 -0700)]
Merge pull request #51042 from kotreshhr/wip-59415-reef

reef: mgr: Add one finisher thread per module

Reviewed-by: Venky Shankar <vshankar@redhat.com>
2 years agoMerge pull request #51520 from zdover23/wip-doc-2023-05-17-backport-51505-to-reef
Anthony D'Atri [Wed, 17 May 2023 12:56:13 +0000 (08:56 -0400)]
Merge pull request #51520 from zdover23/wip-doc-2023-05-17-backport-51505-to-reef

reef: doc: explain cephfs mirroring `peer_add` step in detail

2 years agolibrbd: cleanup few log lines 51518/head
Prasanna Kumar Kalever [Fri, 28 Apr 2023 08:46:35 +0000 (14:16 +0530)]
librbd: cleanup few log lines

Currently:
2023-04-28T12:20:17.135+0530 7f1a7ccd2640 20 librbd::ExclusiveLock: 0x7f1a4c000b60 block_requestsr=0
[...]
2023-04-28T12:20:17.135+0530 7f1a7ccd2640 20 librbd::ManagedLock: 0x7f1a4c000b78 is_lock_owner: =1
[...]
2023-04-18T21:18:50.695+0530 7f0a1ffff640 20 librbd::ImageWatcher: 0x7f0a10007840 remote async request finished: [4305,140018014309120,1] = -110

Signed-off-by: Prasanna Kumar Kalever <prasanna.kalever@redhat.com>
(cherry picked from commit e558ec553aff87769b13288a0afd80c5e3d0f8d6)

2 years agomgr/dashboard: fix regression caused by cephPgImabalance alert 51524/head
Aashish Sharma [Mon, 8 May 2023 07:19:13 +0000 (12:49 +0530)]
mgr/dashboard: fix regression caused by cephPgImabalance alert

because of an earlier fix delivered, there is a regression caused by it
due to which alerts are not getting displayed in the active alerts tab.
This PR intends to fix this issue.

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

2 years agodoc: explain cephfs mirroring `peer_add` step in detail 51520/head
Venky Shankar [Tue, 16 May 2023 05:25:34 +0000 (10:55 +0530)]
doc: explain cephfs mirroring `peer_add` step in detail

@zdover23 reached out regarding missing explanation for `peer_add`
step in cephfs mirroring documentation. Add some explanation and
and example to make the step clear.

Signed-off-by: Venky Shankar <vshankar@redhat.com>
(cherry picked from commit 6a6e887ff1f7f7d76db7f30f8410783b2f8153b0)

2 years agoMerge pull request #51502 from zdover23/wip-doc-2023-05-16-backport-51492-to-reef
Anthony D'Atri [Wed, 17 May 2023 00:49:40 +0000 (20:49 -0400)]
Merge pull request #51502 from zdover23/wip-doc-2023-05-16-backport-51492-to-reef

reef: doc/start: KRBD feature flag support note

2 years agotest/librbd: add empty cookie and blank address tests
Ilya Dryomov [Mon, 8 May 2023 11:30:18 +0000 (13:30 +0200)]
test/librbd: add empty cookie and blank address tests

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

2 years agolibrbd/managed_lock/GetLockerRequest: Fix no valid lockers case
Matan Breizman [Mon, 1 May 2023 13:29:29 +0000 (13:29 +0000)]
librbd/managed_lock/GetLockerRequest: Fix no valid lockers case

See:
`m_locker->address = iter->second.addr.get_legacy_str();`

In the case where `iter->second.addr` is an empty address,
m_locker->address string is assigned with "0)/0" and therfore
will never result in an empty string.

Use `is_blank_ip()` before `get_legacy_str()`

Signed-off-by: Matan Breizman <mbreizma@redhat.com>
(cherry picked from commit 7482beeea9b1bc8c3cbdac425e7afb8ebdc9f270)

2 years agorbd_support: recover from "double blocklisting"
Ramana Raja [Wed, 10 May 2023 18:37:44 +0000 (14:37 -0400)]
rbd_support: recover from "double blocklisting"

Recover from being blocklisted while recovering from blocklisting.
When the rbd_support  module is being set up to recover from client
blocklisting, the module's new rados client connection can also get
blocklisted. Currently, this will cause the recovery to fail and
the module will remain inoperable. Instead, retry module recovery
when the new client gets blocklisted during the module setup in the
recovery thread.

Fixes: https://tracker.ceph.com/issues/59713
Signed-off-by: Ramana Raja <rraja@redhat.com>
(cherry picked from commit 4523d9b68ee84f69e8665a728d4037b53cdf3d6f)

2 years agoqa/workunits/rbd: Add tests for rbd_support module recovery
Ramana Raja [Sun, 5 Feb 2023 03:36:16 +0000 (22:36 -0500)]
qa/workunits/rbd: Add tests for rbd_support module recovery

... after the module's RADOS client is blocklisted.

Signed-off-by: Ramana Raja <rraja@redhat.com>
(cherry picked from commit a2f15d4b2f876c79ee1de59fb79851b0eb505951)

2 years agomgr/rbd_support: recover from rados client blocklisting
Ramana Raja [Wed, 15 Feb 2023 15:12:54 +0000 (10:12 -0500)]
mgr/rbd_support: recover from rados client blocklisting

In certain scenarios the OSDs were slow to process RBD requests.
This lead to the rbd_support module's RBD client not being able to
gracefully handover a RBD exclusive lock to another RBD client.
After the condition persisted for some time, the other RBD client
forcefully acquired the lock by blocklisting the rbd_support module's
RBD client, and consequently blocklisted the module's RADOS client. The
rbd_support module stopped working. To recover the module, the entire
mgr service had to be restarted which reloaded other mgr modules.

Instead of recovering the rbd_support module from client blocklisting
by being disruptive to other mgr modules, recover the module
automatically without restarting the mgr serivce. On client getting
blocklisted, shutdown the module's handlers and blocklisted client,
create a new rados client for the module, and start the new handlers.

Fixes: https://tracker.ceph.com/issues/56724
Signed-off-by: Ramana Raja <rraja@redhat.com>
(cherry picked from commit cc0468738e5ddb98f7ac10b50e54446197b9c9a0)

2 years agopybind/rados: add ConnectionShutdown exception class
Ramana Raja [Thu, 12 Jan 2023 02:53:16 +0000 (21:53 -0500)]
pybind/rados: add ConnectionShutdown exception class

Signed-off-by: Ramana Raja <rraja@redhat.com>
(cherry picked from commit e452899013323def87a8b9e6edbdae66067a827c)

2 years agomgr/rbd_support: notify the thread waiting on pending snapshot
Ramana Raja [Tue, 17 Jan 2023 03:04:08 +0000 (22:04 -0500)]
mgr/rbd_support: notify the thread waiting on pending snapshot

... requests to be completed.

Signed-off-by: Ramana Raja <rraja@redhat.com>
(cherry picked from commit 38a7e3715f0cee225aa49f3331d85ad37e2b7422)

2 years agotest/librbd: use GTEST_SKIP macro to skip tests
Ilya Dryomov [Thu, 27 Apr 2023 13:43:05 +0000 (15:43 +0200)]
test/librbd: use GTEST_SKIP macro to skip tests

The use of SUCCEED macro predates the introduction of GTEST_SKIP macro
to GTest 1.10.  Having skipped tests reported as passed is misleading!

Before:

[ RUN      ] TestMockOperationSnapshotRemoveRequest.FlattenedCloneRemovesChild
SKIPPING
[       OK ] TestMockOperationSnapshotRemoveRequest.FlattenedCloneRemovesChild (9 ms)
...
[ RUN      ] TestMockOperationSnapshotRemoveRequest.RemoveChildError
SKIPPING
[       OK ] TestMockOperationSnapshotRemoveRequest.RemoveChildError (112 ms)
...
[  PASSED  ] 16 tests.

After:

[ RUN      ] TestMockOperationSnapshotRemoveRequest.FlattenedCloneRemovesChild
../src/test/librbd/operation/test_mock_SnapshotRemoveRequest.cc:381: Skipped
Skipping due to unmet REQUIRE
[  SKIPPED ] TestMockOperationSnapshotRemoveRequest.FlattenedCloneRemovesChild (9 ms)
...
[ RUN      ] TestMockOperationSnapshotRemoveRequest.RemoveChildError
../src/test/librbd/operation/test_mock_SnapshotRemoveRequest.cc:727: Skipped
Skipping due to enabled deep-flatten
[  SKIPPED ] TestMockOperationSnapshotRemoveRequest.RemoveChildError (111 ms)
...
[  PASSED  ] 14 tests.
[  SKIPPED ] 2 tests, listed below:
[  SKIPPED ] TestMockOperationSnapshotRemoveRequest.FlattenedCloneRemovesChild
[  SKIPPED ] TestMockOperationSnapshotRemoveRequest.RemoveChildError

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

2 years agolibrbd: localize snap_remove op for mirror snapshots
Christopher Hoffman [Wed, 19 Apr 2023 15:26:27 +0000 (15:26 +0000)]
librbd: localize snap_remove op for mirror snapshots

A client may attempt a lock request not quickly enough to
obtain exclusive lock for operations when another competing
client responds quicker. This can happen when a peer site has
different performance characteristics or latency. Instead of
relying on this unpredictable behavior, localize operation to
primary cluster.

Fixes: https://tracker.ceph.com/issues/59393
Signed-off-by: Christopher Hoffman <choffman@redhat.com>
(cherry picked from commit ac552c9b4d65198db8038d397a3060d5a030917d)

2 years agolibrbd: always refresh after creating snapshot in CreatePrimaryRequest
Ilya Dryomov [Mon, 17 Apr 2023 21:31:37 +0000 (23:31 +0200)]
librbd: always refresh after creating snapshot in CreatePrimaryRequest

Up until now this was conditioned on whether the caller expressed
interest in the ID of the created snapshot and happened to work only
because CreatePrimaryRequest wasn't actually consulting any mirror
snapshot metadata.  This has just changed with unlink_peer() needing to
see an up-to-date complete flag which is set in SetImageStateRequest
following the write out of image state object(s).

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

2 years agolibrbd: remove previous incomplete primary snapshot after successfully creating a...
Prasanna Kumar Kalever [Mon, 6 Mar 2023 09:58:03 +0000 (15:28 +0530)]
librbd: remove previous incomplete primary snapshot after successfully creating a new one

Problem:
-------
At a high level, creating a primary snapshot consists of three steps:

1. actually creating a snapshot in the mirror namespace
2. generating a set of image state objects with additional metadata for
   the snapshot
3. marking the snapshot as complete after the image state objects are
   written out

Depending on the circumstances, a request to create a primary snapshot
can be forwarded to rbd-mirror daemon.  If that happens and rbd-mirror
daemon gets axed for some practical reason after completing steps (1)
and/or (2) but before completing step (3), we are left with a
permanently incomplete primary snapshot because upon retrying that
primary snapshot creation request, librbd notices that such snapshot
already exists.  It does not check whether this "pre-existing" snapshot
is complete.

Solution:
--------
As part of the next mirror snapshot create (say triggered by the
scheduler) the unlink_peer() is called, it checks if there exists any
incomplete snapshot and delete them accordingly.

Fixes: https://tracker.ceph.com/issues/58887
Signed-off-by: Prasanna Kumar Kalever <prasanna.kalever@redhat.com>
(cherry picked from commit 165c9a4e163c5edfa77c900f61c680cc944b2b5d)

2 years agoMerge pull request #50808 from dparmar18/wip-59251-reef
Yuri Weinstein [Tue, 16 May 2023 19:10:22 +0000 (12:10 -0700)]
Merge pull request #50808 from dparmar18/wip-59251-reef

reef: mgr/nfs: disallow non-existent paths when creating export

Reviewed-by: Kotresh HR <khiremat@redhat.com>
2 years agoMerge pull request #50782 from batrick/i59227
Yuri Weinstein [Tue, 16 May 2023 19:09:25 +0000 (12:09 -0700)]
Merge pull request #50782 from batrick/i59227

reef: cephfs-data-scan: does not scan_links for lost+found

Reviewed-by: Kotresh HR <khiremat@redhat.com>
2 years agoMerge pull request #51047 from mchangir/wip-59430-reef
Yuri Weinstein [Tue, 16 May 2023 18:36:17 +0000 (11:36 -0700)]
Merge pull request #51047 from mchangir/wip-59430-reef

reef: qa: avoid explicit set to client mountpoint as "/"

Reviewed-by: Kotresh HR <khiremat@redhat.com>
2 years agoMerge pull request #51003 from joscollin/wip-59406-reef
Yuri Weinstein [Tue, 16 May 2023 18:35:30 +0000 (11:35 -0700)]
Merge pull request #51003 from joscollin/wip-59406-reef

reef: cephfs-top: navigate to home screen when no fs

Reviewed-by: Kotresh HR <khiremat@redhat.com>
2 years agoMerge pull request #50998 from neesingh-rh/wip-59397-reef
Yuri Weinstein [Tue, 16 May 2023 18:33:11 +0000 (11:33 -0700)]
Merge pull request #50998 from neesingh-rh/wip-59397-reef

reef: cephfs-top: fixing the -d [--delay] option in cephfs-top

Reviewed-by: Kotresh HR <khiremat@redhat.com>
Reviewed-by: Jos Collin <jcollin@redhat.com>
2 years agoMerge pull request #50524 from trociny/wip-59020-reef
Yuri Weinstein [Tue, 16 May 2023 18:31:29 +0000 (11:31 -0700)]
Merge pull request #50524 from trociny/wip-59020-reef

reef: tools/cephfs-data-scan: support for multi-datapool

Reviewed-by: Kotresh HR <khiremat@redhat.com>
2 years agorgw: reef: adding s3test albin/json-op-serial 51514/head
galsalomon66 [Fri, 10 Mar 2023 12:27:05 +0000 (14:27 +0200)]
rgw: reef: adding s3test albin/json-op-serial

modify json chunk processing function to handle offset/length as csv-processing
a fix valgrind :: Conditional jump or move depends on uninitialised value
upon using Trino the Trino-server issue multiple requests per single query,upon completion of all requests
the results are merged (by Trino).  these request splits the input into equal parts; the RGW side should be aligned with Trino expectations(for result).
fixing the main routine for shaping the chunk (range-scan) for Trino processing
upon removing the payload-TAG, it need to change the response element index
handling more use cases for "shaping" the processed chunk by s3select per Trino request
re-shape the processed chunk only upon Trino sent the request
bug-fix: the chunk offset was not handle correctly
bug-fix: progress-message calcualation
modifying the range-request boundaries only upon Trino request.

Signed-off-by: galsalomon66 <gal.salomon@gmail.com>
(cherry picked from commit a62588959d28bd2bf16cc3bb9482e22e6f9eb195)

2 years agoMerge pull request #51364 from rhcs-dashboard/reef-ceph-authx-backports
Nizamudeen A [Tue, 16 May 2023 07:19:36 +0000 (12:49 +0530)]
Merge pull request #51364 from rhcs-dashboard/reef-ceph-authx-backports

reef: mgr/dashboard: crud component, ceph authx and create rgw role features

Reviewed-by: Nizamudeen A <nia@redhat.com>
Reviewed-by: Pere Diaz Bou <pdiazbou@redhat.com>
2 years agodoc/start: KRBD feature flag support note 51502/head
Zac Dover [Mon, 15 May 2023 17:04:43 +0000 (03:04 +1000)]
doc/start: KRBD feature flag support note

Add KRBD feature flag support note to doc/start/os-recommendations.rst.

This change was suggested by Anthony D'Atri in https://github.com/ceph/ceph/pull/51485.

Co-authored-by: Ilya Dryomov <idryomov@redhat.com>
Co-authored-by: Anthony D'Atri <anthony.datri@gmail.com>
Signed-off-by: Zac Dover <zac.dover@proton.me>
(cherry picked from commit 2a619dba2d22749e6facaf8dd0d370e16a1672c4)

2 years agoMerge pull request #51477 from zdover23/wip-doc-2023-05-15-backport-51473-to-reef
Anthony D'Atri [Mon, 15 May 2023 16:51:31 +0000 (12:51 -0400)]
Merge pull request #51477 from zdover23/wip-doc-2023-05-15-backport-51473-to-reef

reef: doc/rados: edit devices.rst

2 years agodoc/start/os-recommendations: drop 4.14 kernel and reword guidance 51489/head
Ilya Dryomov [Fri, 12 May 2023 11:55:32 +0000 (13:55 +0200)]
doc/start/os-recommendations: drop 4.14 kernel and reword guidance

The 4.14 LTS kernel has less than a year left in terms of maintenance,
drop it.

Also, the current wording with an explicit list of kernels tends to go
stale: it's missing the latest 6.1 LTS kernel.

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

2 years agorgw/op: Init/CompleteMultipart add crypt attrs for iam policy 51483/head
Casey Bodley [Thu, 6 Apr 2023 15:29:55 +0000 (11:29 -0400)]
rgw/op: Init/CompleteMultipart add crypt attrs for iam policy

Signed-off-by: Casey Bodley <cbodley@redhat.com>
(cherry picked from commit 4cc6e05a7a550b277c22ac43f2088fe7a0423716)

2 years agorgw/op: RGWPostObj adds crypt attrs for iam policy
Casey Bodley [Thu, 6 Apr 2023 15:28:25 +0000 (11:28 -0400)]
rgw/op: RGWPostObj adds crypt attrs for iam policy

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

2 years agorgw/op: factor out rgw_iam_add_crypt_attrs()
Casey Bodley [Thu, 6 Apr 2023 14:53:52 +0000 (10:53 -0400)]
rgw/op: factor out rgw_iam_add_crypt_attrs()

make the iam environment variables for server-side encryption available
to other ops

Signed-off-by: Casey Bodley <cbodley@redhat.com>
(cherry picked from commit 3b517a2679c62529950cd66136f9fb971ae612cc)

2 years agorgw/s3: dump Message field in Error response even if empty 51482/head
Casey Bodley [Wed, 12 Apr 2023 15:18:15 +0000 (11:18 -0400)]
rgw/s3: dump Message field in Error response even if empty

some clients like veeam fail to decode the response if Message is missing

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

2 years agorgw: remove RGWUserInfo::assumed_role_arn 51481/head
Casey Bodley [Thu, 20 Apr 2023 13:32:08 +0000 (09:32 -0400)]
rgw: remove RGWUserInfo::assumed_role_arn

Signed-off-by: Casey Bodley <cbodley@redhat.com>
(cherry picked from commit af5f9cabb90e574c6fab33f1c9273cc868c6da22)

2 years agorgw/dbstore: stop storing RGWUserInfo::assumed_role_arn
Casey Bodley [Thu, 20 Apr 2023 13:31:52 +0000 (09:31 -0400)]
rgw/dbstore: stop storing RGWUserInfo::assumed_role_arn

Signed-off-by: Casey Bodley <cbodley@redhat.com>
(cherry picked from commit 9da31205051db56edade69b1cec3a05e162b7a9b)

2 years agorgw/sts: AssumeRole no longer writes to user metadata
Casey Bodley [Thu, 20 Apr 2023 13:25:49 +0000 (09:25 -0400)]
rgw/sts: AssumeRole no longer writes to user metadata

`storeARN()` was storing the role's ARN in `RGWUserInfo::assumed_role_arn`,
but that field was unused

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

2 years agodoc/rados: edit devices.rst 51477/head
Zac Dover [Mon, 15 May 2023 01:01:19 +0000 (11:01 +1000)]
doc/rados: edit devices.rst

Line-edit doc/rados/operations/devices.rst.

Co-authored-by: Anthony D'Atri <anthony.datri@gmail.com>
Co-authored-by: Cole Mitchell <cole.mitchell.ceph@gmail.com>
Signed-off-by: Zac Dover <zac.dover@proton.me>
(cherry picked from commit 8321b457a25a4394439f908c500091ce30e0736a)

2 years agoMerge pull request #51469 from zdover23/wip-doc-2023-05-14-backport-51175-to-reef
Anthony D'Atri [Sun, 14 May 2023 11:06:58 +0000 (07:06 -0400)]
Merge pull request #51469 from zdover23/wip-doc-2023-05-14-backport-51175-to-reef

reef: doc: add link to "documenting ceph" to index.rst

2 years agodoc: add link to "documenting ceph" to index.rst 51469/head
Zac Dover [Fri, 21 Apr 2023 20:59:04 +0000 (22:59 +0200)]
doc: add link to "documenting ceph" to index.rst

Add a link to the landing page of docs.ceph.com to direct documentation
contributors to documentation-related information.

Signed-off-by: Zac Dover <zac.dover@proton.me>
(cherry picked from commit 155a382cb2e8b80dca260ca7abdc3cc89c805edb)

2 years agoMerge pull request #51465 from zdover23/wip-doc-2023-05-13-backport-51463-to-reef
Anthony D'Atri [Sat, 13 May 2023 11:40:13 +0000 (07:40 -0400)]
Merge pull request #51465 from zdover23/wip-doc-2023-05-13-backport-51463-to-reef

reef: doc/cephfs: edit fs-volumes.rst (1 of x)

2 years agodoc/cephfs: edit fs-volumes.rst (1 of x) 51465/head
Zac Dover [Fri, 12 May 2023 15:49:14 +0000 (01:49 +1000)]
doc/cephfs: edit fs-volumes.rst (1 of x)

Edit the syntax of the English language in the file
doc/cephfs/fs-volumes.rst up to (but not including) the section called
"FS Subvolumes".

Signed-off-by: Zac Dover <zac.dover@proton.me>
(cherry picked from commit a1184070a1a3d2f6c1462c62f88fe70df5626c36)

2 years agoMerge pull request #51461 from zdover23/wip-doc-2023-05-12-backport-51458-to-reef
zdover23 [Fri, 12 May 2023 13:28:48 +0000 (23:28 +1000)]
Merge pull request #51461 from zdover23/wip-doc-2023-05-12-backport-51458-to-reef

reef: doc/cephfs: rectify prompts in fs-volumes.rst

Reviewed-by: Cole Mitchell <cole.mitchell.ceph@gmail.com>
2 years agodoc/cephfs: rectify prompts in fs-volumes.rst 51461/head
Zac Dover [Fri, 12 May 2023 10:35:25 +0000 (20:35 +1000)]
doc/cephfs: rectify prompts in fs-volumes.rst

Make sure all prompts are unselectable. This PR is meant to be
backported to Reef, Quincy, and Pacific, to get all of the prompts into
a fit state so that a line-edit can be performed on the Englsh language
in this file.

Follows https://github.com/ceph/ceph/pull/51427.

Signed-off-by: Zac Dover <zac.dover@proton.me>
(cherry picked from commit 1f88f10fe6d2069d3d474fe490e69a809afb1f56)

2 years agoMerge pull request #51434 from zdover23/wip-doc-2023-05-11-backport-51427-to-reef
zdover23 [Fri, 12 May 2023 10:31:35 +0000 (20:31 +1000)]
Merge pull request #51434 from zdover23/wip-doc-2023-05-11-backport-51427-to-reef

reef: doc/cephfs: fix prompts in fs-volumes.rst

Reviewed-by: Anthony D'Atri <anthony.datri@gmail.com>
2 years agodoc/cephfs: fix prompts in fs-volumes.rst 51434/head
Zac Dover [Wed, 10 May 2023 14:52:50 +0000 (00:52 +1000)]
doc/cephfs: fix prompts in fs-volumes.rst

Fixed a regression introduced in
e5355e3d66e1438d51de6b57eae79fab47cd0184 that broke the unselectable
prompts in the RST.

Signed-off-by: Zac Dover <zac.dover@proton.me>
(cherry picked from commit e019948783adf41207d70e8cd2540d335e07b80b)

2 years agoMerge pull request #51419 from zdover23/wip-doc-2023-05-10-backport-51403-to-reef
Anthony D'Atri [Wed, 10 May 2023 12:23:50 +0000 (08:23 -0400)]
Merge pull request #51419 from zdover23/wip-doc-2023-05-10-backport-51403-to-reef

reef: doc/start: fix "Planet Ceph" link

2 years agodoc/start: fix "Planet Ceph" link 51419/head
Zac Dover [Tue, 9 May 2023 03:39:10 +0000 (13:39 +1000)]
doc/start: fix "Planet Ceph" link

Fix a link to Planet Ceph on the doc/start/get-involved.rst page.

Reported 2023 Apr 21, here:
https://pad.ceph.com/p/Report_Documentation_Bugs

Signed-off-by: Zac Dover <zac.dover@proton.me>
(cherry picked from commit 67ebc206648144e533b627b9c22f29695764b26b)

2 years agoMerge pull request #51016 from cbodley/wip-59351
Casey Bodley [Tue, 9 May 2023 14:30:26 +0000 (10:30 -0400)]
Merge pull request #51016 from cbodley/wip-59351

reef: fmt: remove FMT_HEADER_ONLY defines

Reviewed-by: Daniel Gryniewicz <dang@redhat.com>
Reviewed-by: Ilya Dryomov <idryomov@gmail.com>
2 years agoMerge pull request #51397 from zdover23/wip-doc-2023-05-09-backport-51394-to-reef
Anthony D'Atri [Tue, 9 May 2023 08:47:51 +0000 (04:47 -0400)]
Merge pull request #51397 from zdover23/wip-doc-2023-05-09-backport-51394-to-reef

reef: doc/dev/encoding.txt: update per std::optional

2 years agoMerge pull request #51400 from zdover23/wip-doc-2023-05-09-backport-51392-to-reef
Anthony D'Atri [Tue, 9 May 2023 08:38:17 +0000 (04:38 -0400)]
Merge pull request #51400 from zdover23/wip-doc-2023-05-09-backport-51392-to-reef

reef: doc: update multisite doc

2 years agodoc: update multisite doc 51400/head
parth-gr [Mon, 8 May 2023 13:53:29 +0000 (19:23 +0530)]
doc: update multisite doc

cmd for getting zone group was spelled incorrectly
Updated to rdosgw-admin

Signed-off-by: parth-gr <paarora@redhat.com>
(cherry picked from commit edab93b2f15b19f05a86aab499ba11b56135aaf3)

2 years agodoc/dev/encoding.txt: update per std::optional 51397/head
Radoslaw Zarzynski [Mon, 8 May 2023 14:41:22 +0000 (14:41 +0000)]
doc/dev/encoding.txt: update per std::optional

Signed-off-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
(cherry picked from commit 622829cebcca8ae4ec6f0463a4d74c909998a92d)

2 years agoMerge pull request #51263 from sseshasa/wip-reef-fix-mclk-rec-backfill-cost
Radoslaw Zarzynski [Mon, 8 May 2023 18:23:32 +0000 (20:23 +0200)]
Merge pull request #51263 from sseshasa/wip-reef-fix-mclk-rec-backfill-cost

reef: osd: mClock recovery/backfill cost fixes

Reviewed-by: Sam Just <sjust@redhat.com>
2 years agoMerge pull request #51389 from zdover23/wip-doc-2023-05-08-backport-51387-to-reef
zdover23 [Mon, 8 May 2023 13:37:03 +0000 (23:37 +1000)]
Merge pull request #51389 from zdover23/wip-doc-2023-05-08-backport-51387-to-reef

reef: doc/rados: stretch-mode.rst (other commands)

Reviewed-by: Cole Mitchell <cole.mitchell.ceph@gmail.com>
2 years agodoc/rados: stretch-mode.rst (other commands) 51389/head
Zac Dover [Mon, 8 May 2023 11:08:49 +0000 (21:08 +1000)]
doc/rados: stretch-mode.rst (other commands)

Edit the "Other Commands" section of
doc/rados/operations/stretch-mode.rst.

Signed-off-by: Zac Dover <zac.dover@proton.me>
(cherry picked from commit fde33f1a5b8dbd03c096140887e04038a82f3076)

2 years agoMerge pull request #51371 from zdover23/wip-doc-2023-05-06-backport-51359-to-reef
zdover23 [Mon, 8 May 2023 12:41:55 +0000 (22:41 +1000)]
Merge pull request #51371 from zdover23/wip-doc-2023-05-06-backport-51359-to-reef

reef: doc/cephfs: repairing inaccessible FSes

Reviewed-by: Svelar <sunrongqi@huawei.com>
2 years agoMerge pull request #51377 from zdover23/wip-doc-2023-05-07-backport-51322-to-reef
Anthony D'Atri [Sun, 7 May 2023 10:37:21 +0000 (06:37 -0400)]
Merge pull request #51377 from zdover23/wip-doc-2023-05-07-backport-51322-to-reef

reef: doc/rados: stretch-mode: stretch cluster issues

2 years agodoc/rados: stretch-mode: stretch cluster issues 51377/head
Zac Dover [Wed, 3 May 2023 05:16:07 +0000 (15:16 +1000)]
doc/rados: stretch-mode: stretch cluster issues

Edit "Stretch Cluster Issues", which might better be called "Netsplits"
or "Recognizing Netsplits".

Signed-off-by: Zac Dover <zac.dover@proton.me>
(cherry picked from commit 6c1baffb85556120672b45cce89b93a20e7b09a2)

2 years agodoc/cephfs: repairing inaccessible FSes 51371/head
Zac Dover [Fri, 5 May 2023 06:35:28 +0000 (16:35 +1000)]
doc/cephfs: repairing inaccessible FSes

Add a procedure to doc/cephfs/troubleshooting.rst that explains how to
restore access to FileSystems that became inaccessible after
post-Nautilus upgrades. The procedure included here was written by Harry
G Coin, and merely lightly edited by me. I include him here as a
"co-author", but it should be noted that he did the heavy lifting on
this.

See the email thread here for more context:
https://lists.ceph.io/hyperkitty/list/ceph-users@ceph.io/message/HS5FD3QFR77NAKJ43M2T5ZC25UYXFLNW/

Co-authored-by: Harry G Coin <hgcoin@gmail.com>
Signed-off-by: Zac Dover <zac.dover@proton.me>
2 years agoMerge pull request #51253 from rhcs-dashboard/fix-pg-imbalancy-reef
Nizamudeen A [Fri, 5 May 2023 15:19:21 +0000 (20:49 +0530)]
Merge pull request #51253 from rhcs-dashboard/fix-pg-imbalancy-reef

reef: mgr/dashboard: fix CephPGImbalance alert

Reviewed-by: Avan Thakkar <athakkar@redhat.com>
2 years agomgr/dashboard: Edit ceph authx users 51364/head
Pedro Gonzalez Gomez [Mon, 20 Feb 2023 13:37:00 +0000 (14:37 +0100)]
mgr/dashboard: Edit ceph authx users

Signed-off-by: Pedro Gonzalez Gomez <pegonzal@redhat.com>
Signed-off-by: Pere Diaz Bou <pdiazbou@redhat.com>
(cherry picked from commit 8177a748bd831568417df5c687109fbbbd9b981d)

2 years agomgr/dashboard: import/export authx users
Pere Diaz Bou [Thu, 6 Apr 2023 14:24:03 +0000 (16:24 +0200)]
mgr/dashboard: import/export authx users

Signed-off-by: Pere Diaz Bou <pdiazbou@redhat.com>
Fixes: https://tracker.ceph.com/issues/59486
(cherry picked from commit 62d762f6965c5b8585d223c06cb23071a856cfcb)

2 years agomgr/dashboard: delete-ceph-authx
Pedro Gonzalez Gomez [Thu, 6 Apr 2023 14:18:41 +0000 (16:18 +0200)]
mgr/dashboard: delete-ceph-authx

Fixes: https://tracker.ceph.com/issues/59365
Signed-off-by: Pedro Gonzalez Gomez <pegonzal@redhat.com>
(cherry picked from commit 6b5a00fb8e8b9a72d9308a069763dd86e9ecd153)

2 years agomgr/dashboard: rgw role creation form
Pere Diaz Bou [Thu, 2 Mar 2023 12:17:25 +0000 (13:17 +0100)]
mgr/dashboard: rgw role creation form

Fixes: https://tracker.ceph.com/issues/59187
Signed-off-by: Pere Diaz Bou <pdiazbou@redhat.com>
Signed-off-by: Nizamudeen A <nia@redhat.com>
(cherry picked from commit bd0eb20c673d54b9be3440decc0f3a1449153385)

2 years agomgr/dashboard: replace ajsf with formly
Pere Diaz Bou [Mon, 6 Mar 2023 19:32:24 +0000 (20:32 +0100)]
mgr/dashboard: replace ajsf with formly

ajsf json schema library for angular doesn't seem to be actively
maintained. Instead, fromly is a well maintained replacement with extra
stuff like validators builtin, support for json schemas, custom
components, etc...

Textareas weren't supported on ajsf, therefore, it made sense to move to
this dep instead.

Signed-off-by: Pere Diaz Bou <pdiazbou@redhat.com>
Signed-off-by: Nizamudeen A <nia@redhat.com>
(cherry picked from commit 2c43dd0c16e3cc3b3eada03ed11958a689cc4bcd)

2 years agoMerge pull request #51111 from rhcs-dashboard/wip-59458-reef
Nizamudeen A [Fri, 5 May 2023 05:25:36 +0000 (10:55 +0530)]
Merge pull request #51111 from rhcs-dashboard/wip-59458-reef

reef: mgr/dashboard: expose more grafana configs in service form

Reviewed-by: Avan Thakkar <athakkar@redhat.com>
2 years agoMerge pull request #51349 from zdover23/wip-doc-2023-05-05-backport-51348-to-reef
Anthony D'Atri [Fri, 5 May 2023 03:10:51 +0000 (23:10 -0400)]
Merge pull request #51349 from zdover23/wip-doc-2023-05-05-backport-51348-to-reef

reef: doc: Use `ceph osd crush tree` command to display weight set weights

2 years agodoc: Use `ceph osd crush tree` command to display weight set weights 51349/head
James Lakin [Thu, 4 May 2023 17:02:36 +0000 (18:02 +0100)]
doc: Use `ceph osd crush tree` command to display weight set weights

The previous `ceph osd tree` doesn't show pool-defined weight-sets as the above documentation suggests.

Signed-off-by: James Lakin <james@jameslakin.co.uk>
(cherry picked from commit 15c3d72a43a37798de823b26f1429f7776f67aaa)

2 years agoMerge pull request #51165 from rhcs-dashboard/wip-59503-reef
Nizamudeen A [Thu, 4 May 2023 15:36:31 +0000 (21:06 +0530)]
Merge pull request #51165 from rhcs-dashboard/wip-59503-reef

reef: mgr/dashboard: hide notification on force promote

Reviewed-by: Pere Diaz Bou <pdiazbou@redhat.com>
2 years agoMerge pull request #50881 from adk3798/reef-backport-49969-50100-50270-50101-50244...
Adam King [Thu, 4 May 2023 14:04:54 +0000 (10:04 -0400)]
Merge pull request #50881 from adk3798/reef-backport-49969-50100-50270-50101-50244-50133-50133-50413-50318-50082-

reef: mgr/cephadm: Reef Batch Backport

Reviewed-by: Teoman ONAY <tonay@ibm.com>
2 years agoMerge pull request #51337 from zdover23/wip-doc-2023-05-04-backport-51292-to-reef
Anthony D'Atri [Thu, 4 May 2023 02:18:43 +0000 (22:18 -0400)]
Merge pull request #51337 from zdover23/wip-doc-2023-05-04-backport-51292-to-reef

reef: doc/rados: edit stretch-mode.rst

2 years agodoc/rados: edit stretch-mode.rst 51337/head
Zac Dover [Sun, 30 Apr 2023 02:09:51 +0000 (12:09 +1000)]
doc/rados: edit stretch-mode.rst

Edit "Stretch Mode Limitations" (renamed "Limitations of Stretch Mode"
in this commit) in doc/rados/operations/stretch-mode.rst.

Co-authored-by: Greg Farnum <gfarnum@redhat.com>
Co-authored-by: Anthony D'Atri <anthony.datri@gmail.com>
Signed-off-by: Zac Dover <zac.dover@proton.me>
(cherry picked from commit 410e2a181c3247d13a1b20d80c4bcbbc1a5f84da)

2 years agoMerge pull request #50978 from batrick/i59295
Yuri Weinstein [Wed, 3 May 2023 22:12:22 +0000 (15:12 -0700)]
Merge pull request #50978 from batrick/i59295

reef: MgrMonitor: batch commit OSDMap and MgrMap mutations

Reviewed-by: Ilya Dryomov <idryomov@redhat.com>
Reviewed-by: Ramana Raja <rraja@redhat.com>
2 years agoMerge pull request #50963 from ajarr/wip-58999-reef
Yuri Weinstein [Wed, 3 May 2023 22:11:06 +0000 (15:11 -0700)]
Merge pull request #50963 from ajarr/wip-58999-reef

reef: mgr: store names of modules that register RADOS clients in the MgrMap

Reviewed-by: Ilya Dryomov <idryomov@redhat.com>
2 years agoMerge pull request #51061 from mkogan1/wip-50842-reef
Casey Bodley [Wed, 3 May 2023 21:36:23 +0000 (17:36 -0400)]
Merge pull request #51061 from mkogan1/wip-50842-reef

reef: rgw : fix python script using s3cmd with error code 403 ubuntu 20.04

Reviewed-by: Casey Bodley <cbodley@redhat.com>
2 years agorgw : fix python script using s3cmd with error code 403 ubuntu 20.04 51061/head
Mark Kogan [Sun, 2 Apr 2023 13:23:25 +0000 (16:23 +0300)]
rgw : fix python script using s3cmd with error code 403 ubuntu 20.04

Fixes: https://tracker.ceph.com/issues/54104
Signed-off-by: Mark Kogan <mkogan@redhat.com>
(cherry picked from commit 5846a9c2677067516f98d502980dab1681cddb69)

2 years agoMerge pull request #51334 from ljflores/wip-59600-reef
Laura Flores [Wed, 3 May 2023 18:38:21 +0000 (13:38 -0500)]
Merge pull request #51334 from ljflores/wip-59600-reef

reef: mgr: add urllib3==1.26.15 to mgr/requirements.txt

2 years agomgr: add urllib3==1.26.15 to mgr/requirements.txt 51334/head
Laura Flores [Mon, 1 May 2023 16:28:54 +0000 (16:28 +0000)]
mgr: add urllib3==1.26.15 to mgr/requirements.txt

We do not depend on any particular version of
urllib3, but as a workaround to the incompatibility
of urllib3 constraints between kubernetes and
requests, we need to pin it temporarily to
the version both are happy with.

Fixes: https://tracker.ceph.com/issues/59591
Signed-off-by: Laura Flores <lflores@redhat.com>
(cherry picked from commit 80d460005e44649191aa862fa78bd278644b5237)

2 years agorgw/rados: check_quota() uses real bucket owner 51328/head
Mykola Golub [Thu, 6 Apr 2023 15:38:02 +0000 (11:38 -0400)]
rgw/rados: check_quota() uses real bucket owner

Fixes: https://tracker.ceph.com/issues/58725
Signed-off-by: Mykola Golub <mgolub@suse.com>
Signed-off-by: Casey Bodley <cbodley@redhat.com>
(cherry picked from commit 13299bccc6ae42579a9def4776270abd334e9efe)

2 years agocephfs-top: fix help text for delay 50998/head
Jos Collin [Thu, 20 Apr 2023 09:39:01 +0000 (15:09 +0530)]
cephfs-top: fix help text for delay

Updates:

`
  -d {1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25}, --delay {1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25}
                        Refresh interval in seconds (default: 1)
`

to

`
  -d DELAY, --delay DELAY
                        Refresh interval in seconds (default: 1, range: 1 - 25)
`

Fixes: https://tracker.ceph.com/issues/59553
Signed-off-by: Jos Collin <jcollin@redhat.com>
(cherry picked from commit 10a74b9f09b8e1402e421503d5ff23a44416bf15)

2 years agoMerge pull request #51309 from zdover23/wip-doc-2023-05-02-backport-51133-to-reef
zdover23 [Tue, 2 May 2023 22:25:04 +0000 (08:25 +1000)]
Merge pull request #51309 from zdover23/wip-doc-2023-05-02-backport-51133-to-reef

reef: doc/mgr: update prompts in prometheus.rst

Reviewed-by: Cole Mitchell <cole.mitchell.ceph@gmail.com>