-
Notifications
You must be signed in to change notification settings - Fork 510
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[FAB-9412] Remove stream from connection
The comm/connection should be split into two: connection and streamconnection since not all connections have a stream. Change-Id: I4bb106f2097842ab8606dd0890bb2c39ac4575a8 Signed-off-by: Bob Stasyszyn <Bob.Stasyszyn@securekey.com>
- Loading branch information
1 parent
3e7d1d1
commit 9f82f8e
Showing
6 changed files
with
190 additions
and
87 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
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,94 @@ | ||
| /* | ||
| Copyright SecureKey Technologies Inc. All Rights Reserved. | ||
| SPDX-License-Identifier: Apache-2.0 | ||
| */ | ||
|
|
||
| package comm | ||
|
|
||
| import ( | ||
| "sync" | ||
|
|
||
| "github.com/pkg/errors" | ||
|
|
||
| "github.com/hyperledger/fabric-sdk-go/pkg/client/common/verifier" | ||
| "github.com/hyperledger/fabric-sdk-go/pkg/common/options" | ||
| fabcontext "github.com/hyperledger/fabric-sdk-go/pkg/common/providers/context" | ||
| "github.com/hyperledger/fabric-sdk-go/pkg/common/providers/fab" | ||
| "google.golang.org/grpc" | ||
| "google.golang.org/grpc/credentials" | ||
| "google.golang.org/grpc/peer" | ||
| ) | ||
|
|
||
| // StreamProvider creates a GRPC stream | ||
| type StreamProvider func(conn *grpc.ClientConn) (grpc.ClientStream, error) | ||
|
|
||
| // StreamConnection manages the GRPC connection and client stream | ||
| type StreamConnection struct { | ||
| *GRPCConnection | ||
| stream grpc.ClientStream | ||
| lock sync.Mutex | ||
| } | ||
|
|
||
| // NewStreamConnection creates a new connection with stream | ||
| func NewStreamConnection(ctx fabcontext.Client, chConfig fab.ChannelCfg, streamProvider StreamProvider, url string, opts ...options.Opt) (*StreamConnection, error) { | ||
| conn, err := NewConnection(ctx, chConfig, url, opts...) | ||
| if err != nil { | ||
| return nil, err | ||
| } | ||
|
|
||
| stream, err := streamProvider(conn.conn) | ||
| if err != nil { | ||
| conn.commManager.ReleaseConn(conn.conn) | ||
| return nil, errors.Wrapf(err, "could not create stream to %s", url) | ||
| } | ||
|
|
||
| if stream == nil { | ||
| return nil, errors.New("unexpected nil stream received from provider") | ||
| } | ||
|
|
||
| peer, ok := peer.FromContext(stream.Context()) | ||
| if !ok || peer == nil { | ||
| //return error - certificate is not available | ||
| return nil, errors.Wrapf(err, "No peer cert in GRPC stream") | ||
|
|
||
| } | ||
|
|
||
| if peer.AuthInfo != nil { | ||
| tlsInfo := peer.AuthInfo.(credentials.TLSInfo) | ||
| for _, peercert := range tlsInfo.State.PeerCertificates { | ||
| err := verifier.ValidateCertificateDates(peercert) | ||
| if err != nil { | ||
| logger.Error(err) | ||
| return nil, errors.Wrapf(err, "error validating certificate dates for [%v]", peercert.Subject) | ||
| } | ||
| } | ||
| } | ||
|
|
||
| return &StreamConnection{ | ||
| GRPCConnection: conn, | ||
| stream: stream, | ||
| }, nil | ||
| } | ||
|
|
||
| // Close closes the connection | ||
| func (c *StreamConnection) Close() { | ||
| c.lock.Lock() | ||
| defer c.lock.Unlock() | ||
|
|
||
| if c.Closed() { | ||
| return | ||
| } | ||
|
|
||
| logger.Debug("Closing stream....") | ||
| if err := c.stream.CloseSend(); err != nil { | ||
| logger.Warnf("error closing GRPC stream: %s", err) | ||
| } | ||
|
|
||
| c.GRPCConnection.Close() | ||
| } | ||
|
|
||
| // Stream returns the GRPC stream | ||
| func (c *StreamConnection) Stream() grpc.Stream { | ||
| return c.stream | ||
| } |
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,80 @@ | ||
| /* | ||
| Copyright SecureKey Technologies Inc. All Rights Reserved. | ||
| SPDX-License-Identifier: Apache-2.0 | ||
| */ | ||
|
|
||
| package comm | ||
|
|
||
| import ( | ||
| "context" | ||
| "testing" | ||
| "time" | ||
|
|
||
| "google.golang.org/grpc/keepalive" | ||
|
|
||
| fabmocks "github.com/hyperledger/fabric-sdk-go/pkg/fab/mocks" | ||
|
|
||
| pb "github.com/hyperledger/fabric-sdk-go/third_party/github.com/hyperledger/fabric/protos/peer" | ||
| "github.com/pkg/errors" | ||
| "google.golang.org/grpc" | ||
| ) | ||
|
|
||
| var testStream = func(grpcconn *grpc.ClientConn) (grpc.ClientStream, error) { | ||
| return pb.NewDeliverClient(grpcconn).Deliver(context.Background()) | ||
| } | ||
|
|
||
| var invalidStream = func(grpcconn *grpc.ClientConn) (grpc.ClientStream, error) { | ||
| return nil, errors.New("simulated error creating stream") | ||
| } | ||
|
|
||
| func TestStreamConnection(t *testing.T) { | ||
| channelID := "testchannel" | ||
|
|
||
| context := newMockContext() | ||
| chConfig := fabmocks.NewMockChannelCfg(channelID) | ||
|
|
||
| _, err := NewStreamConnection(context, chConfig, testStream, "") | ||
| if err == nil { | ||
| t.Fatalf("expected error creating new connection with empty URL") | ||
| } | ||
| _, err = NewStreamConnection(context, chConfig, testStream, "invalidhost:0000", | ||
| WithFailFast(true), | ||
| WithCertificate(nil), | ||
| WithInsecure(), | ||
| WithHostOverride(""), | ||
| WithKeepAliveParams(keepalive.ClientParameters{}), | ||
| WithConnectTimeout(3*time.Second), | ||
| ) | ||
| if err == nil { | ||
| t.Fatalf("expected error creating new connection with invalid URL") | ||
| } | ||
| _, err = NewStreamConnection(context, chConfig, invalidStream, peerURL) | ||
| if err == nil { | ||
| t.Fatalf("expected error creating new connection with invalid stream but got none") | ||
| } | ||
|
|
||
| conn, err := NewStreamConnection(context, chConfig, testStream, peerURL) | ||
| if err != nil { | ||
| t.Fatalf("error creating new connection: %s", err) | ||
| } | ||
| if conn.Closed() { | ||
| t.Fatalf("expected connection to be open") | ||
| } | ||
| if conn.Stream() == nil { | ||
| t.Fatalf("got invalid stream") | ||
| } | ||
| if _, err := context.Serialize(); err != nil { | ||
| t.Fatalf("error getting identity") | ||
| } | ||
|
|
||
| time.Sleep(1 * time.Second) | ||
|
|
||
| conn.Close() | ||
| if !conn.Closed() { | ||
| t.Fatalf("expected connection to be closed") | ||
| } | ||
|
|
||
| // Calling close again should be ignored | ||
| conn.Close() | ||
| } |
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
Oops, something went wrong.