Refactor task enqueuing

appengine/gce-backend/cleanup.py

 # Copyright 2016 The LUCI Authors. All rights reserved.
 # Use of this source code is governed under the Apache License, Version 2.0
 # that can be found in the LICENSE file.
 
 """Utilities for cleaning up GCE Backend."""
 
 import datetime
 import logging
 
 from google.appengine.ext import ndb
@@ skipping 210 matching lines @@
 
   if not exists(instance.url):
     # When the instance isn't found, assume it's deleted.
     set_instance_deleted(key, False)
 
 
 def schedule_deleted_instance_check():
   """Enqueues tasks to check for deleted instances."""
   for instance in models.Instance.query():
     if instance.pending_deletion and not instance.deleted:
-      if not utils.enqueue_task(
-          '/internal/queues/check-deleted-instance',
-          'check-deleted-instance',
-          params={
-              'key': instance.key.urlsafe(),
-          },
-      ):
-        logging.warning('Failed to enqueue task for Instance: %s', instance.key)
+      utilities.enqueue_task('check-deleted-instance', instance.key)
 
 
 @ndb.transactional
 def cleanup_deleted_instance(key):
   """Deletes the given Instance.
 
   Args:
     key: ndb.Key for a models.Instance entity.
   """
   instance = key.get()
@@ skipping 17 matching lines @@
   # which gets deleted before it finishes, and at the end of the queue it may
   # incorrectly create an entity for that deleted instance. Since task queues
   # can take at most 10 minutes, we can avoid the race condition by deleting
   # only those entities referring to instances which were detected as having
   # been deleted >10 minutes ago. Here we use 20 minutes for safety.
   THRESHOLD = 60 * 20
   now = utils.utcnow()
 
   for instance in models.Instance.query():
     if instance.deleted and (now - instance.last_updated).seconds > THRESHOLD:
-      if not utils.enqueue_task(
-          '/internal/queues/cleanup-deleted-instance',
-          'cleanup-deleted-instance',
-          params={
-              'key': instance.key.urlsafe(),
-          },
-      ):
-        logging.warning('Failed to enqueue task for Instance: %s', instance.key)
+      utilities.enqueue_task('cleanup-deleted-instance', instance.key)
 
 
 def cleanup_drained_instance(key):
   """Deletes the given drained Instance.
 
   Args:
     key: ndb.Key for a models.Instance entity.
   """
   instance = key.get()
   if not instance:
@@ skipping 39 matching lines @@
 
 def schedule_drained_instance_cleanup():
   """Enqueues tasks to clean up drained instances."""
   for instance_group_manager_key in (
       instance_group_managers.get_drained_instance_group_managers()):
     instance_group_manager = instance_group_manager_key.get()
     if instance_group_manager:
       for instance_key in instance_group_manager.instances:
         instance = instance_key.get()
         if instance and not instance.cataloged:
-          if not utils.enqueue_task(
-              '/internal/queues/cleanup-drained-instance',
-              'cleanup-drained-instance',
-              params={
-                  'key': instance.key.urlsafe(),
-              },
-          ):
-            logging.warning(
-              'Failed to enqueue task for Instance: %s', instance.key)
+          utilities.enqueue_task('cleanup-drained-instance', instance.key)