[utasks] Delete unused code (#3627)

We're not filtering queue tasks.

Author: jonathanmetzman

src/clusterfuzz/_internal/base/tasks.py

@@ -80,9 +80,6 @@
 TASK_PAYLOAD_KEY = 'task_payload'
 TASK_END_TIME_KEY = 'task_end_time'
 
-FILTERS_AND = ' AND '
-FILTERS_OR = ' OR '
-
 POSTPROCESS_QUEUE = 'postprocess'
 
 # See https://github.com/google/clusterfuzz/issues/3347 for usage
@@ -210,42 +207,6 @@ def get_regular_task(queue=None):
       return task
 
 
-# TODO(metzman): Use this function so that linux bots can execute preprocess and
-# postprocess of every utask.
-def get_utask_filters(is_chromium, is_linux):
-  """Returns a string containing filters for pubsub commands. If |is_chromium|
-  and |is_linux| the filters filter out all commands that are not the trusted
-  portions (preprocess and postprocess of utasks). The filter should be used to
-  read from non-linux queues so linux bots can do the trusted preprocess step of
-  non-linux utasks. Otherwise the filters should be used when reading from the
-  bot's "normal" queue to filter out these preprocess/postprocess steps."""
-  if not is_chromium:
-    # Execute all tasks on one machine outside of chrome for now.
-    return None
-
-  # Import here to avoid import errors on webapp.
-  from clusterfuzz._internal.bot.tasks import task_types
-
-  # See https://cloud.google.com/pubsub/docs/subscription-message-filter for
-  # syntax.
-  utask_trusted_portions = task_types.get_utask_trusted_portions()
-  if is_linux:
-    pubsub_filters = [
-        f'attribute.name = {task}' for task in utask_trusted_portions
-    ]
-  else:
-    pubsub_filters = [
-        f'-attribute.name = {task}' for task in utask_trusted_portions
-    ]
-  pubsub_filter = FILTERS_AND.join(pubsub_filters)
-  return pubsub_filter
-
-
-def get_ttask_commands_queues():
-  """Get queues tworkers should be querying for ttask commands. (i.e. tworkers
-  on Linux will need to know about the Windows and Mac queues)."""
-
-
 def get_machine_template_for_queue(queue_name):
   """Gets the machine template for the instance used to execute a task from
   |queue_name|. This will be used by tworkers to schedule the appropriate

src/clusterfuzz/_internal/google_cloud_utils/pubsub.py

@@ -123,7 +123,7 @@ def modify_ack_deadline(self, subscription, ack_ids, seconds):
     """Modify acknowledgement deadline of messages."""
     body = {
         'ackIds': ack_ids,
-        'ackDeadlineSeconds': int(seconds),  # since time.time() is float.
+        'ackDeadlineSeconds': int(seconds),  # Since time.time() is float.
     }
 
     request = self._api_client().projects().subscriptions().modifyAckDeadline(

src/clusterfuzz/_internal/tests/core/base/tasks_test.py

@@ -78,46 +78,6 @@ def test_initialize_untrusted_task(self):
     self.assertEqual(task.job, 'none')
 
 
-class GetUtaskFiltersTest(unittest.TestCase):
-  """Tests for get_utask_filters."""
-
-  # TODO(metzman): Restore tests when feature is used.
-  # def test_chromium_linux(self):
-  #   """Tests that the get_utask_filters only has linux bots in chrome
-  #   clusterfuzz executing preprocess. This test is temporary and
-  #   will be removed when the migration is complete."""
-  #   # TOOD(metzman): Delete this test when it is no longer needed.
-  #   filters = tasks.get_utask_filters(is_chromium=True, is_linux=True)
-  #   self.assertEqual(
-  #       filters,
-  #       'attribute.name = analyze AND attribute.name = postprocess AND attribute.name = variant'
-  #   )
-
-  # def test_chromium_nonlinux(self):
-  #   """Tests that the get_utask_filters only has linux bots in chrome
-  #   clusterfuzz executing preprocess and postprocess. This test is temporary and
-  #   will be removed when the migration is complete."""
-  #   # TOOD(metzman): Delete this test when it is no longer needed.
-  #   filters = tasks.get_utask_filters(is_chromium=True, is_linux=False)
-  #   # Analyze will be begun only on Linux bots.
-  #   self.assertEqual(
-  #       filters,
-  #       '-attribute.name = analyze AND -attribute.name = postprocess AND -attribute.name = variant'
-  #   )
-
-  def test_external_linux(self):
-    """Tests that the get_utask_filters only has linux bots in chrome
-    clusterfuzz executing preprocess and postprocess."""
-    filters = tasks.get_utask_filters(is_chromium=False, is_linux=True)
-    self.assertIsNone(filters)
-
-  def test_external_nonlinux(self):
-    """Tests that the get_utask_filters only has linux bots in chrome
-    clusterfuzz executing preprocess and postprocess."""
-    filters = tasks.get_utask_filters(is_chromium=False, is_linux=False)
-    self.assertIsNone(filters)
-
-
 class GetMachineTemplateForQueueTests(unittest.TestCase):
   """Tests that we know the specs of an instance to launch a batch task on."""