Commit e143fc8a authored by Martin Blanchard's avatar Martin Blanchard
Browse files

scheduler.py: Move out ListOperationsResponse creation

parent c720eeb9
Loading
Loading
Loading
Loading
+5 −1
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ An instance of the LongRunningOperations Service.
import logging

from buildgrid._exceptions import InvalidArgumentError
from buildgrid._protos.google.longrunning import operations_pb2


class OperationsInstance:
@@ -45,7 +46,10 @@ class OperationsInstance:
    def list_operations(self, list_filter, page_size, page_token):
        # TODO: Pages
        # Spec says number of pages and length of a page are optional
        return self._scheduler.get_operations()
        response = operations_pb2.ListOperationsResponse()
        response.operations.extend([job.operation for job in self._scheduler.list_jobs()])

        return response

    def delete_operation(self, name):
        try:
+2 −6
Original line number Diff line number Diff line
@@ -24,7 +24,6 @@ Schedules jobs.
from collections import deque

from buildgrid._exceptions import NotFoundError
from buildgrid._protos.google.longrunning import operations_pb2

from .job import OperationStage, LeaseState

@@ -75,11 +74,8 @@ class Scheduler:
                job.update_operation_stage(OperationStage.QUEUED)
                self.queue.appendleft(job)

    def get_operations(self):
        response = operations_pb2.ListOperationsResponse()
        for v in self.jobs.values():
            response.operations.extend([v.operation])
        return response
    def list_jobs(self):
        return self.jobs.values()

    def update_job_lease_state(self, job_name, lease_state, lease_status=None, lease_result=None):
        job = self.jobs[job_name]