You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by la...@apache.org on 2015/04/15 16:37:28 UTC
[1/4] airavata git commit: fixing exception handling
Repository: airavata
Updated Branches:
refs/heads/master 73c8337aa -> ae15740d8
fixing exception handling
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/c92fbd39
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/c92fbd39
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/c92fbd39
Branch: refs/heads/master
Commit: c92fbd39dfe35adcebe5b25a804b1d70b0023635
Parents: be901aa
Author: Lahiru Gunathilake <gl...@gmail.com>
Authored: Wed Apr 15 08:58:04 2015 -0400
Committer: Lahiru Gunathilake <gl...@gmail.com>
Committed: Wed Apr 15 08:58:04 2015 -0400
----------------------------------------------------------------------
.../main/java/org/apache/airavata/gfac/server/GfacServer.java | 2 ++
.../org/apache/airavata/gfac/server/GfacServerHandler.java | 7 ++++++-
.../airavata/gfac/core/utils/GFacThreadPoolExecutor.java | 3 ++-
3 files changed, 10 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/c92fbd39/modules/gfac/airavata-gfac-service/src/main/java/org/apache/airavata/gfac/server/GfacServer.java
----------------------------------------------------------------------
diff --git a/modules/gfac/airavata-gfac-service/src/main/java/org/apache/airavata/gfac/server/GfacServer.java b/modules/gfac/airavata-gfac-service/src/main/java/org/apache/airavata/gfac/server/GfacServer.java
index e37a9ab..01115b6 100644
--- a/modules/gfac/airavata-gfac-service/src/main/java/org/apache/airavata/gfac/server/GfacServer.java
+++ b/modules/gfac/airavata-gfac-service/src/main/java/org/apache/airavata/gfac/server/GfacServer.java
@@ -23,6 +23,7 @@ package org.apache.airavata.gfac.server;
import org.apache.airavata.common.utils.Constants;
import org.apache.airavata.common.utils.IServer;
import org.apache.airavata.common.utils.ServerSettings;
+import org.apache.airavata.gfac.core.utils.GFacThreadPoolExecutor;
import org.apache.airavata.gfac.cpi.GfacService;
import org.apache.thrift.server.TServer;
import org.apache.thrift.server.TThreadPoolServer;
@@ -109,6 +110,7 @@ public class GfacServer implements IServer{
setStatus(IServer.ServerStatus.STOPING);
server.stop();
}
+ GFacThreadPoolExecutor.getFixedThreadPool().shutdownNow();
}
http://git-wip-us.apache.org/repos/asf/airavata/blob/c92fbd39/modules/gfac/airavata-gfac-service/src/main/java/org/apache/airavata/gfac/server/GfacServerHandler.java
----------------------------------------------------------------------
diff --git a/modules/gfac/airavata-gfac-service/src/main/java/org/apache/airavata/gfac/server/GfacServerHandler.java b/modules/gfac/airavata-gfac-service/src/main/java/org/apache/airavata/gfac/server/GfacServerHandler.java
index f3e1d91..6652db0 100644
--- a/modules/gfac/airavata-gfac-service/src/main/java/org/apache/airavata/gfac/server/GfacServerHandler.java
+++ b/modules/gfac/airavata-gfac-service/src/main/java/org/apache/airavata/gfac/server/GfacServerHandler.java
@@ -255,7 +255,12 @@ public class GfacServerHandler implements GfacService.Iface, Watcher {
logger.debugId(experimentId, "Submitted job to the Gfac Implementation, experiment {}, task {}, gateway " +
"{}", experimentId, taskId, gatewayId);
- GFacThreadPoolExecutor.getFixedThreadPool().execute(inputHandlerWorker);
+ try {
+ GFacThreadPoolExecutor.getFixedThreadPool().execute(inputHandlerWorker);
+ } catch (ApplicationSettingsException e) {
+ logger.error(e.getMessage(), e);
+ throw new TException(e);
+ }
// we immediately return when we have a threadpool
return true;
http://git-wip-us.apache.org/repos/asf/airavata/blob/c92fbd39/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/utils/GFacThreadPoolExecutor.java
----------------------------------------------------------------------
diff --git a/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/utils/GFacThreadPoolExecutor.java b/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/utils/GFacThreadPoolExecutor.java
index 7853513..3c8d56a 100644
--- a/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/utils/GFacThreadPoolExecutor.java
+++ b/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/utils/GFacThreadPoolExecutor.java
@@ -41,12 +41,13 @@ public class GFacThreadPoolExecutor {
return threadPool;
}
- public static ExecutorService getFixedThreadPool() {
+ public static ExecutorService getFixedThreadPool() throws ApplicationSettingsException {
if(threadPool ==null){
try {
threadPool = Executors.newFixedThreadPool(Integer.parseInt(ServerSettings.getSetting(GFAC_THREAD_POOL_SIZE)));
} catch (ApplicationSettingsException e) {
logger.error("Error reading " + GFAC_THREAD_POOL_SIZE+ " property");
+ throw e;
}
}
return threadPool;
[2/4] airavata git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/airavata
Posted by la...@apache.org.
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/airavata
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/5e7d3ef0
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/5e7d3ef0
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/5e7d3ef0
Branch: refs/heads/master
Commit: 5e7d3ef05e3810915a5417914d238d630ff95922
Parents: c92fbd3 395c9d3
Author: Lahiru Gunathilake <gl...@gmail.com>
Authored: Wed Apr 15 08:58:30 2015 -0400
Committer: Lahiru Gunathilake <gl...@gmail.com>
Committed: Wed Apr 15 08:58:30 2015 -0400
----------------------------------------------------------------------
.../lib/airavata/messagingEvents_types.cpp | 36 +++-
.../lib/airavata/messagingEvents_types.h | 20 +-
.../Airavata/Model/Messaging/Event/Types.php | 40 ++++
.../airavata/model/messaging/event/ttypes.py | 30 ++-
.../messaging/event/TaskTerminateEvent.java | 196 ++++++++++++++++++-
.../messagingEvents.thrift | 2 +
.../apache/airavata/gfac/cpi/GfacService.java | 125 ++++++++++--
.../airavata/gfac/server/GfacServerHandler.java | 4 +-
.../cpi/impl/SimpleOrchestratorImpl.java | 21 +-
9 files changed, 446 insertions(+), 28 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/5e7d3ef0/modules/gfac/airavata-gfac-service/src/main/java/org/apache/airavata/gfac/server/GfacServerHandler.java
----------------------------------------------------------------------
[4/4] airavata git commit: movig to cachedTP
Posted by la...@apache.org.
movig to cachedTP
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/ae15740d
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/ae15740d
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/ae15740d
Branch: refs/heads/master
Commit: ae15740d87dd8d128eb2f54fdcf1f9a73e2e3037
Parents: 98f2186
Author: Lahiru Gunathilake <gl...@gmail.com>
Authored: Wed Apr 15 10:37:24 2015 -0400
Committer: Lahiru Gunathilake <gl...@gmail.com>
Committed: Wed Apr 15 10:37:24 2015 -0400
----------------------------------------------------------------------
.../java/org/apache/airavata/gfac/server/GfacServer.java | 2 +-
.../apache/airavata/gfac/server/GfacServerHandler.java | 10 +++-------
.../airavata/gfac/monitor/email/EmailBasedMonitor.java | 8 ++++++--
.../gfac/monitor/impl/pull/qstat/HPCPullMonitor.java | 8 ++++----
4 files changed, 14 insertions(+), 14 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/ae15740d/modules/gfac/airavata-gfac-service/src/main/java/org/apache/airavata/gfac/server/GfacServer.java
----------------------------------------------------------------------
diff --git a/modules/gfac/airavata-gfac-service/src/main/java/org/apache/airavata/gfac/server/GfacServer.java b/modules/gfac/airavata-gfac-service/src/main/java/org/apache/airavata/gfac/server/GfacServer.java
index 01115b6..01c12ad 100644
--- a/modules/gfac/airavata-gfac-service/src/main/java/org/apache/airavata/gfac/server/GfacServer.java
+++ b/modules/gfac/airavata-gfac-service/src/main/java/org/apache/airavata/gfac/server/GfacServer.java
@@ -110,7 +110,7 @@ public class GfacServer implements IServer{
setStatus(IServer.ServerStatus.STOPING);
server.stop();
}
- GFacThreadPoolExecutor.getFixedThreadPool().shutdownNow();
+ GFacThreadPoolExecutor.getThreadPool().shutdownNow();
}
http://git-wip-us.apache.org/repos/asf/airavata/blob/ae15740d/modules/gfac/airavata-gfac-service/src/main/java/org/apache/airavata/gfac/server/GfacServerHandler.java
----------------------------------------------------------------------
diff --git a/modules/gfac/airavata-gfac-service/src/main/java/org/apache/airavata/gfac/server/GfacServerHandler.java b/modules/gfac/airavata-gfac-service/src/main/java/org/apache/airavata/gfac/server/GfacServerHandler.java
index 524a8a9..462fbd8 100644
--- a/modules/gfac/airavata-gfac-service/src/main/java/org/apache/airavata/gfac/server/GfacServerHandler.java
+++ b/modules/gfac/airavata-gfac-service/src/main/java/org/apache/airavata/gfac/server/GfacServerHandler.java
@@ -246,7 +246,7 @@ public class GfacServerHandler implements GfacService.Iface, Watcher {
*/
public boolean submitJob(String experimentId, String taskId, String gatewayId) throws TException {
requestCount++;
- logger.info("-----------------------------------------------------" + requestCount+"-----------------------------------------------------");
+ logger.info("-----------------------------------------------------" + requestCount + "-----------------------------------------------------");
logger.infoId(experimentId, "GFac Received submit job request for the Experiment: {} TaskId: {}", experimentId, taskId);
GFac gfac = getGfac();
InputHandlerWorker inputHandlerWorker = new InputHandlerWorker(gfac, experimentId, taskId, gatewayId);
@@ -255,12 +255,7 @@ public class GfacServerHandler implements GfacService.Iface, Watcher {
logger.debugId(experimentId, "Submitted job to the Gfac Implementation, experiment {}, task {}, gateway " +
"{}", experimentId, taskId, gatewayId);
- try {
- GFacThreadPoolExecutor.getFixedThreadPool().execute(inputHandlerWorker);
- } catch (ApplicationSettingsException e) {
- logger.error(e.getMessage(), e);
- throw new TException(e);
- }
+ GFacThreadPoolExecutor.getThreadPool().execute(inputHandlerWorker);
// we immediately return when we have a threadpool
return true;
@@ -405,6 +400,7 @@ public class GfacServerHandler implements GfacService.Iface, Watcher {
+ "' and with message type '" + message.getType());
} catch (TException e) {
logger.error(e.getMessage(), e); //nobody is listening so nothing to throw
+ rabbitMQTaskLaunchConsumer.sendAck(message.getDeliveryTag());
}
}
}
http://git-wip-us.apache.org/repos/asf/airavata/blob/ae15740d/modules/gfac/gfac-monitor/gfac-email-monitor/src/main/java/org/apache/airavata/gfac/monitor/email/EmailBasedMonitor.java
----------------------------------------------------------------------
diff --git a/modules/gfac/gfac-monitor/gfac-email-monitor/src/main/java/org/apache/airavata/gfac/monitor/email/EmailBasedMonitor.java b/modules/gfac/gfac-monitor/gfac-email-monitor/src/main/java/org/apache/airavata/gfac/monitor/email/EmailBasedMonitor.java
index 631e1a4..95c98b8 100644
--- a/modules/gfac/gfac-monitor/gfac-email-monitor/src/main/java/org/apache/airavata/gfac/monitor/email/EmailBasedMonitor.java
+++ b/modules/gfac/gfac-monitor/gfac-email-monitor/src/main/java/org/apache/airavata/gfac/monitor/email/EmailBasedMonitor.java
@@ -21,6 +21,7 @@
package org.apache.airavata.gfac.monitor.email;
import org.apache.airavata.common.exception.AiravataException;
+import org.apache.airavata.common.exception.ApplicationSettingsException;
import org.apache.airavata.common.logger.AiravataLogger;
import org.apache.airavata.common.logger.AiravataLoggerFactory;
import org.apache.airavata.common.utils.ServerSettings;
@@ -54,7 +55,6 @@ import java.util.Properties;
import java.util.concurrent.ConcurrentHashMap;
public class EmailBasedMonitor implements Runnable{
-
private static final AiravataLogger log = AiravataLoggerFactory.getLogger(EmailBasedMonitor.class);
private static final String PBS_CONSULT_SDSC_EDU = "pbsconsult@sdsc.edu";
@@ -207,7 +207,11 @@ public class EmailBasedMonitor implements Runnable{
JobState resultState = jobStatusResult.getState();
jEC.getJobDetails().setJobStatus(new JobStatus(resultState));
if (resultState == JobState.COMPLETE) {
- GFacThreadPoolExecutor.getFixedThreadPool().submit(new OutHandlerWorker(jEC, BetterGfacImpl.getMonitorPublisher()));
+ try {
+ GFacThreadPoolExecutor.getFixedThreadPool().submit(new OutHandlerWorker(jEC, BetterGfacImpl.getMonitorPublisher()));
+ } catch (ApplicationSettingsException e) {
+ log.error(e.getMessage(), e);
+ }
}else if (resultState == JobState.QUEUED) {
// TODO - publish queued rabbitmq message
}else if (resultState == JobState.FAILED) {
http://git-wip-us.apache.org/repos/asf/airavata/blob/ae15740d/modules/gfac/gfac-monitor/gfac-hpc-monitor/src/main/java/org/apache/airavata/gfac/monitor/impl/pull/qstat/HPCPullMonitor.java
----------------------------------------------------------------------
diff --git a/modules/gfac/gfac-monitor/gfac-hpc-monitor/src/main/java/org/apache/airavata/gfac/monitor/impl/pull/qstat/HPCPullMonitor.java b/modules/gfac/gfac-monitor/gfac-hpc-monitor/src/main/java/org/apache/airavata/gfac/monitor/impl/pull/qstat/HPCPullMonitor.java
index 26d3385..04f9e7d 100644
--- a/modules/gfac/gfac-monitor/gfac-hpc-monitor/src/main/java/org/apache/airavata/gfac/monitor/impl/pull/qstat/HPCPullMonitor.java
+++ b/modules/gfac/gfac-monitor/gfac-hpc-monitor/src/main/java/org/apache/airavata/gfac/monitor/impl/pull/qstat/HPCPullMonitor.java
@@ -197,7 +197,7 @@ public class HPCPullMonitor extends PullMonitor {
sendNotification(iMonitorID);
logger.info("To avoid timing issues we sleep sometime and try to retrieve output files");
Thread.sleep(10000);
- GFacThreadPoolExecutor.getFixedThreadPool().execute(new OutHandlerWorker(gfac, iMonitorID, publisher));
+ GFacThreadPoolExecutor.getThreadPool().execute(new OutHandlerWorker(gfac, iMonitorID, publisher));
break;
}
}
@@ -225,7 +225,7 @@ public class HPCPullMonitor extends PullMonitor {
sendNotification(iMonitorID);
logger.info("To avoid timing issues we sleep sometime and try to retrieve output files");
Thread.sleep(10000);
- GFacThreadPoolExecutor.getFixedThreadPool().execute(new OutHandlerWorker(gfac, iMonitorID, publisher));
+ GFacThreadPoolExecutor.getThreadPool().execute(new OutHandlerWorker(gfac, iMonitorID, publisher));
break;
}
}
@@ -250,7 +250,7 @@ public class HPCPullMonitor extends PullMonitor {
removeList.add(iMonitorID);
logger.info("PULL Notification is complete: marking the Job as ************COMPLETE************ experiment {}, task {}, job name {} .",
iMonitorID.getExperimentID(), iMonitorID.getTaskID(), iMonitorID.getJobName());
- GFacThreadPoolExecutor.getFixedThreadPool().execute(new OutHandlerWorker(gfac, iMonitorID, publisher));
+ GFacThreadPoolExecutor.getThreadPool().execute(new OutHandlerWorker(gfac, iMonitorID, publisher));
}
iMonitorID.setStatus(jobStatuses.get(iMonitorID.getJobID() + "," + iMonitorID.getJobName())); //IMPORTANT this is not a simple setter we have a logic
iMonitorID.setLastMonitored(new Timestamp((new Date()).getTime()));
@@ -288,7 +288,7 @@ public class HPCPullMonitor extends PullMonitor {
sendNotification(iMonitorID);
// CommonUtils.removeMonitorFromQueue(take, iMonitorID);
removeList.add(iMonitorID);
- GFacThreadPoolExecutor.getFixedThreadPool().execute(new OutHandlerWorker(gfac, iMonitorID, publisher));
+ GFacThreadPoolExecutor.getThreadPool().execute(new OutHandlerWorker(gfac, iMonitorID, publisher));
} else {
iMonitorID.setFailedCount(0);
}
[3/4] airavata git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/airavata
Posted by la...@apache.org.
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/airavata
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/98f21864
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/98f21864
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/98f21864
Branch: refs/heads/master
Commit: 98f218642b53d49223bb2ccce740902839053cdb
Parents: 5e7d3ef 73c8337
Author: Lahiru Gunathilake <gl...@gmail.com>
Authored: Wed Apr 15 10:00:40 2015 -0400
Committer: Lahiru Gunathilake <gl...@gmail.com>
Committed: Wed Apr 15 10:00:40 2015 -0400
----------------------------------------------------------------------
.../airavata/gfac/server/GfacServerHandler.java | 2 +-
.../airavata/gfac/core/cpi/BetterGfacImpl.java | 45 +++++++++++---------
.../core/impl/RabbitMQTaskLaunchConsumer.java | 2 +-
.../core/impl/RabbitMQTaskLaunchPublisher.java | 11 +----
.../core/impl/GFACPassiveJobSubmitter.java | 6 ++-
5 files changed, 33 insertions(+), 33 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/98f21864/modules/gfac/airavata-gfac-service/src/main/java/org/apache/airavata/gfac/server/GfacServerHandler.java
----------------------------------------------------------------------