[Notes] [Git][BuildGrid/buildgrid][mablanch/117-job-scheduler-refactoring] 5 commits: Rename ExecutionStage to OperationStage for clarity



Title: GitLab

Martin Blanchard pushed to branch mablanch/117-job-scheduler-refactoring at BuildGrid / buildgrid

Commits:

10 changed files:

Changes:

  • buildgrid/_app/bots/buildbox.py
    ... ... @@ -17,8 +17,6 @@ import os
    17 17
     import subprocess
    
    18 18
     import tempfile
    
    19 19
     
    
    20
    -from google.protobuf import any_pb2
    
    21
    -
    
    22 20
     from buildgrid.client.cas import download, upload
    
    23 21
     from buildgrid._exceptions import BotError
    
    24 22
     from buildgrid._protos.build.bazel.remote.execution.v2 import remote_execution_pb2
    
    ... ... @@ -29,13 +27,14 @@ from buildgrid.utils import read_file, write_file
    29 27
     def work_buildbox(context, lease):
    
    30 28
         """Executes a lease for a build action, using buildbox.
    
    31 29
         """
    
    32
    -
    
    33 30
         local_cas_directory = context.local_cas
    
    34 31
         # instance_name = context.parent
    
    35 32
         logger = context.logger
    
    36 33
     
    
    37 34
         action_digest = remote_execution_pb2.Digest()
    
    35
    +
    
    38 36
         lease.payload.Unpack(action_digest)
    
    37
    +    lease.result.Clear()
    
    39 38
     
    
    40 39
         with download(context.cas_channel) as downloader:
    
    41 40
             action = downloader.get_message(action_digest,
    
    ... ... @@ -131,10 +130,7 @@ def work_buildbox(context, lease):
    131 130
     
    
    132 131
                 action_result.output_directories.extend([output_directory])
    
    133 132
     
    
    134
    -            action_result_any = any_pb2.Any()
    
    135
    -            action_result_any.Pack(action_result)
    
    136
    -
    
    137
    -            lease.result.CopyFrom(action_result_any)
    
    133
    +            lease.result.Pack(action_result)
    
    138 134
     
    
    139 135
         return lease
    
    140 136
     
    

  • buildgrid/_app/bots/host.py
    ... ... @@ -17,8 +17,6 @@ import os
    17 17
     import subprocess
    
    18 18
     import tempfile
    
    19 19
     
    
    20
    -from google.protobuf import any_pb2
    
    21
    -
    
    22 20
     from buildgrid.client.cas import download, upload
    
    23 21
     from buildgrid._protos.build.bazel.remote.execution.v2 import remote_execution_pb2
    
    24 22
     from buildgrid.utils import output_file_maker, output_directory_maker
    
    ... ... @@ -27,12 +25,13 @@ from buildgrid.utils import output_file_maker, output_directory_maker
    27 25
     def work_host_tools(context, lease):
    
    28 26
         """Executes a lease for a build action, using host tools.
    
    29 27
         """
    
    30
    -
    
    31 28
         instance_name = context.parent
    
    32 29
         logger = context.logger
    
    33 30
     
    
    34 31
         action_digest = remote_execution_pb2.Digest()
    
    32
    +
    
    35 33
         lease.payload.Unpack(action_digest)
    
    34
    +    lease.result.Clear()
    
    36 35
     
    
    37 36
         with tempfile.TemporaryDirectory() as temp_directory:
    
    38 37
             with download(context.cas_channel, instance=instance_name) as downloader:
    
    ... ... @@ -122,9 +121,6 @@ def work_host_tools(context, lease):
    122 121
     
    
    123 122
                 action_result.output_directories.extend(output_directories)
    
    124 123
     
    
    125
    -        action_result_any = any_pb2.Any()
    
    126
    -        action_result_any.Pack(action_result)
    
    127
    -
    
    128
    -        lease.result.CopyFrom(action_result_any)
    
    124
    +        lease.result.Pack(action_result)
    
    129 125
     
    
    130 126
         return lease

  • buildgrid/server/bots/instance.py
    ... ... @@ -109,7 +109,8 @@ class BotsInterface:
    109 109
             if server_state == LeaseState.PENDING:
    
    110 110
     
    
    111 111
                 if client_state == LeaseState.ACTIVE:
    
    112
    -                self._scheduler.update_job_lease_state(client_lease.id, client_lease.state)
    
    112
    +                self._scheduler.update_job_lease_state(client_lease.id,
    
    113
    +                                                       LeaseState.ACTIVE)
    
    113 114
                 elif client_state == LeaseState.COMPLETED:
    
    114 115
                     # TODO: Lease was rejected
    
    115 116
                     raise NotImplementedError("'Not Accepted' is unsupported")
    
    ... ... @@ -122,8 +123,10 @@ class BotsInterface:
    122 123
                     pass
    
    123 124
     
    
    124 125
                 elif client_state == LeaseState.COMPLETED:
    
    125
    -                self._scheduler.update_job_lease_state(client_lease.id, client_lease.state)
    
    126
    -                self._scheduler.job_complete(client_lease.id, client_lease.result, client_lease.status)
    
    126
    +                self._scheduler.update_job_lease_state(client_lease.id,
    
    127
    +                                                       LeaseState.COMPLETED,
    
    128
    +                                                       lease_status=client_lease.status,
    
    129
    +                                                       lease_result=client_lease.result)
    
    127 130
                     return None
    
    128 131
     
    
    129 132
                 else:
    

  • buildgrid/server/execution/instance.py
    ... ... @@ -51,9 +51,9 @@ class ExecutionInstance:
    51 51
             job = Job(action_digest, action.do_not_cache, message_queue)
    
    52 52
             self.logger.info("Operation name: [{}]".format(job.name))
    
    53 53
     
    
    54
    -        self._scheduler.append_job(job, skip_cache_lookup)
    
    54
    +        self._scheduler.queue_job(job, skip_cache_lookup)
    
    55 55
     
    
    56
    -        return job.get_operation()
    
    56
    +        return job.operation
    
    57 57
     
    
    58 58
         def register_message_client(self, name, queue):
    
    59 59
             try:
    

  • buildgrid/server/job.py
    ... ... @@ -11,65 +11,39 @@
    11 11
     # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
    
    12 12
     # See the License for the specific language governing permissions and
    
    13 13
     # limitations under the License.
    
    14
    -#
    
    15
    -# Authors:
    
    16
    -#        Finn Ball <finn ball codethink co uk>
    
    14
    +
    
    17 15
     
    
    18 16
     import logging
    
    19 17
     import uuid
    
    20 18
     from enum import Enum
    
    21 19
     
    
    22
    -from google.protobuf import any_pb2
    
    23
    -
    
    24 20
     from buildgrid._protos.build.bazel.remote.execution.v2 import remote_execution_pb2
    
    25 21
     from buildgrid._protos.google.devtools.remoteworkers.v1test2 import bots_pb2
    
    26 22
     from buildgrid._protos.google.longrunning import operations_pb2
    
    27 23
     
    
    28 24
     
    
    29
    -class ExecuteStage(Enum):
    
    25
    +class OperationStage(Enum):
    
    26
    +    # Initially unknown stage.
    
    30 27
         UNKNOWN = remote_execution_pb2.ExecuteOperationMetadata.Stage.Value('UNKNOWN')
    
    31
    -
    
    32 28
         # Checking the result against the cache.
    
    33 29
         CACHE_CHECK = remote_execution_pb2.ExecuteOperationMetadata.Stage.Value('CACHE_CHECK')
    
    34
    -
    
    35 30
         # Currently idle, awaiting a free machine to execute.
    
    36 31
         QUEUED = remote_execution_pb2.ExecuteOperationMetadata.Stage.Value('QUEUED')
    
    37
    -
    
    38 32
         # Currently being executed by a worker.
    
    39 33
         EXECUTING = remote_execution_pb2.ExecuteOperationMetadata.Stage.Value('EXECUTING')
    
    40
    -
    
    41 34
         # Finished execution.
    
    42 35
         COMPLETED = remote_execution_pb2.ExecuteOperationMetadata.Stage.Value('COMPLETED')
    
    43 36
     
    
    44 37
     
    
    45
    -class BotStatus(Enum):
    
    46
    -    BOT_STATUS_UNSPECIFIED = bots_pb2.BotStatus.Value('BOT_STATUS_UNSPECIFIED')
    
    47
    -
    
    48
    -    # The bot is healthy, and will accept leases as normal.
    
    49
    -    OK = bots_pb2.BotStatus.Value('OK')
    
    50
    -
    
    51
    -    # The bot is unhealthy and will not accept new leases.
    
    52
    -    UNHEALTHY = bots_pb2.BotStatus.Value('UNHEALTHY')
    
    53
    -
    
    54
    -    # The bot has been asked to reboot the host.
    
    55
    -    HOST_REBOOTING = bots_pb2.BotStatus.Value('HOST_REBOOTING')
    
    56
    -
    
    57
    -    # The bot has been asked to shut down.
    
    58
    -    BOT_TERMINATING = bots_pb2.BotStatus.Value('BOT_TERMINATING')
    
    59
    -
    
    60
    -
    
    61 38
     class LeaseState(Enum):
    
    39
    +    # Initially unknown state.
    
    62 40
         LEASE_STATE_UNSPECIFIED = bots_pb2.LeaseState.Value('LEASE_STATE_UNSPECIFIED')
    
    63
    -
    
    64 41
         # The server expects the bot to accept this lease.
    
    65 42
         PENDING = bots_pb2.LeaseState.Value('PENDING')
    
    66
    -
    
    67 43
         # The bot has accepted this lease.
    
    68 44
         ACTIVE = bots_pb2.LeaseState.Value('ACTIVE')
    
    69
    -
    
    70 45
         # The bot is no longer leased.
    
    71 46
         COMPLETED = bots_pb2.LeaseState.Value('COMPLETED')
    
    72
    -
    
    73 47
         # The bot should immediately release all resources associated with the lease.
    
    74 48
         CANCELLED = bots_pb2.LeaseState.Value('CANCELLED')
    
    75 49
     
    
    ... ... @@ -77,18 +51,23 @@ class LeaseState(Enum):
    77 51
     class Job:
    
    78 52
     
    
    79 53
         def __init__(self, action_digest, do_not_cache=False, message_queue=None):
    
    80
    -        self.lease = None
    
    81 54
             self.logger = logging.getLogger(__name__)
    
    82
    -        self.n_tries = 0
    
    83
    -        self.result = None
    
    84
    -        self.result_cached = False
    
    85 55
     
    
    86
    -        self._action_digest = action_digest
    
    87
    -        self._do_not_cache = do_not_cache
    
    88
    -        self._execute_stage = ExecuteStage.UNKNOWN
    
    89 56
             self._name = str(uuid.uuid4())
    
    90
    -        self._operation = operations_pb2.Operation(name=self._name)
    
    57
    +        self._do_not_cache = do_not_cache
    
    58
    +        self._operation = operations_pb2.Operation()
    
    59
    +        self._lease = None
    
    60
    +        self._n_tries = 0
    
    61
    +
    
    62
    +        self.__execute_response = None
    
    63
    +        self.__operation_metadata = remote_execution_pb2.ExecuteOperationMetadata()
    
    64
    +
    
    65
    +        self.__operation_metadata.action_digest.CopyFrom(action_digest)
    
    66
    +        self.__operation_metadata.stage = OperationStage.UNKNOWN.value
    
    67
    +
    
    91 68
             self._operation_update_queues = []
    
    69
    +        self._operation.name = self._name
    
    70
    +        self._operation.done = False
    
    92 71
     
    
    93 72
             if message_queue is not None:
    
    94 73
                 self.register_client(message_queue)
    
    ... ... @@ -99,63 +78,80 @@ class Job:
    99 78
     
    
    100 79
         @property
    
    101 80
         def action_digest(self):
    
    102
    -        return self._action_digest
    
    81
    +        return self.__operation_metadata.action_digest
    
    103 82
     
    
    104 83
         @property
    
    105 84
         def do_not_cache(self):
    
    106 85
             return self._do_not_cache
    
    107 86
     
    
    108
    -    def check_job_finished(self):
    
    109
    -        if not self._operation_update_queues:
    
    110
    -            return self._operation.done
    
    111
    -        return False
    
    87
    +    @property
    
    88
    +    def operation(self):
    
    89
    +        return self._operation
    
    90
    +
    
    91
    +    @property
    
    92
    +    def operation_stage(self):
    
    93
    +        return OperationStage(self.__operation_metadata.state)
    
    94
    +
    
    95
    +    @property
    
    96
    +    def lease(self):
    
    97
    +        return self._lease
    
    98
    +
    
    99
    +    @property
    
    100
    +    def lease_state(self):
    
    101
    +        if self._lease is not None:
    
    102
    +            return LeaseState(self._lease.state)
    
    103
    +        else:
    
    104
    +            return None
    
    105
    +
    
    106
    +    @property
    
    107
    +    def n_tries(self):
    
    108
    +        return self._n_tries
    
    112 109
     
    
    113 110
         def register_client(self, queue):
    
    114 111
             self._operation_update_queues.append(queue)
    
    115
    -        queue.put(self.get_operation())
    
    112
    +        queue.put(self._operation)
    
    116 113
     
    
    117 114
         def unregister_client(self, queue):
    
    118 115
             self._operation_update_queues.remove(queue)
    
    119 116
     
    
    120
    -    def get_operation(self):
    
    121
    -        self._operation.metadata.CopyFrom(self._pack_any(self.get_operation_meta()))
    
    122
    -        if self.result is not None:
    
    123
    -            self._operation.done = True
    
    124
    -            response = remote_execution_pb2.ExecuteResponse(result=self.result,
    
    125
    -                                                            cached_result=self.result_cached)
    
    117
    +    def set_cached_result(self, action_result):
    
    118
    +        self.__execute_response = remote_execution_pb2.ExecuteResponse()
    
    119
    +        self.__execute_response.result.CopyFrom(action_result)
    
    120
    +        self.__execute_response.cached_result = True
    
    126 121
     
    
    127
    -            if not self.result_cached:
    
    128
    -                response.status.CopyFrom(self.lease.status)
    
    122
    +    def create_lease(self):
    
    123
    +        self._lease = bots_pb2.Lease()
    
    124
    +        self._lease.id = self._name
    
    125
    +        self._lease.payload.Pack(self.__operation_metadata.action_digest)
    
    126
    +        self._lease.state = LeaseState.PENDING.value
    
    129 127
     
    
    130
    -            self._operation.response.CopyFrom(self._pack_any(response))
    
    128
    +        return self._lease
    
    131 129
     
    
    132
    -        return self._operation
    
    130
    +    def update_lease_state(self, state, status=None, action_result=None):
    
    131
    +        if state.value == self._lease.state:
    
    132
    +            return
    
    133 133
     
    
    134
    -    def get_operation_meta(self):
    
    135
    -        meta = remote_execution_pb2.ExecuteOperationMetadata()
    
    136
    -        meta.stage = self._execute_stage.value
    
    137
    -        meta.action_digest.CopyFrom(self._action_digest)
    
    134
    +        self._lease.state = state.value
    
    138 135
     
    
    139
    -        return meta
    
    136
    +        if self._lease.state == LeaseState.COMPLETED.value:
    
    137
    +            self.__execute_response = remote_execution_pb2.ExecuteResponse()
    
    138
    +            self.__execute_response.result.CopyFrom(action_result)
    
    139
    +            self.__execute_response.cached_result = False
    
    140
    +            self.__execute_response.status.CopyFrom(status)
    
    140 141
     
    
    141
    -    def create_lease(self):
    
    142
    -        action_digest = self._pack_any(self._action_digest)
    
    142
    +    def update_operation_stage(self, stage):
    
    143
    +        if stage.value == self.__operation_metadata.stage:
    
    144
    +            return
    
    145
    +
    
    146
    +        self.__operation_metadata.stage = stage.value
    
    143 147
     
    
    144
    -        lease = bots_pb2.Lease(id=self.name,
    
    145
    -                               payload=action_digest,
    
    146
    -                               state=LeaseState.PENDING.value)
    
    147
    -        self.lease = lease
    
    148
    -        return lease
    
    148
    +        if self.__operation_metadata.stage == OperationStage.QUEUED.value:
    
    149
    +            self._n_tries += 1
    
    150
    +        elif self.__operation_metadata.stage == OperationStage.COMPLETED.value:
    
    151
    +            self._operation.response.Pack(self.__execute_response)
    
    152
    +            self._operation.done = True
    
    149 153
     
    
    150
    -    def get_operations(self):
    
    151
    -        return operations_pb2.ListOperationsResponse(operations=[self.get_operation()])
    
    154
    +        self._operation.metadata.Pack(self.__operation_metadata)
    
    152 155
     
    
    153
    -    def update_execute_stage(self, stage):
    
    154
    -        self._execute_stage = stage
    
    155 156
             for queue in self._operation_update_queues:
    
    156
    -            queue.put(self.get_operation())
    
    157
    -
    
    158
    -    def _pack_any(self, pack):
    
    159
    -        some_any = any_pb2.Any()
    
    160
    -        some_any.Pack(pack)
    
    161
    -        return some_any
    157
    +            queue.put(self._operation)

  • buildgrid/server/operations/instance.py
    ... ... @@ -22,6 +22,7 @@ An instance of the LongRunningOperations Service.
    22 22
     import logging
    
    23 23
     
    
    24 24
     from buildgrid._exceptions import InvalidArgumentError
    
    25
    +from buildgrid._protos.google.longrunning import operations_pb2
    
    25 26
     
    
    26 27
     
    
    27 28
     class OperationsInstance:
    
    ... ... @@ -45,7 +46,10 @@ class OperationsInstance:
    45 46
         def list_operations(self, list_filter, page_size, page_token):
    
    46 47
             # TODO: Pages
    
    47 48
             # Spec says number of pages and length of a page are optional
    
    48
    -        return self._scheduler.get_operations()
    
    49
    +        response = operations_pb2.ListOperationsResponse()
    
    50
    +        response.operations.extend(self._scheduler.list_operations())
    
    51
    +
    
    52
    +        return response
    
    49 53
     
    
    50 54
         def delete_operation(self, name):
    
    51 55
             try:
    

  • buildgrid/server/scheduler.py
    ... ... @@ -11,9 +11,7 @@
    11 11
     # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
    
    12 12
     # See the License for the specific language governing permissions and
    
    13 13
     # limitations under the License.
    
    14
    -#
    
    15
    -# Authors:
    
    16
    -#        Finn Ball <finn ball codethink co uk>
    
    14
    +
    
    17 15
     
    
    18 16
     """
    
    19 17
     Scheduler
    
    ... ... @@ -25,9 +23,8 @@ from collections import deque
    25 23
     
    
    26 24
     from buildgrid._exceptions import NotFoundError
    
    27 25
     from buildgrid._protos.build.bazel.remote.execution.v2 import remote_execution_pb2
    
    28
    -from buildgrid._protos.google.longrunning import operations_pb2
    
    29 26
     
    
    30
    -from .job import ExecuteStage, LeaseState
    
    27
    +from .job import OperationStage, LeaseState
    
    31 28
     
    
    32 29
     
    
    33 30
     class Scheduler:
    
    ... ... @@ -39,80 +36,76 @@ class Scheduler:
    39 36
             self.jobs = {}
    
    40 37
             self.queue = deque()
    
    41 38
     
    
    42
    -    def register_client(self, name, queue):
    
    43
    -        self.jobs[name].register_client(queue)
    
    39
    +    def register_client(self, job_name, queue):
    
    40
    +        self.jobs[job_name].register_client(queue)
    
    44 41
     
    
    45
    -    def unregister_client(self, name, queue):
    
    46
    -        job = self.jobs[name]
    
    47
    -        job.unregister_client(queue)
    
    48
    -        if job.check_job_finished():
    
    49
    -            del self.jobs[name]
    
    42
    +    def unregister_client(self, job_name, queue):
    
    43
    +        self.jobs[job_name].unregister_client(queue)
    
    50 44
     
    
    51
    -    def append_job(self, job, skip_cache_lookup=False):
    
    45
    +        if self.jobs[job_name].operation.done:
    
    46
    +            del self.jobs[job_name]
    
    47
    +
    
    48
    +    def queue_job(self, job, skip_cache_lookup=False):
    
    52 49
             self.jobs[job.name] = job
    
    50
    +
    
    53 51
             if self._action_cache is not None and not skip_cache_lookup:
    
    52
    +            job.update_operation_stage(OperationStage.CACHE_CHECK)
    
    53
    +
    
    54 54
                 try:
    
    55 55
                     cached_result = self._action_cache.get_action_result(job.action_digest)
    
    56
    +
    
    56 57
                 except NotFoundError:
    
    58
    +                job.update_operation_stage(OperationStage.QUEUED)
    
    57 59
                     self.queue.append(job)
    
    58
    -                job.update_execute_stage(ExecuteStage.QUEUED)
    
    59 60
     
    
    60 61
                 else:
    
    61
    -                job.result = cached_result
    
    62
    -                job.result_cached = True
    
    63
    -                job.update_execute_stage(ExecuteStage.COMPLETED)
    
    62
    +                job.set_cached_result(cached_result)
    
    63
    +                job.update_operation_stage(OperationStage.COMPLETED)
    
    64 64
     
    
    65 65
             else:
    
    66 66
                 self.queue.append(job)
    
    67
    -            job.update_execute_stage(ExecuteStage.QUEUED)
    
    67
    +            job.update_operation_stage(OperationStage.QUEUED)
    
    68 68
     
    
    69
    -    def retry_job(self, name):
    
    70
    -        if name in self.jobs:
    
    71
    -            job = self.jobs[name]
    
    69
    +    def retry_job(self, job_name):
    
    70
    +        if job_name in self.jobs:
    
    71
    +            job = self.jobs[job_name]
    
    72 72
                 if job.n_tries >= self.MAX_N_TRIES:
    
    73 73
                     # TODO: Decide what to do with these jobs
    
    74
    -                job.update_execute_stage(ExecuteStage.COMPLETED)
    
    74
    +                job.update_operation_stage(OperationStage.COMPLETED)
    
    75 75
                     # TODO: Mark these jobs as done
    
    76 76
                 else:
    
    77
    -                job.update_execute_stage(ExecuteStage.QUEUED)
    
    78
    -                job.n_tries += 1
    
    77
    +                job.update_operation_stage(OperationStage.QUEUED)
    
    79 78
                     self.queue.appendleft(job)
    
    80 79
     
    
    81
    -    def job_complete(self, name, result, status):
    
    82
    -        job = self.jobs[name]
    
    83
    -        job.lease.status.CopyFrom(status)
    
    84
    -        action_result = remote_execution_pb2.ActionResult()
    
    85
    -        result.Unpack(action_result)
    
    86
    -        job.result = action_result
    
    87
    -        if not job.do_not_cache and self._action_cache is not None:
    
    88
    -            if not job.lease.status.code:
    
    89
    -                self._action_cache.update_action_result(job.action_digest, action_result)
    
    90
    -        job.update_execute_stage(ExecuteStage.COMPLETED)
    
    91
    -
    
    92
    -    def get_operations(self):
    
    93
    -        response = operations_pb2.ListOperationsResponse()
    
    94
    -        for v in self.jobs.values():
    
    95
    -            response.operations.extend([v.get_operation()])
    
    96
    -        return response
    
    97
    -
    
    98
    -    def update_job_lease_state(self, name, state):
    
    99
    -        job = self.jobs[name]
    
    100
    -        job.lease.state = state
    
    101
    -
    
    102
    -    def get_job_lease(self, name):
    
    103
    -        return self.jobs[name].lease
    
    104
    -
    
    105
    -    def cancel_session(self, name):
    
    106
    -        job = self.jobs[name]
    
    107
    -        state = job.lease.state
    
    108
    -        if state in (LeaseState.PENDING.value, LeaseState.ACTIVE.value):
    
    109
    -            self.retry_job(name)
    
    80
    +    def list_operations(self):
    
    81
    +        return [job.operation for job in self.jobs.values()]
    
    82
    +
    
    83
    +    def update_job_lease_state(self, job_name, lease_state, lease_status=None, lease_result=None):
    
    84
    +        job = self.jobs[job_name]
    
    85
    +        if lease_state != LeaseState.COMPLETED:
    
    86
    +            job.update_lease_state(lease_state)
    
    87
    +        else:
    
    88
    +            action_result = remote_execution_pb2.ActionResult()
    
    89
    +            lease_result.Unpack(action_result)
    
    90
    +
    
    91
    +            job.update_lease_state(lease_state, status=lease_status, action_result=action_result)
    
    92
    +
    
    93
    +            if not job.do_not_cache and self._action_cache is not None:
    
    94
    +                if not job.lease.status.code:
    
    95
    +                    self._action_cache.update_action_result(job.action_digest, action_result)
    
    96
    +
    
    97
    +            job.update_operation_stage(OperationStage.COMPLETED)
    
    98
    +
    
    99
    +    def get_job_lease(self, job_name):
    
    100
    +        return self.jobs[job_name].lease
    
    110 101
     
    
    111 102
         def create_lease(self):
    
    112 103
             if self.queue:
    
    113 104
                 job = self.queue.popleft()
    
    114
    -            job.update_execute_stage(ExecuteStage.EXECUTING)
    
    105
    +            job.update_operation_stage(OperationStage.EXECUTING)
    
    115 106
                 job.create_lease()
    
    116
    -            job.lease.state = LeaseState.PENDING.value
    
    117 107
                 return job.lease
    
    118 108
             return None
    
    109
    +
    
    110
    +    def get_job_operation(self, job_name):
    
    111
    +        return self.jobs[job_name].operation

  • tests/integration/bots_service.py
    ... ... @@ -283,4 +283,4 @@ def _inject_work(scheduler, action_digest=None):
    283 283
         if not action_digest:
    
    284 284
             action_digest = remote_execution_pb2.Digest()
    
    285 285
         j = job.Job(action_digest, False)
    
    286
    -    scheduler.append_job(j, True)
    286
    +    scheduler.queue_job(j, True)

  • tests/integration/execution_service.py
    ... ... @@ -82,7 +82,7 @@ def test_execute(skip_cache_lookup, instance, context):
    82 82
         assert isinstance(result, operations_pb2.Operation)
    
    83 83
         metadata = remote_execution_pb2.ExecuteOperationMetadata()
    
    84 84
         result.metadata.Unpack(metadata)
    
    85
    -    assert metadata.stage == job.ExecuteStage.QUEUED.value
    
    85
    +    assert metadata.stage == job.OperationStage.QUEUED.value
    
    86 86
         assert uuid.UUID(result.name, version=4)
    
    87 87
         assert result.done is False
    
    88 88
     
    
    ... ... @@ -116,7 +116,7 @@ def test_wait_execution(instance, controller, context):
    116 116
         action_result = remote_execution_pb2.ActionResult()
    
    117 117
         action_result_any.Pack(action_result)
    
    118 118
     
    
    119
    -    j.update_execute_stage(job.ExecuteStage.COMPLETED)
    
    119
    +    j.update_operation_stage(job.OperationStage.COMPLETED)
    
    120 120
     
    
    121 121
         response = instance.WaitExecution(request, context)
    
    122 122
     
    
    ... ... @@ -125,7 +125,7 @@ def test_wait_execution(instance, controller, context):
    125 125
         assert isinstance(result, operations_pb2.Operation)
    
    126 126
         metadata = remote_execution_pb2.ExecuteOperationMetadata()
    
    127 127
         result.metadata.Unpack(metadata)
    
    128
    -    assert metadata.stage == job.ExecuteStage.COMPLETED.value
    
    128
    +    assert metadata.stage == job.OperationStage.COMPLETED.value
    
    129 129
         assert uuid.UUID(result.name, version=4)
    
    130 130
         assert result.done is True
    
    131 131
     
    

  • tests/integration/operations_service.py
    ... ... @@ -30,6 +30,7 @@ from buildgrid._protos.google.longrunning import operations_pb2
    30 30
     from buildgrid._protos.google.rpc import status_pb2
    
    31 31
     from buildgrid.server.cas.storage import lru_memory_cache
    
    32 32
     from buildgrid.server.controller import ExecutionController
    
    33
    +from buildgrid.server.job import OperationStage
    
    33 34
     from buildgrid.server.operations import service
    
    34 35
     from buildgrid.server.operations.service import OperationsService
    
    35 36
     from buildgrid.utils import create_digest
    
    ... ... @@ -131,9 +132,10 @@ def test_list_operations_with_result(instance, controller, execute_request, cont
    131 132
         action_result.output_files.extend([output_file])
    
    132 133
     
    
    133 134
         controller.operations_instance._scheduler.jobs[response_execute.name].create_lease()
    
    134
    -    controller.operations_instance._scheduler.job_complete(response_execute.name,
    
    135
    -                                                           _pack_any(action_result),
    
    136
    -                                                           status_pb2.Status())
    
    135
    +    controller.operations_instance._scheduler.update_job_lease_state(response_execute.name,
    
    136
    +                                                                     OperationStage.COMPLETED,
    
    137
    +                                                                     lease_status=status_pb2.Status(),
    
    138
    +                                                                     lease_result=_pack_any(action_result))
    
    137 139
     
    
    138 140
         request = operations_pb2.ListOperationsRequest(name=instance_name)
    
    139 141
         response = instance.ListOperations(request, context)
    



  • [Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]