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.

Sign up for GitHub

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

Jump to bottom

Revert nsmonitor + add additional checks to prevent random connection closes #832

Merged
merged 2 commits into from
May 27, 2024
Merged

Revert nsmonitor + add additional checks to prevent random connection closes #832

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
19fc083
Add nsmonitor again + add additional checks to prevent random connect…
NikitaSkrynnik May 27, 2024
0807cda
fix go linter issues
NikitaSkrynnik May 27, 2024
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
2 changes: 2 additions & 0 deletions pkg/networkservice/chains/forwarder/server.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,7 @@ import (
"github.com/networkservicemesh/sdk-vpp/pkg/networkservice/mechanisms/vxlan"
"github.com/networkservicemesh/sdk-vpp/pkg/networkservice/mechanisms/wireguard"
"github.com/networkservicemesh/sdk-vpp/pkg/networkservice/metrics"
"github.com/networkservicemesh/sdk-vpp/pkg/networkservice/nsmonitor"
"github.com/networkservicemesh/sdk-vpp/pkg/networkservice/pinhole"
"github.com/networkservicemesh/sdk-vpp/pkg/networkservice/tag"
"github.com/networkservicemesh/sdk-vpp/pkg/networkservice/up"
Expand Down Expand Up @@ -166,6 +167,7 @@ func NewServer(ctx context.Context, tokenGenerator token.GeneratorFunc, vppConn
afxdppinhole.NewClient(),
pinhole.NewClient(vppConn, pinhole.WithSharedMutex(pinholeMutex)),
recvfd.NewClient(),
nsmonitor.NewClient(ctx),
sendfd.NewClient(),
},
opts.clientAdditionalFunctionality...,
Expand Down
2 changes: 1 addition & 1 deletion pkg/networkservice/nsmonitor/client.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright (c) 2022 Cisco and/or its affiliates.

Check failure on line 1 in pkg/networkservice/nsmonitor/client.go

View workflow job for this annotation

GitHub Actions / golangci-lint / golangci-lint 

Pattern (Copyright \(c\) (((20\d\d\-2024)|(2024))) .*\n\n)+ doesn't match. (goheader)
//
// SPDX-License-Identifier: Apache-2.0
//
Expand Down Expand Up @@ -85,7 +85,7 @@
case <-cancelCtx.Done():
return
case _, ok := <-deleteCh:
if ok {
if ok && cancelCtx.Err() == nil {
factory.Close(begin.CancelContext(cancelCtx))
}
return
Expand Down
Loading