BotsInterface checks to see if lease is cancelled.

buildgrid/server/bots/instance.py

@@ -98,6 +98,11 @@ class BotsInterface:
 
     def _check_lease_state(self, lease):
 
+        # Check for cancelled lease
+        if self._scheduler.get_lease_cancelled(lease.id):
+            return None
+
+        # If not cancelled, update the status
         self._scheduler.update_job_lease(lease)
 
         lease_state = LeaseState(lease.state)

buildgrid/server/job.py

@@ -117,6 +117,10 @@ class Job:
         else:
             return None
 
+    @property
+    def lease_cancelled(self):
+        return self.__lease_cancelled
+
     @property
     def n_tries(self):
         return self._n_tries

buildgrid/server/scheduler.py

@@ -135,6 +135,10 @@ class Scheduler:
         """Returns the lease associated to job, if any have been emitted yet."""
         return self.jobs[job_name].lease
 
+    def get_job_lease_cancelled(self, job_name):
+        """Returns true if the lease is cancelled"""
+        return self.jobs[job_name].lease_cancelled
+
     def get_job_operation(self, job_name):
         """Returns the operation associated to job."""
         return self.jobs[job_name].operation