stuff

main.go

@@ -135,7 +135,7 @@ func (s *PoolServer) Serve() *http.ServeMux {
 	return mux
 }
 
-var clientName = os.Getenv("POD_IP")
+var podIp = os.Getenv("POD_IP")
 var name = os.Getenv("POD_NAME")
 
 func main() {
@@ -151,7 +151,7 @@ func main() {
 
 	var config *rest.Config
 	var kerr error
-	if clientName == "" {
+	if podIp == "" {
 		config, kerr = clientcmd.BuildConfigFromFlags("", "/Users/mats/.kube/config")
 	} else {
 		config, kerr = rest.InClusterConfig()
@@ -165,7 +165,7 @@ func main() {
 	}
 	d := NewK8sDiscovery(client)
 
-	syncedPool, err := NewSyncedPool(app.pool, clientName, d)
+	syncedPool, err := NewSyncedPool(app.pool, podIp, d)
 	if err != nil {
 		log.Fatalf("Error creating synced pool: %v\n", err)
 	}

synced-pool.go

@@ -373,13 +373,13 @@ func (r *RemoteHost) ConfirmChange(id CartId, host string) error {
 	return nil
 }
 
-func (p *SyncedPool) OwnerChanged(id CartId, host string) error {
+func (p *SyncedPool) RequestOwnership(id CartId) error {
 	for _, r := range p.remotes {
-		log.Printf("Confirming change of %s to %s with %s\n", id, host, r.Host)
-		err := r.ConfirmChange(id, host)
+		log.Printf("Confirming change of %s to %s (me) with %s\n", id, p.Hostname, r.Host)
+		err := r.ConfirmChange(id, p.Hostname)
 
 		if err != nil {
-			log.Printf("Error confirming change: %v from %s\n", err, host)
+			log.Printf("Error confirming change: %v from %s\n", err, p.Hostname)
 			return err
 		}
 	}
@@ -477,7 +477,7 @@ func (p *SyncedPool) getGrainPool(id CartId) (GrainPool, error) {
 			remoteLookupCount.Inc()
 			return remotePool, nil
 		}
-		err := p.OwnerChanged(id, p.Hostname)
+		err := p.RequestOwnership(id)
 		if err != nil {
 			return nil, err
 		}