Ensure a 120 second 'provider timeout' with each bmclib client

tinkerbell · Oct 10, 2024 · a3e34d1 · a3e34d1
1 parent f40b9cd
commit a3e34d1
Show file tree

Hide file tree

Showing 6 changed files with 27 additions and 0 deletions.
diff --git a/grpc/oob/bmc/bmc.go b/grpc/oob/bmc/bmc.go
@@ -3,6 +3,7 @@ package bmc
 import (
 	"context"
 	"fmt"
+	"time"
 
 	"github.com/bmc-toolbox/bmclib/v2"
 	"github.com/bmc-toolbox/bmclib/v2/bmc"
@@ -310,6 +311,9 @@ func (m Action) BMCReset(ctx context.Context, rType string) (err error) {
 	span.SetAttributes(attribute.String("bmc.host", host), attribute.String("bmc.username", user))
 	m.SendStatusMessage("working on bmc reset")
 
+	ctx, cancel := context.WithTimeout(ctx, 120*time.Second)
+	defer cancel()
+
 	opts := []bmclib.Option{
 		bmclib.WithLogger(m.Log),
 		bmclib.WithPerProviderTimeout(common.BMCTimeoutFromCtx(ctx)),
@@ -381,6 +385,9 @@ func (m Action) DeactivateSOL(ctx context.Context) error {
 	span.SetAttributes(attribute.String("bmc.host", host), attribute.String("bmc.username", user))
 	m.SendStatusMessage("working on SOL session deactivation")
 
+	ctx, cancel := context.WithTimeout(ctx, 120*time.Second)
+	defer cancel()
+
 	opts := []bmclib.Option{
 		bmclib.WithLogger(m.Log),
 		bmclib.WithPerProviderTimeout(common.BMCTimeoutFromCtx(ctx)),

diff --git a/grpc/oob/bmc/users_bmclibv2.go b/grpc/oob/bmc/users_bmclibv2.go
@@ -3,6 +3,7 @@ package bmc
 import (
 	"context"
 	"fmt"
+	"time"
 
 	"github.com/bmc-toolbox/bmclib/v2"
 	"github.com/go-logr/logr"
@@ -33,6 +34,9 @@ type bmclibv2UserManagement struct {
 func (b *bmclibv2UserManagement) Connect(ctx context.Context) error {
 	var errMsg repository.Error
 
+	ctx, cancel := context.WithTimeout(ctx, 120*time.Second)
+	defer cancel()
+
 	opts := []bmclib.Option{
 		bmclib.WithLogger(b.log),
 		bmclib.WithPerProviderTimeout(common.BMCTimeoutFromCtx(ctx)),

diff --git a/grpc/oob/diagnostic/clearsel.go b/grpc/oob/diagnostic/clearsel.go
@@ -3,6 +3,7 @@ package diagnostic
 import (
 	"context"
 	"fmt"
+	"time"
 
 	"github.com/bmc-toolbox/bmclib/v2"
 	"github.com/bmc-toolbox/bmclib/v2/providers"
@@ -55,6 +56,9 @@ func (m Action) ClearSystemEventLog(ctx context.Context) (result string, err err
 	}
 	span.SetAttributes(attribute.String("bmc.host", host), attribute.String("bmc.username", user))
 
+	ctx, cancel := context.WithTimeout(ctx, 120*time.Second)
+	defer cancel()
+
 	opts := []bmclib.Option{
 		bmclib.WithLogger(m.Log),
 		bmclib.WithPerProviderTimeout(common.BMCTimeoutFromCtx(ctx)),

diff --git a/grpc/oob/diagnostic/nmi.go b/grpc/oob/diagnostic/nmi.go
@@ -3,6 +3,7 @@ package diagnostic
 import (
 	"context"
 	"fmt"
+	"time"
 
 	"github.com/bmc-toolbox/bmclib/v2"
 	"github.com/prometheus/client_golang/prometheus"
@@ -50,6 +51,9 @@ func (m Action) SendNMI(ctx context.Context) error {
 	}
 	span.SetAttributes(attribute.String("bmc.host", host), attribute.String("bmc.username", user))
 
+	ctx, cancel := context.WithTimeout(ctx, 120*time.Second)
+	defer cancel()
+
 	opts := []bmclib.Option{
 		bmclib.WithLogger(m.Log),
 		bmclib.WithPerProviderTimeout(common.BMCTimeoutFromCtx(ctx)),

diff --git a/grpc/oob/diagnostic/screenshot.go b/grpc/oob/diagnostic/screenshot.go
@@ -3,6 +3,7 @@ package diagnostic
 import (
 	"context"
 	"fmt"
+	"time"
 
 	"github.com/bmc-toolbox/bmclib/v2"
 	"github.com/bmc-toolbox/bmclib/v2/bmc"
@@ -56,6 +57,9 @@ func (m Action) GetScreenshot(ctx context.Context) (image []byte, filetype strin
 	}
 	span.SetAttributes(attribute.String("bmc.host", host), attribute.String("bmc.username", user))
 
+	ctx, cancel := context.WithTimeout(ctx, 120*time.Second)
+	defer cancel()
+
 	opts := []bmclib.Option{
 		bmclib.WithLogger(m.Log),
 		bmclib.WithPerProviderTimeout(common.BMCTimeoutFromCtx(ctx)),

diff --git a/grpc/oob/machine/machine.go b/grpc/oob/machine/machine.go
@@ -4,6 +4,7 @@ import (
 	"context"
 	"fmt"
 	"strings"
+	"time"
 
 	"github.com/bmc-toolbox/bmclib/v2"
 	"github.com/bmc-toolbox/bmclib/v2/bmc"
@@ -149,6 +150,9 @@ func (m Action) BootDeviceSet(ctx context.Context, device string, persistent, ef
 	msg := "working on " + base
 	m.SendStatusMessage(msg)
 
+	ctx, cancel := context.WithTimeout(ctx, 120*time.Second)
+	defer cancel()
+
 	opts := []bmclib.Option{
 		bmclib.WithLogger(m.Log),
 		bmclib.WithPerProviderTimeout(common.BMCTimeoutFromCtx(ctx)),