From 0459a20173028abb908fc0926f1eb4e5ad435d97 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Han?= Date: Tue, 18 May 2021 19:36:53 +0200 Subject: [PATCH] ceph: stop using the namespace in the site's name MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Removing the site's name helps us reducing the size of the rbd-mirror socket path which under certain circumstances could exceed the system limit. Also, the namespace information is not that relevant, the cluster FSID is. Signed-off-by: Sébastien Han --- pkg/daemon/ceph/client/mirror.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkg/daemon/ceph/client/mirror.go b/pkg/daemon/ceph/client/mirror.go index f4c3f5db0..f1d400221 100644 --- a/pkg/daemon/ceph/client/mirror.go +++ b/pkg/daemon/ceph/client/mirror.go @@ -67,7 +67,7 @@ func CreateRBDMirrorBootstrapPeer(context *clusterd.Context, clusterInfo *Cluste logger.Infof("create rbd-mirror bootstrap peer token for pool %q", poolName) // Build command - args := []string{"mirror", "pool", "peer", "bootstrap", "create", poolName, "--site-name", fmt.Sprintf("%s-%s", clusterInfo.FSID, clusterInfo.Namespace)} + args := []string{"mirror", "pool", "peer", "bootstrap", "create", poolName, "--site-name", clusterInfo.FSID} cmd := NewRBDCommand(context, clusterInfo, args) // Run command @@ -76,6 +76,7 @@ func CreateRBDMirrorBootstrapPeer(context *clusterd.Context, clusterInfo *Cluste return nil, errors.Wrapf(err, "failed to create rbd-mirror peer token for pool %q. %s", poolName, output) } + logger.Infof("successfully created rbd-mirror bootstrap peer token for pool %q", poolName) return output, nil }