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 2013/01/11 17:02:36 UTC
svn commit: r1432116 - in
/airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac:
external/ notification/impl/ provider/utils/ scheduler/impl/
Author: lahiru
Date: Fri Jan 11 16:02:36 2013
New Revision: 1432116
URL: http://svn.apache.org/viewvc?rev=1432116&view=rev
Log:
Adding some logs in to info level which is useful to monitor grid job submission.
Modified:
airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/external/GridFtp.java
airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/notification/impl/LoggingNotification.java
airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/provider/utils/GramRSLGenerator.java
airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/provider/utils/JobSubmissionListener.java
airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/scheduler/impl/SchedulerImpl.java
Modified: airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/external/GridFtp.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/external/GridFtp.java?rev=1432116&r1=1432115&r2=1432116&view=diff
==============================================================================
--- airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/external/GridFtp.java (original)
+++ airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/external/GridFtp.java Fri Jan 11 16:02:36 2013
@@ -82,7 +82,7 @@ public class GridFtp {
try {
String destPath = destURI.getPath();
- log.debug(("Creating Directory = " + destHost + "=" + destPath));
+ log.info(("Creating Directory = " + destHost + "=" + destPath));
destClient = new GridFTPClient(destHost.hostName, destHost.port);
@@ -144,9 +144,9 @@ public class GridFtp {
try {
String remoteFile = destURI.getPath();
- log.debug("The remote file is " + remoteFile);
+ log.info("The remote file is " + remoteFile);
- log.debug("Setup GridFTP Client");
+ log.info("Setup GridFTP Client");
ftpClient = new GridFTPClient(contactInfo.hostName, contactInfo.port);
ftpClient.setAuthorization(new HostAuthorization(GridFtp.HOST));
@@ -154,7 +154,7 @@ public class GridFtp {
ftpClient.setDataChannelAuthentication(DataChannelAuthentication.SELF);
makeExternalConfigurations(ftpClient, false);
- log.debug("Uploading file");
+ log.info("Uploading file");
if (checkBinaryExtensions(remoteFile)) {
log.debug("Transfer mode is set to Binary for a file upload");
ftpClient.setType(Session.TYPE_IMAGE);
Modified: airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/notification/impl/LoggingNotification.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/notification/impl/LoggingNotification.java?rev=1432116&r1=1432115&r2=1432116&view=diff
==============================================================================
--- airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/notification/impl/LoggingNotification.java (original)
+++ airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/notification/impl/LoggingNotification.java Fri Jan 11 16:02:36 2013
@@ -90,11 +90,11 @@ public class LoggingNotification impleme
private void printOut(InvocationContext context, String... data) {
log.debug("Notifier: " + this.getClass().toString());
if (data != null) {
- log.debug("\t-----DATA-----");
+ log.info("\t-----DATA-----");
for (int i = 0; i < data.length; i++) {
- log.debug("\t\t"+data[i]);
+ log.info("\t\t"+data[i]);
}
- log.debug("\t-----END DATA-----");
+ log.info("\t-----END DATA-----");
}
}
}
Modified: airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/provider/utils/GramRSLGenerator.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/provider/utils/GramRSLGenerator.java?rev=1432116&r1=1432115&r2=1432116&view=diff
==============================================================================
--- airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/provider/utils/GramRSLGenerator.java (original)
+++ airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/provider/utils/GramRSLGenerator.java Fri Jan 11 16:02:36 2013
@@ -177,7 +177,6 @@ public class GramRSLGenerator {
}
if (app.getQueue() != null) {
if (app.getQueue().getQueueName() != null) {
- System.out.println("Testing");
log.debug("Setting job queue to " + app.getQueue().getQueueName());
jobAttr.setQueue(app.getQueue().getQueueName());
}
Modified: airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/provider/utils/JobSubmissionListener.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/provider/utils/JobSubmissionListener.java?rev=1432116&r1=1432115&r2=1432116&view=diff
==============================================================================
--- airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/provider/utils/JobSubmissionListener.java (original)
+++ airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/provider/utils/JobSubmissionListener.java Fri Jan 11 16:02:36 2013
@@ -66,11 +66,11 @@ public class JobSubmissionListener imple
while (!isFinished()) {
int proxyExpTime = job.getCredentials().getRemainingLifetime();
if (proxyExpTime < JOB_PROXY_REMAINING_TIME_LIMIT) {
- log.debug("Job proxy expired. Trying to renew proxy");
+ log.info("Job proxy expired. Trying to renew proxy");
GSSCredential gssCred = ((GSISecurityContext) context.getSecurityContext(MYPROXY_SECURITY_CONTEXT))
.getGssCredentails();
job.renew(gssCred);
- log.debug("Myproxy renewed");
+ log.info("Myproxy renewed");
}
synchronized (this) {
@@ -80,16 +80,16 @@ public class JobSubmissionListener imple
*/
if (status != 0) {
if (job.getStatus() != status) {
- log.debug("Change job status manually");
+ log.info("Change job status manually");
if (setStatus(job.getStatus(), job.getError())) {
break;
}
} else {
- log.debug("job " + job.getIDAsString() + " have same status: "
+ log.info("job " + job.getIDAsString() + " have same status: "
+ GramJob.getStatusAsString(status));
}
} else {
- log.debug("Status is zero");
+ log.info("Status is zero");
}
wait(JOB_FINISH_WAIT_TIME);
@@ -107,7 +107,7 @@ public class JobSubmissionListener imple
switch (this.status) {
case GramJob.STATUS_FAILED:
- log.debug("Job Error Code: " + error);
+ log.info("Job Error Code: " + error);
case GramJob.STATUS_DONE:
this.finished = true;
}
@@ -117,7 +117,7 @@ public class JobSubmissionListener imple
public void statusChanged(GramJob job) {
String jobStatusMessage = "Status of job " + job.getIDAsString() + "is " + job.getStatusAsString();
- log.debug(jobStatusMessage);
+ log.info(jobStatusMessage);
/*
* Notify status change
Modified: airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/scheduler/impl/SchedulerImpl.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/scheduler/impl/SchedulerImpl.java?rev=1432116&r1=1432115&r2=1432116&view=diff
==============================================================================
--- airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/scheduler/impl/SchedulerImpl.java (original)
+++ airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/scheduler/impl/SchedulerImpl.java Fri Jan 11 16:02:36 2013
@@ -139,11 +139,11 @@ public class SchedulerImpl implements Sc
if (GfacUtils.isLocalHost(hostName)) {
return new LocalProvider();
} else if (amazonWebservices != null && hostName != null) {
- log.debug("host name: " + hostName);
+ log.info("host name: " + hostName);
// Amazon Provider
if (hostName.equalsIgnoreCase("AMAZON")){
- log.debug("EC2 Provider Selected");
+ log.info("EC2 Provider Selected");
try {
return new EC2Provider(context);
} catch (ProviderException e) {
@@ -170,7 +170,7 @@ public class SchedulerImpl implements Sc
hostName = applicationSchedulingContextArray[0].getHostName();
}
}
- log.debug("Searching registry for some deployed application hosts");
+ log.info("Searching registry for some deployed application hosts");
HostDescription result = null;
Map<HostDescription, List<ApplicationDescription>> deploymentDescription = null;
result = getRegisteredHost(regService, serviceName);
@@ -213,7 +213,7 @@ public class SchedulerImpl implements Sc
for (String hostDescName : applicationDescriptors.keySet()) {
HostDescription hostDescriptor = regService.getApplicationManager().getHostDescription(hostDescName);
result = hostDescriptor;
- log.debug("Found service on: " + result.getType().getHostAddress());
+ log.info("Found service on: " + result.getType().getHostAddress());
}
} catch (AiravataAPIInvocationException e) {
e.printStackTrace();