Merge pull request kubernetes#83971 from yutedz/err-start-master

k8s-ci-robot · web-flow · commit 3ff376923d84 · 2019-10-21T22:31:21.000-07:00
Log the error before calling closeFn
diff --git a/test/integration/framework/master_utils.go b/test/integration/framework/master_utils.go
@@ -190,6 +190,8 @@ func startMasterOrDie(masterConfig *master.Config, incomingServer *httptest.Serv
 	masterConfig.ExtraConfig.VersionedInformers = informers.NewSharedInformerFactory(clientset, masterConfig.GenericConfig.LoopbackClientConfig.Timeout)
 	m, err = masterConfig.Complete().New(genericapiserver.NewEmptyDelegate())
 	if err != nil {
+		// We log the error first so that even if closeFn crashes, the error is shown
+		klog.Errorf("error in bringing up the master: %v", err)
 		closeFn()
 		klog.Fatalf("error in bringing up the master: %v", err)
 	}

Original file line number	Diff line number	Diff line change
`@@ -190,6 +190,8 @@ func startMasterOrDie(masterConfig master.Config, incomingServer httptest.Serv`
`190`	`190`	`masterConfig.ExtraConfig.VersionedInformers = informers.NewSharedInformerFactory(clientset, masterConfig.GenericConfig.LoopbackClientConfig.Timeout)`
`191`	`191`	`m, err = masterConfig.Complete().New(genericapiserver.NewEmptyDelegate())`
`192`	`192`	`if err != nil {`
	`193`	`+ // We log the error first so that even if closeFn crashes, the error is shown`
	`194`	`+ klog.Errorf("error in bringing up the master: %v", err)`
`193`	`195`	`closeFn()`
`194`	`196`	`klog.Fatalf("error in bringing up the master: %v", err)`
`195`	`197`	`}`