Merge pull request #8492 from cicoyle/fix-wf-running

Fix workflow engine starting when actor runtime is disabled

Author: JoshVanL

pkg/runtime/wfengine/wfengine.go

@@ -26,7 +26,6 @@ import (
 	"github.com/dapr/dapr/pkg/actors"
 	"github.com/dapr/dapr/pkg/actors/targets/workflow"
 	"github.com/dapr/dapr/pkg/config"
-	runtimev1pb "github.com/dapr/dapr/pkg/proto/runtime/v1"
 	"github.com/dapr/dapr/pkg/resiliency"
 	"github.com/dapr/dapr/pkg/runtime/processor"
 	backendactors "github.com/dapr/dapr/pkg/runtime/wfengine/backends/actors"
@@ -146,7 +145,8 @@ func (wfe *engine) RegisterGrpcServer(server *grpc.Server) {
 }
 
 func (wfe *engine) Run(ctx context.Context) error {
-	if wfe.actors.RuntimeStatus().GetRuntimeStatus() == runtimev1pb.ActorRuntime_DISABLED {
+	_, err := wfe.actors.Engine(ctx)
+	if err != nil {
 		<-ctx.Done()
 		return ctx.Err()
 	}

tests/integration/suite/daprd/resources/dapr.go

@@ -21,6 +21,7 @@ import (
 	"github.com/dapr/dapr/tests/integration/framework/process/daprd"
 	"github.com/dapr/dapr/tests/integration/framework/process/exec"
 	"github.com/dapr/dapr/tests/integration/framework/process/logline"
+	"github.com/dapr/dapr/tests/integration/framework/process/placement"
 	"github.com/dapr/dapr/tests/integration/suite"
 )
 
@@ -31,6 +32,7 @@ func init() {
 // dapr ensures that a component with the name `dapr` can be loaded.
 type dapr struct {
 	daprd   *daprd.Daprd
+	place   *placement.Placement
 	logline *logline.LogLine
 }
 
@@ -42,8 +44,13 @@ func (d *dapr) Setup(t *testing.T) []framework.Option {
 		),
 	)
 
-	d.daprd = daprd.New(t, daprd.WithResourceFiles(
-		`apiVersion: dapr.io/v1alpha1
+	d.place = placement.New(t)
+
+	d.daprd = daprd.New(t,
+		daprd.WithPlacementAddresses(d.place.Address()),
+		daprd.WithInMemoryActorStateStore("mystore"),
+		daprd.WithResourceFiles(
+			`apiVersion: dapr.io/v1alpha1
 kind: Component
 metadata:
   name: dapr
@@ -56,10 +63,13 @@ spec:
 		),
 	)
 	return []framework.Option{
-		framework.WithProcesses(d.logline, d.daprd),
+		framework.WithProcesses(d.logline, d.place, d.daprd),
 	}
 }
 
 func (d *dapr) Run(t *testing.T, ctx context.Context) {
+	d.place.WaitUntilRunning(t, ctx)
+	d.daprd.WaitUntilRunning(t, ctx)
+
 	d.logline.EventuallyFoundAll(t)
 }