You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by di...@apache.org on 2023/02/21 20:37:59 UTC
[airavata-mft] 02/03: Minor bug fixes
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 17efc597b85b158ed82739f2a2b387e3ba70d742
Author: Dimuthu Wannipurage <di...@gmail.com>
AuthorDate: Tue Feb 21 15:37:27 2023 -0500
Minor bug fixes
---
.../org/apache/airavata/mft/agent/TransportMediator.java | 3 ++-
.../apache/airavata/mft/api/handler/MFTApiHandler.java | 16 +++++++++++++++-
2 files changed, 17 insertions(+), 2 deletions(-)
diff --git a/agent/service/src/main/java/org/apache/airavata/mft/agent/TransportMediator.java b/agent/service/src/main/java/org/apache/airavata/mft/agent/TransportMediator.java
index 3fc15bd..f009772 100644
--- a/agent/service/src/main/java/org/apache/airavata/mft/agent/TransportMediator.java
+++ b/agent/service/src/main/java/org/apache/airavata/mft/agent/TransportMediator.java
@@ -140,6 +140,7 @@ public class TransportMediator {
for (int i = 0; i < chunkIdx; i++) {
Future<Integer> future = completionService.take();
+ future.get();
}
inConnector.complete();
@@ -283,7 +284,7 @@ public class TransportMediator {
}
return chunkIdx;
} catch (Exception e) {
- logger.error("Failed to transfer ", e);
+ logger.error("Failed to transfer transfer id {}", transferId, e);
throw e;
}
}
diff --git a/api/service/src/main/java/org/apache/airavata/mft/api/handler/MFTApiHandler.java b/api/service/src/main/java/org/apache/airavata/mft/api/handler/MFTApiHandler.java
index e595281..caecae3 100644
--- a/api/service/src/main/java/org/apache/airavata/mft/api/handler/MFTApiHandler.java
+++ b/api/service/src/main/java/org/apache/airavata/mft/api/handler/MFTApiHandler.java
@@ -200,7 +200,7 @@ public class MFTApiHandler extends MFTTransferServiceGrpc.MFTTransferServiceImpl
(completedFiles.size() + failedFiles.size() + pendingFiles.size()));
} else if (!completedFiles.isEmpty()) {
stateBuilder.setState("COMPLETED");
- stateBuilder.setState("All file transfers completed");
+ stateBuilder.setDescription("All file transfers completed");
stateBuilder.setPercentage((completedFiles.size() + failedFiles.size()) * 1.0 /
(completedFiles.size() + failedFiles.size() + pendingFiles.size()));
}
@@ -454,6 +454,20 @@ public class MFTApiHandler extends MFTTransferServiceGrpc.MFTTransferServiceImpl
}
}
+ @Override
+ public void removeTransfer(TransferRemoveRequest request, StreamObserver<TransferRemoveResponse> responseObserver) {
+ try {
+ mftConsulClient.removeTransfer(request.getTransferId());
+ responseObserver.onNext(TransferRemoveResponse.newBuilder().setSuccess(true).build());
+ responseObserver.onCompleted();
+ } catch (Exception e) {
+ logger.error("Error while removing transfer {}", request.getTransferId() , e);
+ responseObserver.onError(Status.INTERNAL
+ .withDescription("Failed to remove the transfer. " + e.getMessage())
+ .asException());
+ }
+ }
+
private String derriveTargetAgent(GetResourceMetadataRequest directRequest) throws Exception {
String targetAgent = "";