remove rq
This commit is contained in:
@@ -36,6 +36,10 @@ func NewSubscriber(endpoints []string, key string, opts ...SubOption) (*Subscrib
|
|||||||
return sub, nil
|
return sub, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func (s *Subscriber) AddListener(listener func()) {
|
||||||
|
s.items.addListener(listener)
|
||||||
|
}
|
||||||
|
|
||||||
func (s *Subscriber) Values() []string {
|
func (s *Subscriber) Values() []string {
|
||||||
return s.items.getValues()
|
return s.items.getValues()
|
||||||
}
|
}
|
||||||
@@ -54,6 +58,7 @@ type container struct {
|
|||||||
mapping map[string]string
|
mapping map[string]string
|
||||||
snapshot atomic.Value
|
snapshot atomic.Value
|
||||||
dirty *syncx.AtomicBool
|
dirty *syncx.AtomicBool
|
||||||
|
listeners []func()
|
||||||
lock sync.Mutex
|
lock sync.Mutex
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -68,10 +73,12 @@ func newContainer(exclusive bool) *container {
|
|||||||
|
|
||||||
func (c *container) OnAdd(kv internal.KV) {
|
func (c *container) OnAdd(kv internal.KV) {
|
||||||
c.addKv(kv.Key, kv.Val)
|
c.addKv(kv.Key, kv.Val)
|
||||||
|
c.notifyChange()
|
||||||
}
|
}
|
||||||
|
|
||||||
func (c *container) OnDelete(kv internal.KV) {
|
func (c *container) OnDelete(kv internal.KV) {
|
||||||
c.removeKey(kv.Key)
|
c.removeKey(kv.Key)
|
||||||
|
c.notifyChange()
|
||||||
}
|
}
|
||||||
|
|
||||||
// addKv adds the kv, returns if there are already other keys associate with the value
|
// addKv adds the kv, returns if there are already other keys associate with the value
|
||||||
@@ -98,6 +105,12 @@ func (c *container) addKv(key, value string) ([]string, bool) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func (c *container) addListener(listener func()) {
|
||||||
|
c.lock.Lock()
|
||||||
|
c.listeners = append(c.listeners, listener)
|
||||||
|
c.lock.Unlock()
|
||||||
|
}
|
||||||
|
|
||||||
func (c *container) doRemoveKey(key string) {
|
func (c *container) doRemoveKey(key string) {
|
||||||
server, ok := c.mapping[key]
|
server, ok := c.mapping[key]
|
||||||
if !ok {
|
if !ok {
|
||||||
@@ -139,6 +152,16 @@ func (c *container) getValues() []string {
|
|||||||
return vals
|
return vals
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func (c *container) notifyChange() {
|
||||||
|
c.lock.Lock()
|
||||||
|
listeners := append(([]func())(nil), c.listeners...)
|
||||||
|
c.lock.Unlock()
|
||||||
|
|
||||||
|
for _, listener := range listeners {
|
||||||
|
listener()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
// removeKey removes the kv, returns true if there are still other keys associate with the value
|
// removeKey removes the kv, returns true if there are still other keys associate with the value
|
||||||
func (c *container) removeKey(key string) {
|
func (c *container) removeKey(key string) {
|
||||||
c.lock.Lock()
|
c.lock.Lock()
|
||||||
|
|||||||
@@ -168,8 +168,13 @@ func TestContainer(t *testing.T) {
|
|||||||
for _, test := range tests {
|
for _, test := range tests {
|
||||||
for _, exclusive := range exclusives {
|
for _, exclusive := range exclusives {
|
||||||
t.Run(test.name, func(t *testing.T) {
|
t.Run(test.name, func(t *testing.T) {
|
||||||
|
var changed bool
|
||||||
c := newContainer(exclusive)
|
c := newContainer(exclusive)
|
||||||
|
c.addListener(func() {
|
||||||
|
changed = true
|
||||||
|
})
|
||||||
assert.Nil(t, c.getValues())
|
assert.Nil(t, c.getValues())
|
||||||
|
assert.False(t, changed)
|
||||||
|
|
||||||
for _, order := range test.do {
|
for _, order := range test.do {
|
||||||
if order.act == actionAdd {
|
if order.act == actionAdd {
|
||||||
@@ -185,6 +190,7 @@ func TestContainer(t *testing.T) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
assert.True(t, changed)
|
||||||
assert.True(t, c.dirty.True())
|
assert.True(t, c.dirty.True())
|
||||||
assert.ElementsMatch(t, test.expect, c.getValues())
|
assert.ElementsMatch(t, test.expect, c.getValues())
|
||||||
assert.False(t, c.dirty.True())
|
assert.False(t, c.dirty.True())
|
||||||
|
|||||||
@@ -2,15 +2,16 @@ package balancer
|
|||||||
|
|
||||||
import (
|
import (
|
||||||
"context"
|
"context"
|
||||||
|
"math/rand"
|
||||||
|
"sync"
|
||||||
|
"time"
|
||||||
|
|
||||||
"google.golang.org/grpc/balancer"
|
"google.golang.org/grpc/balancer"
|
||||||
"google.golang.org/grpc/balancer/base"
|
"google.golang.org/grpc/balancer/base"
|
||||||
"google.golang.org/grpc/resolver"
|
"google.golang.org/grpc/resolver"
|
||||||
)
|
)
|
||||||
|
|
||||||
const (
|
const Name = "roundrobin"
|
||||||
Name = "roundrobin"
|
|
||||||
)
|
|
||||||
|
|
||||||
func init() {
|
func init() {
|
||||||
balancer.Register(newBuilder())
|
balancer.Register(newBuilder())
|
||||||
@@ -24,13 +25,38 @@ func newBuilder() balancer.Builder {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func (b *roundRobinPickerBuilder) Build(readySCs map[resolver.Address]balancer.SubConn) balancer.Picker {
|
func (b *roundRobinPickerBuilder) Build(readySCs map[resolver.Address]balancer.SubConn) balancer.Picker {
|
||||||
panic("implement me")
|
rand.Seed(time.Now().UnixNano())
|
||||||
|
picker := &roundRobinPicker{
|
||||||
|
index: rand.Int(),
|
||||||
|
}
|
||||||
|
|
||||||
|
for addr, conn := range readySCs {
|
||||||
|
picker.conns = append(picker.conns, &subConn{
|
||||||
|
addr: addr,
|
||||||
|
conn: conn,
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
return picker
|
||||||
}
|
}
|
||||||
|
|
||||||
type roundRobinPicker struct {
|
type roundRobinPicker struct {
|
||||||
|
conns []*subConn
|
||||||
|
index int
|
||||||
|
lock sync.Mutex
|
||||||
}
|
}
|
||||||
|
|
||||||
func (p *roundRobinPicker) Pick(ctx context.Context, info balancer.PickInfo) (
|
func (p *roundRobinPicker) Pick(ctx context.Context, info balancer.PickInfo) (
|
||||||
conn balancer.SubConn, done func(balancer.DoneInfo), err error) {
|
conn balancer.SubConn, done func(balancer.DoneInfo), err error) {
|
||||||
panic("implement me")
|
p.lock.Lock()
|
||||||
|
defer p.lock.Unlock()
|
||||||
|
|
||||||
|
p.index = (p.index + 1) % len(p.conns)
|
||||||
|
return p.conns[p.index].conn, func(info balancer.DoneInfo) {
|
||||||
|
}, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
type subConn struct {
|
||||||
|
addr resolver.Address
|
||||||
|
conn balancer.SubConn
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -3,6 +3,7 @@ package resolver
|
|||||||
import "google.golang.org/grpc/resolver"
|
import "google.golang.org/grpc/resolver"
|
||||||
|
|
||||||
type discovResolver struct {
|
type discovResolver struct {
|
||||||
|
cc resolver.ClientConn
|
||||||
}
|
}
|
||||||
|
|
||||||
func (r discovResolver) ResolveNow(options resolver.ResolveNowOptions) {
|
func (r discovResolver) ResolveNow(options resolver.ResolveNowOptions) {
|
||||||
|
|||||||
Reference in New Issue
Block a user