gian/ceph-mirror
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2026-08-02 07:03:18 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge pull request #65309 from joscollin/wip-72683-peer-add-deprecate

Browse Source 
cephfs_mirror: deprecate peer_add command

Reviewed-by: Venky Shankar <vshankar@redhat.com>
Reviewed-by: Anthony D'Atri <anthony.datri@gmail.com>
This commit is contained in:
Jos Collin 2025-09-26 20:23:41 +05:30 committed by GitHub
commit 4c9887dfba
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
PendingReleaseNotes
View File

@ -8,6 +8,7 @@
* DASHBOARD: Removed the older landing page which was deprecated in Quincy.
Admins can no longer enable the older, deprecated landing page layout by
adjusting FEATURE_TOGGLE_DASHBOARD.
* CephFS: The `peer_add` command is deprecated in favor of the `peer_bootstrap` command.
>=20.0.0

2
doc/cephfs/cephfs-mirroring.rst
View File

@ -173,6 +173,8 @@ and the user key. However, bootstrapping a peer is the recommended way to add a
peer.
.. note:: Only a single peer is currently supported.
The ``peer_add`` command is deprecated and will be removed in a future release.
Use the ``peer_bootstrap`` command instead.
To remove a peer, run a command of the following form:

2
doc/dev/cephfs-mirroring.rst
View File

@ -170,6 +170,8 @@ cluster's monitor address and user key. However, bootstrapping a peer is the
recommended way to add a peer.
.. note:: Only a single peer is supported right now.
The ``peer_add`` command is deprecated and will be removed in a future release.
Use the ``peer_bootstrap`` command instead.
To remove a peer, run a command of the following form:

8
src/pybind/mgr/mirroring/module.py
View File

@ -39,8 +39,12 @@ class Module(MgrModule):
if remote_mon_host and cephx_key:
conf['mon_host'] = remote_mon_host
conf['key'] = cephx_key
return self.fs_snapshot_mirror.peer_add(fs_name, remote_cluster_spec,
remote_fs_name, remote_conf=conf)
r, out, err = self.fs_snapshot_mirror.peer_add(fs_name, remote_cluster_spec,
remote_fs_name, remote_conf=conf)
out = (f"{out}\n"
"Warning: The 'peer_add' command is deprecated and will be removed in a "
"future release. Use 'peer_bootstrap' instead.\n")
return r, out, err
@CLIReadCommand('fs snapshot mirror peer_list')
def snapshot_mirror_peer_list(self,