Merge pull request #15051 from parth-gr/reconcle-fix

rbdmirror: rbd import cmd stuck forever
2024-11-26 10:11:05 -07:00
parent cc400ea35e 996a88f902
commit df958b3bec
1 changed files with 2 additions and 1 deletions
@@ -27,6 +27,7 @@ import (
 	cephv1 "github.com/rook/rook/pkg/apis/ceph.rook.io/v1"
 	"github.com/rook/rook/pkg/clusterd"
 	cephver "github.com/rook/rook/pkg/operator/ceph/version"
+	"github.com/rook/rook/pkg/util/exec"
 	"k8s.io/apimachinery/pkg/util/sets"
 )

@@ -87,7 +88,7 @@ func ImportRBDMirrorBootstrapPeer(context *clusterd.Context, clusterInfo *Cluste
 	cmd := NewRBDCommand(context, clusterInfo, args)

 	// Run command
-	output, err := cmd.Run()
+	output, err := cmd.RunWithTimeout(exec.CephCommandsTimeout)
 	if err != nil {
 		return errors.Wrapf(err, "failed to add rbd-mirror peer token for pool %q. %s", poolName, output)
 	}