Menu
▾
▴
cogkit-svn — SVN update notifications are sent to this mailing list
You can subscribe to this list here.
| 2006 |
Jan
|
Feb
|
Mar
|
Apr
(39) |
May
(165) |
Jun
(164) |
Jul
(127) |
Aug
(81) |
Sep
(146) |
Oct
(375) |
Nov
(241) |
Dec
(77) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2007 |
Jan
(42) |
Feb
(38) |
Mar
(30) |
Apr
(6) |
May
(17) |
Jun
|
Jul
(15) |
Aug
(59) |
Sep
(31) |
Oct
(44) |
Nov
(30) |
Dec
(12) |
| 2008 |
Jan
(9) |
Feb
(63) |
Mar
(18) |
Apr
(43) |
May
(28) |
Jun
(32) |
Jul
(61) |
Aug
(5) |
Sep
(72) |
Oct
(48) |
Nov
(6) |
Dec
|
|
From: <ha...@us...> - 2007-09-26 16:31:26
|
Revision: 1757
http://cogkit.svn.sourceforge.net/cogkit/?rev=1757&view=rev
Author: hategan
Date: 2007-09-26 09:31:18 -0700 (Wed, 26 Sep 2007)
Log Message:
-----------
case insensitive attributes
Modified Paths:
--------------
trunk/current/src/cog/modules/abstraction-common/src/org/globus/cog/abstraction/impl/common/task/JobSpecificationImpl.java
Modified: trunk/current/src/cog/modules/abstraction-common/src/org/globus/cog/abstraction/impl/common/task/JobSpecificationImpl.java
===================================================================
--- trunk/current/src/cog/modules/abstraction-common/src/org/globus/cog/abstraction/impl/common/task/JobSpecificationImpl.java 2007-09-21 22:34:48 UTC (rev 1756)
+++ trunk/current/src/cog/modules/abstraction-common/src/org/globus/cog/abstraction/impl/common/task/JobSpecificationImpl.java 2007-09-26 16:31:18 UTC (rev 1757)
@@ -288,11 +288,11 @@
}
public void setAttribute(String name, Object value) {
- this.additionalAttributes.put(name, value);
+ this.additionalAttributes.put(name.toLowerCase(), value);
}
public Object getAttribute(String name) {
- return this.additionalAttributes.get(name);
+ return this.additionalAttributes.get(name.toLowerCase());
}
public Enumeration getAllAttributes() {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ha...@us...> - 2007-09-21 22:34:51
|
Revision: 1756
http://cogkit.svn.sourceforge.net/cogkit/?rev=1756&view=rev
Author: hategan
Date: 2007-09-21 15:34:48 -0700 (Fri, 21 Sep 2007)
Log Message:
-----------
log the type as a string
Modified Paths:
--------------
trunk/current/src/cog/modules/abstraction-common/src/org/globus/cog/abstraction/impl/common/task/TaskImpl.java
Modified: trunk/current/src/cog/modules/abstraction-common/src/org/globus/cog/abstraction/impl/common/task/TaskImpl.java
===================================================================
--- trunk/current/src/cog/modules/abstraction-common/src/org/globus/cog/abstraction/impl/common/task/TaskImpl.java 2007-09-21 15:40:05 UTC (rev 1755)
+++ trunk/current/src/cog/modules/abstraction-common/src/org/globus/cog/abstraction/impl/common/task/TaskImpl.java 2007-09-21 22:34:48 UTC (rev 1756)
@@ -270,8 +270,18 @@
}
public String toString() {
- return "Task(type=" + type + ", identity=" + id + ")";
+ return "Task(type=" + typeString(type) + ", identity=" + id + ")";
}
+
+ public static String typeString(int type) {
+ switch (type) {
+ case JOB_SUBMISSION: return "JOB_SUBMISSION";
+ case FILE_TRANSFER: return "FILE_TRANSFER";
+ case FILE_OPERATION: return "FILE_OPERATION";
+ case INFORMATION_QUERY: return "INFORMATION_QUERY";
+ default: return "UNKNOWN";
+ }
+ }
public boolean isUnsubmitted() {
return (this.status.getStatusCode() == Status.UNSUBMITTED);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
Revision: 1755
http://cogkit.svn.sourceforge.net/cogkit/?rev=1755&view=rev
Author: hategan
Date: 2007-09-21 08:40:05 -0700 (Fri, 21 Sep 2007)
Log Message:
-----------
removed release before destory
Modified Paths:
--------------
trunk/current/src/cog/modules/provider-gt4_0_0/src/org/globus/cog/abstraction/impl/execution/gt4_0_0/JobSubmissionTaskHandler.java
Modified: trunk/current/src/cog/modules/provider-gt4_0_0/src/org/globus/cog/abstraction/impl/execution/gt4_0_0/JobSubmissionTaskHandler.java
===================================================================
--- trunk/current/src/cog/modules/provider-gt4_0_0/src/org/globus/cog/abstraction/impl/execution/gt4_0_0/JobSubmissionTaskHandler.java 2007-09-19 20:49:59 UTC (rev 1754)
+++ trunk/current/src/cog/modules/provider-gt4_0_0/src/org/globus/cog/abstraction/impl/execution/gt4_0_0/JobSubmissionTaskHandler.java 2007-09-21 15:40:05 UTC (rev 1755)
@@ -411,7 +411,6 @@
logger.debug("Destroying remote service for task "
+ this.task.getIdentity().toString());
}
- gramJob.release();
gramJob.destroy();
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ha...@us...> - 2007-09-19 20:50:02
|
Revision: 1754
http://cogkit.svn.sourceforge.net/cogkit/?rev=1754&view=rev
Author: hategan
Date: 2007-09-19 13:49:59 -0700 (Wed, 19 Sep 2007)
Log Message:
-----------
added constructor
Modified Paths:
--------------
trunk/current/src/cog/modules/abstraction-common/src/org/globus/cog/abstraction/impl/common/task/TaskSubmissionException.java
Modified: trunk/current/src/cog/modules/abstraction-common/src/org/globus/cog/abstraction/impl/common/task/TaskSubmissionException.java
===================================================================
--- trunk/current/src/cog/modules/abstraction-common/src/org/globus/cog/abstraction/impl/common/task/TaskSubmissionException.java 2007-09-19 20:49:28 UTC (rev 1753)
+++ trunk/current/src/cog/modules/abstraction-common/src/org/globus/cog/abstraction/impl/common/task/TaskSubmissionException.java 2007-09-19 20:49:59 UTC (rev 1754)
@@ -16,4 +16,8 @@
public TaskSubmissionException(String message, Throwable parent) {
super(message, parent);
}
+
+ public TaskSubmissionException(Throwable parent) {
+ super(parent);
+ }
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ha...@us...> - 2007-09-19 20:49:29
|
Revision: 1753
http://cogkit.svn.sourceforge.net/cogkit/?rev=1753&view=rev
Author: hategan
Date: 2007-09-19 13:49:28 -0700 (Wed, 19 Sep 2007)
Log Message:
-----------
don't set status if exception is thrown
Modified Paths:
--------------
trunk/current/src/cog/modules/abstraction-common/src/org/globus/cog/abstraction/impl/file/TaskHandlerImpl.java
Modified: trunk/current/src/cog/modules/abstraction-common/src/org/globus/cog/abstraction/impl/file/TaskHandlerImpl.java
===================================================================
--- trunk/current/src/cog/modules/abstraction-common/src/org/globus/cog/abstraction/impl/file/TaskHandlerImpl.java 2007-09-19 20:44:23 UTC (rev 1752)
+++ trunk/current/src/cog/modules/abstraction-common/src/org/globus/cog/abstraction/impl/file/TaskHandlerImpl.java 2007-09-19 20:49:28 UTC (rev 1753)
@@ -166,11 +166,7 @@
}
}
catch (Exception e) {
- Status status = new StatusImpl();
- status.setStatusCode(Status.FAILED);
- status.setException(e);
- task.setStatus(status);
- return;
+ throw new TaskSubmissionException(e);
}
task.setStatus(Status.COMPLETED);
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ha...@us...> - 2007-09-19 20:44:24
|
Revision: 1752
http://cogkit.svn.sourceforge.net/cogkit/?rev=1752&view=rev
Author: hategan
Date: 2007-09-19 13:44:23 -0700 (Wed, 19 Sep 2007)
Log Message:
-----------
don't set status if exception is thrown
Modified Paths:
--------------
trunk/current/src/cog/modules/provider-localscheduler/src/org/globus/cog/abstraction/impl/scheduler/cobalt/execution/JobSubmissionTaskHandler.java
trunk/current/src/cog/modules/provider-localscheduler/src/org/globus/cog/abstraction/impl/scheduler/pbs/execution/JobSubmissionTaskHandler.java
Modified: trunk/current/src/cog/modules/provider-localscheduler/src/org/globus/cog/abstraction/impl/scheduler/cobalt/execution/JobSubmissionTaskHandler.java
===================================================================
--- trunk/current/src/cog/modules/provider-localscheduler/src/org/globus/cog/abstraction/impl/scheduler/cobalt/execution/JobSubmissionTaskHandler.java 2007-09-19 20:43:48 UTC (rev 1751)
+++ trunk/current/src/cog/modules/provider-localscheduler/src/org/globus/cog/abstraction/impl/scheduler/cobalt/execution/JobSubmissionTaskHandler.java 2007-09-19 20:44:23 UTC (rev 1752)
@@ -68,12 +68,6 @@
}
}
catch (Exception e) {
- Status newStatus = new StatusImpl();
- Status oldStatus = this.task.getStatus();
- newStatus.setPrevStatusCode(oldStatus.getStatusCode());
- newStatus.setStatusCode(Status.FAILED);
- newStatus.setException(e);
- this.task.setStatus(newStatus);
if (e.getMessage() != null) {
throw new TaskSubmissionException("Cannot submit job: "
+ e.getMessage(), e);
Modified: trunk/current/src/cog/modules/provider-localscheduler/src/org/globus/cog/abstraction/impl/scheduler/pbs/execution/JobSubmissionTaskHandler.java
===================================================================
--- trunk/current/src/cog/modules/provider-localscheduler/src/org/globus/cog/abstraction/impl/scheduler/pbs/execution/JobSubmissionTaskHandler.java 2007-09-19 20:43:48 UTC (rev 1751)
+++ trunk/current/src/cog/modules/provider-localscheduler/src/org/globus/cog/abstraction/impl/scheduler/pbs/execution/JobSubmissionTaskHandler.java 2007-09-19 20:44:23 UTC (rev 1752)
@@ -68,12 +68,6 @@
}
}
catch (Exception e) {
- Status newStatus = new StatusImpl();
- Status oldStatus = this.task.getStatus();
- newStatus.setPrevStatusCode(oldStatus.getStatusCode());
- newStatus.setStatusCode(Status.FAILED);
- newStatus.setException(e);
- this.task.setStatus(newStatus);
if (e.getMessage() != null) {
throw new TaskSubmissionException("Cannot submit job: "
+ e.getMessage(), e);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ha...@us...> - 2007-09-19 20:43:49
|
Revision: 1751
http://cogkit.svn.sourceforge.net/cogkit/?rev=1751&view=rev
Author: hategan
Date: 2007-09-19 13:43:48 -0700 (Wed, 19 Sep 2007)
Log Message:
-----------
don't set status if exception is thrown
Modified Paths:
--------------
trunk/current/src/cog/modules/provider-local/src/org/globus/cog/abstraction/impl/execution/local/JobSubmissionTaskHandler.java
Modified: trunk/current/src/cog/modules/provider-local/src/org/globus/cog/abstraction/impl/execution/local/JobSubmissionTaskHandler.java
===================================================================
--- trunk/current/src/cog/modules/provider-local/src/org/globus/cog/abstraction/impl/execution/local/JobSubmissionTaskHandler.java 2007-09-19 20:43:23 UTC (rev 1750)
+++ trunk/current/src/cog/modules/provider-local/src/org/globus/cog/abstraction/impl/execution/local/JobSubmissionTaskHandler.java 2007-09-19 20:43:48 UTC (rev 1751)
@@ -83,12 +83,6 @@
}
}
} catch (Exception e) {
- Status newStatus = new StatusImpl();
- Status oldStatus = this.task.getStatus();
- newStatus.setPrevStatusCode(oldStatus.getStatusCode());
- newStatus.setStatusCode(Status.FAILED);
- newStatus.setException(e);
- this.task.setStatus(newStatus);
throw new TaskSubmissionException("Cannot submit job", e);
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
Revision: 1750
http://cogkit.svn.sourceforge.net/cogkit/?rev=1750&view=rev
Author: hategan
Date: 2007-09-19 13:43:23 -0700 (Wed, 19 Sep 2007)
Log Message:
-----------
don't set status if exception is thrown
Modified Paths:
--------------
trunk/current/src/cog/modules/provider-gt4_0_0/src/org/globus/cog/abstraction/impl/execution/gt4_0_0/JobSubmissionTaskHandler.java
Modified: trunk/current/src/cog/modules/provider-gt4_0_0/src/org/globus/cog/abstraction/impl/execution/gt4_0_0/JobSubmissionTaskHandler.java
===================================================================
--- trunk/current/src/cog/modules/provider-gt4_0_0/src/org/globus/cog/abstraction/impl/execution/gt4_0_0/JobSubmissionTaskHandler.java 2007-09-19 20:41:43 UTC (rev 1749)
+++ trunk/current/src/cog/modules/provider-gt4_0_0/src/org/globus/cog/abstraction/impl/execution/gt4_0_0/JobSubmissionTaskHandler.java 2007-09-19 20:43:23 UTC (rev 1750)
@@ -188,7 +188,6 @@
}
}
catch (Exception e) {
- failTask(e.getMessage(), e);
// No need for cleanup. Reportedly no resource has been created
// if an exception is thrown
gramJob.removeListener(this);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ha...@us...> - 2007-09-19 20:41:47
|
Revision: 1749
http://cogkit.svn.sourceforge.net/cogkit/?rev=1749&view=rev
Author: hategan
Date: 2007-09-19 13:41:43 -0700 (Wed, 19 Sep 2007)
Log Message:
-----------
don't set status if exception is thrown
Modified Paths:
--------------
trunk/current/src/cog/modules/provider-gt2/src/org/globus/cog/abstraction/impl/execution/gt2/JobSubmissionTaskHandler.java
Modified: trunk/current/src/cog/modules/provider-gt2/src/org/globus/cog/abstraction/impl/execution/gt2/JobSubmissionTaskHandler.java
===================================================================
--- trunk/current/src/cog/modules/provider-gt2/src/org/globus/cog/abstraction/impl/execution/gt2/JobSubmissionTaskHandler.java 2007-09-19 20:40:51 UTC (rev 1748)
+++ trunk/current/src/cog/modules/provider-gt2/src/org/globus/cog/abstraction/impl/execution/gt2/JobSubmissionTaskHandler.java 2007-09-19 20:41:43 UTC (rev 1749)
@@ -145,22 +145,10 @@
}
}
catch (GramException ge) {
- Status newStatus = new StatusImpl();
- Status oldStatus = this.task.getStatus();
- newStatus.setPrevStatusCode(oldStatus.getStatusCode());
- newStatus.setStatusCode(Status.FAILED);
- newStatus.setException(ge);
- this.task.setStatus(newStatus);
cleanup();
throw new TaskSubmissionException("Cannot submit job", ge);
}
catch (GSSException gsse) {
- Status newStatus = new StatusImpl();
- Status oldStatus = this.task.getStatus();
- newStatus.setPrevStatusCode(oldStatus.getStatusCode());
- newStatus.setStatusCode(Status.FAILED);
- newStatus.setException(gsse);
- this.task.setStatus(newStatus);
cleanup();
throw new InvalidSecurityContextException("Invalid GSSCredentials",
gsse);
@@ -224,22 +212,10 @@
}
}
catch (GramException ge) {
- Status newStatus = new StatusImpl();
- Status oldStatus = this.task.getStatus();
- newStatus.setPrevStatusCode(oldStatus.getStatusCode());
- newStatus.setStatusCode(Status.FAILED);
- newStatus.setException(ge);
- this.task.setStatus(newStatus);
listener.failed(true);
throw new TaskSubmissionException("Cannot submit job", ge);
}
catch (GSSException gsse) {
- Status newStatus = new StatusImpl();
- Status oldStatus = this.task.getStatus();
- newStatus.setPrevStatusCode(oldStatus.getStatusCode());
- newStatus.setStatusCode(Status.FAILED);
- newStatus.setException(gsse);
- this.task.setStatus(newStatus);
listener.failed(true);
throw new InvalidSecurityContextException("Invalid GSSCredentials",
gsse);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ha...@us...> - 2007-09-19 20:40:52
|
Revision: 1748
http://cogkit.svn.sourceforge.net/cogkit/?rev=1748&view=rev
Author: hategan
Date: 2007-09-19 13:40:51 -0700 (Wed, 19 Sep 2007)
Log Message:
-----------
cleaned up a bit
Modified Paths:
--------------
trunk/current/src/cog/modules/provider-gt2/src/org/globus/cog/abstraction/impl/file/gridftp/old/FileResourceImpl.java
Modified: trunk/current/src/cog/modules/provider-gt2/src/org/globus/cog/abstraction/impl/file/gridftp/old/FileResourceImpl.java
===================================================================
--- trunk/current/src/cog/modules/provider-gt2/src/org/globus/cog/abstraction/impl/file/gridftp/old/FileResourceImpl.java 2007-09-19 20:38:52 UTC (rev 1747)
+++ trunk/current/src/cog/modules/provider-gt2/src/org/globus/cog/abstraction/impl/file/gridftp/old/FileResourceImpl.java 2007-09-19 20:40:51 UTC (rev 1748)
@@ -25,6 +25,7 @@
import org.globus.cog.abstraction.impl.file.FileResourceException;
import org.globus.cog.abstraction.impl.file.GridFileImpl;
import org.globus.cog.abstraction.impl.file.IllegalHostException;
+import org.globus.cog.abstraction.impl.file.PermissionsImpl;
import org.globus.cog.abstraction.impl.file.ftp.AbstractFTPFileResource;
import org.globus.cog.abstraction.impl.file.gridftp.DataChannelAuthenticationType;
import org.globus.cog.abstraction.impl.file.gridftp.DataChannelProtectionType;
@@ -194,7 +195,7 @@
gridFTPClient.setPassiveMode(true);
Enumeration list = gridFTPClient.list().elements();
while (list.hasMoreElements()) {
- gridFileList.add(createGridFile(list.nextElement()));
+ gridFileList.add(createGridFile((FileInfo) list.nextElement()));
}
return gridFileList;
@@ -511,62 +512,56 @@
}
/** create the file information object */
- private GridFile createGridFile(Object obj) throws FileResourceException {
+ private GridFile createGridFile(FileInfo fi) throws FileResourceException {
GridFile gridFile = new GridFileImpl();
- FileInfo fileInfo = (FileInfo) obj;
-
String directory = getCurrentDirectory();
if (directory.endsWith("/")) {
- gridFile.setAbsolutePathName(directory + fileInfo.getName());
+ gridFile.setAbsolutePathName(directory + fi.getName());
}
else {
- gridFile.setAbsolutePathName(directory + "/" + fileInfo.getName());
+ gridFile.setAbsolutePathName(directory + "/" + fi.getName());
}
- gridFile.setLastModified(fileInfo.getDate());
+ gridFile.setLastModified(fi.getDate());
- if (fileInfo.isFile()) {
+ if (fi.isFile()) {
gridFile.setFileType(GridFile.FILE);
}
- if (fileInfo.isDirectory()) {
+ if (fi.isDirectory()) {
gridFile.setFileType(GridFile.DIRECTORY);
}
- if (fileInfo.isDevice()) {
+ if (fi.isDevice()) {
gridFile.setFileType(GridFile.DEVICE);
}
- if (fileInfo.isSoftLink()) {
+ //Grr. softlink and all the other ones are orthogonal
+ if (fi.isSoftLink()) {
gridFile.setFileType(GridFile.SOFTLINK);
}
- gridFile.setMode(fileInfo.getModeAsString());
- gridFile.setName(fileInfo.getName());
- gridFile.setSize(fileInfo.getSize());
+ gridFile.setMode(fi.getModeAsString());
+ gridFile.setName(fi.getName());
+ gridFile.setSize(fi.getSize());
- Permissions userPermissions = gridFile.getUserPermissions();
- Permissions groupPermissions = gridFile.getGroupPermissions();
- Permissions allPermissions = gridFile.getAllPermissions();
+ gridFile.setUserPermissions(getPermissions(fi.userCanRead(), fi
+ .userCanWrite(), fi.userCanExecute()));
+ gridFile.setGroupPermissions(getPermissions(fi.groupCanRead(), fi
+ .groupCanWrite(), fi.groupCanExecute()));
+ gridFile.setAllPermissions(getPermissions(fi.allCanRead(), fi
+ .allCanWrite(), fi.allCanExecute()));
- userPermissions.setRead(fileInfo.userCanRead());
- userPermissions.setWrite(fileInfo.userCanWrite());
- userPermissions.setExecute(fileInfo.userCanExecute());
-
- groupPermissions.setRead(fileInfo.groupCanRead());
- groupPermissions.setWrite(fileInfo.groupCanWrite());
- groupPermissions.setExecute(fileInfo.groupCanExecute());
-
- allPermissions.setRead(fileInfo.allCanRead());
- allPermissions.setWrite(fileInfo.allCanWrite());
- allPermissions.setExecute(fileInfo.allCanExecute());
-
- gridFile.setUserPermissions(userPermissions);
- gridFile.setGroupPermissions(groupPermissions);
- gridFile.setAllPermissions(allPermissions);
-
return gridFile;
}
+ protected Permissions getPermissions(boolean r, boolean w, boolean x) {
+ Permissions perm = new PermissionsImpl();
+ perm.setRead(r);
+ perm.setWrite(w);
+ perm.setExecute(x);
+ return perm;
+ }
+
private void removeLocalDirectory(String tempDirName) {
File tempFile = new File(tempDirName);
String[] fileNames = tempFile.list();
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ha...@us...> - 2007-09-19 20:38:53
|
Revision: 1747
http://cogkit.svn.sourceforge.net/cogkit/?rev=1747&view=rev
Author: hategan
Date: 2007-09-19 13:38:52 -0700 (Wed, 19 Sep 2007)
Log Message:
-----------
clarified cases in which an exception is thrown and when task status is set
Modified Paths:
--------------
trunk/current/src/cog/modules/abstraction-common/src/org/globus/cog/abstraction/interfaces/TaskHandler.java
Modified: trunk/current/src/cog/modules/abstraction-common/src/org/globus/cog/abstraction/interfaces/TaskHandler.java
===================================================================
--- trunk/current/src/cog/modules/abstraction-common/src/org/globus/cog/abstraction/interfaces/TaskHandler.java 2007-09-19 20:38:04 UTC (rev 1746)
+++ trunk/current/src/cog/modules/abstraction-common/src/org/globus/cog/abstraction/interfaces/TaskHandler.java 2007-09-19 20:38:52 UTC (rev 1747)
@@ -75,19 +75,22 @@
* {@link ExecutableObject#addStatusListener(StatusListener)}and
* {@link Task#addOutputListener(OutputListener)}methods respectively.
*
+ * If the submission fails, the task handler should throw an exception
+ * and not set the status of the task to {@link Task#FAILED}.
+ *
* @param task
* the <code>Task</code> to be submitted
* @throws IllegalSpecException
- * when the {@link Specification}associated with the task is
+ * when the {@link Specification} associated with the task is
* illegal
* @throws InvalidSecurityContextException
- * when the {@link SecurityContext}associated with the task is
+ * when the {@link SecurityContext} associated with the task is
* invalid
* @throws InvalidServiceContactException
- * when the {@link ServiceContact}associated with the task is
+ * when the {@link ServiceContact} associated with the task is
* invalid
* @throws TaskSubmissionException
- * when generic errors occur during task submission
+ * when a generic errors occur during task submission
*/
public void submit(Task task) throws IllegalSpecException,
InvalidSecurityContextException, InvalidServiceContactException,
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ha...@us...> - 2007-09-19 20:38:09
|
Revision: 1746
http://cogkit.svn.sourceforge.net/cogkit/?rev=1746&view=rev
Author: hategan
Date: 2007-09-19 13:38:04 -0700 (Wed, 19 Sep 2007)
Log Message:
-----------
this should be a warning
Modified Paths:
--------------
trunk/current/src/cog/modules/abstraction-common/src/org/globus/cog/abstraction/impl/common/AbstractionProperties.java
Modified: trunk/current/src/cog/modules/abstraction-common/src/org/globus/cog/abstraction/impl/common/AbstractionProperties.java
===================================================================
--- trunk/current/src/cog/modules/abstraction-common/src/org/globus/cog/abstraction/impl/common/AbstractionProperties.java 2007-09-19 15:51:46 UTC (rev 1745)
+++ trunk/current/src/cog/modules/abstraction-common/src/org/globus/cog/abstraction/impl/common/AbstractionProperties.java 2007-09-19 20:38:04 UTC (rev 1746)
@@ -162,7 +162,7 @@
loadProviderProperties(((URL) e.nextElement()).openStream());
}
catch (Exception ee) {
- logger.debug("Error reading from provider properties", ee);
+ logger.warn("Error reading from provider properties", ee);
}
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ha...@us...> - 2007-09-19 15:51:47
|
Revision: 1745
http://cogkit.svn.sourceforge.net/cogkit/?rev=1745&view=rev
Author: hategan
Date: 2007-09-19 08:51:46 -0700 (Wed, 19 Sep 2007)
Log Message:
-----------
updated changes a bit
Modified Paths:
--------------
trunk/current/src/cog/modules/provider-localscheduler/CHANGES.txt
Modified: trunk/current/src/cog/modules/provider-localscheduler/CHANGES.txt
===================================================================
--- trunk/current/src/cog/modules/provider-localscheduler/CHANGES.txt 2007-09-19 15:43:47 UTC (rev 1744)
+++ trunk/current/src/cog/modules/provider-localscheduler/CHANGES.txt 2007-09-19 15:51:46 UTC (rev 1745)
@@ -3,7 +3,8 @@
*** Cobalt: 'count' attribute mapped to '-c'. The default should
be figured by cqsub from 'hostCount'. Looking at the cqsub
code, it seems like count = 2 * hostCount on a BG/L and
- count = 4 * hostCount on a BG/P.
+ count = 4 * hostCount on a BG/P. That's in vn mode. In
+ co mode count = hostCount.
*** Cobalt: 'hostCount' attribute mapped to '-n', with a default
of 1
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ha...@us...> - 2007-09-19 15:43:53
|
Revision: 1744
http://cogkit.svn.sourceforge.net/cogkit/?rev=1744&view=rev
Author: hategan
Date: 2007-09-19 08:43:47 -0700 (Wed, 19 Sep 2007)
Log Message:
-----------
correctly map count to -c and host count to -n
Modified Paths:
--------------
trunk/current/src/cog/modules/provider-localscheduler/CHANGES.txt
trunk/current/src/cog/modules/provider-localscheduler/src/org/globus/cog/abstraction/impl/scheduler/cobalt/CobaltExecutor.java
Modified: trunk/current/src/cog/modules/provider-localscheduler/CHANGES.txt
===================================================================
--- trunk/current/src/cog/modules/provider-localscheduler/CHANGES.txt 2007-09-19 15:36:47 UTC (rev 1743)
+++ trunk/current/src/cog/modules/provider-localscheduler/CHANGES.txt 2007-09-19 15:43:47 UTC (rev 1744)
@@ -1,3 +1,13 @@
+(09/19/07)
+
+*** Cobalt: 'count' attribute mapped to '-c'. The default should
+ be figured by cqsub from 'hostCount'. Looking at the cqsub
+ code, it seems like count = 2 * hostCount on a BG/L and
+ count = 4 * hostCount on a BG/P.
+
+*** Cobalt: 'hostCount' attribute mapped to '-n', with a default
+ of 1
+
(08/22/07)
*** The cobalt provider was not passing command line arguments
Modified: trunk/current/src/cog/modules/provider-localscheduler/src/org/globus/cog/abstraction/impl/scheduler/cobalt/CobaltExecutor.java
===================================================================
--- trunk/current/src/cog/modules/provider-localscheduler/src/org/globus/cog/abstraction/impl/scheduler/cobalt/CobaltExecutor.java 2007-09-19 15:36:47 UTC (rev 1743)
+++ trunk/current/src/cog/modules/provider-localscheduler/src/org/globus/cog/abstraction/impl/scheduler/cobalt/CobaltExecutor.java 2007-09-19 15:43:47 UTC (rev 1744)
@@ -158,7 +158,8 @@
}
addAttr("mode", "-m", l);
// We're gonna treat this as the node count
- addAttr("count", "-n", l, "1");
+ addAttr("count", "-c", l);
+ addAttr("hostCount", "-n", l, "1");
addAttr("project", "-p", l);
addAttr("queue", "-q", l);
addAttr("kernelprofile", "-k", l);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ha...@us...> - 2007-09-19 15:36:53
|
Revision: 1743
http://cogkit.svn.sourceforge.net/cogkit/?rev=1743&view=rev
Author: hategan
Date: 2007-09-19 08:36:47 -0700 (Wed, 19 Sep 2007)
Log Message:
-----------
updated changes
Modified Paths:
--------------
trunk/current/src/cog/modules/karajan/CHANGES.txt
Modified: trunk/current/src/cog/modules/karajan/CHANGES.txt
===================================================================
--- trunk/current/src/cog/modules/karajan/CHANGES.txt 2007-09-19 15:35:05 UTC (rev 1742)
+++ trunk/current/src/cog/modules/karajan/CHANGES.txt 2007-09-19 15:36:47 UTC (rev 1743)
@@ -1,3 +1,11 @@
+(09/19/2007)
+
+*** Added hostCount argument to task:execute. This means that, in
+ general, count should be understood to mean "process count"
+
+*** Added batch argument to task:execute. It allows for
+ "fire and forget" jobs.
+
(09/13/2007)
*** Added a fixed rate submit queue. It can be enabled by specifying
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ha...@us...> - 2007-09-19 15:35:09
|
Revision: 1742
http://cogkit.svn.sourceforge.net/cogkit/?rev=1742&view=rev
Author: hategan
Date: 2007-09-19 08:35:05 -0700 (Wed, 19 Sep 2007)
Log Message:
-----------
added hostCount and batch arguments
Modified Paths:
--------------
trunk/current/src/cog/modules/karajan/src/org/globus/cog/karajan/workflow/nodes/grid/GridExec.java
Modified: trunk/current/src/cog/modules/karajan/src/org/globus/cog/karajan/workflow/nodes/grid/GridExec.java
===================================================================
--- trunk/current/src/cog/modules/karajan/src/org/globus/cog/karajan/workflow/nodes/grid/GridExec.java 2007-09-18 21:45:30 UTC (rev 1741)
+++ trunk/current/src/cog/modules/karajan/src/org/globus/cog/karajan/workflow/nodes/grid/GridExec.java 2007-09-19 15:35:05 UTC (rev 1742)
@@ -52,6 +52,7 @@
public static final Arg A_PROVIDER = new Arg.Optional("provider");
public static final Arg A_SECURITY_CONTEXT = new Arg.Optional("securitycontext");
public static final Arg A_COUNT = new Arg.Optional("count");
+ public static final Arg A_HOST_COUNT = new Arg.Optional("hostcount");
public static final Arg A_JOBTYPE = new Arg.Optional("jobtype");
public static final Arg A_MAXTIME = new Arg.Optional("maxtime");
public static final Arg A_MAXWALLTIME = new Arg.Optional("maxwalltime");
@@ -68,13 +69,14 @@
public static final Arg.Channel C_ENVIRONMENT = new Arg.Channel("environment");
public static final Arg A_ATTRIBUTES = new Arg.Optional("attributes", Collections.EMPTY_MAP);
public static final Arg A_FAIL_ON_JOB_ERROR = new Arg.Optional("failonjoberror", Boolean.TRUE);
+ public static final Arg A_BATCH = new Arg.Optional("batch", Boolean.FALSE);
static {
setArguments(GridExec.class, new Arg[] { A_EXECUTABLE, A_ARGS, A_ARGUMENTS, A_HOST,
A_STDOUT, A_STDERR, A_STDOUTLOCATION, A_STDERRLOCATION, A_STDIN, A_PROVIDER,
- A_COUNT, A_JOBTYPE, A_MAXTIME, A_MAXWALLTIME, A_MAXCPUTIME, A_ENVIRONMENT, A_QUEUE,
+ A_COUNT, A_HOST_COUNT, A_JOBTYPE, A_MAXTIME, A_MAXWALLTIME, A_MAXCPUTIME, A_ENVIRONMENT, A_QUEUE,
A_PROJECT, A_MINMEMORY, A_MAXMEMORY, A_REDIRECT, A_SECURITY_CONTEXT, A_DIRECTORY,
- A_NATIVESPEC, A_DELEGATION, A_ATTRIBUTES, C_ENVIRONMENT, A_FAIL_ON_JOB_ERROR });
+ A_NATIVESPEC, A_DELEGATION, A_ATTRIBUTES, C_ENVIRONMENT, A_FAIL_ON_JOB_ERROR, A_BATCH });
}
public void submitTask(VariableStack stack) throws ExecutionException {
@@ -183,6 +185,9 @@
}
}
}
+ else if (name.equals(A_BATCH.getName())) {
+ js.setBatchJob(TypeUtil.toBoolean(value));
+ }
else {
js.setAttribute(name, value);
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
Revision: 1741
http://cogkit.svn.sourceforge.net/cogkit/?rev=1741&view=rev
Author: hategan
Date: 2007-09-18 14:45:30 -0700 (Tue, 18 Sep 2007)
Log Message:
-----------
added socketTimeout attribute handling
Modified Paths:
--------------
trunk/current/src/cog/modules/provider-gt4_0_0/src/org/globus/cog/abstraction/impl/execution/gt4_0_0/JobSubmissionTaskHandler.java
Modified: trunk/current/src/cog/modules/provider-gt4_0_0/src/org/globus/cog/abstraction/impl/execution/gt4_0_0/JobSubmissionTaskHandler.java
===================================================================
--- trunk/current/src/cog/modules/provider-gt4_0_0/src/org/globus/cog/abstraction/impl/execution/gt4_0_0/JobSubmissionTaskHandler.java 2007-09-14 21:40:11 UTC (rev 1740)
+++ trunk/current/src/cog/modules/provider-gt4_0_0/src/org/globus/cog/abstraction/impl/execution/gt4_0_0/JobSubmissionTaskHandler.java 2007-09-18 21:45:30 UTC (rev 1741)
@@ -176,8 +176,7 @@
this.gramJob.addListener(this);
}
- this.gramJob
- .setDelegationEnabled(spec.getDelegation() != Delegation.NO_DELEGATION);
+ setMiscJobParams(spec, this.gramJob);
try {
this.gramJob.submit(factoryEndpoint, spec.isBatchJob(), spec
@@ -199,6 +198,23 @@
}
}
+ protected void setMiscJobParams(JobSpecification spec, GramJob job) {
+ job
+ .setDelegationEnabled(spec.getDelegation() != Delegation.NO_DELEGATION);
+
+ Object soTimeout = spec.getAttribute("socketTimeout");
+ if (soTimeout instanceof Integer) {
+ job.setTimeOut(((Integer) soTimeout).intValue());
+ }
+ else if (soTimeout instanceof String) {
+ job.setTimeOut(Integer.parseInt((String) soTimeout));
+ }
+ else {
+ logger.warn("Unknown value for socketTimeout attribute ("
+ + soTimeout + "). Ignoring.");
+ }
+ }
+
public void suspend() throws InvalidSecurityContextException,
TaskSubmissionException {
throw new UnsupportedOperationException("suspend");
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ha...@us...> - 2007-09-14 21:40:46
|
Revision: 1740
http://cogkit.svn.sourceforge.net/cogkit/?rev=1740&view=rev
Author: hategan
Date: 2007-09-14 14:40:11 -0700 (Fri, 14 Sep 2007)
Log Message:
-----------
only throttle jobs
Modified Paths:
--------------
trunk/current/src/cog/modules/karajan/src/org/globus/cog/karajan/scheduler/submitQueue/FixedRateQueue.java
Modified: trunk/current/src/cog/modules/karajan/src/org/globus/cog/karajan/scheduler/submitQueue/FixedRateQueue.java
===================================================================
--- trunk/current/src/cog/modules/karajan/src/org/globus/cog/karajan/scheduler/submitQueue/FixedRateQueue.java 2007-09-13 21:20:40 UTC (rev 1739)
+++ trunk/current/src/cog/modules/karajan/src/org/globus/cog/karajan/scheduler/submitQueue/FixedRateQueue.java 2007-09-14 21:40:11 UTC (rev 1740)
@@ -12,16 +12,17 @@
import java.util.Timer;
import java.util.TimerTask;
+import org.globus.cog.abstraction.interfaces.Task;
+
public class FixedRateQueue extends AbstractSubmitQueue {
private long lastSubmit, delay;
private static Timer timer;
-
public FixedRateQueue(long delay) {
- super(Math.max(1, (int) (delay/1000)));
+ super(Math.max(1, (int) (delay / 1000)));
this.delay = delay;
}
-
+
public FixedRateQueue(double rate) {
super(Math.max(1, (int) rate));
this.delay = (long) (1000 / rate);
@@ -56,4 +57,18 @@
nbs.nextQueue();
}
}
+
+ public void queue(NonBlockingSubmit nbs) {
+ if (nbs != null) {
+ if (nbs.getTask().getType() == Task.JOB_SUBMISSION) {
+ super.queue(nbs);
+ }
+ else {
+ nbs.nextQueue();
+ }
+ }
+ else {
+ super.queue(nbs);
+ }
+ }
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ha...@us...> - 2007-09-13 21:20:42
|
Revision: 1739
http://cogkit.svn.sourceforge.net/cogkit/?rev=1739&view=rev
Author: hategan
Date: 2007-09-13 14:20:40 -0700 (Thu, 13 Sep 2007)
Log Message:
-----------
changes
Modified Paths:
--------------
trunk/current/src/cog/modules/karajan/CHANGES.txt
Modified: trunk/current/src/cog/modules/karajan/CHANGES.txt
===================================================================
--- trunk/current/src/cog/modules/karajan/CHANGES.txt 2007-09-13 21:18:23 UTC (rev 1738)
+++ trunk/current/src/cog/modules/karajan/CHANGES.txt 2007-09-13 21:20:40 UTC (rev 1739)
@@ -1,3 +1,10 @@
+(09/13/2007)
+
+*** Added a fixed rate submit queue. It can be enabled by specifying
+ the maxSubmitRate property for a host. The value is a floating
+ point number. So if you wanted at most one job submitted every
+ ten seconds, the rate would be 0.1.
+
(09/06/2007)
*** Partial ability to have a CWD for each separate execution,
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ha...@us...> - 2007-09-13 21:18:34
|
Revision: 1738
http://cogkit.svn.sourceforge.net/cogkit/?rev=1738&view=rev
Author: hategan
Date: 2007-09-13 14:18:23 -0700 (Thu, 13 Sep 2007)
Log Message:
-----------
added a fixed rate queue
Modified Paths:
--------------
trunk/current/src/cog/modules/karajan/src/org/globus/cog/karajan/scheduler/submitQueue/HostSubmitQueue.java
trunk/current/src/cog/modules/karajan/src/org/globus/cog/karajan/scheduler/submitQueue/InstanceSubmitQueue.java
Added Paths:
-----------
trunk/current/src/cog/modules/karajan/src/org/globus/cog/karajan/scheduler/submitQueue/FixedRateQueue.java
Added: trunk/current/src/cog/modules/karajan/src/org/globus/cog/karajan/scheduler/submitQueue/FixedRateQueue.java
===================================================================
--- trunk/current/src/cog/modules/karajan/src/org/globus/cog/karajan/scheduler/submitQueue/FixedRateQueue.java (rev 0)
+++ trunk/current/src/cog/modules/karajan/src/org/globus/cog/karajan/scheduler/submitQueue/FixedRateQueue.java 2007-09-13 21:18:23 UTC (rev 1738)
@@ -0,0 +1,59 @@
+//----------------------------------------------------------------------
+//This code is developed as part of the Java CoG Kit project
+//The terms of the license can be found at http://www.cogkit.org/license
+//This message may not be removed or altered.
+//----------------------------------------------------------------------
+
+/*
+ * Created on Jul 20, 2006
+ */
+package org.globus.cog.karajan.scheduler.submitQueue;
+
+import java.util.Timer;
+import java.util.TimerTask;
+
+public class FixedRateQueue extends AbstractSubmitQueue {
+ private long lastSubmit, delay;
+ private static Timer timer;
+
+
+ public FixedRateQueue(long delay) {
+ super(Math.max(1, (int) (delay/1000)));
+ this.delay = delay;
+ }
+
+ public FixedRateQueue(double rate) {
+ super(Math.max(1, (int) rate));
+ this.delay = (long) (1000 / rate);
+ }
+
+ private static synchronized Timer getTimer() {
+ if (timer == null) {
+ timer = new Timer(true);
+ }
+ return timer;
+ }
+
+ protected void step() {
+ NonBlockingSubmit nbs = null;
+ synchronized (this) {
+ if (!isQueueEmpty()) {
+ long time = System.currentTimeMillis();
+ if (time - lastSubmit > delay) {
+ nbs = poll();
+ lastSubmit = time;
+ }
+ else {
+ getTimer().schedule(new TimerTask() {
+ public void run() {
+ step();
+ }
+ }, delay - time + lastSubmit);
+ }
+ }
+ }
+ if (nbs != null) {
+ nbs.nextQueue();
+ }
+ }
+}
Modified: trunk/current/src/cog/modules/karajan/src/org/globus/cog/karajan/scheduler/submitQueue/HostSubmitQueue.java
===================================================================
--- trunk/current/src/cog/modules/karajan/src/org/globus/cog/karajan/scheduler/submitQueue/HostSubmitQueue.java 2007-09-10 15:46:32 UTC (rev 1737)
+++ trunk/current/src/cog/modules/karajan/src/org/globus/cog/karajan/scheduler/submitQueue/HostSubmitQueue.java 2007-09-13 21:18:23 UTC (rev 1738)
@@ -12,11 +12,16 @@
import java.util.HashMap;
import java.util.Map;
+import org.globus.cog.karajan.util.BoundContact;
+
public class HostSubmitQueue extends AbstractSubmitQueue {
private Map providerQueues;
+ private BoundContact contact;
+ private FixedRateQueue rlq;
- public HostSubmitQueue(int throttle) {
+ public HostSubmitQueue(BoundContact contact, int throttle) {
super(throttle);
+ this.contact = contact;
}
private static final NullQueue NULL_QUEUE = new NullQueue();
@@ -33,8 +38,13 @@
sq = new RateLimiterQueue(initialRate, maxRetries, errorRegexp);
providerQueues.put(provider, sq);
}
-
}
+ else if (contact.getProperty("maxSubmitRate") != null) {
+ if (rlq == null) {
+ rlq = new FixedRateQueue(Double.parseDouble(contact.getProperty("maxSubmitRate").toString()));
+ }
+ sq = rlq;
+ }
else {
sq = NULL_QUEUE;
}
Modified: trunk/current/src/cog/modules/karajan/src/org/globus/cog/karajan/scheduler/submitQueue/InstanceSubmitQueue.java
===================================================================
--- trunk/current/src/cog/modules/karajan/src/org/globus/cog/karajan/scheduler/submitQueue/InstanceSubmitQueue.java 2007-09-10 15:46:32 UTC (rev 1737)
+++ trunk/current/src/cog/modules/karajan/src/org/globus/cog/karajan/scheduler/submitQueue/InstanceSubmitQueue.java 2007-09-13 21:18:23 UTC (rev 1738)
@@ -27,7 +27,7 @@
synchronized (queues) {
HostSubmitQueue hq = (HostSubmitQueue) queues.get(contact);
if (hq == null) {
- hq = new HostSubmitQueue(hostThrottle);
+ hq = new HostSubmitQueue(contact, hostThrottle);
queues.put(contact, hq);
}
return hq;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ha...@us...> - 2007-09-10 15:46:40
|
Revision: 1737
http://cogkit.svn.sourceforge.net/cogkit/?rev=1737&view=rev
Author: hategan
Date: 2007-09-10 08:46:32 -0700 (Mon, 10 Sep 2007)
Log Message:
-----------
removed bogus line
Modified Paths:
--------------
trunk/current/src/cog/modules/abstraction-common/src/org/globus/cog/abstraction/impl/file/TaskHandlerImpl.java
Modified: trunk/current/src/cog/modules/abstraction-common/src/org/globus/cog/abstraction/impl/file/TaskHandlerImpl.java
===================================================================
--- trunk/current/src/cog/modules/abstraction-common/src/org/globus/cog/abstraction/impl/file/TaskHandlerImpl.java 2007-09-10 15:44:43 UTC (rev 1736)
+++ trunk/current/src/cog/modules/abstraction-common/src/org/globus/cog/abstraction/impl/file/TaskHandlerImpl.java 2007-09-10 15:46:32 UTC (rev 1737)
@@ -368,7 +368,6 @@
fileResource.changeMode(spec.getArgument(0), Integer.valueOf(
spec.getArgument(1)).intValue());
}
- fileResource.setCurrentDirectory(cwd);
return output;
}
finally {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ha...@us...> - 2007-09-10 15:44:45
|
Revision: 1736
http://cogkit.svn.sourceforge.net/cogkit/?rev=1736&view=rev
Author: hategan
Date: 2007-09-10 08:44:43 -0700 (Mon, 10 Sep 2007)
Log Message:
-----------
removed new line
Modified Paths:
--------------
trunk/current/src/cog/modules/abstraction-common/src/org/globus/cog/abstraction/impl/file/PermissionsImpl.java
Modified: trunk/current/src/cog/modules/abstraction-common/src/org/globus/cog/abstraction/impl/file/PermissionsImpl.java
===================================================================
--- trunk/current/src/cog/modules/abstraction-common/src/org/globus/cog/abstraction/impl/file/PermissionsImpl.java 2007-09-07 01:05:39 UTC (rev 1735)
+++ trunk/current/src/cog/modules/abstraction-common/src/org/globus/cog/abstraction/impl/file/PermissionsImpl.java 2007-09-10 15:44:43 UTC (rev 1736)
@@ -65,6 +65,5 @@
else {
return "0";
}
-
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ha...@us...> - 2007-09-07 01:05:43
|
Revision: 1735
http://cogkit.svn.sourceforge.net/cogkit/?rev=1735&view=rev
Author: hategan
Date: 2007-09-06 18:05:39 -0700 (Thu, 06 Sep 2007)
Log Message:
-----------
hmm...
Modified Paths:
--------------
trunk/current/src/cog/modules/karajan/src/org/globus/cog/karajan/workflow/nodes/functions/Misc.java
Modified: trunk/current/src/cog/modules/karajan/src/org/globus/cog/karajan/workflow/nodes/functions/Misc.java
===================================================================
--- trunk/current/src/cog/modules/karajan/src/org/globus/cog/karajan/workflow/nodes/functions/Misc.java 2007-09-07 00:52:18 UTC (rev 1734)
+++ trunk/current/src/cog/modules/karajan/src/org/globus/cog/karajan/workflow/nodes/functions/Misc.java 2007-09-07 01:05:39 UTC (rev 1735)
@@ -124,7 +124,6 @@
text.append('\n');
line = br.readLine();
}
- ;
return text.toString();
}
catch (Exception e) {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ha...@us...> - 2007-09-07 00:52:28
|
Revision: 1734
http://cogkit.svn.sourceforge.net/cogkit/?rev=1734&view=rev
Author: hategan
Date: 2007-09-06 17:52:18 -0700 (Thu, 06 Sep 2007)
Log Message:
-----------
same for file:read
Modified Paths:
--------------
trunk/current/src/cog/modules/karajan/src/org/globus/cog/karajan/workflow/nodes/functions/Misc.java
Modified: trunk/current/src/cog/modules/karajan/src/org/globus/cog/karajan/workflow/nodes/functions/Misc.java
===================================================================
--- trunk/current/src/cog/modules/karajan/src/org/globus/cog/karajan/workflow/nodes/functions/Misc.java 2007-09-06 22:16:54 UTC (rev 1733)
+++ trunk/current/src/cog/modules/karajan/src/org/globus/cog/karajan/workflow/nodes/functions/Misc.java 2007-09-07 00:52:18 UTC (rev 1734)
@@ -112,15 +112,19 @@
public Object sys_readfile(VariableStack stack) throws ExecutionException {
try {
- BufferedReader br = new BufferedReader(new FileReader(new File(
- TypeUtil.toString(PA_FILE.getValue(stack)))));
+ File f = new File(TypeUtil.toString(PA_FILE.getValue(stack)));
+ if (!f.isAbsolute()) {
+ f = new File(stack.getExecutionContext().getCwd() + File.separator + f.getPath());
+ }
+ BufferedReader br = new BufferedReader(new FileReader(f));
StringBuffer text = new StringBuffer();
String line = br.readLine();
while (line != null) {
text.append(line);
text.append('\n');
line = br.readLine();
- };
+ }
+ ;
return text.toString();
}
catch (Exception e) {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ha...@us...> - 2007-09-06 22:16:56
|
Revision: 1733
http://cogkit.svn.sourceforge.net/cogkit/?rev=1733&view=rev
Author: hategan
Date: 2007-09-06 15:16:54 -0700 (Thu, 06 Sep 2007)
Log Message:
-----------
honor cwd attribute, if specified
Modified Paths:
--------------
trunk/current/src/cog/modules/abstraction-common/src/org/globus/cog/abstraction/impl/file/TaskHandlerImpl.java
Modified: trunk/current/src/cog/modules/abstraction-common/src/org/globus/cog/abstraction/impl/file/TaskHandlerImpl.java
===================================================================
--- trunk/current/src/cog/modules/abstraction-common/src/org/globus/cog/abstraction/impl/file/TaskHandlerImpl.java 2007-09-06 22:15:49 UTC (rev 1732)
+++ trunk/current/src/cog/modules/abstraction-common/src/org/globus/cog/abstraction/impl/file/TaskHandlerImpl.java 2007-09-06 22:16:54 UTC (rev 1733)
@@ -275,7 +275,13 @@
Object output = null;
//FileOperationSpecification commands are lowercase
String operation = spec.getOperation().toLowerCase();
+ String cwd = null;
+ String taskCwd = (String) spec.getAttribute("cwd");
try {
+ if (taskCwd != null) {
+ cwd = fileResource.getCurrentDirectory();
+ fileResource.setCurrentDirectory(taskCwd);
+ }
if (operation.equals(FileOperationSpecification.LS)
&& spec.getArgumentSize() == 0) {
output = fileResource.list();
@@ -362,10 +368,14 @@
fileResource.changeMode(spec.getArgument(0), Integer.valueOf(
spec.getArgument(1)).intValue());
}
+ fileResource.setCurrentDirectory(cwd);
return output;
}
finally {
// System.err.println(operation + " - " + Thread.currentThread());
+ if (cwd != null) {
+ fileResource.setCurrentDirectory(cwd);
+ }
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
