github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-25 20:53:33 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #40055 from StudyNick/zte-20170118

Browse Source 
Automatic merge from submit-queue

error word

dummyController Struct comment "disonnected " is error word
WaitForCacheSync method comment "contoller" is error word
This commit is contained in:
Kubernetes Submit Queue 2017-04-17 15:30:17 -07:00 committed by GitHub
commit 44127c588d
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
staging/src/k8s.io/client-go/tools/cache/shared_informer.go vendored
View File

@ -96,7 +96,7 @@ type InformerSynced func() bool
const syncedPollPeriod = 100 * time.Millisecond const syncedPollPeriod = 100 * time.Millisecond
// WaitForCacheSync waits for caches to populate. It returns true if it was successful, false // WaitForCacheSync waits for caches to populate. It returns true if it was successful, false
// if the contoller should shutdown // if the controller should shutdown
func WaitForCacheSync(stopCh <-chan struct{}, cacheSyncs ...InformerSynced) bool { func WaitForCacheSync(stopCh <-chan struct{}, cacheSyncs ...InformerSynced) bool {
err := wait.PollUntil(syncedPollPeriod, err := wait.PollUntil(syncedPollPeriod,
func() (bool, error) { func() (bool, error) {
@ -150,7 +150,7 @@ type sharedIndexInformer struct {
} }
// dummyController hides the fact that a SharedInformer is different from a dedicated one // dummyController hides the fact that a SharedInformer is different from a dedicated one
// where a caller can `Run`. The run method is disonnected in this case, because higher // where a caller can `Run`. The run method is disconnected in this case, because higher
// level logic will decide when to start the SharedInformer and related controller. // level logic will decide when to start the SharedInformer and related controller.
// Because returning information back is always asynchronous, the legacy callers shouldn't // Because returning information back is always asynchronous, the legacy callers shouldn't
// notice any change in behavior. // notice any change in behavior.