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

Added logs to metadata #1175

Merged
merged 1 commit into from
Nov 24, 2021
Merged

Added logs to metadata #1175

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
16 changes: 15 additions & 1 deletion pkg/networkservice/utils/metadata/client.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,8 @@ package metadata
import (
"context"

"github.com/networkservicemesh/sdk/pkg/tools/log"

"github.com/golang/protobuf/ptypes/empty"
"github.com/networkservicemesh/api/pkg/api/networkservice"
"google.golang.org/grpc"
Expand All @@ -46,6 +48,11 @@ func (m *metaDataClient) Request(ctx context.Context, request *networkservice.Ne
if err != nil {
if !isEstablished {
del(ctx, connID, &m.Map)

log.FromContext(ctx).
WithField("metadata", "client").
WithField("connID", connID).
Debugf("metadata deleted")
}
return nil, err
}
Expand All @@ -54,5 +61,12 @@ func (m *metaDataClient) Request(ctx context.Context, request *networkservice.Ne
}

func (m *metaDataClient) Close(ctx context.Context, conn *networkservice.Connection, opts ...grpc.CallOption) (*empty.Empty, error) {
return next.Client(ctx).Close(del(ctx, conn.GetId(), &m.Map), conn, opts...)
delCtx := del(ctx, conn.GetId(), &m.Map)

log.FromContext(ctx).
WithField("metadata", "client").
WithField("connID", conn.GetId()).
Debugf("metadata deleted")

return next.Client(ctx).Close(delCtx, conn, opts...)
}
16 changes: 15 additions & 1 deletion pkg/networkservice/utils/metadata/server.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,8 @@ package metadata
import (
"context"

"github.com/networkservicemesh/sdk/pkg/tools/log"

"github.com/golang/protobuf/ptypes/empty"
"github.com/networkservicemesh/api/pkg/api/networkservice"

Expand All @@ -45,6 +47,11 @@ func (m *metadataServer) Request(ctx context.Context, request *networkservice.Ne
if err != nil {
if !isEstablished {
del(ctx, connID, &m.Map)

log.FromContext(ctx).
WithField("metadata", "server").
WithField("connID", connID).
Debugf("metadata deleted")
}
return nil, err
}
Expand All @@ -53,5 +60,12 @@ func (m *metadataServer) Request(ctx context.Context, request *networkservice.Ne
}

func (m *metadataServer) Close(ctx context.Context, conn *networkservice.Connection) (*empty.Empty, error) {
return next.Server(ctx).Close(del(ctx, conn.GetId(), &m.Map), conn)
delCtx := del(ctx, conn.GetId(), &m.Map)

log.FromContext(ctx).
WithField("metadata", "server").
WithField("connID", conn.GetId()).
Debugf("metadata deleted")

return next.Server(ctx).Close(delCtx, conn)
}