• Kubernetes Submit Queue's avatar
    Merge pull request #67426 from yanxuean/check-both-err · 949199e6
    Kubernetes Submit Queue authored
    Automatic merge from submit-queue (batch tested with PRs 67100, 67426). If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>.
    
    should check all error in ResourceCollector.Start()
    Signed-off-by: 's avataryanxuean <yan.xuean@zte.com.cn>
    
    
    **What this PR does / why we need it**:
    1. We should check both errors.
    test/e2e_node/resource_collector.go
    ```
    func (r *ResourceCollector) Start() {
    	// Get the cgroup container names for kubelet and runtime
    	kubeletContainer, err := getContainerNameForProcess(kubeletProcessName, "")
    	runtimeContainer, err := getContainerNameForProcess(framework.TestContext.ContainerRuntimeProcessName, framework.TestContext.ContainerRuntimePidFile)
    	if err == nil {
    		systemContainers = map[string]string{
    			stats.SystemContainerKubelet: kubeletContainer,
    			stats.SystemContainerRuntime: runtimeContainer,
    		}
    	}
    ```
    
    2. redundant compare
    The Timestamp.Equal is unlikely to occur, because we have met Timestamp.Before.
    ```
    if oldStats, ok := oldStatsMap[name]; ok && oldStats.Timestamp.Before(newStats.Timestamp) {
    			if oldStats.Timestamp.Equal(newStats.Timestamp) {
    				continue
    			}
    			r.buffers[name] = append(r.buffers[name], computeContainerResourceUsage(name, oldStats, newStats))
    		}
    ```
    **Which issue(s) this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close the issue(s) when PR gets merged)*:
    Fixes #
    
    **Special notes for your reviewer**:
    
    **Release note**:
    
    ```release-note
    NONE
    ```
    /sig-node
    949199e6
Name
Last commit
Last update
..
builder Loading commit data...
conformance Loading commit data...
environment Loading commit data...
jenkins Loading commit data...
perftype Loading commit data...
remote Loading commit data...
runner Loading commit data...
services Loading commit data...
BUILD Loading commit data...
OWNERS Loading commit data...
README.md Loading commit data...
apparmor_test.go Loading commit data...
benchmark_util.go Loading commit data...
container.go Loading commit data...
container_log_rotation_test.go Loading commit data...
container_manager_test.go Loading commit data...
cpu_manager_test.go Loading commit data...
critical_pod_test.go Loading commit data...
density_test.go Loading commit data...
device_plugin.go Loading commit data...
doc.go Loading commit data...
docker_test.go Loading commit data...
docker_util.go Loading commit data...
dockershim_checkpoint_test.go Loading commit data...
dynamic_kubelet_config_test.go Loading commit data...
e2e_node_suite_test.go Loading commit data...
eviction_test.go Loading commit data...
framework.go Loading commit data...
garbage_collector_test.go Loading commit data...
gke_environment_test.go Loading commit data...
gpu_device_plugin.go Loading commit data...
gubernator.sh Loading commit data...
hugepages_test.go Loading commit data...
image_id_test.go Loading commit data...
image_list.go Loading commit data...
kubelet_test.go Loading commit data...
log_path_test.go Loading commit data...
mirror_pod_test.go Loading commit data...
node_container_manager_test.go Loading commit data...
node_problem_detector_linux.go Loading commit data...
pods_container_manager_test.go Loading commit data...
resource_collector.go Loading commit data...
resource_usage_test.go Loading commit data...
restart_test.go Loading commit data...
runtime_conformance_test.go Loading commit data...
security_context_test.go Loading commit data...
summary_test.go Loading commit data...
util.go Loading commit data...
volume_manager_test.go Loading commit data...