mongo: check all addresses when deciding if machine is master

The recent fix for LP #1397376 meant that on MAAS the replicaset master address no longer matches the address returned by SelectPeerAddress - no state server thought it was the master. This breaks upgrades among other things. All machine addresses are no compared against the replicaset master address. Fixes LP #1403200.
zhatin · Dec 17, 2014 · f22f2f0 · f22f2f0
1 parent 1a4e1a0
commit f22f2f0
Showing 1 changed file with 6 additions and 3 deletions.
diff --git a/mongo/mongo.go b/mongo/mongo.go
@@ -94,7 +94,6 @@ func IsMaster(session *mgo.Session, obj WithAddresses) (bool, error) {
 	if err == replicaset.ErrMasterNotConfigured {
 		return true, nil
 	}
-
 	if err != nil {
 		return false, err
 	}
@@ -104,8 +103,12 @@ func IsMaster(session *mgo.Session, obj WithAddresses) (bool, error) {
 		return false, err
 	}
 
-	machinePeerAddr := SelectPeerAddress(addrs)
-	return machinePeerAddr == masterAddr, nil
+	for _, addr := range addrs {
+		if addr.Value == masterAddr {
+			return true, nil
+		}
+	}
+	return false, nil
 }
 
 // SelectPeerAddress returns the address to use as the