k8s-merge-robot 8a81000b71 Merge pull request #25331 from hongchaodeng/w ...

Automatic merge from submit-queue

etcd3/watcher: fix goroutine leak if ctx is canceled

### Problem
In reflector.go, it could probably call Stop() without retrieving all results
from ResultChan(). See [here](https://github.com/kubernetes/kubernetes/blob/master/pkg/client/cache/reflector.go#L369). A potential leak is that when an error has happened, it could block on resultChan,
and then cancelling context in Stop() wouldn't unblock it.

### What's this PR?
This fixes the problem by making it also select ctx.Done and cancel context afterwards if error happened.

2016-05-09 12:12:15 -07:00

..

admission

…

api

Merge pull request #22575 from MikaelCluseau/wip-issue-20466

2016-05-08 08:45:15 -07:00

apimachinery

…

apis

Inline default methods by hand in custom conversions

2016-05-07 11:55:31 -04:00

apiserver

Merge pull request #24795 from deads2k/use-all-attributes

2016-05-09 04:58:19 -07:00

auth

…

capabilities

…

client

Merge pull request #25344 from wojtek-t/fix_dynamic_client_with_protobufs

2016-05-09 15:06:43 +02:00

cloudprovider

Merge pull request #25225 from a-robinson/fix

2016-05-05 14:35:01 -07:00

controller

Merge pull request #24696 from saad-ali/attachControllerSkeleton

2016-05-08 23:44:38 -07:00

conversion

…

credentialprovider

…

fieldpath

…

fields

…

genericapiserver

Merge pull request #24795 from deads2k/use-all-attributes

2016-05-09 04:58:19 -07:00

healthz

…

httplog

…

hyperkube

…

kubectl

Demand at least go1.6

2016-05-08 20:30:37 -07:00

kubelet

Merge pull request #24810 from derekwaynecarr/sources_cleanup

2016-05-09 05:48:09 -07:00

kubemark

Fix the rest of the code

2016-04-29 17:12:10 -04:00

labels

…

master

Define PodDisruption API types.

2016-05-06 17:24:53 -07:00

metrics

Fix the rest of the code

2016-04-29 17:12:10 -04:00

probe

…

proxy

Squashed commit of the following:

2016-05-03 01:36:32 +00:00

quota

Merge pull request #24514 from derekwaynecarr/pod_quota_fix

2016-04-27 06:27:51 -07:00

registry

Merge pull request #25006 from liggitt/third-party-root-scope

2016-05-06 20:50:35 -07:00

runtime

Merge pull request #24727 from smarterclayton/fast_path_lookup

2016-05-06 07:10:18 -07:00

securitycontext

…

serviceaccount

…

ssh

…

storage

etcd3/watcher: fix goroutine leak if ctx is canceled

2016-05-09 09:06:11 -07:00

types

…

ui

…

util

Merge pull request #24838 from saad-ali/attachControllerOpMap

2016-05-09 06:31:22 -07:00

version

…

volume

Demand at least go1.6

2016-05-08 20:30:37 -07:00

watch

Merge pull request #24789 from wojtek-t/use_proper_codec_in_client

2016-05-04 11:00:04 -07:00

OWNERS

…