run on x86 for a while

synced-pool.go

@@ -143,7 +143,7 @@ func (p *SyncedPool) SpawnRemoteGrain(id CartId, host string) {
 		return
 	}
 	go func() {
-		<-remote.Died
+		<-remote.PersistentConnection.Died
 		p.RemoveRemoteGrain(id)
 		p.HandleHostError(host)
 		log.Printf("Remote grain %s died, host: %s\n", id.String(), host)
@@ -371,7 +371,7 @@ func (p *SyncedPool) AddRemote(host string) error {
 	}
 	p.remotes[host] = &remote
 	go func() {
-		<-remote.Died
+		<-remote.PersistentConnection.Died
 		log.Printf("Removing host, remote died %s", host)
 		p.RemoveHost(&remote)
 	}()
@@ -381,12 +381,12 @@ func (p *SyncedPool) AddRemote(host string) error {
 
 			for err != nil {
 				time.Sleep(time.Millisecond * 200)
-				err = remote.Ping()
 				if !remote.IsHealthy() {
 					log.Printf("Removing host, unable to communicate with %s", host)
 					p.RemoveHost(&remote)
-					break
+					return
 				}
+				err = remote.Ping()
 			}
 		}
 	}()