Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -59,8 +59,10 @@ jobs:
username: ${{ secrets.CLOUDSMITH_CICD_USER }}
password: ${{ secrets.CLOUDSMITH_CICD_TOKEN }}

- name: Misc tests
run: go test --count=1 -v ./kurrentdb -run TestMisc
- name: Unit tests
run: |
go test --count=1 -v ./kurrentdb
go test --count=1 -v ./test -run TestMisc

- name: Start KurrentDB
run: make start-kurrentdb
Expand Down
44 changes: 22 additions & 22 deletions kurrentdb/client.go
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ func (client *Client) AppendToStream(
events ...EventData,
) (*WriteResult, error) {
opts.setDefaults()
handle, err := client.grpcClient.getConnectionHandle()
handle, err := client.grpcClient.getConnectionHandle(context)
Comment thread
w1am marked this conversation as resolved.
Resolved
if err != nil {
return nil, err
}
Expand Down Expand Up @@ -203,7 +203,7 @@ func (client *Client) MultiStreamAppend(
}
}

handle, err := client.grpcClient.getConnectionHandle()
handle, err := client.grpcClient.getConnectionHandle(context)
if err != nil {
return nil, err
}
Expand Down Expand Up @@ -326,7 +326,7 @@ func (client *Client) AppendRecords(
}
}

handle, err := client.grpcClient.getConnectionHandle()
handle, err := client.grpcClient.getConnectionHandle(context)
if err != nil {
return nil, err
}
Expand Down Expand Up @@ -501,7 +501,7 @@ func (client *Client) DeleteStream(
opts DeleteStreamOptions,
) (*DeleteResult, error) {
opts.setDefaults()
handle, err := client.grpcClient.getConnectionHandle()
handle, err := client.grpcClient.getConnectionHandle(parent)
if err != nil {
return nil, err
}
Expand Down Expand Up @@ -531,7 +531,7 @@ func (client *Client) TombstoneStream(
opts TombstoneStreamOptions,
) (*DeleteResult, error) {
opts.setDefaults()
handle, err := client.grpcClient.getConnectionHandle()
handle, err := client.grpcClient.getConnectionHandle(parent)
if err != nil {
return nil, err
}
Expand Down Expand Up @@ -560,7 +560,7 @@ func (client *Client) ReadStream(
) (*ReadStream, error) {
opts.setDefaults()
readRequest := toReadStreamRequest(streamID, opts.Direction, opts.From, count, opts.ResolveLinkTos)
handle, err := client.grpcClient.getConnectionHandle()
handle, err := client.grpcClient.getConnectionHandle(context)
if err != nil {
return nil, err
}
Expand All @@ -576,7 +576,7 @@ func (client *Client) ReadAll(
count uint64,
) (*ReadStream, error) {
opts.setDefaults()
handle, err := client.grpcClient.getConnectionHandle()
handle, err := client.grpcClient.getConnectionHandle(context)
if err != nil {
return nil, err
}
Expand All @@ -595,7 +595,7 @@ func (client *Client) SubscribeToStream(
opts SubscribeToStreamOptions,
) (*Subscription, error) {
opts.setDefaults()
handle, err := client.grpcClient.getConnectionHandle()
handle, err := client.grpcClient.getConnectionHandle(parent)
if err != nil {
return nil, err
}
Expand Down Expand Up @@ -640,7 +640,7 @@ func (client *Client) SubscribeToAll(
opts SubscribeToAllOptions,
) (*Subscription, error) {
opts.setDefaults()
handle, err := client.grpcClient.getConnectionHandle()
handle, err := client.grpcClient.getConnectionHandle(parent)
if err != nil {
return nil, err
}
Expand Down Expand Up @@ -693,7 +693,7 @@ func (client *Client) SubscribeToPersistentSubscription(
options SubscribeToPersistentSubscriptionOptions,
) (*PersistentSubscription, error) {
options.setDefaults()
handle, err := client.grpcClient.getConnectionHandle()
handle, err := client.grpcClient.getConnectionHandle(ctx)
if err != nil {
return nil, err
}
Expand All @@ -718,7 +718,7 @@ func (client *Client) SubscribeToPersistentSubscriptionToAll(
options SubscribeToPersistentSubscriptionOptions,
) (*PersistentSubscription, error) {
options.setDefaults()
handle, err := client.grpcClient.getConnectionHandle()
handle, err := client.grpcClient.getConnectionHandle(ctx)
if err != nil {
return nil, err
}
Expand Down Expand Up @@ -751,7 +751,7 @@ func (client *Client) CreatePersistentSubscription(
options PersistentStreamSubscriptionOptions,
) error {
options.setDefaults()
handle, err := client.grpcClient.getConnectionHandle()
handle, err := client.grpcClient.getConnectionHandle(ctx)
if err != nil {
return err
}
Expand All @@ -776,7 +776,7 @@ func (client *Client) CreatePersistentSubscriptionToAll(
options PersistentAllSubscriptionOptions,
) error {
options.setDefaults()
handle, err := client.grpcClient.getConnectionHandle()
handle, err := client.grpcClient.getConnectionHandle(ctx)
if err != nil {
return err
}
Expand Down Expand Up @@ -818,7 +818,7 @@ func (client *Client) UpdatePersistentSubscription(
options PersistentStreamSubscriptionOptions,
) error {
options.setDefaults()
handle, err := client.grpcClient.getConnectionHandle()
handle, err := client.grpcClient.getConnectionHandle(ctx)
if err != nil {
return err
}
Expand All @@ -839,7 +839,7 @@ func (client *Client) UpdatePersistentSubscriptionToAll(
options PersistentAllSubscriptionOptions,
) error {
options.setDefaults()
handle, err := client.grpcClient.getConnectionHandle()
handle, err := client.grpcClient.getConnectionHandle(ctx)
if err != nil {
return err
}
Expand All @@ -860,7 +860,7 @@ func (client *Client) DeletePersistentSubscription(
groupName string,
options DeletePersistentSubscriptionOptions,
) error {
handle, err := client.grpcClient.getConnectionHandle()
handle, err := client.grpcClient.getConnectionHandle(ctx)
if err != nil {
return err
}
Expand All @@ -875,7 +875,7 @@ func (client *Client) DeletePersistentSubscriptionToAll(
groupName string,
options DeletePersistentSubscriptionOptions,
) error {
handle, err := client.grpcClient.getConnectionHandle()
handle, err := client.grpcClient.getConnectionHandle(ctx)
if err != nil {
return err
}
Expand All @@ -900,7 +900,7 @@ func (client *Client) ReplayParkedMessagesToAll(ctx context.Context, groupName s
}

func (client *Client) replayParkedMessages(ctx context.Context, streamName string, groupName string, options ReplayParkedMessagesOptions) error {
handle, err := client.grpcClient.getConnectionHandle()
handle, err := client.grpcClient.getConnectionHandle(ctx)
if err != nil {
return err
}
Expand Down Expand Up @@ -939,7 +939,7 @@ func (client *Client) ListPersistentSubscriptionsToAll(ctx context.Context, opti
}

func (client *Client) listPersistentSubscriptionsInternal(ctx context.Context, streamName *string, options ListPersistentSubscriptionsOptions) ([]PersistentSubscriptionInfo, error) {
handle, err := client.grpcClient.getConnectionHandle()
handle, err := client.grpcClient.getConnectionHandle(ctx)
if err != nil {
return nil, err
}
Expand Down Expand Up @@ -971,7 +971,7 @@ func (client *Client) GetPersistentSubscriptionInfoToAll(ctx context.Context, gr
}

func (client *Client) getPersistentSubscriptionInfoInternal(ctx context.Context, streamName *string, groupName string, options GetPersistentSubscriptionOptions) (*PersistentSubscriptionInfo, error) {
handle, err := client.grpcClient.getConnectionHandle()
handle, err := client.grpcClient.getConnectionHandle(ctx)
if err != nil {
return nil, err
}
Expand All @@ -996,7 +996,7 @@ func (client *Client) getPersistentSubscriptionInfoInternal(ctx context.Context,

// RestartPersistentSubscriptionSubsystem Restarts the persistent subscription subsystem on the server.
func (client *Client) RestartPersistentSubscriptionSubsystem(ctx context.Context, options RestartPersistentSubscriptionSubsystemOptions) error {
handle, err := client.grpcClient.getConnectionHandle()
handle, err := client.grpcClient.getConnectionHandle(ctx)
if err != nil {
return err
}
Expand Down Expand Up @@ -1041,7 +1041,7 @@ func readInternal(
}

func (client *Client) Gossip(ctx context.Context) ([]*gossip.MemberInfo, error) {
handle, err := client.grpcClient.getConnectionHandle()
handle, err := client.grpcClient.getConnectionHandle(ctx)

if err != nil {
return nil, err
Expand Down
81 changes: 81 additions & 0 deletions kurrentdb/connection_test.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,81 @@
package kurrentdb

import (
"context"
"net"
"testing"
"time"

"github.com/stretchr/testify/require"
)

func TestDiscoveryFailureReleasesConcurrentCallers(t *testing.T) {
listener, err := net.Listen("tcp", "127.0.0.1:0")
require.NoError(t, err)
defer listener.Close()

config, err := ParseConnectionString("kurrentdb://" + listener.Addr().String() + "?tls=false&maxDiscoverAttempts=1&gossipTimeout=1&discoveryInterval=100")
require.NoError(t, err)

for _, timeout := range []time.Duration{0, 250 * time.Millisecond} {
client, err := NewClient(config)
require.NoError(t, err)

errs := make(chan error, 2)
for i := 0; i < 2; i++ {
go func() {
ctx := context.Background()
if timeout > 0 {
var cancel context.CancelFunc
ctx, cancel = context.WithTimeout(ctx, timeout)
defer cancel()
}
_, err := client.ReadStream(ctx, "repro", ReadStreamOptions{}, 1)
errs <- err
}()
}

for i := 0; i < 2; i++ {
select {
case err := <-errs:
require.Error(t, err)
if timeout == 0 {
require.ErrorContains(t, err, "maximum discovery attempt count reached")
}
case <-time.After(5 * time.Second):
t.Fatalf("caller still blocked (timeout %v)", timeout)
}
}

require.NoError(t, client.Close())
}
}

func TestCloseReleasesCallerDuringDiscovery(t *testing.T) {
listener, err := net.Listen("tcp", "127.0.0.1:0")
require.NoError(t, err)
defer listener.Close()

config, err := ParseConnectionString("kurrentdb://" + listener.Addr().String() + "?tls=false&maxDiscoverAttempts=10&gossipTimeout=5")
require.NoError(t, err)

client, err := NewClient(config)
require.NoError(t, err)

errs := make(chan error, 1)
go func() {
_, err := client.ReadStream(context.Background(), "repro", ReadStreamOptions{}, 1)
errs <- err
}()

time.Sleep(100 * time.Millisecond)
require.NoError(t, client.Close())

select {
case err := <-errs:
kurrentErr, _ := FromError(err)
require.Equal(t, ErrorCodeConnectionClosed, kurrentErr.Code())
case <-time.After(time.Second):
t.Fatal("caller still blocked after Close")
}
}
23 changes: 8 additions & 15 deletions kurrentdb/endpoint.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ import (
"strconv"
"strings"
"sync"
"sync/atomic"

"google.golang.org/grpc/credentials"
)
Expand Down Expand Up @@ -90,21 +89,15 @@ func clientPerRPCCredentials(config Configuration) credentials.PerRPCCredentials
}

func newGrpcClient(config Configuration) *grpcClient {
channel := make(chan msg)
closeFlag := new(int32)
logger := logger{
callback: config.Logger,
}

atomic.StoreInt32(closeFlag, 0)

go connectionStateMachine(config, closeFlag, channel, &logger)

return &grpcClient{
channel: channel,
closeFlag: closeFlag,
client := &grpcClient{
channel: make(chan msg),
done: make(chan struct{}),
once: new(sync.Once),
logger: &logger,
logger: &logger{callback: config.Logger},
perRPCCredentials: clientPerRPCCredentials(config),
}

go connectionStateMachine(config, client)

return client
}
Loading
Loading