-
Notifications
You must be signed in to change notification settings - Fork 8.9k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[FAB-2828] DeliveryService: Connection Producer
This commit is part of [FAB-2828] and its goal is to create a connection producer object, which will be used for: 1) Selecting new endpoints once connection is broken 2) Preparing for a shared connection pool between channels in case connecting to the same ordering service instance on different channels. Signed-off-by: Yacov Manevich <yacovm@il.ibm.com> Change-Id: Ia176614a9394b249dca3eafde7e16d86cea0331f
- Loading branch information
Showing
2 changed files
with
223 additions
and
0 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 |
---|---|---|
@@ -0,0 +1,112 @@ | ||
/* | ||
Copyright IBM Corp. 2017 All Rights Reserved. | ||
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 comm | ||
|
||
import ( | ||
"fmt" | ||
"math/rand" | ||
"sync" | ||
|
||
"github.com/op/go-logging" | ||
"google.golang.org/grpc" | ||
) | ||
|
||
var logger = logging.MustGetLogger("ConnProducer") | ||
|
||
// ConnectionFactory creates a connection to a certain endpoint | ||
type ConnectionFactory func(endpoint string) (*grpc.ClientConn, error) | ||
|
||
// ConnectionProducer produces connections out of a set of predefined | ||
// endpoints | ||
type ConnectionProducer interface { | ||
// NewConnection creates a new connection. | ||
// Returns the connection, the endpoint selected, nil on success. | ||
// Returns nil, "", error on failure | ||
NewConnection() (*grpc.ClientConn, string, error) | ||
// UpdateEndpoints updates the endpoints of the ConnectionProducer | ||
// to be the given endpoints | ||
UpdateEndpoints(endpoints []string) | ||
} | ||
|
||
type connProducer struct { | ||
sync.RWMutex | ||
endpoints []string | ||
connect ConnectionFactory | ||
} | ||
|
||
// NewConnectionProducer creates a new ConnectionProducer with given endpoints and connection factory. | ||
// It returns nil, if the given endpoints slice is empty. | ||
func NewConnectionProducer(factory ConnectionFactory, endpoints []string) ConnectionProducer { | ||
if len(endpoints) == 0 { | ||
return nil | ||
} | ||
return &connProducer{endpoints: endpoints, connect: factory} | ||
} | ||
|
||
// NewConnection creates a new connection. | ||
// Returns the connection, the endpoint selected, nil on success. | ||
// Returns nil, "", error on failure | ||
func (cp *connProducer) NewConnection() (*grpc.ClientConn, string, error) { | ||
cp.RLock() | ||
defer cp.RUnlock() | ||
|
||
endpoints := shuffle(cp.endpoints) | ||
for _, endpoint := range endpoints { | ||
conn, err := cp.connect(endpoint) | ||
if err != nil { | ||
logger.Error("Failed connecting to", endpoint, ", error:", err) | ||
continue | ||
} | ||
return conn, endpoint, nil | ||
} | ||
return nil, "", fmt.Errorf("Could not connect to any of the endpoints: %v", endpoints) | ||
} | ||
|
||
// UpdateEndpoints updates the endpoints of the ConnectionProducer | ||
// to be the given endpoints | ||
func (cp *connProducer) UpdateEndpoints(endpoints []string) { | ||
if len(endpoints) == 0 { | ||
// Ignore updates with empty endpoints | ||
return | ||
} | ||
cp.Lock() | ||
defer cp.Unlock() | ||
cp.endpoints = endpoints | ||
} | ||
|
||
func shuffle(a []string) []string { | ||
n := len(a) | ||
returnedSlice := make([]string, n) | ||
indices := rand.Perm(n) | ||
for i, idx := range indices { | ||
returnedSlice[i] = a[idx] | ||
} | ||
return returnedSlice | ||
} | ||
|
||
// filterOut receives a slice of strings and a string to filter out | ||
// and returns the slice without the string | ||
func filterOut(a []string, filteredOut string) []string { | ||
var slice2Return []string | ||
for _, s := range a { | ||
if s == filteredOut { | ||
continue | ||
} | ||
slice2Return = append(slice2Return, s) | ||
} | ||
return slice2Return | ||
} |
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,111 @@ | ||
/* | ||
Copyright IBM Corp. 2017 All Rights Reserved. | ||
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 comm | ||
|
||
import ( | ||
"fmt" | ||
"testing" | ||
|
||
"github.com/stretchr/testify/assert" | ||
"google.golang.org/grpc" | ||
) | ||
|
||
type connMock struct { | ||
*grpc.ClientConn | ||
endpoint string | ||
} | ||
|
||
func TestEmptyEndpoints(t *testing.T) { | ||
noopFactory := func(endpoint string) (*grpc.ClientConn, error) { | ||
return nil, nil | ||
} | ||
assert.Nil(t, NewConnectionProducer(noopFactory, []string{})) | ||
} | ||
|
||
func TestConnFailures(t *testing.T) { | ||
conn2Endpoint := make(map[string]string) | ||
shouldConnFail := map[string]bool{ | ||
"a": true, | ||
"b": false, | ||
"c": false, | ||
} | ||
connFactory := func(endpoint string) (*grpc.ClientConn, error) { | ||
conn := &grpc.ClientConn{} | ||
conn2Endpoint[fmt.Sprintf("%p", conn)] = endpoint | ||
if !shouldConnFail[endpoint] { | ||
return conn, nil | ||
} | ||
return nil, fmt.Errorf("Failed connecting to %s", endpoint) | ||
} | ||
// Create a producer with some endpoints, and have the first one fail and all others not fail | ||
producer := NewConnectionProducer(connFactory, []string{"a", "b", "c"}) | ||
conn, _, err := producer.NewConnection() | ||
assert.NoError(t, err) | ||
// We should not return 'a' because connecting to 'a' fails | ||
assert.NotEqual(t, "a", conn2Endpoint[fmt.Sprintf("%p", conn)]) | ||
// Now, revive 'a' | ||
shouldConnFail["a"] = false | ||
// Try obtaining a connection 1000 times in order to ensure selection is shuffled | ||
selected := make(map[string]struct{}) | ||
for i := 0; i < 1000; i++ { | ||
conn, _, err := producer.NewConnection() | ||
assert.NoError(t, err) | ||
selected[conn2Endpoint[fmt.Sprintf("%p", conn)]] = struct{}{} | ||
} | ||
// The probability of a, b or c not to be selected is really small | ||
_, isAselected := selected["a"] | ||
_, isBselected := selected["b"] | ||
_, isCselected := selected["c"] | ||
assert.True(t, isBselected) | ||
assert.True(t, isCselected) | ||
assert.True(t, isAselected) | ||
|
||
// Now, make every host fail | ||
shouldConnFail["a"] = true | ||
shouldConnFail["b"] = true | ||
shouldConnFail["c"] = true | ||
conn, _, err = producer.NewConnection() | ||
assert.Nil(t, conn) | ||
assert.Error(t, err) | ||
} | ||
|
||
func TestUpdateEndpoints(t *testing.T) { | ||
conn2Endpoint := make(map[string]string) | ||
connFactory := func(endpoint string) (*grpc.ClientConn, error) { | ||
conn := &grpc.ClientConn{} | ||
conn2Endpoint[fmt.Sprintf("%p", conn)] = endpoint | ||
return conn, nil | ||
} | ||
// Create a producer with a single endpoint | ||
producer := NewConnectionProducer(connFactory, []string{"a"}) | ||
conn, a, err := producer.NewConnection() | ||
assert.NoError(t, err) | ||
assert.Equal(t, "a", conn2Endpoint[fmt.Sprintf("%p", conn)]) | ||
assert.Equal(t, "a", a) | ||
// Now update the endpoint and check that when we create a new connection, | ||
// we don't connect to the previous endpoint | ||
producer.UpdateEndpoints([]string{"b"}) | ||
conn, b, err := producer.NewConnection() | ||
assert.NoError(t, err) | ||
assert.NotEqual(t, "a", conn2Endpoint[fmt.Sprintf("%p", conn)]) | ||
assert.Equal(t, "b", conn2Endpoint[fmt.Sprintf("%p", conn)]) | ||
assert.Equal(t, "b", b) | ||
// Next, ensure an empty update is ignored | ||
producer.UpdateEndpoints([]string{}) | ||
conn, _, err = producer.NewConnection() | ||
assert.Equal(t, "b", conn2Endpoint[fmt.Sprintf("%p", conn)]) | ||
} |