Skip to content

Commit

Permalink
Fix issue with the hash generation for MirrorPeer
Browse files Browse the repository at this point in the history
There are two separate methods to generate hashes based on whether
RDR is done for provider mode or internal mode

The one for internal mode is being reverted in this commit as the
it was causing issues with upgrades

Signed-off-by: vbadrina <[email protected]>
  • Loading branch information
vbnrh authored and openshift-cherrypick-robot committed Dec 9, 2024
1 parent 3598290 commit d433113
Showing 1 changed file with 9 additions and 9 deletions.
18 changes: 9 additions & 9 deletions controllers/utils/hash.go
Original file line number Diff line number Diff line change
Expand Up @@ -61,23 +61,23 @@ func CreateUniqueReplicationId(clusterFSIDs map[string]string) (string, error) {
}

func GenerateUniqueIdForMirrorPeer(mirrorPeer multiclusterv1alpha1.MirrorPeer, hasStorageClientRef bool) string {
var peerAccumulator []string

var checksum [20]byte
if hasStorageClientRef {
var peerAccumulator []string
for _, peer := range mirrorPeer.Spec.Items {
peerAccumulator = append(peerAccumulator, GetKey(peer.ClusterName, peer.StorageClusterRef.Name))
}
sort.Strings(peerAccumulator)
checksum = sha1.Sum([]byte(strings.Join(peerAccumulator, "-")))
} else {
var peerAccumulator string
for _, peer := range mirrorPeer.Spec.Items {
peerAccumulator = append(peerAccumulator, peer.ClusterName)
peerAccumulator += peer.ClusterName
}

checksum = sha1.Sum([]byte(peerAccumulator))
}

sort.Strings(peerAccumulator)

checksum := sha1.Sum([]byte(strings.Join(peerAccumulator, "-")))
return hex.EncodeToString(checksum[:])
// truncate to bucketGenerateName + "-" + first 12 (out of 20) byte representations of sha1 checksum
return hex.EncodeToString(checksum[:])[0 : len(BucketGenerateName)+1+12]
}

func GetKey(clusterName, clientName string) string {
Expand Down

0 comments on commit d433113

Please sign in to comment.