Create utasks properly on tworkers (#4421)

Author: jonathanmetzman

src/clusterfuzz/_internal/bot/tasks/commands.py

@@ -196,12 +196,15 @@ def get_command_object(task_name):
   if not environment.is_tworker():
     return task
 
+  if task_name in {'postprocess', 'uworker_main'}:
+    return task
+
   if isinstance(task, task_types.TrustedTask):
     # We don't need to execute this remotely.
     return task
 
   # Force remote execution.
-  return task_types.UTask(task_name)
+  return task_types.UTask(_COMMAND_MODULE_MAP[task_name])
 
 
 def run_command(task_name, task_argument, job_name, uworker_env):

src/clusterfuzz/_internal/bot/tasks/task_types.py

@@ -128,7 +128,9 @@ def execute(self, task_argument, job_type, uworker_env):
     """Executes a utask."""
     logs.info('Executing utask.')
     command = task_utils.get_command_from_module(self.module.__name__)
-    if not is_remote_utask(command, job_type):
+    # TODO(metzman): This is really complicated because of the need to test
+    # remote execution. This is no longer a need, so simplify this.
+    if not (environment.is_tworker() or is_remote_utask(command, job_type)):
       self.execute_locally(task_argument, job_type, uworker_env)
       return