Merge pull request kubernetes#583 from oxddr/errcheck-fix

Fix unchecked errors in clusterloader2 code.
wangxy518 · Jun 28, 2019 · cb3953d · cb3953d
2 parents b5d9eb5 + fb9ed9a
commit cb3953d
Show file tree

Hide file tree

Showing 13 changed files with 43 additions and 16 deletions.
diff --git a/clusterloader2/pkg/measurement/common/bundle/test_metrics.go b/clusterloader2/pkg/measurement/common/bundle/test_metrics.go
@@ -30,7 +30,9 @@ const (
 )
 
 func init() {
-	measurement.Register(testMetricsMeasurementName, createTestMetricsMeasurment)
+	if err := measurement.Register(testMetricsMeasurementName, createTestMetricsMeasurment); err != nil {
+		klog.Fatalf("Cannot register %s: %v", testMetricsMeasurementName, err)
+	}
 }
 
 func createTestMetricsMeasurment() measurement.Measurement {

diff --git a/clusterloader2/pkg/measurement/common/simple/etcd_metrics.go b/clusterloader2/pkg/measurement/common/simple/etcd_metrics.go
@@ -34,7 +34,9 @@ const (
 )
 
 func init() {
-	measurement.Register(etcdMetricsMetricName, createEtcdMetricsMeasurement)
+	if err := measurement.Register(etcdMetricsMetricName, createEtcdMetricsMeasurement); err != nil {
+		klog.Fatalf("Cannot register %s: %v", etcdMetricsMetricName, err)
+	}
 }
 
 func createEtcdMetricsMeasurement() measurement.Measurement {

diff --git a/clusterloader2/pkg/measurement/common/simple/metrics_for_e2e.go b/clusterloader2/pkg/measurement/common/simple/metrics_for_e2e.go
@@ -69,7 +69,9 @@ var interestingKubeletMetricsLabels = []string{
 }
 
 func init() {
-	measurement.Register(metricsForE2EName, createmetricsForE2EMeasurement)
+	if err := measurement.Register(metricsForE2EName, createmetricsForE2EMeasurement); err != nil {
+		klog.Fatalf("Cannot register %s: %v", metricsForE2EName, err)
+	}
 }
 
 func createmetricsForE2EMeasurement() measurement.Measurement {

diff --git a/clusterloader2/pkg/measurement/common/simple/profile.go b/clusterloader2/pkg/measurement/common/simple/profile.go
@@ -35,8 +35,12 @@ const (
 )
 
 func init() {
-	measurement.Register(memoryProfileName, createMemoryProfileMeasurement)
-	measurement.Register(cpuProfileName, createCPUProfileMeasurement)
+	if err := measurement.Register(memoryProfileName, createMemoryProfileMeasurement); err != nil {
+		klog.Fatalf("Cannot register %s: %v", memoryProfileName, err)
+	}
+	if err := measurement.Register(cpuProfileName, createCPUProfileMeasurement); err != nil {
+		klog.Fatalf("Cannot register %s: %v", cpuProfileName, err)
+	}
 }
 
 type profileConfig struct {

diff --git a/clusterloader2/pkg/measurement/common/simple/resource_usage.go b/clusterloader2/pkg/measurement/common/simple/resource_usage.go
@@ -35,7 +35,9 @@ const (
 )
 
 func init() {
-	measurement.Register(resourceUsageMetricName, createResourceUsageMetricMeasurement)
+	if err := measurement.Register(resourceUsageMetricName, createResourceUsageMetricMeasurement); err != nil {
+		klog.Fatalf("Cannot register %s: %v", resourceUsageMetricName, err)
+	}
 }
 
 func createResourceUsageMetricMeasurement() measurement.Measurement {

diff --git a/clusterloader2/pkg/measurement/common/simple/scheduler_latency.go b/clusterloader2/pkg/measurement/common/simple/scheduler_latency.go
@@ -42,7 +42,9 @@ const (
 )
 
 func init() {
-	measurement.Register(schedulerLatencyMetricName, createSchedulerLatencyMeasurement)
+	if err := measurement.Register(schedulerLatencyMetricName, createSchedulerLatencyMeasurement); err != nil {
+		klog.Fatalf("Cannot register %s: %v", schedulerLatencyMetricName, err)
+	}
 }
 
 func createSchedulerLatencyMeasurement() measurement.Measurement {

diff --git a/clusterloader2/pkg/measurement/common/simple/scheduling_throughput.go b/clusterloader2/pkg/measurement/common/simple/scheduling_throughput.go
@@ -35,7 +35,9 @@ const (
 )
 
 func init() {
-	measurement.Register(schedulingThroughputMeasurementName, createSchedulingThroughputMeasurement)
+	if err := measurement.Register(schedulingThroughputMeasurementName, createSchedulingThroughputMeasurement); err != nil {
+		klog.Fatalf("Cannot register %s: %v", schedulingThroughputMeasurementName, err)
+	}
 }
 
 func createSchedulingThroughputMeasurement() measurement.Measurement {

diff --git a/clusterloader2/pkg/measurement/common/simple/timer.go b/clusterloader2/pkg/measurement/common/simple/timer.go
@@ -32,7 +32,9 @@ const (
 )
 
 func init() {
-	measurement.Register(timerMeasurementName, createTimerMeasurment)
+	if err := measurement.Register(timerMeasurementName, createTimerMeasurment); err != nil {
+		klog.Fatalf("Cannot register %s: %v", timerMeasurementName, err)
+	}
 }
 
 func createTimerMeasurment() measurement.Measurement {

diff --git a/clusterloader2/pkg/measurement/common/simple/wait_for_controlled_pods.go b/clusterloader2/pkg/measurement/common/simple/wait_for_controlled_pods.go
@@ -49,7 +49,9 @@ const (
 )
 
 func init() {
-	measurement.Register(waitForControlledPodsRunningName, createWaitForControlledPodsRunningMeasurement)
+	if err := measurement.Register(waitForControlledPodsRunningName, createWaitForControlledPodsRunningMeasurement); err != nil {
+		klog.Fatalf("Cannot register %s: %v", waitForControlledPodsRunningName, err)
+	}
 }
 
 func createWaitForControlledPodsRunningMeasurement() measurement.Measurement {

diff --git a/clusterloader2/pkg/measurement/common/simple/wait_for_pods.go b/clusterloader2/pkg/measurement/common/simple/wait_for_pods.go
@@ -38,7 +38,9 @@ const (
 )
 
 func init() {
-	measurement.Register(waitForRunningPodsMeasurementName, createWaitForRunningPodsMeasurement)
+	if err := measurement.Register(waitForRunningPodsMeasurementName, createWaitForRunningPodsMeasurement); err != nil {
+		klog.Fatalf("Cannot register %s: %v", waitForRunningPodsMeasurementName, err)
+	}
 }
 
 func createWaitForRunningPodsMeasurement() measurement.Measurement {

diff --git a/clusterloader2/pkg/measurement/common/slos/api_responsiveness.go b/clusterloader2/pkg/measurement/common/slos/api_responsiveness.go
@@ -47,13 +47,15 @@ const (
 	apiListCallLatencyThreshold      time.Duration = 5 * time.Second
 	apiClusterScopeListCallThreshold time.Duration = 10 * time.Second
 
-	currentApiCallMetricsVersion = "v1"
+	currentAPICallMetricsVersion = "v1"
 
 	apiResponsivenessMeasurementName = "APIResponsiveness"
 )
 
 func init() {
-	measurement.Register(apiResponsivenessMeasurementName, createAPIResponsivenessMeasurement)
+	if err := measurement.Register(apiResponsivenessMeasurementName, createAPIResponsivenessMeasurement); err != nil {
+		klog.Fatalf("Cannot register %s: %v", apiResponsivenessMeasurementName, err)
+	}
 }
 
 func createAPIResponsivenessMeasurement() measurement.Measurement {
@@ -273,7 +275,7 @@ func setQuantileAPICall(apicall apiCall, quantile float64, latency time.Duration
 
 // apiCallToPerfData transforms apiResponsiveness to PerfData.
 func apiCallToPerfData(apicalls *apiResponsiveness) *measurementutil.PerfData {
-	perfData := &measurementutil.PerfData{Version: currentApiCallMetricsVersion}
+	perfData := &measurementutil.PerfData{Version: currentAPICallMetricsVersion}
 	for _, apicall := range apicalls.ApiCalls {
 		item := measurementutil.DataItem{
 			Data: map[string]float64{

diff --git a/clusterloader2/pkg/measurement/common/slos/pod_startup_latency.go b/clusterloader2/pkg/measurement/common/slos/pod_startup_latency.go
@@ -363,7 +363,7 @@ func latencyToPerfData(l measurementutil.LatencyMetric, name string) measurement
 }
 
 func podStartupLatencyToPerfData(latency *podStartupLatency) *measurementutil.PerfData {
-	perfData := &measurementutil.PerfData{Version: currentApiCallMetricsVersion}
+	perfData := &measurementutil.PerfData{Version: currentAPICallMetricsVersion}
 	perfData.DataItems = append(perfData.DataItems, latencyToPerfData(latency.CreateToScheduleLatency, "create_to_schedule"))
 	perfData.DataItems = append(perfData.DataItems, latencyToPerfData(latency.ScheduleToRunLatency, "schedule_to_run"))
 	perfData.DataItems = append(perfData.DataItems, latencyToPerfData(latency.RunToWatchLatency, "run_to_watch"))

diff --git a/clusterloader2/pkg/measurement/util/runtimeobjects/runtimeobjects.go b/clusterloader2/pkg/measurement/util/runtimeobjects/runtimeobjects.go
@@ -200,7 +200,10 @@ func getSelectorFromUnstrutured(obj *unstructured.Unstructured) (labels.Selector
 			return nil, fmt.Errorf("try to selector failed, field selector not found")
 		}
 		var selector metav1.LabelSelector
-		runtime.DefaultUnstructuredConverter.FromUnstructured(selectorMap, &selector)
+		err = runtime.DefaultUnstructuredConverter.FromUnstructured(selectorMap, &selector)
+		if err != nil {
+			return nil, fmt.Errorf("try to selector failed, %v", err)
+		}
 		return metav1.LabelSelectorAsSelector(&selector)
 	}
 }