aarifullin/frostfs-node
1
0
Fork 0
forked from TrueCloudLab/frostfs-node
Code Issues Pull requests Projects Releases Packages Wiki Activity

[#1446] services/tree: Use grpc.WithInsecure only for nodes without TLS

Browse source 
Signed-off-by: Evgenii Stratonikov <evgeniy@nspcc.ru>
This commit is contained in:
Evgenii Stratonikov 2022-05-30 20:33:54 +03:00 committed by fyrchik
parent ad3038d16d
commit a2edfec0c3
1 changed files with 10 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
pkg/services/tree/cache.go
View file

@ -2,6 +2,7 @@ package tree
import (
"context"
"strings"
"sync"
"time"
@ -59,10 +60,16 @@ func dialTreeService(ctx context.Context, netmapAddr string) (*grpc.ClientConn,
return nil, err
}
opts := make([]grpc.DialOption, 1, 2)
opts[0] = grpc.WithBlock()
// FIXME(@fyrchik): ugly hack #1322
if !strings.HasPrefix(netAddr.URIAddr(), "grpcs:") {
opts = append(opts, grpc.WithInsecure())
}
ctx, cancel := context.WithTimeout(ctx, defaultClientConnectTimeout)
cc, err := grpc.DialContext(ctx, netAddr.URIAddr(),
grpc.WithInsecure(),
grpc.WithBlock())
cc, err := grpc.DialContext(ctx, netAddr.URIAddr(), opts...)
cancel()
return cc, err