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

Merge pull request #29371 from ping035627/ping035627-patch-0722

Browse Source 
Automatic merge from submit-queue

Print two errors to log

The PR add two error info to log.
This commit is contained in:
k8s-merge-robot 2016-07-22 17:13:18 -07:00 committed by GitHub
commit 444e34fc7e
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
cmd/kube-controller-manager/app/controllermanager.go
View File

@ -391,7 +391,7 @@ func StartControllers(s *options.CMServer, kubeClient *client.Client, kubeconfig
provisioner, err := NewVolumeProvisioner(cloud, s.VolumeConfiguration) provisioner, err := NewVolumeProvisioner(cloud, s.VolumeConfiguration)
if err != nil { if err != nil {
glog.Fatal("A Provisioner could not be created, but one was expected. Provisioning will not work. This functionality is considered an early Alpha version.") glog.Fatalf("A Provisioner could not be created: %v, but one was expected. Provisioning will not work. This functionality is considered an early Alpha version.", err)
} }
volumeController := persistentvolumecontroller.NewPersistentVolumeController( volumeController := persistentvolumecontroller.NewPersistentVolumeController(
@ -490,9 +490,8 @@ func StartControllers(s *options.CMServer, kubeClient *client.Client, kubeconfig
clientPool := dynamic.NewClientPool(restclient.AddUserAgent(kubeconfig, "generic-garbage-collector"), dynamic.LegacyAPIPathResolverFunc) clientPool := dynamic.NewClientPool(restclient.AddUserAgent(kubeconfig, "generic-garbage-collector"), dynamic.LegacyAPIPathResolverFunc)
garbageCollector, err := garbagecollector.NewGarbageCollector(clientPool, groupVersionResources) garbageCollector, err := garbagecollector.NewGarbageCollector(clientPool, groupVersionResources)
if err != nil { if err != nil {
glog.Errorf("Failed to start the generic garbage collector") glog.Errorf("Failed to start the generic garbage collector: %v", err)
} else { } else {
// TODO: make this a flag of kube-controller-manager
workers := int(s.ConcurrentGCSyncs) workers := int(s.ConcurrentGCSyncs)
go garbageCollector.Run(workers, wait.NeverStop) go garbageCollector.Run(workers, wait.NeverStop)
} }