some cleanup and annonce expiry

grpc_server.go

@@ -17,21 +17,19 @@ import (
 type cartActorGRPCServer struct {
 	messages.UnimplementedControlPlaneServer
 
-	//pool       GrainPool   // For cart state mutations and queries
-	syncedPool *SyncedPool // For cluster membership and control
+	pool *CartPool
 }
 
 // NewCartActorGRPCServer creates and initializes the server.
-func NewCartActorGRPCServer(syncedPool *SyncedPool) *cartActorGRPCServer {
+func NewCartActorGRPCServer(pool *CartPool) *cartActorGRPCServer {
 	return &cartActorGRPCServer{
-		//pool:       pool,
-		syncedPool: syncedPool,
+		pool: pool,
 	}
 }
 
 func (s *cartActorGRPCServer) AnnounceOwnership(ctx context.Context, req *messages.OwnershipAnnounce) (*messages.OwnerChangeAck, error) {
 	for _, cartId := range req.CartIds {
-		s.syncedPool.removeLocalGrain(CartId(cartId))
+		s.pool.removeLocalGrain(CartId(cartId))
 	}
 	log.Printf("Ack count: %d", len(req.CartIds))
 	return &messages.OwnerChangeAck{
@@ -40,13 +38,21 @@ func (s *cartActorGRPCServer) AnnounceOwnership(ctx context.Context, req *messag
 	}, nil
 }
 
+func (s *cartActorGRPCServer) AnnounceExpiry(ctx context.Context, req *messages.ExpiryAnnounce) (*messages.OwnerChangeAck, error) {
+	s.pool.HandleRemoteExpiry(req.GetHost(), req.GetCartIds())
+	return &messages.OwnerChangeAck{
+		Accepted: true,
+		Message:  "expiry acknowledged",
+	}, nil
+}
+
 // ControlPlane: Ping
 func (s *cartActorGRPCServer) Ping(ctx context.Context, _ *messages.Empty) (*messages.PingReply, error) {
 	// Expose cart owner cookie (first-touch owner = this host) for HTTP gateways translating gRPC metadata.
 	// Gateways that propagate Set-Cookie can help establish sticky sessions at the edge.
 	//_ = grpc.SendHeader(ctx, metadata.Pairs("set-cookie", fmt.Sprintf("cartowner=%s; Path=/; HttpOnly", s.syncedPool.Hostname())))
 	return &messages.PingReply{
-		Host:     s.syncedPool.Hostname(),
+		Host:     s.pool.Hostname(),
 		UnixTime: time.Now().Unix(),
 	}, nil
 }
@@ -61,13 +67,11 @@ func (s *cartActorGRPCServer) Negotiate(ctx context.Context, req *messages.Negot
 		}
 	}
 	// This host
-	hostSet[s.syncedPool.Hostname()] = struct{}{}
+	hostSet[s.pool.Hostname()] = struct{}{}
 	// Known remotes
-	s.syncedPool.mu.RLock()
-	for h := range s.syncedPool.remoteHosts {
+	for _, h := range s.pool.RemoteHostNames() {
 		hostSet[h] = struct{}{}
 	}
-	s.syncedPool.mu.RUnlock()
 
 	out := make([]string, 0, len(hostSet))
 	for h := range hostSet {
@@ -78,22 +82,13 @@ func (s *cartActorGRPCServer) Negotiate(ctx context.Context, req *messages.Negot
 
 // ControlPlane: GetCartIds (locally owned carts only)
 func (s *cartActorGRPCServer) GetCartIds(ctx context.Context, _ *messages.Empty) (*messages.CartIdsReply, error) {
-	s.syncedPool.local.mu.RLock()
-	ids := make([]uint64, 0, len(s.syncedPool.local.grains))
-	for _, g := range s.syncedPool.local.grains {
-		if g == nil {
-			continue
-		}
-		ids = append(ids, uint64(g.GetId()))
-	}
-	s.syncedPool.local.mu.RUnlock()
-	return &messages.CartIdsReply{CartIds: ids}, nil
+	return &messages.CartIdsReply{CartIds: s.pool.LocalCartIDs()}, nil
 }
 
 // ControlPlane: Closing (peer shutdown notification)
 func (s *cartActorGRPCServer) Closing(ctx context.Context, req *messages.ClosingNotice) (*messages.OwnerChangeAck, error) {
 	if req.GetHost() != "" {
-		s.syncedPool.RemoveHost(req.GetHost())
+		s.pool.RemoveHost(req.GetHost())
 	}
 	return &messages.OwnerChangeAck{
 		Accepted: true,
@@ -103,14 +98,14 @@ func (s *cartActorGRPCServer) Closing(ctx context.Context, req *messages.Closing
 
 // StartGRPCServer configures and starts the unified gRPC server on the given address.
 // It registers both the CartActor and ControlPlane services.
-func StartGRPCServer(addr string, syncedPool *SyncedPool) (*grpc.Server, error) {
+func StartGRPCServer(addr string, pool *CartPool) (*grpc.Server, error) {
 	lis, err := net.Listen("tcp", addr)
 	if err != nil {
 		return nil, fmt.Errorf("failed to listen: %w", err)
 	}
 
 	grpcServer := grpc.NewServer()
-	server := NewCartActorGRPCServer(syncedPool)
+	server := NewCartActorGRPCServer(pool)
 
 	messages.RegisterControlPlaneServer(grpcServer, server)
 	reflection.Register(grpcServer)