Pr fix connect server

pkg/networkservice/common/clienturl/client.go

@@ -22,15 +22,15 @@ import (
 	"context"
 	"sync"
 
-	"github.com/networkservicemesh/sdk/pkg/networkservice/chains/client"
-	"github.com/networkservicemesh/sdk/pkg/tools/clienturlctx"
-
 	"github.com/golang/protobuf/ptypes/empty"
-	"github.com/networkservicemesh/api/pkg/api/networkservice"
 	"github.com/pkg/errors"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/connectivity"
 
+	"github.com/networkservicemesh/api/pkg/api/networkservice"
+
+	"github.com/networkservicemesh/sdk/pkg/networkservice/chains/client"
+	"github.com/networkservicemesh/sdk/pkg/tools/clienturlctx"
 	"github.com/networkservicemesh/sdk/pkg/tools/grpcutils"
 )
 
@@ -76,11 +76,16 @@ func (u *clientURLClient) init() error {
 			u.dialErr = errors.New("cannot dial nil clienturl.ClientURL(ctx)")
 			return
 		}
+
+		ctx, cancel := context.WithTimeout(u.ctx, dialTimeout)
+		defer cancel()
+
 		var cc *grpc.ClientConn
-		cc, u.dialErr = grpc.DialContext(u.ctx, grpcutils.URLToTarget(clientURL), u.dialOptions...)
+		cc, u.dialErr = grpc.DialContext(ctx, grpcutils.URLToTarget(clientURL), u.dialOptions...)
 		if u.dialErr != nil {
 			return
 		}
+
 		u.client = u.clientFactory(u.ctx, cc)
 
 		go func() {
@@ -97,5 +102,6 @@ func (u *clientURLClient) init() error {
 			}
 		}()
 	})
+
 	return u.dialErr
 }

pkg/networkservice/common/clienturl/const.go

@@ -0,0 +1,21 @@
+// Copyright (c) 2021 Doc.ai 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 clienturl
+
+import "time"
+
+const dialTimeout = 100 * time.Millisecond

pkg/networkservice/common/connect/README.md

@@ -21,7 +21,7 @@ return without error.
 ## connectServer
 
 `connectServer` keeps `connInfos` [connectionInfoMap](https://github.com/networkservicemesh/pkg/networkservice/common/connect/gen.go#25)
-mapping incoming server `Connection.ID` to the remote server URL and to the client chain assigned to this URL, and `clients` [clientmap.RefcountMap](https://github.com/networkservicemesh/sdk/blob/master/pkg/tools/clientmap/refcount.go)
+mapping incoming server `Connection.ID` to the remote server URL and to the client chain assigned to this URL
 mapping remote server URL to a [clienturl.NewClient(...)](https://github.com/networkservicemesh/sdk/blob/master/pkg/networkservice/common/clienturl/client.go)
 which handles the instantiation and management of the client connection from the `clienturl.ClientURL(ctx)` of the server
 Request. Notably, on every [clienturl.NewClient(...)](https://github.com/networkservicemesh/sdk/blob/master/pkg/networkservice/common/clienturl/client.go)
@@ -46,6 +46,3 @@ Concurrency is primarily managed through type-specific wrappers of [sync.Map](ht
 > Go map paired with a separate Mutex or RWMutex.
 
 This is precisely our case.
-
-[clientmap.RefcountMap](https://github.com/networkservicemesh/sdk/blob/master/pkg/tools/clientmap/refcount.go#L43) utilizes
-a simple atomic refcount, which is also highly performant.

pkg/networkservice/common/connect/gen.go

@@ -1,4 +1,4 @@
-// Copyright (c) 2020 Doc.ai and/or its affiliates.
+// Copyright (c) 2020-2021 Doc.ai and/or its affiliates.
 //
 // SPDX-License-Identifier: Apache-2.0
 //
@@ -21,5 +21,7 @@ import (
 )
 
 //go:generate go-syncmap -output connection_info_map.gen.go -type connectionInfoMap<string,connectionInfo>
+//go:generate go-syncmap -output client_info_map.gen.go -type clientInfoMap<string,*clientInfo>
 
 type connectionInfoMap sync.Map
+type clientInfoMap sync.Map