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
7 changes: 1 addition & 6 deletions core/pkg/sync/grpc/grpc_sync.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ import (
"context"
"fmt"
"math"
msync "sync"
"time"

"buf.build/gen/go/open-feature/flagd/grpc/go/flagd/sync/v1/syncv1grpc"
Expand Down Expand Up @@ -42,8 +41,6 @@ type FlagSyncServiceClientResponse interface {
syncv1grpc.FlagSyncService_SyncFlagsClient
}

var once msync.Once

type Sync struct {
GrpcDialOptionsOverride []grpc.DialOption
CertPath string
Expand Down Expand Up @@ -208,9 +205,7 @@ func (g *Sync) connectWithRetry(

// handleFlagSync wraps the stream listening and push updates through dataSync channel
func (g *Sync) handleFlagSync(stream syncv1grpc.FlagSyncService_SyncFlagsClient, dataSync chan<- sync.DataSync) error {
once.Do(func() {
g.ready = true
})
g.ready = true

for {
data, err := stream.Recv()
Expand Down
59 changes: 59 additions & 0 deletions core/pkg/sync/grpc/grpc_sync_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -338,6 +338,65 @@ func Test_StreamListener(t *testing.T) {
}
}

// Test_MultipleSyncsBecomeReady ensures readiness is tracked per Sync instance.
// flagd builds a distinct *grpc.Sync per configured grpc source, and the runtime
// only reports ready once every Sync.IsReady() is true. A shared, package-level
// guard around g.ready would let only the first instance report ready, leaving any
// flagd with 2+ grpc sources permanently NotReady. Both instances must become ready.
func Test_MultipleSyncsBecomeReady(t *testing.T) {
const target = "localBufCon"

newReadySync := func() *Sync {
bufCon := bufconn.Listen(5)
bufServer := bufferedServer{
listener: bufCon,
mockResponses: []serverPayload{{flags: "{\"flags\": {}}"}},
}
go serve(&bufServer)

dial, err := grpc.Dial(target,
grpc.WithContextDialer(func(ctx context.Context, s string) (net.Conn, error) {
return bufCon.Dial()
}),
grpc.WithTransportCredentials(insecure.NewCredentials()))
require.NoError(t, err)

return &Sync{
URI: target,
Logger: logger.NewLogger(nil, false),
client: syncv1grpc.NewFlagSyncServiceClient(dial),
}
}

syncs := []*Sync{newReadySync(), newReadySync()}

for i, s := range syncs {
require.Falsef(t, s.IsReady(), "sync %d should not be ready before sync starts", i)
}

for i, s := range syncs {
ctx, cancel := context.WithCancel(context.Background())
t.Cleanup(cancel)

syncChan := make(chan sync.DataSync, 1)
go func() {
if err := s.Sync(ctx, syncChan); err != nil && err != io.EOF {
t.Errorf("sync %d returned error: %s", i, err.Error())
}
}()

// Receiving a payload establishes that handleFlagSync ran (and set ready)
// for this instance before we read IsReady, keeping the check race-free.
select {
case <-syncChan:
case <-time.After(5 * time.Second):
t.Fatalf("timed out waiting for sync %d to emit", i)
}

require.Truef(t, s.IsReady(), "sync %d should be ready after its stream connects", i)
}
}

// Test_ConnectWithRetry is an attempt to validate grpc.connectWithRetry behavior
func Test_ConnectWithRetry(t *testing.T) {
target := "grpc://local"
Expand Down
Loading