From 2db53239bcd1cb3702ba74410ce7a70a8cfb7530 Mon Sep 17 00:00:00 2001 From: ThanKarab Date: Fri, 15 Jan 2021 20:51:23 +0200 Subject: [PATCH] Changed info to debug messages. --- .../master/engine/executor/remote/AdpDBArtJobMonitor.java | 4 ++-- .../master/gateway/async/handler/HBP/HBPQueryHandler.java | 7 +++---- .../gateway/async/handler/HttpAsyncDecomposerHandler.java | 1 - .../exareme/worker/art/container/ContainerSession.java | 7 +++---- .../dynamicExecutionEngine/DynamicPlanManager.java | 5 +---- .../CloseContainerSessionEventHandler.java | 4 ++-- 6 files changed, 11 insertions(+), 17 deletions(-) diff --git a/Exareme-Docker/src/exareme/exareme-master/src/main/java/madgik/exareme/master/engine/executor/remote/AdpDBArtJobMonitor.java b/Exareme-Docker/src/exareme/exareme-master/src/main/java/madgik/exareme/master/engine/executor/remote/AdpDBArtJobMonitor.java index e0027ad6e..f08d2f57f 100644 --- a/Exareme-Docker/src/exareme/exareme-master/src/main/java/madgik/exareme/master/engine/executor/remote/AdpDBArtJobMonitor.java +++ b/Exareme-Docker/src/exareme/exareme-master/src/main/java/madgik/exareme/master/engine/executor/remote/AdpDBArtJobMonitor.java @@ -89,13 +89,13 @@ public void run() { .setAdpEngineStatistics(statsManager.getStatistics()); if (sessionManager != null && !sessionManager.hasError()) { - log.info("Session finished, closing! ID: " + sessionPlan.getSessionID().getLongId() + log.debug("Session finished, closing! ID: " + sessionPlan.getSessionID().getLongId() + " , QueryID: " + queryID.getQueryID()); statusManager.setFinished(status.getId()); } else { statusManager.setError(status.getId(), sessionManager.getErrorList().get(0)); } - log.info("Session closing! ID: "+ sessionPlan.getSessionID().getLongId() + log.debug("Session closing! ID: "+ sessionPlan.getSessionID().getLongId() + " , QueryID: " + queryID.getQueryID()); sessionPlan.close(); diff --git a/Exareme-Docker/src/exareme/exareme-master/src/main/java/madgik/exareme/master/gateway/async/handler/HBP/HBPQueryHandler.java b/Exareme-Docker/src/exareme/exareme-master/src/main/java/madgik/exareme/master/gateway/async/handler/HBP/HBPQueryHandler.java index 2c14d8b79..cb5281154 100644 --- a/Exareme-Docker/src/exareme/exareme-master/src/main/java/madgik/exareme/master/gateway/async/handler/HBP/HBPQueryHandler.java +++ b/Exareme-Docker/src/exareme/exareme-master/src/main/java/madgik/exareme/master/gateway/async/handler/HBP/HBPQueryHandler.java @@ -159,10 +159,9 @@ private void handleHBPAlgorithmExecution(HttpRequest request, HttpResponse respo AdpDBClientFactory.createDBClient(manager, clientProperties); queryStatus = dbClient.query(algorithmKey, dfl); - log.info("Executing algorithm " + algorithmKey + - " started with queryId " + queryStatus.getQueryID().getQueryID()); - log.debug("Algorithm " + algorithmKey + " with queryID " - + queryStatus.getQueryID() + " execution started. DFL Script: \n " + dfl); + log.info("Algorithm " + algorithmKey + " with queryID " + + queryStatus.getQueryID() + " execution started."); + log.debug("DFL Script: \n " + dfl); BasicHttpEntity entity = new NQueryResultEntity(queryStatus, ds, ExaremeGatewayUtils.RESPONSE_BUFFER_SIZE); diff --git a/Exareme-Docker/src/exareme/exareme-master/src/main/java/madgik/exareme/master/gateway/async/handler/HttpAsyncDecomposerHandler.java b/Exareme-Docker/src/exareme/exareme-master/src/main/java/madgik/exareme/master/gateway/async/handler/HttpAsyncDecomposerHandler.java index 8096aa352..17ca63a0f 100644 --- a/Exareme-Docker/src/exareme/exareme-master/src/main/java/madgik/exareme/master/gateway/async/handler/HttpAsyncDecomposerHandler.java +++ b/Exareme-Docker/src/exareme/exareme-master/src/main/java/madgik/exareme/master/gateway/async/handler/HttpAsyncDecomposerHandler.java @@ -465,7 +465,6 @@ public void run() { if (timeoutMs > 0) { long timePassed = System.currentTimeMillis() - start; if (timePassed > timeoutMs) { - log.info("Closing session!!!!"); status.close(); log.warn("Time out:" + timeoutMs + " ms passed"); throw new RuntimeException("Time out:" + timeoutMs + " ms passed"); diff --git a/Exareme-Docker/src/exareme/exareme-worker/src/main/java/madgik/exareme/worker/art/container/ContainerSession.java b/Exareme-Docker/src/exareme/exareme-worker/src/main/java/madgik/exareme/worker/art/container/ContainerSession.java index 2124c3739..d7883a37e 100644 --- a/Exareme-Docker/src/exareme/exareme-worker/src/main/java/madgik/exareme/worker/art/container/ContainerSession.java +++ b/Exareme-Docker/src/exareme/exareme-worker/src/main/java/madgik/exareme/worker/art/container/ContainerSession.java @@ -45,13 +45,12 @@ public ContainerSessionID getContainerSessionID() { public ContainerJobResults execJobs(ContainerJobs jobs) throws RemoteException { jobs.setSession(containerSessionID, sessionID); - log.info("Executing jobs for session ID: " + sessionID.getLongId()); - log.info("Executing " + jobs.getJobs().size() + " Jobs!"); + log.debug("Executing " + jobs.getJobs().size() + " Jobs!"); for (ContainerJob job : jobs.getJobs()) { - log.info("Job: " + job.getType().name() + " " + job.toString()); + log.debug("Job: " + job.getType().name() + " " + job.toString()); } ContainerJobResults results = containerProxy.getRemoteObject().execJobs(jobs); - log.info("Returning results for jobs from sessionID: " + sessionID.getLongId()); + log.debug("Returning results for jobs from sessionID: " + sessionID.getLongId()); return results; } diff --git a/Exareme-Docker/src/exareme/exareme-worker/src/main/java/madgik/exareme/worker/art/executionEngine/dynamicExecutionEngine/DynamicPlanManager.java b/Exareme-Docker/src/exareme/exareme-worker/src/main/java/madgik/exareme/worker/art/executionEngine/dynamicExecutionEngine/DynamicPlanManager.java index 2660d4181..aa73a8e3c 100644 --- a/Exareme-Docker/src/exareme/exareme-worker/src/main/java/madgik/exareme/worker/art/executionEngine/dynamicExecutionEngine/DynamicPlanManager.java +++ b/Exareme-Docker/src/exareme/exareme-worker/src/main/java/madgik/exareme/worker/art/executionEngine/dynamicExecutionEngine/DynamicPlanManager.java @@ -120,7 +120,6 @@ public ContainerSessionID createContainerSession(PlanSessionID planSessionID) @Override public void destroySession(PlanSessionID sessionID) throws RemoteException { - log.info("Inside Destroying session with ID: " + sessionID.getLongId()); try { PlanEventScheduler eventScheduler = schedulerMap.get(sessionID); IndependentEvents jobs = new IndependentEvents(eventScheduler.getState()); @@ -128,10 +127,8 @@ public void destroySession(PlanSessionID sessionID) throws RemoteException { eventScheduler.queueIndependentEvents(jobs); Semaphore sem = new Semaphore(0); if (!eventScheduler.getState().isTerminated()) { - log.info("State not yet terminated. " + sessionID.getLongId()); eventScheduler.getState() .registerTerminationListener(new SemaphoreTerminationListener(sem)); - log.debug( "Waiting '" + forceSessionStopAfter_sec + "' seconds for session to stop ..."); boolean stopped = sem.tryAcquire(forceSessionStopAfter_sec, TimeUnit.SECONDS); @@ -140,7 +137,7 @@ public void destroySession(PlanSessionID sessionID) throws RemoteException { } } - log.info("Destroying session with ID: " + sessionID.getLongId()); + log.debug("Destroying session with ID: " + sessionID.getLongId()); PlanSessionReportID reportID = eventScheduler.getState().getPlanSessionReportID(); schedulerMap.remove(sessionID); containerSessionMap.remove(sessionID); diff --git a/Exareme-Docker/src/exareme/exareme-worker/src/main/java/madgik/exareme/worker/art/executionEngine/dynamicExecutionEngine/event/closeContainerSession/CloseContainerSessionEventHandler.java b/Exareme-Docker/src/exareme/exareme-worker/src/main/java/madgik/exareme/worker/art/executionEngine/dynamicExecutionEngine/event/closeContainerSession/CloseContainerSessionEventHandler.java index 20c416f89..aa4f95ead 100644 --- a/Exareme-Docker/src/exareme/exareme-worker/src/main/java/madgik/exareme/worker/art/executionEngine/dynamicExecutionEngine/event/closeContainerSession/CloseContainerSessionEventHandler.java +++ b/Exareme-Docker/src/exareme/exareme-worker/src/main/java/madgik/exareme/worker/art/executionEngine/dynamicExecutionEngine/event/closeContainerSession/CloseContainerSessionEventHandler.java @@ -89,7 +89,7 @@ public GetStatsAndCloseSession(ContainerSession session) { @Override public void run() { try { - log.info("Closing session: " + session.getSessionID().getLongId() + " , " + this.toString()); + log.debug("Closing session: " + session.getSessionID().getLongId() + " , " + this.toString()); ContainerJobs jobs = new ContainerJobs(); jobs.addJob(GetStatisticsJob.instance); results = session.execJobs(jobs); @@ -99,7 +99,7 @@ public void run() { exception = e; log.error("Cannot close session " + session.getSessionID().getLongId(), e); }finally{ - log.info("Closed session: " + session.getSessionID().getLongId() + " , " + this.toString()); + log.debug("Closed session: " + session.getSessionID().getLongId() + " , " + this.toString()); } } }