From c9280090bfe6d6ef3598cbdd9d51c7277f7ddb31 Mon Sep 17 00:00:00 2001
From: matst80 <mats.tornberg@gmail.com>
Date: Sat, 9 Nov 2024 22:34:31 +0100
Subject: [PATCH] better node removal

---
 .gitignore     |  5 ++++-
 packet.go      |  4 ++++
 synced-pool.go | 29 +++++++++++++++++++++++++----
 3 files changed, 33 insertions(+), 5 deletions(-)

diff --git a/.gitignore b/.gitignore
index 8fcbb00..3c6764d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,4 @@
-__debug*
\ No newline at end of file
+__debug*
+go-cart-actor
+data/*.prot
+data/*.go*
\ No newline at end of file
diff --git a/packet.go b/packet.go
index bdac0d7..49e3921 100644
--- a/packet.go
+++ b/packet.go
@@ -3,6 +3,7 @@ package main
 import (
 	"encoding/binary"
 	"encoding/json"
+	"fmt"
 	"io"
 )
 
@@ -30,6 +31,9 @@ func SendCartPacket(conn io.Writer, id CartId, messageType uint16, datafn func(w
 	if err != nil {
 		return err
 	}
+	if conn == nil {
+		return fmt.Errorf("no connection to send to")
+	}
 	binary.Write(conn, binary.LittleEndian, CartPacket{
 		Version:     2,
 		MessageType: messageType,
diff --git a/synced-pool.go b/synced-pool.go
index 5faefb3..282393d 100644
--- a/synced-pool.go
+++ b/synced-pool.go
@@ -56,16 +56,15 @@ func NewSyncedPool(local *GrainLocalPool, hostname string, d Discovery) (*Synced
 	go func(pingTimer *time.Ticker) {
 		for {
 			<-pingTimer.C
-			log.Printf("Pinging remotes %d\n", len(pool.remotes))
-			for i, r := range pool.remotes {
+			for _, r := range pool.remotes {
 				err := DoPing(r)
 				if err != nil {
 					r.MissedPings++
 					log.Printf("Error pinging remote %s: %v\n, missed pings: %d", r.Host, err, r.MissedPings)
 					if r.MissedPings > 3 {
 						log.Printf("Removing remote %s\n", r.Host)
-
-						pool.remotes = append(pool.remotes[:i], pool.remotes[i+1:]...)
+						go pool.RemoveHost(r)
+						//pool.remotes = append(pool.remotes[:i], pool.remotes[i+1:]...)
 
 					}
 				} else {
@@ -133,6 +132,28 @@ func NewSyncedPool(local *GrainLocalPool, hostname string, d Discovery) (*Synced
 	return pool, nil
 }
 
+func (p *SyncedPool) RemoveHost(host *RemoteHost) {
+
+	for i, r := range p.remotes {
+		if r == host {
+			p.RemoveHostMappedCarts(r)
+			p.remotes = append(p.remotes[:i], p.remotes[i+1:]...)
+			connectedRemotes.Set(float64(len(p.remotes)))
+			return
+		}
+	}
+}
+
+func (p *SyncedPool) RemoveHostMappedCarts(host *RemoteHost) {
+	p.mu.Lock()
+	defer p.mu.Unlock()
+	for id, r := range p.remoteIndex {
+		if r == host.Pool {
+			delete(p.remoteIndex, id)
+		}
+	}
+}
+
 var (
 	negotiationCount = promauto.NewCounter(prometheus.CounterOpts{
 		Name: "cart_remote_negotiation_total",