Menu
▾
▴
[Cogkit-svn] SF.net SVN: cogkit:[2172] trunk/current/src/cog/modules/karajan/src/org/ globus/cog/karajan/workflow/service
|
From: <ha...@us...> - 2008-09-16 10:56:34
|
Revision: 2172
http://cogkit.svn.sourceforge.net/cogkit/?rev=2172&view=rev
Author: hategan
Date: 2008-09-16 17:56:30 +0000 (Tue, 16 Sep 2008)
Log Message:
-----------
...
Modified Paths:
--------------
trunk/current/src/cog/modules/karajan/src/org/globus/cog/karajan/workflow/service/Client.java
trunk/current/src/cog/modules/karajan/src/org/globus/cog/karajan/workflow/service/ConnectionHandler.java
trunk/current/src/cog/modules/karajan/src/org/globus/cog/karajan/workflow/service/GSSService.java
trunk/current/src/cog/modules/karajan/src/org/globus/cog/karajan/workflow/service/RemoteConfiguration.java
trunk/current/src/cog/modules/karajan/src/org/globus/cog/karajan/workflow/service/RequestReply.java
trunk/current/src/cog/modules/karajan/src/org/globus/cog/karajan/workflow/service/Service.java
trunk/current/src/cog/modules/karajan/src/org/globus/cog/karajan/workflow/service/ServiceRequestManager.java
trunk/current/src/cog/modules/karajan/src/org/globus/cog/karajan/workflow/service/UDPService.java
trunk/current/src/cog/modules/karajan/src/org/globus/cog/karajan/workflow/service/handlers/ChannelConfigurationHandler.java
Modified: trunk/current/src/cog/modules/karajan/src/org/globus/cog/karajan/workflow/service/Client.java
===================================================================
--- trunk/current/src/cog/modules/karajan/src/org/globus/cog/karajan/workflow/service/Client.java 2008-09-16 17:56:08 UTC (rev 2171)
+++ trunk/current/src/cog/modules/karajan/src/org/globus/cog/karajan/workflow/service/Client.java 2008-09-16 17:56:30 UTC (rev 2172)
@@ -113,15 +113,6 @@
port = 1984;
}
channel = ChannelFactory.newChannel(contact, sc, requestManager);
- URI callbackURI = null;
- if (sc.getConfiguration().hasOption(RemoteConfiguration.CALLBACK)) {
- callbackURI = channel.getCallbackURI();
- }
- String remoteID = getChannel().getChannelContext().getChannelID().getRemoteID();
-
- ChannelConfigurationCommand ccc = new ChannelConfigurationCommand(
- sc.getConfiguration(), callbackURI);
- ccc.execute(this.getChannel());
connected = true;
}
catch (Exception e) {
Modified: trunk/current/src/cog/modules/karajan/src/org/globus/cog/karajan/workflow/service/ConnectionHandler.java
===================================================================
--- trunk/current/src/cog/modules/karajan/src/org/globus/cog/karajan/workflow/service/ConnectionHandler.java 2008-09-16 17:56:08 UTC (rev 2171)
+++ trunk/current/src/cog/modules/karajan/src/org/globus/cog/karajan/workflow/service/ConnectionHandler.java 2008-09-16 17:56:30 UTC (rev 2172)
@@ -9,6 +9,7 @@
*/
package org.globus.cog.karajan.workflow.service;
+import java.io.IOException;
import java.net.Socket;
import org.apache.log4j.Logger;
@@ -25,11 +26,11 @@
private final AbstractTCPChannel channel;
private final RequestManager requestManager;
- public ConnectionHandler(Service service, Socket socket) {
+ public ConnectionHandler(Service service, Socket socket) throws IOException {
this(service, socket, null);
}
- public ConnectionHandler(Service service, Socket socket, RequestManager requestManager) {
+ public ConnectionHandler(Service service, Socket socket, RequestManager requestManager) throws IOException {
this.socket = socket;
this.requestManager = requestManager == null ? new ServiceRequestManager() : requestManager;
if (socket instanceof GssSocket) {
@@ -45,5 +46,5 @@
socket.setKeepAlive(true);
socket.setSoTimeout(0);
channel.start();
- }
+ }
}
Modified: trunk/current/src/cog/modules/karajan/src/org/globus/cog/karajan/workflow/service/GSSService.java
===================================================================
--- trunk/current/src/cog/modules/karajan/src/org/globus/cog/karajan/workflow/service/GSSService.java 2008-09-16 17:56:08 UTC (rev 2171)
+++ trunk/current/src/cog/modules/karajan/src/org/globus/cog/karajan/workflow/service/GSSService.java 2008-09-16 17:56:30 UTC (rev 2172)
@@ -22,6 +22,9 @@
import org.globus.cog.abstraction.interfaces.JobSpecification;
import org.globus.cog.abstraction.interfaces.Task;
import org.globus.cog.abstraction.interfaces.TaskHandler;
+import org.globus.cog.karajan.workflow.service.channels.ChannelException;
+import org.globus.cog.karajan.workflow.service.channels.ChannelManager;
+import org.globus.cog.karajan.workflow.service.channels.KarajanChannel;
import org.globus.cog.util.ArgumentParser;
import org.globus.cog.util.ArgumentParserException;
import org.globus.cog.util.GridMap;
@@ -41,7 +44,7 @@
private boolean restricted;
private URI contact;
private RequestManager requestManager;
-
+
public GSSService() throws IOException {
super();
}
@@ -76,11 +79,11 @@
this._server = ServerSocketFactory.getDefault().createServerSocket(port, 50, bindTo);
}
}
-
+
protected void setRequestManager(RequestManager requestManager) {
this.requestManager = requestManager;
}
-
+
public void initialize() {
// prevent the server from being started by BaseServer constructors
}
@@ -123,11 +126,12 @@
if (serverThread == null) {
accept = true;
serverThread = new Thread(this);
+ serverThread.setDaemon(true);
serverThread.setName("Server: " + getContact());
serverThread.start();
}
}
-
+
public String toString() {
return String.valueOf(contact);
}
@@ -270,4 +274,9 @@
System.exit(1);
}
}
+
+ public void irrecoverableChannelError(KarajanChannel channel, Exception e) {
+ System.err.println("Irrecoverable channel exception: " + e.getMessage());
+ System.exit(2);
+ }
}
Modified: trunk/current/src/cog/modules/karajan/src/org/globus/cog/karajan/workflow/service/RemoteConfiguration.java
===================================================================
--- trunk/current/src/cog/modules/karajan/src/org/globus/cog/karajan/workflow/service/RemoteConfiguration.java 2008-09-16 17:56:08 UTC (rev 2171)
+++ trunk/current/src/cog/modules/karajan/src/org/globus/cog/karajan/workflow/service/RemoteConfiguration.java 2008-09-16 17:56:30 UTC (rev 2172)
@@ -29,6 +29,7 @@
public static final String RECONNECT = "reconnect";
public static final String POLL = "poll";
public static final String BUFFER = "buffer";
+ public static final String HEARTBEAT = "heartbeat";
private List entries;
private static final Entry DEFAULT;
@@ -75,9 +76,11 @@
}
public Entry find(String host) {
+ logger.warn("Find: " + host);
Iterator i = entries.iterator();
while (i.hasNext()) {
Entry e = (Entry) i.next();
+ logger.warn("Find: " + e.getUnparsed() + " - " + host);
if (e.compiled.matcher(host).matches()) {
return e;
}
Modified: trunk/current/src/cog/modules/karajan/src/org/globus/cog/karajan/workflow/service/RequestReply.java
===================================================================
--- trunk/current/src/cog/modules/karajan/src/org/globus/cog/karajan/workflow/service/RequestReply.java 2008-09-16 17:56:08 UTC (rev 2171)
+++ trunk/current/src/cog/modules/karajan/src/org/globus/cog/karajan/workflow/service/RequestReply.java 2008-09-16 17:56:30 UTC (rev 2172)
@@ -191,6 +191,10 @@
public KarajanChannel getChannel() {
return channel;
}
+
+ protected void setChannel(KarajanChannel channel) {
+ this.channel = channel;
+ }
public List getOutData() {
return outData;
Modified: trunk/current/src/cog/modules/karajan/src/org/globus/cog/karajan/workflow/service/Service.java
===================================================================
--- trunk/current/src/cog/modules/karajan/src/org/globus/cog/karajan/workflow/service/Service.java 2008-09-16 17:56:08 UTC (rev 2171)
+++ trunk/current/src/cog/modules/karajan/src/org/globus/cog/karajan/workflow/service/Service.java 2008-09-16 17:56:30 UTC (rev 2172)
@@ -11,6 +11,8 @@
import java.net.URI;
+import org.globus.cog.karajan.workflow.service.channels.KarajanChannel;
+
public interface Service {
boolean isRestricted();
@@ -19,4 +21,5 @@
ServiceContext getContext();
+ void irrecoverableChannelError(KarajanChannel channel, Exception e);
}
Modified: trunk/current/src/cog/modules/karajan/src/org/globus/cog/karajan/workflow/service/ServiceRequestManager.java
===================================================================
--- trunk/current/src/cog/modules/karajan/src/org/globus/cog/karajan/workflow/service/ServiceRequestManager.java 2008-09-16 17:56:08 UTC (rev 2171)
+++ trunk/current/src/cog/modules/karajan/src/org/globus/cog/karajan/workflow/service/ServiceRequestManager.java 2008-09-16 17:56:30 UTC (rev 2172)
@@ -12,6 +12,7 @@
import org.globus.cog.karajan.workflow.service.handlers.ChannelConfigurationHandler;
import org.globus.cog.karajan.workflow.service.handlers.EchoHandler;
import org.globus.cog.karajan.workflow.service.handlers.EventHandler;
+import org.globus.cog.karajan.workflow.service.handlers.HeartBeatHandler;
import org.globus.cog.karajan.workflow.service.handlers.ShutdownHandler;
import org.globus.cog.karajan.workflow.service.handlers.StartGroupHandler;
import org.globus.cog.karajan.workflow.service.handlers.StartHandler;
@@ -35,5 +36,6 @@
addHandler("SHUTDOWN", ShutdownHandler.class);
addHandler("STAT", StatHandler.class);
addHandler("SUBMIT", SubmitHandler.class);
+ addHandler(HeartBeatHandler.NAME, HeartBeatHandler.class);
}
}
Modified: trunk/current/src/cog/modules/karajan/src/org/globus/cog/karajan/workflow/service/UDPService.java
===================================================================
--- trunk/current/src/cog/modules/karajan/src/org/globus/cog/karajan/workflow/service/UDPService.java 2008-09-16 17:56:08 UTC (rev 2171)
+++ trunk/current/src/cog/modules/karajan/src/org/globus/cog/karajan/workflow/service/UDPService.java 2008-09-16 17:56:30 UTC (rev 2172)
@@ -22,6 +22,7 @@
import org.globus.cog.karajan.workflow.service.channels.ChannelContext;
import org.globus.cog.karajan.workflow.service.channels.ChannelException;
import org.globus.cog.karajan.workflow.service.channels.ChannelManager;
+import org.globus.cog.karajan.workflow.service.channels.KarajanChannel;
import org.globus.cog.karajan.workflow.service.channels.UDPChannel;
public class UDPService implements Service, Runnable {
@@ -122,6 +123,10 @@
}
}
+ public void irrecoverableChannelError(KarajanChannel channel, Exception e) {
+ e.printStackTrace();
+ }
+
public static void main(String[] args) {
try {
RequestManager rm = new ServiceRequestManager();
Modified: trunk/current/src/cog/modules/karajan/src/org/globus/cog/karajan/workflow/service/handlers/ChannelConfigurationHandler.java
===================================================================
--- trunk/current/src/cog/modules/karajan/src/org/globus/cog/karajan/workflow/service/handlers/ChannelConfigurationHandler.java 2008-09-16 17:56:08 UTC (rev 2171)
+++ trunk/current/src/cog/modules/karajan/src/org/globus/cog/karajan/workflow/service/handlers/ChannelConfigurationHandler.java 2008-09-16 17:56:30 UTC (rev 2172)
@@ -60,7 +60,7 @@
Iterator i = conf.getOptions().iterator();
while (i.hasNext()) {
String opt = (String) i.next();
- if (opt.equals(RemoteConfiguration.POLL)) {
+ if (opt.equals(RemoteConfiguration.POLL) || opt.equals(RemoteConfiguration.RECONNECT)) {
newopts.put(RemoteConfiguration.BUFFER, null);
}
else if (opt.equals(RemoteConfiguration.CALLBACK)) {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
