vitalif
/
etcd
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #9760 from gyuho/stream 

etcdserver/api/v3rpc: add "etcd_network_server_stream_failures_total"
release-3.4
Gyuho Lee 2018-05-23 10:36:05 -07:00 committed by GitHub
parent 539e2f2ff8 a5b32ba941
commit bf45d6a76e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 16 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
etcdserver/api/v3rpc/lease.go
View File

@ -122,6 +122,7 @@ func (ls *LeaseServer) leaseKeepAlive(stream pb.Lease_LeaseKeepAliveServer) erro
} else {
plog.Warningf("failed to receive lease keepalive request from gRPC stream (%q)", err.Error())
}
streamFailures.WithLabelValues("receive", "lease-keepalive").Inc()
}
return err
}
@ -160,6 +161,7 @@ func (ls *LeaseServer) leaseKeepAlive(stream pb.Lease_LeaseKeepAliveServer) erro
} else {
plog.Warningf("failed to send lease keepalive response to gRPC stream (%q)", err.Error())
}
streamFailures.WithLabelValues("send", "lease-keepalive").Inc()
}
return err
}

10
etcdserver/api/v3rpc/metrics.go
View File

@ -30,9 +30,19 @@ var (
Name: "client_grpc_received_bytes_total",
Help: "The total number of bytes received from grpc clients.",
})
streamFailures = prometheus.NewCounterVec(prometheus.CounterOpts{
Namespace: "etcd",
Subsystem: "network",
Name: "server_stream_failures_total",
Help: "The total number of stream failures from the local server.",
},
[]string{"Type", "API"},
)
)
func init() {
prometheus.MustRegister(sentBytes)
prometheus.MustRegister(receivedBytes)
prometheus.MustRegister(streamFailures)
}

4
etcdserver/api/v3rpc/watch.go
View File

@ -183,6 +183,7 @@ func (ws *watchServer) Watch(stream pb.Watch_WatchServer) (err error) {
} else {
plog.Warningf("failed to receive watch request from gRPC stream (%q)", rerr.Error())
}
streamFailures.WithLabelValues("receive", "watch").Inc()
}
errc <- rerr
}
@ -416,6 +417,7 @@ func (sws *serverWatchStream) sendLoop() {
} else {
plog.Warningf("failed to send watch response to gRPC stream (%q)", serr.Error())
}
streamFailures.WithLabelValues("send", "watch").Inc()
}
return
}
@ -445,6 +447,7 @@ func (sws *serverWatchStream) sendLoop() {
} else {
plog.Warningf("failed to send watch control response to gRPC stream (%q)", err.Error())
}
streamFailures.WithLabelValues("send", "watch").Inc()
}
return
}
@ -473,6 +476,7 @@ func (sws *serverWatchStream) sendLoop() {
} else {
plog.Warningf("failed to send pending watch response to gRPC stream (%q)", err.Error())
}
streamFailures.WithLabelValues("send", "watch").Inc()
}
return
}