Merge pull request #21312 from wojtek-t/logs_for_scalability_debug

Auto commit by PR queue bot
This commit is contained in:
k8s-merge-robot 2016-02-16 08:55:08 -08:00
commit ea0b040e81

View File

@ -179,16 +179,19 @@ func (f *Framework) afterEach() {
summaries := make([]TestDataSummary, 0)
if testContext.GatherKubeSystemResourceUsageData {
By("Collecting resource usage data")
summaries = append(summaries, f.gatherer.stopAndSummarize([]int{90, 99}, f.addonResourceConstraints))
}
if testContext.GatherLogsSizes {
By("Gathering log sizes data")
close(f.logsSizeCloseChannel)
f.logsSizeWaitGroup.Wait()
summaries = append(summaries, f.logsSizeVerifier.GetSummary())
}
if testContext.GatherMetricsAfterTest {
By("Gathering metrics")
// TODO: enable Scheduler and ControllerManager metrics grabbing when Master's Kubelet will be registered.
grabber, err := metrics.NewMetricsGrabber(f.Client, true, false, false, true)
if err != nil {