Merge pull request #13652 from hashicorp/backport-min-fix-1.2.x

client: cannot use generic Min func in backport
hashicorp · Jul 8, 2022 · 17649ee · 17649ee
2 parents 70587d6 + cf1f809
commit 17649ee
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 5 deletions.
diff --git a/client/allocrunner/taskrunner/driver_handle.go b/client/allocrunner/taskrunner/driver_handle.go
@@ -6,7 +6,6 @@ import (
 	"time"
 
 	cstructs "github.com/hashicorp/nomad/client/structs"
-	"github.com/hashicorp/nomad/helper"
 	"github.com/hashicorp/nomad/nomad/structs"
 	"github.com/hashicorp/nomad/plugins/drivers"
 )
@@ -18,12 +17,18 @@ func NewDriverHandle(
 	task *structs.Task,
 	maxKillTimeout time.Duration,
 	net *drivers.DriverNetwork) *DriverHandle {
+
+	timeout := task.KillTimeout
+	if maxKillTimeout < timeout {
+		timeout = maxKillTimeout
+	}
+
 	return &DriverHandle{
 		driver:      driver,
 		net:         net,
 		taskID:      taskID,
 		killSignal:  task.KillSignal,
-		killTimeout: helper.Min(task.KillTimeout, maxKillTimeout),
+		killTimeout: timeout,
 	}
 }
 

diff --git a/nomad/structs/structs.go b/nomad/structs/structs.go
@@ -8222,9 +8222,13 @@ func (e *TaskEvent) SetValidationError(err error) *TaskEvent {
 }
 
 func (e *TaskEvent) SetKillTimeout(timeout, maxTimeout time.Duration) *TaskEvent {
-	actual := helper.Min(timeout, maxTimeout)
-	e.KillTimeout = actual
-	e.Details["kill_timeout"] = actual.String()
+	lower := timeout
+	if maxTimeout < lower {
+		lower = maxTimeout
+	}
+
+	e.KillTimeout = lower
+	e.Details["kill_timeout"] = lower.String()
 	return e
 }