From 5ead65f98be89f86a41e97ac2f0610e6b845c439 Mon Sep 17 00:00:00 2001 From: David Colburn Date: Thu, 5 Dec 2024 17:50:07 -0800 Subject: [PATCH] remove double drain --- pkg/server/server_rpc.go | 7 ++++++- test/ioserver.go | 3 +-- test/runner.go | 1 - 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/pkg/server/server_rpc.go b/pkg/server/server_rpc.go index c11a3664..40b2054a 100644 --- a/pkg/server/server_rpc.go +++ b/pkg/server/server_rpc.go @@ -159,7 +159,12 @@ func (s *Server) processEnded(req *rpc.StartEgressRequest, info *livekit.EgressI avgCPU, maxCPU, maxMemory := s.monitor.EgressEnded(req) if maxCPU > 0 { - logger.Debugw("egress stats", "egressID", info.EgressId, "avgCPU", avgCPU, "maxCPU", maxCPU, "maxMemory", maxMemory) + logger.Debugw("egress metrics", + "egressID", info.EgressId, + "avgCPU", avgCPU, + "maxCPU", maxCPU, + "maxMemory", maxMemory, + ) } s.ProcessFinished(info.EgressId) diff --git a/test/ioserver.go b/test/ioserver.go index 5c568943..1a78bdd5 100644 --- a/test/ioserver.go +++ b/test/ioserver.go @@ -56,7 +56,6 @@ func (s *ioTestServer) UpdateEgress(_ context.Context, info *livekit.EgressInfo) return &emptypb.Empty{}, nil } -func (s *ioTestServer) UpdateMetrics(_ context.Context, req *rpc.UpdateMetricsRequest) (*emptypb.Empty, error) { - logger.Infow("egress metrics", "egressID", req.Info.EgressId, "avgCPU", req.AvgCpuUsage, "maxCPU", req.MaxCpuUsage) +func (s *ioTestServer) UpdateMetrics(_ context.Context, _ *rpc.UpdateMetricsRequest) (*emptypb.Empty, error) { return &emptypb.Empty{}, nil } diff --git a/test/runner.go b/test/runner.go index 922d5ddd..789ca09c 100644 --- a/test/runner.go +++ b/test/runner.go @@ -192,7 +192,6 @@ func (r *Runner) StartServer(t *testing.T, svc Server, bus psrpc.MessageBus, tem r.room.Disconnect() } r.svc.Shutdown(false, true) - r.svc.Drain() }) // connect to room