Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[qfix] vl3mtu: store cloned conn #1511

Merged
merged 1 commit into from
Sep 15, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions pkg/networkservice/connectioncontext/mtu/vl3mtu/server.go
Original file line number Diff line number Diff line change
Expand Up @@ -59,11 +59,12 @@ func (v *vl3MtuServer) Request(ctx context.Context, request *networkservice.Netw
}
})

conn, err := next.Server(ctx).Request(ctx, request)
ret, err := next.Server(ctx).Request(ctx, request)
if err != nil {
return conn, err
return ret, err
}

conn := ret.Clone()
v.executor.AsyncExec(func() {
// We need to update minimum mtu of the vl3 network and send notifications to the already connected clients.
logger := log.FromContext(ctx).WithField("vl3MtuServer", "Request")
Expand Down Expand Up @@ -92,7 +93,7 @@ func (v *vl3MtuServer) Request(ctx context.Context, request *networkservice.Netw
v.connections[conn.GetId()] = conn
})

return conn, nil
return ret, nil
}

func (v *vl3MtuServer) Close(ctx context.Context, conn *networkservice.Connection) (*empty.Empty, error) {
Expand Down
84 changes: 83 additions & 1 deletion pkg/networkservice/connectioncontext/mtu/vl3mtu/server_test.go
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright (c) 2022 Cisco and/or its affiliates.
// Copyright (c) 2022-2023 Cisco and/or its affiliates.
//
// SPDX-License-Identifier: Apache-2.0
//
Expand Down Expand Up @@ -140,3 +140,85 @@ func Test_vl3MtuServer(t *testing.T) {
require.Equal(t, segmentName, event.GetConnections()[segmentName].GetPath().GetPathSegments()[0].GetName())
}
}

func Test_vl3MtuServer_SpoiledConnection(t *testing.T) {
t.Cleanup(func() { goleak.VerifyNone(t) })

const (
id1 = "id1"
id2 = "id2"
invalidID = "invalidId"
)

ctx, cancel := context.WithTimeout(context.Background(), time.Second)
defer cancel()

segmentName := "local-nsm"

// Create monitorServer
var monitorServer networkservice.MonitorConnectionServer
server := chain.NewNetworkServiceServer(
metadata.NewServer(),
monitor.NewServer(ctx, &monitorServer),
vl3mtu.NewServer(),
)
monitorClient := adapters.NewMonitorServerToClient(monitorServer)
monitorCtx, cancelMonitor := context.WithCancel(ctx)
defer cancelMonitor()

receiver, monitorErr := monitorClient.MonitorConnections(monitorCtx, &networkservice.MonitorScopeSelector{
PathSegments: []*networkservice.PathSegment{{Name: segmentName}},
})
require.NoError(t, monitorErr)

// Get Empty initial state transfer
event, err := receiver.Recv()
require.NoError(t, err)
require.NotNil(t, event)
require.Equal(t, networkservice.ConnectionEventType_INITIAL_STATE_TRANSFER, event.GetType())

// Send the first request
connection1, err := server.Request(ctx, &networkservice.NetworkServiceRequest{
Connection: &networkservice.Connection{
Id: id1,
Path: &networkservice.Path{
PathSegments: []*networkservice.PathSegment{{Name: segmentName}},
},
},
})
require.NoError(t, err)

// Get an update that was triggered by the first request and insure we've properly filtered by segmentName
_, err = receiver.Recv()
require.NoError(t, err)

// Spoil the connectionId of the first connection
connection1.Id = invalidID

// Send the second request
_, err = server.Request(ctx, &networkservice.NetworkServiceRequest{
Connection: &networkservice.Connection{
Id: id2,
Path: &networkservice.Path{
PathSegments: []*networkservice.PathSegment{{Name: segmentName}},
},
Context: &networkservice.ConnectionContext{MTU: 1500},
},
})
require.NoError(t, err)

// Get an update that was triggered by the second request and insure we've properly filtered by segmentName
_, err = receiver.Recv()
require.NoError(t, err)

// We should get the event that contains only the proper connection
event, err = receiver.Recv()
require.NotNil(t, event)
require.NoError(t, err)
eventConn, ok := event.GetConnections()[id1]
require.True(t, ok)
require.Equal(t, networkservice.State_REFRESH_REQUESTED, eventConn.State)

_, ok = event.GetConnections()[invalidID]
require.False(t, ok)
}