|
From: <ha...@us...> - 2008-04-22 20:13:46
|
Revision: 1972
http://cogkit.svn.sourceforge.net/cogkit/?rev=1972&view=rev
Author: hategan
Date: 2008-04-22 13:13:20 -0700 (Tue, 22 Apr 2008)
Log Message:
-----------
added some logging
Modified Paths:
--------------
trunk/current/src/cog/modules/provider-coaster/src/org/globus/cog/abstraction/coaster/service/local/LocalService.java
trunk/current/src/cog/modules/provider-coaster/src/org/globus/cog/abstraction/impl/execution/coaster/Bootstrap.java
trunk/current/src/cog/modules/provider-coaster/src/org/globus/cog/abstraction/impl/execution/coaster/ServiceManager.java
Modified: trunk/current/src/cog/modules/provider-coaster/src/org/globus/cog/abstraction/coaster/service/local/LocalService.java
===================================================================
--- trunk/current/src/cog/modules/provider-coaster/src/org/globus/cog/abstraction/coaster/service/local/LocalService.java 2008-04-22 18:13:19 UTC (rev 1971)
+++ trunk/current/src/cog/modules/provider-coaster/src/org/globus/cog/abstraction/coaster/service/local/LocalService.java 2008-04-22 20:13:20 UTC (rev 1972)
@@ -34,6 +34,9 @@
}
public void start() {
+ if (logger.isDebugEnabled()) {
+ logger.debug("Starting local service");
+ }
setAuthorization(new SelfAuthorization());
services = new HashMap();
this.accept = true;
@@ -63,6 +66,9 @@
public String waitForRegistration(Task t, String id, long timeout)
throws InterruptedException, IOException {
+ if (logger.isDebugEnabled()) {
+ logger.debug("Waiting for registration from service " + id);
+ }
long start = System.currentTimeMillis();
synchronized (services) {
while (!services.containsKey(id)) {
@@ -83,6 +89,9 @@
}
public void registrationReceived(String id, String url, KarajanChannel channel) {
+ if (logger.isDebugEnabled()) {
+ logger.debug("Received registration from service " + id + ": " + url);
+ }
synchronized (services) {
if (services.containsKey(id)) {
throw new IllegalArgumentException(
Modified: trunk/current/src/cog/modules/provider-coaster/src/org/globus/cog/abstraction/impl/execution/coaster/Bootstrap.java
===================================================================
--- trunk/current/src/cog/modules/provider-coaster/src/org/globus/cog/abstraction/impl/execution/coaster/Bootstrap.java 2008-04-22 18:13:19 UTC (rev 1971)
+++ trunk/current/src/cog/modules/provider-coaster/src/org/globus/cog/abstraction/impl/execution/coaster/Bootstrap.java 2008-04-22 20:13:20 UTC (rev 1972)
@@ -287,5 +287,4 @@
System.err.println(message);
System.exit(1);
}
-
}
Modified: trunk/current/src/cog/modules/provider-coaster/src/org/globus/cog/abstraction/impl/execution/coaster/ServiceManager.java
===================================================================
--- trunk/current/src/cog/modules/provider-coaster/src/org/globus/cog/abstraction/impl/execution/coaster/ServiceManager.java 2008-04-22 18:13:19 UTC (rev 1971)
+++ trunk/current/src/cog/modules/provider-coaster/src/org/globus/cog/abstraction/impl/execution/coaster/ServiceManager.java 2008-04-22 20:13:20 UTC (rev 1972)
@@ -21,6 +21,7 @@
import java.util.Map;
import java.util.Set;
+import org.apache.log4j.Logger;
import org.globus.cog.abstraction.coaster.service.local.LocalService;
import org.globus.cog.abstraction.impl.common.task.ExecutionServiceImpl;
import org.globus.cog.abstraction.impl.common.task.JobSpecificationImpl;
@@ -34,6 +35,9 @@
import org.globus.cog.abstraction.interfaces.TaskHandler;
public class ServiceManager {
+ public static final Logger logger = Logger
+ .getLogger(ServiceManager.class);
+
public static final String BOOTSTRAP_SCRIPT = "bootstrap.sh";
public static final String BOOTSTRAP_JAR = "coaster-bootstrap.jar";
public static final String BOOTSTRAP_LIST = "coaster-bootstrap.list";
@@ -65,6 +69,9 @@
public String reserveService(Task task, TaskHandler bootHandler)
throws TaskSubmissionException {
+ if (logger.isDebugEnabled()) {
+ logger.debug("Reserving service for " + task);
+ }
try {
Object service = getService(task);
// beah. it's impossible to nicely abstract both concurrency
@@ -100,6 +107,10 @@
try {
startLocalService();
Task t = buildTask(task);
+ if (logger.isDebugEnabled()) {
+ logger.debug("Starting coaster service on "
+ + task.getService(0) + ". Task is " + t);
+ }
bootHandler.submit(t);
String url = localService.waitForRegistration(t, (String) t
.getAttribute(TASK_ATTR_ID));
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|