diff --git a/buildgrid/server/actioncache/service.py b/buildgrid/server/actioncache/service.py index 3d29bdcafe6f09c3256ebb8cbbe263684622249b..871bfe671c886cb2eb10922e70f83909a3aec82c 100644 --- a/buildgrid/server/actioncache/service.py +++ b/buildgrid/server/actioncache/service.py @@ -42,8 +42,9 @@ class ActionCacheService(remote_execution_pb2_grpc.ActionCacheServicer): self._instances[name] = instance def GetActionResult(self, request, context): + self.__logger.debug("GetActionResult request from [%s]", context.peer()) + try: - self.__logger.debug("GetActionResult request from [%s]", context.peer()) instance = self._get_instance(request.instance_name) return instance.get_action_result(request.action_digest) @@ -59,8 +60,9 @@ class ActionCacheService(remote_execution_pb2_grpc.ActionCacheServicer): return remote_execution_pb2.ActionResult() def UpdateActionResult(self, request, context): + self.__logger.debug("UpdateActionResult request from [%s]", context.peer()) + try: - self.__logger.debug("UpdateActionResult request from [%s]", context.peer()) instance = self._get_instance(request.instance_name) instance.update_action_result(request.action_digest, request.action_result) return request.action_result diff --git a/buildgrid/server/bots/service.py b/buildgrid/server/bots/service.py index 26651de95558f1cec24907ea2fe140500dd42276..957a621e84959e350ddfe16059ce74cbe0c2d461 100644 --- a/buildgrid/server/bots/service.py +++ b/buildgrid/server/bots/service.py @@ -43,8 +43,9 @@ class BotsService(bots_pb2_grpc.BotsServicer): self._instances[name] = instance def CreateBotSession(self, request, context): + self.__logger.debug("CreateBotSession request from [%s]", context.peer()) + try: - self.__logger.debug("CreateBotSession request from [%s]", context.peer()) parent = request.parent instance = self._get_instance(request.parent) return instance.create_bot_session(parent, @@ -58,8 +59,9 @@ class BotsService(bots_pb2_grpc.BotsServicer): return bots_pb2.BotSession() def UpdateBotSession(self, request, context): + self.__logger.debug("UpdateBotSession request from [%s]", context.peer()) + try: - self.__logger.debug("UpdateBotSession request from [%s]", context.peer()) names = request.name.split("/") # Operation name should be in format: # {instance/name}/{uuid} @@ -87,7 +89,8 @@ class BotsService(bots_pb2_grpc.BotsServicer): return bots_pb2.BotSession() def PostBotEventTemp(self, request, context): - self.__logger.debug("PostBotEventTemp request from [%s]", context.peer()) + self.__logger.debug("PostBotEventTemp request from [%s]", context.peer()) + context.set_code(grpc.StatusCode.UNIMPLEMENTED) return Empty() diff --git a/buildgrid/server/cas/service.py b/buildgrid/server/cas/service.py index 9a33b7e5430b8ad93f1f7f4f99dcd3783397b757..781b322211398bea186aaf0a8f71d01442c8c712 100644 --- a/buildgrid/server/cas/service.py +++ b/buildgrid/server/cas/service.py @@ -45,11 +45,12 @@ class ContentAddressableStorageService(remote_execution_pb2_grpc.ContentAddressa self._instances[name] = instance def FindMissingBlobs(self, request, context): + self.__logger.debug("FindMissingBlobs request from [%s]", context.peer()) + try: - self.__logger.debug("FindMissingBlobs request: [%s]", request) instance = self._get_instance(request.instance_name) response = instance.find_missing_blobs(request.blob_digests) - self.__logger.debug("FindMissingBlobs response: [%s]", response) + return response except InvalidArgumentError as e: @@ -60,11 +61,12 @@ class ContentAddressableStorageService(remote_execution_pb2_grpc.ContentAddressa return remote_execution_pb2.FindMissingBlobsResponse() def BatchUpdateBlobs(self, request, context): + self.__logger.debug("BatchUpdateBlobs request from [%s]", context.peer()) + try: - self.__logger.debug("BatchUpdateBlobs request: [%s]", request) instance = self._get_instance(request.instance_name) response = instance.batch_update_blobs(request.requests) - self.__logger.debug("FindMissingBlobs response: [%s]", response) + return response except InvalidArgumentError as e: @@ -75,12 +77,16 @@ class ContentAddressableStorageService(remote_execution_pb2_grpc.ContentAddressa return remote_execution_pb2.BatchReadBlobsResponse() def BatchReadBlobs(self, request, context): + self.__logger.debug("BatchReadBlobs request from [%s]", context.peer()) + context.set_code(grpc.StatusCode.UNIMPLEMENTED) context.set_details('Method not implemented!') return remote_execution_pb2.BatchReadBlobsResponse() def GetTree(self, request, context): + self.__logger.debug("GetTree request from [%s]", context.peer()) + context.set_code(grpc.StatusCode.UNIMPLEMENTED) context.set_details('Method not implemented!') @@ -107,8 +113,9 @@ class ByteStreamService(bytestream_pb2_grpc.ByteStreamServicer): self._instances[name] = instance def Read(self, request, context): + self.__logger.debug("Read request from [%s]", context.peer()) + try: - self.__logger.debug("Read request: [%s]", request) path = request.resource_name.split("/") instance_name = path[0] @@ -148,13 +155,12 @@ class ByteStreamService(bytestream_pb2_grpc.ByteStreamServicer): context.set_code(grpc.StatusCode.OUT_OF_RANGE) yield bytestream_pb2.ReadResponse() - self.__logger.debug("Read finished.") - def Write(self, requests, context): + self.__logger.debug("Write request from [%s]", context.peer()) + try: requests, request_probe = tee(requests, 2) first_request = next(request_probe) - self.__logger.debug("First write request: [%s]", first_request) path = first_request.resource_name.split("/") @@ -175,7 +181,7 @@ class ByteStreamService(bytestream_pb2_grpc.ByteStreamServicer): instance = self._get_instance(instance_name) response = instance.write(requests) - self.__logger.debug("Write response: [%s]", response) + return response except NotImplementedError as e: diff --git a/buildgrid/server/execution/service.py b/buildgrid/server/execution/service.py index 7ae5acb1e2a333926e8c66706269ed9aab8c5ee5..698346dd87fec625080cfec2715cce2109d5392f 100644 --- a/buildgrid/server/execution/service.py +++ b/buildgrid/server/execution/service.py @@ -43,8 +43,9 @@ class ExecutionService(remote_execution_pb2_grpc.ExecutionServicer): self._instances[name] = instance def Execute(self, request, context): + self.__logger.debug("Execute request from [%s]", context.peer()) + try: - self.__logger.debug("Execute request from [%s]", context.peer()) message_queue = queue.Queue() instance = self._get_instance(request.instance_name) operation = instance.execute(request.action_digest, @@ -79,8 +80,9 @@ class ExecutionService(remote_execution_pb2_grpc.ExecutionServicer): yield operations_pb2.Operation() def WaitExecution(self, request, context): + self.__logger.debug("WaitExecution request from [%s]", context.peer()) + try: - self.__logger.debug("WaitExecution request from [%s]", context.peer()) names = request.name.split("/") # Operation name should be in format: diff --git a/buildgrid/server/operations/service.py b/buildgrid/server/operations/service.py index 2e4cf29b499c92564829ccd6110caefce713e33c..aef12f837f879fa9a55c804d98a0952dd4fdd7b9 100644 --- a/buildgrid/server/operations/service.py +++ b/buildgrid/server/operations/service.py @@ -42,8 +42,9 @@ class OperationsService(operations_pb2_grpc.OperationsServicer): self._instances[name] = instance def GetOperation(self, request, context): + self.__logger.debug("GetOperation request from [%s]", context.peer()) + try: - self.__logger.debug("GetOperation request from [%s]", context.peer()) name = request.name instance_name = self._parse_instance_name(name) @@ -64,8 +65,9 @@ class OperationsService(operations_pb2_grpc.OperationsServicer): return operations_pb2.Operation() def ListOperations(self, request, context): + self.__logger.debug("ListOperations request from [%s]", context.peer()) + try: - self.__logger.debug("ListOperations request from [%s]", context.peer()) # The request name should be the collection name # In our case, this is just the instance_name instance_name = request.name @@ -88,8 +90,9 @@ class OperationsService(operations_pb2_grpc.OperationsServicer): return operations_pb2.ListOperationsResponse() def DeleteOperation(self, request, context): + self.__logger.debug("DeleteOperation request from [%s]", context.peer()) + try: - self.__logger.debug("DeleteOperation request from [%s]", context.peer()) name = request.name instance_name = self._parse_instance_name(name) @@ -106,8 +109,9 @@ class OperationsService(operations_pb2_grpc.OperationsServicer): return Empty() def CancelOperation(self, request, context): + self.__logger.debug("CancelOperation request from [%s]", context.peer()) + try: - self.__logger.debug("CancelOperation request from [%s]", context.peer()) name = request.name instance_name = self._parse_instance_name(name) diff --git a/buildgrid/server/referencestorage/service.py b/buildgrid/server/referencestorage/service.py index a1a197c6f68199f6712e6824a68c706968e166b8..1e8a0f012f06052c6f083514dbd42a6d1eadc345 100644 --- a/buildgrid/server/referencestorage/service.py +++ b/buildgrid/server/referencestorage/service.py @@ -35,6 +35,8 @@ class ReferenceStorageService(buildstream_pb2_grpc.ReferenceStorageServicer): self._instances[name] = instance def GetReference(self, request, context): + self.__logger.debug("GetReference request from [%s]", context.peer()) + try: instance = self._get_instance(request.instance_name) digest = instance.get_digest_reference(request.key) @@ -54,6 +56,8 @@ class ReferenceStorageService(buildstream_pb2_grpc.ReferenceStorageServicer): return buildstream_pb2.GetReferenceResponse() def UpdateReference(self, request, context): + self.__logger.debug("UpdateReference request from [%s]", context.peer()) + try: instance = self._get_instance(request.instance_name) digest = request.digest @@ -72,6 +76,8 @@ class ReferenceStorageService(buildstream_pb2_grpc.ReferenceStorageServicer): return buildstream_pb2.UpdateReferenceResponse() def Status(self, request, context): + self.__logger.debug("Status request from [%s]", context.peer()) + try: instance = self._get_instance(request.instance_name) allow_updates = instance.allow_updates