Commit 785da59c authored by Jürg Billeter's avatar Jürg Billeter
Browse files

Merge branch 'valentindavid/wrong_type_in_status_code' into 'master' 

Fix type of error codes in CAS server

Closes #882

See merge request !1099
parents 2fcb4491 1c05a092

buildstream/_cas/casserver.py

+3 −3
Original line number Diff line number Diff line
@@ -324,7 +324,7 @@ class _ContentAddressableStorageServicer(remote_execution_pb2_grpc.ContentAddres 
            blob_response.digest.size_bytes = digest.size_bytes



            if len(blob_request.data) != digest.size_bytes:

                blob_response.status.code = grpc.StatusCode.FAILED_PRECONDITION

                blob_response.status.code = code_pb2.FAILED_PRECONDITION

                continue



            try:
@@ -335,10 +335,10 @@ class _ContentAddressableStorageServicer(remote_execution_pb2_grpc.ContentAddres 
                    out.flush()

                    server_digest = self.cas.add_object(path=out.name)

                    if server_digest.hash != digest.hash:

                        blob_response.status.code = grpc.StatusCode.FAILED_PRECONDITION

                        blob_response.status.code = code_pb2.FAILED_PRECONDITION



            except ArtifactTooLargeException:

                blob_response.status.code = grpc.StatusCode.RESOURCE_EXHAUSTED

                blob_response.status.code = code_pb2.RESOURCE_EXHAUSTED



        return response