]> git.apps.os.sepia.ceph.com Git - ceph.git/log
ceph.git
2 years agomgr: force propose whenever the active changes
Patrick Donnelly [Wed, 8 Mar 2023 19:54:04 +0000 (14:54 -0500)]
mgr: force propose whenever the active changes

This race fixed by 23c3f7 exists wherever we drop the active mgr.
Resolve this by forcing immediate proposal (circumventing any delays)
whenever the active is dropped.

Fixes: 23c3f76018b446fb77bbd71fdd33bddfbae9e06d
Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
(cherry picked from commit 30b20d3c13be532e5508dc65276e90c7973c0c51)

2 years agomon: fix semantic error prepare_update return
Patrick Donnelly [Mon, 13 Mar 2023 14:25:55 +0000 (10:25 -0400)]
mon: fix semantic error prepare_update return

The return value is used to indicate whether the pending state should be
committed. There is no concept of "handled message" here (unlike
preprocess_query).

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

2 years agomon/MgrMonitor: do not propse again for "mgr fail"
Kefu Chai [Sat, 27 Aug 2022 15:46:00 +0000 (23:46 +0800)]
mon/MgrMonitor: do not propse again for "mgr fail"

in 23c3f76018b446fb77bbd71fdd33bddfbae9e06d, the change to fail the mgr
is proposed immediately. but `MgrMonitor::prepare_command()` method still
returns `true` in this case. its indirect caller of
`PaxosService::dispatch()` considers this as a sign that it needs to
propose the change with `propose_pending()`. but the pending change has
already been proposed by `MgrMonitor::prepare_command()`, and
`have_pending` is also cleared by this call. as we don't allow
consecutive paxos proposals, the second `propose_pending()` call is
delayed with a configured latency. but when the timer is fired, this
poseponed call would find itself trying to propose nothing. the change
to fail the mgr has been proposed. that's why we have
`ceph_assert(have_pending)` assertion failures.

in this change, the second proposal is not proposed anymore if the
proposal is proposed immediately. this should avoid the assertion
failure.

this change should address the regression introduced by
23c3f76018b446fb77bbd71fdd33bddfbae9e06d.

Fixes: https://tracker.ceph.com/issues/56850
Signed-off-by: Kefu Chai <tchaikov@gmail.com>
(cherry picked from commit 5b1c6ad4967196cb97afd8c04848b13ee5a198f0)

2 years agomon: fix a race between `mgr fail` and MgrMonitor::prepare_beacon()
Radosław Zarzyński [Mon, 16 May 2022 23:41:40 +0000 (01:41 +0200)]
mon: fix a race between `mgr fail` and MgrMonitor::prepare_beacon()

There is a race condition between the `mgr fail` handling  and `mgrbeacon`.

```diff
diff --git a/src/mon/MgrMonitor.cc b/src/mon/MgrMonitor.cc
index 8ada44e2628..9000b2e0687 100644
--- a/src/mon/MgrMonitor.cc
+++ b/src/mon/MgrMonitor.cc
@@ -1203,7 +1203,9 @@ bool MgrMonitor::prepare_command(MonOpRequestRef op)
     }

     if (changed && pending_map.active_gid == 0) {
+      dout(5) << "========== changed and active_state == 0" << dendl;
       promote_standby();
+      dout(5) << "========== after promote_standby: " << pending_map.active_gid << dendl;
     }
   } else if (prefix == "mgr module enable") {
     string module;
```

```
2022-05-17T00:11:19.602+0200 7f6bd5769700  0 mon.a@0(leader) e1 handle_command mon_command({"prefix": "mgr fail", "who": "x"} v 0) v1
...
2022-05-17T00:11:19.614+0200 7f6bd5769700  5 mon.a@0(leader).mgr e25 ========== changed and active_state == 0
2022-05-17T00:11:19.614+0200 7f6bd5769700  5 mon.a@0(leader).mgr e25 ========== after promote_standby: 0
2022-05-17T00:11:19.614+0200 7f6bd5769700  4 mon.a@0(leader).mgr e25 prepare_command done, r=0
...
2022-05-17T00:11:19.630+0200 7f6bd5769700  4 mon.a@0(leader).mgr e25 selecting new active 4210 x (was 0 )
```

```cpp
bool MgrMonitor::prepare_beacon(MonOpRequestRef op)
  if (pending_map.active_gid == m->get_gid()) {
    // ...
  } else if (pending_map.active_gid == 0) {
    // There is no currently active daemon, select this one.
    if (pending_map.standbys.count(m->get_gid())) {
      drop_standby(m->get_gid(), false);
    }
    dout(4) << "selecting new active " << m->get_gid()
            << " " << m->get_name()
            << " (was " << pending_map.active_gid << " "
            << pending_map.active_name << ")" << dendl;
    pending_map.active_gid = m->get_gid();
    pending_map.active_name = m->get_name();
    pending_map.active_change = ceph_clock_now()
```

The `25` version of `MgrMap`, when handled at `mgr.x`, doesn't trigger the `respawn()` path:

```
2022-05-17T00:10:11.197+0200 7fa3d1e0a700 10 mgr ms_dispatch2 active mgrmap(e 25) v1
2022-05-17T00:10:11.197+0200 7fa3d1e0a700  4 mgr handle_mgr_map received map epoch 25
2022-05-17T00:10:11.197+0200 7fa3d1e0a700  4 mgr handle_mgr_map active in map: 1 active is 4210
2022-05-17T00:10:11.197+0200 7fa3d6613700 10 --2- 127.0.0.1:0/743576734 >> [v2:127.0.0.1:40929/0,v1:127.0.0.1:40930/0] conn(0x5592635ef400 0x5592635f6580 secure :-1 s=THROTTLE_DONE pgs=130 cs=0 l=1 rev1=1 crypto rx=0x55926362e810 tx=0x559263563b60 comp rx=0 tx=0).handle_read_frame_dispatch tag=17
2022-05-17T00:10:11.197+0200 7fa3d6613700  5 --2- 127.0.0.1:0/743576734 >> [v2:127.0.0.1:40929/0,v1:127.0.0.1:40930/0] conn(0x5592635ef400 0x5592635f6580 secure :-1 s=THROTTLE_DONE pgs=130 cs=0 l=1 rev1=1 crypto rx=0x55926362e810 tx=0x559263563b60 comp rx=0 tx=0).handle_message got 43089 + 0 + 0 byte message. envelope type=1796 src mon.0 off 0
2022-05-17T00:10:11.197+0200 7fa3d1e0a700 10 mgr handle_mgr_map I was already active
```

Fixes: https://tracker.ceph.com/issues/55711
Signed-off-by: Radosław Zarzyński <rzarzyns@redhat.com>
(cherry picked from commit 23c3f76018b446fb77bbd71fdd33bddfbae9e06d)

2 years agoMerge pull request #51325 from rhcs-dashboard/wip-59623-quincy
Nizamudeen A [Thu, 4 May 2023 15:29:09 +0000 (20:59 +0530)]
Merge pull request #51325 from rhcs-dashboard/wip-59623-quincy

quincy: mgr/dashboard: fix the rbd mirroring configure check

Reviewed-by: Avan Thakkar <athakkar@redhat.com>
2 years agoMerge pull request #51338 from zdover23/wip-doc-2023-05-04-backport-51292-to-quincy
Anthony D'Atri [Thu, 4 May 2023 02:19:12 +0000 (22:19 -0400)]
Merge pull request #51338 from zdover23/wip-doc-2023-05-04-backport-51292-to-quincy

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

2 years agodoc/rados: edit stretch-mode.rst 51338/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 #51335 from ljflores/wip-59625-quincy
Laura Flores [Wed, 3 May 2023 18:38:03 +0000 (13:38 -0500)]
Merge pull request #51335 from ljflores/wip-59625-quincy

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

2 years agomgr: add urllib3==1.26.15 to mgr/requirements.txt 51335/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 agoMerge pull request #51210 from guits/wip-59257-quincy
Guillaume Abrioux [Wed, 3 May 2023 09:22:21 +0000 (11:22 +0200)]
Merge pull request #51210 from guits/wip-59257-quincy

quincy: ceph-volume: fix drive-group issue that expects the batch_args to be a string

2 years agoMerge pull request #51206 from guits/wip-59518-quincy
Guillaume Abrioux [Wed, 3 May 2023 09:22:08 +0000 (11:22 +0200)]
Merge pull request #51206 from guits/wip-59518-quincy

quincy: ceph-volume: fix batch refactor issue

2 years agoMerge pull request #51195 from guits/wip-59524-quincy
Guillaume Abrioux [Wed, 3 May 2023 09:21:53 +0000 (11:21 +0200)]
Merge pull request #51195 from guits/wip-59524-quincy

quincy: ceph-volume: quick fix in zap.py

2 years agomgr/dashboard: fix the rbd mirroring configure check 51325/head
Nizamudeen A [Thu, 27 Apr 2023 11:24:24 +0000 (16:54 +0530)]
mgr/dashboard: fix the rbd mirroring configure check

In one-way mirroring, the condition we are checking now for configuring
the mirroring will fail because only one cluster needs to have the
mirror daemon present. Thus even if mirroring is successfuly happening
the page won't load. For now relaxing the rule until we find a better
api call to check for the status

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

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

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

Reviewed-by: Cole Mitchell <cole.mitchell.ceph@gmail.com>
2 years agodoc/mgr: update prompts in prometheus.rst 51310/head
Zac Dover [Tue, 18 Apr 2023 14:28:50 +0000 (16:28 +0200)]
doc/mgr: update prompts in prometheus.rst

Update prompts in prometheus.rst so that they're unselectable.

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

2 years agoMerge pull request #51306 from zdover23/wip-doc-2023-05-02-backport-51299-to-quincy
Anthony D'Atri [Mon, 1 May 2023 23:25:55 +0000 (19:25 -0400)]
Merge pull request #51306 from zdover23/wip-doc-2023-05-02-backport-51299-to-quincy

quincy: doc/radosgw: rabbitmq - push-endpoint edit

2 years agodoc/radosgw: rabbitmq - push-endpoint edit 51306/head
Zac Dover [Mon, 1 May 2023 17:14:01 +0000 (03:14 +1000)]
doc/radosgw: rabbitmq - push-endpoint edit

Remove a note that directed users to change "push-endpoint" (with a
hyphen) to "push_endpoint" (with an underscore) when using rabbitmq.

Re: https://github.com/ceph/ceph/pull/48486#issuecomment-1529925389

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

2 years agoMerge pull request #51303 from zdover23/wip-doc-2023-05-02-backport-51296-to-quincy
Anthony D'Atri [Mon, 1 May 2023 20:35:59 +0000 (16:35 -0400)]
Merge pull request #51303 from zdover23/wip-doc-2023-05-02-backport-51296-to-quincy

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

2 years agodoc/rados: edit stretch-mode.rst 51303/head
Zac Dover [Mon, 1 May 2023 02:29:07 +0000 (12:29 +1000)]
doc/rados: edit stretch-mode.rst

Refine and supplement the introductory and explanatory text at the top
of the /doc/rados/operations/stretch-mode.rst file.

Co-authored-by: Josh Durgin <jdurgin@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 b642900abc57302e62a5064dba510c3cc5743ac0)

2 years agoMerge pull request #51290 from zdover23/wip-doc-2023-04-30-backport-51285-to-quincy
Anthony D'Atri [Sat, 29 Apr 2023 20:01:07 +0000 (16:01 -0400)]
Merge pull request #51290 from zdover23/wip-doc-2023-04-30-backport-51285-to-quincy

quincy: doc/rados: edit stretch-mode procedure

2 years agodoc/rados: edit stretch-mode procedure 51290/head
Zac Dover [Sat, 29 Apr 2023 00:14:02 +0000 (10:14 +1000)]
doc/rados: edit stretch-mode procedure

Edit the "stretch mode" section in doc/rados/operations/stretch-mode.rst
so that the procedure is formatted as a procedure and the sentences
correctly have heads.

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

2 years agoMerge pull request #51287 from zdover23/wip-doc-2023-04-29-backport-51276-to-quincy
zdover23 [Sat, 29 Apr 2023 17:32:11 +0000 (03:32 +1000)]
Merge pull request #51287 from zdover23/wip-doc-2023-04-29-backport-51276-to-quincy

quincy: docs: Update the Prometheus endpoint info

Reviewed-by: Anthony D'Atri <anthony.datri@gmail.com>
2 years agodocs: Update the Prometheus endpoint info 51287/head
Paul Cuzner [Fri, 28 Apr 2023 05:21:39 +0000 (17:21 +1200)]
docs: Update the Prometheus endpoint info

This patch just tidies up some of the links and adds
an example showing how the http_sd_configs option
may be used.

Signed-off-by: Paul Cuzner <pcuzner@redhat.com>
(cherry picked from commit 690d34ab08f22cd988828aa2097531627000907e)

2 years agoMerge pull request #51273 from zdover23/wip-doc-2023-04-28-backport-51271-to-quincy
Anthony D'Atri [Fri, 28 Apr 2023 00:52:26 +0000 (20:52 -0400)]
Merge pull request #51273 from zdover23/wip-doc-2023-04-28-backport-51271-to-quincy

quincy: doc/rados: m-config-ref: edit "background"

2 years agodoc/rados: m-config-ref: edit "background" 51273/head
Zac Dover [Thu, 27 Apr 2023 22:35:17 +0000 (08:35 +1000)]
doc/rados: m-config-ref: edit "background"

Edit the "Background" section of doc/rados/monitor/config-ref.rst

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

2 years agoMerge pull request #51240 from zdover23/wip-doc-2023-04-27-backport-51154-to-quincy
zdover23 [Thu, 27 Apr 2023 00:44:56 +0000 (10:44 +1000)]
Merge pull request #51240 from zdover23/wip-doc-2023-04-27-backport-51154-to-quincy

quincy: doc/rados/ops: edit user-management.rst (3 of x)

Reviewed-by: Cole Mitchell <cole.mitchell@gmail.com>
2 years agodoc/rados/ops: edit user-management.rst (3 of x) 51240/head
Zac Dover [Thu, 20 Apr 2023 08:25:00 +0000 (10:25 +0200)]
doc/rados/ops: edit user-management.rst (3 of x)

Line-edit doc/rados/user-management.rst (3 of x).

https://tracker.ceph.com/issues/58485

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

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

2 years agoMerge pull request #51156 from zdover23/wip-doc-2023-04-20-backport-51140-to-quincy
zdover23 [Thu, 27 Apr 2023 00:09:17 +0000 (10:09 +1000)]
Merge pull request #51156 from zdover23/wip-doc-2023-04-20-backport-51140-to-quincy

quincy: doc/rados: edit user-management (2 of x)

Reviewed-by: Cole Mitchell <cole.mitchell@gmail.com>
2 years agoMerge pull request #51236 from zdover23/wip-doc-2023-04-27-backport-51204-to-quincy
Anthony D'Atri [Wed, 26 Apr 2023 22:26:46 +0000 (18:26 -0400)]
Merge pull request #51236 from zdover23/wip-doc-2023-04-27-backport-51204-to-quincy

quincy: doc/cephfs: explain cephfs data and metadata set

2 years agodoc/cephfs: explain cephfs data and metadata set 51236/head
Zac Dover [Tue, 25 Apr 2023 07:46:53 +0000 (17:46 +1000)]
doc/cephfs: explain cephfs data and metadata set

Explain how to set application metadata for the CephFS data pool and the
CephFS metadata pool.

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

2 years agoMerge pull request #51221 from zdover23/wip-doc-2023-04-26-backport-51193-to-quincy
Anthony D'Atri [Wed, 26 Apr 2023 00:21:47 +0000 (20:21 -0400)]
Merge pull request #51221 from zdover23/wip-doc-2023-04-26-backport-51193-to-quincy

quincy: doc/start: rewrite intro paragraph

2 years agodoc/start: rewrite intro paragraph 51221/head
Zac Dover [Mon, 24 Apr 2023 11:02:16 +0000 (13:02 +0200)]
doc/start: rewrite intro paragraph

Rewrite the first paragraph in doc/start/intro.rst.

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

2 years agoMerge PR #51029 into quincy
Patrick Donnelly [Tue, 25 Apr 2023 15:00:09 +0000 (11:00 -0400)]
Merge PR #51029 into quincy

* refs/pull/51029/head:
Revert "qa/fs/mixed-clients: specify distros for tests"

Reviewed-by: Venky Shankar <vshankar@redhat.com>
2 years agoMerge PR #50783 into quincy
Patrick Donnelly [Tue, 25 Apr 2023 14:56:57 +0000 (10:56 -0400)]
Merge PR #50783 into quincy

* refs/pull/50783/head:
tools/cephfs: include lost+found in scan_links

Reviewed-by: Venky Shankar <vshankar@redhat.com>
2 years agoMerge PR #50779 into quincy
Patrick Donnelly [Tue, 25 Apr 2023 14:54:52 +0000 (10:54 -0400)]
Merge PR #50779 into quincy

* refs/pull/50779/head:
mds: add config to decide whether to mark dentry bad
qa: add missing scan_links step for data scan recovery
qa/tasks/cephfs: test damage to dentry's first is caught
qa/tasks/cephfs: use rank_asok and allow specifying rank
qa/tasks: allow specifying timeout command prefix to ceph
mds: provide test configs for creating first corruption
mds: catch damage to dentry's first field
mds: add debugging for pre_cow_old_inode
mds: cleanup code
mds: check for some dentry damage in scrub
mds: remove unused method
mds: note damaged dentry with first gt last
mds: cluster log scrub failure for dirfrag
mds: mark dirfrag good if repaired
mds: only dump past_parent_snap if non-empty

Reviewed-by: Venky Shankar <vshankar@redhat.com>
2 years agoMerge PR #50777 into quincy
Patrick Donnelly [Tue, 25 Apr 2023 14:53:55 +0000 (10:53 -0400)]
Merge PR #50777 into quincy

* refs/pull/50777/head:
log: fix stderr handling on Windows
log: add tests for stderr writes to fifos
log: use non-blocking atomic writes to stderr fifos
log: invalidate m_fd on close
log: reorg header

Reviewed-by: Venky Shankar <vshankar@redhat.com>
2 years agoMerge PR #50774 into quincy
Patrick Donnelly [Tue, 25 Apr 2023 14:53:05 +0000 (10:53 -0400)]
Merge PR #50774 into quincy

* refs/pull/50774/head:
qa: ignore expected scrub error

Reviewed-by: Venky Shankar <vshankar@redhat.com>
2 years agoMerge PR #50772 into quincy
Patrick Donnelly [Tue, 25 Apr 2023 14:52:23 +0000 (10:52 -0400)]
Merge PR #50772 into quincy

* refs/pull/50772/head:
qa: output higher debugging for cephfs-journal-tool/cephfs-data-scan

Reviewed-by: Venky Shankar <vshankar@redhat.com>
2 years agoMerge PR #50768 into quincy
Patrick Donnelly [Tue, 25 Apr 2023 14:51:46 +0000 (10:51 -0400)]
Merge PR #50768 into quincy

* refs/pull/50768/head:
qa: ignore MDS_TRIM warnings when osd thrashing

Reviewed-by: Venky Shankar <vshankar@redhat.com>
2 years agoMerge PR #50767 into quincy
Patrick Donnelly [Tue, 25 Apr 2023 14:50:56 +0000 (10:50 -0400)]
Merge PR #50767 into quincy

* refs/pull/50767/head:
qa: simplify and use correct recovery procedure
doc: update alternate meta pool recovery
tools/cephfs/DataScan: add debugging for directory injection

Reviewed-by: Venky Shankar <vshankar@redhat.com>
2 years agoMerge PR #50766 into quincy
Patrick Donnelly [Tue, 25 Apr 2023 14:50:07 +0000 (10:50 -0400)]
Merge PR #50766 into quincy

* refs/pull/50766/head:
qa: cleanup volumes on unwind

Reviewed-by: Venky Shankar <vshankar@redhat.com>
2 years agoMerge pull request #51164 from rhcs-dashboard/wip-59501-quincy
Pedro Gonzalez Gomez [Tue, 25 Apr 2023 10:59:29 +0000 (12:59 +0200)]
Merge pull request #51164 from rhcs-dashboard/wip-59501-quincy

quincy: mgr/dashboard: hide notification on force promote

Reviewed-by: Avan Thakkar <athakkar@redhat.com>
2 years agoceph-volume: fix drive-group issue 51210/head
Mohan Sharma [Tue, 27 Dec 2022 06:01:04 +0000 (11:31 +0530)]
ceph-volume: fix drive-group issue

The drive-group expects the batch_args to be a string,
however in the current version it is passed as a list
of one element, thus calling the first item of the list solves the issue.

Fixes: https://tracker.ceph.com/issues/59203
Signed-off-by: Mohan Sharma <mohan7427@gmail.com>
(cherry picked from commit 7602a99f7a1308c684a7c1d619bb6d9f09c79af9)

2 years agoceph-volume: fix batch refactor regression 51206/head
Guillaume Abrioux [Thu, 13 Apr 2023 14:42:32 +0000 (16:42 +0200)]
ceph-volume: fix batch refactor regression

This makes sure `ceph-volume lvm batch` will recreate the db device
with the right size when coming from a cluster deployed prior to 14.2.13

Fixes: https://tracker.ceph.com/issues/59442
Signed-off-by: Guillaume Abrioux <gabrioux@ibm.com>
(cherry picked from commit 98c68f2c8f648a5b9faac295999de212d362744d)

2 years agoceph-volume: quick fix in zap.py 51195/head
Guillaume Abrioux [Wed, 29 Mar 2023 14:58:11 +0000 (16:58 +0200)]
ceph-volume: quick fix in zap.py

`api.get_single_pv(filters={'lv_uuid': lv.lv_uuid})` needs to be called
only if `--destroy` is passed in order to remove vg and pv when there's
nothing left.

With old deployments, it is possible that a lv_uuid matches more than 1
PV.
Given that `get_single_pv()` is only needed when `--destroy` is passed,
let's move this call where it is actually needed.

This makes `ceph-volume lvm zap` fail even though

Fixes: https://tracker.ceph.com/issues/59210
Signed-off-by: Guillaume Abrioux <gabrioux@ibm.com>
(cherry picked from commit a666f700f16937565484dffc90713f6c04d76313)

2 years agoMerge pull request #51182 from zdover23/wip-doc-2023-04-23-backport-51177-to-quincy
Anthony D'Atri [Sun, 23 Apr 2023 21:19:36 +0000 (23:19 +0200)]
Merge pull request #51182 from zdover23/wip-doc-2023-04-23-backport-51177-to-quincy

quincy: doc/start: edit first 150 lines of documenting-ceph

2 years agoMerge pull request #51185 from zdover23/wip-doc-2023-04-23-backport-51178-to-quincy
Anthony D'Atri [Sun, 23 Apr 2023 21:16:26 +0000 (23:16 +0200)]
Merge pull request #51185 from zdover23/wip-doc-2023-04-23-backport-51178-to-quincy

quincy: Wip doc 2023 04 23 backport 51178 to quincy

2 years agodoc/glossary: add "Placement Groups" definition 51185/head
Zac Dover [Sat, 22 Apr 2023 08:55:38 +0000 (10:55 +0200)]
doc/glossary: add "Placement Groups" definition

Add a definition of "Placement Groups" to the Glossary.

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

2 years agodoc/start: edit first 50 lines of documenting-ceph 51182/head
Zac Dover [Sat, 22 Apr 2023 07:03:12 +0000 (09:03 +0200)]
doc/start: edit first 50 lines of documenting-ceph

Edit the first 150 lines of doc/start/documenting-ceph.rst. This is part
of an initiative to harvest the fruits of Cephalocon 2023, at which
documentation proved to be in demand to a surprising degree.

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

2 years agoMerge pull request #51124 from zdover23/wip-doc-2023-04-17-backport-49762-to-quincy
Svelar [Sun, 23 Apr 2023 02:50:48 +0000 (10:50 +0800)]
Merge pull request #51124 from zdover23/wip-doc-2023-04-17-backport-49762-to-quincy

quincy: vstart: fix text format

2 years agomgr/dashboard: hide notification on force promote 51164/head
Pedro Gonzalez Gomez [Thu, 20 Apr 2023 15:29:57 +0000 (17:29 +0200)]
mgr/dashboard: hide notification on force promote

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

2 years agodoc/rados: edit user-management (2 of x) 51156/head
Zac Dover [Tue, 18 Apr 2023 20:59:09 +0000 (22:59 +0200)]
doc/rados: edit user-management (2 of x)

Line-edit doc/rados/user-management.rst (2 of x). Some internal
references had to be removed, but these will be repaired when the next
part of this file is updated in a future PR.

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

2 years agoMerge pull request #51119 from rhcs-dashboard/wip-59464-quincy
Nizamudeen A [Tue, 18 Apr 2023 13:27:49 +0000 (18:57 +0530)]
Merge pull request #51119 from rhcs-dashboard/wip-59464-quincy

quincy: mgr/dashboard: remove unncessary hyperlink in landing page

Reviewed-by: Pegonzal <NOT@FOUND>
2 years agovstart: fix text format 51124/head
Rongqi Sun [Tue, 17 Jan 2023 05:55:01 +0000 (13:55 +0800)]
vstart: fix text format

Signed-off-by: Rongqi Sun <sunrongqi@huawei.com>
(cherry picked from commit 57dc8ce51602543d42a2f82cb829eda1c231b434)

2 years agomgr/dashboard: remove unncessary hyperlink in landing page 51119/head
Nizamudeen A [Mon, 17 Apr 2023 09:38:06 +0000 (15:08 +0530)]
mgr/dashboard: remove unncessary hyperlink in landing page

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

2 years agoMerge pull request #51079 from rhcs-dashboard/wip-59451-quincy
Nizamudeen A [Mon, 17 Apr 2023 13:38:57 +0000 (19:08 +0530)]
Merge pull request #51079 from rhcs-dashboard/wip-59451-quincy

quincy: mgr/dashboard: fix cephadm e2e expression changed error

Reviewed-by: Aashish Sharma <aasharma@redhat.com>
2 years agoMerge pull request #51117 from zdover23/wip-doc-2023-04-17-backport-51114-to-quincy
colemitchell [Mon, 17 Apr 2023 10:43:34 +0000 (12:43 +0200)]
Merge pull request #51117 from zdover23/wip-doc-2023-04-17-backport-51114-to-quincy

quincy: doc/radosgw: format part of s3select

Reviewed-by: Cole Mitchell <cole.mitchell.ceph@gmail.com>
2 years agodoc/radosgw: format part of s3select 51117/head
Cole Mitchell [Mon, 17 Apr 2023 09:34:49 +0000 (05:34 -0400)]
doc/radosgw: format part of s3select

Partially format the 'Basic Workflow' section's introduction and 'Basic Functionalities' subsection in s3select. Nothing else is being fixed.

Signed-off-by: Cole Mitchell <cole.mitchell.ceph@gmail.com>
(cherry picked from commit 13cf134c0610509da52aa68e11e26f0740002bde)

2 years agoMerge pull request #51108 from zdover23/wip-doc-2023-04-16-backport-51099-to-quincy
zdover23 [Sun, 16 Apr 2023 16:24:40 +0000 (18:24 +0200)]
Merge pull request #51108 from zdover23/wip-doc-2023-04-16-backport-51099-to-quincy

quincy: doc/dev: format command in cephfs-mirroring

Reviewed-by: Cole Mitchell <cole.mitchell.ceph@gmail.com>
2 years agoMerge pull request #51097 from zdover23/wip-doc-2023-04-16-backport-51062-to-quincy
zdover23 [Sun, 16 Apr 2023 16:22:48 +0000 (18:22 +0200)]
Merge pull request #51097 from zdover23/wip-doc-2023-04-16-backport-51062-to-quincy

quincy: doc/glossary: add "Hybrid Storage"

Reviewed-by: Cole Mitchell <cole.mitchell.ceph@gmail.com>
2 years agoMerge pull request #51093 from zdover23/wip-doc-2023-04-16-backport-51091-to-quincy
zdover23 [Sun, 16 Apr 2023 16:18:52 +0000 (18:18 +0200)]
Merge pull request #51093 from zdover23/wip-doc-2023-04-16-backport-51091-to-quincy

quincy: doc/mgr/prometheus: fix confval reference

Reviewed-by: Cole Mitchell <cole.mitchell.ceph@gmail.com>
2 years agodoc/dev: format command in cephfs-mirroring 51108/head
Zac Dover [Sun, 16 Apr 2023 09:11:27 +0000 (11:11 +0200)]
doc/dev: format command in cephfs-mirroring

Correctly format a command in doc/dev/cephfs-mirroring/#creating-users.

Reported by casanlin@init7.net at
https://pad.ceph.com/p/Report_Documentation_Bugs

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

2 years agoMerge pull request #51105 from zdover23/wip-doc-2023-04-16-backport-51103-to-quincy
colemitchell [Sun, 16 Apr 2023 14:43:17 +0000 (10:43 -0400)]
Merge pull request #51105 from zdover23/wip-doc-2023-04-16-backport-51103-to-quincy

quincy: doc/radosgw: format part of s3select

Reviewed-by: Cole Mitchell <cole.mitchell.ceph@gmail.com>
2 years agodoc/radosgw: format part of s3select 51105/head
Cole Mitchell [Sun, 16 Apr 2023 13:13:56 +0000 (09:13 -0400)]
doc/radosgw: format part of s3select

Format the first section of s3select. Nothing else is being fixed.

Signed-off-by: Cole Mitchell <cole.mitchell.ceph@gmail.com>
(cherry picked from commit a6a84471a7af154e7ccc93f51df2fc9744dc606c)

2 years agodoc/glossary: add "Hybrid Storage" 51097/head
Zac Dover [Thu, 13 Apr 2023 12:01:44 +0000 (14:01 +0200)]
doc/glossary: add "Hybrid Storage"

Add "Hybrid Storage" to the glossary.

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

2 years agodoc/mgr/prometheus: fix confval reference 51093/head
Piotr Parczewski [Sat, 15 Apr 2023 21:16:35 +0000 (23:16 +0200)]
doc/mgr/prometheus: fix confval reference

Signed-off-by: Piotr Parczewski <piotr@stackhpc.com>
(cherry picked from commit b9b75dafe248e07b21f2958023697397094cc537)

2 years agoMerge pull request #51088 from zdover23/wip-doc-2023-04-15-backport-51086-to-quincy
Anthony D'Atri [Sat, 15 Apr 2023 09:46:30 +0000 (11:46 +0200)]
Merge pull request #51088 from zdover23/wip-doc-2023-04-15-backport-51086-to-quincy

quincy: doc/rados/ops: remove ceph-medic from monitoring

2 years agodoc/rados/ops: remove ceph-medic from monitoring 51088/head
Zac Dover [Sat, 15 Apr 2023 07:42:31 +0000 (09:42 +0200)]
doc/rados/ops: remove ceph-medic from monitoring

Remove mention of ceph-medic from doc/rados/operations/monitoring.rst,
because it is no longer supported.

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

2 years agomgr/dashboard: fix cephadm e2e expression changed error 51079/head
Nizamudeen A [Fri, 14 Apr 2023 06:03:16 +0000 (11:33 +0530)]
mgr/dashboard: fix cephadm e2e expression changed error

tried to fix this issue from the daemon component sometime ago several
times but it didn't work. So force ignoring the error

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

2 years agoMerge pull request #51076 from aaSharma14/wip-59448-quincy
Nizamudeen A [Fri, 14 Apr 2023 10:01:23 +0000 (15:31 +0530)]
Merge pull request #51076 from aaSharma14/wip-59448-quincy

quincy: mgr/dashboard: Fix rbd snapshot creation

Reviewed-by: Nizamudeen A <nia@redhat.com>
2 years agomgr/dashboard: fix rbd mirror snapshot creation 51076/head
Aashish Sharma [Wed, 21 Dec 2022 11:53:37 +0000 (17:23 +0530)]
mgr/dashboard: fix rbd mirror snapshot creation

There are two types of snapshots that can be created on a snapshot based mirroring image - Normal Snapshot(same as journal based snapshot) and Nirror Image Snapshot. Till now Dashboard allowed only Mirror image snapshot, this PR intends to enable both the types

Signed-off-by: Aashish Sharma <aasharma@redhat.com>
(cherry picked from commit 5ea4171ae3d2a28efbe20b825602eff1429ef92d)

2 years agoMerge pull request #51072 from zdover23/wip-doc-2023-04-14-backport-50166-to-quincy
Anthony D'Atri [Fri, 14 Apr 2023 01:50:00 +0000 (21:50 -0400)]
Merge pull request #51072 from zdover23/wip-doc-2023-04-14-backport-50166-to-quincy

quincy: doc/rgw: refine "Setting a Zonegroup"

2 years agodoc/rgw: refine "Setting a Zonegroup" 51072/head
Zac Dover [Sun, 19 Feb 2023 13:50:43 +0000 (23:50 +1000)]
doc/rgw: refine "Setting a Zonegroup"

Streamline the "Setting a Zonegroup" section by separating out the
necessary prerequisite reading from the procedure itself.

I also corrected a typo in the word "following" in an unrelated section.

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

2 years agoMerge pull request #51064 from zdover23/wip-doc-2023-04-13-backport-50713-to-quincy
Anthony D'Atri [Thu, 13 Apr 2023 12:32:34 +0000 (08:32 -0400)]
Merge pull request #51064 from zdover23/wip-doc-2023-04-13-backport-50713-to-quincy

quincy: doc/glossary: improve "CephX" entry

2 years agodoc/glossary: improve "CephX" entry 51064/head
Zac Dover [Tue, 28 Mar 2023 08:42:11 +0000 (18:42 +1000)]
doc/glossary: improve "CephX" entry

Improve the glossary entry for "CephX".

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

2 years agoMerge pull request #51057 from rhcs-dashboard/wip-59435-quincy
Nizamudeen A [Thu, 13 Apr 2023 10:09:00 +0000 (15:39 +0530)]
Merge pull request #51057 from rhcs-dashboard/wip-59435-quincy

quincy: mgr/dashboard: rbd-mirror force promotion

Reviewed-by: Nizamudeen A <nia@redhat.com>
2 years agoMerge pull request #50897 from adk3798/wip-58996-quincy
Adam King [Wed, 12 Apr 2023 21:35:45 +0000 (17:35 -0400)]
Merge pull request #50897 from adk3798/wip-58996-quincy

quincy: mgr/cephadm: add commands to set services to managed/unmanaged

Reviewed-by: Redouane Kachach <rkachach@redhat.com>
2 years agomgr/dashboard: rbd-mirror force promotion 51057/head
Pedro Gonzalez Gomez [Wed, 5 Apr 2023 15:42:52 +0000 (17:42 +0200)]
mgr/dashboard: rbd-mirror force promotion

resolves: https://tracker.ceph.com/issues/59327
Signed-off-by: Pedro Gonzalez Gomez <pegonzal@redhat.com>
(cherry picked from commit 9696b6a04830297c23c4cccd6e7c225f183ba0b2)

2 years agoRevert "qa/fs/mixed-clients: specify distros for tests" 51029/head
Patrick Donnelly [Tue, 11 Apr 2023 13:58:51 +0000 (09:58 -0400)]
Revert "qa/fs/mixed-clients: specify distros for tests"

This reverts commit 3731fc7779e80bdfe234fec4dae21cfe46c3f193.

Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
2 years agoMerge pull request #51036 from zdover23/wip-doc-2023-04-12-backport-50993-to-quincy
zdover23 [Wed, 12 Apr 2023 09:42:08 +0000 (19:42 +1000)]
Merge pull request #51036 from zdover23/wip-doc-2023-04-12-backport-50993-to-quincy

quincy: doc/rados/operations: edit monitoring.rst

Reviewed-by: Anthony D'Atri <anthony.datri@gmail.com>
2 years agoMerge pull request #50995 from guits/cv-bkp-50473-quincy
Guillaume Abrioux [Wed, 12 Apr 2023 07:58:43 +0000 (09:58 +0200)]
Merge pull request #50995 from guits/cv-bkp-50473-quincy

ceph-volume: update the OS before deploying Ceph (quincy)

2 years agoMerge pull request #51011 from rhcs-dashboard/wip-59421-quincy
Nizamudeen A [Wed, 12 Apr 2023 07:12:35 +0000 (12:42 +0530)]
Merge pull request #51011 from rhcs-dashboard/wip-59421-quincy

quincy: mgr/dashboard: fix eviction of all FS clients

Reviewed-by: Nizamudeen A <nia@redhat.com>
2 years agoMerge pull request #51007 from rhcs-dashboard/wip-59401-quincy
Nizamudeen A [Wed, 12 Apr 2023 07:08:21 +0000 (12:38 +0530)]
Merge pull request #51007 from rhcs-dashboard/wip-59401-quincy

quincy: mgr/dashboard: fix create osd default selected as recommended not working

Reviewed-by: Aashish Sharma <aasharma@redhat.com>
2 years agodoc/rados/operations: edit monitoring.rst 51036/head
Zac Dover [Tue, 11 Apr 2023 04:15:47 +0000 (14:15 +1000)]
doc/rados/operations: edit monitoring.rst

Line-edit the final third of doc/rados/operations/monitoring.rst.

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

https://tracker.ceph.com/issues/58485

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

2 years agoMerge pull request #50906 from adk3798/wip-59315-quincy
Adam King [Tue, 11 Apr 2023 21:10:33 +0000 (17:10 -0400)]
Merge pull request #50906 from adk3798/wip-59315-quincy

quincy: mgr/cephadm: use a dedicated cephadm tmp dir to copy remote files

Reviewed-by: Redouane Kachach <rkachach@redhat.com>
2 years agoMerge pull request #50905 from adk3798/wip-59308-quincy
Adam King [Tue, 11 Apr 2023 21:09:35 +0000 (17:09 -0400)]
Merge pull request #50905 from adk3798/wip-59308-quincy

quincy: cephadm: using ip instead of short hostname for prometheus urls

Reviewed-by: Guillaume Abrioux <gabrioux@ibm.com>
2 years agoMerge pull request #50903 from adk3798/wip-59238-quincy
Adam King [Tue, 11 Apr 2023 21:08:45 +0000 (17:08 -0400)]
Merge pull request #50903 from adk3798/wip-59238-quincy

quincy: mgr/cephadm: increasing container stop timeout for OSDs

Reviewed-by: Redouane Kachach <rkachach@redhat.com>
2 years agoMerge pull request #50902 from adk3798/wip-59236-quincy
Adam King [Tue, 11 Apr 2023 21:07:51 +0000 (17:07 -0400)]
Merge pull request #50902 from adk3798/wip-59236-quincy

quincy: cephadm: mount host /etc/hosts for daemon containers in podman deployments

Reviewed-by: Guillaume Abrioux <gabrioux@ibm.com>
2 years agoMerge pull request #50901 from adk3798/wip-59235-quincy
Adam King [Tue, 11 Apr 2023 21:06:51 +0000 (17:06 -0400)]
Merge pull request #50901 from adk3798/wip-59235-quincy

quincy: mgr/cephadm: add more aggressive force flag for host maintenance enter

Reviewed-by: Guillaume Abrioux <gabrioux@ibm.com>
2 years agoMerge pull request #50900 from adk3798/wip-59234-quincy
Adam King [Tue, 11 Apr 2023 21:05:52 +0000 (17:05 -0400)]
Merge pull request #50900 from adk3798/wip-59234-quincy

quincy: mgr/cephadm: handle HostConnectionError when checking for valid addr

Reviewed-by: Redouane Kachach <rkachach@redhat.com>
2 years agoMerge pull request #50899 from adk3798/wip-59182-quincy
Adam King [Tue, 11 Apr 2023 21:04:41 +0000 (17:04 -0400)]
Merge pull request #50899 from adk3798/wip-59182-quincy

quincy: mgr/orchestrator: fix device size in `orch device ls` output

Reviewed-by: Guillaume Abrioux <gabrioux@ibm.com>
2 years agoMerge pull request #50898 from adk3798/wip-58997-quincy
Adam King [Tue, 11 Apr 2023 21:03:39 +0000 (17:03 -0400)]
Merge pull request #50898 from adk3798/wip-58997-quincy

quincy: mgr/cephadm: make upgrade respect use_repo_digest

Reviewed-by: Redouane Kachach <rkachach@redhat.com>
2 years agomgr/cephadm: add commands to set services to managed/unmanaged 50897/head
Adam King [Mon, 13 Feb 2023 20:01:59 +0000 (15:01 -0500)]
mgr/cephadm: add commands to set services to managed/unmanaged

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

Conflicts:
src/pybind/mgr/orchestrator/module.py

2 years agoMerge pull request #50891 from adk3798/wip-58995-quincy
Adam King [Tue, 11 Apr 2023 20:55:48 +0000 (16:55 -0400)]
Merge pull request #50891 from adk3798/wip-58995-quincy

quincy: mgr/orchestrator: allow deploying raw mode OSDs with --all-available-devices

Reviewed-by: Guillaume Abrioux <gabrioux@ibm.com>
2 years agoMerge pull request #50890 from adk3798/wip-58982-quincy
Adam King [Tue, 11 Apr 2023 20:37:20 +0000 (16:37 -0400)]
Merge pull request #50890 from adk3798/wip-58982-quincy

quincy: cephadm: set --ulimit nofiles with Docker

Reviewed-by: Guillaume Abrioux <gabrioux@ibm.com>
2 years agoMerge pull request #50889 from adk3798/wip-58536-quincy
Adam King [Tue, 11 Apr 2023 20:36:20 +0000 (16:36 -0400)]
Merge pull request #50889 from adk3798/wip-58536-quincy

quincy: orchestrator: improvements to the orch host ls command

Reviewed-by: Guillaume Abrioux <gabrioux@ibm.com>
2 years agoMerge pull request #50888 from adk3798/wip-58989-quincy
Adam King [Tue, 11 Apr 2023 20:35:05 +0000 (16:35 -0400)]
Merge pull request #50888 from adk3798/wip-58989-quincy

quincy: mgr/cephadm: be aware of host's shortname and FQDN

Reviewed-by: Redouane Kachach <rkachach@redhat.com>
2 years agoMerge pull request #50887 from adk3798/quincy-multisite-deployment
Adam King [Tue, 11 Apr 2023 20:33:10 +0000 (16:33 -0400)]
Merge pull request #50887 from adk3798/quincy-multisite-deployment

quincy: mgr/rgw: initial multisite deployment work

Reviewed-by: Redouane Kachach <rkachach@redhat.com>
2 years agoMerge pull request #50521 from trociny/wip-58987-quincy
Adam King [Tue, 11 Apr 2023 20:32:20 +0000 (16:32 -0400)]
Merge pull request #50521 from trociny/wip-58987-quincy

quincy: mgr/cephadm: don't add mgr into iscsi trusted_ip_list if it's already there

Reviewed-by: Adam King <adking@redhat.com>
2 years agomgr/dashboard: fix eviction of all FS clients 51011/head
Pere Diaz Bou [Wed, 5 Apr 2023 16:54:45 +0000 (18:54 +0200)]
mgr/dashboard: fix eviction of all FS clients

Signed-off-by: Pere Diaz Bou <pere-altea@hotmail.com>
(cherry picked from commit 780f49325aefd0b2c537462c6bb498232621ee8a)