Merge pull request #66929 from deads2k/client-03-wrapping-log

Automatic merge from submit-queue (batch tested with PRs 66870, 66929, 66837). If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>.

add logging to find offending transports

When a transport can't be cancelled, we're notified, but we don't which transport is missing the ability.  This adds logging to give us a target type.

@kubernetes/sig-api-machinery-bugs
/assign @juanvallejo

since you hit it.

```release-note
NONE
```

Kubernetes-commit: 99f96511fdb8438f85ebeb4c22c929c97fabcbb6
This commit is contained in:
Kubernetes Publisher 2018-08-02 17:03:05 -07:00
commit d0ef5a1c7d
2 changed files with 57 additions and 57 deletions

102
Godeps/Godeps.json generated
View File

@ -396,207 +396,207 @@
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/api/apitesting", "ImportPath": "k8s.io/apimachinery/pkg/api/apitesting",
"Rev": "085ff9770270458ad7d899f2338e193c2c585d5b" "Rev": "70491ec73e10be2989242c913738f049a37e72c7"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/api/apitesting/fuzzer", "ImportPath": "k8s.io/apimachinery/pkg/api/apitesting/fuzzer",
"Rev": "085ff9770270458ad7d899f2338e193c2c585d5b" "Rev": "70491ec73e10be2989242c913738f049a37e72c7"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/api/apitesting/roundtrip", "ImportPath": "k8s.io/apimachinery/pkg/api/apitesting/roundtrip",
"Rev": "085ff9770270458ad7d899f2338e193c2c585d5b" "Rev": "70491ec73e10be2989242c913738f049a37e72c7"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/api/equality", "ImportPath": "k8s.io/apimachinery/pkg/api/equality",
"Rev": "085ff9770270458ad7d899f2338e193c2c585d5b" "Rev": "70491ec73e10be2989242c913738f049a37e72c7"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/api/errors", "ImportPath": "k8s.io/apimachinery/pkg/api/errors",
"Rev": "085ff9770270458ad7d899f2338e193c2c585d5b" "Rev": "70491ec73e10be2989242c913738f049a37e72c7"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/api/meta", "ImportPath": "k8s.io/apimachinery/pkg/api/meta",
"Rev": "085ff9770270458ad7d899f2338e193c2c585d5b" "Rev": "70491ec73e10be2989242c913738f049a37e72c7"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/api/resource", "ImportPath": "k8s.io/apimachinery/pkg/api/resource",
"Rev": "085ff9770270458ad7d899f2338e193c2c585d5b" "Rev": "70491ec73e10be2989242c913738f049a37e72c7"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/apis/meta/fuzzer", "ImportPath": "k8s.io/apimachinery/pkg/apis/meta/fuzzer",
"Rev": "085ff9770270458ad7d899f2338e193c2c585d5b" "Rev": "70491ec73e10be2989242c913738f049a37e72c7"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/apis/meta/internalversion", "ImportPath": "k8s.io/apimachinery/pkg/apis/meta/internalversion",
"Rev": "085ff9770270458ad7d899f2338e193c2c585d5b" "Rev": "70491ec73e10be2989242c913738f049a37e72c7"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/apis/meta/v1", "ImportPath": "k8s.io/apimachinery/pkg/apis/meta/v1",
"Rev": "085ff9770270458ad7d899f2338e193c2c585d5b" "Rev": "70491ec73e10be2989242c913738f049a37e72c7"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured", "ImportPath": "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured",
"Rev": "085ff9770270458ad7d899f2338e193c2c585d5b" "Rev": "70491ec73e10be2989242c913738f049a37e72c7"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/apis/meta/v1beta1", "ImportPath": "k8s.io/apimachinery/pkg/apis/meta/v1beta1",
"Rev": "085ff9770270458ad7d899f2338e193c2c585d5b" "Rev": "70491ec73e10be2989242c913738f049a37e72c7"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/conversion", "ImportPath": "k8s.io/apimachinery/pkg/conversion",
"Rev": "085ff9770270458ad7d899f2338e193c2c585d5b" "Rev": "70491ec73e10be2989242c913738f049a37e72c7"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/conversion/queryparams", "ImportPath": "k8s.io/apimachinery/pkg/conversion/queryparams",
"Rev": "085ff9770270458ad7d899f2338e193c2c585d5b" "Rev": "70491ec73e10be2989242c913738f049a37e72c7"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/fields", "ImportPath": "k8s.io/apimachinery/pkg/fields",
"Rev": "085ff9770270458ad7d899f2338e193c2c585d5b" "Rev": "70491ec73e10be2989242c913738f049a37e72c7"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/labels", "ImportPath": "k8s.io/apimachinery/pkg/labels",
"Rev": "085ff9770270458ad7d899f2338e193c2c585d5b" "Rev": "70491ec73e10be2989242c913738f049a37e72c7"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/runtime", "ImportPath": "k8s.io/apimachinery/pkg/runtime",
"Rev": "085ff9770270458ad7d899f2338e193c2c585d5b" "Rev": "70491ec73e10be2989242c913738f049a37e72c7"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/runtime/schema", "ImportPath": "k8s.io/apimachinery/pkg/runtime/schema",
"Rev": "085ff9770270458ad7d899f2338e193c2c585d5b" "Rev": "70491ec73e10be2989242c913738f049a37e72c7"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer", "ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer",
"Rev": "085ff9770270458ad7d899f2338e193c2c585d5b" "Rev": "70491ec73e10be2989242c913738f049a37e72c7"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/json", "ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/json",
"Rev": "085ff9770270458ad7d899f2338e193c2c585d5b" "Rev": "70491ec73e10be2989242c913738f049a37e72c7"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/protobuf", "ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/protobuf",
"Rev": "085ff9770270458ad7d899f2338e193c2c585d5b" "Rev": "70491ec73e10be2989242c913738f049a37e72c7"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/recognizer", "ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/recognizer",
"Rev": "085ff9770270458ad7d899f2338e193c2c585d5b" "Rev": "70491ec73e10be2989242c913738f049a37e72c7"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/streaming", "ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/streaming",
"Rev": "085ff9770270458ad7d899f2338e193c2c585d5b" "Rev": "70491ec73e10be2989242c913738f049a37e72c7"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/versioning", "ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/versioning",
"Rev": "085ff9770270458ad7d899f2338e193c2c585d5b" "Rev": "70491ec73e10be2989242c913738f049a37e72c7"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/selection", "ImportPath": "k8s.io/apimachinery/pkg/selection",
"Rev": "085ff9770270458ad7d899f2338e193c2c585d5b" "Rev": "70491ec73e10be2989242c913738f049a37e72c7"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/types", "ImportPath": "k8s.io/apimachinery/pkg/types",
"Rev": "085ff9770270458ad7d899f2338e193c2c585d5b" "Rev": "70491ec73e10be2989242c913738f049a37e72c7"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/util/cache", "ImportPath": "k8s.io/apimachinery/pkg/util/cache",
"Rev": "085ff9770270458ad7d899f2338e193c2c585d5b" "Rev": "70491ec73e10be2989242c913738f049a37e72c7"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/util/clock", "ImportPath": "k8s.io/apimachinery/pkg/util/clock",
"Rev": "085ff9770270458ad7d899f2338e193c2c585d5b" "Rev": "70491ec73e10be2989242c913738f049a37e72c7"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/util/diff", "ImportPath": "k8s.io/apimachinery/pkg/util/diff",
"Rev": "085ff9770270458ad7d899f2338e193c2c585d5b" "Rev": "70491ec73e10be2989242c913738f049a37e72c7"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/util/errors", "ImportPath": "k8s.io/apimachinery/pkg/util/errors",
"Rev": "085ff9770270458ad7d899f2338e193c2c585d5b" "Rev": "70491ec73e10be2989242c913738f049a37e72c7"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/util/framer", "ImportPath": "k8s.io/apimachinery/pkg/util/framer",
"Rev": "085ff9770270458ad7d899f2338e193c2c585d5b" "Rev": "70491ec73e10be2989242c913738f049a37e72c7"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/util/httpstream", "ImportPath": "k8s.io/apimachinery/pkg/util/httpstream",
"Rev": "085ff9770270458ad7d899f2338e193c2c585d5b" "Rev": "70491ec73e10be2989242c913738f049a37e72c7"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/util/httpstream/spdy", "ImportPath": "k8s.io/apimachinery/pkg/util/httpstream/spdy",
"Rev": "085ff9770270458ad7d899f2338e193c2c585d5b" "Rev": "70491ec73e10be2989242c913738f049a37e72c7"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/util/intstr", "ImportPath": "k8s.io/apimachinery/pkg/util/intstr",
"Rev": "085ff9770270458ad7d899f2338e193c2c585d5b" "Rev": "70491ec73e10be2989242c913738f049a37e72c7"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/util/json", "ImportPath": "k8s.io/apimachinery/pkg/util/json",
"Rev": "085ff9770270458ad7d899f2338e193c2c585d5b" "Rev": "70491ec73e10be2989242c913738f049a37e72c7"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/util/mergepatch", "ImportPath": "k8s.io/apimachinery/pkg/util/mergepatch",
"Rev": "085ff9770270458ad7d899f2338e193c2c585d5b" "Rev": "70491ec73e10be2989242c913738f049a37e72c7"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/util/naming", "ImportPath": "k8s.io/apimachinery/pkg/util/naming",
"Rev": "085ff9770270458ad7d899f2338e193c2c585d5b" "Rev": "70491ec73e10be2989242c913738f049a37e72c7"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/util/net", "ImportPath": "k8s.io/apimachinery/pkg/util/net",
"Rev": "085ff9770270458ad7d899f2338e193c2c585d5b" "Rev": "70491ec73e10be2989242c913738f049a37e72c7"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/util/remotecommand", "ImportPath": "k8s.io/apimachinery/pkg/util/remotecommand",
"Rev": "085ff9770270458ad7d899f2338e193c2c585d5b" "Rev": "70491ec73e10be2989242c913738f049a37e72c7"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/util/runtime", "ImportPath": "k8s.io/apimachinery/pkg/util/runtime",
"Rev": "085ff9770270458ad7d899f2338e193c2c585d5b" "Rev": "70491ec73e10be2989242c913738f049a37e72c7"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/util/sets", "ImportPath": "k8s.io/apimachinery/pkg/util/sets",
"Rev": "085ff9770270458ad7d899f2338e193c2c585d5b" "Rev": "70491ec73e10be2989242c913738f049a37e72c7"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/util/strategicpatch", "ImportPath": "k8s.io/apimachinery/pkg/util/strategicpatch",
"Rev": "085ff9770270458ad7d899f2338e193c2c585d5b" "Rev": "70491ec73e10be2989242c913738f049a37e72c7"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/util/validation", "ImportPath": "k8s.io/apimachinery/pkg/util/validation",
"Rev": "085ff9770270458ad7d899f2338e193c2c585d5b" "Rev": "70491ec73e10be2989242c913738f049a37e72c7"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/util/validation/field", "ImportPath": "k8s.io/apimachinery/pkg/util/validation/field",
"Rev": "085ff9770270458ad7d899f2338e193c2c585d5b" "Rev": "70491ec73e10be2989242c913738f049a37e72c7"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/util/wait", "ImportPath": "k8s.io/apimachinery/pkg/util/wait",
"Rev": "085ff9770270458ad7d899f2338e193c2c585d5b" "Rev": "70491ec73e10be2989242c913738f049a37e72c7"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/util/yaml", "ImportPath": "k8s.io/apimachinery/pkg/util/yaml",
"Rev": "085ff9770270458ad7d899f2338e193c2c585d5b" "Rev": "70491ec73e10be2989242c913738f049a37e72c7"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/version", "ImportPath": "k8s.io/apimachinery/pkg/version",
"Rev": "085ff9770270458ad7d899f2338e193c2c585d5b" "Rev": "70491ec73e10be2989242c913738f049a37e72c7"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/watch", "ImportPath": "k8s.io/apimachinery/pkg/watch",
"Rev": "085ff9770270458ad7d899f2338e193c2c585d5b" "Rev": "70491ec73e10be2989242c913738f049a37e72c7"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/third_party/forked/golang/json", "ImportPath": "k8s.io/apimachinery/third_party/forked/golang/json",
"Rev": "085ff9770270458ad7d899f2338e193c2c585d5b" "Rev": "70491ec73e10be2989242c913738f049a37e72c7"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/third_party/forked/golang/netutil", "ImportPath": "k8s.io/apimachinery/third_party/forked/golang/netutil",
"Rev": "085ff9770270458ad7d899f2338e193c2c585d5b" "Rev": "70491ec73e10be2989242c913738f049a37e72c7"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/third_party/forked/golang/reflect", "ImportPath": "k8s.io/apimachinery/third_party/forked/golang/reflect",
"Rev": "085ff9770270458ad7d899f2338e193c2c585d5b" "Rev": "70491ec73e10be2989242c913738f049a37e72c7"
}, },
{ {
"ImportPath": "k8s.io/kube-openapi/pkg/util/proto", "ImportPath": "k8s.io/kube-openapi/pkg/util/proto",

View File

@ -138,7 +138,7 @@ func (rt *authProxyRoundTripper) CancelRequest(req *http.Request) {
if canceler, ok := rt.rt.(requestCanceler); ok { if canceler, ok := rt.rt.(requestCanceler); ok {
canceler.CancelRequest(req) canceler.CancelRequest(req)
} else { } else {
glog.Errorf("CancelRequest not implemented") glog.Errorf("CancelRequest not implemented by %T", rt.rt)
} }
} }
@ -166,7 +166,7 @@ func (rt *userAgentRoundTripper) CancelRequest(req *http.Request) {
if canceler, ok := rt.rt.(requestCanceler); ok { if canceler, ok := rt.rt.(requestCanceler); ok {
canceler.CancelRequest(req) canceler.CancelRequest(req)
} else { } else {
glog.Errorf("CancelRequest not implemented") glog.Errorf("CancelRequest not implemented by %T", rt.rt)
} }
} }
@ -197,7 +197,7 @@ func (rt *basicAuthRoundTripper) CancelRequest(req *http.Request) {
if canceler, ok := rt.rt.(requestCanceler); ok { if canceler, ok := rt.rt.(requestCanceler); ok {
canceler.CancelRequest(req) canceler.CancelRequest(req)
} else { } else {
glog.Errorf("CancelRequest not implemented") glog.Errorf("CancelRequest not implemented by %T", rt.rt)
} }
} }
@ -257,7 +257,7 @@ func (rt *impersonatingRoundTripper) CancelRequest(req *http.Request) {
if canceler, ok := rt.delegate.(requestCanceler); ok { if canceler, ok := rt.delegate.(requestCanceler); ok {
canceler.CancelRequest(req) canceler.CancelRequest(req)
} else { } else {
glog.Errorf("CancelRequest not implemented") glog.Errorf("CancelRequest not implemented by %T", rt.delegate)
} }
} }
@ -288,7 +288,7 @@ func (rt *bearerAuthRoundTripper) CancelRequest(req *http.Request) {
if canceler, ok := rt.rt.(requestCanceler); ok { if canceler, ok := rt.rt.(requestCanceler); ok {
canceler.CancelRequest(req) canceler.CancelRequest(req)
} else { } else {
glog.Errorf("CancelRequest not implemented") glog.Errorf("CancelRequest not implemented by %T", rt.rt)
} }
} }
@ -372,7 +372,7 @@ func (rt *debuggingRoundTripper) CancelRequest(req *http.Request) {
if canceler, ok := rt.delegatedRoundTripper.(requestCanceler); ok { if canceler, ok := rt.delegatedRoundTripper.(requestCanceler); ok {
canceler.CancelRequest(req) canceler.CancelRequest(req)
} else { } else {
glog.Errorf("CancelRequest not implemented") glog.Errorf("CancelRequest not implemented by %T", rt.delegatedRoundTripper)
} }
} }