Merge "rpc/test: Make TestReplayAttack work with separated blessingsFlow."
diff --git a/runtime/internal/flow/manager/manager.go b/runtime/internal/flow/manager/manager.go
index f413de6..01ebcc8 100644
--- a/runtime/internal/flow/manager/manager.go
+++ b/runtime/internal/flow/manager/manager.go
@@ -45,14 +45,14 @@
func NewWithBlessings(ctx *context.T, serverBlessings security.Blessings, rid naming.RoutingID) flow.Manager {
m := &manager{
- rid: rid,
- closed: make(chan struct{}),
- cache: NewConnCache(),
- ctx: ctx,
- serverBlessings: serverBlessings,
- serverNames: security.BlessingNames(v23.GetPrincipal(ctx), serverBlessings),
+ rid: rid,
+ closed: make(chan struct{}),
+ cache: NewConnCache(),
+ ctx: ctx,
}
if rid != naming.NullRoutingID {
+ m.serverBlessings = serverBlessings
+ m.serverNames = security.BlessingNames(v23.GetPrincipal(ctx), serverBlessings)
m.ls = &listenState{
q: upcqueue.New(),
listeners: []flow.Listener{},
diff --git a/services/syncbase/vsync/sync.go b/services/syncbase/vsync/sync.go
index 99a4a6e..60b6b58 100644
--- a/services/syncbase/vsync/sync.go
+++ b/services/syncbase/vsync/sync.go
@@ -229,7 +229,14 @@
for !s.Closed() {
select {
- case update := <-ch:
+ case update, ok := <-ch:
+ if s.Closed() {
+ break
+ }
+ if !ok {
+ vlog.VI(1).Info("sync: discoverPeers: scan cancelled, stop listening and exit")
+ return
+ }
switch u := update.(type) {
case discovery.UpdateFound:
svc := &u.Value.Service
diff --git a/test/goroutines/goroutines.go b/test/goroutines/goroutines.go
index c83011e..1169906 100644
--- a/test/goroutines/goroutines.go
+++ b/test/goroutines/goroutines.go
@@ -21,6 +21,7 @@
var ignoredGoroutines = []string{
"runtime.ensureSigM",
+ "sync.(*WaitGroup).Done",
}
type Goroutine struct {
