Merge remote branch 'cros/upstream' into master

scheduler/metahost_scheduler.py

 from autotest_lib.client.common_lib import utils
 
 class HostSchedulingUtility(object):
     """Interface to host availability information from the scheduler."""
     def hosts_in_label(self, label_id):
         """Return potentially usable hosts with the given label."""
         raise NotImplementedError
 
 
     def remove_host_from_label(self, host_id, label_id):
@@ skipping 36 matching lines @@
         """Return true if this object can schedule the given queue entry.
 
         At most one MetahostScheduler should return true for any given entry.
 
         @param queue_entry: a HostQueueEntry DBObject
         """
         raise NotImplementedError
 
 
     def schedule_metahost(self, queue_entry, scheduling_utility):
-         """Schedule the given queue entry, if possible.
+        """Schedule the given queue entry, if possible.
 
-         This method should make necessary database changes culminating in
-         assigning a host to the given queue entry in the database.  It may
-         take no action if no host can be assigned currently.
+        This method should make necessary database changes culminating in
+        assigning a host to the given queue entry in the database.  It may
+        take no action if no host can be assigned currently.
 
-         @param queue_entry: a HostQueueEntry DBObject
-         @param scheduling_utility: a HostSchedulingUtility object
-         """
-         raise NotImplementedError
+        @param queue_entry: a HostQueueEntry DBObject
+        @param scheduling_utility: a HostSchedulingUtility object
+        """
+        raise NotImplementedError
 
 
     def recovery_on_startup(self):
         """Perform any necessary recovery upon scheduler startup."""
         pass
 
 
     def tick(self):
         """Called once per scheduler cycle; any actions are allowed."""
         pass
@@ skipping 22 matching lines @@
 
             # Remove the host from our cached internal state before returning
             scheduling_utility.remove_host_from_label(host_id, label_id)
             host = scheduling_utility.pop_host(host_id)
             queue_entry.set_host(host)
             return
 
 
 def get_metahost_schedulers():
     return [LabelMetahostScheduler()]