github/client-go
1
0
Fork 0
mirror of https://github.com/kubernetes/client-go.git synced 2025-08-14 13:33:22 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #50562 from atlassian/call-cleanup-properly

Browse Source 
Automatic merge from submit-queue (batch tested with PRs 51134, 51122, 50562, 50971, 51327)

Call the right cleanup function

**What this PR does / why we need it**:
`defer cleanup()` will always call the function that was returned by the first call to `r.resyncChan()` but it should call the one returned by the last call.

**Special notes for your reviewer**:
This will print `c1`, not `c2`. See https://play.golang.org/p/FDjDbUxOvI
```go
func main() {
	var c func()
	c = c1
	defer c()
	c = c2
}

func c1 () {
	fmt.Println("c1")
}

func c2 () {
	fmt.Println("c2")
}
```

**Release note**:
```release-note
NONE
```
/kind bug
/sig api-machinery

Kubernetes-commit: ccae631ff9d82e302631fc7f1965a09c4e1e9f56
This commit is contained in:
Kubernetes Publisher 2017-08-25 14:01:30 -07:00
commit 2554b0b462
2 changed files with 52 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

96
Godeps/Godeps.json generated
View File

@ -456,195 +456,195 @@
},
{
"ImportPath": "k8s.io/apimachinery/pkg/api/equality",
"Rev": "d62cf72a0abe0cce52774b5136fb672a1f37f70e"
"Rev": "2dc2b12394600198a0176dc967d31ab73a65d74f"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/api/errors",
"Rev": "d62cf72a0abe0cce52774b5136fb672a1f37f70e"
"Rev": "2dc2b12394600198a0176dc967d31ab73a65d74f"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/api/meta",
"Rev": "d62cf72a0abe0cce52774b5136fb672a1f37f70e"
"Rev": "2dc2b12394600198a0176dc967d31ab73a65d74f"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/api/resource",
"Rev": "d62cf72a0abe0cce52774b5136fb672a1f37f70e"
"Rev": "2dc2b12394600198a0176dc967d31ab73a65d74f"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/apimachinery",
"Rev": "d62cf72a0abe0cce52774b5136fb672a1f37f70e"
"Rev": "2dc2b12394600198a0176dc967d31ab73a65d74f"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/apimachinery/registered",
"Rev": "d62cf72a0abe0cce52774b5136fb672a1f37f70e"
"Rev": "2dc2b12394600198a0176dc967d31ab73a65d74f"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/apis/meta/v1",
"Rev": "d62cf72a0abe0cce52774b5136fb672a1f37f70e"
"Rev": "2dc2b12394600198a0176dc967d31ab73a65d74f"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured",
"Rev": "d62cf72a0abe0cce52774b5136fb672a1f37f70e"
"Rev": "2dc2b12394600198a0176dc967d31ab73a65d74f"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/apis/meta/v1alpha1",
"Rev": "d62cf72a0abe0cce52774b5136fb672a1f37f70e"
"Rev": "2dc2b12394600198a0176dc967d31ab73a65d74f"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/conversion",
"Rev": "d62cf72a0abe0cce52774b5136fb672a1f37f70e"
"Rev": "2dc2b12394600198a0176dc967d31ab73a65d74f"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/conversion/queryparams",
"Rev": "d62cf72a0abe0cce52774b5136fb672a1f37f70e"
"Rev": "2dc2b12394600198a0176dc967d31ab73a65d74f"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/conversion/unstructured",
"Rev": "d62cf72a0abe0cce52774b5136fb672a1f37f70e"
"Rev": "2dc2b12394600198a0176dc967d31ab73a65d74f"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/fields",
"Rev": "d62cf72a0abe0cce52774b5136fb672a1f37f70e"
"Rev": "2dc2b12394600198a0176dc967d31ab73a65d74f"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/labels",
"Rev": "d62cf72a0abe0cce52774b5136fb672a1f37f70e"
"Rev": "2dc2b12394600198a0176dc967d31ab73a65d74f"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/runtime",
"Rev": "d62cf72a0abe0cce52774b5136fb672a1f37f70e"
"Rev": "2dc2b12394600198a0176dc967d31ab73a65d74f"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/runtime/schema",
"Rev": "d62cf72a0abe0cce52774b5136fb672a1f37f70e"
"Rev": "2dc2b12394600198a0176dc967d31ab73a65d74f"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer",
"Rev": "d62cf72a0abe0cce52774b5136fb672a1f37f70e"
"Rev": "2dc2b12394600198a0176dc967d31ab73a65d74f"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/json",
"Rev": "d62cf72a0abe0cce52774b5136fb672a1f37f70e"
"Rev": "2dc2b12394600198a0176dc967d31ab73a65d74f"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/protobuf",
"Rev": "d62cf72a0abe0cce52774b5136fb672a1f37f70e"
"Rev": "2dc2b12394600198a0176dc967d31ab73a65d74f"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/recognizer",
"Rev": "d62cf72a0abe0cce52774b5136fb672a1f37f70e"
"Rev": "2dc2b12394600198a0176dc967d31ab73a65d74f"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/streaming",
"Rev": "d62cf72a0abe0cce52774b5136fb672a1f37f70e"
"Rev": "2dc2b12394600198a0176dc967d31ab73a65d74f"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/versioning",
"Rev": "d62cf72a0abe0cce52774b5136fb672a1f37f70e"
"Rev": "2dc2b12394600198a0176dc967d31ab73a65d74f"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/selection",
"Rev": "d62cf72a0abe0cce52774b5136fb672a1f37f70e"
"Rev": "2dc2b12394600198a0176dc967d31ab73a65d74f"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/types",
"Rev": "d62cf72a0abe0cce52774b5136fb672a1f37f70e"
"Rev": "2dc2b12394600198a0176dc967d31ab73a65d74f"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/cache",
"Rev": "d62cf72a0abe0cce52774b5136fb672a1f37f70e"
"Rev": "2dc2b12394600198a0176dc967d31ab73a65d74f"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/clock",
"Rev": "d62cf72a0abe0cce52774b5136fb672a1f37f70e"
"Rev": "2dc2b12394600198a0176dc967d31ab73a65d74f"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/diff",
"Rev": "d62cf72a0abe0cce52774b5136fb672a1f37f70e"
"Rev": "2dc2b12394600198a0176dc967d31ab73a65d74f"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/errors",
"Rev": "d62cf72a0abe0cce52774b5136fb672a1f37f70e"
"Rev": "2dc2b12394600198a0176dc967d31ab73a65d74f"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/framer",
"Rev": "d62cf72a0abe0cce52774b5136fb672a1f37f70e"
"Rev": "2dc2b12394600198a0176dc967d31ab73a65d74f"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/httpstream",
"Rev": "d62cf72a0abe0cce52774b5136fb672a1f37f70e"
"Rev": "2dc2b12394600198a0176dc967d31ab73a65d74f"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/httpstream/spdy",
"Rev": "d62cf72a0abe0cce52774b5136fb672a1f37f70e"
"Rev": "2dc2b12394600198a0176dc967d31ab73a65d74f"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/intstr",
"Rev": "d62cf72a0abe0cce52774b5136fb672a1f37f70e"
"Rev": "2dc2b12394600198a0176dc967d31ab73a65d74f"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/json",
"Rev": "d62cf72a0abe0cce52774b5136fb672a1f37f70e"
"Rev": "2dc2b12394600198a0176dc967d31ab73a65d74f"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/mergepatch",
"Rev": "d62cf72a0abe0cce52774b5136fb672a1f37f70e"
"Rev": "2dc2b12394600198a0176dc967d31ab73a65d74f"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/net",
"Rev": "d62cf72a0abe0cce52774b5136fb672a1f37f70e"
"Rev": "2dc2b12394600198a0176dc967d31ab73a65d74f"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/remotecommand",
"Rev": "d62cf72a0abe0cce52774b5136fb672a1f37f70e"
"Rev": "2dc2b12394600198a0176dc967d31ab73a65d74f"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/runtime",
"Rev": "d62cf72a0abe0cce52774b5136fb672a1f37f70e"
"Rev": "2dc2b12394600198a0176dc967d31ab73a65d74f"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/sets",
"Rev": "d62cf72a0abe0cce52774b5136fb672a1f37f70e"
"Rev": "2dc2b12394600198a0176dc967d31ab73a65d74f"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/strategicpatch",
"Rev": "d62cf72a0abe0cce52774b5136fb672a1f37f70e"
"Rev": "2dc2b12394600198a0176dc967d31ab73a65d74f"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/validation",
"Rev": "d62cf72a0abe0cce52774b5136fb672a1f37f70e"
"Rev": "2dc2b12394600198a0176dc967d31ab73a65d74f"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/validation/field",
"Rev": "d62cf72a0abe0cce52774b5136fb672a1f37f70e"
"Rev": "2dc2b12394600198a0176dc967d31ab73a65d74f"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/wait",
"Rev": "d62cf72a0abe0cce52774b5136fb672a1f37f70e"
"Rev": "2dc2b12394600198a0176dc967d31ab73a65d74f"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/yaml",
"Rev": "d62cf72a0abe0cce52774b5136fb672a1f37f70e"
"Rev": "2dc2b12394600198a0176dc967d31ab73a65d74f"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/version",
"Rev": "d62cf72a0abe0cce52774b5136fb672a1f37f70e"
"Rev": "2dc2b12394600198a0176dc967d31ab73a65d74f"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/watch",
"Rev": "d62cf72a0abe0cce52774b5136fb672a1f37f70e"
"Rev": "2dc2b12394600198a0176dc967d31ab73a65d74f"
},
{
"ImportPath": "k8s.io/apimachinery/third_party/forked/golang/json",
"Rev": "d62cf72a0abe0cce52774b5136fb672a1f37f70e"
"Rev": "2dc2b12394600198a0176dc967d31ab73a65d74f"
},
{
"ImportPath": "k8s.io/apimachinery/third_party/forked/golang/netutil",
"Rev": "d62cf72a0abe0cce52774b5136fb672a1f37f70e"
"Rev": "2dc2b12394600198a0176dc967d31ab73a65d74f"
},
{
"ImportPath": "k8s.io/apimachinery/third_party/forked/golang/reflect",
"Rev": "d62cf72a0abe0cce52774b5136fb672a1f37f70e"
"Rev": "2dc2b12394600198a0176dc967d31ab73a65d74f"
},
{
"ImportPath": "k8s.io/kube-openapi/pkg/common",

6
tools/cache/reflector.go vendored
View File

@ -239,8 +239,6 @@ func (r *Reflector) resyncChan() (<-chan time.Time, func() bool) {
func (r *Reflector) ListAndWatch(stopCh <-chan struct{}) error {
glog.V(3).Infof("Listing and watching %v from %s", r.expectedType, r.name)
var resourceVersion string
resyncCh, cleanup := r.resyncChan()
defer cleanup()
// Explicitly set "0" as resource version - it's fine for the List()
// to be served from cache and potentially be delayed relative to
@ -272,6 +270,10 @@ func (r *Reflector) ListAndWatch(stopCh <-chan struct{}) error {
cancelCh := make(chan struct{})
defer close(cancelCh)
go func() {
resyncCh, cleanup := r.resyncChan()
defer func() {
cleanup() // Call the last one written into cleanup
}()
for {
select {
case <-resyncCh: