VOL-2225 Event Filtering mechanism
This commit contains changes related to migration from alarm
filter to event filter.
Change-Id: Iccd10a43aefc8611ba045df2a0daf919bf74572a
diff --git a/.golangci.yml b/.golangci.yml
index ed56321..3c1a75a 100644
--- a/.golangci.yml
+++ b/.golangci.yml
@@ -67,8 +67,8 @@
- "don't use underscores in Go names; method Update_flows_incrementally"
- "don't use underscores in Go names; method Update_pm_config"
- "don't use underscores in Go names; method Receive_packet_out"
- - "don't use underscores in Go names; method Suppress_alarm"
- - "don't use underscores in Go names; method Unsuppress_alarm"
+ - "don't use underscores in Go names; method Suppress_event"
+ - "don't use underscores in Go names; method Unsuppress_event"
- "don't use underscores in Go names; method Get_ofp_device_info"
- "don't use underscores in Go names; method Get_ofp_port_info"
- "don't use underscores in Go names; method Process_inter_adapter_message"
diff --git a/adaptercore/openolt.go b/adaptercore/openolt.go
index 9b5b5ac..4c506a5 100644
--- a/adaptercore/openolt.go
+++ b/adaptercore/openolt.go
@@ -302,13 +302,13 @@
return errors.New("device-handler-not-set")
}
-//Suppress_alarm unimplemented
-func (oo *OpenOLT) Suppress_alarm(filter *voltha.AlarmFilter) error {
+//Suppress_event unimplemented
+func (oo *OpenOLT) Suppress_event(filter *voltha.EventFilter) error {
return errors.New("unImplemented")
}
-//Unsuppress_alarm unimplemented
-func (oo *OpenOLT) Unsuppress_alarm(filter *voltha.AlarmFilter) error {
+//Unsuppress_event unimplemented
+func (oo *OpenOLT) Unsuppress_event(filter *voltha.EventFilter) error {
return errors.New("unImplemented")
}
diff --git a/adaptercore/openolt_test.go b/adaptercore/openolt_test.go
index 27af430..ec1ca43 100644
--- a/adaptercore/openolt_test.go
+++ b/adaptercore/openolt_test.go
@@ -745,9 +745,9 @@
}
}
-func TestOpenOLT_Suppress_alarm(t *testing.T) {
+func TestOpenOLT_Suppress_event(t *testing.T) {
type args struct {
- filter *voltha.AlarmFilter
+ filter *voltha.EventFilter
}
tests := []struct {
name string
@@ -755,24 +755,24 @@
args args
wantErr error
}{
- {"suppress_alarm-1", &fields{}, args{}, errors.New("unImplemented")},
- {"suppress_alarm-2", &fields{}, args{}, errors.New("unImplemented")},
- {"suppress_alarm-3", &fields{}, args{}, errors.New("unImplemented")},
+ {"suppress_event-1", &fields{}, args{}, errors.New("unImplemented")},
+ {"suppress_event-2", &fields{}, args{}, errors.New("unImplemented")},
+ {"suppress_event-3", &fields{}, args{}, errors.New("unImplemented")},
}
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
oo := testOltObject(tt.fields)
- if err := oo.Suppress_alarm(tt.args.filter); (err != nil) &&
+ if err := oo.Suppress_event(tt.args.filter); (err != nil) &&
(reflect.TypeOf(err) != reflect.TypeOf(tt.wantErr)) {
- t.Errorf("Suppress_alarm() error = %v, wantErr %v", err, tt.wantErr)
+ t.Errorf("Suppress_event() error = %v, wantErr %v", err, tt.wantErr)
}
})
}
}
-func TestOpenOLT_Unsuppress_alarm(t *testing.T) {
+func TestOpenOLT_Unsuppress_event(t *testing.T) {
type args struct {
- filter *voltha.AlarmFilter
+ filter *voltha.EventFilter
}
tests := []struct {
name string
@@ -780,16 +780,16 @@
args args
wantErr error
}{
- {"unsupress_alarm-1", &fields{}, args{}, errors.New("unImplemented")},
- {"unsupress_alarm-2", &fields{}, args{}, errors.New("unImplemented")},
- {"unsupress_alarm-3", &fields{}, args{}, errors.New("unImplemented")},
+ {"unsupress_event-1", &fields{}, args{}, errors.New("unImplemented")},
+ {"unsupress_event-2", &fields{}, args{}, errors.New("unImplemented")},
+ {"unsupress_event-3", &fields{}, args{}, errors.New("unImplemented")},
}
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
oo := testOltObject(tt.fields)
- if err := oo.Unsuppress_alarm(tt.args.filter); (err != nil) &&
+ if err := oo.Unsuppress_event(tt.args.filter); (err != nil) &&
(reflect.TypeOf(err) != reflect.TypeOf(tt.wantErr)) {
- t.Errorf("Unsuppress_alarm() error = %v, wantErr %v", err, tt.wantErr)
+ t.Errorf("Unsuppress_event() error = %v, wantErr %v", err, tt.wantErr)
}
})
}
diff --git a/go.mod b/go.mod
index cedfb5c..06cdf31 100644
--- a/go.mod
+++ b/go.mod
@@ -3,12 +3,11 @@
go 1.12
require (
- github.com/gogo/protobuf v1.3.0
+ github.com/gogo/protobuf v1.3.1
github.com/golang/protobuf v1.3.2
- github.com/onsi/ginkgo v1.8.0 // indirect
- github.com/onsi/gomega v1.5.0 // indirect
- github.com/opencord/voltha-lib-go/v2 v2.2.17
- github.com/opencord/voltha-protos/v2 v2.0.1
+ github.com/opencord/voltha-lib-go/v2 v2.2.18
+ github.com/opencord/voltha-protos/v2 v2.1.0
+ github.com/phayes/freeport v0.0.0-20180830031419-95f893ade6f2 // indirect
go.etcd.io/etcd v0.0.0-20190930204107-236ac2a90522
- google.golang.org/grpc v1.24.0
+ google.golang.org/grpc v1.25.1
)
diff --git a/go.sum b/go.sum
index b3e4feb..cee2dca 100644
--- a/go.sum
+++ b/go.sum
@@ -23,6 +23,7 @@
github.com/boljen/go-bitmap v0.0.0-20151001105940-23cd2fb0ce7d/go.mod h1:f1iKL6ZhUWvbk7PdWVmOaak10o86cqMUYEmn1CZNGEI=
github.com/bsm/sarama-cluster v2.1.15+incompatible h1:RkV6WiNRnqEEbp81druK8zYhmnIgdOjqSVi0+9Cnl2A=
github.com/bsm/sarama-cluster v2.1.15+incompatible/go.mod h1:r7ao+4tTNXvWm+VRpRJchr2kQhqxgmAp2iEX5W96gMM=
+github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
github.com/cevaris/ordered_map v0.0.0-20190319150403-3adeae072e73 h1:q1g9lSyo/nOIC3W5E3FK3Unrz8b9LdLXCyuC+ZcpPC0=
github.com/cevaris/ordered_map v0.0.0-20190319150403-3adeae072e73/go.mod h1:507vXsotcZop7NZfBWdhPmVeOse4ko2R7AagJYrpoEg=
github.com/circonus-labs/circonus-gometrics v2.3.1+incompatible/go.mod h1:nmEj6Dob7S7YxXgwXpfOuvO54S+tGdZdw9fuRZt25Ag=
@@ -53,6 +54,8 @@
github.com/eapache/go-xerial-snappy v0.0.0-20180814174437-776d5712da21/go.mod h1:+020luEh2TKB4/GOp8oxxtq0Daoen/Cii55CzbTV6DU=
github.com/eapache/queue v1.1.0 h1:YOEu7KNc61ntiQlcEeUIoDTJ2o8mQznoNvUhiigpIqc=
github.com/eapache/queue v1.1.0/go.mod h1:6eCeP0CKFpHLu8blIFXhExK/dRa7WDZfr6jVFPTqq+I=
+github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
+github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c=
github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4=
github.com/frankban/quicktest v1.5.0 h1:Tb4jWdSpdjKzTUicPnY61PZxKbDoGa7ABbrReT3gQVY=
github.com/frankban/quicktest v1.5.0/go.mod h1:jaStnuzAqU1AJdCO0l53JDCJrVDKcS03DbaAcR7Ks/o=
@@ -64,8 +67,9 @@
github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY=
github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ=
github.com/gogo/protobuf v1.2.1/go.mod h1:hp+jE20tsWTFYpLwKvXlhS1hjn+gTNwPg2I6zVXpSg4=
-github.com/gogo/protobuf v1.3.0 h1:G8O7TerXerS4F6sx9OV7/nRfJdnXgHZu/S/7F2SN+UE=
github.com/gogo/protobuf v1.3.0/go.mod h1:SlYgWuQ5SjCEi6WLHjHCa1yvBfUnHcTbrrZtXPKa29o=
+github.com/gogo/protobuf v1.3.1 h1:DqDEcV5aeaTmdFBePNpYsp3FlcVH/2ISVVM9Qf8PSls=
+github.com/gogo/protobuf v1.3.1/go.mod h1:SlYgWuQ5SjCEi6WLHjHCa1yvBfUnHcTbrrZtXPKa29o=
github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b h1:VKtxabqXZkF25pY9ekfRL6a582T4P37/31XEstQ5p58=
github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q=
github.com/golang/groupcache v0.0.0-20160516000752-02826c3e7903 h1:LbsanbbD6LieFkXbj9YNNBupiGHJgFeLpO0j0Fza1h8=
@@ -184,16 +188,14 @@
github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U=
github.com/olekukonko/tablewriter v0.0.0-20170122224234-a0225b3f23b5/go.mod h1:vsDQFd/mU46D+Z4whnwzcISnGGzXWMclvtLoiIKAKIo=
+github.com/onsi/ginkgo v1.6.0 h1:Ix8l273rp3QzYgXSR+c8d1fTG7UPgYkOSELPhiY/YGw=
github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
-github.com/onsi/ginkgo v1.8.0 h1:VkHVNpR4iVnU8XQR6DBm8BqYjN7CRzw+xKUbVVbbW9w=
-github.com/onsi/ginkgo v1.8.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
+github.com/onsi/gomega v1.4.2 h1:3mYCb7aPxS/RU7TI1y4rkEn1oKmPRjNJLNEXgw7MH2I=
github.com/onsi/gomega v1.4.2/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY=
-github.com/onsi/gomega v1.5.0 h1:izbySO9zDPmjJ8rDjLvkA2zJHIo+HkYXHnf7eN7SSyo=
-github.com/onsi/gomega v1.5.0/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY=
-github.com/opencord/voltha-lib-go/v2 v2.2.17 h1:if2mGx376oUO8+wFI7BZ7KMLElewoeSBj0zWi7Xl/Fk=
-github.com/opencord/voltha-lib-go/v2 v2.2.17/go.mod h1:1NOSy3uX2DcAIJyZZXkbjCwokwliEQJPu0zF3Jo5OEA=
-github.com/opencord/voltha-protos/v2 v2.0.1 h1:vcE0XxNVeu0SED0bW2lf2w24k/QMFrFqMexuedIyTEg=
-github.com/opencord/voltha-protos/v2 v2.0.1/go.mod h1:6kOcfYi1CadWowFxI2SH5wLfHrsRECZLZlD2MFK6WDI=
+github.com/opencord/voltha-lib-go/v2 v2.2.18 h1:rie20b5QNhRjh9GL4THHdGiHSUqrx4VMEJw44hZI1Mk=
+github.com/opencord/voltha-lib-go/v2 v2.2.18/go.mod h1:vjd6PeC3vOYDE/ztMjraWFB2Wv1oaPcum1Xz4RJbSoE=
+github.com/opencord/voltha-protos/v2 v2.1.0 h1:Ppl4/3OBwgGuLk0ob9vIEwMGGRC2sqe7WWoxh0Uq/n0=
+github.com/opencord/voltha-protos/v2 v2.1.0/go.mod h1:6kOcfYi1CadWowFxI2SH5wLfHrsRECZLZlD2MFK6WDI=
github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc=
github.com/pascaldekloe/goe v0.1.0 h1:cBOtyMzM9HTpWjXfbbunk26uA6nG3a8n06Wieeh0MwY=
github.com/pascaldekloe/goe v0.1.0/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc=
@@ -214,8 +216,9 @@
github.com/prometheus/client_golang v1.0.0 h1:vrDKnkGzuGvhNAL56c7DBz29ZL+KxnoR0x7enabFceM=
github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5FsnadC4Ky3P0J6CfImo=
github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo=
-github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90 h1:S/YWwWx/RA8rT8tKFRuGUZhuA90OyIBpPCXkcbwU8DE=
github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
+github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4 h1:gQz4mCbXsO+nc9n1hCxHcGA3Zx3Eo+UHZoInFGUIXNM=
+github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
github.com/prometheus/common v0.0.0-20181126121408-4724e9255275/go.mod h1:daVV7qP5qjZbuso7PdcryaAu0sAZbrN9i7WWcTMWvro=
github.com/prometheus/common v0.4.1 h1:K0MGApIoQvMw27RTdJkPbr3JZ7DNbtxQNyi5STVM6Kw=
github.com/prometheus/common v0.4.1/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4=
@@ -322,13 +325,16 @@
google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM=
google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
+google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc=
google.golang.org/genproto v0.0.0-20190927181202-20e1ac93f88c h1:hrpEMCZ2O7DR5gC1n2AJGVhrwiEjOi35+jxtIuZpTMo=
google.golang.org/genproto v0.0.0-20190927181202-20e1ac93f88c/go.mod h1:IbNlFCBrqXvoKpeg0TB2l7cyZUmoaFKYIwrEpbDKLA8=
google.golang.org/grpc v1.17.0/go.mod h1:6QZJwpn2B+Zp71q/5VxRsJ6NXXVCE5NRUHRo+f3cWCs=
google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
+google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg=
google.golang.org/grpc v1.23.1/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg=
-google.golang.org/grpc v1.24.0 h1:vb/1TCsVn3DcJlQ0Gs1yB1pKI6Do2/QNwxdKqmc/b0s=
google.golang.org/grpc v1.24.0/go.mod h1:XDChyiUovWa60DnaeDeZmSW86xtLtjtZbwvSiRnRtcA=
+google.golang.org/grpc v1.25.1 h1:wdKvqQk7IttEw92GoRyKG2IDrUIpgpj6H6m81yfeMW0=
+google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY=
gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw=
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 h1:qIbj1fsPNlZgppZ+VLlY7N33q108Sa+fhmuc+sWQYwY=
diff --git a/vendor/github.com/gogo/protobuf/proto/encode.go b/vendor/github.com/gogo/protobuf/proto/encode.go
index 3abfed2..9581ccd 100644
--- a/vendor/github.com/gogo/protobuf/proto/encode.go
+++ b/vendor/github.com/gogo/protobuf/proto/encode.go
@@ -189,6 +189,8 @@
// prefixed by a varint-encoded length.
func (p *Buffer) EncodeMessage(pb Message) error {
siz := Size(pb)
+ sizVar := SizeVarint(uint64(siz))
+ p.grow(siz + sizVar)
p.EncodeVarint(uint64(siz))
return p.Marshal(pb)
}
diff --git a/vendor/github.com/gogo/protobuf/proto/properties.go b/vendor/github.com/gogo/protobuf/proto/properties.go
index 62c5562..28da147 100644
--- a/vendor/github.com/gogo/protobuf/proto/properties.go
+++ b/vendor/github.com/gogo/protobuf/proto/properties.go
@@ -43,7 +43,6 @@
import (
"fmt"
"log"
- "os"
"reflect"
"sort"
"strconv"
@@ -205,7 +204,7 @@
// "bytes,49,opt,name=foo,def=hello!"
fields := strings.Split(s, ",") // breaks def=, but handled below.
if len(fields) < 2 {
- fmt.Fprintf(os.Stderr, "proto: tag has too few fields: %q\n", s)
+ log.Printf("proto: tag has too few fields: %q", s)
return
}
@@ -225,7 +224,7 @@
p.WireType = WireBytes
// no numeric converter for non-numeric types
default:
- fmt.Fprintf(os.Stderr, "proto: tag has unknown wire type: %q\n", s)
+ log.Printf("proto: tag has unknown wire type: %q", s)
return
}
diff --git a/vendor/github.com/gogo/protobuf/proto/table_marshal.go b/vendor/github.com/gogo/protobuf/proto/table_marshal.go
index db9927a..f8babde 100644
--- a/vendor/github.com/gogo/protobuf/proto/table_marshal.go
+++ b/vendor/github.com/gogo/protobuf/proto/table_marshal.go
@@ -2969,7 +2969,9 @@
if m, ok := pb.(newMarshaler); ok {
siz := m.XXX_Size()
p.grow(siz) // make sure buf has enough capacity
- p.buf, err = m.XXX_Marshal(p.buf, p.deterministic)
+ pp := p.buf[len(p.buf) : len(p.buf) : len(p.buf)+siz]
+ pp, err = m.XXX_Marshal(pp, p.deterministic)
+ p.buf = append(p.buf, pp...)
return err
}
if m, ok := pb.(Marshaler); ok {
diff --git a/vendor/github.com/gogo/protobuf/proto/text.go b/vendor/github.com/gogo/protobuf/proto/text.go
index 0407ba8..87416af 100644
--- a/vendor/github.com/gogo/protobuf/proto/text.go
+++ b/vendor/github.com/gogo/protobuf/proto/text.go
@@ -476,6 +476,8 @@
return nil
}
+var textMarshalerType = reflect.TypeOf((*encoding.TextMarshaler)(nil)).Elem()
+
// writeAny writes an arbitrary field.
func (tm *TextMarshaler) writeAny(w *textWriter, v reflect.Value, props *Properties) error {
v = reflect.Indirect(v)
@@ -589,8 +591,8 @@
// mutating this value.
v = v.Addr()
}
- if etm, ok := v.Interface().(encoding.TextMarshaler); ok {
- text, err := etm.MarshalText()
+ if v.Type().Implements(textMarshalerType) {
+ text, err := v.Interface().(encoding.TextMarshaler).MarshalText()
if err != nil {
return err
}
diff --git a/vendor/github.com/gogo/protobuf/protoc-gen-gogo/descriptor/descriptor.pb.go b/vendor/github.com/gogo/protobuf/protoc-gen-gogo/descriptor/descriptor.pb.go
index d1307d9..18b2a33 100644
--- a/vendor/github.com/gogo/protobuf/protoc-gen-gogo/descriptor/descriptor.pb.go
+++ b/vendor/github.com/gogo/protobuf/protoc-gen-gogo/descriptor/descriptor.pb.go
@@ -1364,8 +1364,8 @@
// determining the namespace.
PhpNamespace *string `protobuf:"bytes,41,opt,name=php_namespace,json=phpNamespace" json:"php_namespace,omitempty"`
// Use this option to change the namespace of php generated metadata classes.
- // Default is empty. When this option is empty, the proto file name will be used
- // for determining the namespace.
+ // Default is empty. When this option is empty, the proto file name will be
+ // used for determining the namespace.
PhpMetadataNamespace *string `protobuf:"bytes,44,opt,name=php_metadata_namespace,json=phpMetadataNamespace" json:"php_metadata_namespace,omitempty"`
// Use this option to change the package of ruby generated classes. Default
// is empty. When this option is not set, the package name will be used for
@@ -1615,7 +1615,7 @@
//
// Implementations may choose not to generate the map_entry=true message, but
// use a native map in the target language to hold the keys and values.
- // The reflection APIs in such implementions still need to work as
+ // The reflection APIs in such implementations still need to work as
// if the field is a repeated message field.
//
// NOTE: Do not set the option in .proto files. Always use the maps syntax
@@ -2363,7 +2363,7 @@
// beginning of the "extend" block and is shared by all extensions within
// the block.
// - Just because a location's span is a subset of some other location's span
- // does not mean that it is a descendent. For example, a "group" defines
+ // does not mean that it is a descendant. For example, a "group" defines
// both a type and a field in a single declaration. Thus, the locations
// corresponding to the type and field and their components will overlap.
// - Code which tries to interpret locations should probably be designed to
diff --git a/vendor/github.com/opencord/voltha-lib-go/v2/pkg/adapters/iAdapter.go b/vendor/github.com/opencord/voltha-lib-go/v2/pkg/adapters/iAdapter.go
index be98f17..38aac38 100644
--- a/vendor/github.com/opencord/voltha-lib-go/v2/pkg/adapters/iAdapter.go
+++ b/vendor/github.com/opencord/voltha-lib-go/v2/pkg/adapters/iAdapter.go
@@ -39,8 +39,8 @@
Update_flows_incrementally(device *voltha.Device, flows *openflow_13.FlowChanges, groups *openflow_13.FlowGroupChanges, flowMetadata *voltha.FlowMetadata) error
Update_pm_config(device *voltha.Device, pm_configs *voltha.PmConfigs) error
Receive_packet_out(deviceId string, egress_port_no int, msg *openflow_13.OfpPacketOut) error
- Suppress_alarm(filter *voltha.AlarmFilter) error
- Unsuppress_alarm(filter *voltha.AlarmFilter) error
+ Suppress_event(filter *voltha.EventFilter) error
+ Unsuppress_event(filter *voltha.EventFilter) error
Get_ofp_device_info(device *voltha.Device) (*ic.SwitchCapability, error)
Get_ofp_port_info(device *voltha.Device, port_no int64) (*ic.PortCapability, error)
Process_inter_adapter_message(msg *ic.InterAdapterMessage) error
diff --git a/vendor/github.com/opencord/voltha-lib-go/v2/pkg/kafka/sarama_client.go b/vendor/github.com/opencord/voltha-lib-go/v2/pkg/kafka/sarama_client.go
index a251c56..73025d9 100644
--- a/vendor/github.com/opencord/voltha-lib-go/v2/pkg/kafka/sarama_client.go
+++ b/vendor/github.com/opencord/voltha-lib-go/v2/pkg/kafka/sarama_client.go
@@ -16,10 +16,12 @@
package kafka
import (
+ "context"
"errors"
"fmt"
"github.com/Shopify/sarama"
scc "github.com/bsm/sarama-cluster"
+ "github.com/eapache/go-resiliency/breaker"
"github.com/golang/protobuf/proto"
"github.com/google/uuid"
"github.com/opencord/voltha-lib-go/v2/pkg/log"
@@ -482,6 +484,49 @@
}
}
+func (sc *SaramaClient) isLivenessError(err error) bool {
+ // Sarama producers and consumers encapsulate the error inside
+ // a ProducerError or ConsumerError struct.
+ if prodError, ok := err.(*sarama.ProducerError); ok {
+ err = prodError.Err
+ } else if consumerError, ok := err.(*sarama.ConsumerError); ok {
+ err = consumerError.Err
+ }
+
+ // Sarama-Cluster will compose the error into a ClusterError struct,
+ // which we can't do a compare by reference. To handle that, we the
+ // best we can do is compare the error strings.
+
+ switch err.Error() {
+ case context.DeadlineExceeded.Error():
+ log.Info("is-liveness-error-timeout")
+ return true
+ case sarama.ErrOutOfBrokers.Error(): // "Kafka: client has run out of available brokers"
+ log.Info("is-liveness-error-no-brokers")
+ return true
+ case sarama.ErrShuttingDown.Error(): // "Kafka: message received by producer in process of shutting down"
+ log.Info("is-liveness-error-shutting-down")
+ return true
+ case sarama.ErrControllerNotAvailable.Error(): // "Kafka: controller is not available"
+ log.Info("is-liveness-error-not-available")
+ return true
+ case breaker.ErrBreakerOpen.Error(): // "circuit breaker is open"
+ log.Info("is-liveness-error-circuit-breaker-open")
+ return true
+ }
+
+ if strings.HasSuffix(err.Error(), "connection refused") { // "dial tcp 10.244.1.176:9092: connect: connection refused"
+ log.Info("is-liveness-error-connection-refused")
+ return true
+ }
+
+ // Other errors shouldn't trigger a loss of liveness
+
+ log.Infow("is-liveness-error-ignored", log.Fields{"err": err})
+
+ return false
+}
+
// send formats and sends the request onto the kafka messaging bus.
func (sc *SaramaClient) Send(msg interface{}, topic *Topic, keys ...string) error {
@@ -521,7 +566,7 @@
sc.updateLiveness(true)
case notOk := <-sc.producer.Errors():
log.Debugw("error-sending", log.Fields{"status": notOk})
- if strings.Contains(notOk.Error(), "Failed to produce") {
+ if sc.isLivenessError(notOk) {
sc.updateLiveness(false)
}
return notOk
@@ -577,7 +622,7 @@
sc.updateLiveness(true)
case notOk := <-sc.producer.Errors():
log.Debugw("liveness-error-sending", log.Fields{"status": notOk})
- if strings.Contains(notOk.Error(), "Failed to produce") {
+ if sc.isLivenessError(notOk) {
sc.updateLiveness(false)
}
return notOk
@@ -896,7 +941,9 @@
select {
case err, ok := <-consumer.Errors():
if ok {
- sc.updateLiveness(false)
+ if sc.isLivenessError(err) {
+ sc.updateLiveness(false)
+ }
log.Warnw("group-consumers-error", log.Fields{"topic": topic.Name, "error": err})
} else {
log.Warnw("group-consumers-closed-err", log.Fields{"topic": topic.Name})
diff --git a/vendor/github.com/opencord/voltha-protos/v2/go/inter_container/inter_container.pb.go b/vendor/github.com/opencord/voltha-protos/v2/go/inter_container/inter_container.pb.go
index c3b77bb..e529427 100644
--- a/vendor/github.com/opencord/voltha-protos/v2/go/inter_container/inter_container.pb.go
+++ b/vendor/github.com/opencord/voltha-protos/v2/go/inter_container/inter_container.pb.go
@@ -127,17 +127,17 @@
// DeviceGroups from public import voltha_protos/voltha.proto
type DeviceGroups = voltha.DeviceGroups
-// AlarmFilterRuleKey from public import voltha_protos/voltha.proto
-type AlarmFilterRuleKey = voltha.AlarmFilterRuleKey
+// EventFilterRuleKey from public import voltha_protos/voltha.proto
+type EventFilterRuleKey = voltha.EventFilterRuleKey
-// AlarmFilterRule from public import voltha_protos/voltha.proto
-type AlarmFilterRule = voltha.AlarmFilterRule
+// EventFilterRule from public import voltha_protos/voltha.proto
+type EventFilterRule = voltha.EventFilterRule
-// AlarmFilter from public import voltha_protos/voltha.proto
-type AlarmFilter = voltha.AlarmFilter
+// EventFilter from public import voltha_protos/voltha.proto
+type EventFilter = voltha.EventFilter
-// AlarmFilters from public import voltha_protos/voltha.proto
-type AlarmFilters = voltha.AlarmFilters
+// EventFilters from public import voltha_protos/voltha.proto
+type EventFilters = voltha.EventFilters
// CoreInstance from public import voltha_protos/voltha.proto
type CoreInstance = voltha.CoreInstance
@@ -160,18 +160,18 @@
// FlowMetadata from public import voltha_protos/voltha.proto
type FlowMetadata = voltha.FlowMetadata
-// AlarmFilterRuleKey_AlarmFilterRuleKey from public import voltha_protos/voltha.proto
-type AlarmFilterRuleKey_AlarmFilterRuleKey = voltha.AlarmFilterRuleKey_AlarmFilterRuleKey
+// EventFilterRuleKey_EventFilterRuleType from public import voltha_protos/voltha.proto
+type EventFilterRuleKey_EventFilterRuleType = voltha.EventFilterRuleKey_EventFilterRuleType
-var AlarmFilterRuleKey_AlarmFilterRuleKey_name = voltha.AlarmFilterRuleKey_AlarmFilterRuleKey_name
-var AlarmFilterRuleKey_AlarmFilterRuleKey_value = voltha.AlarmFilterRuleKey_AlarmFilterRuleKey_value
+var EventFilterRuleKey_EventFilterRuleType_name = voltha.EventFilterRuleKey_EventFilterRuleType_name
+var EventFilterRuleKey_EventFilterRuleType_value = voltha.EventFilterRuleKey_EventFilterRuleType_value
-const AlarmFilterRuleKey_id = AlarmFilterRuleKey_AlarmFilterRuleKey(voltha.AlarmFilterRuleKey_id)
-const AlarmFilterRuleKey_type = AlarmFilterRuleKey_AlarmFilterRuleKey(voltha.AlarmFilterRuleKey_type)
-const AlarmFilterRuleKey_severity = AlarmFilterRuleKey_AlarmFilterRuleKey(voltha.AlarmFilterRuleKey_severity)
-const AlarmFilterRuleKey_resource_id = AlarmFilterRuleKey_AlarmFilterRuleKey(voltha.AlarmFilterRuleKey_resource_id)
-const AlarmFilterRuleKey_category = AlarmFilterRuleKey_AlarmFilterRuleKey(voltha.AlarmFilterRuleKey_category)
-const AlarmFilterRuleKey_device_id = AlarmFilterRuleKey_AlarmFilterRuleKey(voltha.AlarmFilterRuleKey_device_id)
+const EventFilterRuleKey_filter_all = EventFilterRuleKey_EventFilterRuleType(voltha.EventFilterRuleKey_filter_all)
+const EventFilterRuleKey_category = EventFilterRuleKey_EventFilterRuleType(voltha.EventFilterRuleKey_category)
+const EventFilterRuleKey_sub_category = EventFilterRuleKey_EventFilterRuleType(voltha.EventFilterRuleKey_sub_category)
+const EventFilterRuleKey_kpi_event_type = EventFilterRuleKey_EventFilterRuleType(voltha.EventFilterRuleKey_kpi_event_type)
+const EventFilterRuleKey_config_event_type = EventFilterRuleKey_EventFilterRuleType(voltha.EventFilterRuleKey_config_event_type)
+const EventFilterRuleKey_device_event_type = EventFilterRuleKey_EventFilterRuleType(voltha.EventFilterRuleKey_device_event_type)
// SelfTestResponse_SelfTestResult from public import voltha_protos/voltha.proto
type SelfTestResponse_SelfTestResult = voltha.SelfTestResponse_SelfTestResult
diff --git a/vendor/github.com/opencord/voltha-protos/v2/go/voltha/voltha.pb.go b/vendor/github.com/opencord/voltha-protos/v2/go/voltha/voltha.pb.go
index e5e4142..7a768b9 100644
--- a/vendor/github.com/opencord/voltha-protos/v2/go/voltha/voltha.pb.go
+++ b/vendor/github.com/opencord/voltha-protos/v2/go/voltha/voltha.pb.go
@@ -1270,40 +1270,40 @@
const OfpControllerRole_OFPCR_ROLE_MASTER = OfpControllerRole(openflow_13.OfpControllerRole_OFPCR_ROLE_MASTER)
const OfpControllerRole_OFPCR_ROLE_SLAVE = OfpControllerRole(openflow_13.OfpControllerRole_OFPCR_ROLE_SLAVE)
-type AlarmFilterRuleKey_AlarmFilterRuleKey int32
+type EventFilterRuleKey_EventFilterRuleType int32
const (
- AlarmFilterRuleKey_id AlarmFilterRuleKey_AlarmFilterRuleKey = 0
- AlarmFilterRuleKey_type AlarmFilterRuleKey_AlarmFilterRuleKey = 1
- AlarmFilterRuleKey_severity AlarmFilterRuleKey_AlarmFilterRuleKey = 2
- AlarmFilterRuleKey_resource_id AlarmFilterRuleKey_AlarmFilterRuleKey = 3
- AlarmFilterRuleKey_category AlarmFilterRuleKey_AlarmFilterRuleKey = 4
- AlarmFilterRuleKey_device_id AlarmFilterRuleKey_AlarmFilterRuleKey = 5
+ EventFilterRuleKey_filter_all EventFilterRuleKey_EventFilterRuleType = 0
+ EventFilterRuleKey_category EventFilterRuleKey_EventFilterRuleType = 1
+ EventFilterRuleKey_sub_category EventFilterRuleKey_EventFilterRuleType = 2
+ EventFilterRuleKey_kpi_event_type EventFilterRuleKey_EventFilterRuleType = 3
+ EventFilterRuleKey_config_event_type EventFilterRuleKey_EventFilterRuleType = 4
+ EventFilterRuleKey_device_event_type EventFilterRuleKey_EventFilterRuleType = 5
)
-var AlarmFilterRuleKey_AlarmFilterRuleKey_name = map[int32]string{
- 0: "id",
- 1: "type",
- 2: "severity",
- 3: "resource_id",
- 4: "category",
- 5: "device_id",
+var EventFilterRuleKey_EventFilterRuleType_name = map[int32]string{
+ 0: "filter_all",
+ 1: "category",
+ 2: "sub_category",
+ 3: "kpi_event_type",
+ 4: "config_event_type",
+ 5: "device_event_type",
}
-var AlarmFilterRuleKey_AlarmFilterRuleKey_value = map[string]int32{
- "id": 0,
- "type": 1,
- "severity": 2,
- "resource_id": 3,
- "category": 4,
- "device_id": 5,
+var EventFilterRuleKey_EventFilterRuleType_value = map[string]int32{
+ "filter_all": 0,
+ "category": 1,
+ "sub_category": 2,
+ "kpi_event_type": 3,
+ "config_event_type": 4,
+ "device_event_type": 5,
}
-func (x AlarmFilterRuleKey_AlarmFilterRuleKey) String() string {
- return proto.EnumName(AlarmFilterRuleKey_AlarmFilterRuleKey_name, int32(x))
+func (x EventFilterRuleKey_EventFilterRuleType) String() string {
+ return proto.EnumName(EventFilterRuleKey_EventFilterRuleType_name, int32(x))
}
-func (AlarmFilterRuleKey_AlarmFilterRuleKey) EnumDescriptor() ([]byte, []int) {
+func (EventFilterRuleKey_EventFilterRuleType) EnumDescriptor() ([]byte, []int) {
return fileDescriptor_e084f1a60ce7016c, []int{2, 0}
}
@@ -1432,164 +1432,188 @@
return nil
}
-type AlarmFilterRuleKey struct {
+type EventFilterRuleKey struct {
XXX_NoUnkeyedLiteral struct{} `json:"-"`
XXX_unrecognized []byte `json:"-"`
XXX_sizecache int32 `json:"-"`
}
-func (m *AlarmFilterRuleKey) Reset() { *m = AlarmFilterRuleKey{} }
-func (m *AlarmFilterRuleKey) String() string { return proto.CompactTextString(m) }
-func (*AlarmFilterRuleKey) ProtoMessage() {}
-func (*AlarmFilterRuleKey) Descriptor() ([]byte, []int) {
+func (m *EventFilterRuleKey) Reset() { *m = EventFilterRuleKey{} }
+func (m *EventFilterRuleKey) String() string { return proto.CompactTextString(m) }
+func (*EventFilterRuleKey) ProtoMessage() {}
+func (*EventFilterRuleKey) Descriptor() ([]byte, []int) {
return fileDescriptor_e084f1a60ce7016c, []int{2}
}
-func (m *AlarmFilterRuleKey) XXX_Unmarshal(b []byte) error {
- return xxx_messageInfo_AlarmFilterRuleKey.Unmarshal(m, b)
+func (m *EventFilterRuleKey) XXX_Unmarshal(b []byte) error {
+ return xxx_messageInfo_EventFilterRuleKey.Unmarshal(m, b)
}
-func (m *AlarmFilterRuleKey) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
- return xxx_messageInfo_AlarmFilterRuleKey.Marshal(b, m, deterministic)
+func (m *EventFilterRuleKey) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+ return xxx_messageInfo_EventFilterRuleKey.Marshal(b, m, deterministic)
}
-func (m *AlarmFilterRuleKey) XXX_Merge(src proto.Message) {
- xxx_messageInfo_AlarmFilterRuleKey.Merge(m, src)
+func (m *EventFilterRuleKey) XXX_Merge(src proto.Message) {
+ xxx_messageInfo_EventFilterRuleKey.Merge(m, src)
}
-func (m *AlarmFilterRuleKey) XXX_Size() int {
- return xxx_messageInfo_AlarmFilterRuleKey.Size(m)
+func (m *EventFilterRuleKey) XXX_Size() int {
+ return xxx_messageInfo_EventFilterRuleKey.Size(m)
}
-func (m *AlarmFilterRuleKey) XXX_DiscardUnknown() {
- xxx_messageInfo_AlarmFilterRuleKey.DiscardUnknown(m)
+func (m *EventFilterRuleKey) XXX_DiscardUnknown() {
+ xxx_messageInfo_EventFilterRuleKey.DiscardUnknown(m)
}
-var xxx_messageInfo_AlarmFilterRuleKey proto.InternalMessageInfo
+var xxx_messageInfo_EventFilterRuleKey proto.InternalMessageInfo
-type AlarmFilterRule struct {
- Key AlarmFilterRuleKey_AlarmFilterRuleKey `protobuf:"varint,1,opt,name=key,proto3,enum=voltha.AlarmFilterRuleKey_AlarmFilterRuleKey" json:"key,omitempty"`
- Value string `protobuf:"bytes,2,opt,name=value,proto3" json:"value,omitempty"`
- XXX_NoUnkeyedLiteral struct{} `json:"-"`
- XXX_unrecognized []byte `json:"-"`
- XXX_sizecache int32 `json:"-"`
+type EventFilterRule struct {
+ Key EventFilterRuleKey_EventFilterRuleType `protobuf:"varint,1,opt,name=key,proto3,enum=voltha.EventFilterRuleKey_EventFilterRuleType" json:"key,omitempty"`
+ Value string `protobuf:"bytes,2,opt,name=value,proto3" json:"value,omitempty"`
+ XXX_NoUnkeyedLiteral struct{} `json:"-"`
+ XXX_unrecognized []byte `json:"-"`
+ XXX_sizecache int32 `json:"-"`
}
-func (m *AlarmFilterRule) Reset() { *m = AlarmFilterRule{} }
-func (m *AlarmFilterRule) String() string { return proto.CompactTextString(m) }
-func (*AlarmFilterRule) ProtoMessage() {}
-func (*AlarmFilterRule) Descriptor() ([]byte, []int) {
+func (m *EventFilterRule) Reset() { *m = EventFilterRule{} }
+func (m *EventFilterRule) String() string { return proto.CompactTextString(m) }
+func (*EventFilterRule) ProtoMessage() {}
+func (*EventFilterRule) Descriptor() ([]byte, []int) {
return fileDescriptor_e084f1a60ce7016c, []int{3}
}
-func (m *AlarmFilterRule) XXX_Unmarshal(b []byte) error {
- return xxx_messageInfo_AlarmFilterRule.Unmarshal(m, b)
+func (m *EventFilterRule) XXX_Unmarshal(b []byte) error {
+ return xxx_messageInfo_EventFilterRule.Unmarshal(m, b)
}
-func (m *AlarmFilterRule) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
- return xxx_messageInfo_AlarmFilterRule.Marshal(b, m, deterministic)
+func (m *EventFilterRule) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+ return xxx_messageInfo_EventFilterRule.Marshal(b, m, deterministic)
}
-func (m *AlarmFilterRule) XXX_Merge(src proto.Message) {
- xxx_messageInfo_AlarmFilterRule.Merge(m, src)
+func (m *EventFilterRule) XXX_Merge(src proto.Message) {
+ xxx_messageInfo_EventFilterRule.Merge(m, src)
}
-func (m *AlarmFilterRule) XXX_Size() int {
- return xxx_messageInfo_AlarmFilterRule.Size(m)
+func (m *EventFilterRule) XXX_Size() int {
+ return xxx_messageInfo_EventFilterRule.Size(m)
}
-func (m *AlarmFilterRule) XXX_DiscardUnknown() {
- xxx_messageInfo_AlarmFilterRule.DiscardUnknown(m)
+func (m *EventFilterRule) XXX_DiscardUnknown() {
+ xxx_messageInfo_EventFilterRule.DiscardUnknown(m)
}
-var xxx_messageInfo_AlarmFilterRule proto.InternalMessageInfo
+var xxx_messageInfo_EventFilterRule proto.InternalMessageInfo
-func (m *AlarmFilterRule) GetKey() AlarmFilterRuleKey_AlarmFilterRuleKey {
+func (m *EventFilterRule) GetKey() EventFilterRuleKey_EventFilterRuleType {
if m != nil {
return m.Key
}
- return AlarmFilterRuleKey_id
+ return EventFilterRuleKey_filter_all
}
-func (m *AlarmFilterRule) GetValue() string {
+func (m *EventFilterRule) GetValue() string {
if m != nil {
return m.Value
}
return ""
}
-type AlarmFilter struct {
+type EventFilter struct {
Id string `protobuf:"bytes,1,opt,name=id,proto3" json:"id,omitempty"`
- Rules []*AlarmFilterRule `protobuf:"bytes,2,rep,name=rules,proto3" json:"rules,omitempty"`
+ Enable bool `protobuf:"varint,2,opt,name=enable,proto3" json:"enable,omitempty"`
+ DeviceId string `protobuf:"bytes,3,opt,name=device_id,json=deviceId,proto3" json:"device_id,omitempty"`
+ EventType string `protobuf:"bytes,4,opt,name=event_type,json=eventType,proto3" json:"event_type,omitempty"`
+ Rules []*EventFilterRule `protobuf:"bytes,5,rep,name=rules,proto3" json:"rules,omitempty"`
XXX_NoUnkeyedLiteral struct{} `json:"-"`
XXX_unrecognized []byte `json:"-"`
XXX_sizecache int32 `json:"-"`
}
-func (m *AlarmFilter) Reset() { *m = AlarmFilter{} }
-func (m *AlarmFilter) String() string { return proto.CompactTextString(m) }
-func (*AlarmFilter) ProtoMessage() {}
-func (*AlarmFilter) Descriptor() ([]byte, []int) {
+func (m *EventFilter) Reset() { *m = EventFilter{} }
+func (m *EventFilter) String() string { return proto.CompactTextString(m) }
+func (*EventFilter) ProtoMessage() {}
+func (*EventFilter) Descriptor() ([]byte, []int) {
return fileDescriptor_e084f1a60ce7016c, []int{4}
}
-func (m *AlarmFilter) XXX_Unmarshal(b []byte) error {
- return xxx_messageInfo_AlarmFilter.Unmarshal(m, b)
+func (m *EventFilter) XXX_Unmarshal(b []byte) error {
+ return xxx_messageInfo_EventFilter.Unmarshal(m, b)
}
-func (m *AlarmFilter) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
- return xxx_messageInfo_AlarmFilter.Marshal(b, m, deterministic)
+func (m *EventFilter) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+ return xxx_messageInfo_EventFilter.Marshal(b, m, deterministic)
}
-func (m *AlarmFilter) XXX_Merge(src proto.Message) {
- xxx_messageInfo_AlarmFilter.Merge(m, src)
+func (m *EventFilter) XXX_Merge(src proto.Message) {
+ xxx_messageInfo_EventFilter.Merge(m, src)
}
-func (m *AlarmFilter) XXX_Size() int {
- return xxx_messageInfo_AlarmFilter.Size(m)
+func (m *EventFilter) XXX_Size() int {
+ return xxx_messageInfo_EventFilter.Size(m)
}
-func (m *AlarmFilter) XXX_DiscardUnknown() {
- xxx_messageInfo_AlarmFilter.DiscardUnknown(m)
+func (m *EventFilter) XXX_DiscardUnknown() {
+ xxx_messageInfo_EventFilter.DiscardUnknown(m)
}
-var xxx_messageInfo_AlarmFilter proto.InternalMessageInfo
+var xxx_messageInfo_EventFilter proto.InternalMessageInfo
-func (m *AlarmFilter) GetId() string {
+func (m *EventFilter) GetId() string {
if m != nil {
return m.Id
}
return ""
}
-func (m *AlarmFilter) GetRules() []*AlarmFilterRule {
+func (m *EventFilter) GetEnable() bool {
+ if m != nil {
+ return m.Enable
+ }
+ return false
+}
+
+func (m *EventFilter) GetDeviceId() string {
+ if m != nil {
+ return m.DeviceId
+ }
+ return ""
+}
+
+func (m *EventFilter) GetEventType() string {
+ if m != nil {
+ return m.EventType
+ }
+ return ""
+}
+
+func (m *EventFilter) GetRules() []*EventFilterRule {
if m != nil {
return m.Rules
}
return nil
}
-type AlarmFilters struct {
- Filters []*AlarmFilter `protobuf:"bytes,1,rep,name=filters,proto3" json:"filters,omitempty"`
+type EventFilters struct {
+ Filters []*EventFilter `protobuf:"bytes,1,rep,name=filters,proto3" json:"filters,omitempty"`
XXX_NoUnkeyedLiteral struct{} `json:"-"`
XXX_unrecognized []byte `json:"-"`
XXX_sizecache int32 `json:"-"`
}
-func (m *AlarmFilters) Reset() { *m = AlarmFilters{} }
-func (m *AlarmFilters) String() string { return proto.CompactTextString(m) }
-func (*AlarmFilters) ProtoMessage() {}
-func (*AlarmFilters) Descriptor() ([]byte, []int) {
+func (m *EventFilters) Reset() { *m = EventFilters{} }
+func (m *EventFilters) String() string { return proto.CompactTextString(m) }
+func (*EventFilters) ProtoMessage() {}
+func (*EventFilters) Descriptor() ([]byte, []int) {
return fileDescriptor_e084f1a60ce7016c, []int{5}
}
-func (m *AlarmFilters) XXX_Unmarshal(b []byte) error {
- return xxx_messageInfo_AlarmFilters.Unmarshal(m, b)
+func (m *EventFilters) XXX_Unmarshal(b []byte) error {
+ return xxx_messageInfo_EventFilters.Unmarshal(m, b)
}
-func (m *AlarmFilters) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
- return xxx_messageInfo_AlarmFilters.Marshal(b, m, deterministic)
+func (m *EventFilters) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+ return xxx_messageInfo_EventFilters.Marshal(b, m, deterministic)
}
-func (m *AlarmFilters) XXX_Merge(src proto.Message) {
- xxx_messageInfo_AlarmFilters.Merge(m, src)
+func (m *EventFilters) XXX_Merge(src proto.Message) {
+ xxx_messageInfo_EventFilters.Merge(m, src)
}
-func (m *AlarmFilters) XXX_Size() int {
- return xxx_messageInfo_AlarmFilters.Size(m)
+func (m *EventFilters) XXX_Size() int {
+ return xxx_messageInfo_EventFilters.Size(m)
}
-func (m *AlarmFilters) XXX_DiscardUnknown() {
- xxx_messageInfo_AlarmFilters.DiscardUnknown(m)
+func (m *EventFilters) XXX_DiscardUnknown() {
+ xxx_messageInfo_EventFilters.DiscardUnknown(m)
}
-var xxx_messageInfo_AlarmFilters proto.InternalMessageInfo
+var xxx_messageInfo_EventFilters proto.InternalMessageInfo
-func (m *AlarmFilters) GetFilters() []*AlarmFilter {
+func (m *EventFilters) GetFilters() []*EventFilter {
if m != nil {
return m.Filters
}
@@ -1694,7 +1718,7 @@
Devices []*Device `protobuf:"bytes,4,rep,name=devices,proto3" json:"devices,omitempty"`
DeviceTypes []*DeviceType `protobuf:"bytes,5,rep,name=device_types,json=deviceTypes,proto3" json:"device_types,omitempty"`
DeviceGroups []*DeviceGroup `protobuf:"bytes,6,rep,name=device_groups,json=deviceGroups,proto3" json:"device_groups,omitempty"`
- AlarmFilters []*AlarmFilter `protobuf:"bytes,7,rep,name=alarm_filters,json=alarmFilters,proto3" json:"alarm_filters,omitempty"`
+ EventFilters []*EventFilter `protobuf:"bytes,7,rep,name=event_filters,json=eventFilters,proto3" json:"event_filters,omitempty"`
OmciMibDatabase []*omci.MibDeviceData `protobuf:"bytes,28,rep,name=omci_mib_database,json=omciMibDatabase,proto3" json:"omci_mib_database,omitempty"`
OmciAlarmDatabase []*omci.AlarmDeviceData `protobuf:"bytes,29,rep,name=omci_alarm_database,json=omciAlarmDatabase,proto3" json:"omci_alarm_database,omitempty"`
XXX_NoUnkeyedLiteral struct{} `json:"-"`
@@ -1769,9 +1793,9 @@
return nil
}
-func (m *Voltha) GetAlarmFilters() []*AlarmFilter {
+func (m *Voltha) GetEventFilters() []*EventFilter {
if m != nil {
- return m.AlarmFilters
+ return m.EventFilters
}
return nil
}
@@ -1971,14 +1995,14 @@
}
func init() {
- proto.RegisterEnum("voltha.AlarmFilterRuleKey_AlarmFilterRuleKey", AlarmFilterRuleKey_AlarmFilterRuleKey_name, AlarmFilterRuleKey_AlarmFilterRuleKey_value)
+ proto.RegisterEnum("voltha.EventFilterRuleKey_EventFilterRuleType", EventFilterRuleKey_EventFilterRuleType_name, EventFilterRuleKey_EventFilterRuleType_value)
proto.RegisterEnum("voltha.SelfTestResponse_SelfTestResult", SelfTestResponse_SelfTestResult_name, SelfTestResponse_SelfTestResult_value)
proto.RegisterType((*DeviceGroup)(nil), "voltha.DeviceGroup")
proto.RegisterType((*DeviceGroups)(nil), "voltha.DeviceGroups")
- proto.RegisterType((*AlarmFilterRuleKey)(nil), "voltha.AlarmFilterRuleKey")
- proto.RegisterType((*AlarmFilterRule)(nil), "voltha.AlarmFilterRule")
- proto.RegisterType((*AlarmFilter)(nil), "voltha.AlarmFilter")
- proto.RegisterType((*AlarmFilters)(nil), "voltha.AlarmFilters")
+ proto.RegisterType((*EventFilterRuleKey)(nil), "voltha.EventFilterRuleKey")
+ proto.RegisterType((*EventFilterRule)(nil), "voltha.EventFilterRule")
+ proto.RegisterType((*EventFilter)(nil), "voltha.EventFilter")
+ proto.RegisterType((*EventFilters)(nil), "voltha.EventFilters")
proto.RegisterType((*CoreInstance)(nil), "voltha.CoreInstance")
proto.RegisterType((*CoreInstances)(nil), "voltha.CoreInstances")
proto.RegisterType((*Voltha)(nil), "voltha.Voltha")
@@ -1991,164 +2015,167 @@
func init() { proto.RegisterFile("voltha_protos/voltha.proto", fileDescriptor_e084f1a60ce7016c) }
var fileDescriptor_e084f1a60ce7016c = []byte{
- // 2497 bytes of a gzipped FileDescriptorProto
- 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xc4, 0x5a, 0xcb, 0x72, 0xdb, 0xc8,
- 0xd5, 0x16, 0x75, 0xd7, 0x21, 0x29, 0x92, 0x4d, 0x5d, 0x38, 0x94, 0x34, 0x96, 0x7b, 0x7c, 0xfb,
- 0xf5, 0x8f, 0x48, 0x5b, 0x1a, 0xbb, 0x12, 0x4f, 0xa6, 0x26, 0x16, 0x25, 0x2b, 0x8c, 0x65, 0x89,
- 0x01, 0x2d, 0x3b, 0xc9, 0x8c, 0x8b, 0x05, 0x12, 0x2d, 0x0a, 0x35, 0x20, 0xc0, 0xa0, 0x9b, 0x74,
- 0x54, 0xce, 0x54, 0x52, 0xce, 0xb5, 0xb2, 0xcc, 0xbc, 0x42, 0x56, 0xa9, 0xbc, 0x8a, 0x57, 0x79,
- 0x81, 0x54, 0x2a, 0x8b, 0x2c, 0xb3, 0x72, 0xb2, 0x4c, 0xf5, 0x05, 0x24, 0x40, 0x00, 0xba, 0x4c,
- 0xa6, 0x2a, 0x2b, 0x11, 0xdd, 0xa7, 0xbf, 0xef, 0xeb, 0xd3, 0xa7, 0xfb, 0x1c, 0x34, 0x04, 0xc5,
- 0xbe, 0x63, 0xb1, 0x53, 0xbd, 0xd1, 0x75, 0x1d, 0xe6, 0xd0, 0xb2, 0x7c, 0x2a, 0x89, 0x27, 0x34,
- 0x2d, 0x9f, 0x8a, 0xab, 0x6d, 0xc7, 0x69, 0x5b, 0xa4, 0xac, 0x77, 0xcd, 0xb2, 0x6e, 0xdb, 0x0e,
- 0xd3, 0x99, 0xe9, 0xd8, 0x54, 0x5a, 0x15, 0x57, 0x54, 0xaf, 0x78, 0x6a, 0xf6, 0x4e, 0xca, 0xa4,
- 0xd3, 0x65, 0x67, 0xaa, 0xb3, 0x10, 0x84, 0xef, 0x10, 0xa6, 0xc0, 0x8b, 0x23, 0xc4, 0x2d, 0xa7,
- 0xd3, 0x71, 0xec, 0xe8, 0xbe, 0x53, 0xa2, 0x5b, 0xec, 0x54, 0xf5, 0xe1, 0x60, 0x9f, 0xe5, 0xb4,
- 0xcd, 0x96, 0x6e, 0x35, 0x0c, 0xd2, 0x37, 0x5b, 0x24, 0x7a, 0x7c, 0xa0, 0x6f, 0x25, 0xd8, 0xa7,
- 0x1b, 0x7a, 0x97, 0x11, 0x57, 0x75, 0x5e, 0x0b, 0x76, 0x3a, 0x5d, 0x62, 0x9f, 0x58, 0xce, 0xab,
- 0xc6, 0xbd, 0xed, 0x18, 0x83, 0x4e, 0xcb, 0x6c, 0x74, 0xcc, 0x66, 0xc3, 0x68, 0x2a, 0x83, 0xeb,
- 0x11, 0x06, 0xba, 0xa5, 0xbb, 0x9d, 0xa1, 0xc9, 0x7a, 0xd0, 0xe4, 0x4c, 0xb7, 0xdb, 0x0d, 0xa7,
- 0xeb, 0x73, 0x29, 0xfe, 0x63, 0x02, 0x92, 0xbb, 0x42, 0xf4, 0xbe, 0xeb, 0xf4, 0xba, 0x68, 0x11,
- 0xc6, 0x4d, 0xa3, 0x90, 0x58, 0x4f, 0xdc, 0x99, 0xdb, 0x99, 0xfa, 0xc7, 0xbb, 0xb7, 0x6b, 0x09,
- 0x6d, 0xdc, 0x34, 0x50, 0x15, 0x32, 0xc1, 0xe9, 0xd3, 0xc2, 0xf8, 0xfa, 0xc4, 0x9d, 0xe4, 0xd6,
- 0x62, 0x49, 0xad, 0xe3, 0x81, 0xec, 0x96, 0x58, 0x3b, 0x73, 0x7f, 0x7b, 0xf7, 0x76, 0x6d, 0x92,
- 0x63, 0x69, 0xf3, 0x96, 0xbf, 0x87, 0xa2, 0x6d, 0x98, 0xf1, 0x20, 0x26, 0x04, 0xc4, 0xbc, 0x07,
- 0x11, 0x1e, 0xeb, 0x59, 0xe2, 0x6f, 0x43, 0xca, 0xa7, 0x92, 0xa2, 0xff, 0x83, 0x29, 0x93, 0x91,
- 0x0e, 0x2d, 0x24, 0x04, 0x44, 0x3e, 0x08, 0x21, 0x8c, 0x34, 0x69, 0x81, 0x7f, 0x0e, 0xe8, 0x11,
- 0xf7, 0xca, 0x63, 0xd3, 0x62, 0xc4, 0xd5, 0x7a, 0x16, 0x79, 0x42, 0xce, 0x70, 0x33, 0xaa, 0x15,
- 0x4d, 0x73, 0xd6, 0xec, 0x18, 0x9a, 0x85, 0x49, 0x76, 0xd6, 0x25, 0xd9, 0x04, 0x4a, 0xc1, 0x2c,
- 0x25, 0x7d, 0xe2, 0x9a, 0xec, 0x2c, 0x3b, 0x8e, 0x32, 0x90, 0x74, 0x09, 0x75, 0x7a, 0x6e, 0x8b,
- 0x34, 0x4c, 0x23, 0x3b, 0xc1, 0xbb, 0x5b, 0x3a, 0x23, 0x6d, 0xc7, 0x3d, 0xcb, 0x4e, 0xa2, 0x34,
- 0xcc, 0x49, 0xc1, 0xbc, 0x73, 0xea, 0xe1, 0xd4, 0x3f, 0xdf, 0xbd, 0x5d, 0x1b, 0xc3, 0xa7, 0x90,
- 0x19, 0xa1, 0x42, 0x9f, 0xc2, 0xc4, 0x17, 0xe4, 0x4c, 0xb8, 0x79, 0x7e, 0x6b, 0xd3, 0x13, 0x1f,
- 0x16, 0x14, 0xd1, 0xa4, 0xf1, 0x91, 0x68, 0x01, 0xa6, 0xfa, 0xba, 0xd5, 0x23, 0x85, 0x71, 0xbe,
- 0x52, 0x9a, 0x7c, 0xc0, 0x75, 0x48, 0xfa, 0x06, 0xc4, 0xad, 0xe5, 0x26, 0x4c, 0xb9, 0x3d, 0x6b,
- 0xb0, 0x82, 0xcb, 0x31, 0xf4, 0x9a, 0xb4, 0xc2, 0x9f, 0x40, 0xca, 0xd7, 0x43, 0xd1, 0x26, 0xcc,
- 0x9c, 0xc8, 0x9f, 0xa3, 0xce, 0xf7, 0x03, 0x78, 0x36, 0xd8, 0x85, 0x54, 0xc5, 0x71, 0x49, 0xd5,
- 0xa6, 0x4c, 0xb7, 0x5b, 0x04, 0xdd, 0x82, 0xa4, 0xa9, 0x7e, 0x37, 0x46, 0xd5, 0x81, 0xd7, 0x53,
- 0x35, 0xd0, 0x36, 0x4c, 0xcb, 0xcd, 0x28, 0xa6, 0x98, 0xdc, 0x5a, 0xf0, 0x58, 0xbe, 0x27, 0x5a,
- 0xeb, 0x4c, 0x67, 0x3d, 0xba, 0x33, 0xc5, 0x63, 0x65, 0x4c, 0x53, 0xa6, 0x0f, 0xa7, 0xfe, 0xcd,
- 0x71, 0xf0, 0x0e, 0xa4, 0xfd, 0x9c, 0x14, 0x6d, 0x04, 0xc3, 0x65, 0x80, 0xe5, 0xb7, 0x52, 0xf1,
- 0xe2, 0x61, 0xfc, 0x75, 0x12, 0xa6, 0x9f, 0x0b, 0x2b, 0x74, 0x0d, 0x66, 0xfa, 0xc4, 0xa5, 0xa6,
- 0x63, 0x07, 0xe5, 0x7a, 0xad, 0xe8, 0x01, 0xcc, 0xaa, 0xcd, 0xed, 0x39, 0x35, 0x33, 0xf0, 0x89,
- 0x6c, 0xf7, 0x07, 0xf5, 0xc0, 0x36, 0x6a, 0x57, 0x4d, 0xfc, 0xf7, 0xbb, 0x6a, 0xf2, 0xb2, 0xbb,
- 0x0a, 0x7d, 0x17, 0x52, 0x2a, 0x5e, 0x79, 0xb4, 0xd3, 0xc2, 0x94, 0x18, 0x89, 0x82, 0x23, 0x9f,
- 0x9d, 0x75, 0x03, 0xa3, 0x93, 0xc6, 0xa0, 0x99, 0xa2, 0x0a, 0xa4, 0x15, 0x42, 0x5b, 0x6c, 0xcc,
- 0xc2, 0x74, 0xec, 0x7e, 0xf4, 0x63, 0x28, 0x5a, 0xb5, 0x99, 0x2b, 0x90, 0x96, 0xe7, 0x96, 0x17,
- 0x57, 0x33, 0xb1, 0x71, 0x15, 0x00, 0xd1, 0xfd, 0x61, 0xf9, 0x03, 0xc8, 0x0d, 0x8f, 0x48, 0x9d,
- 0xe9, 0x4d, 0x9d, 0x92, 0xc2, 0xaa, 0x02, 0xe2, 0x3d, 0xa5, 0xa7, 0x66, 0x53, 0xca, 0xd9, 0xd5,
- 0x99, 0xbe, 0x93, 0xe5, 0x40, 0x49, 0xdf, 0x86, 0xd5, 0x32, 0xdc, 0x8a, 0x1b, 0xa9, 0xd1, 0xe8,
- 0x05, 0xe4, 0xfd, 0x87, 0xaa, 0x07, 0xba, 0xa6, 0x96, 0x48, 0x80, 0x0a, 0x6d, 0xe7, 0xc2, 0x0a,
- 0x59, 0xd2, 0x4c, 0x21, 0x78, 0x21, 0xf6, 0xe7, 0x04, 0x64, 0xeb, 0xc4, 0x3a, 0x79, 0x46, 0x28,
- 0xd3, 0x08, 0xed, 0x3a, 0x36, 0xe5, 0x47, 0xc3, 0xb4, 0x4b, 0x68, 0xcf, 0x62, 0xea, 0x74, 0xb8,
- 0xed, 0x79, 0x61, 0xd4, 0xd2, 0xdf, 0xd0, 0xb3, 0x98, 0xa6, 0x86, 0xe1, 0x1a, 0xcc, 0x07, 0x7b,
- 0x50, 0x12, 0x66, 0xea, 0xc7, 0x95, 0xca, 0x5e, 0xbd, 0x9e, 0x1d, 0xe3, 0x0f, 0x8f, 0x1f, 0x55,
- 0x0f, 0x8e, 0xb5, 0xbd, 0x6c, 0x02, 0xe5, 0x20, 0x7d, 0x78, 0xf4, 0xac, 0x51, 0x3f, 0xae, 0xd5,
- 0x8e, 0xb4, 0x67, 0x7b, 0xbb, 0xd9, 0x71, 0xde, 0x74, 0x7c, 0xf8, 0xe4, 0xf0, 0xe8, 0xc5, 0x61,
- 0x63, 0x4f, 0xd3, 0x8e, 0xb4, 0xec, 0x84, 0x77, 0x8e, 0x1d, 0x41, 0xee, 0xe8, 0xe4, 0x51, 0x9b,
- 0xd8, 0xac, 0xde, 0x6b, 0xd2, 0x96, 0x6b, 0x36, 0x89, 0x8b, 0xd6, 0x00, 0x9c, 0x13, 0x9d, 0x37,
- 0x0e, 0x76, 0xb3, 0x36, 0xa7, 0x5a, 0xaa, 0x06, 0x5a, 0x81, 0x39, 0x95, 0x82, 0x4c, 0x43, 0x9d,
- 0x55, 0xb3, 0xb2, 0xa1, 0x6a, 0xe0, 0x8f, 0x01, 0x9e, 0x92, 0x4e, 0x93, 0xb8, 0xf4, 0xd4, 0xec,
- 0x72, 0x24, 0x11, 0x43, 0x0d, 0x5b, 0xef, 0x10, 0x0f, 0x49, 0xb4, 0x1c, 0xea, 0x1d, 0x82, 0xe6,
- 0xc5, 0x61, 0x26, 0x21, 0xc6, 0x4d, 0x03, 0xef, 0x41, 0xea, 0xb1, 0xe5, 0xbc, 0x7a, 0x4a, 0x98,
- 0xce, 0x57, 0x06, 0xdd, 0x87, 0xe9, 0x0e, 0xf1, 0x9d, 0x4a, 0x6b, 0x25, 0x7f, 0x4a, 0x75, 0x4e,
- 0xba, 0x0d, 0xd1, 0xdd, 0x68, 0x39, 0xf6, 0x89, 0xd9, 0xd6, 0x94, 0xf1, 0xd6, 0x9b, 0xbb, 0x90,
- 0x96, 0xdb, 0xbc, 0x4e, 0x5c, 0xbe, 0x64, 0x48, 0x83, 0xf9, 0xe3, 0xae, 0xa1, 0x33, 0x72, 0xe0,
- 0xb4, 0x0f, 0x48, 0x9f, 0x58, 0x28, 0x53, 0x52, 0x25, 0xc3, 0x81, 0xd3, 0x6e, 0x9b, 0x76, 0xbb,
- 0xb8, 0x54, 0x92, 0x85, 0x48, 0xc9, 0x2b, 0x44, 0x4a, 0x7b, 0xbc, 0x10, 0xc1, 0xcb, 0x6f, 0xfe,
- 0xf2, 0xf7, 0xaf, 0xc6, 0x73, 0x38, 0x25, 0xea, 0x97, 0xfe, 0x3d, 0x5e, 0x32, 0xd0, 0x87, 0x89,
- 0x0d, 0x54, 0x83, 0xd4, 0x3e, 0x61, 0x1e, 0x20, 0x45, 0x85, 0x11, 0xc4, 0x8a, 0xd3, 0xe9, 0x3a,
- 0x36, 0xb1, 0x59, 0x31, 0x3b, 0xd2, 0x43, 0xf1, 0x82, 0x00, 0x9d, 0x47, 0x01, 0x50, 0xf4, 0x02,
- 0xd2, 0xfb, 0x84, 0xf9, 0xdc, 0x17, 0xa3, 0xa9, 0x38, 0xd8, 0xcd, 0x43, 0x5b, 0x5c, 0x14, 0x90,
- 0x0b, 0x08, 0x79, 0x90, 0x9d, 0x21, 0xce, 0x4b, 0xc8, 0xca, 0xe9, 0xfb, 0xb0, 0x23, 0x30, 0x62,
- 0x7d, 0xb0, 0x26, 0xb0, 0x97, 0x71, 0x04, 0x36, 0xf7, 0xc4, 0x2e, 0xcc, 0xed, 0x13, 0xa6, 0x0e,
- 0xd6, 0x38, 0xcd, 0x83, 0xb3, 0x4b, 0xda, 0xe1, 0x8c, 0xc0, 0x9c, 0x43, 0x33, 0x0a, 0x13, 0xf5,
- 0x20, 0x77, 0x60, 0x52, 0x16, 0x3c, 0xe4, 0xe3, 0xd0, 0x16, 0xa3, 0x4e, 0x7b, 0x8a, 0xef, 0xfd,
- 0xfe, 0x5f, 0x6f, 0xd7, 0x66, 0x54, 0x62, 0x10, 0xbf, 0x91, 0xfc, 0x2d, 0xc8, 0xf2, 0x28, 0xe7,
- 0x4d, 0xc0, 0x1c, 0x30, 0xd4, 0x21, 0xb3, 0x4f, 0x02, 0xac, 0x08, 0xbc, 0xf5, 0xaa, 0xee, 0x16,
- 0x23, 0xd3, 0x0a, 0x7e, 0x5f, 0xe0, 0x15, 0xd0, 0x52, 0x08, 0xaf, 0xfc, 0xda, 0x34, 0xbe, 0x44,
- 0x3a, 0xa4, 0xf8, 0x5c, 0x1e, 0x79, 0x49, 0x21, 0x6e, 0x1a, 0xd9, 0x91, 0x94, 0x42, 0xf1, 0x6d,
- 0xae, 0x1a, 0x86, 0xb9, 0x47, 0x10, 0x21, 0x94, 0xf5, 0x88, 0x06, 0x79, 0xe6, 0x35, 0x20, 0x4e,
- 0x71, 0x10, 0x4c, 0x19, 0x71, 0x44, 0x4b, 0x91, 0xc9, 0x87, 0xe2, 0xfb, 0x9c, 0x2e, 0x17, 0x4a,
- 0x59, 0x82, 0xf5, 0x3d, 0xb4, 0xec, 0x0b, 0x4f, 0x7f, 0x37, 0xfa, 0x0c, 0xb2, 0x32, 0xf6, 0x87,
- 0x58, 0x01, 0xaf, 0x45, 0xe7, 0x3a, 0x7c, 0x43, 0xe0, 0xbe, 0x8f, 0x56, 0x63, 0x70, 0xa5, 0xf3,
- 0x5c, 0x58, 0x0a, 0xcd, 0xac, 0xe6, 0xb8, 0x8c, 0x46, 0x2f, 0x8c, 0xb2, 0x13, 0x16, 0xf8, 0x81,
- 0x0a, 0x80, 0x2e, 0x7f, 0x12, 0x6c, 0x37, 0x10, 0x3e, 0x8f, 0xad, 0x2c, 0x2c, 0xd1, 0x2f, 0x13,
- 0xb0, 0x30, 0x3a, 0x23, 0x8e, 0x88, 0x16, 0x23, 0x68, 0xaa, 0x46, 0x31, 0x1f, 0xd1, 0x8c, 0x3f,
- 0xe5, 0xe4, 0xd3, 0x30, 0xc9, 0x21, 0x05, 0x77, 0x09, 0x7d, 0x78, 0x31, 0x77, 0xf9, 0x35, 0xff,
- 0xd3, 0xe0, 0x33, 0xff, 0x75, 0x02, 0x96, 0xf7, 0x6c, 0xbd, 0x69, 0x91, 0x4b, 0x0b, 0x89, 0xdb,
- 0xb2, 0x1f, 0x0b, 0x01, 0xf7, 0xf1, 0xf6, 0x55, 0x04, 0x94, 0x89, 0x20, 0x47, 0xbf, 0x4d, 0x40,
- 0x61, 0xd7, 0xa4, 0xdf, 0x88, 0x90, 0xef, 0x08, 0x21, 0x0f, 0xf0, 0x47, 0x57, 0x12, 0x62, 0x48,
- 0x76, 0xf4, 0xb3, 0x88, 0x58, 0xe0, 0x29, 0x22, 0x18, 0x0b, 0x28, 0x90, 0x17, 0x44, 0x3f, 0xde,
- 0x51, 0x91, 0xc0, 0x5b, 0xc3, 0x47, 0xc1, 0x45, 0x51, 0x21, 0x46, 0xf1, 0xa8, 0x58, 0x1d, 0xe4,
- 0x8d, 0xa0, 0x80, 0x67, 0x42, 0xde, 0x6a, 0x88, 0x58, 0xb4, 0xcb, 0x31, 0xb1, 0x2e, 0xd9, 0x14,
- 0x12, 0x6e, 0xe3, 0x4b, 0x48, 0xe0, 0xc7, 0xeb, 0xaf, 0x12, 0xb0, 0x16, 0xa1, 0xe2, 0x29, 0x4f,
- 0x76, 0x52, 0xc6, 0x4a, 0x40, 0x86, 0xe8, 0x78, 0xea, 0x18, 0x17, 0xa8, 0x28, 0x09, 0x15, 0x77,
- 0xf0, 0x07, 0xe7, 0xaa, 0x90, 0x29, 0x95, 0xcb, 0xf8, 0x45, 0x02, 0x96, 0x43, 0x6b, 0x21, 0xb8,
- 0x82, 0x8b, 0x91, 0x0f, 0x8b, 0xa1, 0x78, 0x97, 0xaf, 0xc0, 0xac, 0x97, 0xce, 0x43, 0xcb, 0x71,
- 0x13, 0x5d, 0x46, 0x05, 0xfa, 0x43, 0x02, 0x56, 0x22, 0xc3, 0x41, 0x15, 0x9d, 0x7e, 0x19, 0xcb,
- 0xa1, 0xa5, 0x91, 0x46, 0xf8, 0x90, 0xb3, 0xa7, 0x21, 0x29, 0xba, 0x64, 0x85, 0x1b, 0xd2, 0xb3,
- 0x81, 0xee, 0x5c, 0xb8, 0x36, 0x6a, 0x2c, 0xfa, 0x2a, 0x01, 0xd7, 0x63, 0x82, 0x44, 0x30, 0xca,
- 0x25, 0xba, 0x1e, 0x2d, 0xe7, 0x32, 0xe1, 0xb2, 0x2d, 0x24, 0x6d, 0xe2, 0x4b, 0x4b, 0xe2, 0xab,
- 0xf5, 0x12, 0x92, 0xdc, 0x53, 0x17, 0xe5, 0x85, 0x4c, 0xb0, 0xa8, 0xa7, 0xf8, 0x26, 0xf7, 0xc5,
- 0xdc, 0xe0, 0xc5, 0x43, 0x16, 0x3f, 0x28, 0xe3, 0x51, 0x7b, 0x09, 0xc0, 0x80, 0xf4, 0x10, 0xbe,
- 0x6a, 0xc4, 0x13, 0x24, 0x87, 0x4b, 0x42, 0x71, 0x89, 0x83, 0x8b, 0x42, 0xff, 0xbc, 0xdc, 0x2c,
- 0x39, 0x4c, 0x83, 0xa2, 0x63, 0xc8, 0x6a, 0xa4, 0xe5, 0xd8, 0x2d, 0xd3, 0x22, 0xde, 0x4c, 0xfc,
- 0x80, 0xb1, 0x2e, 0x5b, 0x15, 0x98, 0x4b, 0x38, 0x8c, 0xc9, 0x7d, 0xb3, 0x27, 0xea, 0x95, 0x88,
- 0xb4, 0x35, 0xf2, 0x7e, 0xe5, 0xc1, 0xa0, 0x85, 0x91, 0xe9, 0xcb, 0x3c, 0xf5, 0x7d, 0x48, 0x55,
- 0x5c, 0xa2, 0x33, 0x25, 0x0d, 0x8d, 0x8c, 0x0e, 0xa1, 0xa9, 0x0a, 0x0d, 0x8f, 0x3a, 0x93, 0x4b,
- 0x7a, 0x01, 0x29, 0x79, 0xf0, 0x47, 0xa8, 0x8a, 0x9b, 0xe4, 0x07, 0x02, 0x6f, 0x0d, 0xaf, 0x44,
- 0xa9, 0xf3, 0x8e, 0xf2, 0x1f, 0x41, 0x5a, 0x9d, 0xe4, 0x57, 0x40, 0x56, 0x79, 0x1a, 0xaf, 0x46,
- 0x22, 0x7b, 0x67, 0xf3, 0x0b, 0x48, 0x69, 0xa4, 0xe9, 0x38, 0xec, 0x1b, 0xd3, 0xec, 0x0a, 0x38,
- 0x0e, 0xbc, 0x4b, 0x2c, 0xc2, 0xbe, 0x86, 0x33, 0x36, 0xa2, 0x81, 0x0d, 0x01, 0x87, 0x7a, 0x90,
- 0xde, 0x75, 0x5e, 0xd9, 0x96, 0xa3, 0x1b, 0xd5, 0x8e, 0xde, 0x26, 0xc3, 0x5c, 0x26, 0x1e, 0xbd,
- 0xbe, 0xe2, 0xa2, 0x47, 0x78, 0xd4, 0x25, 0xae, 0xb8, 0xad, 0xe4, 0x2f, 0x68, 0xf8, 0x81, 0xe0,
- 0xb8, 0x8b, 0xff, 0x3f, 0x92, 0xc3, 0xe4, 0x10, 0x0d, 0x43, 0x61, 0xd0, 0xf2, 0x6b, 0xfe, 0xce,
- 0xf3, 0x25, 0x5f, 0xdc, 0x37, 0x09, 0x58, 0xda, 0x27, 0x2c, 0xc0, 0x21, 0xef, 0x3a, 0xe2, 0x05,
- 0x44, 0x35, 0xe3, 0x87, 0x42, 0xc0, 0x47, 0x68, 0xeb, 0x0a, 0x02, 0xca, 0x54, 0x32, 0xf5, 0x44,
- 0xc9, 0x16, 0xc0, 0xbb, 0x22, 0xbb, 0x3a, 0x87, 0xd0, 0x55, 0xa6, 0x8f, 0x4e, 0x64, 0x99, 0x1a,
- 0x40, 0xa2, 0x23, 0x2b, 0x1a, 0xc5, 0x46, 0xf1, 0x87, 0x82, 0xee, 0x16, 0xba, 0x71, 0x19, 0x3a,
- 0xf4, 0x53, 0xc8, 0x57, 0x78, 0x01, 0x6e, 0x5d, 0x72, 0x86, 0x91, 0x0b, 0xac, 0x66, 0xb8, 0x71,
- 0xa5, 0x19, 0xfe, 0x2e, 0x01, 0xf9, 0x47, 0x2d, 0x66, 0xf6, 0x75, 0x46, 0x04, 0x8b, 0x3c, 0xce,
- 0xaf, 0x48, 0x5d, 0x11, 0xd4, 0x9f, 0xe0, 0x6f, 0x5d, 0x65, 0x69, 0x65, 0x73, 0x4f, 0xf0, 0xf1,
- 0x40, 0xfb, 0x4d, 0x02, 0x72, 0x1a, 0xe9, 0x13, 0x97, 0xfd, 0x4f, 0x84, 0xb8, 0x82, 0x9a, 0x0b,
- 0xf9, 0x1c, 0x32, 0xc3, 0xf4, 0x10, 0xae, 0xdd, 0xd3, 0x9e, 0x22, 0x59, 0xb4, 0x97, 0x42, 0x45,
- 0xfb, 0x2a, 0x2a, 0x46, 0xd2, 0xcb, 0x62, 0xfd, 0x25, 0xe4, 0x7d, 0xe8, 0x9d, 0x8a, 0x78, 0xfb,
- 0x0f, 0x32, 0xe4, 0x06, 0x0c, 0x5e, 0x37, 0xbe, 0x2d, 0x90, 0xaf, 0xa3, 0x6b, 0xd1, 0xc8, 0x1d,
- 0x75, 0x8b, 0x40, 0x91, 0x0d, 0x8b, 0xd2, 0x73, 0xa3, 0x04, 0x61, 0xd0, 0xd8, 0xe3, 0x68, 0x43,
- 0x56, 0x99, 0xf8, 0x22, 0x32, 0xee, 0xac, 0x8e, 0xdf, 0x59, 0x97, 0x2b, 0x6e, 0x1f, 0x9e, 0x5b,
- 0xdc, 0xc6, 0x79, 0x6f, 0x50, 0xd4, 0x2e, 0x04, 0xf9, 0xae, 0x52, 0x3d, 0x3d, 0xbe, 0x44, 0xf5,
- 0x84, 0xd1, 0x7a, 0x2c, 0xbf, 0x57, 0x35, 0x39, 0xfe, 0x49, 0xcb, 0x7b, 0xc7, 0xb8, 0x12, 0x22,
- 0x1f, 0xbe, 0xbb, 0xa4, 0xb8, 0xcc, 0x59, 0xe7, 0x83, 0x77, 0x9d, 0xd1, 0xd9, 0x5a, 0xf6, 0x21,
- 0x4d, 0x5c, 0xae, 0x0c, 0x21, 0x46, 0x7c, 0x1c, 0xa2, 0xc0, 0xd7, 0x05, 0xdc, 0x0a, 0x7a, 0x2f,
- 0x0a, 0x4e, 0x56, 0x00, 0x14, 0xb2, 0xc3, 0x49, 0x28, 0x2f, 0xc6, 0xcd, 0x62, 0x21, 0xe2, 0xfa,
- 0x54, 0x5d, 0x58, 0x64, 0x46, 0x2e, 0x5c, 0xe5, 0x6d, 0x0b, 0x5a, 0x1c, 0x21, 0x56, 0x9e, 0x7b,
- 0x0c, 0xd9, 0x3a, 0x73, 0x89, 0xde, 0xa9, 0xe9, 0xad, 0x2f, 0x08, 0xa3, 0x47, 0x3d, 0x86, 0x96,
- 0x02, 0xcb, 0x25, 0x3b, 0x8e, 0x7a, 0x2c, 0x36, 0x3c, 0xc7, 0xee, 0x24, 0xd0, 0x9e, 0x28, 0xae,
- 0x88, 0xd9, 0x27, 0x0a, 0xa8, 0x6a, 0x9f, 0x73, 0xdd, 0x12, 0xc6, 0xaf, 0xda, 0x78, 0xec, 0x6e,
- 0x02, 0x3d, 0x81, 0xbc, 0x82, 0xa9, 0x9c, 0xea, 0x76, 0x9b, 0xec, 0xf5, 0x89, 0xcd, 0xe2, 0xdd,
- 0x50, 0x08, 0x20, 0xf9, 0x86, 0x08, 0xb0, 0x63, 0x98, 0x1f, 0x2c, 0x92, 0xfc, 0x76, 0x15, 0x7c,
- 0xb3, 0x08, 0xbb, 0x10, 0xe3, 0xe8, 0x90, 0x57, 0xde, 0x92, 0xeb, 0xd4, 0x80, 0x9c, 0xac, 0xd4,
- 0xfc, 0x5f, 0x52, 0xa2, 0xae, 0xa2, 0x8b, 0x51, 0x8d, 0x78, 0x5d, 0x50, 0x14, 0xf1, 0x60, 0x41,
- 0x02, 0x37, 0xdb, 0x7c, 0x0b, 0x4b, 0xdd, 0x7e, 0xf4, 0x48, 0xdd, 0x7e, 0xd0, 0x90, 0xee, 0x00,
- 0xa8, 0xd4, 0x6d, 0x40, 0x4e, 0x9e, 0x44, 0x5f, 0x4f, 0xf7, 0x4d, 0x41, 0x71, 0xad, 0x78, 0x0e,
- 0x05, 0x17, 0xff, 0x19, 0xe4, 0x64, 0xb9, 0x15, 0xa7, 0x3f, 0x2e, 0x8a, 0xd4, 0x14, 0x36, 0xce,
- 0x9b, 0x42, 0x43, 0x6e, 0x91, 0xc0, 0xd7, 0xa6, 0x0b, 0xb7, 0x88, 0xdf, 0xda, 0xbb, 0x7c, 0x44,
- 0xd1, 0xde, 0x47, 0x07, 0xa2, 0x98, 0x17, 0xa9, 0x8d, 0x46, 0x17, 0xf3, 0xb2, 0xcf, 0xab, 0x10,
- 0xd1, 0x4a, 0x7c, 0x62, 0xa3, 0xe8, 0x87, 0x30, 0xeb, 0x5d, 0xb4, 0x07, 0xc0, 0x0a, 0x71, 0x37,
- 0xf6, 0xf8, 0x96, 0x80, 0x5d, 0xc7, 0xef, 0x47, 0xc2, 0x52, 0x62, 0x9d, 0x34, 0x18, 0x47, 0x7b,
- 0x2e, 0xea, 0xaf, 0xc0, 0xf7, 0x8a, 0xd1, 0xd7, 0xe6, 0xd0, 0x07, 0x8d, 0xf0, 0x19, 0xc4, 0x37,
- 0x0f, 0xb7, 0x53, 0xaf, 0xc5, 0x66, 0x13, 0x7d, 0x0e, 0xc8, 0x0b, 0xbd, 0x18, 0xe4, 0xe8, 0xaf,
- 0x1a, 0x61, 0x7f, 0x04, 0xb1, 0x85, 0x97, 0x11, 0x85, 0x74, 0xdd, 0xec, 0xf4, 0x2c, 0x2f, 0x06,
- 0xd1, 0xea, 0xc0, 0x11, 0xfe, 0x66, 0x8d, 0xfc, 0xa4, 0x47, 0x28, 0x8b, 0xab, 0x29, 0x42, 0x17,
- 0x1e, 0x41, 0x1f, 0x29, 0xa4, 0x06, 0x47, 0xe2, 0x01, 0x59, 0x81, 0xb9, 0xc1, 0xd7, 0x08, 0xf4,
- 0x9e, 0x47, 0x18, 0xfa, 0x4e, 0x51, 0x8c, 0xef, 0xc2, 0x63, 0x3b, 0x16, 0xe4, 0x1d, 0xb7, 0x2d,
- 0x4e, 0x9b, 0x96, 0xe3, 0x1a, 0xca, 0x74, 0x27, 0x25, 0xaf, 0x9f, 0x6b, 0xe2, 0xe3, 0xf9, 0x8f,
- 0x4b, 0x6d, 0x93, 0x9d, 0xf6, 0x9a, 0x5c, 0x75, 0xd9, 0xb3, 0x54, 0xff, 0xc4, 0xb0, 0xe9, 0xfd,
- 0x4b, 0xc3, 0x56, 0xb9, 0xed, 0xa8, 0xb6, 0x3f, 0x8d, 0x2f, 0x1d, 0x79, 0x78, 0xcf, 0xfd, 0xb7,
- 0xd9, 0xb5, 0xf1, 0xda, 0x44, 0x6d, 0xb2, 0x36, 0x55, 0x9b, 0xae, 0xcd, 0xd4, 0x66, 0x9b, 0xd3,
- 0x62, 0xec, 0xf6, 0x7f, 0x02, 0x00, 0x00, 0xff, 0xff, 0x42, 0x95, 0xa9, 0x38, 0x1e, 0x21, 0x00,
- 0x00,
+ // 2553 bytes of a gzipped FileDescriptorProto
+ 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xc4, 0x5a, 0xcb, 0x6f, 0x1b, 0xc7,
+ 0x19, 0xd7, 0xea, 0xad, 0x4f, 0xa4, 0x44, 0x0e, 0xf5, 0x60, 0x28, 0x29, 0x96, 0x27, 0xf1, 0xa3,
+ 0x6a, 0x4c, 0xda, 0x52, 0x6c, 0xb4, 0x4e, 0x83, 0x44, 0xa2, 0x64, 0x95, 0xb5, 0x2c, 0xb1, 0x2b,
+ 0xcb, 0xee, 0x23, 0x06, 0xb1, 0xe4, 0x8e, 0xa8, 0x85, 0x97, 0xbb, 0xec, 0xce, 0x50, 0xae, 0xe0,
+ 0x06, 0x28, 0xd2, 0x47, 0x8a, 0xa2, 0xa7, 0xe6, 0xde, 0x53, 0x81, 0x02, 0x45, 0xff, 0x15, 0x9f,
+ 0xfa, 0x0f, 0x14, 0x45, 0x0f, 0x3d, 0xf6, 0x94, 0xf6, 0x58, 0xcc, 0x63, 0xc9, 0x7d, 0xea, 0x91,
+ 0x06, 0xe8, 0x49, 0xdc, 0x99, 0x6f, 0x7e, 0xbf, 0xef, 0x35, 0xf3, 0x7d, 0x3b, 0x2b, 0x28, 0x9d,
+ 0xba, 0x36, 0x3b, 0x31, 0x1a, 0x5d, 0xcf, 0x65, 0x2e, 0xad, 0xc8, 0xa7, 0xb2, 0x78, 0x42, 0xe3,
+ 0xf2, 0xa9, 0xb4, 0xdc, 0x76, 0xdd, 0xb6, 0x4d, 0x2a, 0x46, 0xd7, 0xaa, 0x18, 0x8e, 0xe3, 0x32,
+ 0x83, 0x59, 0xae, 0x43, 0xa5, 0x54, 0x69, 0x49, 0xcd, 0x8a, 0xa7, 0x66, 0xef, 0xb8, 0x42, 0x3a,
+ 0x5d, 0x76, 0xa6, 0x26, 0x8b, 0x61, 0xf8, 0x0e, 0x61, 0x0a, 0xbc, 0x14, 0x21, 0x6e, 0xb9, 0x9d,
+ 0x8e, 0xeb, 0x24, 0xcf, 0x9d, 0x10, 0xc3, 0x66, 0x27, 0x6a, 0x0e, 0x87, 0xe7, 0x6c, 0xb7, 0x6d,
+ 0xb5, 0x0c, 0xbb, 0x61, 0x92, 0x53, 0xab, 0x45, 0x92, 0xd7, 0x87, 0xe6, 0x96, 0xc2, 0x73, 0x86,
+ 0x69, 0x74, 0x19, 0xf1, 0xd4, 0xe4, 0xb5, 0xf0, 0xa4, 0xdb, 0x25, 0xce, 0xb1, 0xed, 0xbe, 0x6a,
+ 0xdc, 0xdb, 0x48, 0x11, 0xe8, 0xb4, 0xac, 0x46, 0xc7, 0x6a, 0x36, 0xcc, 0xa6, 0x12, 0xb8, 0x9e,
+ 0x20, 0x60, 0xd8, 0x86, 0xd7, 0x19, 0x88, 0xac, 0x86, 0x45, 0xce, 0x0c, 0xa7, 0xdd, 0x70, 0xbb,
+ 0x01, 0x97, 0xe2, 0x3f, 0x6a, 0x30, 0xbd, 0x2d, 0x94, 0xde, 0xf5, 0xdc, 0x5e, 0x17, 0xcd, 0xc3,
+ 0xb0, 0x65, 0x16, 0xb5, 0x55, 0xed, 0xf6, 0xd4, 0xd6, 0xd8, 0x3f, 0xbf, 0x7c, 0xb3, 0xa2, 0xe9,
+ 0xc3, 0x96, 0x89, 0x6a, 0x30, 0x1b, 0x36, 0x9f, 0x16, 0x87, 0x57, 0x47, 0x6e, 0x4f, 0xaf, 0xcf,
+ 0x97, 0x55, 0x1c, 0xf7, 0xe4, 0xb4, 0xc4, 0xda, 0x9a, 0xfa, 0xfb, 0x97, 0x6f, 0x56, 0x46, 0x39,
+ 0x96, 0x3e, 0x63, 0x07, 0x67, 0x28, 0xda, 0x80, 0x09, 0x1f, 0x62, 0x44, 0x40, 0xcc, 0xf8, 0x10,
+ 0xf1, 0xb5, 0xbe, 0x24, 0xfe, 0x36, 0x64, 0x02, 0x5a, 0x52, 0xf4, 0x0d, 0x18, 0xb3, 0x18, 0xe9,
+ 0xd0, 0xa2, 0x26, 0x20, 0x0a, 0x61, 0x08, 0x21, 0xa4, 0x4b, 0x09, 0xfc, 0x07, 0x0d, 0xd0, 0xce,
+ 0x29, 0x71, 0xd8, 0x23, 0xcb, 0x66, 0xc4, 0xd3, 0x7b, 0x36, 0x79, 0x4c, 0xce, 0xf0, 0xe7, 0x1a,
+ 0x14, 0x22, 0xc3, 0x4f, 0xcf, 0xba, 0x04, 0xcd, 0x00, 0x1c, 0x8b, 0x91, 0x86, 0x61, 0xdb, 0xb9,
+ 0x21, 0x94, 0x81, 0xc9, 0x96, 0xc1, 0x48, 0xdb, 0xf5, 0xce, 0x72, 0x1a, 0xca, 0x41, 0x86, 0xf6,
+ 0x9a, 0x8d, 0xfe, 0xc8, 0x30, 0x42, 0x30, 0xf3, 0xb2, 0x6b, 0x35, 0x08, 0x87, 0x6a, 0xb0, 0xb3,
+ 0x2e, 0xc9, 0x8d, 0xa0, 0x79, 0xc8, 0xb7, 0x5c, 0xe7, 0xd8, 0x6a, 0x07, 0x87, 0x47, 0xf9, 0xb0,
+ 0xb4, 0x27, 0x38, 0x3c, 0x86, 0x2d, 0x98, 0x8d, 0x28, 0x82, 0x3e, 0x86, 0x91, 0x97, 0xe4, 0x4c,
+ 0x84, 0x61, 0x66, 0xbd, 0xec, 0x1b, 0x17, 0xb7, 0xa2, 0x9c, 0x60, 0x81, 0xce, 0x97, 0xa2, 0x39,
+ 0x18, 0x3b, 0x35, 0xec, 0x1e, 0x29, 0x0e, 0xf3, 0x50, 0xea, 0xf2, 0x01, 0xff, 0x49, 0x83, 0xe9,
+ 0xc0, 0x92, 0xb4, 0x68, 0x2f, 0xc0, 0x38, 0x71, 0x8c, 0xa6, 0x2d, 0x57, 0x4f, 0xea, 0xea, 0x09,
+ 0x2d, 0xc1, 0x94, 0x32, 0xc0, 0x32, 0x8b, 0x23, 0x02, 0x78, 0x52, 0x0e, 0xd4, 0x4c, 0xb4, 0x02,
+ 0x30, 0x30, 0xab, 0x38, 0x2a, 0x66, 0xa7, 0xc4, 0x88, 0xf0, 0xeb, 0x1d, 0x18, 0xf3, 0x7a, 0x36,
+ 0xa1, 0xc5, 0x31, 0x11, 0xb1, 0xc5, 0x14, 0xa3, 0x74, 0x29, 0x85, 0x3f, 0x84, 0x4c, 0x60, 0x86,
+ 0xa2, 0x3b, 0x30, 0x21, 0xc3, 0x12, 0x0b, 0x79, 0x10, 0xc0, 0x97, 0xc1, 0x1e, 0x64, 0xaa, 0xae,
+ 0x47, 0x6a, 0x0e, 0x65, 0x86, 0xd3, 0x22, 0xe8, 0x26, 0x4c, 0x5b, 0xea, 0x77, 0x23, 0x6a, 0x31,
+ 0xf8, 0x33, 0x35, 0x13, 0x6d, 0xc0, 0xb8, 0x3c, 0x02, 0x84, 0xe5, 0xd3, 0xeb, 0x73, 0x3e, 0xcb,
+ 0x77, 0xc5, 0xe8, 0x21, 0x33, 0x58, 0x8f, 0x6e, 0x8d, 0xf1, 0x0c, 0x1d, 0xd2, 0x95, 0xe8, 0xc3,
+ 0xb1, 0xff, 0x70, 0x1c, 0xbc, 0x05, 0xd9, 0x20, 0x27, 0x45, 0x6b, 0xe1, 0x24, 0xed, 0x63, 0x05,
+ 0xa5, 0x54, 0x96, 0xfa, 0x18, 0x7f, 0x1b, 0x85, 0xf1, 0x67, 0x42, 0x0a, 0x5d, 0x83, 0x89, 0x53,
+ 0xe2, 0x51, 0xcb, 0x75, 0xc2, 0xea, 0xfa, 0xa3, 0xe8, 0x01, 0x4c, 0xaa, 0x23, 0xc5, 0xdf, 0x8c,
+ 0xb3, 0x3e, 0xc3, 0xa6, 0x1c, 0x0f, 0x6e, 0xa5, 0xbe, 0x6c, 0xd2, 0x5e, 0x1e, 0xf9, 0xdf, 0xf7,
+ 0xf2, 0xe8, 0x65, 0xf7, 0x32, 0xfa, 0x18, 0x32, 0x2a, 0x8b, 0x78, 0xa6, 0xf8, 0x09, 0x81, 0xc2,
+ 0x2b, 0x79, 0xce, 0x04, 0x57, 0x4f, 0x9b, 0xfd, 0x61, 0x8a, 0xaa, 0x90, 0x55, 0x08, 0x6d, 0x71,
+ 0x1c, 0x14, 0xc7, 0x53, 0x4f, 0x81, 0x20, 0x86, 0xa2, 0x55, 0x47, 0x48, 0x15, 0xb2, 0x32, 0x5f,
+ 0xfd, 0xbc, 0x9a, 0x48, 0xcd, 0xab, 0x10, 0x08, 0x09, 0xa6, 0xe5, 0xf7, 0x21, 0x3f, 0x38, 0x98,
+ 0x0d, 0x66, 0x34, 0x0d, 0x4a, 0x8a, 0xcb, 0x0a, 0x88, 0xcf, 0x94, 0x9f, 0x58, 0x4d, 0xa9, 0xce,
+ 0xb6, 0xc1, 0x8c, 0xad, 0x1c, 0x07, 0x9a, 0x0e, 0x6c, 0x23, 0x7d, 0x96, 0x4b, 0x71, 0x21, 0xb5,
+ 0x1a, 0x3d, 0x87, 0x42, 0xf0, 0x28, 0xf7, 0x41, 0x57, 0x54, 0x88, 0x04, 0xe8, 0x26, 0x9f, 0x3b,
+ 0x17, 0x56, 0xa8, 0x25, 0xc5, 0x14, 0x82, 0x9f, 0x62, 0x7f, 0xd1, 0x20, 0x77, 0x48, 0xec, 0xe3,
+ 0xa7, 0x84, 0x32, 0x9d, 0xd0, 0xae, 0xeb, 0x50, 0x82, 0x3e, 0x82, 0x71, 0x8f, 0xd0, 0x9e, 0xcd,
+ 0xd4, 0x99, 0x73, 0xcb, 0xf7, 0x42, 0x54, 0x32, 0x38, 0xd0, 0xb3, 0x99, 0xae, 0x96, 0xe1, 0x3a,
+ 0xcc, 0x84, 0x67, 0xd0, 0x34, 0x4c, 0x1c, 0x1e, 0x55, 0xab, 0x3b, 0x87, 0x87, 0xb9, 0x21, 0xfe,
+ 0xf0, 0x68, 0xb3, 0xb6, 0x77, 0xa4, 0xef, 0xe4, 0x34, 0x94, 0x87, 0xec, 0xfe, 0xc1, 0xd3, 0xc6,
+ 0xe1, 0x51, 0xbd, 0x7e, 0xa0, 0x3f, 0xdd, 0xd9, 0xce, 0x0d, 0xf3, 0xa1, 0xa3, 0xfd, 0xc7, 0xfb,
+ 0x07, 0xcf, 0xf7, 0x1b, 0x3b, 0xba, 0x7e, 0xa0, 0xe7, 0x46, 0x1e, 0x8e, 0xfd, 0x8b, 0x6f, 0x32,
+ 0x7c, 0x00, 0xf9, 0x83, 0xe3, 0xcd, 0x36, 0x71, 0xd8, 0x61, 0xaf, 0x49, 0x5b, 0x9e, 0xd5, 0x24,
+ 0x1e, 0x3f, 0x6b, 0xdc, 0x63, 0x83, 0x0f, 0xf6, 0x77, 0xb3, 0x3e, 0xa5, 0x46, 0x6a, 0x26, 0x3f,
+ 0xa7, 0x54, 0xe1, 0xb3, 0x4c, 0x75, 0x00, 0x4e, 0xca, 0x81, 0x9a, 0x89, 0x3f, 0x00, 0x78, 0x42,
+ 0x3a, 0x4d, 0xe2, 0xd1, 0x13, 0xab, 0xcb, 0x91, 0x44, 0x0e, 0x35, 0x1c, 0xa3, 0x43, 0x7c, 0x24,
+ 0x31, 0xb2, 0x6f, 0x74, 0x78, 0x35, 0x18, 0xee, 0x43, 0x0c, 0x5b, 0x26, 0xde, 0x81, 0xcc, 0x23,
+ 0xdb, 0x7d, 0xf5, 0x84, 0x30, 0x83, 0x47, 0x06, 0xdd, 0x87, 0xf1, 0x0e, 0x09, 0x9c, 0x4a, 0x2b,
+ 0xe5, 0x60, 0x21, 0x77, 0x8f, 0xbb, 0x0d, 0x31, 0xdd, 0x90, 0xe5, 0x40, 0x57, 0xc2, 0xeb, 0xbf,
+ 0xbb, 0x0b, 0x59, 0xb9, 0xcd, 0x0f, 0x89, 0xc7, 0x43, 0x86, 0x74, 0x98, 0x39, 0xea, 0x9a, 0x06,
+ 0x23, 0x7b, 0x6e, 0x7b, 0x8f, 0x9c, 0x12, 0x1b, 0xcd, 0x96, 0x55, 0xa3, 0xb2, 0xe7, 0xb6, 0xdb,
+ 0x96, 0xd3, 0x2e, 0x2d, 0x94, 0x65, 0xfb, 0x53, 0xf6, 0xdb, 0x9f, 0xf2, 0x0e, 0x6f, 0x7f, 0xf0,
+ 0xe2, 0x67, 0x7f, 0xfd, 0xc7, 0x17, 0xc3, 0x79, 0x9c, 0x11, 0x5d, 0xd3, 0xe9, 0x3d, 0xde, 0xa8,
+ 0xd0, 0x87, 0xda, 0x1a, 0xaa, 0x43, 0x66, 0x97, 0x30, 0x1f, 0x90, 0xa2, 0x62, 0x04, 0xb1, 0xea,
+ 0x76, 0xba, 0xae, 0x43, 0x1c, 0x56, 0xca, 0x45, 0x66, 0x28, 0x9e, 0x13, 0xa0, 0x33, 0x28, 0x04,
+ 0x8a, 0x9e, 0x43, 0x76, 0x97, 0xb0, 0x80, 0xfb, 0x52, 0x74, 0x2a, 0xf5, 0x77, 0xf3, 0x40, 0x16,
+ 0x97, 0x04, 0xe4, 0x1c, 0x42, 0x3e, 0x64, 0x67, 0x80, 0xf3, 0x02, 0x72, 0xd2, 0xfc, 0x00, 0x76,
+ 0x02, 0x46, 0xaa, 0x0f, 0x56, 0x04, 0xf6, 0x22, 0x4e, 0xc0, 0xe6, 0x9e, 0xd8, 0x86, 0xa9, 0x5d,
+ 0xc2, 0xd4, 0xc1, 0x9a, 0xa6, 0x73, 0xff, 0xec, 0x92, 0x72, 0x78, 0x56, 0x60, 0x4e, 0xa1, 0x09,
+ 0x85, 0x89, 0x7a, 0x90, 0xdf, 0xb3, 0x28, 0x0b, 0x1f, 0xf2, 0x69, 0x68, 0xf3, 0x49, 0xa7, 0x3d,
+ 0xc5, 0xf7, 0x7e, 0xfb, 0xef, 0x37, 0x2b, 0x13, 0xaa, 0x30, 0x88, 0xdf, 0x48, 0xfe, 0x16, 0x64,
+ 0x05, 0x94, 0xf7, 0x0d, 0xb0, 0xfa, 0x0c, 0x87, 0x30, 0xbb, 0x4b, 0x42, 0xac, 0x08, 0xfc, 0x78,
+ 0xd5, 0xb6, 0x4b, 0x89, 0x65, 0x05, 0xbf, 0x2d, 0xf0, 0x8a, 0x68, 0x21, 0x86, 0x57, 0x79, 0x6d,
+ 0x99, 0x9f, 0x22, 0x03, 0x32, 0xdc, 0x96, 0x4d, 0xbf, 0x28, 0xa4, 0x99, 0x91, 0x8b, 0x94, 0x14,
+ 0x8a, 0x6f, 0x71, 0xad, 0x61, 0x50, 0x7b, 0x04, 0x11, 0x42, 0x39, 0x9f, 0xa8, 0x5f, 0x67, 0x5e,
+ 0x03, 0xe2, 0x14, 0x7b, 0xe1, 0x92, 0x91, 0x46, 0xb4, 0x90, 0x58, 0x7c, 0x28, 0xbe, 0xcf, 0xe9,
+ 0xf2, 0xb1, 0x92, 0x25, 0x58, 0xdf, 0x42, 0x8b, 0x81, 0xf4, 0x0c, 0x4e, 0xa3, 0x1f, 0x43, 0x4e,
+ 0xe6, 0xfe, 0x00, 0x2b, 0xe4, 0xb5, 0xe4, 0x5a, 0x87, 0xdf, 0x15, 0xb8, 0x6f, 0xa3, 0xe5, 0x14,
+ 0x5c, 0xe9, 0x3c, 0x0f, 0x16, 0x62, 0x96, 0xd5, 0x5d, 0x8f, 0xd1, 0xe4, 0xc0, 0x28, 0x39, 0x21,
+ 0x81, 0x1f, 0xa8, 0x04, 0xe8, 0xf2, 0x27, 0xc1, 0xf6, 0x2e, 0xc2, 0xe7, 0xb1, 0x55, 0x84, 0x24,
+ 0xfa, 0x85, 0x06, 0x73, 0x51, 0x8b, 0x38, 0x22, 0x9a, 0x4f, 0xa0, 0xa9, 0x99, 0xa5, 0x42, 0xc2,
+ 0x30, 0xfe, 0x88, 0x93, 0x8f, 0xc3, 0x28, 0x87, 0x14, 0xdc, 0x65, 0xf4, 0xde, 0xc5, 0xdc, 0x95,
+ 0xd7, 0xfc, 0x4f, 0x83, 0x5b, 0xfe, 0x2b, 0x0d, 0x16, 0x77, 0x44, 0x33, 0x78, 0x69, 0x45, 0xd2,
+ 0xb6, 0xec, 0x07, 0x42, 0x81, 0xfb, 0x78, 0xe3, 0x2a, 0x0a, 0x54, 0x54, 0x27, 0xfa, 0xb9, 0x06,
+ 0xc5, 0x6d, 0x8b, 0x7e, 0x2d, 0x8a, 0x7c, 0x47, 0x28, 0xf2, 0x00, 0xbf, 0x7f, 0x25, 0x45, 0x4c,
+ 0xc9, 0x8e, 0x7e, 0x96, 0x90, 0x0b, 0xbc, 0x44, 0x84, 0x73, 0x01, 0x85, 0xea, 0x82, 0x98, 0xc7,
+ 0x5b, 0x2a, 0x13, 0xf8, 0x68, 0xfc, 0x28, 0xb8, 0x28, 0x2b, 0xc4, 0x2a, 0x9e, 0x15, 0xcb, 0xfd,
+ 0xba, 0x11, 0x56, 0xe0, 0xa9, 0x50, 0x6f, 0x39, 0x46, 0x2c, 0xc6, 0xe5, 0x9a, 0x54, 0x97, 0xdc,
+ 0x11, 0x2a, 0xdc, 0xc2, 0x97, 0x50, 0x81, 0x1f, 0xaf, 0xbf, 0xd4, 0x60, 0x25, 0x41, 0x8b, 0x27,
+ 0xbc, 0xd8, 0x49, 0x35, 0x96, 0x42, 0x6a, 0x88, 0x89, 0x27, 0xae, 0x79, 0x81, 0x16, 0x65, 0xa1,
+ 0xc5, 0x6d, 0xfc, 0xce, 0xb9, 0x5a, 0xc8, 0x92, 0xca, 0xd5, 0xf8, 0xb9, 0x06, 0x8b, 0xb1, 0x58,
+ 0x08, 0xae, 0x70, 0x30, 0x0a, 0x71, 0x65, 0x28, 0xde, 0xe6, 0x11, 0x98, 0xf4, 0xcb, 0x79, 0x2c,
+ 0x1c, 0x37, 0xd0, 0x65, 0xb4, 0x40, 0xbf, 0xd7, 0x60, 0x29, 0x31, 0x1d, 0x54, 0xd3, 0x19, 0x54,
+ 0x63, 0x31, 0x16, 0x1a, 0x29, 0x84, 0xf7, 0x39, 0x7b, 0x16, 0xa6, 0xc5, 0x94, 0xec, 0x70, 0x63,
+ 0xfa, 0xac, 0xa1, 0xdb, 0x17, 0xc6, 0x46, 0xad, 0x45, 0x5f, 0x68, 0x70, 0x3d, 0x25, 0x49, 0x04,
+ 0xa3, 0x0c, 0xd1, 0xf5, 0x64, 0x75, 0x2e, 0x93, 0x2e, 0x1b, 0x42, 0xa5, 0x3b, 0xf8, 0xd2, 0x2a,
+ 0xf1, 0x68, 0xbd, 0x80, 0x69, 0xee, 0xa9, 0x8b, 0xea, 0xc2, 0x6c, 0xb8, 0xa9, 0xa7, 0xf8, 0x06,
+ 0xf7, 0xc5, 0x54, 0xff, 0xc5, 0x43, 0x36, 0x3f, 0x68, 0xd6, 0xa7, 0xf6, 0x0b, 0x80, 0x09, 0xd9,
+ 0x01, 0x7c, 0xcd, 0x4c, 0x27, 0x98, 0x1e, 0x84, 0x84, 0xe2, 0x32, 0x07, 0x17, 0x8d, 0xfe, 0x79,
+ 0xb5, 0x59, 0x72, 0x58, 0x26, 0x45, 0x47, 0x90, 0xd3, 0x49, 0xcb, 0x75, 0x5a, 0x96, 0x4d, 0x7c,
+ 0x4b, 0x82, 0x80, 0xa9, 0x2e, 0x5b, 0x16, 0x98, 0x0b, 0x38, 0x8e, 0xc9, 0x7d, 0xb3, 0x23, 0xfa,
+ 0x95, 0x84, 0xb2, 0x15, 0x79, 0xbf, 0xf2, 0x61, 0xd0, 0x5c, 0xc4, 0x7c, 0x59, 0xa7, 0xbe, 0x07,
+ 0x99, 0xaa, 0x47, 0x0c, 0xa6, 0x54, 0x43, 0x91, 0xd5, 0x31, 0x34, 0xd5, 0xa1, 0xe1, 0xa8, 0x33,
+ 0xb9, 0x4a, 0xcf, 0x21, 0x23, 0x0f, 0xfe, 0x04, 0xad, 0xd2, 0x8c, 0x7c, 0x47, 0xe0, 0xad, 0xe0,
+ 0xa5, 0x24, 0xed, 0xfc, 0xa3, 0xfc, 0x87, 0x90, 0x55, 0x27, 0xf9, 0x15, 0x90, 0x55, 0x9d, 0xc6,
+ 0xcb, 0x89, 0xc8, 0xfe, 0xd9, 0xfc, 0x1c, 0x32, 0x3a, 0x69, 0xba, 0x2e, 0xfb, 0xda, 0x74, 0xf6,
+ 0x04, 0x1c, 0x07, 0xde, 0x26, 0x36, 0x61, 0x5f, 0xc1, 0x19, 0x6b, 0xc9, 0xc0, 0xa6, 0x80, 0x43,
+ 0x3d, 0xc8, 0x6e, 0xbb, 0xaf, 0x1c, 0xdb, 0x35, 0xcc, 0x5a, 0xc7, 0x68, 0x93, 0x41, 0x2d, 0x13,
+ 0x8f, 0xfe, 0x5c, 0x69, 0xde, 0x27, 0x3c, 0xe8, 0x12, 0x4f, 0xdc, 0x91, 0xf2, 0x17, 0x34, 0xfc,
+ 0x40, 0x70, 0xdc, 0xc5, 0xdf, 0x4c, 0xe4, 0xb0, 0x38, 0x44, 0xc3, 0x54, 0x18, 0xb4, 0xf2, 0x9a,
+ 0xbf, 0xf3, 0x7c, 0xca, 0x83, 0xfb, 0x99, 0x06, 0x0b, 0xbb, 0x84, 0x85, 0x38, 0xe4, 0x5d, 0x47,
+ 0xba, 0x02, 0x49, 0xc3, 0xf8, 0xa1, 0x50, 0xe0, 0x7d, 0xb4, 0x7e, 0x05, 0x05, 0x2a, 0x54, 0x32,
+ 0xf5, 0x44, 0xcb, 0x16, 0xc2, 0xbb, 0x22, 0xbb, 0x3a, 0x87, 0xd0, 0x55, 0xcc, 0x47, 0xc7, 0xb2,
+ 0x4d, 0x0d, 0x21, 0xd1, 0x48, 0x44, 0x93, 0xd8, 0x28, 0x7e, 0x4f, 0xd0, 0xdd, 0x44, 0xef, 0x5e,
+ 0x86, 0x0e, 0xfd, 0x14, 0x0a, 0x55, 0xde, 0x80, 0xdb, 0x97, 0xb4, 0x30, 0x31, 0xc0, 0xca, 0xc2,
+ 0xb5, 0x2b, 0x59, 0xf8, 0x1b, 0x0d, 0x0a, 0x9b, 0x2d, 0x66, 0x9d, 0x1a, 0x8c, 0x08, 0x16, 0x79,
+ 0x9c, 0x5f, 0x91, 0xba, 0x2a, 0xa8, 0x3f, 0xc4, 0xdf, 0xba, 0x4a, 0x68, 0xe5, 0x70, 0x4f, 0xf0,
+ 0xf1, 0x44, 0xfb, 0xb5, 0x06, 0x79, 0x9d, 0x9c, 0x12, 0x8f, 0xfd, 0x5f, 0x14, 0xf1, 0x04, 0x35,
+ 0x57, 0xe4, 0x13, 0x98, 0x1d, 0x94, 0x87, 0x78, 0xef, 0x9e, 0xf5, 0x35, 0x92, 0x4d, 0x7b, 0x39,
+ 0xd6, 0xb4, 0x2f, 0xa3, 0x52, 0x22, 0xbd, 0x6c, 0xd6, 0x5f, 0x40, 0x21, 0x80, 0xde, 0xa9, 0x8a,
+ 0xb7, 0xff, 0x30, 0x43, 0xbe, 0xcf, 0xe0, 0x4f, 0xe3, 0x5b, 0x02, 0xf9, 0x3a, 0xba, 0x96, 0x8c,
+ 0xdc, 0x51, 0xb7, 0x08, 0x14, 0x39, 0x30, 0x2f, 0x3d, 0x17, 0x25, 0x88, 0x83, 0xa6, 0x1e, 0x47,
+ 0x6b, 0xb2, 0xcb, 0xc4, 0x17, 0x91, 0x71, 0x67, 0x75, 0x82, 0xce, 0xba, 0x5c, 0x73, 0xfb, 0xf0,
+ 0xdc, 0xe6, 0x36, 0xcd, 0x7b, 0xfd, 0xa6, 0x76, 0x2e, 0xcc, 0x77, 0x95, 0xee, 0xe9, 0xd1, 0x25,
+ 0xba, 0x27, 0x8c, 0x56, 0x53, 0xf9, 0xfd, 0xae, 0xc9, 0x0d, 0x1a, 0x2d, 0xef, 0x1d, 0xd3, 0x5a,
+ 0x88, 0x42, 0xfc, 0xee, 0x92, 0xe2, 0x0a, 0x67, 0x9d, 0x09, 0xdf, 0x75, 0x26, 0x57, 0x6b, 0x39,
+ 0x87, 0x74, 0x71, 0xb9, 0x32, 0x80, 0x88, 0xf8, 0x38, 0x46, 0x81, 0xaf, 0x0b, 0xb8, 0x25, 0xf4,
+ 0x56, 0x12, 0x9c, 0xec, 0x00, 0x28, 0xe4, 0x06, 0x46, 0x28, 0x2f, 0xa6, 0x59, 0x31, 0x97, 0x70,
+ 0x7d, 0xaa, 0x2e, 0x2c, 0x66, 0x23, 0x17, 0xae, 0xf2, 0xb6, 0x05, 0xcd, 0x47, 0x88, 0x95, 0xe7,
+ 0x1e, 0x41, 0xee, 0x90, 0x79, 0xc4, 0xe8, 0xd4, 0x8d, 0xd6, 0x4b, 0xc2, 0xe8, 0x41, 0x8f, 0xa1,
+ 0x85, 0x50, 0xb8, 0xe4, 0xc4, 0x41, 0x8f, 0xa5, 0xa6, 0xe7, 0xd0, 0x6d, 0x0d, 0xed, 0x88, 0xe6,
+ 0x8a, 0x58, 0xa7, 0x44, 0x01, 0xd5, 0x9c, 0x73, 0xae, 0x5b, 0xe2, 0xf8, 0x35, 0x07, 0x0f, 0xdd,
+ 0xd5, 0xd0, 0x63, 0x28, 0x28, 0x98, 0xea, 0x89, 0xe1, 0xb4, 0x89, 0xb8, 0xd8, 0x4d, 0x77, 0x43,
+ 0x31, 0x84, 0x14, 0x58, 0x22, 0xc0, 0x8e, 0x60, 0xa6, 0x1f, 0x24, 0xf9, 0xc5, 0x2c, 0xfc, 0x66,
+ 0x11, 0x77, 0x21, 0xc6, 0xc9, 0x29, 0xaf, 0xbc, 0x25, 0xe3, 0xd4, 0x80, 0xbc, 0xec, 0xd4, 0x82,
+ 0x5f, 0x67, 0x92, 0xae, 0xa2, 0x4b, 0x49, 0x83, 0x78, 0x55, 0x50, 0x94, 0x70, 0x3f, 0x20, 0xa1,
+ 0x9b, 0x6d, 0xbe, 0x85, 0x9f, 0x09, 0xbd, 0x83, 0xe8, 0x89, 0x57, 0x15, 0xc1, 0x6f, 0x2e, 0x71,
+ 0xc5, 0x43, 0xa8, 0x52, 0x71, 0x13, 0xf2, 0xf2, 0x28, 0xfa, 0x6a, 0x8a, 0xdf, 0x10, 0x14, 0xd7,
+ 0x4a, 0xe7, 0x50, 0x70, 0xed, 0x4d, 0xc8, 0xcb, 0x7e, 0xeb, 0x42, 0x96, 0xb4, 0x7c, 0x52, 0xb6,
+ 0xac, 0x9d, 0x67, 0x4b, 0x43, 0x6e, 0x96, 0xd0, 0x77, 0xa7, 0x0b, 0x37, 0x4b, 0xc8, 0x63, 0x2b,
+ 0xd1, 0x8d, 0x11, 0x62, 0x41, 0x7b, 0xa2, 0xad, 0x17, 0x45, 0x8e, 0x26, 0xb7, 0xf5, 0x72, 0xce,
+ 0xef, 0x15, 0xd1, 0x52, 0x7a, 0x89, 0xa3, 0xe8, 0x07, 0x30, 0xe9, 0x5f, 0xb9, 0x87, 0xc0, 0x8a,
+ 0x69, 0x77, 0xf7, 0xf8, 0xa6, 0x80, 0x5d, 0xc5, 0x6f, 0x27, 0xc2, 0x52, 0x62, 0x1f, 0x37, 0x18,
+ 0x47, 0x7b, 0x26, 0x3a, 0xb1, 0xd0, 0x97, 0x8b, 0xe8, 0x0b, 0x74, 0xec, 0xd3, 0x46, 0xfc, 0x34,
+ 0xe2, 0xdb, 0x88, 0xcb, 0xa9, 0x17, 0x64, 0xab, 0x89, 0x3e, 0x01, 0xb4, 0x4b, 0x58, 0xe4, 0xe3,
+ 0x45, 0xe4, 0x5a, 0x2e, 0xe9, 0xfb, 0x46, 0xdc, 0x1f, 0x61, 0x6c, 0xf1, 0xa9, 0x04, 0x51, 0xc8,
+ 0x1e, 0x5a, 0x9d, 0x9e, 0x6d, 0x30, 0x22, 0xd6, 0xa3, 0xe5, 0xbe, 0x23, 0x82, 0xc3, 0x3a, 0xf9,
+ 0x49, 0x8f, 0x50, 0x96, 0xd6, 0x5d, 0xc4, 0xae, 0x3e, 0xc2, 0x3e, 0x52, 0x48, 0x0d, 0x8e, 0xc4,
+ 0x33, 0xb3, 0x0a, 0x53, 0xfd, 0xef, 0x12, 0xe8, 0x2d, 0x9f, 0x30, 0xf6, 0xc5, 0xa2, 0x94, 0x3e,
+ 0x85, 0x87, 0xb6, 0x6c, 0x28, 0xb8, 0x5e, 0x5b, 0x9c, 0x3b, 0x2d, 0xd7, 0x33, 0x95, 0xe8, 0x56,
+ 0x46, 0x5e, 0x44, 0xd7, 0xc5, 0xc7, 0xfb, 0x1f, 0x95, 0xdb, 0x16, 0x3b, 0xe9, 0x35, 0xb9, 0xd6,
+ 0x15, 0x5f, 0x52, 0xfd, 0x13, 0xc5, 0x1d, 0xff, 0x5f, 0x2a, 0xd6, 0x2b, 0x6d, 0x57, 0x8d, 0xfd,
+ 0x79, 0x78, 0xe1, 0xc0, 0xc7, 0x7b, 0x16, 0xbc, 0xd7, 0xae, 0x0f, 0xd7, 0x47, 0xea, 0xa3, 0xf5,
+ 0xb1, 0xfa, 0x78, 0x7d, 0xa2, 0x3e, 0xd9, 0x1c, 0x17, 0x6b, 0x37, 0xfe, 0x1b, 0x00, 0x00, 0xff,
+ 0xff, 0x85, 0xd9, 0x4c, 0xe3, 0x9e, 0x21, 0x00, 0x00,
}
// Reference imports to suppress errors if they are not otherwise used.
@@ -2274,11 +2301,13 @@
ReceiveChangeEvents(ctx context.Context, in *empty.Empty, opts ...grpc.CallOption) (VolthaService_ReceiveChangeEventsClient, error)
// Get additional information on a device group
GetDeviceGroup(ctx context.Context, in *common.ID, opts ...grpc.CallOption) (*DeviceGroup, error)
- CreateAlarmFilter(ctx context.Context, in *AlarmFilter, opts ...grpc.CallOption) (*AlarmFilter, error)
- GetAlarmFilter(ctx context.Context, in *common.ID, opts ...grpc.CallOption) (*AlarmFilter, error)
- UpdateAlarmFilter(ctx context.Context, in *AlarmFilter, opts ...grpc.CallOption) (*AlarmFilter, error)
- DeleteAlarmFilter(ctx context.Context, in *common.ID, opts ...grpc.CallOption) (*empty.Empty, error)
- ListAlarmFilters(ctx context.Context, in *empty.Empty, opts ...grpc.CallOption) (*AlarmFilters, error)
+ CreateEventFilter(ctx context.Context, in *EventFilter, opts ...grpc.CallOption) (*EventFilter, error)
+ // Get all filters present for a device
+ GetEventFilter(ctx context.Context, in *common.ID, opts ...grpc.CallOption) (*EventFilters, error)
+ UpdateEventFilter(ctx context.Context, in *EventFilter, opts ...grpc.CallOption) (*EventFilter, error)
+ DeleteEventFilter(ctx context.Context, in *EventFilter, opts ...grpc.CallOption) (*empty.Empty, error)
+ // Get all the filters present
+ ListEventFilters(ctx context.Context, in *empty.Empty, opts ...grpc.CallOption) (*EventFilters, error)
GetImages(ctx context.Context, in *common.ID, opts ...grpc.CallOption) (*Images, error)
SelfTest(ctx context.Context, in *common.ID, opts ...grpc.CallOption) (*SelfTestResponse, error)
// OpenOMCI MIB information
@@ -2801,45 +2830,45 @@
return out, nil
}
-func (c *volthaServiceClient) CreateAlarmFilter(ctx context.Context, in *AlarmFilter, opts ...grpc.CallOption) (*AlarmFilter, error) {
- out := new(AlarmFilter)
- err := c.cc.Invoke(ctx, "/voltha.VolthaService/CreateAlarmFilter", in, out, opts...)
+func (c *volthaServiceClient) CreateEventFilter(ctx context.Context, in *EventFilter, opts ...grpc.CallOption) (*EventFilter, error) {
+ out := new(EventFilter)
+ err := c.cc.Invoke(ctx, "/voltha.VolthaService/CreateEventFilter", in, out, opts...)
if err != nil {
return nil, err
}
return out, nil
}
-func (c *volthaServiceClient) GetAlarmFilter(ctx context.Context, in *common.ID, opts ...grpc.CallOption) (*AlarmFilter, error) {
- out := new(AlarmFilter)
- err := c.cc.Invoke(ctx, "/voltha.VolthaService/GetAlarmFilter", in, out, opts...)
+func (c *volthaServiceClient) GetEventFilter(ctx context.Context, in *common.ID, opts ...grpc.CallOption) (*EventFilters, error) {
+ out := new(EventFilters)
+ err := c.cc.Invoke(ctx, "/voltha.VolthaService/GetEventFilter", in, out, opts...)
if err != nil {
return nil, err
}
return out, nil
}
-func (c *volthaServiceClient) UpdateAlarmFilter(ctx context.Context, in *AlarmFilter, opts ...grpc.CallOption) (*AlarmFilter, error) {
- out := new(AlarmFilter)
- err := c.cc.Invoke(ctx, "/voltha.VolthaService/UpdateAlarmFilter", in, out, opts...)
+func (c *volthaServiceClient) UpdateEventFilter(ctx context.Context, in *EventFilter, opts ...grpc.CallOption) (*EventFilter, error) {
+ out := new(EventFilter)
+ err := c.cc.Invoke(ctx, "/voltha.VolthaService/UpdateEventFilter", in, out, opts...)
if err != nil {
return nil, err
}
return out, nil
}
-func (c *volthaServiceClient) DeleteAlarmFilter(ctx context.Context, in *common.ID, opts ...grpc.CallOption) (*empty.Empty, error) {
+func (c *volthaServiceClient) DeleteEventFilter(ctx context.Context, in *EventFilter, opts ...grpc.CallOption) (*empty.Empty, error) {
out := new(empty.Empty)
- err := c.cc.Invoke(ctx, "/voltha.VolthaService/DeleteAlarmFilter", in, out, opts...)
+ err := c.cc.Invoke(ctx, "/voltha.VolthaService/DeleteEventFilter", in, out, opts...)
if err != nil {
return nil, err
}
return out, nil
}
-func (c *volthaServiceClient) ListAlarmFilters(ctx context.Context, in *empty.Empty, opts ...grpc.CallOption) (*AlarmFilters, error) {
- out := new(AlarmFilters)
- err := c.cc.Invoke(ctx, "/voltha.VolthaService/ListAlarmFilters", in, out, opts...)
+func (c *volthaServiceClient) ListEventFilters(ctx context.Context, in *empty.Empty, opts ...grpc.CallOption) (*EventFilters, error) {
+ out := new(EventFilters)
+ err := c.cc.Invoke(ctx, "/voltha.VolthaService/ListEventFilters", in, out, opts...)
if err != nil {
return nil, err
}
@@ -3013,11 +3042,13 @@
ReceiveChangeEvents(*empty.Empty, VolthaService_ReceiveChangeEventsServer) error
// Get additional information on a device group
GetDeviceGroup(context.Context, *common.ID) (*DeviceGroup, error)
- CreateAlarmFilter(context.Context, *AlarmFilter) (*AlarmFilter, error)
- GetAlarmFilter(context.Context, *common.ID) (*AlarmFilter, error)
- UpdateAlarmFilter(context.Context, *AlarmFilter) (*AlarmFilter, error)
- DeleteAlarmFilter(context.Context, *common.ID) (*empty.Empty, error)
- ListAlarmFilters(context.Context, *empty.Empty) (*AlarmFilters, error)
+ CreateEventFilter(context.Context, *EventFilter) (*EventFilter, error)
+ // Get all filters present for a device
+ GetEventFilter(context.Context, *common.ID) (*EventFilters, error)
+ UpdateEventFilter(context.Context, *EventFilter) (*EventFilter, error)
+ DeleteEventFilter(context.Context, *EventFilter) (*empty.Empty, error)
+ // Get all the filters present
+ ListEventFilters(context.Context, *empty.Empty) (*EventFilters, error)
GetImages(context.Context, *common.ID) (*Images, error)
SelfTest(context.Context, *common.ID) (*SelfTestResponse, error)
// OpenOMCI MIB information
@@ -3911,92 +3942,92 @@
return interceptor(ctx, in, info, handler)
}
-func _VolthaService_CreateAlarmFilter_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
- in := new(AlarmFilter)
+func _VolthaService_CreateEventFilter_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+ in := new(EventFilter)
if err := dec(in); err != nil {
return nil, err
}
if interceptor == nil {
- return srv.(VolthaServiceServer).CreateAlarmFilter(ctx, in)
+ return srv.(VolthaServiceServer).CreateEventFilter(ctx, in)
}
info := &grpc.UnaryServerInfo{
Server: srv,
- FullMethod: "/voltha.VolthaService/CreateAlarmFilter",
+ FullMethod: "/voltha.VolthaService/CreateEventFilter",
}
handler := func(ctx context.Context, req interface{}) (interface{}, error) {
- return srv.(VolthaServiceServer).CreateAlarmFilter(ctx, req.(*AlarmFilter))
+ return srv.(VolthaServiceServer).CreateEventFilter(ctx, req.(*EventFilter))
}
return interceptor(ctx, in, info, handler)
}
-func _VolthaService_GetAlarmFilter_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+func _VolthaService_GetEventFilter_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
in := new(common.ID)
if err := dec(in); err != nil {
return nil, err
}
if interceptor == nil {
- return srv.(VolthaServiceServer).GetAlarmFilter(ctx, in)
+ return srv.(VolthaServiceServer).GetEventFilter(ctx, in)
}
info := &grpc.UnaryServerInfo{
Server: srv,
- FullMethod: "/voltha.VolthaService/GetAlarmFilter",
+ FullMethod: "/voltha.VolthaService/GetEventFilter",
}
handler := func(ctx context.Context, req interface{}) (interface{}, error) {
- return srv.(VolthaServiceServer).GetAlarmFilter(ctx, req.(*common.ID))
+ return srv.(VolthaServiceServer).GetEventFilter(ctx, req.(*common.ID))
}
return interceptor(ctx, in, info, handler)
}
-func _VolthaService_UpdateAlarmFilter_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
- in := new(AlarmFilter)
+func _VolthaService_UpdateEventFilter_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+ in := new(EventFilter)
if err := dec(in); err != nil {
return nil, err
}
if interceptor == nil {
- return srv.(VolthaServiceServer).UpdateAlarmFilter(ctx, in)
+ return srv.(VolthaServiceServer).UpdateEventFilter(ctx, in)
}
info := &grpc.UnaryServerInfo{
Server: srv,
- FullMethod: "/voltha.VolthaService/UpdateAlarmFilter",
+ FullMethod: "/voltha.VolthaService/UpdateEventFilter",
}
handler := func(ctx context.Context, req interface{}) (interface{}, error) {
- return srv.(VolthaServiceServer).UpdateAlarmFilter(ctx, req.(*AlarmFilter))
+ return srv.(VolthaServiceServer).UpdateEventFilter(ctx, req.(*EventFilter))
}
return interceptor(ctx, in, info, handler)
}
-func _VolthaService_DeleteAlarmFilter_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
- in := new(common.ID)
+func _VolthaService_DeleteEventFilter_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+ in := new(EventFilter)
if err := dec(in); err != nil {
return nil, err
}
if interceptor == nil {
- return srv.(VolthaServiceServer).DeleteAlarmFilter(ctx, in)
+ return srv.(VolthaServiceServer).DeleteEventFilter(ctx, in)
}
info := &grpc.UnaryServerInfo{
Server: srv,
- FullMethod: "/voltha.VolthaService/DeleteAlarmFilter",
+ FullMethod: "/voltha.VolthaService/DeleteEventFilter",
}
handler := func(ctx context.Context, req interface{}) (interface{}, error) {
- return srv.(VolthaServiceServer).DeleteAlarmFilter(ctx, req.(*common.ID))
+ return srv.(VolthaServiceServer).DeleteEventFilter(ctx, req.(*EventFilter))
}
return interceptor(ctx, in, info, handler)
}
-func _VolthaService_ListAlarmFilters_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+func _VolthaService_ListEventFilters_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
in := new(empty.Empty)
if err := dec(in); err != nil {
return nil, err
}
if interceptor == nil {
- return srv.(VolthaServiceServer).ListAlarmFilters(ctx, in)
+ return srv.(VolthaServiceServer).ListEventFilters(ctx, in)
}
info := &grpc.UnaryServerInfo{
Server: srv,
- FullMethod: "/voltha.VolthaService/ListAlarmFilters",
+ FullMethod: "/voltha.VolthaService/ListEventFilters",
}
handler := func(ctx context.Context, req interface{}) (interface{}, error) {
- return srv.(VolthaServiceServer).ListAlarmFilters(ctx, req.(*empty.Empty))
+ return srv.(VolthaServiceServer).ListEventFilters(ctx, req.(*empty.Empty))
}
return interceptor(ctx, in, info, handler)
}
@@ -4294,24 +4325,24 @@
Handler: _VolthaService_GetDeviceGroup_Handler,
},
{
- MethodName: "CreateAlarmFilter",
- Handler: _VolthaService_CreateAlarmFilter_Handler,
+ MethodName: "CreateEventFilter",
+ Handler: _VolthaService_CreateEventFilter_Handler,
},
{
- MethodName: "GetAlarmFilter",
- Handler: _VolthaService_GetAlarmFilter_Handler,
+ MethodName: "GetEventFilter",
+ Handler: _VolthaService_GetEventFilter_Handler,
},
{
- MethodName: "UpdateAlarmFilter",
- Handler: _VolthaService_UpdateAlarmFilter_Handler,
+ MethodName: "UpdateEventFilter",
+ Handler: _VolthaService_UpdateEventFilter_Handler,
},
{
- MethodName: "DeleteAlarmFilter",
- Handler: _VolthaService_DeleteAlarmFilter_Handler,
+ MethodName: "DeleteEventFilter",
+ Handler: _VolthaService_DeleteEventFilter_Handler,
},
{
- MethodName: "ListAlarmFilters",
- Handler: _VolthaService_ListAlarmFilters_Handler,
+ MethodName: "ListEventFilters",
+ Handler: _VolthaService_ListEventFilters_Handler,
},
{
MethodName: "GetImages",
diff --git a/vendor/google.golang.org/grpc/.travis.yml b/vendor/google.golang.org/grpc/.travis.yml
index f0f723f..87f40b8 100644
--- a/vendor/google.golang.org/grpc/.travis.yml
+++ b/vendor/google.golang.org/grpc/.travis.yml
@@ -2,18 +2,20 @@
matrix:
include:
- - go: 1.12.x
+ - go: 1.13.x
env: VET=1 GO111MODULE=on
- - go: 1.12.x
+ - go: 1.13.x
env: RACE=1 GO111MODULE=on
- - go: 1.12.x
+ - go: 1.13.x
env: RUN386=1
- - go: 1.12.x
+ - go: 1.13.x
env: GRPC_GO_RETRY=on
+ - go: 1.13.x
+ env: TESTEXAMPLES=1
+ - go: 1.12.x
+ env: GO111MODULE=on
- go: 1.11.x
env: GO111MODULE=on
- - go: 1.10.x
- - go: 1.9.x
- go: 1.9.x
env: GAE=1
@@ -28,12 +30,13 @@
install:
- try3() { eval "$*" || eval "$*" || eval "$*"; }
- try3 'if [[ "${GO111MODULE}" = "on" ]]; then go mod download; else make testdeps; fi'
- - if [[ "${GAE}" = 1 ]]; then source ./install_gae.sh; make testappenginedeps; fi
- - if [[ "${VET}" = 1 ]]; then ./vet.sh -install; fi
+ - if [[ -n "${GAE}" ]]; then source ./install_gae.sh; make testappenginedeps; fi
+ - if [[ -n "${VET}" ]]; then ./vet.sh -install; fi
script:
- set -e
- - if [[ "${VET}" = 1 ]]; then ./vet.sh; fi
- - if [[ "${GAE}" = 1 ]]; then make testappengine; exit 0; fi
- - if [[ "${RACE}" = 1 ]]; then make testrace; exit 0; fi
+ - if [[ -n "${TESTEXAMPLES}" ]]; then examples/examples_test.sh; exit 0; fi
+ - if [[ -n "${VET}" ]]; then ./vet.sh; fi
+ - if [[ -n "${GAE}" ]]; then make testappengine; exit 0; fi
+ - if [[ -n "${RACE}" ]]; then make testrace; exit 0; fi
- make test
diff --git a/vendor/google.golang.org/grpc/backoff.go b/vendor/google.golang.org/grpc/backoff.go
index 97c6e25..ff7c3ee 100644
--- a/vendor/google.golang.org/grpc/backoff.go
+++ b/vendor/google.golang.org/grpc/backoff.go
@@ -23,16 +23,36 @@
import (
"time"
+
+ "google.golang.org/grpc/backoff"
)
// DefaultBackoffConfig uses values specified for backoff in
// https://github.com/grpc/grpc/blob/master/doc/connection-backoff.md.
+//
+// Deprecated: use ConnectParams instead. Will be supported throughout 1.x.
var DefaultBackoffConfig = BackoffConfig{
MaxDelay: 120 * time.Second,
}
// BackoffConfig defines the parameters for the default gRPC backoff strategy.
+//
+// Deprecated: use ConnectParams instead. Will be supported throughout 1.x.
type BackoffConfig struct {
// MaxDelay is the upper bound of backoff delay.
MaxDelay time.Duration
}
+
+// ConnectParams defines the parameters for connecting and retrying. Users are
+// encouraged to use this instead of the BackoffConfig type defined above. See
+// here for more details:
+// https://github.com/grpc/grpc/blob/master/doc/connection-backoff.md.
+//
+// This API is EXPERIMENTAL.
+type ConnectParams struct {
+ // Backoff specifies the configuration options for connection backoff.
+ Backoff backoff.Config
+ // MinConnectTimeout is the minimum amount of time we are willing to give a
+ // connection to complete.
+ MinConnectTimeout time.Duration
+}
diff --git a/vendor/google.golang.org/grpc/backoff/backoff.go b/vendor/google.golang.org/grpc/backoff/backoff.go
new file mode 100644
index 0000000..0787d0b
--- /dev/null
+++ b/vendor/google.golang.org/grpc/backoff/backoff.go
@@ -0,0 +1,52 @@
+/*
+ *
+ * Copyright 2019 gRPC authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+// Package backoff provides configuration options for backoff.
+//
+// More details can be found at:
+// https://github.com/grpc/grpc/blob/master/doc/connection-backoff.md.
+//
+// All APIs in this package are experimental.
+package backoff
+
+import "time"
+
+// Config defines the configuration options for backoff.
+type Config struct {
+ // BaseDelay is the amount of time to backoff after the first failure.
+ BaseDelay time.Duration
+ // Multiplier is the factor with which to multiply backoffs after a
+ // failed retry. Should ideally be greater than 1.
+ Multiplier float64
+ // Jitter is the factor with which backoffs are randomized.
+ Jitter float64
+ // MaxDelay is the upper bound of backoff delay.
+ MaxDelay time.Duration
+}
+
+// DefaultConfig is a backoff configuration with the default values specfied
+// at https://github.com/grpc/grpc/blob/master/doc/connection-backoff.md.
+//
+// This should be useful for callers who want to configure backoff with
+// non-default values only for a subset of the options.
+var DefaultConfig = Config{
+ BaseDelay: 1.0 * time.Second,
+ Multiplier: 1.6,
+ Jitter: 0.2,
+ MaxDelay: 120 * time.Second,
+}
diff --git a/vendor/google.golang.org/grpc/balancer/balancer.go b/vendor/google.golang.org/grpc/balancer/balancer.go
index c266f4e..917c242 100644
--- a/vendor/google.golang.org/grpc/balancer/balancer.go
+++ b/vendor/google.golang.org/grpc/balancer/balancer.go
@@ -305,14 +305,23 @@
BalancerConfig serviceconfig.LoadBalancingConfig
}
+// ErrBadResolverState may be returned by UpdateClientConnState to indicate a
+// problem with the provided name resolver data.
+var ErrBadResolverState = errors.New("bad resolver state")
+
// V2Balancer is defined for documentation purposes. If a Balancer also
// implements V2Balancer, its UpdateClientConnState method will be called
// instead of HandleResolvedAddrs and its UpdateSubConnState will be called
// instead of HandleSubConnStateChange.
type V2Balancer interface {
// UpdateClientConnState is called by gRPC when the state of the ClientConn
- // changes.
- UpdateClientConnState(ClientConnState)
+ // changes. If the error returned is ErrBadResolverState, the ClientConn
+ // will begin calling ResolveNow on the active name resolver with
+ // exponential backoff until a subsequent call to UpdateClientConnState
+ // returns a nil error. Any other errors are currently ignored.
+ UpdateClientConnState(ClientConnState) error
+ // ResolverError is called by gRPC when the name resolver reports an error.
+ ResolverError(error)
// UpdateSubConnState is called by gRPC when the state of a SubConn
// changes.
UpdateSubConnState(SubConn, SubConnState)
diff --git a/vendor/google.golang.org/grpc/balancer/base/balancer.go b/vendor/google.golang.org/grpc/balancer/base/balancer.go
index 1af88f0..1a5c1aa 100644
--- a/vendor/google.golang.org/grpc/balancer/base/balancer.go
+++ b/vendor/google.golang.org/grpc/balancer/base/balancer.go
@@ -53,6 +53,8 @@
return bb.name
}
+var _ balancer.V2Balancer = (*baseBalancer)(nil) // Assert that we implement V2Balancer
+
type baseBalancer struct {
cc balancer.ClientConn
pickerBuilder PickerBuilder
@@ -70,7 +72,11 @@
panic("not implemented")
}
-func (b *baseBalancer) UpdateClientConnState(s balancer.ClientConnState) {
+func (b *baseBalancer) ResolverError(error) {
+ // Ignore
+}
+
+func (b *baseBalancer) UpdateClientConnState(s balancer.ClientConnState) error {
// TODO: handle s.ResolverState.Err (log if not nil) once implemented.
// TODO: handle s.ResolverState.ServiceConfig?
if grpclog.V(2) {
@@ -101,6 +107,7 @@
// The entry will be deleted in HandleSubConnStateChange.
}
}
+ return nil
}
// regeneratePicker takes a snapshot of the balancer, and generates a picker
diff --git a/vendor/google.golang.org/grpc/balancer_conn_wrappers.go b/vendor/google.golang.org/grpc/balancer_conn_wrappers.go
index 8df4095..5356194 100644
--- a/vendor/google.golang.org/grpc/balancer_conn_wrappers.go
+++ b/vendor/google.golang.org/grpc/balancer_conn_wrappers.go
@@ -25,6 +25,8 @@
"google.golang.org/grpc/balancer"
"google.golang.org/grpc/connectivity"
"google.golang.org/grpc/grpclog"
+ "google.golang.org/grpc/internal/buffer"
+ "google.golang.org/grpc/internal/grpcsync"
"google.golang.org/grpc/resolver"
)
@@ -34,62 +36,14 @@
state connectivity.State
}
-// scStateUpdateBuffer is an unbounded channel for scStateChangeTuple.
-// TODO make a general purpose buffer that uses interface{}.
-type scStateUpdateBuffer struct {
- c chan *scStateUpdate
- mu sync.Mutex
- backlog []*scStateUpdate
-}
-
-func newSCStateUpdateBuffer() *scStateUpdateBuffer {
- return &scStateUpdateBuffer{
- c: make(chan *scStateUpdate, 1),
- }
-}
-
-func (b *scStateUpdateBuffer) put(t *scStateUpdate) {
- b.mu.Lock()
- defer b.mu.Unlock()
- if len(b.backlog) == 0 {
- select {
- case b.c <- t:
- return
- default:
- }
- }
- b.backlog = append(b.backlog, t)
-}
-
-func (b *scStateUpdateBuffer) load() {
- b.mu.Lock()
- defer b.mu.Unlock()
- if len(b.backlog) > 0 {
- select {
- case b.c <- b.backlog[0]:
- b.backlog[0] = nil
- b.backlog = b.backlog[1:]
- default:
- }
- }
-}
-
-// get returns the channel that the scStateUpdate will be sent to.
-//
-// Upon receiving, the caller should call load to send another
-// scStateChangeTuple onto the channel if there is any.
-func (b *scStateUpdateBuffer) get() <-chan *scStateUpdate {
- return b.c
-}
-
// ccBalancerWrapper is a wrapper on top of cc for balancers.
// It implements balancer.ClientConn interface.
type ccBalancerWrapper struct {
- cc *ClientConn
- balancer balancer.Balancer
- stateChangeQueue *scStateUpdateBuffer
- ccUpdateCh chan *balancer.ClientConnState
- done chan struct{}
+ cc *ClientConn
+ balancerMu sync.Mutex // synchronizes calls to the balancer
+ balancer balancer.Balancer
+ scBuffer *buffer.Unbounded
+ done *grpcsync.Event
mu sync.Mutex
subConns map[*acBalancerWrapper]struct{}
@@ -97,11 +51,10 @@
func newCCBalancerWrapper(cc *ClientConn, b balancer.Builder, bopts balancer.BuildOptions) *ccBalancerWrapper {
ccb := &ccBalancerWrapper{
- cc: cc,
- stateChangeQueue: newSCStateUpdateBuffer(),
- ccUpdateCh: make(chan *balancer.ClientConnState, 1),
- done: make(chan struct{}),
- subConns: make(map[*acBalancerWrapper]struct{}),
+ cc: cc,
+ scBuffer: buffer.NewUnbounded(),
+ done: grpcsync.NewEvent(),
+ subConns: make(map[*acBalancerWrapper]struct{}),
}
go ccb.watcher()
ccb.balancer = b.Build(ccb, bopts)
@@ -113,36 +66,23 @@
func (ccb *ccBalancerWrapper) watcher() {
for {
select {
- case t := <-ccb.stateChangeQueue.get():
- ccb.stateChangeQueue.load()
- select {
- case <-ccb.done:
- ccb.balancer.Close()
- return
- default:
+ case t := <-ccb.scBuffer.Get():
+ ccb.scBuffer.Load()
+ if ccb.done.HasFired() {
+ break
}
+ ccb.balancerMu.Lock()
+ su := t.(*scStateUpdate)
if ub, ok := ccb.balancer.(balancer.V2Balancer); ok {
- ub.UpdateSubConnState(t.sc, balancer.SubConnState{ConnectivityState: t.state})
+ ub.UpdateSubConnState(su.sc, balancer.SubConnState{ConnectivityState: su.state})
} else {
- ccb.balancer.HandleSubConnStateChange(t.sc, t.state)
+ ccb.balancer.HandleSubConnStateChange(su.sc, su.state)
}
- case s := <-ccb.ccUpdateCh:
- select {
- case <-ccb.done:
- ccb.balancer.Close()
- return
- default:
- }
- if ub, ok := ccb.balancer.(balancer.V2Balancer); ok {
- ub.UpdateClientConnState(*s)
- } else {
- ccb.balancer.HandleResolvedAddrs(s.ResolverState.Addresses, nil)
- }
- case <-ccb.done:
+ ccb.balancerMu.Unlock()
+ case <-ccb.done.Done():
}
- select {
- case <-ccb.done:
+ if ccb.done.HasFired() {
ccb.balancer.Close()
ccb.mu.Lock()
scs := ccb.subConns
@@ -153,14 +93,12 @@
}
ccb.UpdateBalancerState(connectivity.Connecting, nil)
return
- default:
}
- ccb.cc.firstResolveEvent.Fire()
}
}
func (ccb *ccBalancerWrapper) close() {
- close(ccb.done)
+ ccb.done.Fire()
}
func (ccb *ccBalancerWrapper) handleSubConnStateChange(sc balancer.SubConn, s connectivity.State) {
@@ -174,30 +112,28 @@
if sc == nil {
return
}
- ccb.stateChangeQueue.put(&scStateUpdate{
+ ccb.scBuffer.Put(&scStateUpdate{
sc: sc,
state: s,
})
}
-func (ccb *ccBalancerWrapper) updateClientConnState(ccs *balancer.ClientConnState) {
- if ccb.cc.curBalancerName != grpclbName {
- // Filter any grpclb addresses since we don't have the grpclb balancer.
- s := &ccs.ResolverState
- for i := 0; i < len(s.Addresses); {
- if s.Addresses[i].Type == resolver.GRPCLB {
- copy(s.Addresses[i:], s.Addresses[i+1:])
- s.Addresses = s.Addresses[:len(s.Addresses)-1]
- continue
- }
- i++
- }
+func (ccb *ccBalancerWrapper) updateClientConnState(ccs *balancer.ClientConnState) error {
+ ccb.balancerMu.Lock()
+ defer ccb.balancerMu.Unlock()
+ if ub, ok := ccb.balancer.(balancer.V2Balancer); ok {
+ return ub.UpdateClientConnState(*ccs)
}
- select {
- case <-ccb.ccUpdateCh:
- default:
+ ccb.balancer.HandleResolvedAddrs(ccs.ResolverState.Addresses, nil)
+ return nil
+}
+
+func (ccb *ccBalancerWrapper) resolverError(err error) {
+ if ub, ok := ccb.balancer.(balancer.V2Balancer); ok {
+ ccb.balancerMu.Lock()
+ ub.ResolverError(err)
+ ccb.balancerMu.Unlock()
}
- ccb.ccUpdateCh <- ccs
}
func (ccb *ccBalancerWrapper) NewSubConn(addrs []resolver.Address, opts balancer.NewSubConnOptions) (balancer.SubConn, error) {
diff --git a/vendor/google.golang.org/grpc/clientconn.go b/vendor/google.golang.org/grpc/clientconn.go
index a7643df..4414ba8 100644
--- a/vendor/google.golang.org/grpc/clientconn.go
+++ b/vendor/google.golang.org/grpc/clientconn.go
@@ -31,7 +31,7 @@
"time"
"google.golang.org/grpc/balancer"
- _ "google.golang.org/grpc/balancer/roundrobin" // To register roundrobin.
+ "google.golang.org/grpc/balancer/base"
"google.golang.org/grpc/codes"
"google.golang.org/grpc/connectivity"
"google.golang.org/grpc/credentials"
@@ -42,10 +42,12 @@
"google.golang.org/grpc/internal/transport"
"google.golang.org/grpc/keepalive"
"google.golang.org/grpc/resolver"
- _ "google.golang.org/grpc/resolver/dns" // To register dns resolver.
- _ "google.golang.org/grpc/resolver/passthrough" // To register passthrough resolver.
"google.golang.org/grpc/serviceconfig"
"google.golang.org/grpc/status"
+
+ _ "google.golang.org/grpc/balancer/roundrobin" // To register roundrobin.
+ _ "google.golang.org/grpc/internal/resolver/dns" // To register dns resolver.
+ _ "google.golang.org/grpc/internal/resolver/passthrough" // To register passthrough resolver.
)
const (
@@ -186,11 +188,11 @@
}
if cc.dopts.defaultServiceConfigRawJSON != nil {
- sc, err := parseServiceConfig(*cc.dopts.defaultServiceConfigRawJSON)
- if err != nil {
- return nil, fmt.Errorf("%s: %v", invalidDefaultServiceConfigErrPrefix, err)
+ scpr := parseServiceConfig(*cc.dopts.defaultServiceConfigRawJSON)
+ if scpr.Err != nil {
+ return nil, fmt.Errorf("%s: %v", invalidDefaultServiceConfigErrPrefix, scpr.Err)
}
- cc.dopts.defaultServiceConfig = sc
+ cc.dopts.defaultServiceConfig, _ = scpr.Config.(*ServiceConfig)
}
cc.mkp = cc.dopts.copts.KeepaliveParams
@@ -235,9 +237,7 @@
}
}
if cc.dopts.bs == nil {
- cc.dopts.bs = backoff.Exponential{
- MaxDelay: DefaultBackoffConfig.MaxDelay,
- }
+ cc.dopts.bs = backoff.DefaultExponential
}
if cc.dopts.resolverBuilder == nil {
// Only try to parse target when resolver builder is not already set.
@@ -443,7 +443,18 @@
return csm.notifyChan
}
-// ClientConn represents a client connection to an RPC server.
+// ClientConn represents a virtual connection to a conceptual endpoint, to
+// perform RPCs.
+//
+// A ClientConn is free to have zero or more actual connections to the endpoint
+// based on configuration, load, etc. It is also free to determine which actual
+// endpoints to use and may change it every RPC, permitting client-side load
+// balancing.
+//
+// A ClientConn encapsulates a range of functionality including name
+// resolution, TCP connection establishment (with retries and backoff) and TLS
+// handshakes. It also handles errors on established connections by
+// re-resolving the name and reconnecting.
type ClientConn struct {
ctx context.Context
cancel context.CancelFunc
@@ -532,58 +543,104 @@
}
}
-func (cc *ClientConn) updateResolverState(s resolver.State) error {
+var emptyServiceConfig *ServiceConfig
+
+func init() {
+ cfg := parseServiceConfig("{}")
+ if cfg.Err != nil {
+ panic(fmt.Sprintf("impossible error parsing empty service config: %v", cfg.Err))
+ }
+ emptyServiceConfig = cfg.Config.(*ServiceConfig)
+}
+
+func (cc *ClientConn) maybeApplyDefaultServiceConfig(addrs []resolver.Address) {
+ if cc.sc != nil {
+ cc.applyServiceConfigAndBalancer(cc.sc, addrs)
+ return
+ }
+ if cc.dopts.defaultServiceConfig != nil {
+ cc.applyServiceConfigAndBalancer(cc.dopts.defaultServiceConfig, addrs)
+ } else {
+ cc.applyServiceConfigAndBalancer(emptyServiceConfig, addrs)
+ }
+}
+
+func (cc *ClientConn) updateResolverState(s resolver.State, err error) error {
+ defer cc.firstResolveEvent.Fire()
cc.mu.Lock()
- defer cc.mu.Unlock()
// Check if the ClientConn is already closed. Some fields (e.g.
// balancerWrapper) are set to nil when closing the ClientConn, and could
// cause nil pointer panic if we don't have this check.
if cc.conns == nil {
+ cc.mu.Unlock()
return nil
}
- if cc.dopts.disableServiceConfig || s.ServiceConfig == nil {
- if cc.dopts.defaultServiceConfig != nil && cc.sc == nil {
- cc.applyServiceConfig(cc.dopts.defaultServiceConfig)
+ if err != nil {
+ // May need to apply the initial service config in case the resolver
+ // doesn't support service configs, or doesn't provide a service config
+ // with the new addresses.
+ cc.maybeApplyDefaultServiceConfig(nil)
+
+ if cc.balancerWrapper != nil {
+ cc.balancerWrapper.resolverError(err)
}
- } else if sc, ok := s.ServiceConfig.(*ServiceConfig); ok {
- cc.applyServiceConfig(sc)
+
+ // No addresses are valid with err set; return early.
+ cc.mu.Unlock()
+ return balancer.ErrBadResolverState
+ }
+
+ var ret error
+ if cc.dopts.disableServiceConfig || s.ServiceConfig == nil {
+ cc.maybeApplyDefaultServiceConfig(s.Addresses)
+ // TODO: do we need to apply a failing LB policy if there is no
+ // default, per the error handling design?
+ } else {
+ if sc, ok := s.ServiceConfig.Config.(*ServiceConfig); s.ServiceConfig.Err == nil && ok {
+ cc.applyServiceConfigAndBalancer(sc, s.Addresses)
+ } else {
+ ret = balancer.ErrBadResolverState
+ if cc.balancerWrapper == nil {
+ var err error
+ if s.ServiceConfig.Err != nil {
+ err = status.Errorf(codes.Unavailable, "error parsing service config: %v", s.ServiceConfig.Err)
+ } else {
+ err = status.Errorf(codes.Unavailable, "illegal service config type: %T", s.ServiceConfig.Config)
+ }
+ cc.blockingpicker.updatePicker(base.NewErrPicker(err))
+ cc.csMgr.updateState(connectivity.TransientFailure)
+ cc.mu.Unlock()
+ return ret
+ }
+ }
}
var balCfg serviceconfig.LoadBalancingConfig
- if cc.dopts.balancerBuilder == nil {
- // Only look at balancer types and switch balancer if balancer dial
- // option is not set.
- var newBalancerName string
- if cc.sc != nil && cc.sc.lbConfig != nil {
- newBalancerName = cc.sc.lbConfig.name
- balCfg = cc.sc.lbConfig.cfg
- } else {
- var isGRPCLB bool
- for _, a := range s.Addresses {
- if a.Type == resolver.GRPCLB {
- isGRPCLB = true
- break
- }
- }
- if isGRPCLB {
- newBalancerName = grpclbName
- } else if cc.sc != nil && cc.sc.LB != nil {
- newBalancerName = *cc.sc.LB
- } else {
- newBalancerName = PickFirstBalancerName
- }
- }
- cc.switchBalancer(newBalancerName)
- } else if cc.balancerWrapper == nil {
- // Balancer dial option was set, and this is the first time handling
- // resolved addresses. Build a balancer with dopts.balancerBuilder.
- cc.curBalancerName = cc.dopts.balancerBuilder.Name()
- cc.balancerWrapper = newCCBalancerWrapper(cc, cc.dopts.balancerBuilder, cc.balancerBuildOpts)
+ if cc.dopts.balancerBuilder == nil && cc.sc != nil && cc.sc.lbConfig != nil {
+ balCfg = cc.sc.lbConfig.cfg
}
- cc.balancerWrapper.updateClientConnState(&balancer.ClientConnState{ResolverState: s, BalancerConfig: balCfg})
- return nil
+ cbn := cc.curBalancerName
+ bw := cc.balancerWrapper
+ cc.mu.Unlock()
+ if cbn != grpclbName {
+ // Filter any grpclb addresses since we don't have the grpclb balancer.
+ for i := 0; i < len(s.Addresses); {
+ if s.Addresses[i].Type == resolver.GRPCLB {
+ copy(s.Addresses[i:], s.Addresses[i+1:])
+ s.Addresses = s.Addresses[:len(s.Addresses)-1]
+ continue
+ }
+ i++
+ }
+ }
+ uccsErr := bw.updateClientConnState(&balancer.ClientConnState{ResolverState: s, BalancerConfig: balCfg})
+ if ret == nil {
+ ret = uccsErr // prefer ErrBadResolver state since any other error is
+ // currently meaningless to the caller.
+ }
+ return ret
}
// switchBalancer starts the switching from current balancer to the balancer
@@ -831,10 +888,10 @@
return t, done, nil
}
-func (cc *ClientConn) applyServiceConfig(sc *ServiceConfig) error {
+func (cc *ClientConn) applyServiceConfigAndBalancer(sc *ServiceConfig, addrs []resolver.Address) {
if sc == nil {
// should never reach here.
- return fmt.Errorf("got nil pointer for service config")
+ return
}
cc.sc = sc
@@ -850,7 +907,35 @@
cc.retryThrottler.Store((*retryThrottler)(nil))
}
- return nil
+ if cc.dopts.balancerBuilder == nil {
+ // Only look at balancer types and switch balancer if balancer dial
+ // option is not set.
+ var newBalancerName string
+ if cc.sc != nil && cc.sc.lbConfig != nil {
+ newBalancerName = cc.sc.lbConfig.name
+ } else {
+ var isGRPCLB bool
+ for _, a := range addrs {
+ if a.Type == resolver.GRPCLB {
+ isGRPCLB = true
+ break
+ }
+ }
+ if isGRPCLB {
+ newBalancerName = grpclbName
+ } else if cc.sc != nil && cc.sc.LB != nil {
+ newBalancerName = *cc.sc.LB
+ } else {
+ newBalancerName = PickFirstBalancerName
+ }
+ }
+ cc.switchBalancer(newBalancerName)
+ } else if cc.balancerWrapper == nil {
+ // Balancer dial option was set, and this is the first time handling
+ // resolved addresses. Build a balancer with dopts.balancerBuilder.
+ cc.curBalancerName = cc.dopts.balancerBuilder.Name()
+ cc.balancerWrapper = newCCBalancerWrapper(cc, cc.dopts.balancerBuilder, cc.balancerBuildOpts)
+ }
}
func (cc *ClientConn) resolveNow(o resolver.ResolveNowOption) {
@@ -875,8 +960,9 @@
// This API is EXPERIMENTAL.
func (cc *ClientConn) ResetConnectBackoff() {
cc.mu.Lock()
- defer cc.mu.Unlock()
- for ac := range cc.conns {
+ conns := cc.conns
+ cc.mu.Unlock()
+ for ac := range conns {
ac.resetConnectBackoff()
}
}
@@ -1136,10 +1222,16 @@
onCloseCalled := make(chan struct{})
reconnect := grpcsync.NewEvent()
+ authority := ac.cc.authority
+ // addr.ServerName takes precedent over ClientConn authority, if present.
+ if addr.ServerName != "" {
+ authority = addr.ServerName
+ }
+
target := transport.TargetInfo{
Addr: addr.Addr,
Metadata: addr.Metadata,
- Authority: ac.cc.authority,
+ Authority: authority,
}
once := sync.Once{}
@@ -1331,7 +1423,7 @@
curTr := ac.transport
ac.transport = nil
// We have to set the state to Shutdown before anything else to prevent races
- // between setting the state and logic that waits on context cancelation / etc.
+ // between setting the state and logic that waits on context cancellation / etc.
ac.updateConnectivityState(connectivity.Shutdown)
ac.cancel()
ac.curAddr = resolver.Address{}
@@ -1355,7 +1447,7 @@
},
})
// TraceEvent needs to be called before RemoveEntry, as TraceEvent may add trace reference to
- // the entity beng deleted, and thus prevent it from being deleted right away.
+ // the entity being deleted, and thus prevent it from being deleted right away.
channelz.RemoveEntry(ac.channelzID)
}
ac.mu.Unlock()
diff --git a/vendor/google.golang.org/grpc/credentials/credentials.go b/vendor/google.golang.org/grpc/credentials/credentials.go
index 8ea3d4a..c690161 100644
--- a/vendor/google.golang.org/grpc/credentials/credentials.go
+++ b/vendor/google.golang.org/grpc/credentials/credentials.go
@@ -30,10 +30,11 @@
"fmt"
"io/ioutil"
"net"
- "strings"
"github.com/golang/protobuf/proto"
+
"google.golang.org/grpc/credentials/internal"
+ ginternal "google.golang.org/grpc/internal"
)
// PerRPCCredentials defines the common interface for the credentials which need to
@@ -45,7 +46,8 @@
// context. If a status code is returned, it will be used as the status
// for the RPC. uri is the URI of the entry point for the request.
// When supported by the underlying implementation, ctx can be used for
- // timeout and cancellation.
+ // timeout and cancellation. Additionally, RequestInfo data will be
+ // available via ctx to this call.
// TODO(zhaoq): Define the set of the qualified keys instead of leaving
// it as an arbitrary string.
GetRequestMetadata(ctx context.Context, uri ...string) (map[string]string, error)
@@ -166,11 +168,12 @@
// use local cfg to avoid clobbering ServerName if using multiple endpoints
cfg := cloneTLSConfig(c.config)
if cfg.ServerName == "" {
- colonPos := strings.LastIndex(authority, ":")
- if colonPos == -1 {
- colonPos = len(authority)
+ serverName, _, err := net.SplitHostPort(authority)
+ if err != nil {
+ // If the authority had no host port or if the authority cannot be parsed, use it as-is.
+ serverName = authority
}
- cfg.ServerName = authority[:colonPos]
+ cfg.ServerName = serverName
}
conn := tls.Client(rawConn, cfg)
errChannel := make(chan error, 1)
@@ -334,3 +337,28 @@
return cfg.Clone()
}
+
+// RequestInfo contains request data attached to the context passed to GetRequestMetadata calls.
+//
+// This API is experimental.
+type RequestInfo struct {
+ // The method passed to Invoke or NewStream for this RPC. (For proto methods, this has the format "/some.Service/Method")
+ Method string
+}
+
+// requestInfoKey is a struct to be used as the key when attaching a RequestInfo to a context object.
+type requestInfoKey struct{}
+
+// RequestInfoFromContext extracts the RequestInfo from the context if it exists.
+//
+// This API is experimental.
+func RequestInfoFromContext(ctx context.Context) (ri RequestInfo, ok bool) {
+ ri, ok = ctx.Value(requestInfoKey{}).(RequestInfo)
+ return
+}
+
+func init() {
+ ginternal.NewRequestInfoContext = func(ctx context.Context, ri RequestInfo) context.Context {
+ return context.WithValue(ctx, requestInfoKey{}, ri)
+ }
+}
diff --git a/vendor/google.golang.org/grpc/dialoptions.go b/vendor/google.golang.org/grpc/dialoptions.go
index e8f34d0..9f872df 100644
--- a/vendor/google.golang.org/grpc/dialoptions.go
+++ b/vendor/google.golang.org/grpc/dialoptions.go
@@ -24,11 +24,12 @@
"net"
"time"
+ "google.golang.org/grpc/backoff"
"google.golang.org/grpc/balancer"
"google.golang.org/grpc/credentials"
"google.golang.org/grpc/grpclog"
"google.golang.org/grpc/internal"
- "google.golang.org/grpc/internal/backoff"
+ internalbackoff "google.golang.org/grpc/internal/backoff"
"google.golang.org/grpc/internal/envconfig"
"google.golang.org/grpc/internal/transport"
"google.golang.org/grpc/keepalive"
@@ -47,7 +48,7 @@
cp Compressor
dc Decompressor
- bs backoff.Strategy
+ bs internalbackoff.Strategy
block bool
insecure bool
timeout time.Duration
@@ -68,6 +69,10 @@
minConnectTimeout func() time.Duration
defaultServiceConfig *ServiceConfig // defaultServiceConfig is parsed from defaultServiceConfigRawJSON.
defaultServiceConfigRawJSON *string
+ // This is used by ccResolverWrapper to backoff between successive calls to
+ // resolver.ResolveNow(). The user will have no need to configure this, but
+ // we need to be able to configure this in tests.
+ resolveNowBackoff func(int) time.Duration
}
// DialOption configures how we set up the connection.
@@ -246,8 +251,28 @@
})
}
+// WithConnectParams configures the dialer to use the provided ConnectParams.
+//
+// The backoff configuration specified as part of the ConnectParams overrides
+// all defaults specified in
+// https://github.com/grpc/grpc/blob/master/doc/connection-backoff.md. Consider
+// using the backoff.DefaultConfig as a base, in cases where you want to
+// override only a subset of the backoff configuration.
+//
+// This API is EXPERIMENTAL.
+func WithConnectParams(p ConnectParams) DialOption {
+ return newFuncDialOption(func(o *dialOptions) {
+ o.bs = internalbackoff.Exponential{Config: p.Backoff}
+ o.minConnectTimeout = func() time.Duration {
+ return p.MinConnectTimeout
+ }
+ })
+}
+
// WithBackoffMaxDelay configures the dialer to use the provided maximum delay
// when backing off after failed connection attempts.
+//
+// Deprecated: use WithConnectParams instead. Will be supported throughout 1.x.
func WithBackoffMaxDelay(md time.Duration) DialOption {
return WithBackoffConfig(BackoffConfig{MaxDelay: md})
}
@@ -255,19 +280,18 @@
// WithBackoffConfig configures the dialer to use the provided backoff
// parameters after connection failures.
//
-// Use WithBackoffMaxDelay until more parameters on BackoffConfig are opened up
-// for use.
+// Deprecated: use WithConnectParams instead. Will be supported throughout 1.x.
func WithBackoffConfig(b BackoffConfig) DialOption {
- return withBackoff(backoff.Exponential{
- MaxDelay: b.MaxDelay,
- })
+ bc := backoff.DefaultConfig
+ bc.MaxDelay = b.MaxDelay
+ return withBackoff(internalbackoff.Exponential{Config: bc})
}
// withBackoff sets the backoff strategy used for connectRetryNum after a failed
// connection attempt.
//
// This can be exported if arbitrary backoff strategies are allowed by gRPC.
-func withBackoff(bs backoff.Strategy) DialOption {
+func withBackoff(bs internalbackoff.Strategy) DialOption {
return newFuncDialOption(func(o *dialOptions) {
o.bs = bs
})
@@ -539,6 +563,7 @@
WriteBufferSize: defaultWriteBufSize,
ReadBufferSize: defaultReadBufSize,
},
+ resolveNowBackoff: internalbackoff.DefaultExponential.Backoff,
}
}
@@ -552,3 +577,13 @@
o.minConnectTimeout = f
})
}
+
+// withResolveNowBackoff specifies the function that clientconn uses to backoff
+// between successive calls to resolver.ResolveNow().
+//
+// For testing purpose only.
+func withResolveNowBackoff(f func(int) time.Duration) DialOption {
+ return newFuncDialOption(func(o *dialOptions) {
+ o.resolveNowBackoff = f
+ })
+}
diff --git a/vendor/google.golang.org/grpc/encoding/encoding.go b/vendor/google.golang.org/grpc/encoding/encoding.go
index 30a75da..195e844 100644
--- a/vendor/google.golang.org/grpc/encoding/encoding.go
+++ b/vendor/google.golang.org/grpc/encoding/encoding.go
@@ -46,6 +46,10 @@
// coding header. The result must be static; the result cannot change
// between calls.
Name() string
+ // EXPERIMENTAL: if a Compressor implements
+ // DecompressedSize(compressedBytes []byte) int, gRPC will call it
+ // to determine the size of the buffer allocated for the result of decompression.
+ // Return -1 to indicate unknown size.
}
var registeredCompressor = make(map[string]Compressor)
diff --git a/vendor/google.golang.org/grpc/go.mod b/vendor/google.golang.org/grpc/go.mod
index c7f3fa3..dc56aa7 100644
--- a/vendor/google.golang.org/grpc/go.mod
+++ b/vendor/google.golang.org/grpc/go.mod
@@ -3,19 +3,14 @@
go 1.11
require (
- cloud.google.com/go v0.26.0 // indirect
- github.com/BurntSushi/toml v0.3.1 // indirect
- github.com/client9/misspell v0.3.4
+ github.com/envoyproxy/go-control-plane v0.9.0
+ github.com/envoyproxy/protoc-gen-validate v0.1.0
github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b
github.com/golang/mock v1.1.1
github.com/golang/protobuf v1.3.2
github.com/google/go-cmp v0.2.0
- golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3
golang.org/x/net v0.0.0-20190311183353-d8887717615a
golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be
golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a
- golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135
- google.golang.org/appengine v1.1.0 // indirect
- google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8
- honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc
+ google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55
)
diff --git a/vendor/google.golang.org/grpc/go.sum b/vendor/google.golang.org/grpc/go.sum
index 7faff49..f6a4784 100644
--- a/vendor/google.golang.org/grpc/go.sum
+++ b/vendor/google.golang.org/grpc/go.sum
@@ -1,37 +1,53 @@
cloud.google.com/go v0.26.0 h1:e0WKqKTd5BnrG8aKH3J3h+QvEIQtSUcf2n5UZ5ZgLtQ=
cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
-github.com/BurntSushi/toml v0.3.1 h1:WXkYYl6Yr3qBf1K79EBnL4mak0OimBfB0XUf9Vl28OQ=
github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
-github.com/client9/misspell v0.3.4 h1:ta993UF76GwbvJcIo3Y68y/M3WxlpEHPWIGDkJYwzJI=
+github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
+github.com/envoyproxy/go-control-plane v0.9.0 h1:67WMNTvGrl7V1dWdKCeTwxDr7nio9clKoTlLhwIPnT4=
+github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
+github.com/envoyproxy/protoc-gen-validate v0.1.0 h1:EQciDnbrYxy13PgWoY8AqoxGiPrpgBZ1R8UNe3ddc+A=
+github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c=
github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b h1:VKtxabqXZkF25pY9ekfRL6a582T4P37/31XEstQ5p58=
github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q=
github.com/golang/mock v1.1.1 h1:G5FRp8JnTd7RQH5kemVNlMeyXQAztQ3mOWV95KxsXH8=
github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A=
+github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
github.com/golang/protobuf v1.3.2 h1:6nsPYzhq5kReh6QImI3k5qWzO4PEbvbIW2cwSfR/6xs=
github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
github.com/google/go-cmp v0.2.0 h1:+dTQ8DZQJz0Mb/HjFlkptS1FeQ4cWSnN941F8aEG4SQ=
github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M=
+github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
-golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3 h1:XQyxROzUlZH+WIQwySDgnISgOivlhjIEwaQaJEJrrN0=
+golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
+golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
+golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU=
golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
+golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
+golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
+golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
golang.org/x/net v0.0.0-20190311183353-d8887717615a h1:oWX7TPOiFAMXLq8o0ikBYfCJVlRHBcsciT5bXOrH628=
golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be h1:vEDujvNQGv4jgYKudGeI/+DAX4Jffq6hpD55MmoEvKs=
golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
-golang.org/x/sync v0.0.0-20190423024810-112230192c58 h1:8gQV6CLnAEikrhgkHFbMAEhagSSnXWGV915qUMm9mrU=
+golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a h1:1BGLXjeY4akVXGgbC9HugT3Jv3hCI0z56oJR5vAMgBU=
golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
golang.org/x/text v0.3.0 h1:g61tztE5qeGQ89tm6NTjjM9VPIm088od1l6aSorWRWg=
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
-golang.org/x/tools v0.0.0-20190311212946-11955173bddd h1:/e+gpKk9r3dJobndpTytxS2gOy6m5uvpg+ISQoEcusQ=
+golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
+golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY=
golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
-golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135 h1:5Beo0mZN8dRzgrMMkDp0jc8YXQKx9DiJ2k1dkvGsn5A=
golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
-google.golang.org/appengine v1.1.0 h1:igQkv0AAhEIvTEpD5LIpAfav2eeVO9HBTjvKHVJPRSs=
google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM=
-google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8 h1:Nw54tB0rB7hY/N0NQvRW8DG4Yk3Q6T9cu9RcFQDu1tc=
+google.golang.org/appengine v1.4.0 h1:/wp5JvzpHIxhs/dumFmF7BXTf3Z+dd4uXta4kVyO508=
+google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
-honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc h1:/hemPrYIhOhy8zYrNj+069zDB68us2sMGsfkFJO0iZs=
+google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55 h1:gSJIx1SDwno+2ElGhA4+qG2zF97qiUzTM+rQ0klBOcE=
+google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc=
+google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
+google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg=
+honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
diff --git a/vendor/google.golang.org/grpc/grpclog/grpclog.go b/vendor/google.golang.org/grpc/grpclog/grpclog.go
index 51bb945..874ea6d 100644
--- a/vendor/google.golang.org/grpc/grpclog/grpclog.go
+++ b/vendor/google.golang.org/grpc/grpclog/grpclog.go
@@ -89,7 +89,7 @@
}
// Fatalf logs to the FATAL log. Arguments are handled in the manner of fmt.Printf.
-// It calles os.Exit() with exit code 1.
+// It calls os.Exit() with exit code 1.
func Fatalf(format string, args ...interface{}) {
logger.Fatalf(format, args...)
// Make sure fatal logs will exit.
diff --git a/vendor/google.golang.org/grpc/internal/backoff/backoff.go b/vendor/google.golang.org/grpc/internal/backoff/backoff.go
index 1bd0cce..5fc0ee3 100644
--- a/vendor/google.golang.org/grpc/internal/backoff/backoff.go
+++ b/vendor/google.golang.org/grpc/internal/backoff/backoff.go
@@ -25,44 +25,39 @@
import (
"time"
+ grpcbackoff "google.golang.org/grpc/backoff"
"google.golang.org/grpc/internal/grpcrand"
)
// Strategy defines the methodology for backing off after a grpc connection
// failure.
-//
type Strategy interface {
// Backoff returns the amount of time to wait before the next retry given
// the number of consecutive failures.
Backoff(retries int) time.Duration
}
-const (
- // baseDelay is the amount of time to wait before retrying after the first
- // failure.
- baseDelay = 1.0 * time.Second
- // factor is applied to the backoff after each retry.
- factor = 1.6
- // jitter provides a range to randomize backoff delays.
- jitter = 0.2
-)
+// DefaultExponential is an exponential backoff implementation using the
+// default values for all the configurable knobs defined in
+// https://github.com/grpc/grpc/blob/master/doc/connection-backoff.md.
+var DefaultExponential = Exponential{Config: grpcbackoff.DefaultConfig}
// Exponential implements exponential backoff algorithm as defined in
// https://github.com/grpc/grpc/blob/master/doc/connection-backoff.md.
type Exponential struct {
- // MaxDelay is the upper bound of backoff delay.
- MaxDelay time.Duration
+ // Config contains all options to configure the backoff algorithm.
+ Config grpcbackoff.Config
}
// Backoff returns the amount of time to wait before the next retry given the
// number of retries.
func (bc Exponential) Backoff(retries int) time.Duration {
if retries == 0 {
- return baseDelay
+ return bc.Config.BaseDelay
}
- backoff, max := float64(baseDelay), float64(bc.MaxDelay)
+ backoff, max := float64(bc.Config.BaseDelay), float64(bc.Config.MaxDelay)
for backoff < max && retries > 0 {
- backoff *= factor
+ backoff *= bc.Config.Multiplier
retries--
}
if backoff > max {
@@ -70,7 +65,7 @@
}
// Randomize backoff delays so that if a cluster of requests start at
// the same time, they won't operate in lockstep.
- backoff *= 1 + jitter*(grpcrand.Float64()*2-1)
+ backoff *= 1 + bc.Config.Jitter*(grpcrand.Float64()*2-1)
if backoff < 0 {
return 0
}
diff --git a/vendor/google.golang.org/grpc/internal/binarylog/binarylog.go b/vendor/google.golang.org/grpc/internal/binarylog/binarylog.go
index fee6aec..4062c02 100644
--- a/vendor/google.golang.org/grpc/internal/binarylog/binarylog.go
+++ b/vendor/google.golang.org/grpc/internal/binarylog/binarylog.go
@@ -34,7 +34,7 @@
}
// binLogger is the global binary logger for the binary. One of this should be
-// built at init time from the configuration (environment varialbe or flags).
+// built at init time from the configuration (environment variable or flags).
//
// It is used to get a methodLogger for each individual method.
var binLogger Logger
diff --git a/vendor/google.golang.org/grpc/internal/binarylog/env_config.go b/vendor/google.golang.org/grpc/internal/binarylog/env_config.go
index 4cc2525..be30d0e 100644
--- a/vendor/google.golang.org/grpc/internal/binarylog/env_config.go
+++ b/vendor/google.golang.org/grpc/internal/binarylog/env_config.go
@@ -43,7 +43,7 @@
// Foo.
//
// If two configs exist for one certain method or service, the one specified
-// later overrides the privous config.
+// later overrides the previous config.
func NewLoggerFromConfigString(s string) Logger {
if s == "" {
return nil
@@ -74,7 +74,7 @@
return fmt.Errorf("invalid config: %q, %v", config, err)
}
if m == "*" {
- return fmt.Errorf("invalid config: %q, %v", config, "* not allowd in blacklist config")
+ return fmt.Errorf("invalid config: %q, %v", config, "* not allowed in blacklist config")
}
if suffix != "" {
return fmt.Errorf("invalid config: %q, %v", config, "header/message limit not allowed in blacklist config")
diff --git a/vendor/google.golang.org/grpc/internal/binarylog/sink.go b/vendor/google.golang.org/grpc/internal/binarylog/sink.go
index 20d044f..a2e7c34 100644
--- a/vendor/google.golang.org/grpc/internal/binarylog/sink.go
+++ b/vendor/google.golang.org/grpc/internal/binarylog/sink.go
@@ -63,7 +63,7 @@
// newWriterSink creates a binary log sink with the given writer.
//
-// Write() marshalls the proto message and writes it to the given writer. Each
+// Write() marshals the proto message and writes it to the given writer. Each
// message is prefixed with a 4 byte big endian unsigned integer as the length.
//
// No buffer is done, Close() doesn't try to close the writer.
diff --git a/vendor/google.golang.org/grpc/internal/buffer/unbounded.go b/vendor/google.golang.org/grpc/internal/buffer/unbounded.go
new file mode 100644
index 0000000..2cb3109
--- /dev/null
+++ b/vendor/google.golang.org/grpc/internal/buffer/unbounded.go
@@ -0,0 +1,78 @@
+/*
+ * Copyright 2019 gRPC authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+// Package buffer provides an implementation of an unbounded buffer.
+package buffer
+
+import "sync"
+
+// Unbounded is an implementation of an unbounded buffer which does not use
+// extra goroutines. This is typically used for passing updates from one entity
+// to another within gRPC.
+//
+// All methods on this type are thread-safe and don't block on anything except
+// the underlying mutex used for synchronization.
+type Unbounded struct {
+ c chan interface{}
+ mu sync.Mutex
+ backlog []interface{}
+}
+
+// NewUnbounded returns a new instance of Unbounded.
+func NewUnbounded() *Unbounded {
+ return &Unbounded{c: make(chan interface{}, 1)}
+}
+
+// Put adds t to the unbounded buffer.
+func (b *Unbounded) Put(t interface{}) {
+ b.mu.Lock()
+ if len(b.backlog) == 0 {
+ select {
+ case b.c <- t:
+ b.mu.Unlock()
+ return
+ default:
+ }
+ }
+ b.backlog = append(b.backlog, t)
+ b.mu.Unlock()
+}
+
+// Load sends the earliest buffered data, if any, onto the read channel
+// returned by Get(). Users are expected to call this every time they read a
+// value from the read channel.
+func (b *Unbounded) Load() {
+ b.mu.Lock()
+ if len(b.backlog) > 0 {
+ select {
+ case b.c <- b.backlog[0]:
+ b.backlog[0] = nil
+ b.backlog = b.backlog[1:]
+ default:
+ }
+ }
+ b.mu.Unlock()
+}
+
+// Get returns a read channel on which values added to the buffer, via Put(),
+// are sent on.
+//
+// Upon reading a value from this channel, users are expected to call Load() to
+// send the next buffered value onto the channel if there is any.
+func (b *Unbounded) Get() <-chan interface{} {
+ return b.c
+}
diff --git a/vendor/google.golang.org/grpc/internal/internal.go b/vendor/google.golang.org/grpc/internal/internal.go
index bc1f99a..b96b359 100644
--- a/vendor/google.golang.org/grpc/internal/internal.go
+++ b/vendor/google.golang.org/grpc/internal/internal.go
@@ -28,9 +28,9 @@
)
var (
- // WithResolverBuilder is exported by dialoptions.go
+ // WithResolverBuilder is set by dialoptions.go
WithResolverBuilder interface{} // func (resolver.Builder) grpc.DialOption
- // WithHealthCheckFunc is not exported by dialoptions.go
+ // WithHealthCheckFunc is set by dialoptions.go
WithHealthCheckFunc interface{} // func (HealthChecker) DialOption
// HealthCheckFunc is used to provide client-side LB channel health checking
HealthCheckFunc HealthChecker
@@ -39,14 +39,17 @@
// KeepaliveMinPingTime is the minimum ping interval. This must be 10s by
// default, but tests may wish to set it lower for convenience.
KeepaliveMinPingTime = 10 * time.Second
- // ParseServiceConfig is a function to parse JSON service configs into
- // opaque data structures.
- ParseServiceConfig func(sc string) (interface{}, error)
// StatusRawProto is exported by status/status.go. This func returns a
// pointer to the wrapped Status proto for a given status.Status without a
// call to proto.Clone(). The returned Status proto should not be mutated by
// the caller.
StatusRawProto interface{} // func (*status.Status) *spb.Status
+ // NewRequestInfoContext creates a new context based on the argument context attaching
+ // the passed in RequestInfo to the new context.
+ NewRequestInfoContext interface{} // func(context.Context, credentials.RequestInfo) context.Context
+ // ParseServiceConfigForTesting is for creating a fake
+ // ClientConn for resolver testing only
+ ParseServiceConfigForTesting interface{} // func(string) *serviceconfig.ParseResult
)
// HealthChecker defines the signature of the client-side LB channel health checking function.
diff --git a/vendor/google.golang.org/grpc/internal/resolver/dns/dns_resolver.go b/vendor/google.golang.org/grpc/internal/resolver/dns/dns_resolver.go
new file mode 100644
index 0000000..abc0f92
--- /dev/null
+++ b/vendor/google.golang.org/grpc/internal/resolver/dns/dns_resolver.go
@@ -0,0 +1,460 @@
+/*
+ *
+ * Copyright 2018 gRPC authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+// Package dns implements a dns resolver to be installed as the default resolver
+// in grpc.
+package dns
+
+import (
+ "context"
+ "encoding/json"
+ "errors"
+ "fmt"
+ "net"
+ "os"
+ "strconv"
+ "strings"
+ "sync"
+ "time"
+
+ "google.golang.org/grpc/backoff"
+ "google.golang.org/grpc/grpclog"
+ internalbackoff "google.golang.org/grpc/internal/backoff"
+ "google.golang.org/grpc/internal/grpcrand"
+ "google.golang.org/grpc/resolver"
+)
+
+func init() {
+ resolver.Register(NewBuilder())
+}
+
+const (
+ defaultPort = "443"
+ defaultFreq = time.Minute * 30
+ defaultDNSSvrPort = "53"
+ golang = "GO"
+ // txtPrefix is the prefix string to be prepended to the host name for txt record lookup.
+ txtPrefix = "_grpc_config."
+ // In DNS, service config is encoded in a TXT record via the mechanism
+ // described in RFC-1464 using the attribute name grpc_config.
+ txtAttribute = "grpc_config="
+)
+
+var (
+ errMissingAddr = errors.New("dns resolver: missing address")
+
+ // Addresses ending with a colon that is supposed to be the separator
+ // between host and port is not allowed. E.g. "::" is a valid address as
+ // it is an IPv6 address (host only) and "[::]:" is invalid as it ends with
+ // a colon as the host and port separator
+ errEndsWithColon = errors.New("dns resolver: missing port after port-separator colon")
+)
+
+var (
+ defaultResolver netResolver = net.DefaultResolver
+ // To prevent excessive re-resolution, we enforce a rate limit on DNS
+ // resolution requests.
+ minDNSResRate = 30 * time.Second
+)
+
+var customAuthorityDialler = func(authority string) func(ctx context.Context, network, address string) (net.Conn, error) {
+ return func(ctx context.Context, network, address string) (net.Conn, error) {
+ var dialer net.Dialer
+ return dialer.DialContext(ctx, network, authority)
+ }
+}
+
+var customAuthorityResolver = func(authority string) (netResolver, error) {
+ host, port, err := parseTarget(authority, defaultDNSSvrPort)
+ if err != nil {
+ return nil, err
+ }
+
+ authorityWithPort := net.JoinHostPort(host, port)
+
+ return &net.Resolver{
+ PreferGo: true,
+ Dial: customAuthorityDialler(authorityWithPort),
+ }, nil
+}
+
+// NewBuilder creates a dnsBuilder which is used to factory DNS resolvers.
+func NewBuilder() resolver.Builder {
+ return &dnsBuilder{minFreq: defaultFreq}
+}
+
+type dnsBuilder struct {
+ // minimum frequency of polling the DNS server.
+ minFreq time.Duration
+}
+
+// Build creates and starts a DNS resolver that watches the name resolution of the target.
+func (b *dnsBuilder) Build(target resolver.Target, cc resolver.ClientConn, opts resolver.BuildOption) (resolver.Resolver, error) {
+ host, port, err := parseTarget(target.Endpoint, defaultPort)
+ if err != nil {
+ return nil, err
+ }
+
+ // IP address.
+ if net.ParseIP(host) != nil {
+ host, _ = formatIP(host)
+ addr := []resolver.Address{{Addr: host + ":" + port}}
+ i := &ipResolver{
+ cc: cc,
+ ip: addr,
+ rn: make(chan struct{}, 1),
+ q: make(chan struct{}),
+ }
+ cc.NewAddress(addr)
+ go i.watcher()
+ return i, nil
+ }
+
+ // DNS address (non-IP).
+ ctx, cancel := context.WithCancel(context.Background())
+ bc := backoff.DefaultConfig
+ bc.MaxDelay = b.minFreq
+ d := &dnsResolver{
+ freq: b.minFreq,
+ backoff: internalbackoff.Exponential{Config: bc},
+ host: host,
+ port: port,
+ ctx: ctx,
+ cancel: cancel,
+ cc: cc,
+ t: time.NewTimer(0),
+ rn: make(chan struct{}, 1),
+ disableServiceConfig: opts.DisableServiceConfig,
+ }
+
+ if target.Authority == "" {
+ d.resolver = defaultResolver
+ } else {
+ d.resolver, err = customAuthorityResolver(target.Authority)
+ if err != nil {
+ return nil, err
+ }
+ }
+
+ d.wg.Add(1)
+ go d.watcher()
+ return d, nil
+}
+
+// Scheme returns the naming scheme of this resolver builder, which is "dns".
+func (b *dnsBuilder) Scheme() string {
+ return "dns"
+}
+
+type netResolver interface {
+ LookupHost(ctx context.Context, host string) (addrs []string, err error)
+ LookupSRV(ctx context.Context, service, proto, name string) (cname string, addrs []*net.SRV, err error)
+ LookupTXT(ctx context.Context, name string) (txts []string, err error)
+}
+
+// ipResolver watches for the name resolution update for an IP address.
+type ipResolver struct {
+ cc resolver.ClientConn
+ ip []resolver.Address
+ // rn channel is used by ResolveNow() to force an immediate resolution of the target.
+ rn chan struct{}
+ q chan struct{}
+}
+
+// ResolveNow resend the address it stores, no resolution is needed.
+func (i *ipResolver) ResolveNow(opt resolver.ResolveNowOption) {
+ select {
+ case i.rn <- struct{}{}:
+ default:
+ }
+}
+
+// Close closes the ipResolver.
+func (i *ipResolver) Close() {
+ close(i.q)
+}
+
+func (i *ipResolver) watcher() {
+ for {
+ select {
+ case <-i.rn:
+ i.cc.NewAddress(i.ip)
+ case <-i.q:
+ return
+ }
+ }
+}
+
+// dnsResolver watches for the name resolution update for a non-IP target.
+type dnsResolver struct {
+ freq time.Duration
+ backoff internalbackoff.Exponential
+ retryCount int
+ host string
+ port string
+ resolver netResolver
+ ctx context.Context
+ cancel context.CancelFunc
+ cc resolver.ClientConn
+ // rn channel is used by ResolveNow() to force an immediate resolution of the target.
+ rn chan struct{}
+ t *time.Timer
+ // wg is used to enforce Close() to return after the watcher() goroutine has finished.
+ // Otherwise, data race will be possible. [Race Example] in dns_resolver_test we
+ // replace the real lookup functions with mocked ones to facilitate testing.
+ // If Close() doesn't wait for watcher() goroutine finishes, race detector sometimes
+ // will warns lookup (READ the lookup function pointers) inside watcher() goroutine
+ // has data race with replaceNetFunc (WRITE the lookup function pointers).
+ wg sync.WaitGroup
+ disableServiceConfig bool
+}
+
+// ResolveNow invoke an immediate resolution of the target that this dnsResolver watches.
+func (d *dnsResolver) ResolveNow(opt resolver.ResolveNowOption) {
+ select {
+ case d.rn <- struct{}{}:
+ default:
+ }
+}
+
+// Close closes the dnsResolver.
+func (d *dnsResolver) Close() {
+ d.cancel()
+ d.wg.Wait()
+ d.t.Stop()
+}
+
+func (d *dnsResolver) watcher() {
+ defer d.wg.Done()
+ for {
+ select {
+ case <-d.ctx.Done():
+ return
+ case <-d.t.C:
+ case <-d.rn:
+ if !d.t.Stop() {
+ // Before resetting a timer, it should be stopped to prevent racing with
+ // reads on it's channel.
+ <-d.t.C
+ }
+ }
+
+ result, sc := d.lookup()
+ // Next lookup should happen within an interval defined by d.freq. It may be
+ // more often due to exponential retry on empty address list.
+ if len(result) == 0 {
+ d.retryCount++
+ d.t.Reset(d.backoff.Backoff(d.retryCount))
+ } else {
+ d.retryCount = 0
+ d.t.Reset(d.freq)
+ }
+ d.cc.NewServiceConfig(sc)
+ d.cc.NewAddress(result)
+
+ // Sleep to prevent excessive re-resolutions. Incoming resolution requests
+ // will be queued in d.rn.
+ t := time.NewTimer(minDNSResRate)
+ select {
+ case <-t.C:
+ case <-d.ctx.Done():
+ t.Stop()
+ return
+ }
+ }
+}
+
+func (d *dnsResolver) lookupSRV() []resolver.Address {
+ var newAddrs []resolver.Address
+ _, srvs, err := d.resolver.LookupSRV(d.ctx, "grpclb", "tcp", d.host)
+ if err != nil {
+ grpclog.Infof("grpc: failed dns SRV record lookup due to %v.\n", err)
+ return nil
+ }
+ for _, s := range srvs {
+ lbAddrs, err := d.resolver.LookupHost(d.ctx, s.Target)
+ if err != nil {
+ grpclog.Infof("grpc: failed load balancer address dns lookup due to %v.\n", err)
+ continue
+ }
+ for _, a := range lbAddrs {
+ a, ok := formatIP(a)
+ if !ok {
+ grpclog.Errorf("grpc: failed IP parsing due to %v.\n", err)
+ continue
+ }
+ addr := a + ":" + strconv.Itoa(int(s.Port))
+ newAddrs = append(newAddrs, resolver.Address{Addr: addr, Type: resolver.GRPCLB, ServerName: s.Target})
+ }
+ }
+ return newAddrs
+}
+
+func (d *dnsResolver) lookupTXT() string {
+ ss, err := d.resolver.LookupTXT(d.ctx, txtPrefix+d.host)
+ if err != nil {
+ grpclog.Infof("grpc: failed dns TXT record lookup due to %v.\n", err)
+ return ""
+ }
+ var res string
+ for _, s := range ss {
+ res += s
+ }
+
+ // TXT record must have "grpc_config=" attribute in order to be used as service config.
+ if !strings.HasPrefix(res, txtAttribute) {
+ grpclog.Warningf("grpc: TXT record %v missing %v attribute", res, txtAttribute)
+ return ""
+ }
+ return strings.TrimPrefix(res, txtAttribute)
+}
+
+func (d *dnsResolver) lookupHost() []resolver.Address {
+ var newAddrs []resolver.Address
+ addrs, err := d.resolver.LookupHost(d.ctx, d.host)
+ if err != nil {
+ grpclog.Warningf("grpc: failed dns A record lookup due to %v.\n", err)
+ return nil
+ }
+ for _, a := range addrs {
+ a, ok := formatIP(a)
+ if !ok {
+ grpclog.Errorf("grpc: failed IP parsing due to %v.\n", err)
+ continue
+ }
+ addr := a + ":" + d.port
+ newAddrs = append(newAddrs, resolver.Address{Addr: addr})
+ }
+ return newAddrs
+}
+
+func (d *dnsResolver) lookup() ([]resolver.Address, string) {
+ newAddrs := d.lookupSRV()
+ // Support fallback to non-balancer address.
+ newAddrs = append(newAddrs, d.lookupHost()...)
+ if d.disableServiceConfig {
+ return newAddrs, ""
+ }
+ sc := d.lookupTXT()
+ return newAddrs, canaryingSC(sc)
+}
+
+// formatIP returns ok = false if addr is not a valid textual representation of an IP address.
+// If addr is an IPv4 address, return the addr and ok = true.
+// If addr is an IPv6 address, return the addr enclosed in square brackets and ok = true.
+func formatIP(addr string) (addrIP string, ok bool) {
+ ip := net.ParseIP(addr)
+ if ip == nil {
+ return "", false
+ }
+ if ip.To4() != nil {
+ return addr, true
+ }
+ return "[" + addr + "]", true
+}
+
+// parseTarget takes the user input target string and default port, returns formatted host and port info.
+// If target doesn't specify a port, set the port to be the defaultPort.
+// If target is in IPv6 format and host-name is enclosed in square brackets, brackets
+// are stripped when setting the host.
+// examples:
+// target: "www.google.com" defaultPort: "443" returns host: "www.google.com", port: "443"
+// target: "ipv4-host:80" defaultPort: "443" returns host: "ipv4-host", port: "80"
+// target: "[ipv6-host]" defaultPort: "443" returns host: "ipv6-host", port: "443"
+// target: ":80" defaultPort: "443" returns host: "localhost", port: "80"
+func parseTarget(target, defaultPort string) (host, port string, err error) {
+ if target == "" {
+ return "", "", errMissingAddr
+ }
+ if ip := net.ParseIP(target); ip != nil {
+ // target is an IPv4 or IPv6(without brackets) address
+ return target, defaultPort, nil
+ }
+ if host, port, err = net.SplitHostPort(target); err == nil {
+ if port == "" {
+ // If the port field is empty (target ends with colon), e.g. "[::1]:", this is an error.
+ return "", "", errEndsWithColon
+ }
+ // target has port, i.e ipv4-host:port, [ipv6-host]:port, host-name:port
+ if host == "" {
+ // Keep consistent with net.Dial(): If the host is empty, as in ":80", the local system is assumed.
+ host = "localhost"
+ }
+ return host, port, nil
+ }
+ if host, port, err = net.SplitHostPort(target + ":" + defaultPort); err == nil {
+ // target doesn't have port
+ return host, port, nil
+ }
+ return "", "", fmt.Errorf("invalid target address %v, error info: %v", target, err)
+}
+
+type rawChoice struct {
+ ClientLanguage *[]string `json:"clientLanguage,omitempty"`
+ Percentage *int `json:"percentage,omitempty"`
+ ClientHostName *[]string `json:"clientHostName,omitempty"`
+ ServiceConfig *json.RawMessage `json:"serviceConfig,omitempty"`
+}
+
+func containsString(a *[]string, b string) bool {
+ if a == nil {
+ return true
+ }
+ for _, c := range *a {
+ if c == b {
+ return true
+ }
+ }
+ return false
+}
+
+func chosenByPercentage(a *int) bool {
+ if a == nil {
+ return true
+ }
+ return grpcrand.Intn(100)+1 <= *a
+}
+
+func canaryingSC(js string) string {
+ if js == "" {
+ return ""
+ }
+ var rcs []rawChoice
+ err := json.Unmarshal([]byte(js), &rcs)
+ if err != nil {
+ grpclog.Warningf("grpc: failed to parse service config json string due to %v.\n", err)
+ return ""
+ }
+ cliHostname, err := os.Hostname()
+ if err != nil {
+ grpclog.Warningf("grpc: failed to get client hostname due to %v.\n", err)
+ return ""
+ }
+ var sc string
+ for _, c := range rcs {
+ if !containsString(c.ClientLanguage, golang) ||
+ !chosenByPercentage(c.Percentage) ||
+ !containsString(c.ClientHostName, cliHostname) ||
+ c.ServiceConfig == nil {
+ continue
+ }
+ sc = string(*c.ServiceConfig)
+ break
+ }
+ return sc
+}
diff --git a/vendor/google.golang.org/grpc/internal/resolver/passthrough/passthrough.go b/vendor/google.golang.org/grpc/internal/resolver/passthrough/passthrough.go
new file mode 100644
index 0000000..893d5d1
--- /dev/null
+++ b/vendor/google.golang.org/grpc/internal/resolver/passthrough/passthrough.go
@@ -0,0 +1,57 @@
+/*
+ *
+ * Copyright 2017 gRPC authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+// Package passthrough implements a pass-through resolver. It sends the target
+// name without scheme back to gRPC as resolved address.
+package passthrough
+
+import "google.golang.org/grpc/resolver"
+
+const scheme = "passthrough"
+
+type passthroughBuilder struct{}
+
+func (*passthroughBuilder) Build(target resolver.Target, cc resolver.ClientConn, opts resolver.BuildOption) (resolver.Resolver, error) {
+ r := &passthroughResolver{
+ target: target,
+ cc: cc,
+ }
+ r.start()
+ return r, nil
+}
+
+func (*passthroughBuilder) Scheme() string {
+ return scheme
+}
+
+type passthroughResolver struct {
+ target resolver.Target
+ cc resolver.ClientConn
+}
+
+func (r *passthroughResolver) start() {
+ r.cc.UpdateState(resolver.State{Addresses: []resolver.Address{{Addr: r.target.Endpoint}}})
+}
+
+func (*passthroughResolver) ResolveNow(o resolver.ResolveNowOption) {}
+
+func (*passthroughResolver) Close() {}
+
+func init() {
+ resolver.Register(&passthroughBuilder{})
+}
diff --git a/vendor/google.golang.org/grpc/internal/transport/http2_client.go b/vendor/google.golang.org/grpc/internal/transport/http2_client.go
index 9bd8c27..294661a 100644
--- a/vendor/google.golang.org/grpc/internal/transport/http2_client.go
+++ b/vendor/google.golang.org/grpc/internal/transport/http2_client.go
@@ -35,6 +35,7 @@
"google.golang.org/grpc/codes"
"google.golang.org/grpc/credentials"
+ "google.golang.org/grpc/internal"
"google.golang.org/grpc/internal/channelz"
"google.golang.org/grpc/internal/syscall"
"google.golang.org/grpc/keepalive"
@@ -46,6 +47,7 @@
// http2Client implements the ClientTransport interface with HTTP2.
type http2Client struct {
+ lastRead int64 // keep this field 64-bit aligned
ctx context.Context
cancel context.CancelFunc
ctxDone <-chan struct{} // Cache the ctx.Done() chan.
@@ -75,9 +77,6 @@
perRPCCreds []credentials.PerRPCCredentials
- // Boolean to keep track of reading activity on transport.
- // 1 is true and 0 is false.
- activity uint32 // Accessed atomically.
kp keepalive.ClientParameters
keepaliveEnabled bool
@@ -352,6 +351,7 @@
func (t *http2Client) newStream(ctx context.Context, callHdr *CallHdr) *Stream {
// TODO(zhaoq): Handle uint32 overflow of Stream.id.
s := &Stream{
+ ct: t,
done: make(chan struct{}),
method: callHdr.Method,
sendCompress: callHdr.SendCompress,
@@ -385,23 +385,23 @@
}
func (t *http2Client) getPeer() *peer.Peer {
- pr := &peer.Peer{
- Addr: t.remoteAddr,
+ return &peer.Peer{
+ Addr: t.remoteAddr,
+ AuthInfo: t.authInfo,
}
- // Attach Auth info if there is any.
- if t.authInfo != nil {
- pr.AuthInfo = t.authInfo
- }
- return pr
}
func (t *http2Client) createHeaderFields(ctx context.Context, callHdr *CallHdr) ([]hpack.HeaderField, error) {
aud := t.createAudience(callHdr)
- authData, err := t.getTrAuthData(ctx, aud)
+ ri := credentials.RequestInfo{
+ Method: callHdr.Method,
+ }
+ ctxWithRequestInfo := internal.NewRequestInfoContext.(func(context.Context, credentials.RequestInfo) context.Context)(ctx, ri)
+ authData, err := t.getTrAuthData(ctxWithRequestInfo, aud)
if err != nil {
return nil, err
}
- callAuthData, err := t.getCallAuthData(ctx, aud, callHdr)
+ callAuthData, err := t.getCallAuthData(ctxWithRequestInfo, aud, callHdr)
if err != nil {
return nil, err
}
@@ -1191,6 +1191,7 @@
// If headerChan hasn't been closed yet
if atomic.CompareAndSwapUint32(&s.headerChanClosed, 0, 1) {
+ s.headerValid = true
if !endStream {
// HEADERS frame block carries a Response-Headers.
isHeader = true
@@ -1233,7 +1234,7 @@
}
t.conn.SetReadDeadline(time.Time{}) // reset deadline once we get the settings frame (we didn't time out, yay!)
if t.keepaliveEnabled {
- atomic.CompareAndSwapUint32(&t.activity, 0, 1)
+ atomic.StoreInt64(&t.lastRead, time.Now().UnixNano())
}
sf, ok := frame.(*http2.SettingsFrame)
if !ok {
@@ -1248,7 +1249,7 @@
t.controlBuf.throttle()
frame, err := t.framer.fr.ReadFrame()
if t.keepaliveEnabled {
- atomic.CompareAndSwapUint32(&t.activity, 0, 1)
+ atomic.StoreInt64(&t.lastRead, time.Now().UnixNano())
}
if err != nil {
// Abort an active stream if the http2.Framer returns a
@@ -1292,17 +1293,41 @@
}
}
+func minTime(a, b time.Duration) time.Duration {
+ if a < b {
+ return a
+ }
+ return b
+}
+
// keepalive running in a separate goroutune makes sure the connection is alive by sending pings.
func (t *http2Client) keepalive() {
p := &ping{data: [8]byte{}}
+ // True iff a ping has been sent, and no data has been received since then.
+ outstandingPing := false
+ // Amount of time remaining before which we should receive an ACK for the
+ // last sent ping.
+ timeoutLeft := time.Duration(0)
+ // Records the last value of t.lastRead before we go block on the timer.
+ // This is required to check for read activity since then.
+ prevNano := time.Now().UnixNano()
timer := time.NewTimer(t.kp.Time)
for {
select {
case <-timer.C:
- if atomic.CompareAndSwapUint32(&t.activity, 1, 0) {
- timer.Reset(t.kp.Time)
+ lastRead := atomic.LoadInt64(&t.lastRead)
+ if lastRead > prevNano {
+ // There has been read activity since the last time we were here.
+ outstandingPing = false
+ // Next timer should fire at kp.Time seconds from lastRead time.
+ timer.Reset(time.Duration(lastRead) + t.kp.Time - time.Duration(time.Now().UnixNano()))
+ prevNano = lastRead
continue
}
+ if outstandingPing && timeoutLeft <= 0 {
+ t.Close()
+ return
+ }
t.mu.Lock()
if t.state == closing {
// If the transport is closing, we should exit from the
@@ -1315,36 +1340,37 @@
return
}
if len(t.activeStreams) < 1 && !t.kp.PermitWithoutStream {
+ // If a ping was sent out previously (because there were active
+ // streams at that point) which wasn't acked and its timeout
+ // hadn't fired, but we got here and are about to go dormant,
+ // we should make sure that we unconditionally send a ping once
+ // we awaken.
+ outstandingPing = false
t.kpDormant = true
t.kpDormancyCond.Wait()
}
t.kpDormant = false
t.mu.Unlock()
- if channelz.IsOn() {
- atomic.AddInt64(&t.czData.kpCount, 1)
- }
// We get here either because we were dormant and a new stream was
// created which unblocked the Wait() call, or because the
// keepalive timer expired. In both cases, we need to send a ping.
- t.controlBuf.put(p)
-
- timer.Reset(t.kp.Timeout)
- select {
- case <-timer.C:
- if atomic.CompareAndSwapUint32(&t.activity, 1, 0) {
- timer.Reset(t.kp.Time)
- continue
+ if !outstandingPing {
+ if channelz.IsOn() {
+ atomic.AddInt64(&t.czData.kpCount, 1)
}
- infof("transport: closing client transport due to idleness.")
- t.Close()
- return
- case <-t.ctx.Done():
- if !timer.Stop() {
- <-timer.C
- }
- return
+ t.controlBuf.put(p)
+ timeoutLeft = t.kp.Timeout
+ outstandingPing = true
}
+ // The amount of time to sleep here is the minimum of kp.Time and
+ // timeoutLeft. This will ensure that we wait only for kp.Time
+ // before sending out the next ping (for cases where the ping is
+ // acked).
+ sleepDuration := minTime(t.kp.Time, timeoutLeft)
+ timeoutLeft -= sleepDuration
+ prevNano = lastRead
+ timer.Reset(sleepDuration)
case <-t.ctx.Done():
if !timer.Stop() {
<-timer.C
diff --git a/vendor/google.golang.org/grpc/internal/transport/http2_server.go b/vendor/google.golang.org/grpc/internal/transport/http2_server.go
index 33686a1..0760383 100644
--- a/vendor/google.golang.org/grpc/internal/transport/http2_server.go
+++ b/vendor/google.golang.org/grpc/internal/transport/http2_server.go
@@ -174,6 +174,12 @@
Val: *config.MaxHeaderListSize,
})
}
+ if config.HeaderTableSize != nil {
+ isettings = append(isettings, http2.Setting{
+ ID: http2.SettingHeaderTableSize,
+ Val: *config.HeaderTableSize,
+ })
+ }
if err := framer.fr.WriteSettings(isettings...); err != nil {
return nil, connectionErrorf(false, err, "transport: %v", err)
}
@@ -751,7 +757,7 @@
return true
}
-// WriteHeader sends the header metedata md back to the client.
+// WriteHeader sends the header metadata md back to the client.
func (t *http2Server) WriteHeader(s *Stream, md metadata.MD) error {
if s.updateHeaderSent() || s.getState() == streamDone {
return ErrIllegalHeaderWrite
diff --git a/vendor/google.golang.org/grpc/internal/transport/transport.go b/vendor/google.golang.org/grpc/internal/transport/transport.go
index 1c1d106..bfab940 100644
--- a/vendor/google.golang.org/grpc/internal/transport/transport.go
+++ b/vendor/google.golang.org/grpc/internal/transport/transport.go
@@ -233,6 +233,7 @@
type Stream struct {
id uint32
st ServerTransport // nil for client side Stream
+ ct *http2Client // nil for server side Stream
ctx context.Context // the associated context of the stream
cancel context.CancelFunc // always nil for client side Stream
done chan struct{} // closed at the end of stream to unblock writers. On the client side.
@@ -251,6 +252,10 @@
headerChan chan struct{} // closed to indicate the end of header metadata.
headerChanClosed uint32 // set when headerChan is closed. Used to avoid closing headerChan multiple times.
+ // headerValid indicates whether a valid header was received. Only
+ // meaningful after headerChan is closed (always call waitOnHeader() before
+ // reading its value). Not valid on server side.
+ headerValid bool
// hdrMu protects header and trailer metadata on the server-side.
hdrMu sync.Mutex
@@ -303,34 +308,28 @@
return streamState(atomic.LoadUint32((*uint32)(&s.state)))
}
-func (s *Stream) waitOnHeader() error {
+func (s *Stream) waitOnHeader() {
if s.headerChan == nil {
// On the server headerChan is always nil since a stream originates
// only after having received headers.
- return nil
+ return
}
select {
case <-s.ctx.Done():
- // We prefer success over failure when reading messages because we delay
- // context error in stream.Read(). To keep behavior consistent, we also
- // prefer success here.
- select {
- case <-s.headerChan:
- return nil
- default:
- }
- return ContextErr(s.ctx.Err())
+ // Close the stream to prevent headers/trailers from changing after
+ // this function returns.
+ s.ct.CloseStream(s, ContextErr(s.ctx.Err()))
+ // headerChan could possibly not be closed yet if closeStream raced
+ // with operateHeaders; wait until it is closed explicitly here.
+ <-s.headerChan
case <-s.headerChan:
- return nil
}
}
// RecvCompress returns the compression algorithm applied to the inbound
// message. It is empty string if there is no compression applied.
func (s *Stream) RecvCompress() string {
- if err := s.waitOnHeader(); err != nil {
- return ""
- }
+ s.waitOnHeader()
return s.recvCompress
}
@@ -351,36 +350,27 @@
// available. It blocks until i) the metadata is ready or ii) there is no header
// metadata or iii) the stream is canceled/expired.
//
-// On server side, it returns the out header after t.WriteHeader is called.
+// On server side, it returns the out header after t.WriteHeader is called. It
+// does not block and must not be called until after WriteHeader.
func (s *Stream) Header() (metadata.MD, error) {
- if s.headerChan == nil && s.header != nil {
+ if s.headerChan == nil {
// On server side, return the header in stream. It will be the out
// header after t.WriteHeader is called.
return s.header.Copy(), nil
}
- err := s.waitOnHeader()
- // Even if the stream is closed, header is returned if available.
- select {
- case <-s.headerChan:
- if s.header == nil {
- return nil, nil
- }
- return s.header.Copy(), nil
- default:
+ s.waitOnHeader()
+ if !s.headerValid {
+ return nil, s.status.Err()
}
- return nil, err
+ return s.header.Copy(), nil
}
// TrailersOnly blocks until a header or trailers-only frame is received and
// then returns true if the stream was trailers-only. If the stream ends
-// before headers are received, returns true, nil. If a context error happens
-// first, returns it as a status error. Client-side only.
-func (s *Stream) TrailersOnly() (bool, error) {
- err := s.waitOnHeader()
- if err != nil {
- return false, err
- }
- return s.noHeaders, nil
+// before headers are received, returns true, nil. Client-side only.
+func (s *Stream) TrailersOnly() bool {
+ s.waitOnHeader()
+ return s.noHeaders
}
// Trailer returns the cached trailer metedata. Note that if it is not called
@@ -534,6 +524,7 @@
ReadBufferSize int
ChannelzParentID int64
MaxHeaderListSize *uint32
+ HeaderTableSize *uint32
}
// NewServerTransport creates a ServerTransport with conn or non-nil error
diff --git a/vendor/google.golang.org/grpc/resolver/dns/dns_resolver.go b/vendor/google.golang.org/grpc/resolver/dns/dns_resolver.go
index 297492e..14aa6f2 100644
--- a/vendor/google.golang.org/grpc/resolver/dns/dns_resolver.go
+++ b/vendor/google.golang.org/grpc/resolver/dns/dns_resolver.go
@@ -18,440 +18,19 @@
// Package dns implements a dns resolver to be installed as the default resolver
// in grpc.
+//
+// Deprecated: this package is imported by grpc and should not need to be
+// imported directly by users.
package dns
import (
- "context"
- "encoding/json"
- "errors"
- "fmt"
- "net"
- "os"
- "strconv"
- "strings"
- "sync"
- "time"
-
- "google.golang.org/grpc/grpclog"
- "google.golang.org/grpc/internal/backoff"
- "google.golang.org/grpc/internal/grpcrand"
+ "google.golang.org/grpc/internal/resolver/dns"
"google.golang.org/grpc/resolver"
)
-func init() {
- resolver.Register(NewBuilder())
-}
-
-const (
- defaultPort = "443"
- defaultFreq = time.Minute * 30
- defaultDNSSvrPort = "53"
- golang = "GO"
- // txtPrefix is the prefix string to be prepended to the host name for txt record lookup.
- txtPrefix = "_grpc_config."
- // In DNS, service config is encoded in a TXT record via the mechanism
- // described in RFC-1464 using the attribute name grpc_config.
- txtAttribute = "grpc_config="
-)
-
-var (
- errMissingAddr = errors.New("dns resolver: missing address")
-
- // Addresses ending with a colon that is supposed to be the separator
- // between host and port is not allowed. E.g. "::" is a valid address as
- // it is an IPv6 address (host only) and "[::]:" is invalid as it ends with
- // a colon as the host and port separator
- errEndsWithColon = errors.New("dns resolver: missing port after port-separator colon")
-)
-
-var (
- defaultResolver netResolver = net.DefaultResolver
- // To prevent excessive re-resolution, we enforce a rate limit on DNS
- // resolution requests.
- minDNSResRate = 30 * time.Second
-)
-
-var customAuthorityDialler = func(authority string) func(ctx context.Context, network, address string) (net.Conn, error) {
- return func(ctx context.Context, network, address string) (net.Conn, error) {
- var dialer net.Dialer
- return dialer.DialContext(ctx, network, authority)
- }
-}
-
-var customAuthorityResolver = func(authority string) (netResolver, error) {
- host, port, err := parseTarget(authority, defaultDNSSvrPort)
- if err != nil {
- return nil, err
- }
-
- authorityWithPort := net.JoinHostPort(host, port)
-
- return &net.Resolver{
- PreferGo: true,
- Dial: customAuthorityDialler(authorityWithPort),
- }, nil
-}
-
// NewBuilder creates a dnsBuilder which is used to factory DNS resolvers.
+//
+// Deprecated: import grpc and use resolver.Get("dns") instead.
func NewBuilder() resolver.Builder {
- return &dnsBuilder{minFreq: defaultFreq}
-}
-
-type dnsBuilder struct {
- // minimum frequency of polling the DNS server.
- minFreq time.Duration
-}
-
-// Build creates and starts a DNS resolver that watches the name resolution of the target.
-func (b *dnsBuilder) Build(target resolver.Target, cc resolver.ClientConn, opts resolver.BuildOption) (resolver.Resolver, error) {
- host, port, err := parseTarget(target.Endpoint, defaultPort)
- if err != nil {
- return nil, err
- }
-
- // IP address.
- if net.ParseIP(host) != nil {
- host, _ = formatIP(host)
- addr := []resolver.Address{{Addr: host + ":" + port}}
- i := &ipResolver{
- cc: cc,
- ip: addr,
- rn: make(chan struct{}, 1),
- q: make(chan struct{}),
- }
- cc.NewAddress(addr)
- go i.watcher()
- return i, nil
- }
-
- // DNS address (non-IP).
- ctx, cancel := context.WithCancel(context.Background())
- d := &dnsResolver{
- freq: b.minFreq,
- backoff: backoff.Exponential{MaxDelay: b.minFreq},
- host: host,
- port: port,
- ctx: ctx,
- cancel: cancel,
- cc: cc,
- t: time.NewTimer(0),
- rn: make(chan struct{}, 1),
- disableServiceConfig: opts.DisableServiceConfig,
- }
-
- if target.Authority == "" {
- d.resolver = defaultResolver
- } else {
- d.resolver, err = customAuthorityResolver(target.Authority)
- if err != nil {
- return nil, err
- }
- }
-
- d.wg.Add(1)
- go d.watcher()
- return d, nil
-}
-
-// Scheme returns the naming scheme of this resolver builder, which is "dns".
-func (b *dnsBuilder) Scheme() string {
- return "dns"
-}
-
-type netResolver interface {
- LookupHost(ctx context.Context, host string) (addrs []string, err error)
- LookupSRV(ctx context.Context, service, proto, name string) (cname string, addrs []*net.SRV, err error)
- LookupTXT(ctx context.Context, name string) (txts []string, err error)
-}
-
-// ipResolver watches for the name resolution update for an IP address.
-type ipResolver struct {
- cc resolver.ClientConn
- ip []resolver.Address
- // rn channel is used by ResolveNow() to force an immediate resolution of the target.
- rn chan struct{}
- q chan struct{}
-}
-
-// ResolveNow resend the address it stores, no resolution is needed.
-func (i *ipResolver) ResolveNow(opt resolver.ResolveNowOption) {
- select {
- case i.rn <- struct{}{}:
- default:
- }
-}
-
-// Close closes the ipResolver.
-func (i *ipResolver) Close() {
- close(i.q)
-}
-
-func (i *ipResolver) watcher() {
- for {
- select {
- case <-i.rn:
- i.cc.NewAddress(i.ip)
- case <-i.q:
- return
- }
- }
-}
-
-// dnsResolver watches for the name resolution update for a non-IP target.
-type dnsResolver struct {
- freq time.Duration
- backoff backoff.Exponential
- retryCount int
- host string
- port string
- resolver netResolver
- ctx context.Context
- cancel context.CancelFunc
- cc resolver.ClientConn
- // rn channel is used by ResolveNow() to force an immediate resolution of the target.
- rn chan struct{}
- t *time.Timer
- // wg is used to enforce Close() to return after the watcher() goroutine has finished.
- // Otherwise, data race will be possible. [Race Example] in dns_resolver_test we
- // replace the real lookup functions with mocked ones to facilitate testing.
- // If Close() doesn't wait for watcher() goroutine finishes, race detector sometimes
- // will warns lookup (READ the lookup function pointers) inside watcher() goroutine
- // has data race with replaceNetFunc (WRITE the lookup function pointers).
- wg sync.WaitGroup
- disableServiceConfig bool
-}
-
-// ResolveNow invoke an immediate resolution of the target that this dnsResolver watches.
-func (d *dnsResolver) ResolveNow(opt resolver.ResolveNowOption) {
- select {
- case d.rn <- struct{}{}:
- default:
- }
-}
-
-// Close closes the dnsResolver.
-func (d *dnsResolver) Close() {
- d.cancel()
- d.wg.Wait()
- d.t.Stop()
-}
-
-func (d *dnsResolver) watcher() {
- defer d.wg.Done()
- for {
- select {
- case <-d.ctx.Done():
- return
- case <-d.t.C:
- case <-d.rn:
- if !d.t.Stop() {
- // Before resetting a timer, it should be stopped to prevent racing with
- // reads on it's channel.
- <-d.t.C
- }
- }
-
- result, sc := d.lookup()
- // Next lookup should happen within an interval defined by d.freq. It may be
- // more often due to exponential retry on empty address list.
- if len(result) == 0 {
- d.retryCount++
- d.t.Reset(d.backoff.Backoff(d.retryCount))
- } else {
- d.retryCount = 0
- d.t.Reset(d.freq)
- }
- d.cc.NewServiceConfig(sc)
- d.cc.NewAddress(result)
-
- // Sleep to prevent excessive re-resolutions. Incoming resolution requests
- // will be queued in d.rn.
- t := time.NewTimer(minDNSResRate)
- select {
- case <-t.C:
- case <-d.ctx.Done():
- t.Stop()
- return
- }
- }
-}
-
-func (d *dnsResolver) lookupSRV() []resolver.Address {
- var newAddrs []resolver.Address
- _, srvs, err := d.resolver.LookupSRV(d.ctx, "grpclb", "tcp", d.host)
- if err != nil {
- grpclog.Infof("grpc: failed dns SRV record lookup due to %v.\n", err)
- return nil
- }
- for _, s := range srvs {
- lbAddrs, err := d.resolver.LookupHost(d.ctx, s.Target)
- if err != nil {
- grpclog.Infof("grpc: failed load balancer address dns lookup due to %v.\n", err)
- continue
- }
- for _, a := range lbAddrs {
- a, ok := formatIP(a)
- if !ok {
- grpclog.Errorf("grpc: failed IP parsing due to %v.\n", err)
- continue
- }
- addr := a + ":" + strconv.Itoa(int(s.Port))
- newAddrs = append(newAddrs, resolver.Address{Addr: addr, Type: resolver.GRPCLB, ServerName: s.Target})
- }
- }
- return newAddrs
-}
-
-func (d *dnsResolver) lookupTXT() string {
- ss, err := d.resolver.LookupTXT(d.ctx, txtPrefix+d.host)
- if err != nil {
- grpclog.Infof("grpc: failed dns TXT record lookup due to %v.\n", err)
- return ""
- }
- var res string
- for _, s := range ss {
- res += s
- }
-
- // TXT record must have "grpc_config=" attribute in order to be used as service config.
- if !strings.HasPrefix(res, txtAttribute) {
- grpclog.Warningf("grpc: TXT record %v missing %v attribute", res, txtAttribute)
- return ""
- }
- return strings.TrimPrefix(res, txtAttribute)
-}
-
-func (d *dnsResolver) lookupHost() []resolver.Address {
- var newAddrs []resolver.Address
- addrs, err := d.resolver.LookupHost(d.ctx, d.host)
- if err != nil {
- grpclog.Warningf("grpc: failed dns A record lookup due to %v.\n", err)
- return nil
- }
- for _, a := range addrs {
- a, ok := formatIP(a)
- if !ok {
- grpclog.Errorf("grpc: failed IP parsing due to %v.\n", err)
- continue
- }
- addr := a + ":" + d.port
- newAddrs = append(newAddrs, resolver.Address{Addr: addr})
- }
- return newAddrs
-}
-
-func (d *dnsResolver) lookup() ([]resolver.Address, string) {
- newAddrs := d.lookupSRV()
- // Support fallback to non-balancer address.
- newAddrs = append(newAddrs, d.lookupHost()...)
- if d.disableServiceConfig {
- return newAddrs, ""
- }
- sc := d.lookupTXT()
- return newAddrs, canaryingSC(sc)
-}
-
-// formatIP returns ok = false if addr is not a valid textual representation of an IP address.
-// If addr is an IPv4 address, return the addr and ok = true.
-// If addr is an IPv6 address, return the addr enclosed in square brackets and ok = true.
-func formatIP(addr string) (addrIP string, ok bool) {
- ip := net.ParseIP(addr)
- if ip == nil {
- return "", false
- }
- if ip.To4() != nil {
- return addr, true
- }
- return "[" + addr + "]", true
-}
-
-// parseTarget takes the user input target string and default port, returns formatted host and port info.
-// If target doesn't specify a port, set the port to be the defaultPort.
-// If target is in IPv6 format and host-name is enclosed in square brackets, brackets
-// are stripped when setting the host.
-// examples:
-// target: "www.google.com" defaultPort: "443" returns host: "www.google.com", port: "443"
-// target: "ipv4-host:80" defaultPort: "443" returns host: "ipv4-host", port: "80"
-// target: "[ipv6-host]" defaultPort: "443" returns host: "ipv6-host", port: "443"
-// target: ":80" defaultPort: "443" returns host: "localhost", port: "80"
-func parseTarget(target, defaultPort string) (host, port string, err error) {
- if target == "" {
- return "", "", errMissingAddr
- }
- if ip := net.ParseIP(target); ip != nil {
- // target is an IPv4 or IPv6(without brackets) address
- return target, defaultPort, nil
- }
- if host, port, err = net.SplitHostPort(target); err == nil {
- if port == "" {
- // If the port field is empty (target ends with colon), e.g. "[::1]:", this is an error.
- return "", "", errEndsWithColon
- }
- // target has port, i.e ipv4-host:port, [ipv6-host]:port, host-name:port
- if host == "" {
- // Keep consistent with net.Dial(): If the host is empty, as in ":80", the local system is assumed.
- host = "localhost"
- }
- return host, port, nil
- }
- if host, port, err = net.SplitHostPort(target + ":" + defaultPort); err == nil {
- // target doesn't have port
- return host, port, nil
- }
- return "", "", fmt.Errorf("invalid target address %v, error info: %v", target, err)
-}
-
-type rawChoice struct {
- ClientLanguage *[]string `json:"clientLanguage,omitempty"`
- Percentage *int `json:"percentage,omitempty"`
- ClientHostName *[]string `json:"clientHostName,omitempty"`
- ServiceConfig *json.RawMessage `json:"serviceConfig,omitempty"`
-}
-
-func containsString(a *[]string, b string) bool {
- if a == nil {
- return true
- }
- for _, c := range *a {
- if c == b {
- return true
- }
- }
- return false
-}
-
-func chosenByPercentage(a *int) bool {
- if a == nil {
- return true
- }
- return grpcrand.Intn(100)+1 <= *a
-}
-
-func canaryingSC(js string) string {
- if js == "" {
- return ""
- }
- var rcs []rawChoice
- err := json.Unmarshal([]byte(js), &rcs)
- if err != nil {
- grpclog.Warningf("grpc: failed to parse service config json string due to %v.\n", err)
- return ""
- }
- cliHostname, err := os.Hostname()
- if err != nil {
- grpclog.Warningf("grpc: failed to get client hostname due to %v.\n", err)
- return ""
- }
- var sc string
- for _, c := range rcs {
- if !containsString(c.ClientLanguage, golang) ||
- !chosenByPercentage(c.Percentage) ||
- !containsString(c.ClientHostName, cliHostname) ||
- c.ServiceConfig == nil {
- continue
- }
- sc = string(*c.ServiceConfig)
- break
- }
- return sc
+ return dns.NewBuilder()
}
diff --git a/vendor/google.golang.org/grpc/resolver/passthrough/passthrough.go b/vendor/google.golang.org/grpc/resolver/passthrough/passthrough.go
index 893d5d1..c8a0c3d 100644
--- a/vendor/google.golang.org/grpc/resolver/passthrough/passthrough.go
+++ b/vendor/google.golang.org/grpc/resolver/passthrough/passthrough.go
@@ -18,40 +18,9 @@
// Package passthrough implements a pass-through resolver. It sends the target
// name without scheme back to gRPC as resolved address.
+//
+// Deprecated: this package is imported by grpc and should not need to be
+// imported directly by users.
package passthrough
-import "google.golang.org/grpc/resolver"
-
-const scheme = "passthrough"
-
-type passthroughBuilder struct{}
-
-func (*passthroughBuilder) Build(target resolver.Target, cc resolver.ClientConn, opts resolver.BuildOption) (resolver.Resolver, error) {
- r := &passthroughResolver{
- target: target,
- cc: cc,
- }
- r.start()
- return r, nil
-}
-
-func (*passthroughBuilder) Scheme() string {
- return scheme
-}
-
-type passthroughResolver struct {
- target resolver.Target
- cc resolver.ClientConn
-}
-
-func (r *passthroughResolver) start() {
- r.cc.UpdateState(resolver.State{Addresses: []resolver.Address{{Addr: r.target.Endpoint}}})
-}
-
-func (*passthroughResolver) ResolveNow(o resolver.ResolveNowOption) {}
-
-func (*passthroughResolver) Close() {}
-
-func init() {
- resolver.Register(&passthroughBuilder{})
-}
+import _ "google.golang.org/grpc/internal/resolver/passthrough" // import for side effects after package was moved
diff --git a/vendor/google.golang.org/grpc/resolver/resolver.go b/vendor/google.golang.org/grpc/resolver/resolver.go
index e83da34..4c5423b 100644
--- a/vendor/google.golang.org/grpc/resolver/resolver.go
+++ b/vendor/google.golang.org/grpc/resolver/resolver.go
@@ -21,6 +21,10 @@
package resolver
import (
+ "context"
+ "net"
+
+ "google.golang.org/grpc/credentials"
"google.golang.org/grpc/serviceconfig"
)
@@ -86,9 +90,16 @@
// Type is the type of this address.
Type AddressType
// ServerName is the name of this address.
+ // If non-empty, the ServerName is used as the transport certification authority for
+ // the address, instead of the hostname from the Dial target string. In most cases,
+ // this should not be set.
//
- // e.g. if Type is GRPCLB, ServerName should be the name of the remote load
+ // If Type is GRPCLB, ServerName should be the name of the remote load
// balancer, not the name of the backend.
+ //
+ // WARNING: ServerName must only be populated with trusted values. It
+ // is insecure to populate it with data from untrusted inputs since untrusted
+ // values could be used to bypass the authority checks performed by TLS.
ServerName string
// Metadata is the information associated with Addr, which may be used
// to make load balancing decision.
@@ -98,18 +109,38 @@
// BuildOption includes additional information for the builder to create
// the resolver.
type BuildOption struct {
- // DisableServiceConfig indicates whether resolver should fetch service config data.
+ // DisableServiceConfig indicates whether a resolver implementation should
+ // fetch service config data.
DisableServiceConfig bool
+ // DialCreds is the transport credentials used by the ClientConn for
+ // communicating with the target gRPC service (set via
+ // WithTransportCredentials). In cases where a name resolution service
+ // requires the same credentials, the resolver may use this field. In most
+ // cases though, it is not appropriate, and this field may be ignored.
+ DialCreds credentials.TransportCredentials
+ // CredsBundle is the credentials bundle used by the ClientConn for
+ // communicating with the target gRPC service (set via
+ // WithCredentialsBundle). In cases where a name resolution service
+ // requires the same credentials, the resolver may use this field. In most
+ // cases though, it is not appropriate, and this field may be ignored.
+ CredsBundle credentials.Bundle
+ // Dialer is the custom dialer used by the ClientConn for dialling the
+ // target gRPC service (set via WithDialer). In cases where a name
+ // resolution service requires the same dialer, the resolver may use this
+ // field. In most cases though, it is not appropriate, and this field may
+ // be ignored.
+ Dialer func(context.Context, string) (net.Conn, error)
}
// State contains the current Resolver state relevant to the ClientConn.
type State struct {
- Addresses []Address // Resolved addresses for the target
- // ServiceConfig is the parsed service config; obtained from
- // serviceconfig.Parse.
- ServiceConfig serviceconfig.Config
+ // Addresses is the latest set of resolved addresses for the target.
+ Addresses []Address
- // TODO: add Err error
+ // ServiceConfig contains the result from parsing the latest service
+ // config. If it is nil, it indicates no service config is present or the
+ // resolver does not provide service configs.
+ ServiceConfig *serviceconfig.ParseResult
}
// ClientConn contains the callbacks for resolver to notify any updates
@@ -122,6 +153,10 @@
type ClientConn interface {
// UpdateState updates the state of the ClientConn appropriately.
UpdateState(State)
+ // ReportError notifies the ClientConn that the Resolver encountered an
+ // error. The ClientConn will notify the load balancer and begin calling
+ // ResolveNow on the Resolver with exponential backoff.
+ ReportError(error)
// NewAddress is called by resolver to notify ClientConn a new list
// of resolved addresses.
// The address list should be the complete list of resolved addresses.
@@ -133,6 +168,9 @@
//
// Deprecated: Use UpdateState instead.
NewServiceConfig(serviceConfig string)
+ // ParseServiceConfig parses the provided service config and returns an
+ // object that provides the parsed config.
+ ParseServiceConfig(serviceConfigJSON string) *serviceconfig.ParseResult
}
// Target represents a target for gRPC, as specified in:
diff --git a/vendor/google.golang.org/grpc/resolver_conn_wrapper.go b/vendor/google.golang.org/grpc/resolver_conn_wrapper.go
index 6934905..7dcefcf 100644
--- a/vendor/google.golang.org/grpc/resolver_conn_wrapper.go
+++ b/vendor/google.golang.org/grpc/resolver_conn_wrapper.go
@@ -21,22 +21,29 @@
import (
"fmt"
"strings"
- "sync/atomic"
+ "sync"
+ "time"
+ "google.golang.org/grpc/balancer"
+ "google.golang.org/grpc/credentials"
"google.golang.org/grpc/grpclog"
"google.golang.org/grpc/internal/channelz"
+ "google.golang.org/grpc/internal/grpcsync"
"google.golang.org/grpc/resolver"
+ "google.golang.org/grpc/serviceconfig"
)
// ccResolverWrapper is a wrapper on top of cc for resolvers.
// It implements resolver.ClientConnection interface.
type ccResolverWrapper struct {
- cc *ClientConn
- resolver resolver.Resolver
- addrCh chan []resolver.Address
- scCh chan string
- done uint32 // accessed atomically; set to 1 when closed.
- curState resolver.State
+ cc *ClientConn
+ resolverMu sync.Mutex
+ resolver resolver.Resolver
+ done *grpcsync.Event
+ curState resolver.State
+
+ pollingMu sync.Mutex
+ polling chan struct{}
}
// split2 returns the values from strings.SplitN(s, sep, 2).
@@ -67,12 +74,9 @@
return ret
}
-// newCCResolverWrapper parses cc.target for scheme and gets the resolver
-// builder for this scheme and builds the resolver. The monitoring goroutine
-// for it is not started yet and can be created by calling start().
-//
-// If withResolverBuilder dial option is set, the specified resolver will be
-// used instead.
+// newCCResolverWrapper uses the resolver.Builder stored in the ClientConn to
+// build a Resolver and returns a ccResolverWrapper object which wraps the
+// newly built resolver.
func newCCResolverWrapper(cc *ClientConn) (*ccResolverWrapper, error) {
rb := cc.dopts.resolverBuilder
if rb == nil {
@@ -80,47 +84,122 @@
}
ccr := &ccResolverWrapper{
- cc: cc,
- addrCh: make(chan []resolver.Address, 1),
- scCh: make(chan string, 1),
+ cc: cc,
+ done: grpcsync.NewEvent(),
+ }
+
+ var credsClone credentials.TransportCredentials
+ if creds := cc.dopts.copts.TransportCredentials; creds != nil {
+ credsClone = creds.Clone()
+ }
+ rbo := resolver.BuildOption{
+ DisableServiceConfig: cc.dopts.disableServiceConfig,
+ DialCreds: credsClone,
+ CredsBundle: cc.dopts.copts.CredsBundle,
+ Dialer: cc.dopts.copts.Dialer,
}
var err error
- ccr.resolver, err = rb.Build(cc.parsedTarget, ccr, resolver.BuildOption{DisableServiceConfig: cc.dopts.disableServiceConfig})
+ // We need to hold the lock here while we assign to the ccr.resolver field
+ // to guard against a data race caused by the following code path,
+ // rb.Build-->ccr.ReportError-->ccr.poll-->ccr.resolveNow, would end up
+ // accessing ccr.resolver which is being assigned here.
+ ccr.resolverMu.Lock()
+ ccr.resolver, err = rb.Build(cc.parsedTarget, ccr, rbo)
if err != nil {
return nil, err
}
+ ccr.resolverMu.Unlock()
return ccr, nil
}
func (ccr *ccResolverWrapper) resolveNow(o resolver.ResolveNowOption) {
- ccr.resolver.ResolveNow(o)
+ ccr.resolverMu.Lock()
+ if !ccr.done.HasFired() {
+ ccr.resolver.ResolveNow(o)
+ }
+ ccr.resolverMu.Unlock()
}
func (ccr *ccResolverWrapper) close() {
+ ccr.resolverMu.Lock()
ccr.resolver.Close()
- atomic.StoreUint32(&ccr.done, 1)
+ ccr.done.Fire()
+ ccr.resolverMu.Unlock()
}
-func (ccr *ccResolverWrapper) isDone() bool {
- return atomic.LoadUint32(&ccr.done) == 1
+// poll begins or ends asynchronous polling of the resolver based on whether
+// err is ErrBadResolverState.
+func (ccr *ccResolverWrapper) poll(err error) {
+ ccr.pollingMu.Lock()
+ defer ccr.pollingMu.Unlock()
+ if err != balancer.ErrBadResolverState {
+ // stop polling
+ if ccr.polling != nil {
+ close(ccr.polling)
+ ccr.polling = nil
+ }
+ return
+ }
+ if ccr.polling != nil {
+ // already polling
+ return
+ }
+ p := make(chan struct{})
+ ccr.polling = p
+ go func() {
+ for i := 0; ; i++ {
+ ccr.resolveNow(resolver.ResolveNowOption{})
+ t := time.NewTimer(ccr.cc.dopts.resolveNowBackoff(i))
+ select {
+ case <-p:
+ t.Stop()
+ return
+ case <-ccr.done.Done():
+ // Resolver has been closed.
+ t.Stop()
+ return
+ case <-t.C:
+ select {
+ case <-p:
+ return
+ default:
+ }
+ // Timer expired; re-resolve.
+ }
+ }
+ }()
}
func (ccr *ccResolverWrapper) UpdateState(s resolver.State) {
- if ccr.isDone() {
+ if ccr.done.HasFired() {
return
}
grpclog.Infof("ccResolverWrapper: sending update to cc: %v", s)
if channelz.IsOn() {
ccr.addChannelzTraceEvent(s)
}
- ccr.cc.updateResolverState(s)
ccr.curState = s
+ ccr.poll(ccr.cc.updateResolverState(ccr.curState, nil))
+}
+
+func (ccr *ccResolverWrapper) ReportError(err error) {
+ if ccr.done.HasFired() {
+ return
+ }
+ grpclog.Warningf("ccResolverWrapper: reporting error to cc: %v", err)
+ if channelz.IsOn() {
+ channelz.AddTraceEvent(ccr.cc.channelzID, &channelz.TraceEventDesc{
+ Desc: fmt.Sprintf("Resolver reported error: %v", err),
+ Severity: channelz.CtWarning,
+ })
+ }
+ ccr.poll(ccr.cc.updateResolverState(resolver.State{}, err))
}
// NewAddress is called by the resolver implementation to send addresses to gRPC.
func (ccr *ccResolverWrapper) NewAddress(addrs []resolver.Address) {
- if ccr.isDone() {
+ if ccr.done.HasFired() {
return
}
grpclog.Infof("ccResolverWrapper: sending new addresses to cc: %v", addrs)
@@ -128,31 +207,49 @@
ccr.addChannelzTraceEvent(resolver.State{Addresses: addrs, ServiceConfig: ccr.curState.ServiceConfig})
}
ccr.curState.Addresses = addrs
- ccr.cc.updateResolverState(ccr.curState)
+ ccr.poll(ccr.cc.updateResolverState(ccr.curState, nil))
}
// NewServiceConfig is called by the resolver implementation to send service
// configs to gRPC.
func (ccr *ccResolverWrapper) NewServiceConfig(sc string) {
- if ccr.isDone() {
+ if ccr.done.HasFired() {
return
}
grpclog.Infof("ccResolverWrapper: got new service config: %v", sc)
- c, err := parseServiceConfig(sc)
- if err != nil {
+ scpr := parseServiceConfig(sc)
+ if scpr.Err != nil {
+ grpclog.Warningf("ccResolverWrapper: error parsing service config: %v", scpr.Err)
+ if channelz.IsOn() {
+ channelz.AddTraceEvent(ccr.cc.channelzID, &channelz.TraceEventDesc{
+ Desc: fmt.Sprintf("Error parsing service config: %v", scpr.Err),
+ Severity: channelz.CtWarning,
+ })
+ }
+ ccr.poll(balancer.ErrBadResolverState)
return
}
if channelz.IsOn() {
- ccr.addChannelzTraceEvent(resolver.State{Addresses: ccr.curState.Addresses, ServiceConfig: c})
+ ccr.addChannelzTraceEvent(resolver.State{Addresses: ccr.curState.Addresses, ServiceConfig: scpr})
}
- ccr.curState.ServiceConfig = c
- ccr.cc.updateResolverState(ccr.curState)
+ ccr.curState.ServiceConfig = scpr
+ ccr.poll(ccr.cc.updateResolverState(ccr.curState, nil))
+}
+
+func (ccr *ccResolverWrapper) ParseServiceConfig(scJSON string) *serviceconfig.ParseResult {
+ return parseServiceConfig(scJSON)
}
func (ccr *ccResolverWrapper) addChannelzTraceEvent(s resolver.State) {
var updates []string
- oldSC, oldOK := ccr.curState.ServiceConfig.(*ServiceConfig)
- newSC, newOK := s.ServiceConfig.(*ServiceConfig)
+ var oldSC, newSC *ServiceConfig
+ var oldOK, newOK bool
+ if ccr.curState.ServiceConfig != nil {
+ oldSC, oldOK = ccr.curState.ServiceConfig.Config.(*ServiceConfig)
+ }
+ if s.ServiceConfig != nil {
+ newSC, newOK = s.ServiceConfig.Config.(*ServiceConfig)
+ }
if oldOK != newOK || (oldOK && newOK && oldSC.rawJSONString != newSC.rawJSONString) {
updates = append(updates, "service config updated")
}
diff --git a/vendor/google.golang.org/grpc/rpc_util.go b/vendor/google.golang.org/grpc/rpc_util.go
index 088c3f1..edaba79 100644
--- a/vendor/google.golang.org/grpc/rpc_util.go
+++ b/vendor/google.golang.org/grpc/rpc_util.go
@@ -648,35 +648,58 @@
return nil, st.Err()
}
+ var size int
if pf == compressionMade {
// To match legacy behavior, if the decompressor is set by WithDecompressor or RPCDecompressor,
// use this decompressor as the default.
if dc != nil {
d, err = dc.Do(bytes.NewReader(d))
- if err != nil {
- return nil, status.Errorf(codes.Internal, "grpc: failed to decompress the received message %v", err)
- }
+ size = len(d)
} else {
- dcReader, err := compressor.Decompress(bytes.NewReader(d))
- if err != nil {
- return nil, status.Errorf(codes.Internal, "grpc: failed to decompress the received message %v", err)
- }
- // Read from LimitReader with limit max+1. So if the underlying
- // reader is over limit, the result will be bigger than max.
- d, err = ioutil.ReadAll(io.LimitReader(dcReader, int64(maxReceiveMessageSize)+1))
- if err != nil {
- return nil, status.Errorf(codes.Internal, "grpc: failed to decompress the received message %v", err)
- }
+ d, size, err = decompress(compressor, d, maxReceiveMessageSize)
}
+ if err != nil {
+ return nil, status.Errorf(codes.Internal, "grpc: failed to decompress the received message %v", err)
+ }
+ } else {
+ size = len(d)
}
- if len(d) > maxReceiveMessageSize {
+ if size > maxReceiveMessageSize {
// TODO: Revisit the error code. Currently keep it consistent with java
// implementation.
- return nil, status.Errorf(codes.ResourceExhausted, "grpc: received message larger than max (%d vs. %d)", len(d), maxReceiveMessageSize)
+ return nil, status.Errorf(codes.ResourceExhausted, "grpc: received message larger than max (%d vs. %d)", size, maxReceiveMessageSize)
}
return d, nil
}
+// Using compressor, decompress d, returning data and size.
+// Optionally, if data will be over maxReceiveMessageSize, just return the size.
+func decompress(compressor encoding.Compressor, d []byte, maxReceiveMessageSize int) ([]byte, int, error) {
+ dcReader, err := compressor.Decompress(bytes.NewReader(d))
+ if err != nil {
+ return nil, 0, err
+ }
+ if sizer, ok := compressor.(interface {
+ DecompressedSize(compressedBytes []byte) int
+ }); ok {
+ if size := sizer.DecompressedSize(d); size >= 0 {
+ if size > maxReceiveMessageSize {
+ return nil, size, nil
+ }
+ // size is used as an estimate to size the buffer, but we
+ // will read more data if available.
+ // +MinRead so ReadFrom will not reallocate if size is correct.
+ buf := bytes.NewBuffer(make([]byte, 0, size+bytes.MinRead))
+ bytesRead, err := buf.ReadFrom(io.LimitReader(dcReader, int64(maxReceiveMessageSize)+1))
+ return buf.Bytes(), int(bytesRead), err
+ }
+ }
+ // Read from LimitReader with limit max+1. So if the underlying
+ // reader is over limit, the result will be bigger than max.
+ d, err = ioutil.ReadAll(io.LimitReader(dcReader, int64(maxReceiveMessageSize)+1))
+ return d, len(d), err
+}
+
// For the two compressor parameters, both should not be set, but if they are,
// dc takes precedence over compressor.
// TODO(dfawley): wrap the old compressor/decompressor using the new API?
diff --git a/vendor/google.golang.org/grpc/server.go b/vendor/google.golang.org/grpc/server.go
index f064b73..e54083d 100644
--- a/vendor/google.golang.org/grpc/server.go
+++ b/vendor/google.golang.org/grpc/server.go
@@ -130,6 +130,7 @@
readBufferSize int
connectionTimeout time.Duration
maxHeaderListSize *uint32
+ headerTableSize *uint32
}
var defaultServerOptions = serverOptions{
@@ -377,6 +378,16 @@
})
}
+// HeaderTableSize returns a ServerOption that sets the size of dynamic
+// header table for stream.
+//
+// This API is EXPERIMENTAL.
+func HeaderTableSize(s uint32) ServerOption {
+ return newFuncServerOption(func(o *serverOptions) {
+ o.headerTableSize = &s
+ })
+}
+
// NewServer creates a gRPC server which has no service registered and has not
// started to accept requests yet.
func NewServer(opt ...ServerOption) *Server {
@@ -686,6 +697,7 @@
ReadBufferSize: s.opts.readBufferSize,
ChannelzParentID: s.channelzID,
MaxHeaderListSize: s.opts.maxHeaderListSize,
+ HeaderTableSize: s.opts.headerTableSize,
}
st, err := transport.NewServerTransport("http2", c, config)
if err != nil {
diff --git a/vendor/google.golang.org/grpc/service_config.go b/vendor/google.golang.org/grpc/service_config.go
index 686ad7b..4f8836d 100644
--- a/vendor/google.golang.org/grpc/service_config.go
+++ b/vendor/google.golang.org/grpc/service_config.go
@@ -261,20 +261,17 @@
}
func init() {
- internal.ParseServiceConfig = func(sc string) (interface{}, error) {
- return parseServiceConfig(sc)
- }
+ internal.ParseServiceConfigForTesting = parseServiceConfig
}
-
-func parseServiceConfig(js string) (*ServiceConfig, error) {
+func parseServiceConfig(js string) *serviceconfig.ParseResult {
if len(js) == 0 {
- return nil, fmt.Errorf("no JSON service config provided")
+ return &serviceconfig.ParseResult{Err: fmt.Errorf("no JSON service config provided")}
}
var rsc jsonSC
err := json.Unmarshal([]byte(js), &rsc)
if err != nil {
grpclog.Warningf("grpc: parseServiceConfig error unmarshaling %s due to %v", js, err)
- return nil, err
+ return &serviceconfig.ParseResult{Err: err}
}
sc := ServiceConfig{
LB: rsc.LoadBalancingPolicy,
@@ -288,7 +285,7 @@
if len(lbcfg) != 1 {
err := fmt.Errorf("invalid loadBalancingConfig: entry %v does not contain exactly 1 policy/config pair: %q", i, lbcfg)
grpclog.Warningf(err.Error())
- return nil, err
+ return &serviceconfig.ParseResult{Err: err}
}
var name string
var jsonCfg json.RawMessage
@@ -303,7 +300,7 @@
var err error
sc.lbConfig.cfg, err = parser.ParseConfig(jsonCfg)
if err != nil {
- return nil, fmt.Errorf("error parsing loadBalancingConfig for policy %q: %v", name, err)
+ return &serviceconfig.ParseResult{Err: fmt.Errorf("error parsing loadBalancingConfig for policy %q: %v", name, err)}
}
} else if string(jsonCfg) != "{}" {
grpclog.Warningf("non-empty balancer configuration %q, but balancer does not implement ParseConfig", string(jsonCfg))
@@ -316,12 +313,12 @@
// case.
err := fmt.Errorf("invalid loadBalancingConfig: no supported policies found")
grpclog.Warningf(err.Error())
- return nil, err
+ return &serviceconfig.ParseResult{Err: err}
}
}
if rsc.MethodConfig == nil {
- return &sc, nil
+ return &serviceconfig.ParseResult{Config: &sc}
}
for _, m := range *rsc.MethodConfig {
if m.Name == nil {
@@ -330,7 +327,7 @@
d, err := parseDuration(m.Timeout)
if err != nil {
grpclog.Warningf("grpc: parseServiceConfig error unmarshaling %s due to %v", js, err)
- return nil, err
+ return &serviceconfig.ParseResult{Err: err}
}
mc := MethodConfig{
@@ -339,7 +336,7 @@
}
if mc.retryPolicy, err = convertRetryPolicy(m.RetryPolicy); err != nil {
grpclog.Warningf("grpc: parseServiceConfig error unmarshaling %s due to %v", js, err)
- return nil, err
+ return &serviceconfig.ParseResult{Err: err}
}
if m.MaxRequestMessageBytes != nil {
if *m.MaxRequestMessageBytes > int64(maxInt) {
@@ -364,13 +361,13 @@
if sc.retryThrottling != nil {
if mt := sc.retryThrottling.MaxTokens; mt <= 0 || mt > 1000 {
- return nil, fmt.Errorf("invalid retry throttling config: maxTokens (%v) out of range (0, 1000]", mt)
+ return &serviceconfig.ParseResult{Err: fmt.Errorf("invalid retry throttling config: maxTokens (%v) out of range (0, 1000]", mt)}
}
if tr := sc.retryThrottling.TokenRatio; tr <= 0 {
- return nil, fmt.Errorf("invalid retry throttling config: tokenRatio (%v) may not be negative", tr)
+ return &serviceconfig.ParseResult{Err: fmt.Errorf("invalid retry throttling config: tokenRatio (%v) may not be negative", tr)}
}
}
- return &sc, nil
+ return &serviceconfig.ParseResult{Config: &sc}
}
func convertRetryPolicy(jrp *jsonRetryPolicy) (p *retryPolicy, err error) {
diff --git a/vendor/google.golang.org/grpc/serviceconfig/serviceconfig.go b/vendor/google.golang.org/grpc/serviceconfig/serviceconfig.go
index 53b2787..187c304 100644
--- a/vendor/google.golang.org/grpc/serviceconfig/serviceconfig.go
+++ b/vendor/google.golang.org/grpc/serviceconfig/serviceconfig.go
@@ -22,27 +22,20 @@
// This package is EXPERIMENTAL.
package serviceconfig
-import (
- "google.golang.org/grpc/internal"
-)
-
// Config represents an opaque data structure holding a service config.
type Config interface {
- isConfig()
+ isServiceConfig()
}
// LoadBalancingConfig represents an opaque data structure holding a load
-// balancer config.
+// balancing config.
type LoadBalancingConfig interface {
isLoadBalancingConfig()
}
-// Parse parses the JSON service config provided into an internal form or
-// returns an error if the config is invalid.
-func Parse(ServiceConfigJSON string) (Config, error) {
- c, err := internal.ParseServiceConfig(ServiceConfigJSON)
- if err != nil {
- return nil, err
- }
- return c.(Config), err
+// ParseResult contains a service config or an error. Exactly one must be
+// non-nil.
+type ParseResult struct {
+ Config Config
+ Err error
}
diff --git a/vendor/google.golang.org/grpc/stream.go b/vendor/google.golang.org/grpc/stream.go
index 134a624..bb99940 100644
--- a/vendor/google.golang.org/grpc/stream.go
+++ b/vendor/google.golang.org/grpc/stream.go
@@ -488,7 +488,7 @@
pushback := 0
hasPushback := false
if cs.attempt.s != nil {
- if to, toErr := cs.attempt.s.TrailersOnly(); toErr != nil || !to {
+ if !cs.attempt.s.TrailersOnly() {
return err
}
diff --git a/vendor/google.golang.org/grpc/version.go b/vendor/google.golang.org/grpc/version.go
index 483ef89..40af096 100644
--- a/vendor/google.golang.org/grpc/version.go
+++ b/vendor/google.golang.org/grpc/version.go
@@ -19,4 +19,4 @@
package grpc
// Version is the current grpc version.
-const Version = "1.24.0"
+const Version = "1.25.1"
diff --git a/vendor/google.golang.org/grpc/vet.sh b/vendor/google.golang.org/grpc/vet.sh
index 2d79b1c..f324be5 100644
--- a/vendor/google.golang.org/grpc/vet.sh
+++ b/vendor/google.golang.org/grpc/vet.sh
@@ -31,12 +31,15 @@
if [[ "$1" = "-install" ]]; then
# Check for module support
if go help mod >& /dev/null; then
+ # Install the pinned versions as defined in module tools.
+ pushd ./test/tools
go install \
golang.org/x/lint/golint \
golang.org/x/tools/cmd/goimports \
honnef.co/go/tools/cmd/staticcheck \
github.com/client9/misspell/cmd/misspell \
github.com/golang/protobuf/protoc-gen-go
+ popd
else
# Ye olde `go get` incantation.
# Note: this gets the latest version of all tools (vs. the pinned versions
@@ -73,6 +76,9 @@
(! grep 'func Test[^(]' *_test.go)
(! grep 'func Test[^(]' test/*.go)
+# - Do not import x/net/context.
+(! git grep -l 'x/net/context' -- "*.go")
+
# - Do not import math/rand for real library code. Use internal/grpcrand for
# thread safety.
git grep -l '"math/rand"' -- "*.go" 2>&1 | (! grep -v '^examples\|^stress\|grpcrand\|wrr_test')
@@ -109,6 +115,7 @@
staticcheck -go 1.9 -checks 'inherit,-ST1015' -ignore '
google.golang.org/grpc/balancer.go:SA1019
google.golang.org/grpc/balancer/grpclb/grpclb_remote_balancer.go:SA1019
+google.golang.org/grpc/balancer/grpclb/grpclb_test.go:SA1019
google.golang.org/grpc/balancer/roundrobin/roundrobin_test.go:SA1019
google.golang.org/grpc/xds/internal/balancer/edsbalancer/balancergroup.go:SA1019
google.golang.org/grpc/xds/internal/resolver/xds_resolver.go:SA1019
@@ -125,7 +132,7 @@
google.golang.org/grpc/examples/features/load_balancing/client/main.go:SA1019
google.golang.org/grpc/internal/transport/handler_server.go:SA1019
google.golang.org/grpc/internal/transport/handler_server_test.go:SA1019
-google.golang.org/grpc/resolver/dns/dns_resolver.go:SA1019
+google.golang.org/grpc/internal/resolver/dns/dns_resolver.go:SA1019
google.golang.org/grpc/stats/stats_test.go:SA1019
google.golang.org/grpc/test/balancer_test.go:SA1019
google.golang.org/grpc/test/channelz_test.go:SA1019
diff --git a/vendor/modules.txt b/vendor/modules.txt
index 1ce4e81..1bd48eb 100644
--- a/vendor/modules.txt
+++ b/vendor/modules.txt
@@ -22,7 +22,7 @@
github.com/eapache/go-xerial-snappy
# github.com/eapache/queue v1.1.0
github.com/eapache/queue
-# github.com/gogo/protobuf v1.3.0
+# github.com/gogo/protobuf v1.3.1
github.com/gogo/protobuf/proto
github.com/gogo/protobuf/gogoproto
github.com/gogo/protobuf/protoc-gen-gogo/descriptor
@@ -59,7 +59,7 @@
github.com/mitchellh/go-homedir
# github.com/mitchellh/mapstructure v1.1.2
github.com/mitchellh/mapstructure
-# github.com/opencord/voltha-lib-go/v2 v2.2.17
+# github.com/opencord/voltha-lib-go/v2 v2.2.18
github.com/opencord/voltha-lib-go/v2/pkg/adapters
github.com/opencord/voltha-lib-go/v2/pkg/adapters/adapterif
github.com/opencord/voltha-lib-go/v2/pkg/adapters/common
@@ -72,7 +72,7 @@
github.com/opencord/voltha-lib-go/v2/pkg/techprofile
github.com/opencord/voltha-lib-go/v2/pkg/db
github.com/opencord/voltha-lib-go/v2/pkg/ponresourcemanager
-# github.com/opencord/voltha-protos/v2 v2.0.1
+# github.com/opencord/voltha-protos/v2 v2.1.0
github.com/opencord/voltha-protos/v2/go/inter_container
github.com/opencord/voltha-protos/v2/go/voltha
github.com/opencord/voltha-protos/v2/go/common
@@ -140,12 +140,14 @@
# google.golang.org/genproto v0.0.0-20190927181202-20e1ac93f88c
google.golang.org/genproto/googleapis/api/annotations
google.golang.org/genproto/googleapis/rpc/status
-# google.golang.org/grpc v1.24.0
+# google.golang.org/grpc v1.25.1
google.golang.org/grpc
google.golang.org/grpc/codes
google.golang.org/grpc/status
google.golang.org/grpc/metadata
+google.golang.org/grpc/backoff
google.golang.org/grpc/balancer
+google.golang.org/grpc/balancer/base
google.golang.org/grpc/balancer/roundrobin
google.golang.org/grpc/connectivity
google.golang.org/grpc/credentials
@@ -156,24 +158,26 @@
google.golang.org/grpc/internal/backoff
google.golang.org/grpc/internal/balancerload
google.golang.org/grpc/internal/binarylog
+google.golang.org/grpc/internal/buffer
google.golang.org/grpc/internal/channelz
google.golang.org/grpc/internal/envconfig
google.golang.org/grpc/internal/grpcrand
google.golang.org/grpc/internal/grpcsync
+google.golang.org/grpc/internal/resolver/dns
+google.golang.org/grpc/internal/resolver/passthrough
google.golang.org/grpc/internal/transport
google.golang.org/grpc/keepalive
google.golang.org/grpc/naming
google.golang.org/grpc/peer
google.golang.org/grpc/resolver
-google.golang.org/grpc/resolver/dns
-google.golang.org/grpc/resolver/passthrough
google.golang.org/grpc/serviceconfig
google.golang.org/grpc/stats
google.golang.org/grpc/tap
-google.golang.org/grpc/balancer/base
google.golang.org/grpc/credentials/internal
google.golang.org/grpc/binarylog/grpc_binarylog_v1
google.golang.org/grpc/internal/syscall
+google.golang.org/grpc/resolver/dns
+google.golang.org/grpc/resolver/passthrough
# gopkg.in/jcmturner/aescts.v1 v1.0.1
gopkg.in/jcmturner/aescts.v1
# gopkg.in/jcmturner/dnsutils.v1 v1.0.1