Remove expiration_interval from grpclb message (#1477)
This commit is contained in:
Menghan Li
GitHub
Родитель
41127174ce
Коммит
e696c3d4da
53
grpclb.go
53
grpclb.go
|
|
@ -97,19 +97,18 @@ type grpclbAddrInfo struct {
|
|||
}
|
||||
|
||||
type balancer struct {
|
||||
r naming.Resolver
|
||||
target string
|
||||
mu sync.Mutex
|
||||
seq int // a sequence number to make sure addrCh does not get stale addresses.
|
||||
w naming.Watcher
|
||||
addrCh chan []Address
|
||||
rbs []remoteBalancerInfo
|
||||
addrs []*grpclbAddrInfo
|
||||
next int
|
||||
waitCh chan struct{}
|
||||
done bool
|
||||
expTimer *time.Timer
|
||||
rand *rand.Rand
|
||||
r naming.Resolver
|
||||
target string
|
||||
mu sync.Mutex
|
||||
seq int // a sequence number to make sure addrCh does not get stale addresses.
|
||||
w naming.Watcher
|
||||
addrCh chan []Address
|
||||
rbs []remoteBalancerInfo
|
||||
addrs []*grpclbAddrInfo
|
||||
next int
|
||||
waitCh chan struct{}
|
||||
done bool
|
||||
rand *rand.Rand
|
||||
|
||||
clientStats lbmpb.ClientStats
|
||||
}
|
||||
|
|
@ -181,21 +180,6 @@ func (b *balancer) watchAddrUpdates(w naming.Watcher, ch chan []remoteBalancerIn
|
|||
return nil
|
||||
}
|
||||
|
||||
func (b *balancer) serverListExpire(seq int) {
|
||||
b.mu.Lock()
|
||||
defer b.mu.Unlock()
|
||||
// TODO: gRPC interanls do not clear the connections when the server list is stale.
|
||||
// This means RPCs will keep using the existing server list until b receives new
|
||||
// server list even though the list is expired. Revisit this behavior later.
|
||||
if b.done || seq < b.seq {
|
||||
return
|
||||
}
|
||||
b.next = 0
|
||||
b.addrs = nil
|
||||
// Ask grpc internals to close all the corresponding connections.
|
||||
b.addrCh <- nil
|
||||
}
|
||||
|
||||
func convertDuration(d *lbmpb.Duration) time.Duration {
|
||||
if d == nil {
|
||||
return 0
|
||||
|
|
@ -208,7 +192,6 @@ func (b *balancer) processServerList(l *lbmpb.ServerList, seq int) {
|
|||
return
|
||||
}
|
||||
servers := l.GetServers()
|
||||
expiration := convertDuration(l.GetExpirationInterval())
|
||||
var (
|
||||
sl []*grpclbAddrInfo
|
||||
addrs []Address
|
||||
|
|
@ -243,15 +226,6 @@ func (b *balancer) processServerList(l *lbmpb.ServerList, seq int) {
|
|||
b.next = 0
|
||||
b.addrs = sl
|
||||
b.addrCh <- addrs
|
||||
if b.expTimer != nil {
|
||||
b.expTimer.Stop()
|
||||
b.expTimer = nil
|
||||
}
|
||||
if expiration > 0 {
|
||||
b.expTimer = time.AfterFunc(expiration, func() {
|
||||
b.serverListExpire(seq)
|
||||
})
|
||||
}
|
||||
}
|
||||
return
|
||||
}
|
||||
|
|
@ -721,9 +695,6 @@ func (b *balancer) Close() error {
|
|||
return errBalancerClosed
|
||||
}
|
||||
b.done = true
|
||||
if b.expTimer != nil {
|
||||
b.expTimer.Stop()
|
||||
}
|
||||
if b.waitCh != nil {
|
||||
close(b.waitCh)
|
||||
}
|
||||
|
|
|
|||
|
|
@ -472,11 +472,6 @@ type ServerList struct {
|
|||
// across more servers. The client should consume the server list in order
|
||||
// unless instructed otherwise via the client_config.
|
||||
Servers []*Server `protobuf:"bytes,1,rep,name=servers" json:"servers,omitempty"`
|
||||
// Indicates the amount of time that the client should consider this server
|
||||
// list as valid. It may be considered stale after waiting this interval of
|
||||
// time after receiving the list. If the interval is not positive, the
|
||||
// client can assume the list is valid until the next list is received.
|
||||
ExpirationInterval *Duration `protobuf:"bytes,3,opt,name=expiration_interval,json=expirationInterval" json:"expiration_interval,omitempty"`
|
||||
}
|
||||
|
||||
func (m *ServerList) Reset() { *m = ServerList{} }
|
||||
|
|
@ -491,13 +486,6 @@ func (m *ServerList) GetServers() []*Server {
|
|||
return nil
|
||||
}
|
||||
|
||||
func (m *ServerList) GetExpirationInterval() *Duration {
|
||||
if m != nil {
|
||||
return m.ExpirationInterval
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
||||
// Contains server information. When none of the [drop_for_*] fields are true,
|
||||
// use the other fields. When drop_for_rate_limiting is true, ignore all other
|
||||
// fields. Use drop_for_load_balancing only when it is true and
|
||||
|
|
@ -578,51 +566,50 @@ func init() {
|
|||
func init() { proto.RegisterFile("grpc_lb_v1/messages/messages.proto", fileDescriptor0) }
|
||||
|
||||
var fileDescriptor0 = []byte{
|
||||
// 721 bytes of a gzipped FileDescriptorProto
|
||||
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x55, 0xdd, 0x4e, 0x1b, 0x3d,
|
||||
0x10, 0x65, 0xbf, 0xf0, 0x93, 0x4c, 0xd0, 0x07, 0x35, 0x29, 0x04, 0x0a, 0x12, 0x8d, 0x54, 0x1a,
|
||||
0x55, 0x34, 0x08, 0x68, 0x2f, 0xfa, 0x73, 0xd3, 0x40, 0x51, 0x50, 0xb9, 0xa8, 0x1c, 0xaa, 0x4a,
|
||||
0x95, 0x2a, 0xcb, 0xc9, 0x0e, 0xc1, 0x62, 0x63, 0x6f, 0x6d, 0x27, 0xb4, 0x97, 0xbd, 0xec, 0xa3,
|
||||
0xf4, 0x31, 0xaa, 0x3e, 0x43, 0xdf, 0xa7, 0x5a, 0xef, 0x6e, 0x76, 0x81, 0x10, 0xd4, 0x3b, 0x7b,
|
||||
0x7c, 0xe6, 0xcc, 0xf1, 0xac, 0xcf, 0x2c, 0xd4, 0x7a, 0x3a, 0xec, 0xb2, 0xa0, 0xc3, 0x86, 0xbb,
|
||||
0x3b, 0x7d, 0x34, 0x86, 0xf7, 0xd0, 0x8c, 0x16, 0x8d, 0x50, 0x2b, 0xab, 0x08, 0x44, 0x98, 0x46,
|
||||
0xd0, 0x69, 0x0c, 0x77, 0x6b, 0x2f, 0xa1, 0x78, 0x38, 0xd0, 0xdc, 0x0a, 0x25, 0x49, 0x15, 0xe6,
|
||||
0x0c, 0x76, 0x95, 0xf4, 0x4d, 0xd5, 0xdb, 0xf4, 0xea, 0x05, 0x9a, 0x6e, 0x49, 0x05, 0x66, 0x24,
|
||||
0x97, 0xca, 0x54, 0xff, 0xdb, 0xf4, 0xea, 0x33, 0x34, 0xde, 0xd4, 0x5e, 0x41, 0xe9, 0x54, 0xf4,
|
||||
0xd1, 0x58, 0xde, 0x0f, 0xff, 0x39, 0xf9, 0x97, 0x07, 0xe4, 0x44, 0x71, 0xbf, 0xc9, 0x03, 0x2e,
|
||||
0xbb, 0x48, 0xf1, 0xcb, 0x00, 0x8d, 0x25, 0xef, 0x61, 0x41, 0x48, 0x61, 0x05, 0x0f, 0x98, 0x8e,
|
||||
0x43, 0x8e, 0xae, 0xbc, 0xf7, 0xa8, 0x91, 0xa9, 0x6e, 0x1c, 0xc7, 0x90, 0x9b, 0xf9, 0xad, 0x29,
|
||||
0xfa, 0x7f, 0x92, 0x9f, 0x32, 0xbe, 0x86, 0xf9, 0x6e, 0x20, 0x50, 0x5a, 0x66, 0x2c, 0xb7, 0xb1,
|
||||
0x8a, 0xf2, 0xde, 0x4a, 0x9e, 0xee, 0xc0, 0x9d, 0xb7, 0xa3, 0xe3, 0xd6, 0x14, 0x2d, 0x77, 0xb3,
|
||||
0x6d, 0xf3, 0x01, 0xac, 0x06, 0x8a, 0xfb, 0xac, 0x13, 0x97, 0x49, 0x45, 0x31, 0xfb, 0x2d, 0xc4,
|
||||
0xda, 0x0e, 0xac, 0xde, 0xaa, 0x84, 0x10, 0x98, 0x96, 0xbc, 0x8f, 0x4e, 0x7e, 0x89, 0xba, 0x75,
|
||||
0xed, 0xc7, 0x34, 0x94, 0x73, 0xc5, 0xc8, 0x3e, 0x94, 0x6c, 0xda, 0xc1, 0xe4, 0x9e, 0xf7, 0xf3,
|
||||
0xc2, 0x46, 0xed, 0xa5, 0x19, 0x8e, 0x3c, 0x81, 0x7b, 0x72, 0xd0, 0x67, 0x5d, 0x1e, 0x04, 0x26,
|
||||
0xba, 0x93, 0xb6, 0xe8, 0xbb, 0x5b, 0x15, 0xe8, 0x82, 0x1c, 0xf4, 0x0f, 0xa2, 0x78, 0x3b, 0x0e,
|
||||
0x93, 0x6d, 0x20, 0x19, 0xf6, 0x4c, 0x48, 0x61, 0xce, 0xd1, 0xaf, 0x16, 0x1c, 0x78, 0x31, 0x05,
|
||||
0x1f, 0x25, 0x71, 0xc2, 0xa0, 0x71, 0x13, 0xcd, 0x2e, 0x85, 0x3d, 0x67, 0xbe, 0x56, 0x21, 0x3b,
|
||||
0x53, 0x9a, 0x69, 0x6e, 0x91, 0x05, 0xa2, 0x2f, 0xac, 0x90, 0xbd, 0xea, 0xb4, 0x63, 0x7a, 0x7c,
|
||||
0x9d, 0xe9, 0xa3, 0xb0, 0xe7, 0x87, 0x5a, 0x85, 0x47, 0x4a, 0x53, 0x6e, 0xf1, 0x24, 0x81, 0x13,
|
||||
0x0e, 0x3b, 0x77, 0x16, 0xc8, 0xb5, 0x3b, 0xaa, 0x30, 0xe3, 0x2a, 0xd4, 0x27, 0x54, 0xc8, 0x7a,
|
||||
0x1f, 0x95, 0xf8, 0x0c, 0x4f, 0x6f, 0x2b, 0x91, 0x3c, 0x83, 0x33, 0x2e, 0x02, 0xf4, 0x99, 0x55,
|
||||
0xcc, 0xa0, 0xf4, 0xab, 0xb3, 0xae, 0xc0, 0xd6, 0xb8, 0x02, 0xf1, 0xa7, 0x3a, 0x72, 0xf8, 0x53,
|
||||
0xd5, 0x46, 0xe9, 0x93, 0x16, 0x3c, 0x1c, 0x43, 0x7f, 0x21, 0xd5, 0xa5, 0x64, 0x1a, 0xbb, 0x28,
|
||||
0x86, 0xe8, 0x57, 0xe7, 0x1c, 0xe5, 0xc6, 0x75, 0xca, 0x77, 0x11, 0x8a, 0x26, 0xa0, 0xda, 0x6f,
|
||||
0x0f, 0x96, 0xae, 0x3c, 0x1b, 0x13, 0x2a, 0x69, 0x90, 0xb4, 0x61, 0x31, 0x73, 0x40, 0x1c, 0x4b,
|
||||
0x9e, 0xc6, 0xd6, 0x5d, 0x16, 0x88, 0xd1, 0xad, 0x29, 0xba, 0x30, 0xf2, 0x40, 0x42, 0xfa, 0x02,
|
||||
0xca, 0x06, 0xf5, 0x10, 0x35, 0x0b, 0x84, 0xb1, 0x89, 0x07, 0x96, 0xf3, 0x7c, 0x6d, 0x77, 0x7c,
|
||||
0x22, 0x9c, 0x87, 0xc0, 0x8c, 0x76, 0xcd, 0x75, 0x58, 0xbb, 0xe6, 0x80, 0x98, 0x33, 0xb6, 0xc0,
|
||||
0x4f, 0x0f, 0xd6, 0x6e, 0x97, 0x42, 0x9e, 0xc1, 0x72, 0x3e, 0x59, 0x33, 0x1f, 0x03, 0xec, 0x71,
|
||||
0x9b, 0xda, 0xa2, 0x12, 0x64, 0x49, 0xfa, 0x30, 0x39, 0x23, 0x1f, 0x60, 0x3d, 0x6f, 0x59, 0xa6,
|
||||
0x31, 0x54, 0xda, 0x32, 0x21, 0x2d, 0xea, 0x21, 0x0f, 0x12, 0xf9, 0x95, 0xbc, 0xfc, 0x74, 0x88,
|
||||
0xd1, 0xd5, 0x9c, 0x7b, 0xa9, 0xcb, 0x3b, 0x4e, 0xd2, 0x6a, 0xdf, 0x3d, 0x80, 0xec, 0x9a, 0x64,
|
||||
0x3b, 0x9a, 0x58, 0xd1, 0x2e, 0x9a, 0x58, 0x85, 0x7a, 0x79, 0x8f, 0xdc, 0xec, 0x07, 0x4d, 0x21,
|
||||
0xe4, 0x2d, 0x2c, 0xe1, 0xd7, 0x50, 0xc4, 0x55, 0x32, 0x29, 0x85, 0x09, 0x52, 0x48, 0x96, 0x30,
|
||||
0xd2, 0xf0, 0xc7, 0x83, 0xd9, 0x98, 0x9a, 0x6c, 0x00, 0x88, 0x90, 0x71, 0xdf, 0xd7, 0x68, 0xe2,
|
||||
0xa1, 0x39, 0x4f, 0x4b, 0x22, 0x7c, 0x13, 0x07, 0xa2, 0xf9, 0x11, 0xa9, 0x4f, 0xa6, 0xa6, 0x5b,
|
||||
0x47, 0x76, 0xbe, 0xf2, 0x2d, 0xac, 0xba, 0x40, 0xe9, 0x34, 0x94, 0xe8, 0x62, 0xae, 0x95, 0xa7,
|
||||
0x51, 0x9c, 0xec, 0xc3, 0xf2, 0x04, 0xdb, 0x16, 0xe9, 0x92, 0x3f, 0xc6, 0xa2, 0xcf, 0x61, 0x65,
|
||||
0x92, 0x15, 0x8b, 0xb4, 0xe2, 0x8f, 0xb1, 0x5d, 0x13, 0x3e, 0x15, 0xd3, 0xbf, 0x4c, 0x67, 0xd6,
|
||||
0xfd, 0x66, 0xf6, 0xff, 0x06, 0x00, 0x00, 0xff, 0xff, 0x9e, 0xb4, 0x3c, 0xc3, 0x8c, 0x06, 0x00,
|
||||
0x00,
|
||||
// 709 bytes of a gzipped FileDescriptorProto
|
||||
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x55, 0xdd, 0x4e, 0x1b, 0x3b,
|
||||
0x10, 0x26, 0x27, 0x01, 0x92, 0x09, 0x3a, 0xe4, 0x98, 0x1c, 0x08, 0x14, 0x24, 0xba, 0x52, 0x69,
|
||||
0x54, 0xd1, 0x20, 0xa0, 0xbd, 0xe8, 0xcf, 0x45, 0x1b, 0x10, 0x0a, 0x2d, 0x17, 0x95, 0x43, 0x55,
|
||||
0xa9, 0x52, 0x65, 0x39, 0xd9, 0x21, 0x58, 0x6c, 0xec, 0xad, 0xed, 0x04, 0xf5, 0x11, 0xfa, 0x28,
|
||||
0x7d, 0x8c, 0xaa, 0xcf, 0xd0, 0xf7, 0xa9, 0xd6, 0xbb, 0x9b, 0x5d, 0x20, 0x80, 0x7a, 0x67, 0x8f,
|
||||
0xbf, 0xf9, 0xbe, 0xf1, 0xac, 0xbf, 0x59, 0xf0, 0x06, 0x3a, 0xec, 0xb3, 0xa0, 0xc7, 0xc6, 0xbb,
|
||||
0x3b, 0x43, 0x34, 0x86, 0x0f, 0xd0, 0x4c, 0x16, 0xad, 0x50, 0x2b, 0xab, 0x08, 0x44, 0x98, 0x56,
|
||||
0xd0, 0x6b, 0x8d, 0x77, 0xbd, 0x97, 0x50, 0x3e, 0x1c, 0x69, 0x6e, 0x85, 0x92, 0xa4, 0x01, 0xf3,
|
||||
0x06, 0xfb, 0x4a, 0xfa, 0xa6, 0x51, 0xd8, 0x2c, 0x34, 0x8b, 0x34, 0xdd, 0x92, 0x3a, 0xcc, 0x4a,
|
||||
0x2e, 0x95, 0x69, 0xfc, 0xb3, 0x59, 0x68, 0xce, 0xd2, 0x78, 0xe3, 0xbd, 0x82, 0xca, 0xa9, 0x18,
|
||||
0xa2, 0xb1, 0x7c, 0x18, 0xfe, 0x75, 0xf2, 0xcf, 0x02, 0x90, 0x13, 0xc5, 0xfd, 0x36, 0x0f, 0xb8,
|
||||
0xec, 0x23, 0xc5, 0xaf, 0x23, 0x34, 0x96, 0x7c, 0x80, 0x45, 0x21, 0x85, 0x15, 0x3c, 0x60, 0x3a,
|
||||
0x0e, 0x39, 0xba, 0xea, 0xde, 0xa3, 0x56, 0x56, 0x75, 0xeb, 0x38, 0x86, 0xdc, 0xcc, 0xef, 0xcc,
|
||||
0xd0, 0x7f, 0x93, 0xfc, 0x94, 0xf1, 0x35, 0x2c, 0xf4, 0x03, 0x81, 0xd2, 0x32, 0x63, 0xb9, 0x8d,
|
||||
0xab, 0xa8, 0xee, 0xad, 0xe4, 0xe9, 0x0e, 0xdc, 0x79, 0x37, 0x3a, 0xee, 0xcc, 0xd0, 0x6a, 0x3f,
|
||||
0xdb, 0xb6, 0x1f, 0xc0, 0x6a, 0xa0, 0xb8, 0xcf, 0x7a, 0xb1, 0x4c, 0x5a, 0x14, 0xb3, 0xdf, 0x42,
|
||||
0xf4, 0x76, 0x60, 0xf5, 0xd6, 0x4a, 0x08, 0x81, 0x92, 0xe4, 0x43, 0x74, 0xe5, 0x57, 0xa8, 0x5b,
|
||||
0x7b, 0xdf, 0x4b, 0x50, 0xcd, 0x89, 0x91, 0x7d, 0xa8, 0xd8, 0xb4, 0x83, 0xc9, 0x3d, 0xff, 0xcf,
|
||||
0x17, 0x36, 0x69, 0x2f, 0xcd, 0x70, 0xe4, 0x09, 0xfc, 0x27, 0x47, 0x43, 0xd6, 0xe7, 0x41, 0x60,
|
||||
0xa2, 0x3b, 0x69, 0x8b, 0xbe, 0xbb, 0x55, 0x91, 0x2e, 0xca, 0xd1, 0xf0, 0x20, 0x8a, 0x77, 0xe3,
|
||||
0x30, 0xd9, 0x06, 0x92, 0x61, 0xcf, 0x84, 0x14, 0xe6, 0x1c, 0xfd, 0x46, 0xd1, 0x81, 0x6b, 0x29,
|
||||
0xf8, 0x28, 0x89, 0x13, 0x06, 0xad, 0x9b, 0x68, 0x76, 0x29, 0xec, 0x39, 0xf3, 0xb5, 0x0a, 0xd9,
|
||||
0x99, 0xd2, 0x4c, 0x73, 0x8b, 0x2c, 0x10, 0x43, 0x61, 0x85, 0x1c, 0x34, 0x4a, 0x8e, 0xe9, 0xf1,
|
||||
0x75, 0xa6, 0x4f, 0xc2, 0x9e, 0x1f, 0x6a, 0x15, 0x1e, 0x29, 0x4d, 0xb9, 0xc5, 0x93, 0x04, 0x4e,
|
||||
0x38, 0xec, 0xdc, 0x2b, 0x90, 0x6b, 0x77, 0xa4, 0x30, 0xeb, 0x14, 0x9a, 0x77, 0x28, 0x64, 0xbd,
|
||||
0x8f, 0x24, 0xbe, 0xc0, 0xd3, 0xdb, 0x24, 0x92, 0x67, 0x70, 0xc6, 0x45, 0x80, 0x3e, 0xb3, 0x8a,
|
||||
0x19, 0x94, 0x7e, 0x63, 0xce, 0x09, 0x6c, 0x4d, 0x13, 0x88, 0x3f, 0xd5, 0x91, 0xc3, 0x9f, 0xaa,
|
||||
0x2e, 0x4a, 0x9f, 0x74, 0xe0, 0xe1, 0x14, 0xfa, 0x0b, 0xa9, 0x2e, 0x25, 0xd3, 0xd8, 0x47, 0x31,
|
||||
0x46, 0xbf, 0x31, 0xef, 0x28, 0x37, 0xae, 0x53, 0xbe, 0x8f, 0x50, 0x34, 0x01, 0x79, 0xbf, 0x0a,
|
||||
0xb0, 0x74, 0xe5, 0xd9, 0x98, 0x50, 0x49, 0x83, 0xa4, 0x0b, 0xb5, 0xcc, 0x01, 0x71, 0x2c, 0x79,
|
||||
0x1a, 0x5b, 0xf7, 0x59, 0x20, 0x46, 0x77, 0x66, 0xe8, 0xe2, 0xc4, 0x03, 0x09, 0xe9, 0x0b, 0xa8,
|
||||
0x1a, 0xd4, 0x63, 0xd4, 0x2c, 0x10, 0xc6, 0x26, 0x1e, 0x58, 0xce, 0xf3, 0x75, 0xdd, 0xf1, 0x89,
|
||||
0x70, 0x1e, 0x02, 0x33, 0xd9, 0xb5, 0xd7, 0x61, 0xed, 0x9a, 0x03, 0x62, 0xce, 0xd8, 0x02, 0x3f,
|
||||
0x0a, 0xb0, 0x76, 0x7b, 0x29, 0xe4, 0x19, 0x2c, 0xe7, 0x93, 0x35, 0xf3, 0x31, 0xc0, 0x01, 0xb7,
|
||||
0xa9, 0x2d, 0xea, 0x41, 0x96, 0xa4, 0x0f, 0x93, 0x33, 0xf2, 0x11, 0xd6, 0xf3, 0x96, 0x65, 0x1a,
|
||||
0x43, 0xa5, 0x2d, 0x13, 0xd2, 0xa2, 0x1e, 0xf3, 0x20, 0x29, 0xbf, 0x9e, 0x2f, 0x3f, 0x1d, 0x62,
|
||||
0x74, 0x35, 0xe7, 0x5e, 0xea, 0xf2, 0x8e, 0x93, 0x34, 0xef, 0x0d, 0x40, 0x76, 0x4b, 0xb2, 0x1d,
|
||||
0x0d, 0xac, 0x68, 0x17, 0x0d, 0xac, 0x62, 0xb3, 0xba, 0x47, 0x6e, 0xb6, 0x83, 0xa6, 0x90, 0x77,
|
||||
0xa5, 0x72, 0xb1, 0x56, 0xf2, 0x7e, 0x17, 0x60, 0x2e, 0x3e, 0x21, 0x1b, 0x00, 0x22, 0x64, 0xdc,
|
||||
0xf7, 0x35, 0x9a, 0x78, 0xe4, 0x2d, 0xd0, 0x8a, 0x08, 0xdf, 0xc6, 0x81, 0xc8, 0xfd, 0x91, 0x76,
|
||||
0x32, 0xf3, 0xdc, 0x3a, 0x32, 0xe3, 0x95, 0x4e, 0x5a, 0x75, 0x81, 0xd2, 0x99, 0xb1, 0x42, 0x6b,
|
||||
0xb9, 0x46, 0x9c, 0x46, 0x71, 0xb2, 0x0f, 0xcb, 0x77, 0x98, 0xae, 0x4c, 0x97, 0xfc, 0x29, 0x06,
|
||||
0x7b, 0x0e, 0x2b, 0x77, 0x19, 0xa9, 0x4c, 0xeb, 0xfe, 0x14, 0xd3, 0xb4, 0xe1, 0x73, 0x39, 0xfd,
|
||||
0x47, 0xf4, 0xe6, 0xdc, 0x4f, 0x62, 0xff, 0x4f, 0x00, 0x00, 0x00, 0xff, 0xff, 0xa3, 0x36, 0x86,
|
||||
0xa6, 0x4a, 0x06, 0x00, 0x00,
|
||||
}
|
||||
|
|
|
|||
|
|
@ -32,7 +32,6 @@ message Duration {
|
|||
}
|
||||
|
||||
message Timestamp {
|
||||
|
||||
// Represents seconds of UTC time since Unix epoch
|
||||
// 1970-01-01T00:00:00Z. Must be from 0001-01-01T00:00:00Z to
|
||||
// 9999-12-31T23:59:59Z inclusive.
|
||||
|
|
@ -122,11 +121,8 @@ message ServerList {
|
|||
// unless instructed otherwise via the client_config.
|
||||
repeated Server servers = 1;
|
||||
|
||||
// Indicates the amount of time that the client should consider this server
|
||||
// list as valid. It may be considered stale after waiting this interval of
|
||||
// time after receiving the list. If the interval is not positive, the
|
||||
// client can assume the list is valid until the next list is received.
|
||||
Duration expiration_interval = 3;
|
||||
// Was google.protobuf.Duration expiration_interval.
|
||||
reserved 3;
|
||||
}
|
||||
|
||||
// Contains server information. When none of the [drop_for_*] fields are true,
|
||||
|
|
|
|||
|
|
@ -501,66 +501,6 @@ func TestDropRequestFailedNonFailFast(t *testing.T) {
|
|||
cc.Close()
|
||||
}
|
||||
|
||||
func TestServerExpiration(t *testing.T) {
|
||||
tss, cleanup, err := newLoadBalancer(1)
|
||||
if err != nil {
|
||||
t.Fatalf("failed to create new load balancer: %v", err)
|
||||
}
|
||||
defer cleanup()
|
||||
be := &lbmpb.Server{
|
||||
IpAddress: tss.beIPs[0],
|
||||
Port: int32(tss.bePorts[0]),
|
||||
LoadBalanceToken: lbToken,
|
||||
}
|
||||
var bes []*lbmpb.Server
|
||||
bes = append(bes, be)
|
||||
exp := &lbmpb.Duration{
|
||||
Seconds: 0,
|
||||
Nanos: 100000000, // 100ms
|
||||
}
|
||||
var sls []*lbmpb.ServerList
|
||||
sl := &lbmpb.ServerList{
|
||||
Servers: bes,
|
||||
ExpirationInterval: exp,
|
||||
}
|
||||
sls = append(sls, sl)
|
||||
sl = &lbmpb.ServerList{
|
||||
Servers: bes,
|
||||
}
|
||||
sls = append(sls, sl)
|
||||
var intervals []time.Duration
|
||||
intervals = append(intervals, 0)
|
||||
intervals = append(intervals, 500*time.Millisecond)
|
||||
tss.ls.sls = sls
|
||||
tss.ls.intervals = intervals
|
||||
creds := serverNameCheckCreds{
|
||||
expected: besn,
|
||||
}
|
||||
ctx, cancel := context.WithTimeout(context.Background(), 10*time.Second)
|
||||
defer cancel()
|
||||
cc, err := grpc.DialContext(ctx, besn,
|
||||
grpc.WithBalancer(grpc.NewGRPCLBBalancer(&testNameResolver{addrs: []string{tss.lbAddr}})),
|
||||
grpc.WithBlock(), grpc.WithTransportCredentials(&creds), grpc.WithDialer(fakeNameDialer))
|
||||
if err != nil {
|
||||
t.Fatalf("Failed to dial to the backend %v", err)
|
||||
}
|
||||
testC := testpb.NewTestServiceClient(cc)
|
||||
if _, err := testC.EmptyCall(context.Background(), &testpb.Empty{}); err != nil {
|
||||
t.Fatalf("%v.EmptyCall(_, _) = _, %v, want _, <nil>", testC, err)
|
||||
}
|
||||
// Sleep and wake up when the first server list gets expired.
|
||||
time.Sleep(150 * time.Millisecond)
|
||||
if _, err := testC.EmptyCall(context.Background(), &testpb.Empty{}); grpc.Code(err) != codes.Unavailable {
|
||||
t.Fatalf("%v.EmptyCall(_, _) = _, %v, want _, %s", testC, err, codes.Unavailable)
|
||||
}
|
||||
// A non-failfast rpc should be succeeded after the second server list is received from
|
||||
// the remote load balancer.
|
||||
if _, err := testC.EmptyCall(context.Background(), &testpb.Empty{}, grpc.FailFast(false)); err != nil {
|
||||
t.Fatalf("%v.EmptyCall(_, _) = _, %v, want _, <nil>", testC, err)
|
||||
}
|
||||
cc.Close()
|
||||
}
|
||||
|
||||
// When the balancer in use disconnects, grpclb should connect to the next address from resolved balancer address list.
|
||||
func TestBalancerDisconnects(t *testing.T) {
|
||||
var (
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче