expose match information

api/v1alpha1/api.proto

@@ -39,12 +39,18 @@ enum TicketStatus {
     NO_PLAYABLE_FLAVOR_VERSION = 2;
 }
 
+message Match {
+    string id = 1;
+    uint32 player_count = 2;
+}
+
 message Ticket {
     string id = 1;
     string flavor_id = 2;
     uint32 player_count = 3;
     TicketStatus status = 4;
     Assignment assignment = 5;
+    Match match = 6;
 }
 
 message Assignment {

cmd/server/main.go

@@ -35,6 +35,7 @@ func main() {
 		ctx, cancel = context.WithCancel(context.Background())
 		logger      = slog.New(slog.NewJSONHandler(os.Stdout, nil))
 		tickets     = matchmaking.NewStore[matchmaking.Ticket]()
+		matches     = matchmaking.NewStore[matchmaking.Match]()
 	)
 
 	viper.SetEnvPrefix("MM")
@@ -46,14 +47,15 @@ func main() {
 	viper.SetDefault("match_interval", "1s")
 	viper.SetDefault("allocate_instance_for_pending_match_after", "15s")
 	viper.SetDefault("remove_inactive_tickets_after", "1m")
+	viper.SetDefault("remove_deployed_matches_after", "2m")
 
 	var cfg server.Config
 	if err := viper.Unmarshal(&cfg); err != nil {
 		logger.ErrorContext(ctx, "unable to decode config", "err", err)
 		os.Exit(1)
 	}
 
-	serv := server.New(logger, cfg, tickets)
+	serv := server.New(logger, cfg, tickets, matches)
 
 	go func() {
 		c := make(chan os.Signal, 1)

internal/matchmaking/matchmaker.go

@@ -50,6 +50,7 @@ type FlavorMatchMaker struct {
 
 	allocInstanceForPendingMatchAfter time.Duration
 	removeInactiveTicketsAfter        time.Duration
+	removeDeployedMatchesAfter        time.Duration
 
 	chunkClient chunkv1alpha1.ChunkServiceClient
 	insClient   instancev1alpha1.InstanceServiceClient
@@ -60,7 +61,9 @@ func NewFlavorMatchMaker(
 	matchEvalInterval time.Duration,
 	allocInstanceForPendingMatchAfter time.Duration,
 	removeInactiveTicketsAfter time.Duration,
+	removeDeployedMatchesAfter time.Duration,
 	tickets *Store[Ticket],
+	matches *Store[Match],
 	chunkClient chunkv1alpha1.ChunkServiceClient,
 	insClient instancev1alpha1.InstanceServiceClient,
 ) *FlavorMatchMaker {
@@ -69,10 +72,11 @@ func NewFlavorMatchMaker(
 		ticker:                            time.NewTicker(matchEvalInterval),
 		tickets:                           tickets,
 		ticketPools:                       make(map[string]TicketPool),
-		matches:                           NewStore[Match](),
+		matches:                           matches,
 		pendingMatches:                    make(map[string][]string),
 		allocInstanceForPendingMatchAfter: allocInstanceForPendingMatchAfter,
 		removeInactiveTicketsAfter:        removeInactiveTicketsAfter,
+		removeDeployedMatchesAfter:        removeDeployedMatchesAfter,
 		chunkClient:                       chunkClient,
 		insClient:                         insClient,
 	}
@@ -157,9 +161,9 @@ func (m FlavorMatchMaker) generateMatches(flavorID string, version *chunkv1alpha
 			matched    = pool.FindTickets(maxPlayers - match.PlayerCount())
 		)
 
-		for _, t := range matched {
-			t.MatchID = &match.ID
-			m.tickets.Update(t)
+		for i := range matched {
+			matched[i].MatchID = &match.ID
+			m.tickets.Update(matched[i])
 		}
 
 		pool.RemoveAll(matched)
@@ -209,9 +213,9 @@ func (m FlavorMatchMaker) generateMatches(flavorID string, version *chunkv1alpha
 		match.Full = true
 	}
 
-	for _, t := range match.Tickets {
-		t.MatchID = &match.ID
-		m.tickets.Update(t)
+	for i := range match.Tickets {
+		match.Tickets[i].MatchID = &match.ID
+		m.tickets.Update(match.Tickets[i])
 	}
 
 	m.matches.Add(match)
@@ -228,6 +232,12 @@ func (m FlavorMatchMaker) checkAndDeployMatches(ctx context.Context) {
 
 		logger.Info("found match")
 
+		if time.Now().After(match.CreatedAt.Add(m.removeDeployedMatchesAfter)) {
+			logger.InfoContext(ctx, "removing deployed match")
+			m.matches.Delete(match.ID)
+			continue
+		}
+
 		var (
 			invalidated []Ticket
 			valid       []Ticket
@@ -267,7 +277,7 @@ func (m FlavorMatchMaker) checkAndDeployMatches(ctx context.Context) {
 			continue
 		}
 
-		if time.Now().After(match.CreatedAt.Add(m.allocInstanceForPendingMatchAfter)) {
+		if time.Now().After(match.CreatedAt.Add(m.allocInstanceForPendingMatchAfter)) && match.InstanceAllocatedAt == nil {
 			m.logger.Info("pending match created")
 			if err := m.AllocateInstanceAndAssign(ctx, match); err != nil {
 				logger.ErrorContext(ctx, "failed to allocate instance", "err", err)
@@ -308,7 +318,8 @@ func (m FlavorMatchMaker) AllocateInstanceAndAssign(ctx context.Context, match M
 		return match.ID == matchID
 	})
 
-	m.matches.Delete(match.ID)
+	match.InstanceAllocatedAt = new(time.Now())
+	m.matches.Update(match)
 	return nil
 }
 

internal/matchmaking/types.go

@@ -53,13 +53,14 @@ type Assignment struct {
 }
 
 type Match struct {
-	ID            string
-	Tickets       TicketList
-	Full          bool
-	ChunkID       string
-	FlavorID      string
-	FlavorVersion *chunkv1alpha1.FlavorVersion
-	CreatedAt     time.Time
+	ID                  string
+	Tickets             TicketList
+	Full                bool
+	ChunkID             string
+	FlavorID            string
+	FlavorVersion       *chunkv1alpha1.FlavorVersion
+	CreatedAt           time.Time
+	InstanceAllocatedAt *time.Time
 }
 
 func (m Match) GetID() string {

internal/server/endpoints.go

@@ -34,23 +34,32 @@ func (s Server) GetTicket(
 	_ context.Context,
 	req *mmv1alpha1.GetTicketRequest,
 ) (*mmv1alpha1.GetTicketResponse, error) {
-	t := s.tickets.Get(req.TicketId)
-	if t == nil {
+	ticket := s.tickets.Get(req.TicketId)
+	if ticket == nil {
 		return nil, status.Error(codes.NotFound, "ticket not found")
 	}
 
 	ret := &mmv1alpha1.GetTicketResponse{
 		Ticket: &mmv1alpha1.Ticket{
-			Id:          t.ID,
-			FlavorId:    t.FlavorID,
-			PlayerCount: t.PlayerCount,
-			Status:      mmv1alpha1.TicketStatus(t.Status),
+			Id:          ticket.ID,
+			FlavorId:    ticket.FlavorID,
+			PlayerCount: ticket.PlayerCount,
+			Status:      mmv1alpha1.TicketStatus(ticket.Status),
 		},
 	}
 
-	if t.Assignment != nil {
+	if ticket.Assignment != nil {
 		ret.Ticket.Assignment = &mmv1alpha1.Assignment{
-			InstanceId: t.Assignment.InstanceID,
+			InstanceId: ticket.Assignment.InstanceID,
+		}
+	}
+
+	if ticket.MatchID != nil {
+		if m := s.matches.Get(*ticket.MatchID); m != nil {
+			ret.Ticket.Match = &mmv1alpha1.Match{
+				Id:          m.ID,
+				PlayerCount: m.PlayerCount(),
+			}
 		}
 	}
 

internal/server/server.go

@@ -44,13 +44,20 @@ type Server struct {
 	logger  *slog.Logger
 	cfg     Config
 	tickets *matchmaking.Store[matchmaking.Ticket]
+	matches *matchmaking.Store[matchmaking.Match]
 }
 
-func New(logger *slog.Logger, config Config, tickets *matchmaking.Store[matchmaking.Ticket]) *Server {
+func New(
+	logger *slog.Logger,
+	config Config,
+	tickets *matchmaking.Store[matchmaking.Ticket],
+	matches *matchmaking.Store[matchmaking.Match],
+) *Server {
 	return &Server{
 		logger:  logger,
 		cfg:     config,
 		tickets: tickets,
+		matches: matches,
 	}
 }
 
@@ -62,6 +69,7 @@ type Config struct {
 	MatchInterval                        time.Duration `mapstructure:"match_interval"`
 	AllocateInstanceForPendingMatchAfter time.Duration `mapstructure:"allocate_instance_for_pending_match_after"`
 	RemoveInactiveTicketsAfter           time.Duration `mapstructure:"remove_inactive_tickets_after"`
+	RemoveDeployedMatchesAfter           time.Duration `mapstructure:"remove_deployed_matches_after"`
 }
 
 func (s Server) Run(ctx context.Context) error {
@@ -118,7 +126,9 @@ func (s Server) Run(ctx context.Context) error {
 		s.cfg.MatchInterval,
 		s.cfg.AllocateInstanceForPendingMatchAfter,
 		s.cfg.RemoveInactiveTicketsAfter,
+		s.cfg.RemoveDeployedMatchesAfter,
 		s.tickets,
+		s.matches,
 		chunkv1alpha1.NewChunkServiceClient(conn),
 		instancev1alpha1.NewInstanceServiceClient(conn),
 	)