Start worker even when no workflow/activity registered (#539)

* Start worker even when no workflow/activity registered * fix unit test * fix test
temporalio · Sep 17, 2021 · 16bb227 · 16bb227
1 parent f39757a
commit 16bb227
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 18 deletions.
diff --git a/evictiontest/workflow_cache_eviction_test.go b/evictiontest/workflow_cache_eviction_test.go
@@ -159,7 +159,7 @@ func (s *CacheEvictionSuite) TestResetStickyOnEviction() {
 	s.service.EXPECT().ResetStickyTaskQueue(gomock.Any(), gomock.Any()).DoAndReturn(mockResetStickyTaskQueue).Times(1)
 
 	client := internal.NewServiceClient(s.service, nil, internal.ClientOptions{})
-	workflowWorker := internal.NewAggregatedWorker(client, "taskqueue", worker.Options{})
+	workflowWorker := internal.NewAggregatedWorker(client, "taskqueue", worker.Options{LocalActivityWorkerOnly: true})
 	// this is an arbitrary workflow we use for this test
 	// NOTE: a simple helloworld that doesn't execute an activity
 	// won't work because the workflow will simply just complete

diff --git a/internal/internal_worker.go b/internal/internal_worker.go
@@ -884,25 +884,17 @@ func (aw *AggregatedWorker) Start() error {
 	}
 
 	if !util.IsInterfaceNil(aw.workflowWorker) {
-		if len(aw.registry.getRegisteredWorkflowTypes()) == 0 {
-			aw.logger.Debug("No workflows registered. Skipping workflow worker start")
-		} else {
-			if err := aw.workflowWorker.Start(); err != nil {
-				return err
-			}
+		if err := aw.workflowWorker.Start(); err != nil {
+			return err
 		}
 	}
 	if !util.IsInterfaceNil(aw.activityWorker) {
-		if len(aw.registry.getRegisteredActivities()) == 0 {
-			aw.logger.Debug("No activities registered. Skipping activity worker start")
-		} else {
-			if err := aw.activityWorker.Start(); err != nil {
-				// stop workflow worker.
-				if aw.workflowWorker.worker.isWorkerStarted {
-					aw.workflowWorker.Stop()
-				}
-				return err
+		if err := aw.activityWorker.Start(); err != nil {
+			// stop workflow worker.
+			if aw.workflowWorker.worker.isWorkerStarted {
+				aw.workflowWorker.Stop()
 			}
+			return err
 		}
 	}
 

diff --git a/internal/internal_worker_test.go b/internal/internal_worker_test.go
@@ -1503,8 +1503,8 @@ func (s *internalWorkerTestSuite) TestNoActivitiesOrWorkflows() {
 	assert.Empty(t, w.registry.getRegisteredActivities())
 	assert.Empty(t, w.registry.getRegisteredWorkflowTypes())
 	assert.NoError(t, w.Start())
-	assert.False(t, w.activityWorker.worker.isWorkerStarted)
-	assert.False(t, w.workflowWorker.worker.isWorkerStarted)
+	assert.True(t, w.activityWorker.worker.isWorkerStarted)
+	assert.True(t, w.workflowWorker.worker.isWorkerStarted)
 }
 
 func (s *internalWorkerTestSuite) TestStartWorkerAfterStopped() {