fix up vgpu device plugin shutdown sequence and fix up failing integr…

…ation tests
harvester · Jan 22, 2024 · f569071 · f569071
1 parent 3a76207
commit f569071
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 8 deletions.
diff --git a/pkg/deviceplugins/vgpu_device_manager.go b/pkg/deviceplugins/vgpu_device_manager.go
@@ -356,14 +356,13 @@ func (dp *VGPUDevicePlugin) GetDeviceName() string {
 
 // Stop stops the gRPC server
 func (dp *VGPUDevicePlugin) stopDevicePlugin() error {
-	defer func() {
-		if !IsChanClosed(dp.done) {
-			close(dp.done)
-		}
-	}()
 
-	// Give the device plugin one second to properly deregister
-	ticker := time.NewTicker(1 * time.Second)
+	if !IsChanClosed(dp.done) {
+		close(dp.done)
+	}
+
+	// Give the device plugin 5 seconds to properly deregister
+	ticker := time.NewTicker(5 * time.Second)
 	defer ticker.Stop()
 	select {
 	case <-dp.deregistered:

diff --git a/tests/integration/mutator_test.go b/tests/integration/mutator_test.go
@@ -94,7 +94,7 @@ var _ = Describe("validate mutator by sending a mock pod request needing mutatio
 		Spec: corev1.PodSpec{
 			Containers: []corev1.Container{
 				{
-					Name:  "fakepod",
+					Name:  "compute",
 					Image: "fakeimage",
 					SecurityContext: &corev1.SecurityContext{
 						Capabilities: &corev1.Capabilities{