Merge branch 'main' into main

README.md

@@ -36,7 +36,7 @@ The list of prerequisites for running the Volcano device plugin is described bel
 * nvidia-docker version > 2.0 (see how to [install](https://github.com/NVIDIA/nvidia-docker) and it's [prerequisites](https://github.com/nvidia/nvidia-docker/wiki/Installation-\(version-2.0\)#prerequisites))
 * docker configured with nvidia as the [default runtime](https://github.com/NVIDIA/nvidia-docker/wiki/Advanced-topics#default-runtime).
 * Kubernetes version >= 1.16
-* Volcano verison >= 1.19
+* Volcano verison >= 1.9
 
 ## Quick Start
 

go.mod

@@ -7,6 +7,7 @@ require (
 	github.com/NVIDIA/go-nvml v0.12.4-0
 	github.com/NVIDIA/gpu-monitoring-tools v0.0.0-20201109160820-d08ea3cdcce4
 	github.com/fsnotify/fsnotify v1.4.9
+	github.com/mitchellh/gox v1.0.1 // indirect
 	github.com/prometheus/client_golang v1.0.0
 	github.com/prometheus/common v0.4.1
 	github.com/spf13/cobra v0.0.5

pkg/plugin/vgpu/util/util.go

@@ -69,15 +69,15 @@ func GetPendingPod(node string) (*v1.Pod, error) {
 		return nil, err
 	}
 
-	oldestPod := getOldestPod(podList.Items)
+	oldestPod := getOldestPod(podList.Items, node)
 	if oldestPod == nil {
 		return nil, fmt.Errorf("cannot get valid pod")
 	}
 
 	return oldestPod, nil
 }
 
-func getOldestPod(pods []v1.Pod) *v1.Pod {
+func getOldestPod(pods []v1.Pod, nodename string) *v1.Pod {
 	if len(pods) == 0 {
 		return nil
 	}
@@ -96,6 +96,13 @@ func getOldestPod(pods []v1.Pod) *v1.Pod {
 				continue
 			}
 		}
+    if assignedNodeAnnotations, ok := pod.Annotations[AssignedNodeAnnotations]; !ok {
+			continue
+		} else {
+			if strings.Compare(assignedNodeAnnotations, nodename) != 0 {
+				continue
+			}
+		}
 		klog.V(4).Infof("pod %s, predicate time: %s", pod.Name, pod.Annotations[AssignedTimeAnnotations])
 		if oldest == nil || getPredicateTimeFromPodAnnotation(oldest) > getPredicateTimeFromPodAnnotation(&pod) {
 			oldest = &pods[i]