From 26ce7b82f4011a6d77058e3bc1587e7117315a9a Mon Sep 17 00:00:00 2001 From: David Colburn Date: Sat, 26 Sep 2026 10:53:57 -0400 Subject: [PATCH] Add skip_playback to EgressReadyRequest (#1821) * Add skip_playback to EgressReadyRequest The egress knows whether it resolved a pipeline that reads the replay from object storage; cloud cannot infer that without duplicating the egress's own source resolution. Reporting it on the ready request lets cloud skip starting a realtime playback it would never use. * generated protobuf --------- Co-authored-by: github-actions <41898282+github-actions[bot]@users.noreply.github.com> --- protobufs/rpc/egress.proto | 3 ++ rpc/egress.pb.go | 18 +++++-- rpc/egress.psrpc.go | 96 +++++++++++++++++++------------------- 3 files changed, 66 insertions(+), 51 deletions(-) diff --git a/protobufs/rpc/egress.proto b/protobufs/rpc/egress.proto index 9d307bd3a..2be56c0eb 100644 --- a/protobufs/rpc/egress.proto +++ b/protobufs/rpc/egress.proto @@ -92,6 +92,9 @@ message ListActiveEgressResponse { message EgressReadyRequest { string egress_id = 1 [(logger.name) = "egressID"]; + + // set when the egress is exporting from object storage rather than joining a room + bool skip_playback = 2; } message EgressReadyResponse { diff --git a/rpc/egress.pb.go b/rpc/egress.pb.go index 60bb8d4ab..2594451a8 100644 --- a/rpc/egress.pb.go +++ b/rpc/egress.pb.go @@ -351,8 +351,10 @@ func (x *ListActiveEgressResponse) GetEgressIds() []string { } type EgressReadyRequest struct { - state protoimpl.MessageState `protogen:"open.v1"` - EgressId string `protobuf:"bytes,1,opt,name=egress_id,json=egressId,proto3" json:"egress_id,omitempty"` + state protoimpl.MessageState `protogen:"open.v1"` + EgressId string `protobuf:"bytes,1,opt,name=egress_id,json=egressId,proto3" json:"egress_id,omitempty"` + // set when the egress is exporting from object storage rather than joining a room + SkipPlayback bool `protobuf:"varint,2,opt,name=skip_playback,json=skipPlayback,proto3" json:"skip_playback,omitempty"` unknownFields protoimpl.UnknownFields sizeCache protoimpl.SizeCache } @@ -394,6 +396,13 @@ func (x *EgressReadyRequest) GetEgressId() string { return "" } +func (x *EgressReadyRequest) GetSkipPlayback() bool { + if x != nil { + return x.SkipPlayback + } + return false +} + type EgressReadyResponse struct { state protoimpl.MessageState `protogen:"open.v1"` StartAt int64 `protobuf:"varint,1,opt,name=start_at,json=startAt,proto3" json:"start_at,omitempty"` // wallclock unix timestamp (nanoseconds) @@ -473,9 +482,10 @@ const file_rpc_egress_proto_rawDesc = "" + "\x17ListActiveEgressRequest\"9\n" + "\x18ListActiveEgressResponse\x12\x1d\n" + "\n" + - "egress_ids\x18\x01 \x03(\tR\tegressIds\">\n" + + "egress_ids\x18\x01 \x03(\tR\tegressIds\"c\n" + "\x12EgressReadyRequest\x12(\n" + - "\tegress_id\x18\x01 \x01(\tB\v\xbaP\begressIDR\begressId\"Q\n" + + "\tegress_id\x18\x01 \x01(\tB\v\xbaP\begressIDR\begressId\x12#\n" + + "\rskip_playback\x18\x02 \x01(\bR\fskipPlayback\"Q\n" + "\x13EgressReadyResponse\x12\x19\n" + "\bstart_at\x18\x01 \x01(\x03R\astartAt\x12\x1f\n" + "\vduration_ms\x18\x02 \x01(\x03R\n" + diff --git a/rpc/egress.psrpc.go b/rpc/egress.psrpc.go index 6332e7360..8b1038e80 100644 --- a/rpc/egress.psrpc.go +++ b/rpc/egress.psrpc.go @@ -436,51 +436,53 @@ func (UnimplementedReplayExportServer) EgressReady(context.Context, *EgressReady } var psrpcFileDescriptor2 = []byte{ - // 732 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x54, 0xc1, 0x6e, 0xeb, 0x44, - 0x14, 0x65, 0x12, 0xc5, 0x89, 0x6f, 0x9a, 0xbc, 0x30, 0xef, 0xa1, 0x37, 0xc9, 0x6b, 0xd5, 0x34, - 0x65, 0xe1, 0x0d, 0x49, 0x95, 0x0a, 0x24, 0x36, 0x88, 0xa6, 0x8d, 0x68, 0xa4, 0x02, 0xc1, 0xa5, - 0x42, 0x02, 0x24, 0x6b, 0x62, 0x0f, 0xc1, 0x8a, 0xed, 0x19, 0xc6, 0xe3, 0x96, 0x7e, 0x42, 0x3f, - 0x83, 0x5f, 0xe8, 0x82, 0x45, 0x57, 0xfc, 0x10, 0xff, 0x80, 0x3c, 0x76, 0x5c, 0x27, 0xa1, 0x88, - 0xb7, 0x8a, 0x7d, 0xce, 0x3d, 0x67, 0x7c, 0xef, 0xe4, 0x5c, 0xe8, 0x48, 0xe1, 0x8e, 0xd8, 0x52, - 0xb2, 0x38, 0x1e, 0x0a, 0xc9, 0x15, 0xc7, 0x55, 0x29, 0xdc, 0x5e, 0x8b, 0x0b, 0xe5, 0xf3, 0x28, - 0xc7, 0x7a, 0x6f, 0x02, 0xbe, 0x5c, 0x32, 0x39, 0xda, 0x46, 0xfd, 0x5b, 0xb6, 0xf2, 0x95, 0x53, - 0xd6, 0x0f, 0xfe, 0xae, 0x01, 0xbe, 0x56, 0x54, 0xaa, 0xa9, 0x46, 0x6d, 0xf6, 0x5b, 0xc2, 0x62, - 0x85, 0x2d, 0x30, 0xb3, 0x32, 0xc7, 0xf7, 0x08, 0xea, 0x23, 0xcb, 0x9c, 0x34, 0x9f, 0xe6, 0x8d, - 0x0c, 0x9b, 0x5d, 0xd8, 0xeb, 0x27, 0x0f, 0x7f, 0x0a, 0x46, 0xf6, 0x4c, 0x3a, 0x7d, 0x64, 0x35, - 0xc7, 0xef, 0x86, 0xf9, 0x39, 0xc3, 0x5d, 0xdb, 0xcb, 0x0f, 0xec, 0xbc, 0x18, 0x7f, 0x06, 0x86, - 0x64, 0x22, 0xa0, 0xf7, 0xe4, 0x43, 0x2d, 0xdb, 0x2f, 0x64, 0xd3, 0xdf, 0x05, 0x97, 0xca, 0xd6, - 0x64, 0x49, 0x97, 0x55, 0xe3, 0x2b, 0x68, 0x4b, 0xce, 0x43, 0xc7, 0xe5, 0xa1, 0xe0, 0xb1, 0xaf, - 0x18, 0xa9, 0x69, 0xfd, 0x71, 0xa1, 0xb7, 0x39, 0x0f, 0xcf, 0xd7, 0xec, 0xf6, 0xf1, 0x2d, 0x59, - 0x66, 0xf1, 0x27, 0x50, 0xbd, 0x63, 0x0b, 0xd2, 0xd4, 0x16, 0xdd, 0xc2, 0xe2, 0x07, 0xb6, 0xd8, - 0x16, 0xa6, 0x75, 0x78, 0x0a, 0x4d, 0x41, 0xa5, 0xf2, 0x5d, 0x5f, 0xd0, 0x48, 0x91, 0x96, 0x96, - 0x1d, 0x15, 0xb2, 0xf9, 0x33, 0xb7, 0x2d, 0x2f, 0xeb, 0xf0, 0xb7, 0xf0, 0x4a, 0x49, 0xea, 0xae, - 0x4a, 0x4d, 0x18, 0xda, 0xea, 0xe3, 0xc2, 0xea, 0xfb, 0x94, 0x7f, 0xb1, 0x8b, 0xb6, 0xda, 0xa0, - 0xf1, 0x29, 0xd4, 0x34, 0x42, 0xea, 0x5b, 0x57, 0xa0, 0x6d, 0xb6, 0xd5, 0x59, 0x2d, 0x1e, 0x40, - 0x5d, 0x4f, 0xd2, 0xf7, 0x48, 0x55, 0x5f, 0xb0, 0xf9, 0x34, 0x37, 0x52, 0x64, 0x76, 0x61, 0x67, - 0xbf, 0x1e, 0x7e, 0x07, 0xa6, 0xae, 0x89, 0x68, 0xc8, 0x08, 0x4e, 0xab, 0xec, 0x46, 0x0a, 0x7c, - 0x43, 0x43, 0x86, 0xbb, 0x50, 0x53, 0x7c, 0xc5, 0x22, 0xd2, 0xd0, 0xf2, 0xea, 0x5f, 0xf3, 0x8a, - 0x9d, 0x21, 0xf8, 0x23, 0x30, 0xee, 0x62, 0x27, 0x91, 0x01, 0x31, 0xb5, 0xa8, 0x76, 0x17, 0xdf, - 0xc8, 0x00, 0x9f, 0xc0, 0x1b, 0x37, 0xe0, 0x89, 0xe7, 0x2c, 0xa8, 0xbb, 0x4a, 0x84, 0xc3, 0x22, - 0xba, 0x08, 0x98, 0x47, 0xa0, 0x8f, 0xac, 0x86, 0x8d, 0x35, 0x37, 0xd1, 0xd4, 0x34, 0x63, 0xf0, - 0x31, 0xb4, 0x58, 0xac, 0xfc, 0x90, 0x2a, 0xe6, 0x39, 0xae, 0x48, 0x48, 0xbb, 0x8f, 0x2c, 0x64, - 0xef, 0x15, 0xe0, 0xb9, 0x48, 0xf0, 0x21, 0x34, 0x25, 0x53, 0xf2, 0xde, 0x71, 0x79, 0x12, 0x29, - 0xf2, 0xaa, 0x8f, 0xac, 0x9a, 0x0d, 0x1a, 0x3a, 0x4f, 0x91, 0x89, 0x09, 0x75, 0x99, 0xb5, 0x3f, - 0xe8, 0xc2, 0xdb, 0x2b, 0x3f, 0x56, 0x67, 0xae, 0xf2, 0x6f, 0x37, 0xe7, 0x3a, 0xf8, 0x1c, 0xc8, - 0x2e, 0x15, 0x0b, 0x1e, 0xc5, 0x0c, 0x1f, 0x00, 0x14, 0x79, 0x88, 0x09, 0xea, 0x57, 0x2d, 0xd3, - 0x36, 0xd7, 0x19, 0x88, 0x07, 0x5f, 0x00, 0x5e, 0x0b, 0xa8, 0x77, 0xff, 0xde, 0x21, 0x1a, 0x7c, - 0x07, 0xaf, 0x37, 0xf4, 0xf9, 0xa9, 0x5d, 0x68, 0xc4, 0x69, 0x88, 0x1c, 0xaa, 0xb4, 0xbe, 0x6a, - 0xd7, 0xf5, 0xfb, 0x99, 0x4a, 0x7b, 0xf6, 0x12, 0x49, 0xd3, 0x80, 0x3b, 0x61, 0x4c, 0x2a, 0x9a, - 0x85, 0x35, 0xf4, 0x75, 0x3c, 0xfe, 0x13, 0x41, 0x3b, 0xf3, 0x9c, 0x45, 0x8a, 0xc9, 0x88, 0x06, - 0xf8, 0x2b, 0x68, 0x96, 0x32, 0x89, 0xdf, 0x0e, 0xa5, 0x70, 0xff, 0x25, 0xa5, 0xbd, 0xd7, 0xcf, - 0x59, 0xcc, 0x0d, 0x7e, 0xe1, 0x03, 0x78, 0x7c, 0x40, 0x46, 0x07, 0x7d, 0x89, 0x4e, 0x10, 0xfe, - 0x09, 0x3a, 0xdb, 0x93, 0xc2, 0xfb, 0xda, 0xed, 0x85, 0xd9, 0xf6, 0x0e, 0x5e, 0x60, 0xb3, 0x46, - 0x0b, 0xf3, 0x8a, 0x85, 0xc6, 0x7f, 0x20, 0x68, 0x65, 0xf4, 0x25, 0x8d, 0xbc, 0x80, 0x49, 0x3c, - 0x05, 0xb8, 0x56, 0x5c, 0xe4, 0x07, 0xf5, 0x4a, 0x0b, 0x66, 0x0d, 0xfe, 0xe7, 0x97, 0x1b, 0x8f, - 0x0f, 0xa8, 0xd2, 0x41, 0x78, 0x06, 0x7b, 0x37, 0xc2, 0xa3, 0x8a, 0x5d, 0x2b, 0xc9, 0x68, 0x88, - 0x9f, 0x57, 0x4e, 0x19, 0xfe, 0x3f, 0x56, 0xe3, 0x9f, 0x61, 0x2f, 0x5b, 0x50, 0xd9, 0xb2, 0xc2, - 0x57, 0xd0, 0x2c, 0xdd, 0x5f, 0x3e, 0xd9, 0xdd, 0x7f, 0x44, 0x8f, 0xec, 0x12, 0x9b, 0x13, 0xe8, - 0x55, 0xfa, 0x68, 0x72, 0xf4, 0xe3, 0xe1, 0xd2, 0x57, 0xbf, 0x26, 0x8b, 0xa1, 0xcb, 0xc3, 0x51, - 0xfe, 0x19, 0x23, 0xbd, 0xaf, 0x5d, 0x1e, 0x8c, 0xa4, 0x70, 0x17, 0x86, 0x7e, 0x3b, 0xfd, 0x27, - 0x00, 0x00, 0xff, 0xff, 0x29, 0x44, 0x50, 0xc1, 0x11, 0x06, 0x00, 0x00, + // 753 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x54, 0xdd, 0x8e, 0xdb, 0x44, + 0x14, 0x66, 0x12, 0xc5, 0x89, 0x4f, 0x7e, 0x1a, 0xa6, 0x45, 0x9d, 0xa4, 0xad, 0x9a, 0x66, 0xb9, + 0xf0, 0x0d, 0x49, 0x95, 0x0a, 0x24, 0xee, 0x68, 0xb6, 0x11, 0x8d, 0xb4, 0x40, 0xf0, 0xb2, 0x42, + 0x02, 0x24, 0x6b, 0x62, 0x0f, 0xc1, 0x8a, 0xed, 0x19, 0x66, 0xc6, 0xbb, 0xec, 0x23, 0xec, 0x63, + 0xf0, 0x0a, 0x7b, 0xc1, 0xc5, 0x5e, 0xf1, 0x42, 0xbc, 0x03, 0xf2, 0xd8, 0xf1, 0x3a, 0x09, 0x8b, + 0xe0, 0xca, 0xf6, 0xf7, 0x9d, 0xef, 0x3b, 0x33, 0xe7, 0xf8, 0x1c, 0xe8, 0x4b, 0xe1, 0x4f, 0xd9, + 0x46, 0x32, 0xa5, 0x26, 0x42, 0x72, 0xcd, 0x71, 0x5d, 0x0a, 0x7f, 0xd8, 0xe5, 0x42, 0x87, 0x3c, + 0x29, 0xb0, 0xe1, 0x93, 0x88, 0x6f, 0x36, 0x4c, 0x4e, 0x0f, 0xd1, 0xf0, 0x92, 0x6d, 0x43, 0xed, + 0x55, 0xf5, 0xe3, 0xbf, 0x1a, 0x80, 0xcf, 0x35, 0x95, 0x7a, 0x61, 0x50, 0x97, 0xfd, 0x9a, 0x32, + 0xa5, 0xb1, 0x03, 0x76, 0x1e, 0xe6, 0x85, 0x01, 0x41, 0x23, 0xe4, 0xd8, 0xf3, 0xf6, 0xdd, 0xaa, + 0x95, 0x63, 0xcb, 0x77, 0xee, 0xee, 0x2d, 0xc0, 0x9f, 0x82, 0x95, 0xbf, 0x93, 0xfe, 0x08, 0x39, + 0xed, 0xd9, 0xb3, 0x49, 0x91, 0x67, 0x72, 0x6c, 0xfb, 0xfe, 0x03, 0xb7, 0x08, 0xc6, 0x9f, 0x81, + 0x25, 0x99, 0x88, 0xe8, 0x35, 0xf9, 0xd0, 0xc8, 0x9e, 0x97, 0xb2, 0xc5, 0x6f, 0x82, 0x4b, 0xed, + 0x1a, 0xb2, 0xa2, 0xcb, 0xa3, 0xf1, 0x19, 0xf4, 0x24, 0xe7, 0xb1, 0xe7, 0xf3, 0x58, 0x70, 0x15, + 0x6a, 0x46, 0x1a, 0x46, 0x7f, 0x52, 0xea, 0x5d, 0xce, 0xe3, 0xd3, 0x1d, 0x7b, 0x98, 0xbe, 0x2b, + 0xab, 0x2c, 0xfe, 0x04, 0xea, 0x57, 0x6c, 0x4d, 0xda, 0xc6, 0x62, 0x50, 0x5a, 0x7c, 0xcf, 0xd6, + 0x87, 0xc2, 0x2c, 0x0e, 0x2f, 0xa0, 0x2d, 0xa8, 0xd4, 0xa1, 0x1f, 0x0a, 0x9a, 0x68, 0xd2, 0x35, + 0xb2, 0x57, 0xa5, 0x6c, 0x75, 0xcf, 0x1d, 0xca, 0xab, 0x3a, 0xfc, 0x0d, 0x3c, 0xd2, 0x92, 0xfa, + 0xdb, 0xca, 0x25, 0x2c, 0x63, 0xf5, 0x71, 0x69, 0xf5, 0x5d, 0xc6, 0x3f, 0x78, 0x8b, 0x9e, 0xde, + 0xa3, 0xf1, 0x1b, 0x68, 0x18, 0x84, 0x34, 0x0f, 0x5a, 0x60, 0x6c, 0x0e, 0xd5, 0x79, 0x2c, 0x1e, + 0x43, 0xd3, 0x54, 0x32, 0x0c, 0x48, 0xdd, 0x34, 0xd8, 0xbe, 0x5b, 0x59, 0x19, 0xb2, 0x7c, 0xe7, + 0xe6, 0xcf, 0x00, 0x3f, 0x03, 0xdb, 0xc4, 0x24, 0x34, 0x66, 0x04, 0x67, 0x51, 0x6e, 0x2b, 0x03, + 0xbe, 0xa6, 0x31, 0xc3, 0x03, 0x68, 0x68, 0xbe, 0x65, 0x09, 0x69, 0x19, 0x79, 0xfd, 0xcf, 0x55, + 0xcd, 0xcd, 0x11, 0xfc, 0x11, 0x58, 0x57, 0xca, 0x4b, 0x65, 0x44, 0x6c, 0x23, 0x6a, 0x5c, 0xa9, + 0x0b, 0x19, 0xe1, 0xd7, 0xf0, 0xc4, 0x8f, 0x78, 0x1a, 0x78, 0x6b, 0xea, 0x6f, 0x53, 0xe1, 0xb1, + 0x84, 0xae, 0x23, 0x16, 0x10, 0x18, 0x21, 0xa7, 0xe5, 0x62, 0xc3, 0xcd, 0x0d, 0xb5, 0xc8, 0x19, + 0x7c, 0x02, 0x5d, 0xa6, 0x74, 0x18, 0x53, 0xcd, 0x02, 0xcf, 0x17, 0x29, 0xe9, 0x8d, 0x90, 0x83, + 0xdc, 0x4e, 0x09, 0x9e, 0x8a, 0x14, 0xbf, 0x84, 0xb6, 0x64, 0x5a, 0x5e, 0x7b, 0x3e, 0x4f, 0x13, + 0x4d, 0x1e, 0x8d, 0x90, 0xd3, 0x70, 0xc1, 0x40, 0xa7, 0x19, 0x32, 0xb7, 0xa1, 0x29, 0xf3, 0xeb, + 0x8f, 0x07, 0xf0, 0xf4, 0x2c, 0x54, 0xfa, 0xad, 0xaf, 0xc3, 0xcb, 0xfd, 0xba, 0x8e, 0x3f, 0x07, + 0x72, 0x4c, 0x29, 0xc1, 0x13, 0xc5, 0xf0, 0x0b, 0x80, 0x72, 0x1e, 0x14, 0x41, 0xa3, 0xba, 0x63, + 0xbb, 0xf6, 0x6e, 0x06, 0xd4, 0xd8, 0x07, 0xbc, 0x13, 0xd0, 0xe0, 0xfa, 0xff, 0x0f, 0xd1, 0x09, + 0x74, 0xd5, 0x36, 0x14, 0x5e, 0xf6, 0x8b, 0x67, 0xb5, 0x21, 0x35, 0x53, 0x91, 0x4e, 0x06, 0xae, + 0x0a, 0x6c, 0xfc, 0x2d, 0x3c, 0xde, 0x4b, 0x52, 0x1c, 0x6d, 0x00, 0x2d, 0x95, 0x4d, 0x9a, 0x47, + 0xb5, 0x49, 0x52, 0x77, 0x9b, 0xe6, 0xfb, 0xad, 0xce, 0x0a, 0x13, 0xa4, 0x92, 0x66, 0x5b, 0xc0, + 0x8b, 0x95, 0x31, 0xad, 0xbb, 0xb0, 0x83, 0xbe, 0x52, 0xb3, 0x3f, 0x10, 0xf4, 0x72, 0xcf, 0x65, + 0xa2, 0x99, 0x4c, 0x68, 0x84, 0xbf, 0x84, 0x76, 0x65, 0x70, 0xf1, 0xd3, 0x89, 0x14, 0xfe, 0x3f, + 0x8c, 0xf2, 0xf0, 0xf1, 0xfd, 0xc0, 0x16, 0x06, 0x3f, 0xf3, 0x31, 0xdc, 0xde, 0x20, 0xab, 0x8f, + 0xbe, 0x40, 0xaf, 0x11, 0xfe, 0x11, 0xfa, 0x87, 0xe5, 0xc4, 0xcf, 0x8d, 0xdb, 0x03, 0x0d, 0x18, + 0xbe, 0x78, 0x80, 0xcd, 0x2f, 0x5a, 0x9a, 0xd7, 0x1c, 0x34, 0xfb, 0x1d, 0x41, 0x37, 0xa7, 0xdf, + 0xd3, 0x24, 0x88, 0x98, 0xc4, 0x0b, 0x80, 0x73, 0xcd, 0x45, 0x91, 0x68, 0x58, 0xd9, 0x42, 0x3b, + 0xf0, 0x5f, 0x4f, 0x6e, 0xdd, 0xde, 0xa0, 0x5a, 0x1f, 0xe1, 0x25, 0x74, 0x2e, 0x44, 0x40, 0x35, + 0x3b, 0xd7, 0x92, 0xd1, 0x18, 0xdf, 0xef, 0xa5, 0x2a, 0xfc, 0x5f, 0xac, 0x66, 0x3f, 0x41, 0x27, + 0xdf, 0x62, 0xf9, 0x46, 0xc3, 0x67, 0xd0, 0xae, 0xf4, 0xaf, 0xa8, 0xec, 0xf1, 0x6f, 0x33, 0x24, + 0xc7, 0xc4, 0x7e, 0x05, 0x86, 0xb5, 0x11, 0x9a, 0xbf, 0xfa, 0xe1, 0xe5, 0x26, 0xd4, 0xbf, 0xa4, + 0xeb, 0x89, 0xcf, 0xe3, 0x69, 0x71, 0x8c, 0xa9, 0x59, 0xea, 0x3e, 0x8f, 0xa6, 0x52, 0xf8, 0x6b, + 0xcb, 0x7c, 0xbd, 0xf9, 0x3b, 0x00, 0x00, 0xff, 0xff, 0xa4, 0x66, 0xca, 0x7d, 0x36, 0x06, 0x00, + 0x00, }