Fix error scheduling variant for mac (#3628)

Fixes: #3576

Author: jonathanmetzman

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

@@ -285,13 +285,6 @@ def create_postminimize_tasks(testcase):
   schedule_tasks(tasks)
 
 
-def is_remote_utask(task: Task) -> bool:
-  """Returns True if |task| is supposed to be executed remotely (i.e. preprocess
-  utask_main and postprocess on different machines."""
-  command = task.name
-  return task_types.COMMAND_TYPES[command].is_execution_remote()
-
-
 def _preprocess(task: Task) -> None:
   """Runs preprocess portion of task and saves the uworker_input to task."""
   from clusterfuzz._internal.bot.tasks import commands
@@ -320,7 +313,7 @@ def schedule_tasks(tasks: List[Task]):
   uworker_tasks = []
   tasks = [task for task in tasks if task is not None]
   for task in tasks:
-    if not task_types.is_remote_utask(task.name):
+    if not task_types.is_remote_utask(task.name, task.job):
       taskslib.add_task(task.name, task.argument, task.job,
                         task.queue_for_platform)
       logs.log(f'UTask {task.name} not remote.')

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

@@ -69,8 +69,15 @@ def preprocess(self, task_argument, job_type, uworker_env):
     raise NotImplementedError('Child class must implement.')
 
 
-def is_remote_utask(command):
-  return COMMAND_TYPES[command].is_execution_remote()
+def is_remote_utask(command, job):
+  if not COMMAND_TYPES[command].is_execution_remote():
+    return False
+
+  if environment.is_uworker():
+    # Return True even if we can't query the db.
+    return True
+
+  return batch.is_remote_task(command, job)
 
 
 class UTaskLocalExecutor(BaseUTask):
@@ -132,8 +139,7 @@ def execute(self, task_argument, job_type, uworker_env):
 
 def is_remotely_executing_utasks():
   return bool(environment.is_production() and
-              environment.get_value('REMOTE_UTASK_EXECUTION') and
-              environment.platform() == 'LINUX')
+              environment.get_value('REMOTE_UTASK_EXECUTION'))
 
 
 class PostprocessTask(BaseTask):

src/clusterfuzz/_internal/google_cloud_utils/batch.py

@@ -214,6 +214,14 @@ def _get_job(job_name):
   return data_types.Job.query(data_types.Job.name == job_name).get()
 
 
+def is_remote_task(command, job_name):
+  try:
+    _get_spec_from_config(command, job_name)
+    return True
+  except ValueError:
+    return False
+
+
 def _get_spec_from_config(command, job_name):
   """Gets the configured specifications for a batch workload."""
   job = _get_job(job_name)

src/clusterfuzz/_internal/tests/core/bot/tasks/task_types_test.py

@@ -16,7 +16,9 @@
 from unittest import mock
 
 from clusterfuzz._internal.bot.tasks import task_types
+from clusterfuzz._internal.datastore import data_types
 from clusterfuzz._internal.tests.test_libs import helpers
+from clusterfuzz._internal.tests.test_libs import test_utils
 
 
 class UTaskCombinedTest(unittest.TestCase):
@@ -29,3 +31,38 @@ def test_is_remote(self):
         'clusterfuzz._internal.bot.tasks.task_types.is_remotely_executing_utasks',
         return_value=True):
       self.assertTrue(task_types.UTaskCombined.is_execution_remote())
+
+
+@test_utils.with_cloud_emulators('datastore')
+class IsRemoteUtaskTest(unittest.TestCase):
+  """Tests for is_remote_utask."""
+
+  def setUp(self):
+    helpers.patch_environ(self)
+
+  def test_mac(self):
+    job_name = 'libfuzzer_mac_asan'
+
+    with mock.patch(
+        'clusterfuzz._internal.bot.tasks.task_types.is_remotely_executing_utasks',
+        return_value=True):
+      data_types.Job(name=job_name, platform='MAC').put()
+      self.assertFalse(task_types.is_remote_utask('variant', job_name))
+
+  def test_linux(self):
+    job_name = 'libfuzzer_linux_asan'
+
+    with mock.patch(
+        'clusterfuzz._internal.bot.tasks.task_types.is_remotely_executing_utasks',
+        return_value=True):
+      data_types.Job(name=job_name, platform='LINUX').put()
+      self.assertTrue(task_types.is_remote_utask('variant', job_name))
+
+  def test_trusted(self):
+    job_name = 'libfuzzer_linux_asan'
+
+    with mock.patch(
+        'clusterfuzz._internal.bot.tasks.task_types.is_remotely_executing_utasks',
+        return_value=True):
+      data_types.Job(name=job_name, platform='LINUX').put()
+      self.assertFalse(task_types.is_remote_utask('impact', job_name))