more refactoring

2025-10-10 13:22:36 +00:00
parent c30be581cd
commit 159253b8b0
13 changed files with 1475 additions and 295 deletions
--- a/proto/control_plane.pb.go
+++ b/proto/control_plane.pb.go
@@ -420,13 +420,12 @@ const file_control_plane_proto_rawDesc = "" +
 	"\baccepted\x18\x01 \x01(\bR\baccepted\x12\x18\n" +
 	"\amessage\x18\x02 \x01(\tR\amessage\"#\n" +
 	"\rClosingNotice\x12\x12\n" +
-	"\x04host\x18\x01 \x01(\tR\x04host2\xbc\x02\n" +
+	"\x04host\x18\x01 \x01(\tR\x04host2\xf4\x01\n" +
 	"\fControlPlane\x12,\n" +
 	"\x04Ping\x12\x0f.messages.Empty\x1a\x13.messages.PingReply\x12A\n" +
 	"\tNegotiate\x12\x1a.messages.NegotiateRequest\x1a\x18.messages.NegotiateReply\x125\n" +
 	"\n" +
-	"GetCartIds\x12\x0f.messages.Empty\x1a\x16.messages.CartIdsReply\x12F\n" +
-	"\fConfirmOwner\x12\x1c.messages.OwnerChangeRequest\x1a\x18.messages.OwnerChangeAck\x12<\n" +
+	"GetCartIds\x12\x0f.messages.Empty\x1a\x16.messages.CartIdsReply\x12<\n" +
 	"\aClosing\x12\x17.messages.ClosingNotice\x1a\x18.messages.OwnerChangeAckB.Z,git.tornberg.me/go-cart-actor/proto;messagesb\x06proto3"

 var (
@@ -456,15 +455,13 @@ var file_control_plane_proto_depIdxs = []int32{
 	0, // 0: messages.ControlPlane.Ping:input_type -> messages.Empty
 	2, // 1: messages.ControlPlane.Negotiate:input_type -> messages.NegotiateRequest
 	0, // 2: messages.ControlPlane.GetCartIds:input_type -> messages.Empty
-	5, // 3: messages.ControlPlane.ConfirmOwner:input_type -> messages.OwnerChangeRequest
-	7, // 4: messages.ControlPlane.Closing:input_type -> messages.ClosingNotice
-	1, // 5: messages.ControlPlane.Ping:output_type -> messages.PingReply
-	3, // 6: messages.ControlPlane.Negotiate:output_type -> messages.NegotiateReply
-	4, // 7: messages.ControlPlane.GetCartIds:output_type -> messages.CartIdsReply
-	6, // 8: messages.ControlPlane.ConfirmOwner:output_type -> messages.OwnerChangeAck
-	6, // 9: messages.ControlPlane.Closing:output_type -> messages.OwnerChangeAck
-	5, // [5:10] is the sub-list for method output_type
-	0, // [0:5] is the sub-list for method input_type
+	7, // 3: messages.ControlPlane.Closing:input_type -> messages.ClosingNotice
+	1, // 4: messages.ControlPlane.Ping:output_type -> messages.PingReply
+	3, // 5: messages.ControlPlane.Negotiate:output_type -> messages.NegotiateReply
+	4, // 6: messages.ControlPlane.GetCartIds:output_type -> messages.CartIdsReply
+	6, // 7: messages.ControlPlane.Closing:output_type -> messages.OwnerChangeAck
+	4, // [4:8] is the sub-list for method output_type
+	0, // [0:4] is the sub-list for method input_type
 	0, // [0:0] is the sub-list for extension type_name
 	0, // [0:0] is the sub-list for extension extendee
 	0, // [0:0] is the sub-list for field type_name
--- a/proto/control_plane.proto
+++ b/proto/control_plane.proto
@@ -11,7 +11,7 @@ option go_package = "git.tornberg.me/go-cart-actor/proto;messages";
 // Responsibilities:
 //   - Liveness (Ping)
 //   - Membership negotiation (Negotiate)
-//   - Cart ownership change propagation (ConfirmOwner)
+//   - Deterministic ring-based ownership (ConfirmOwner RPC removed)
 //   - Cart ID listing for remote grain spawning (GetCartIds)
 //   - Graceful shutdown notifications (Closing)
 // No authentication / TLS is defined initially (can be added later).
@@ -41,13 +41,7 @@ message CartIdsReply {
  repeated string cart_ids = 1;
 }

-// OwnerChangeRequest notifies peers that ownership of a cart moved (or is moving) to new_host.
-message OwnerChangeRequest {
-  string cart_id = 1;
-  string new_host = 2;
-}
-
-// OwnerChangeAck indicates acceptance or rejection of an ownership change.
+// OwnerChangeAck retained as response type for Closing RPC (ConfirmOwner removed).
 message OwnerChangeAck {
  bool accepted = 1;
  string message = 2;
@@ -69,8 +63,7 @@ service ControlPlane {
  // GetCartIds lists currently owned cart IDs on this node.
  rpc GetCartIds(Empty) returns (CartIdsReply);

-  // ConfirmOwner announces/asks peers to acknowledge ownership transfer.
-  rpc ConfirmOwner(OwnerChangeRequest) returns (OwnerChangeAck);
+  // ConfirmOwner RPC removed (was legacy ownership acknowledgement; ring-based ownership now authoritative)

  // Closing announces graceful shutdown so peers can proactively adjust.
  rpc Closing(ClosingNotice) returns (OwnerChangeAck);
--- a/proto/control_plane_grpc.pb.go
+++ b/proto/control_plane_grpc.pb.go
@@ -19,11 +19,10 @@ import (
 const _ = grpc.SupportPackageIsVersion9

 const (
-	ControlPlane_Ping_FullMethodName         = "/messages.ControlPlane/Ping"
-	ControlPlane_Negotiate_FullMethodName    = "/messages.ControlPlane/Negotiate"
-	ControlPlane_GetCartIds_FullMethodName   = "/messages.ControlPlane/GetCartIds"
-	ControlPlane_ConfirmOwner_FullMethodName = "/messages.ControlPlane/ConfirmOwner"
-	ControlPlane_Closing_FullMethodName      = "/messages.ControlPlane/Closing"
+	ControlPlane_Ping_FullMethodName       = "/messages.ControlPlane/Ping"
+	ControlPlane_Negotiate_FullMethodName  = "/messages.ControlPlane/Negotiate"
+	ControlPlane_GetCartIds_FullMethodName = "/messages.ControlPlane/GetCartIds"
+	ControlPlane_Closing_FullMethodName    = "/messages.ControlPlane/Closing"
 )

 // ControlPlaneClient is the client API for ControlPlane service.
@@ -38,8 +37,6 @@ type ControlPlaneClient interface {
 	Negotiate(ctx context.Context, in *NegotiateRequest, opts ...grpc.CallOption) (*NegotiateReply, error)
 	// GetCartIds lists currently owned cart IDs on this node.
 	GetCartIds(ctx context.Context, in *Empty, opts ...grpc.CallOption) (*CartIdsReply, error)
-	// ConfirmOwner announces/asks peers to acknowledge ownership transfer.
-	ConfirmOwner(ctx context.Context, in *OwnerChangeRequest, opts ...grpc.CallOption) (*OwnerChangeAck, error)
 	// Closing announces graceful shutdown so peers can proactively adjust.
 	Closing(ctx context.Context, in *ClosingNotice, opts ...grpc.CallOption) (*OwnerChangeAck, error)
 }
@@ -82,16 +79,6 @@ func (c *controlPlaneClient) GetCartIds(ctx context.Context, in *Empty, opts ...
 	return out, nil
 }

-func (c *controlPlaneClient) ConfirmOwner(ctx context.Context, in *OwnerChangeRequest, opts ...grpc.CallOption) (*OwnerChangeAck, error) {
-	cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...)
-	out := new(OwnerChangeAck)
-	err := c.cc.Invoke(ctx, ControlPlane_ConfirmOwner_FullMethodName, in, out, cOpts...)
-	if err != nil {
-		return nil, err
-	}
-	return out, nil
-}
-
 func (c *controlPlaneClient) Closing(ctx context.Context, in *ClosingNotice, opts ...grpc.CallOption) (*OwnerChangeAck, error) {
 	cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...)
 	out := new(OwnerChangeAck)
@@ -114,8 +101,6 @@ type ControlPlaneServer interface {
 	Negotiate(context.Context, *NegotiateRequest) (*NegotiateReply, error)
 	// GetCartIds lists currently owned cart IDs on this node.
 	GetCartIds(context.Context, *Empty) (*CartIdsReply, error)
-	// ConfirmOwner announces/asks peers to acknowledge ownership transfer.
-	ConfirmOwner(context.Context, *OwnerChangeRequest) (*OwnerChangeAck, error)
 	// Closing announces graceful shutdown so peers can proactively adjust.
 	Closing(context.Context, *ClosingNotice) (*OwnerChangeAck, error)
 	mustEmbedUnimplementedControlPlaneServer()
@@ -137,9 +122,6 @@ func (UnimplementedControlPlaneServer) Negotiate(context.Context, *NegotiateRequ
 func (UnimplementedControlPlaneServer) GetCartIds(context.Context, *Empty) (*CartIdsReply, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method GetCartIds not implemented")
 }
-func (UnimplementedControlPlaneServer) ConfirmOwner(context.Context, *OwnerChangeRequest) (*OwnerChangeAck, error) {
-	return nil, status.Errorf(codes.Unimplemented, "method ConfirmOwner not implemented")
-}
 func (UnimplementedControlPlaneServer) Closing(context.Context, *ClosingNotice) (*OwnerChangeAck, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method Closing not implemented")
 }
@@ -218,24 +200,6 @@ func _ControlPlane_GetCartIds_Handler(srv interface{}, ctx context.Context, dec
 	return interceptor(ctx, in, info, handler)
 }

-func _ControlPlane_ConfirmOwner_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(OwnerChangeRequest)
-	if err := dec(in); err != nil {
-		return nil, err
-	}
-	if interceptor == nil {
-		return srv.(ControlPlaneServer).ConfirmOwner(ctx, in)
-	}
-	info := &grpc.UnaryServerInfo{
-		Server:     srv,
-		FullMethod: ControlPlane_ConfirmOwner_FullMethodName,
-	}
-	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(ControlPlaneServer).ConfirmOwner(ctx, req.(*OwnerChangeRequest))
-	}
-	return interceptor(ctx, in, info, handler)
-}
-
 func _ControlPlane_Closing_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
 	in := new(ClosingNotice)
 	if err := dec(in); err != nil {
@@ -273,10 +237,6 @@ var ControlPlane_ServiceDesc = grpc.ServiceDesc{
 			MethodName: "GetCartIds",
 			Handler:    _ControlPlane_GetCartIds_Handler,
 		},
-		{
-			MethodName: "ConfirmOwner",
-			Handler:    _ControlPlane_ConfirmOwner_Handler,
-		},
 		{
 			MethodName: "Closing",
 			Handler:    _ControlPlane_Closing_Handler,