mirror of
https://github.com/etcd-io/etcd.git
synced 2024-09-27 06:25:44 +00:00
vendor: upgrade grpc/grpc-go to v1.7.4
Signed-off-by: Gyuho Lee <gyuhox@gmail.com>
This commit is contained in:
parent
78fb932156
commit
ff1f08c93f
2
cmd/vendor/google.golang.org/grpc/rpc_util.go
generated
vendored
2
cmd/vendor/google.golang.org/grpc/rpc_util.go
generated
vendored
@ -567,6 +567,6 @@ const SupportPackageIsVersion3 = true
|
||||
const SupportPackageIsVersion4 = true
|
||||
|
||||
// Version is the current grpc version.
|
||||
const Version = "1.7.3"
|
||||
const Version = "1.7.4"
|
||||
|
||||
const grpcUA = "grpc-go/" + Version
|
||||
|
23
cmd/vendor/google.golang.org/grpc/transport/handler_server.go
generated
vendored
23
cmd/vendor/google.golang.org/grpc/transport/handler_server.go
generated
vendored
@ -123,10 +123,9 @@ type serverHandlerTransport struct {
|
||||
// when WriteStatus is called.
|
||||
writes chan func()
|
||||
|
||||
mu sync.Mutex
|
||||
// streamDone indicates whether WriteStatus has been called and writes channel
|
||||
// has been closed.
|
||||
streamDone bool
|
||||
// block concurrent WriteStatus calls
|
||||
// e.g. grpc/(*serverStream).SendMsg/RecvMsg
|
||||
writeStatusMu sync.Mutex
|
||||
}
|
||||
|
||||
func (ht *serverHandlerTransport) Close() error {
|
||||
@ -177,13 +176,9 @@ func (ht *serverHandlerTransport) do(fn func()) error {
|
||||
}
|
||||
|
||||
func (ht *serverHandlerTransport) WriteStatus(s *Stream, st *status.Status) error {
|
||||
ht.mu.Lock()
|
||||
if ht.streamDone {
|
||||
ht.mu.Unlock()
|
||||
return nil
|
||||
}
|
||||
ht.streamDone = true
|
||||
ht.mu.Unlock()
|
||||
ht.writeStatusMu.Lock()
|
||||
defer ht.writeStatusMu.Unlock()
|
||||
|
||||
err := ht.do(func() {
|
||||
ht.writeCommonHeaders(s)
|
||||
|
||||
@ -222,7 +217,11 @@ func (ht *serverHandlerTransport) WriteStatus(s *Stream, st *status.Status) erro
|
||||
}
|
||||
}
|
||||
})
|
||||
close(ht.writes)
|
||||
|
||||
if err == nil { // transport has not been closed
|
||||
ht.Close()
|
||||
close(ht.writes)
|
||||
}
|
||||
return err
|
||||
}
|
||||
|
||||
|
6
glide.lock
generated
6
glide.lock
generated
@ -1,5 +1,5 @@
|
||||
hash: 49834a8aac35bf7f5978c26cd6ea8c2d929369d6da2a3afbf1606a00e8d4a5e6
|
||||
updated: 2017-11-16T12:43:55.076614824-08:00
|
||||
hash: 94008ff434d6e211d8dbd412d81f123c5f43bb41b5267a50612ff34b8879b796
|
||||
updated: 2017-12-04T14:22:51.678346-08:00
|
||||
imports:
|
||||
- name: github.com/beorn7/perks
|
||||
version: 4c0e84591b9aa9e6dcfdf3e020114cd81f89d5f9
|
||||
@ -149,7 +149,7 @@ imports:
|
||||
- googleapis/api/annotations
|
||||
- googleapis/rpc/status
|
||||
- name: google.golang.org/grpc
|
||||
version: 401e0e00e4bb830a10496d64cd95e068c5bf50de
|
||||
version: 9a2334748bab9638f1480ad4f0ac6ac0c6c3a486
|
||||
subpackages:
|
||||
- balancer
|
||||
- codes
|
||||
|
@ -97,7 +97,7 @@ import:
|
||||
subpackages:
|
||||
- rate
|
||||
- package: google.golang.org/grpc
|
||||
version: v1.7.3
|
||||
version: v1.7.4
|
||||
subpackages:
|
||||
- codes
|
||||
- credentials
|
||||
|
Loading…
x
Reference in New Issue
Block a user