-
Notifications
You must be signed in to change notification settings - Fork 36
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Signed-off-by: denis-tingaikin <[email protected]>
- Loading branch information
1 parent
d19115a
commit a0ee78d
Showing
12 changed files
with
808 additions
and
4 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -132,7 +132,6 @@ linters: | |
| - deadcode | ||
| - depguard | ||
| - dogsled | ||
| - dupl | ||
| - errcheck | ||
| - funlen | ||
| - gochecknoinits | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,114 @@ | ||
| // Copyright (c) 2024 Cisco and/or its affiliates. | ||
| // | ||
| // SPDX-License-Identifier: Apache-2.0 | ||
| // | ||
| // Licensed under the Apache License, Version 2.0 (the "License"); | ||
| // you may not use this file except in compliance with the License. | ||
| // You may obtain a copy of the License at: | ||
| // | ||
| // http://www.apache.org/licenses/LICENSE-2.0 | ||
| // | ||
| // Unless required by applicable law or agreed to in writing, software | ||
| // distributed under the License is distributed on an "AS IS" BASIS, | ||
| // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| // See the License for the specific language governing permissions and | ||
| // limitations under the License. | ||
|
|
||
| // Package limit provides a chain element that can set limits for the RPC calls. | ||
| package limit | ||
|
|
||
| import ( | ||
| "context" | ||
| "time" | ||
|
|
||
| "github.com/golang/protobuf/ptypes/empty" | ||
| "github.com/networkservicemesh/api/pkg/api/networkservice" | ||
| "google.golang.org/grpc" | ||
|
|
||
| "github.com/networkservicemesh/sdk/pkg/networkservice/common/clientconn" | ||
| "github.com/networkservicemesh/sdk/pkg/networkservice/core/next" | ||
| "github.com/networkservicemesh/sdk/pkg/tools/log" | ||
| ) | ||
|
|
||
| // Option overrides default values | ||
| type Option func(c *limitClient) | ||
|
|
||
| // WithDialLimit sets dial limit | ||
| func WithDialLimit(d time.Duration) Option { | ||
| return func(c *limitClient) { | ||
| c.dialLimit = d | ||
| } | ||
| } | ||
|
|
||
| type limitClient struct { | ||
| dialLimit time.Duration | ||
| } | ||
|
|
||
| // NewClient returns new NetworkServiceClient that limits rpc | ||
| func NewClient(opts ...Option) networkservice.NetworkServiceClient { | ||
| ret := &limitClient{ | ||
| dialLimit: time.Minute, | ||
| } | ||
|
|
||
| for _, opt := range opts { | ||
| opt(ret) | ||
| } | ||
|
|
||
| return ret | ||
| } | ||
|
|
||
| func (n *limitClient) Request(ctx context.Context, request *networkservice.NetworkServiceRequest, opts ...grpc.CallOption) (*networkservice.Connection, error) { | ||
| cc, ok := clientconn.Load(ctx) | ||
| if !ok { | ||
| return next.Server(ctx).Request(ctx, request) | ||
| } | ||
|
|
||
| closer, ok := cc.(interface{ Close() error }) | ||
| if !ok { | ||
| return next.Server(ctx).Request(ctx, request) | ||
| } | ||
|
|
||
| doneCh := make(chan struct{}) | ||
| defer close(doneCh) | ||
|
|
||
| logger := log.FromContext(ctx).WithField("throttleClient", "Request") | ||
|
|
||
| go func() { | ||
| select { | ||
| case <-time.After(n.dialLimit): | ||
| logger.Warn("Reached dial limit, closing connection...") | ||
| _ = closer.Close() | ||
| case <-doneCh: | ||
| return | ||
| } | ||
| }() | ||
| return next.Client(ctx).Request(ctx, request, opts...) | ||
| } | ||
|
|
||
| func (n *limitClient) Close(ctx context.Context, conn *networkservice.Connection, opts ...grpc.CallOption) (*empty.Empty, error) { | ||
| cc, ok := clientconn.Load(ctx) | ||
| if !ok { | ||
| return next.Server(ctx).Close(ctx, conn) | ||
| } | ||
|
|
||
| closer, ok := cc.(interface{ Close() error }) | ||
| if !ok { | ||
| return next.Server(ctx).Close(ctx, conn) | ||
| } | ||
|
|
||
| doneCh := make(chan struct{}) | ||
| defer close(doneCh) | ||
|
|
||
| logger := log.FromContext(ctx).WithField("throttleClient", "Close") | ||
|
|
||
| go func() { | ||
| select { | ||
| case <-time.After(n.dialLimit): | ||
| logger.Warn("Reached dial limit, closing connection...") | ||
| _ = closer.Close() | ||
| case <-doneCh: | ||
| return | ||
| } | ||
| }() | ||
| return next.Client(ctx).Close(ctx, conn, opts...) | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,122 @@ | ||
| // Copyright (c) 2024 Cisco and/or its affiliates. | ||
| // | ||
| // SPDX-License-Identifier: Apache-2.0 | ||
| // | ||
| // Licensed under the Apache License, Version 2.0 (the "License"); | ||
| // you may not use this file except in compliance with the License. | ||
| // You may obtain a copy of the License at: | ||
| // | ||
| // http://www.apache.org/licenses/LICENSE-2.0 | ||
| // | ||
| // Unless required by applicable law or agreed to in writing, software | ||
| // distributed under the License is distributed on an "AS IS" BASIS, | ||
| // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| // See the License for the specific language governing permissions and | ||
| // limitations under the License. | ||
|
|
||
| package limit_test | ||
|
|
||
| import ( | ||
| "context" | ||
| "sync/atomic" | ||
| "testing" | ||
| "time" | ||
|
|
||
| "github.com/networkservicemesh/api/pkg/api/networkservice" | ||
| "github.com/stretchr/testify/require" | ||
| "go.uber.org/goleak" | ||
| "google.golang.org/grpc" | ||
|
|
||
| "github.com/networkservicemesh/sdk/pkg/networkservice/common/clientconn" | ||
| "github.com/networkservicemesh/sdk/pkg/networkservice/common/limit" | ||
| "github.com/networkservicemesh/sdk/pkg/networkservice/core/chain" | ||
| "github.com/networkservicemesh/sdk/pkg/networkservice/utils/checks/checkclose" | ||
| "github.com/networkservicemesh/sdk/pkg/networkservice/utils/checks/checkrequest" | ||
| "github.com/networkservicemesh/sdk/pkg/networkservice/utils/metadata" | ||
| ) | ||
|
|
||
| type myConnection struct { | ||
| closed atomic.Bool | ||
| grpc.ClientConnInterface | ||
| } | ||
|
|
||
| func (cc *myConnection) Close() error { | ||
| cc.closed.Store(true) | ||
| return nil | ||
| } | ||
|
|
||
| func Test_DialLimitShouldCalled_OnLimitReached_Request(t *testing.T) { | ||
| t.Cleanup(func() { goleak.VerifyNone(t) }) | ||
|
|
||
| var cc = new(myConnection) | ||
| var myChain = chain.NewNetworkServiceClient( | ||
| metadata.NewClient(), | ||
| clientconn.NewClient(cc), | ||
| limit.NewClient(limit.WithDialLimit(time.Second/5)), | ||
| checkrequest.NewClient(t, func(t *testing.T, nsr *networkservice.NetworkServiceRequest) { | ||
| time.Sleep(time.Second / 4) | ||
| }), | ||
| ) | ||
|
|
||
| _, _ = myChain.Request(context.Background(), &networkservice.NetworkServiceRequest{}) | ||
|
|
||
| require.Eventually(t, func() bool { | ||
| return cc.closed.Load() | ||
| }, time.Second/2, time.Millisecond*75) | ||
| } | ||
|
|
||
| func Test_DialLimitShouldCalled_OnLimitReached_Close(t *testing.T) { | ||
| t.Cleanup(func() { goleak.VerifyNone(t) }) | ||
|
|
||
| var cc = new(myConnection) | ||
| var myChain = chain.NewNetworkServiceClient( | ||
| metadata.NewClient(), | ||
| clientconn.NewClient(cc), | ||
| limit.NewClient(limit.WithDialLimit(time.Second/5)), | ||
| checkclose.NewClient(t, func(t *testing.T, nsr *networkservice.Connection) { | ||
| time.Sleep(time.Second / 4) | ||
| }), | ||
| ) | ||
|
|
||
| _, _ = myChain.Request(context.Background(), &networkservice.NetworkServiceRequest{}) | ||
| _, _ = myChain.Close(context.Background(), &networkservice.Connection{}) | ||
|
|
||
| require.Eventually(t, func() bool { | ||
| return cc.closed.Load() | ||
| }, time.Second/2, time.Millisecond*75) | ||
| } | ||
|
|
||
| func Test_DialLimitShouldNotBeCalled_OnSuccesRequest(t *testing.T) { | ||
| t.Cleanup(func() { goleak.VerifyNone(t) }) | ||
|
|
||
| var cc = new(myConnection) | ||
| var myChain = chain.NewNetworkServiceClient( | ||
| metadata.NewClient(), | ||
| clientconn.NewClient(cc), | ||
| limit.NewClient(limit.WithDialLimit(time.Second/5)), | ||
| ) | ||
|
|
||
| _, _ = myChain.Request(context.Background(), &networkservice.NetworkServiceRequest{}) | ||
|
|
||
| require.Never(t, func() bool { | ||
| return cc.closed.Load() | ||
| }, time.Second/2, time.Millisecond*75) | ||
| } | ||
|
|
||
| func Test_DialLimitShouldNotBeCalled_OnSuccessClose(t *testing.T) { | ||
| t.Cleanup(func() { goleak.VerifyNone(t) }) | ||
|
|
||
| var cc = new(myConnection) | ||
| var myChain = chain.NewNetworkServiceClient( | ||
| metadata.NewClient(), | ||
| clientconn.NewClient(cc), | ||
| limit.NewClient(limit.WithDialLimit(time.Second/5)), | ||
| ) | ||
|
|
||
| _, _ = myChain.Request(context.Background(), &networkservice.NetworkServiceRequest{}) | ||
| _, _ = myChain.Close(context.Background(), &networkservice.Connection{}) | ||
|
|
||
| require.Never(t, func() bool { | ||
| return cc.closed.Load() | ||
| }, time.Second/2, time.Millisecond*75) | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,33 @@ | ||
| // Copyright (c) 2024 Cisco and/or its affiliates. | ||
| // | ||
| // SPDX-License-Identifier: Apache-2.0 | ||
| // | ||
| // Licensed under the Apache License, Version 2.0 (the "License"); | ||
| // you may not use this file except in compliance with the License. | ||
| // You may obtain a copy of the License at: | ||
| // | ||
| // http://www.apache.org/licenses/LICENSE-2.0 | ||
| // | ||
| // Unless required by applicable law or agreed to in writing, software | ||
| // distributed under the License is distributed on an "AS IS" BASIS, | ||
| // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| // See the License for the specific language governing permissions and | ||
| // limitations under the License. | ||
|
|
||
| package limit | ||
|
|
||
| import "time" | ||
|
|
||
| type limitConfig struct { | ||
| dialLimit time.Duration | ||
| } | ||
|
|
||
| // Option overrides default values | ||
| type Option func(cfg *limitConfig) | ||
|
|
||
| // WithDialLimit sets dial time limit | ||
| func WithDialLimit(t time.Duration) Option { | ||
| return Option(func(cfg *limitConfig) { | ||
| cfg.dialLimit = t | ||
| }) | ||
| } |
Oops, something went wrong.