[systemds] branch master updated: [MINOR] Debugging Update for FederatedWorkerHandler

[ba...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

baunsgaard pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/systemds.git


The following commit(s) were added to refs/heads/master by this push:
     new 260f440  [MINOR] Debugging Update for FederatedWorkerHandler
260f440 is described below

commit 260f44001844a7b231e52eb36f064f4d9808058e
Author: baunsgaard <ba...@tugraz.at>
AuthorDate: Thu Aug 20 18:09:14 2020 +0200

    [MINOR] Debugging Update for FederatedWorkerHandler
---
 .../federated/FederatedWorkerHandler.java               | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/src/main/java/org/apache/sysds/runtime/controlprogram/federated/FederatedWorkerHandler.java b/src/main/java/org/apache/sysds/runtime/controlprogram/federated/FederatedWorkerHandler.java
index bb64acc..ae8f2c8 100644
--- a/src/main/java/org/apache/sysds/runtime/controlprogram/federated/FederatedWorkerHandler.java
+++ b/src/main/java/org/apache/sysds/runtime/controlprogram/federated/FederatedWorkerHandler.java
@@ -72,7 +72,9 @@ public class FederatedWorkerHandler extends ChannelInboundHandlerAdapter {
 
 	@Override
 	public void channelRead(ChannelHandlerContext ctx, Object msg) {
-		log.debug("Received: " + msg.getClass().getSimpleName());
+		if( log.isDebugEnabled() ){
+			log.debug("Received: " + msg.getClass().getSimpleName());
+		}
 		if (!(msg instanceof FederatedRequest[]))
 			throw new DMLRuntimeException("FederatedWorkerHandler: Received object no instance of 'FederatedRequest[]'.");
 		FederatedRequest[] requests = (FederatedRequest[]) msg;
@@ -80,15 +82,20 @@ public class FederatedWorkerHandler extends ChannelInboundHandlerAdapter {
 		
 		for( int i=0; i<requests.length; i++ ) {
 			FederatedRequest request = requests[i];
-			if( log.isDebugEnabled() )
-				log.debug("Executing command "+(i+1)+"/"+requests.length + ": " + request.getType().name());
+			if( log.isInfoEnabled() ){
+				log.info("Executing command " + (i+1) + "/" + requests.length + ": " + request.getType().name());
+				if( log.isDebugEnabled() ){
+					log.debug("full command: " + request.toString());
+				}
+			}
 			PrivacyMonitor.setCheckPrivacy(request.checkPrivacy());
 			PrivacyMonitor.clearCheckedConstraints();
 	
 			response = executeCommand(request);
 			conditionalAddCheckedConstraints(request, response);
-			if (!response.isSuccessful())
-				log.error("Command " + request.getType() + " failed: " + response.getErrorMessage());
+			if (!response.isSuccessful()){
+				log.error("Command " + request.getType() + " failed: " + response.getErrorMessage() + "full command: \n" + request.toString());
+			}
 		}
 		ctx.writeAndFlush(response).addListener(new CloseListener());
 	}