Refactor task enqueuing

appengine/gce-backend/instance_group_managers.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 operating on instance group managers."""
 
 import collections
 import json
 import logging
 
 from google.appengine.ext import ndb
 
 from components import gce
 from components import net
-from components import utils
 
 import instance_templates
 import models
+import utilities
 
 
 def get_instance_group_manager_key(base_name, revision, zone):
   """Returns a key for an InstanceTemplateGroupManager.
 
   Args:
     base_name: Base name for the models.InstanceTemplate.
     revision: Revision string for the models.InstanceTemplateRevision.
     zone: Zone for the models.InstanceGroupManager.
 
@@ skipping 155 matching lines @@
   # InstanceGroupManager could be out of date and may already have a task
   # scheduled/completed. In either case it doesn't matter since we make
   # creating an instance group manager and updating the URL idempotent.
   for instance_template in models.InstanceTemplate.query():
     if instance_template.active:
       instance_template_revision = instance_template.active.get()
       if instance_template_revision and instance_template_revision.url:
         for instance_group_manager_key in instance_template_revision.active:
           instance_group_manager = instance_group_manager_key.get()
           if instance_group_manager and not instance_group_manager.url:
-            if not utils.enqueue_task(
-                '/internal/queues/create-instance-group-manager',
-                'create-instance-group-manager',
-                params={
-                    'key': instance_group_manager_key.urlsafe(),
-                },
-            ):
-              logging.warning(
-                  'Failed to enqueue task for InstanceGroupManager: %s',
-                  instance_group_manager_key,
-              )
+            utilities.enqueue_task(
+                'create-instance-group-manager', instance_group_manager_key)
 
 
 def get_instance_group_manager_to_delete(key):
   """Returns the URL of the instance group manager to delete.
 
   Args:
     key: ndb.Key for a models.InstanceGroupManager entity.
 
   Returns:
     The URL of the instance group manager to delete, or None if there isn't one.
@@ skipping 68 matching lines @@
 
   return keys
 
 
 def schedule_deletion():
   """Enqueues tasks to delete drained instance group managers."""
   for key in get_drained_instance_group_managers():
     instance_group_manager = key.get()
     if instance_group_manager:
       if instance_group_manager.url and not instance_group_manager.instances:
-        if not utils.enqueue_task(
-            '/internal/queues/delete-instance-group-manager',
-            'delete-instance-group-manager',
-            params={
-                'key': key.urlsafe(),
-            },
-        ):
-          logging.warning(
-            'Failed to enqueue task for InstanceGroupManager: %s', key)
+        utilities.enqueue_task('delete-instance-group-manager', key)
 
 
 def resize(key):
   """Resizes the given instance group manager.
 
   Args:
     key: ndb.Key for a models.InstanceGroupManager entity.
   """
   # To avoid a massive resize, impose a limit on how much larger we can
   # resize the instance group. Repeated calls will eventually allow the
@@ skipping 68 matching lines @@
   api.resize_managed_instance_group(response['name'], key.id(), target_size)
 
 
 def schedule_resize():
   """Enqueues tasks to resize instance group managers."""
   for instance_template in models.InstanceTemplate.query():
     if instance_template.active:
       instance_template_revision = instance_template.active.get()
       if instance_template_revision:
         for instance_group_manager_key in instance_template_revision.active:
-          if not utils.enqueue_task(
-              '/internal/queues/resize-instance-group',
-              'resize-instance-group',
-              params={
-                  'key': instance_group_manager_key.urlsafe(),
-              },
-          ):
-            logging.warning(
-                'Failed to enqueue task for InstanceGroupManager: %s',
-                instance_group_manager_key,
-            )
+          utilities.enqueue_task(
+              'resize-instance-group', instance_group_manager_key)
 
 
 def count_instances():
   """Counts the number of instances owned by each instance template.
 
   Returns:
     A dict mapping instance template name to count of instances.
   """
   # Aggregate the number of instances owned by each instance group manager
   # created for each instance template.
   totals = collections.defaultdict(int)
   for instance_group_manager in models.InstanceGroupManager.query():
     instance_template_name = instance_group_manager.key.parent().parent().id()
     totals[instance_template_name] += len(instance_group_manager.instances)
   return totals