This is an automated email from the ASF dual-hosted git repository. dimuthuupe pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/airavata-mft.git
commit 3eadd942052d44c606f9120c73415e681afe97d7 Author: Dimuthu Wannipurage <[email protected]> AuthorDate: Tue Feb 21 15:37:05 2023 -0500 Support to delete old transfer status --- api/stub/src/main/proto/MFTTransferApi.proto | 9 ++ .../apache/airavata/mft/admin/MFTConsulClient.java | 6 ++ .../src/airavata_mft_sdk/MFTTransferApi_pb2.py | 90 ++++++++------------ .../airavata_mft_sdk/MFTTransferApi_pb2_grpc.py | 97 +++++++--------------- 4 files changed, 82 insertions(+), 120 deletions(-) diff --git a/api/stub/src/main/proto/MFTTransferApi.proto b/api/stub/src/main/proto/MFTTransferApi.proto index 3629a08..83641d4 100644 --- a/api/stub/src/main/proto/MFTTransferApi.proto +++ b/api/stub/src/main/proto/MFTTransferApi.proto @@ -94,6 +94,14 @@ message FetchResourceMetadataRequest { org.apache.airavata.mft.common.AuthToken mftAuthorizationToken = 3; } +message TransferRemoveRequest { + string transferId = 1; +} + +message TransferRemoveResponse { + bool success = 1; +} + service MFTTransferService { rpc submitTransfer(TransferApiRequest) returns (TransferApiResponse); @@ -106,4 +114,5 @@ service MFTTransferService { rpc resourceMetadata(FetchResourceMetadataRequest) returns (org.apache.airavata.mft.agent.stub.ResourceMetadata); + rpc removeTransfer(TransferRemoveRequest) returns (TransferRemoveResponse); } \ No newline at end of file diff --git a/common/common-clients/src/main/java/org/apache/airavata/mft/admin/MFTConsulClient.java b/common/common-clients/src/main/java/org/apache/airavata/mft/admin/MFTConsulClient.java index d2e0252..faf14f3 100644 --- a/common/common-clients/src/main/java/org/apache/airavata/mft/admin/MFTConsulClient.java +++ b/common/common-clients/src/main/java/org/apache/airavata/mft/admin/MFTConsulClient.java @@ -26,6 +26,7 @@ import com.orbitz.consul.ConsulException; import com.orbitz.consul.KeyValueClient; import com.orbitz.consul.SessionClient; import com.orbitz.consul.model.kv.Value; +import com.orbitz.consul.option.DeleteOptions; import com.orbitz.consul.option.PutOptions; import org.apache.airavata.mft.admin.models.AgentInfo; import org.apache.airavata.mft.admin.models.TransferState; @@ -445,6 +446,11 @@ public class MFTConsulClient { } } + public void removeTransfer(String transferId) { + kvClient.deleteKey(TRANSFER_STATE_PATH + transferId, DeleteOptions.RECURSE); + kvClient.deleteKey(TRANSFER_PROCESSED_PATH + transferId, DeleteOptions.RECURSE); + } + public List<AgentInfo> getLiveAgentInfos() throws MFTConsulClientException { List<String> liveAgentIds = getLiveAgentIds(); return liveAgentIds.stream().map(id -> getAgentInfo(id).get()).collect(Collectors.toList()); diff --git a/python-sdk/src/airavata_mft_sdk/MFTTransferApi_pb2.py b/python-sdk/src/airavata_mft_sdk/MFTTransferApi_pb2.py index 6476263..b197321 100644 --- a/python-sdk/src/airavata_mft_sdk/MFTTransferApi_pb2.py +++ b/python-sdk/src/airavata_mft_sdk/MFTTransferApi_pb2.py @@ -16,7 +16,7 @@ import airavata_mft_sdk.CredCommon_pb2 as CredCommon__pb2 import airavata_mft_sdk.MFTAgentStubs_pb2 as MFTAgentStubs__pb2 -DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x14MFTTransferApi.proto\x12#org.apache.airavata.mft.api.service\x1a\x10\x43redCommon.proto\x1a\x13MFTAgentStubs.proto\"\x9b\x01\n\x10\x43\x61llbackEndpoint\x12P\n\x04type\x18\x01 \x01(\x0e\x32\x42.org.apache.airavata.mft.api.service.CallbackEndpoint.CallbackType\x12\x10\n\x08\x65ndpoint\x18\x02 \x01(\t\"#\n\x0c\x43\x61llbackType\x12\x08\n\x04HTTP\x10\x00\x12\t\n\x05KAFKA\x10\x01\"<\n\rEndpointPaths\x12\x12\n\nsourcePath\x18\x [...] +DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x14MFTTransferApi.proto\x12#org.apache.airavata.mft.api.service\x1a\x10\x43redCommon.proto\x1a\x13MFTAgentStubs.proto\"\x9b\x01\n\x10\x43\x61llbackEndpoint\x12P\n\x04type\x18\x01 \x01(\x0e\x32\x42.org.apache.airavata.mft.api.service.CallbackEndpoint.CallbackType\x12\x10\n\x08\x65ndpoint\x18\x02 \x01(\t\"#\n\x0c\x43\x61llbackType\x12\x08\n\x04HTTP\x10\x00\x12\t\n\x05KAFKA\x10\x01\"<\n\rEndpointPaths\x12\x12\n\nsourcePath\x18\x [...] @@ -25,16 +25,14 @@ _ENDPOINTPATHS = DESCRIPTOR.message_types_by_name['EndpointPaths'] _TRANSFERAPIREQUEST = DESCRIPTOR.message_types_by_name['TransferApiRequest'] _TRANSFERAPIREQUEST_TARGETAGENTSENTRY = _TRANSFERAPIREQUEST.nested_types_by_name['TargetAgentsEntry'] _TRANSFERAPIRESPONSE = DESCRIPTOR.message_types_by_name['TransferApiResponse'] -_HTTPUPLOADAPIREQUEST = DESCRIPTOR.message_types_by_name['HttpUploadApiRequest'] -_HTTPUPLOADAPIRESPONSE = DESCRIPTOR.message_types_by_name['HttpUploadApiResponse'] -_HTTPDOWNLOADAPIREQUEST = DESCRIPTOR.message_types_by_name['HttpDownloadApiRequest'] -_HTTPDOWNLOADAPIRESPONSE = DESCRIPTOR.message_types_by_name['HttpDownloadApiResponse'] _TRANSFERSTATEAPIREQUEST = DESCRIPTOR.message_types_by_name['TransferStateApiRequest'] _TRANSFERSTATERESPONSE = DESCRIPTOR.message_types_by_name['TransferStateResponse'] _TRANSFERSTATESUMMARYRESPONSE = DESCRIPTOR.message_types_by_name['TransferStateSummaryResponse'] _RESOURCEAVAILABILITYRESPONSE = DESCRIPTOR.message_types_by_name['ResourceAvailabilityResponse'] _GETRESOURCEMETADATAFROMIDSREQUEST = DESCRIPTOR.message_types_by_name['GetResourceMetadataFromIDsRequest'] _FETCHRESOURCEMETADATAREQUEST = DESCRIPTOR.message_types_by_name['FetchResourceMetadataRequest'] +_TRANSFERREMOVEREQUEST = DESCRIPTOR.message_types_by_name['TransferRemoveRequest'] +_TRANSFERREMOVERESPONSE = DESCRIPTOR.message_types_by_name['TransferRemoveResponse'] _CALLBACKENDPOINT_CALLBACKTYPE = _CALLBACKENDPOINT.enum_types_by_name['CallbackType'] CallbackEndpoint = _reflection.GeneratedProtocolMessageType('CallbackEndpoint', (_message.Message,), { 'DESCRIPTOR' : _CALLBACKENDPOINT, @@ -72,34 +70,6 @@ TransferApiResponse = _reflection.GeneratedProtocolMessageType('TransferApiRespo }) _sym_db.RegisterMessage(TransferApiResponse) -HttpUploadApiRequest = _reflection.GeneratedProtocolMessageType('HttpUploadApiRequest', (_message.Message,), { - 'DESCRIPTOR' : _HTTPUPLOADAPIREQUEST, - '__module__' : 'MFTTransferApi_pb2' - # @@protoc_insertion_point(class_scope:org.apache.airavata.mft.api.service.HttpUploadApiRequest) - }) -_sym_db.RegisterMessage(HttpUploadApiRequest) - -HttpUploadApiResponse = _reflection.GeneratedProtocolMessageType('HttpUploadApiResponse', (_message.Message,), { - 'DESCRIPTOR' : _HTTPUPLOADAPIRESPONSE, - '__module__' : 'MFTTransferApi_pb2' - # @@protoc_insertion_point(class_scope:org.apache.airavata.mft.api.service.HttpUploadApiResponse) - }) -_sym_db.RegisterMessage(HttpUploadApiResponse) - -HttpDownloadApiRequest = _reflection.GeneratedProtocolMessageType('HttpDownloadApiRequest', (_message.Message,), { - 'DESCRIPTOR' : _HTTPDOWNLOADAPIREQUEST, - '__module__' : 'MFTTransferApi_pb2' - # @@protoc_insertion_point(class_scope:org.apache.airavata.mft.api.service.HttpDownloadApiRequest) - }) -_sym_db.RegisterMessage(HttpDownloadApiRequest) - -HttpDownloadApiResponse = _reflection.GeneratedProtocolMessageType('HttpDownloadApiResponse', (_message.Message,), { - 'DESCRIPTOR' : _HTTPDOWNLOADAPIRESPONSE, - '__module__' : 'MFTTransferApi_pb2' - # @@protoc_insertion_point(class_scope:org.apache.airavata.mft.api.service.HttpDownloadApiResponse) - }) -_sym_db.RegisterMessage(HttpDownloadApiResponse) - TransferStateApiRequest = _reflection.GeneratedProtocolMessageType('TransferStateApiRequest', (_message.Message,), { 'DESCRIPTOR' : _TRANSFERSTATEAPIREQUEST, '__module__' : 'MFTTransferApi_pb2' @@ -142,6 +112,20 @@ FetchResourceMetadataRequest = _reflection.GeneratedProtocolMessageType('FetchRe }) _sym_db.RegisterMessage(FetchResourceMetadataRequest) +TransferRemoveRequest = _reflection.GeneratedProtocolMessageType('TransferRemoveRequest', (_message.Message,), { + 'DESCRIPTOR' : _TRANSFERREMOVEREQUEST, + '__module__' : 'MFTTransferApi_pb2' + # @@protoc_insertion_point(class_scope:org.apache.airavata.mft.api.service.TransferRemoveRequest) + }) +_sym_db.RegisterMessage(TransferRemoveRequest) + +TransferRemoveResponse = _reflection.GeneratedProtocolMessageType('TransferRemoveResponse', (_message.Message,), { + 'DESCRIPTOR' : _TRANSFERREMOVERESPONSE, + '__module__' : 'MFTTransferApi_pb2' + # @@protoc_insertion_point(class_scope:org.apache.airavata.mft.api.service.TransferRemoveResponse) + }) +_sym_db.RegisterMessage(TransferRemoveResponse) + _MFTTRANSFERSERVICE = DESCRIPTOR.services_by_name['MFTTransferService'] if _descriptor._USE_C_DESCRIPTORS == False: @@ -161,26 +145,22 @@ if _descriptor._USE_C_DESCRIPTORS == False: _TRANSFERAPIREQUEST_TARGETAGENTSENTRY._serialized_end=860 _TRANSFERAPIRESPONSE._serialized_start=862 _TRANSFERAPIRESPONSE._serialized_end=903 - _HTTPUPLOADAPIREQUEST._serialized_start=906 - _HTTPUPLOADAPIREQUEST._serialized_end=1104 - _HTTPUPLOADAPIRESPONSE._serialized_start=1106 - _HTTPUPLOADAPIRESPONSE._serialized_end=1163 - _HTTPDOWNLOADAPIREQUEST._serialized_start=1166 - _HTTPDOWNLOADAPIREQUEST._serialized_end=1356 - _HTTPDOWNLOADAPIRESPONSE._serialized_start=1358 - _HTTPDOWNLOADAPIRESPONSE._serialized_end=1417 - _TRANSFERSTATEAPIREQUEST._serialized_start=1419 - _TRANSFERSTATEAPIREQUEST._serialized_end=1538 - _TRANSFERSTATERESPONSE._serialized_start=1540 - _TRANSFERSTATERESPONSE._serialized_end=1643 - _TRANSFERSTATESUMMARYRESPONSE._serialized_start=1646 - _TRANSFERSTATESUMMARYRESPONSE._serialized_end=1811 - _RESOURCEAVAILABILITYRESPONSE._serialized_start=1813 - _RESOURCEAVAILABILITYRESPONSE._serialized_end=1862 - _GETRESOURCEMETADATAFROMIDSREQUEST._serialized_start=1864 - _GETRESOURCEMETADATAFROMIDSREQUEST._serialized_end=1983 - _FETCHRESOURCEMETADATAREQUEST._serialized_start=1986 - _FETCHRESOURCEMETADATAREQUEST._serialized_end=2283 - _MFTTRANSFERSERVICE._serialized_start=2286 - _MFTTRANSFERSERVICE._serialized_end=3336 + _TRANSFERSTATEAPIREQUEST._serialized_start=905 + _TRANSFERSTATEAPIREQUEST._serialized_end=1024 + _TRANSFERSTATERESPONSE._serialized_start=1026 + _TRANSFERSTATERESPONSE._serialized_end=1129 + _TRANSFERSTATESUMMARYRESPONSE._serialized_start=1132 + _TRANSFERSTATESUMMARYRESPONSE._serialized_end=1297 + _RESOURCEAVAILABILITYRESPONSE._serialized_start=1299 + _RESOURCEAVAILABILITYRESPONSE._serialized_end=1348 + _GETRESOURCEMETADATAFROMIDSREQUEST._serialized_start=1350 + _GETRESOURCEMETADATAFROMIDSREQUEST._serialized_end=1469 + _FETCHRESOURCEMETADATAREQUEST._serialized_start=1472 + _FETCHRESOURCEMETADATAREQUEST._serialized_end=1769 + _TRANSFERREMOVEREQUEST._serialized_start=1771 + _TRANSFERREMOVEREQUEST._serialized_end=1814 + _TRANSFERREMOVERESPONSE._serialized_start=1816 + _TRANSFERREMOVERESPONSE._serialized_end=1857 + _MFTTRANSFERSERVICE._serialized_start=1860 + _MFTTRANSFERSERVICE._serialized_end=2764 # @@protoc_insertion_point(module_scope) diff --git a/python-sdk/src/airavata_mft_sdk/MFTTransferApi_pb2_grpc.py b/python-sdk/src/airavata_mft_sdk/MFTTransferApi_pb2_grpc.py index 9cba39d..bd3e6d8 100644 --- a/python-sdk/src/airavata_mft_sdk/MFTTransferApi_pb2_grpc.py +++ b/python-sdk/src/airavata_mft_sdk/MFTTransferApi_pb2_grpc.py @@ -20,16 +20,6 @@ class MFTTransferServiceStub(object): request_serializer=MFTTransferApi__pb2.TransferApiRequest.SerializeToString, response_deserializer=MFTTransferApi__pb2.TransferApiResponse.FromString, ) - self.submitHttpUpload = channel.unary_unary( - '/org.apache.airavata.mft.api.service.MFTTransferService/submitHttpUpload', - request_serializer=MFTTransferApi__pb2.HttpUploadApiRequest.SerializeToString, - response_deserializer=MFTTransferApi__pb2.HttpUploadApiResponse.FromString, - ) - self.submitHttpDownload = channel.unary_unary( - '/org.apache.airavata.mft.api.service.MFTTransferService/submitHttpDownload', - request_serializer=MFTTransferApi__pb2.HttpDownloadApiRequest.SerializeToString, - response_deserializer=MFTTransferApi__pb2.HttpDownloadApiResponse.FromString, - ) self.getAllTransferStates = channel.unary_stream( '/org.apache.airavata.mft.api.service.MFTTransferService/getAllTransferStates', request_serializer=MFTTransferApi__pb2.TransferStateApiRequest.SerializeToString, @@ -50,6 +40,11 @@ class MFTTransferServiceStub(object): request_serializer=MFTTransferApi__pb2.FetchResourceMetadataRequest.SerializeToString, response_deserializer=MFTAgentStubs__pb2.ResourceMetadata.FromString, ) + self.removeTransfer = channel.unary_unary( + '/org.apache.airavata.mft.api.service.MFTTransferService/removeTransfer', + request_serializer=MFTTransferApi__pb2.TransferRemoveRequest.SerializeToString, + response_deserializer=MFTTransferApi__pb2.TransferRemoveResponse.FromString, + ) class MFTTransferServiceServicer(object): @@ -61,37 +56,31 @@ class MFTTransferServiceServicer(object): context.set_details('Method not implemented!') raise NotImplementedError('Method not implemented!') - def submitHttpUpload(self, request, context): + def getAllTransferStates(self, request, context): """Missing associated documentation comment in .proto file.""" context.set_code(grpc.StatusCode.UNIMPLEMENTED) context.set_details('Method not implemented!') raise NotImplementedError('Method not implemented!') - def submitHttpDownload(self, request, context): + def getTransferStateSummary(self, request, context): """Missing associated documentation comment in .proto file.""" context.set_code(grpc.StatusCode.UNIMPLEMENTED) context.set_details('Method not implemented!') raise NotImplementedError('Method not implemented!') - def getAllTransferStates(self, request, context): + def getResourceAvailability(self, request, context): """Missing associated documentation comment in .proto file.""" context.set_code(grpc.StatusCode.UNIMPLEMENTED) context.set_details('Method not implemented!') raise NotImplementedError('Method not implemented!') - def getTransferStateSummary(self, request, context): + def resourceMetadata(self, request, context): """Missing associated documentation comment in .proto file.""" context.set_code(grpc.StatusCode.UNIMPLEMENTED) context.set_details('Method not implemented!') raise NotImplementedError('Method not implemented!') - def getResourceAvailability(self, request, context): - """Missing associated documentation comment in .proto file.""" - context.set_code(grpc.StatusCode.UNIMPLEMENTED) - context.set_details('Method not implemented!') - raise NotImplementedError('Method not implemented!') - - def resourceMetadata(self, request, context): + def removeTransfer(self, request, context): """Missing associated documentation comment in .proto file.""" context.set_code(grpc.StatusCode.UNIMPLEMENTED) context.set_details('Method not implemented!') @@ -105,16 +94,6 @@ def add_MFTTransferServiceServicer_to_server(servicer, server): request_deserializer=MFTTransferApi__pb2.TransferApiRequest.FromString, response_serializer=MFTTransferApi__pb2.TransferApiResponse.SerializeToString, ), - 'submitHttpUpload': grpc.unary_unary_rpc_method_handler( - servicer.submitHttpUpload, - request_deserializer=MFTTransferApi__pb2.HttpUploadApiRequest.FromString, - response_serializer=MFTTransferApi__pb2.HttpUploadApiResponse.SerializeToString, - ), - 'submitHttpDownload': grpc.unary_unary_rpc_method_handler( - servicer.submitHttpDownload, - request_deserializer=MFTTransferApi__pb2.HttpDownloadApiRequest.FromString, - response_serializer=MFTTransferApi__pb2.HttpDownloadApiResponse.SerializeToString, - ), 'getAllTransferStates': grpc.unary_stream_rpc_method_handler( servicer.getAllTransferStates, request_deserializer=MFTTransferApi__pb2.TransferStateApiRequest.FromString, @@ -135,6 +114,11 @@ def add_MFTTransferServiceServicer_to_server(servicer, server): request_deserializer=MFTTransferApi__pb2.FetchResourceMetadataRequest.FromString, response_serializer=MFTAgentStubs__pb2.ResourceMetadata.SerializeToString, ), + 'removeTransfer': grpc.unary_unary_rpc_method_handler( + servicer.removeTransfer, + request_deserializer=MFTTransferApi__pb2.TransferRemoveRequest.FromString, + response_serializer=MFTTransferApi__pb2.TransferRemoveResponse.SerializeToString, + ), } generic_handler = grpc.method_handlers_generic_handler( 'org.apache.airavata.mft.api.service.MFTTransferService', rpc_method_handlers) @@ -162,40 +146,6 @@ class MFTTransferService(object): options, channel_credentials, insecure, call_credentials, compression, wait_for_ready, timeout, metadata) - @staticmethod - def submitHttpUpload(request, - target, - options=(), - channel_credentials=None, - call_credentials=None, - insecure=False, - compression=None, - wait_for_ready=None, - timeout=None, - metadata=None): - return grpc.experimental.unary_unary(request, target, '/org.apache.airavata.mft.api.service.MFTTransferService/submitHttpUpload', - MFTTransferApi__pb2.HttpUploadApiRequest.SerializeToString, - MFTTransferApi__pb2.HttpUploadApiResponse.FromString, - options, channel_credentials, - insecure, call_credentials, compression, wait_for_ready, timeout, metadata) - - @staticmethod - def submitHttpDownload(request, - target, - options=(), - channel_credentials=None, - call_credentials=None, - insecure=False, - compression=None, - wait_for_ready=None, - timeout=None, - metadata=None): - return grpc.experimental.unary_unary(request, target, '/org.apache.airavata.mft.api.service.MFTTransferService/submitHttpDownload', - MFTTransferApi__pb2.HttpDownloadApiRequest.SerializeToString, - MFTTransferApi__pb2.HttpDownloadApiResponse.FromString, - options, channel_credentials, - insecure, call_credentials, compression, wait_for_ready, timeout, metadata) - @staticmethod def getAllTransferStates(request, target, @@ -263,3 +213,20 @@ class MFTTransferService(object): MFTAgentStubs__pb2.ResourceMetadata.FromString, options, channel_credentials, insecure, call_credentials, compression, wait_for_ready, timeout, metadata) + + @staticmethod + def removeTransfer(request, + target, + options=(), + channel_credentials=None, + call_credentials=None, + insecure=False, + compression=None, + wait_for_ready=None, + timeout=None, + metadata=None): + return grpc.experimental.unary_unary(request, target, '/org.apache.airavata.mft.api.service.MFTTransferService/removeTransfer', + MFTTransferApi__pb2.TransferRemoveRequest.SerializeToString, + MFTTransferApi__pb2.TransferRemoveResponse.FromString, + options, channel_credentials, + insecure, call_credentials, compression, wait_for_ready, timeout, metadata)
