From: Aleš Křenek Date: Tue, 8 Sep 2009 14:38:27 +0000 (+0000) Subject: another iteration for CREAM support X-Git-Tag: glite-security-gss_R_2_0_1_1~82 X-Git-Url: http://scientific.zcu.cz/git/?a=commitdiff_plain;h=2bbec28762bb7cc64c291f1076bdab1a63134cb4;p=jra1mw.git another iteration for CREAM support --- diff --git a/org.glite.lb.client-java/examples/ProducerTestIL.java b/org.glite.lb.client-java/examples/ProducerTestIL.java index fda43f4..5d8e23a 100644 --- a/org.glite.lb.client-java/examples/ProducerTestIL.java +++ b/org.glite.lb.client-java/examples/ProducerTestIL.java @@ -1,7 +1,7 @@ -package org.glite.lb; import java.util.Random; import org.glite.jobid.Jobid; +import org.glite.lb.*; /** * This class shows how to work with ContextIL. diff --git a/org.glite.lb.client-java/examples/ProducerTestLL.java b/org.glite.lb.client-java/examples/ProducerTestLL.java index f535525..81e1219 100644 --- a/org.glite.lb.client-java/examples/ProducerTestLL.java +++ b/org.glite.lb.client-java/examples/ProducerTestLL.java @@ -1,7 +1,7 @@ -package org.glite.lb; import java.util.Random; import org.glite.jobid.Jobid; +import org.glite.lb.*; /** * This class shows how to work with ContextIL. @@ -14,7 +14,7 @@ public class ProducerTestLL { if (args.length != 12) { System.out.println("How to use test class:\n" + - "you have to set 13 arguments in this order, if the choice is optional \"\" or text has to be set:\n" + + "you have to set 12 arguments in this order, if the choice is optional \"\" or text has to be set:\n" + "1. jobid in format \"https://somewhere:port/unique_part\" (required)\n" + "2. source, enum constant from class Sources, determines which part of sequence code will be increased (required)\n" + "3. flag (required)\n" + @@ -25,7 +25,8 @@ public class ProducerTestLL { "8. proxy server address (required)\n" + "9. proxy server port, default value is 9002 (optional)\n" + "10. path to user's certificate (required)\n" + - "11. path to directory where will be saved files with logs until inter-logger sends the content."); + "11. path to directory where will be saved files with logs until inter-logger sends the content.\n" + + "12. worker node name for example event."); } else { /* Create new instance of jobid, you can use other constructors too (see org.glite.jobid.api_java.Jobid.java) * Examples: diff --git a/org.glite.lb.client/src/EventAttrNames.pl b/org.glite.lb.client/src/EventAttrNames.pl index 46216bc..f424919 100644 --- a/org.glite.lb.client/src/EventAttrNames.pl +++ b/org.glite.lb.client/src/EventAttrNames.pl @@ -83,4 +83,5 @@ EXPIRES COMMAND CMDID + CALLEE /; diff --git a/org.glite.lb.client/src/StatusAttrNames.pl b/org.glite.lb.client/src/StatusAttrNames.pl index 3fe6acc..ab9ed31 100644 --- a/org.glite.lb.client/src/StatusAttrNames.pl +++ b/org.glite.lb.client/src/StatusAttrNames.pl @@ -73,4 +73,17 @@ SANDBOX_RETRIEVED JW_STATUS JDL_CLASSAD + CREAM_CANCEL_REASON + CREAM_CANCELING + CREAM_CPU_TIME + CREAM_DONE_CODE + CREAM_ENDPOINT + CREAM_EXIT_CODE + CREAM_JDL + CREAM_JW_STATUS + CREAM_LRMS_ID + CREAM_NODE + CREAM_OWNER + CREAM_REASON + CREAM_STATE /; diff --git a/org.glite.lb.common/interface/context.h b/org.glite.lb.common/interface/context.h index b94a521..29b103d 100644 --- a/org.glite.lb.common/interface/context.h +++ b/org.glite.lb.common/interface/context.h @@ -80,6 +80,8 @@ typedef enum _edg_wll_Source { EDG_WLL_SOURCE_LRMS, EDG_WLL_SOURCE_APPLICATION, EDG_WLL_SOURCE_LB_SERVER, + EDG_WLL_SOURCE_CREAM_CORE, + EDG_WLL_SOURCE_BLAH, EDG_WLL_SOURCE__LAST /* marker, for internal use only */ } edg_wll_Source; diff --git a/org.glite.lb.types/events.T b/org.glite.lb.types/events.T index 71317a5..9d620d3 100644 --- a/org.glite.lb.types/events.T +++ b/org.glite.lb.types/events.T @@ -354,17 +354,54 @@ @type CREAMStore int command Command to store - _code_ CMDSTART Start registered job - _code_ CMDCANCEL Cancel job - _code_ CMDPURGE Purge request - _code_ CMDSUSPEND Suspend running job - _code_ CMDRESUME Resume suspended job + _code_ CMDSTART Start registered job + _code_ CMDCANCEL Cancel job + _code_ CMDPURGE Purge request + _code_ CMDSUSPEND Suspend running job + _code_ CMDRESUME Resume suspended job string cmdid Id of the command in store + _optional_ int result store phase/result _code_ START _code_ OK _code_ FAILED -@type CREAMBlahCall Processing command and calling BLAH +@type CREAMCall Processing command and calling BLAH or LRMS + logsrc callee int command The command string cmdid Id of the command, as stored previously + _optional_ + int result + _code_ START + _code_ OK + _code_ FAIL + string reason + _optional_ + +@type CREAMRuning + string node + +@type CREAMReallyRunning + +@type CREAMDone + int status_code + _code_ OK + _code_ FAILED + _code_ CANCELLED + _code_ KILLED + string reason + _optional_ + int exit_code + _null_ -1 + +@type CREAMCancel + int status_code + _code_ REQ + _code_ REFUSE + _code_ DONE + _code_ ABORT + string reason + _optional_ + +@type CREAMAbort + string reason diff --git a/org.glite.lb.types/status.T b/org.glite.lb.types/status.T index f43db3b..14c48e7 100644 --- a/org.glite.lb.types/status.T +++ b/org.glite.lb.types/status.T @@ -12,6 +12,7 @@ int jobtype Type of job _code_ COLLECTION parent of collection of jobs _code_ PBS PBS job _code_ CONDOR Condor job + _code_ CREAM CREAM job jobid parent_job parent job of subjob string seed string used for generation of subjob IDs @@ -130,6 +131,32 @@ string condor_error_desc Glued error descriptions from error events _pad_ 25 +int cream_state + _null_ -1 + _code_ REGISTERED + _code_ PENDING + _code_ IDLE + _code_ RUNNING + _code_ REALLYRUNNING + _code_ HELD + _code_ DONEOK + _code_ DONEFAILED + _code_ ABORTED + +string cream_owner +string cream_endpoint +string cream_jdl +string cream_reason +string cream_lrms_id +string cream_node +int cream_done_code Uses done_code enum + _null_ -1 +int cream_exit_code +bool cream_canceling +string cream_cancel_reason +int cream_cpu_time +int cream_jw_status Users jw_status enum + @type Submitted Entered by the user to the User Interface or registered by Job Partitioner. @type Waiting Accepted by WMS, waiting for resource allocation. @type Ready Matching resources found.