Skip to content

Commit

Permalink
rbd-mirror: use a sorted list for peer token content
Browse files Browse the repository at this point in the history
The monitor list was not sorted, so each time we were reconciling, the
peer secret token will see its content updated with randomized
monitors. This would enter our predicate and trigger a reconcile.
Potentially an endless one, if the randomized list is already different.

Closes: #9076
Signed-off-by: Sébastien Han <seb@redhat.com>
(cherry picked from commit 8cb6cdc)
  • Loading branch information
leseb authored and mergify-bot committed Nov 3, 2021
1 parent 3016b00 commit a0eed53
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion pkg/daemon/ceph/client/mirror.go
Expand Up @@ -371,7 +371,7 @@ func CreateRBDMirrorBootstrapPeerWithoutPool(context *clusterd.Context, clusterI
ClusterFSID: clusterInfo.FSID,
ClientID: rbdMirrorPeerKeyringID,
Key: key,
MonHost: strings.Join(mons.UnsortedList(), ","),
MonHost: strings.Join(mons.List(), ","),
Namespace: clusterInfo.Namespace,
}

Expand Down

0 comments on commit a0eed53

Please sign in to comment.