From 59c1abe9b9d5ee4e5ad68c2defdfd1fc4da4f012 Mon Sep 17 00:00:00 2001 From: Murali Reddy Date: Thu, 4 Oct 2018 14:08:56 +0530 Subject: [PATCH] addressing review comments --- prog/kube-utils/main.go | 10 +++------- prog/kube-utils/peerlist.go | 2 +- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/prog/kube-utils/main.go b/prog/kube-utils/main.go index 054b3991..5926394d 100644 --- a/prog/kube-utils/main.go +++ b/prog/kube-utils/main.go @@ -140,14 +140,10 @@ func reclaimPeer(weave weaveClient, cml *configMapAnnotations, storedPeerList *p } else { // handle an edge case where peer claimed to own the action to reclaim but no longer // exists hence lock persists foever - peerExists := false - for _, peer := range storedPeerList.Peers { - if existingAnnotation == peer.PeerName { - peerExists = true - break - } + if !storedPeerList.contains(existingAnnotation) { + nonExistentPeer = true + common.Log.Debugln("[kube-peers] Existing annotation", existingAnnotation, " has a non-existent peer so owning the reclaim action") } - nonExistentPeer = !peerExists } } if !found || nonExistentPeer { diff --git a/prog/kube-utils/peerlist.go b/prog/kube-utils/peerlist.go index 2573d5a5..f034b230 100644 --- a/prog/kube-utils/peerlist.go +++ b/prog/kube-utils/peerlist.go @@ -26,7 +26,7 @@ type peerInfo struct { NodeName string // Kubernetes node name } -func (pl peerList) contains(peerName string) bool { +func (pl *peerList) contains(peerName string) bool { for _, peer := range pl.Peers { if peer.PeerName == peerName { return true