Mirroristas/etcd
2
0
Fork 0
mirror of https://github.com/etcd-io/etcd.git synced 2024-09-27 06:25:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

etcdserver: Fix txn request 'took too long' warnings to use loggable request stringer

Browse Source
This commit is contained in:
Joe Betz 2018-06-11 16:58:48 -07:00
parent 59aec1fa31
commit a6fad51603
No known key found for this signature in database
GPG Key ID: 4930C680B6E0DDB8
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
etcdserver/etcdserverpb/raft_internal_stringer.go
View File

@ -64,7 +64,7 @@ func (as *InternalRaftStringer) String() string {
case as.Request.Txn != nil: case as.Request.Txn != nil:
return fmt.Sprintf("header:<%s> txn:<%s>", return fmt.Sprintf("header:<%s> txn:<%s>",
as.Request.Header.String(), as.Request.Header.String(),
newLoggableTxnRequest(as.Request.Txn).String(), NewLoggableTxnRequest(as.Request.Txn).String(),
) )
default: default:
// nothing to redact // nothing to redact
@ -78,7 +78,7 @@ type txnRequestStringer struct {
Request *TxnRequest Request *TxnRequest
} }
func newLoggableTxnRequest(request *TxnRequest) *txnRequestStringer { func NewLoggableTxnRequest(request *TxnRequest) *txnRequestStringer {
return &txnRequestStringer{request} return &txnRequestStringer{request}
} }
@ -123,7 +123,7 @@ func (as *requestOpStringer) String() string {
case *RequestOp_RequestPut: case *RequestOp_RequestPut:
return fmt.Sprintf("request_put:<%s>", newLoggablePutRequest(op.RequestPut).String()) return fmt.Sprintf("request_put:<%s>", newLoggablePutRequest(op.RequestPut).String())
case *RequestOp_RequestTxn: case *RequestOp_RequestTxn:
return fmt.Sprintf("request_txn:<%s>", newLoggableTxnRequest(op.RequestTxn).String()) return fmt.Sprintf("request_txn:<%s>", NewLoggableTxnRequest(op.RequestTxn).String())
default: default:
// nothing to redact // nothing to redact
} }

3
etcdserver/util.go
View File

@ -111,7 +111,8 @@ func warnOfExpensiveRequest(lg *zap.Logger, now time.Time, reqStringer fmt.Strin
warnOfExpensiveGenericRequest(lg, now, reqStringer, "", resp, err) warnOfExpensiveGenericRequest(lg, now, reqStringer, "", resp, err)
} }
func warnOfExpensiveReadOnlyTxnRequest(lg *zap.Logger, now time.Time, reqStringer fmt.Stringer, txnResponse *pb.TxnResponse, err error) { func warnOfExpensiveReadOnlyTxnRequest(lg *zap.Logger, now time.Time, r *pb.TxnRequest, txnResponse *pb.TxnResponse, err error) {
reqStringer := pb.NewLoggableTxnRequest(r)
var resp string var resp string
if !isNil(txnResponse) { if !isNil(txnResponse) {
var resps []string var resps []string