This is an automated email from the ASF dual-hosted git repository.
dimuthuupe pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/airavata-mft.git
The following commit(s) were added to refs/heads/develop by this push:
new 0c65dc1 Logging improvements
0c65dc1 is described below
commit 0c65dc12a47158ea4259215dcb4e29f13fcd05bd
Author: Dimuthu Wannipurage <[email protected]>
AuthorDate: Mon Aug 23 10:14:17 2021 -0400
Logging improvements
---
.../main/java/org/apache/airavata/mft/admin/SyncRPCClient.java | 2 ++
.../apache/airavata/mft/admin/models/rpc/SyncRPCRequest.java | 10 ++++++++++
.../main/java/org/apache/airavata/mft/agent/rpc/RPCParser.java | 1 +
.../org/apache/airavata/mft/api/handler/MFTApiHandler.java | 3 +++
4 files changed, 16 insertions(+)
diff --git
a/admin/src/main/java/org/apache/airavata/mft/admin/SyncRPCClient.java
b/admin/src/main/java/org/apache/airavata/mft/admin/SyncRPCClient.java
index 77fcf87..9e2e1f6 100644
--- a/admin/src/main/java/org/apache/airavata/mft/admin/SyncRPCClient.java
+++ b/admin/src/main/java/org/apache/airavata/mft/admin/SyncRPCClient.java
@@ -96,11 +96,13 @@ public class SyncRPCClient {
this.responseQueueMap.put(request.getMessageId(), queue);
try {
+ logger.info("Requesting sync request {} on agent {}",
request.getRequestId(), request.getAgentId());
this.mftConsulClient.sendSyncRPCToAgent(request.getAgentId(),
request);
SyncRPCResponse response = queue.poll(waitMs,
TimeUnit.MILLISECONDS);
if (response == null) {
throw new MFTConsulClientException("Timed out waiting for the
response");
}
+ logger.info("Completing sync request {} on agent {}",
request.getRequestId(), request.getAgentId());
return response;
} finally {
this.responseQueueMap.remove(request.getMessageId());
diff --git
a/admin/src/main/java/org/apache/airavata/mft/admin/models/rpc/SyncRPCRequest.java
b/admin/src/main/java/org/apache/airavata/mft/admin/models/rpc/SyncRPCRequest.java
index 1aadc83..0d0bdff 100644
---
a/admin/src/main/java/org/apache/airavata/mft/admin/models/rpc/SyncRPCRequest.java
+++
b/admin/src/main/java/org/apache/airavata/mft/admin/models/rpc/SyncRPCRequest.java
@@ -19,8 +19,10 @@
import java.util.HashMap;
import java.util.Map;
+import java.util.UUID;
public class SyncRPCRequest {
+ private String requestId = UUID.randomUUID().toString();
private String agentId;
private String method;
private Map<String, String> parameters;
@@ -72,6 +74,14 @@ public class SyncRPCRequest {
return this;
}
+ public String getRequestId() {
+ return requestId;
+ }
+
+ public void setRequestId(String requestId) {
+ this.requestId = requestId;
+ }
+
public static final class SyncRPCRequestBuilder {
private String agentId;
private String method;
diff --git
a/agent/src/main/java/org/apache/airavata/mft/agent/rpc/RPCParser.java
b/agent/src/main/java/org/apache/airavata/mft/agent/rpc/RPCParser.java
index 8cb454a..e83b0f3 100644
--- a/agent/src/main/java/org/apache/airavata/mft/agent/rpc/RPCParser.java
+++ b/agent/src/main/java/org/apache/airavata/mft/agent/rpc/RPCParser.java
@@ -62,6 +62,7 @@ public class RPCParser {
public String resolveRPCRequest(SyncRPCRequest request) throws Exception {
// TODO implement using the reflection
ObjectMapper mapper = new ObjectMapper();
+ logger.info("Accepting sync request {}", request.getRequestId());
switch (request.getMethod()) {
case "getFileResourceMetadata":
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 77a1efe..dbce2d2 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
@@ -202,6 +202,8 @@ public class MFTApiHandler extends
MFTApiServiceGrpc.MFTApiServiceImplBase {
try {
+ logger.info("Calling get file resource metadata for resource {}",
request.getResourceId());
+
String targetAgent =
derriveTargetAgent(request.getTargetAgentId());
SyncRPCRequest.SyncRPCRequestBuilder requestBuilder =
SyncRPCRequest.SyncRPCRequestBuilder.builder()
@@ -253,6 +255,7 @@ public class MFTApiHandler extends
MFTApiServiceGrpc.MFTApiServiceImplBase {
public void getDirectoryResourceMetadata(FetchResourceMetadataRequest
request, StreamObserver<DirectoryMetadataResponse> responseObserver) {
try {
+ logger.info("Calling get directory metadata for resource {}",
request.getResourceId());
String targetAgent =
derriveTargetAgent(request.getTargetAgentId());
SyncRPCRequest.SyncRPCRequestBuilder requestBuilder =
SyncRPCRequest.SyncRPCRequestBuilder.builder()
