3
This commit is contained in:
@@ -140,15 +140,12 @@ func run(ctx context.Context) (smokeReport, error) {
|
||||
return smokeReport{}, fmt.Errorf("test service: %w", err)
|
||||
}
|
||||
fabricSessionStartedAt := time.Now()
|
||||
fabricSession, _, err := mesh.NewClient(nodeB.URL).OpenFabricSession(ctx, mesh.FabricSessionDialOptions{
|
||||
Token: "rap_fsn_mesh_live_smoke",
|
||||
Timeout: 3 * time.Second,
|
||||
})
|
||||
fabricSession, fabricQUICEndpoint, fabricQUICPressure, err := smokeQUICFabricSession(ctx)
|
||||
if err != nil {
|
||||
return smokeReport{}, fmt.Errorf("fabric session open: %w", err)
|
||||
return smokeReport{}, fmt.Errorf("fabric quic session open: %w", err)
|
||||
}
|
||||
defer fabricSession.Close()
|
||||
firstFabricSessionResponse, err := fabricSession.RoundTrip(ctx, fabricproto.Frame{
|
||||
firstFabricSessionResponse, err := smokeFabricSessionRoundTrip(ctx, fabricSession, fabricproto.Frame{
|
||||
Type: fabricproto.FramePing,
|
||||
Sequence: uint64(fabricSessionStartedAt.UnixNano()),
|
||||
Payload: []byte("mesh-live-smoke-fabric-session"),
|
||||
@@ -156,7 +153,7 @@ func run(ctx context.Context) (smokeReport, error) {
|
||||
if err != nil {
|
||||
return smokeReport{}, fmt.Errorf("fabric session first round trip: %w", err)
|
||||
}
|
||||
secondFabricSessionResponse, err := fabricSession.RoundTrip(ctx, fabricproto.Frame{
|
||||
secondFabricSessionResponse, err := smokeFabricSessionRoundTrip(ctx, fabricSession, fabricproto.Frame{
|
||||
Type: fabricproto.FramePing,
|
||||
Sequence: uint64(fabricSessionStartedAt.UnixNano()) + 1,
|
||||
Payload: []byte("mesh-live-smoke-fabric-session-2"),
|
||||
@@ -175,13 +172,9 @@ func run(ctx context.Context) (smokeReport, error) {
|
||||
}
|
||||
fabricVPNBulkPressure, fabricVPNBulkChannels, fabricVPNInteractiveChannels, fabricVPNBulkWindow, fabricVPNInteractiveWindow, fabricVPNPressureLevel, fabricVPNPressureScore, fabricVPNPressureReasons, fabricVPNPressureAction := smokeVPNFlowSchedulerBulkPressure()
|
||||
fabricVPNRouteRecovered, fabricVPNRouteSwitches, fabricVPNRecoveryMS, fabricVPNRecoveryMaxMS, fabricVPNRecoveryAvgMS, fabricVPNRecoveryReason := smokeVPNFlowSchedulerRouteRecovery()
|
||||
fabricQUICAccepted, fabricQUICEndpoint, fabricQUICPressure, err := smokeQUICFabricSession(ctx)
|
||||
if err != nil {
|
||||
return smokeReport{}, fmt.Errorf("fabric quic smoke: %w", err)
|
||||
}
|
||||
|
||||
return smokeReport{
|
||||
Stage: "C17F scoped synthetic config plus live HTTP transport",
|
||||
Stage: "C17F scoped synthetic config plus live QUIC fabric transport",
|
||||
ProductionForwarding: false,
|
||||
ScopedConfigLoaded: nodeAConfig.ConfigVersion == "smoke-config-v1",
|
||||
DirectProbeAccepted: directAck.MessageType == mesh.SyntheticMessageProbeAck,
|
||||
@@ -210,11 +203,11 @@ func run(ctx context.Context) (smokeReport, error) {
|
||||
FabricVPNRecoveryMaxMS: fabricVPNRecoveryMaxMS,
|
||||
FabricVPNRecoveryAvgMS: fabricVPNRecoveryAvgMS,
|
||||
FabricVPNRecoveryReason: fabricVPNRecoveryReason,
|
||||
FabricQUICAccepted: fabricQUICAccepted,
|
||||
FabricQUICAccepted: fabricSessionAccepted,
|
||||
FabricQUICEndpoint: fabricQUICEndpoint,
|
||||
FabricQUICPressure: fabricQUICPressure,
|
||||
FabricSessionLatencyMS: fabricSessionLatency.Milliseconds(),
|
||||
FabricSessionEndpoint: nodeB.URL + "/mesh/v1/fabric/session/ws",
|
||||
FabricSessionEndpoint: "quic://" + fabricQUICEndpoint,
|
||||
PeerEndpoints: map[string]any{
|
||||
"node-a": nodeA.URL,
|
||||
"node-r": nodeR.URL,
|
||||
@@ -269,18 +262,16 @@ func smokeVPNFlowSchedulerRouteRecovery() (bool, uint64, int64, int64, int64, st
|
||||
stat.LastRouteSwitchReason
|
||||
}
|
||||
|
||||
func smokeQUICFabricSession(ctx context.Context) (bool, string, int, error) {
|
||||
func smokeQUICFabricSession(ctx context.Context) (mesh.FabricTransportSession, string, int, error) {
|
||||
server, err := mesh.StartQUICFabricServer(ctx, mesh.QUICFabricServerConfig{
|
||||
ListenAddr: "127.0.0.1:0",
|
||||
TLSConfig: smokeQUICTLSConfig(),
|
||||
})
|
||||
if err != nil {
|
||||
return false, "", 0, err
|
||||
return nil, "", 0, err
|
||||
}
|
||||
defer server.Close()
|
||||
endpoint := server.Addr().String()
|
||||
transport := mesh.NewQUICFabricTransport(nil)
|
||||
defer transport.Close()
|
||||
session, err := transport.Connect(ctx, mesh.FabricTransportTarget{
|
||||
PeerID: "node-b",
|
||||
Endpoint: endpoint,
|
||||
@@ -293,31 +284,12 @@ func smokeQUICFabricSession(ctx context.Context) (bool, string, int, error) {
|
||||
ErrorBuffer: 4,
|
||||
})
|
||||
if err != nil {
|
||||
return false, endpoint, 0, err
|
||||
}
|
||||
defer session.Close()
|
||||
if err := session.Send(ctx, fabricproto.Frame{
|
||||
Type: fabricproto.FramePing,
|
||||
Sequence: uint64(time.Now().UnixNano()),
|
||||
Payload: []byte("mesh-live-smoke-quic"),
|
||||
}); err != nil {
|
||||
return false, endpoint, 0, err
|
||||
}
|
||||
timer := time.NewTimer(3 * time.Second)
|
||||
defer timer.Stop()
|
||||
for {
|
||||
select {
|
||||
case frame := <-session.Frames():
|
||||
snapshot := transport.Snapshot()
|
||||
return frame.Type == fabricproto.FramePong && string(frame.Payload) == "mesh-live-smoke-quic", endpoint, snapshot.CapacityPressurePercent, nil
|
||||
case err := <-session.Errors():
|
||||
return false, endpoint, 0, err
|
||||
case <-timer.C:
|
||||
return false, endpoint, 0, fmt.Errorf("timed out waiting for quic pong")
|
||||
case <-ctx.Done():
|
||||
return false, endpoint, 0, ctx.Err()
|
||||
}
|
||||
_ = transport.Close()
|
||||
_ = server.Close()
|
||||
return nil, endpoint, 0, err
|
||||
}
|
||||
snapshot := transport.Snapshot()
|
||||
return &smokeManagedFabricSession{session: session, transport: transport, server: server}, endpoint, snapshot.CapacityPressurePercent, nil
|
||||
}
|
||||
|
||||
func smokeQUICTLSConfig() *tls.Config {
|
||||
@@ -341,25 +313,20 @@ func smokeQUICTLSConfig() *tls.Config {
|
||||
}
|
||||
}
|
||||
|
||||
func smokeFabricVPNPacketOverSession(ctx context.Context, fabricSession *mesh.FabricSessionClient) (bool, bool, int, error) {
|
||||
func smokeFabricVPNPacketOverSession(ctx context.Context, fabricSession mesh.FabricTransportSession) (bool, bool, int, error) {
|
||||
const interactiveStreamID uint64 = 4400
|
||||
const bulkStreamID uint64 = 4401
|
||||
pump := fabricSession.StartPump(ctx, mesh.FabricSessionPumpOptions{
|
||||
OutboundBuffer: 4,
|
||||
InboundBuffer: 4,
|
||||
ErrorBuffer: 4,
|
||||
})
|
||||
defer pump.Close()
|
||||
for _, frame := range []fabricproto.Frame{
|
||||
{Type: fabricproto.FrameOpenStream, StreamID: interactiveStreamID, TrafficClass: fabricproto.TrafficClassInteractive},
|
||||
{Type: fabricproto.FrameOpenStream, StreamID: bulkStreamID, TrafficClass: fabricproto.TrafficClassBulk},
|
||||
} {
|
||||
if err := pump.Send(ctx, frame); err != nil {
|
||||
if err := fabricSession.Send(ctx, frame); err != nil {
|
||||
return false, false, 0, err
|
||||
}
|
||||
}
|
||||
transport := &vpnruntime.FabricSessionPacketTransport{
|
||||
Sender: pump,
|
||||
Sender: fabricSession,
|
||||
Receiver: fabricSession,
|
||||
StreamID: interactiveStreamID,
|
||||
VPNConnectionID: "vpn-smoke",
|
||||
SendDirection: vpnruntime.FabricDirectionGatewayToClient,
|
||||
@@ -378,7 +345,7 @@ func smokeFabricVPNPacketOverSession(ctx context.Context, fabricSession *mesh.Fa
|
||||
acked := map[uint64]bool{}
|
||||
for {
|
||||
select {
|
||||
case frame := <-pump.Frames():
|
||||
case frame := <-fabricSession.Frames():
|
||||
if frame.Type == fabricproto.FrameAck && frame.Sequence == 1 {
|
||||
acked[frame.StreamID] = true
|
||||
if acked[interactiveStreamID] && acked[bulkStreamID] {
|
||||
@@ -393,7 +360,7 @@ func smokeFabricVPNPacketOverSession(ctx context.Context, fabricSession *mesh.Fa
|
||||
return true, sharded, int(fanout), nil
|
||||
}
|
||||
}
|
||||
case err := <-pump.Errors():
|
||||
case err := <-fabricSession.Errors():
|
||||
return false, false, 0, err
|
||||
case <-timer.C:
|
||||
return false, false, 0, fmt.Errorf("timed out waiting for fabric vpn packet ack")
|
||||
@@ -403,6 +370,68 @@ func smokeFabricVPNPacketOverSession(ctx context.Context, fabricSession *mesh.Fa
|
||||
}
|
||||
}
|
||||
|
||||
type smokeManagedFabricSession struct {
|
||||
session mesh.FabricTransportSession
|
||||
transport *mesh.QUICFabricTransport
|
||||
server *mesh.QUICFabricServer
|
||||
}
|
||||
|
||||
func (s *smokeManagedFabricSession) Send(ctx context.Context, frame fabricproto.Frame) error {
|
||||
return s.session.Send(ctx, frame)
|
||||
}
|
||||
|
||||
func (s *smokeManagedFabricSession) Frames() <-chan fabricproto.Frame {
|
||||
return s.session.Frames()
|
||||
}
|
||||
|
||||
func (s *smokeManagedFabricSession) Errors() <-chan error {
|
||||
return s.session.Errors()
|
||||
}
|
||||
|
||||
func (s *smokeManagedFabricSession) Closed() bool {
|
||||
return s.session.Closed()
|
||||
}
|
||||
|
||||
func (s *smokeManagedFabricSession) Close() error {
|
||||
var firstErr error
|
||||
if s.session != nil {
|
||||
firstErr = s.session.Close()
|
||||
}
|
||||
if s.transport != nil {
|
||||
if err := s.transport.Close(); firstErr == nil {
|
||||
firstErr = err
|
||||
}
|
||||
}
|
||||
if s.server != nil {
|
||||
if err := s.server.Close(); firstErr == nil {
|
||||
firstErr = err
|
||||
}
|
||||
}
|
||||
return firstErr
|
||||
}
|
||||
|
||||
func smokeFabricSessionRoundTrip(ctx context.Context, session mesh.FabricTransportSession, frame fabricproto.Frame) (fabricproto.Frame, error) {
|
||||
if err := session.Send(ctx, frame); err != nil {
|
||||
return fabricproto.Frame{}, err
|
||||
}
|
||||
timer := time.NewTimer(3 * time.Second)
|
||||
defer timer.Stop()
|
||||
for {
|
||||
select {
|
||||
case response := <-session.Frames():
|
||||
if response.Sequence == frame.Sequence {
|
||||
return response, nil
|
||||
}
|
||||
case err := <-session.Errors():
|
||||
return fabricproto.Frame{}, err
|
||||
case <-timer.C:
|
||||
return fabricproto.Frame{}, fmt.Errorf("timed out waiting for fabric session response")
|
||||
case <-ctx.Done():
|
||||
return fabricproto.Frame{}, ctx.Err()
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
func smokeIPv4TCPPacket(src [4]byte, dst [4]byte, srcPort uint16, dstPort uint16, flags byte) []byte {
|
||||
packet := make([]byte, 40)
|
||||
packet[0] = 0x45
|
||||
@@ -445,7 +474,7 @@ func writeSmokeScopedConfig(local mesh.PeerIdentity, peers map[string]string, ro
|
||||
func newSmokeNode(local mesh.PeerIdentity) *smokeNode {
|
||||
node := &smokeNode{Local: local}
|
||||
node.server = httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
|
||||
mesh.Server{Local: node.Local, SyntheticRuntime: node.Runtime, FabricSessionEnabled: true, FabricSessionWebSocketEnabled: true}.Handler().ServeHTTP(w, r)
|
||||
mesh.Server{Local: node.Local, SyntheticRuntime: node.Runtime}.Handler().ServeHTTP(w, r)
|
||||
}))
|
||||
node.URL = node.server.URL
|
||||
return node
|
||||
|
||||
Reference in New Issue
Block a user