enriched PBS status structure

diff --git a/org.glite.lb.server/src/jobstat_supp.c b/org.glite.lb.server/src/jobstat_supp.c
index ba28baa..d0b5749 100644 (file)
--- a/org.glite.lb.server/src/jobstat_supp.c
+++ b/org.glite.lb.server/src/jobstat_supp.c
@@ -502,10 +502,12 @@ static char *enc_JobStat(char *old, edg_wll_JobStat* stat)
        if (ret) ret = enc_string(ret, stat->pbs_queue);
        if (ret) ret = enc_string(ret, stat->pbs_owner);
        if (ret) ret = enc_string(ret, stat->pbs_name);
+       if (ret) ret = enc_string(ret, stat->pbs_reason);
        if (ret) ret = enc_string(ret, stat->pbs_scheduler);
        if (ret) ret = enc_string(ret, stat->pbs_dest_host);
        if (ret) ret = enc_int(ret, stat->pbs_pid);
        if (ret) ret = enc_int(ret, stat->pbs_exit_status);
+       if (ret) ret = enc_string(ret, stat->pbs_error);
 
        return ret;
 }
@@ -562,10 +564,12 @@ static edg_wll_JobStat* dec_JobStat(char *in, char **rest)
         if (tmp_in != NULL) stat->pbs_queue = dec_string(tmp_in, &tmp_in);
         if (tmp_in != NULL) stat->pbs_owner = dec_string(tmp_in, &tmp_in);
         if (tmp_in != NULL) stat->pbs_name = dec_string(tmp_in, &tmp_in);
+        if (tmp_in != NULL) stat->pbs_reason = dec_string(tmp_in, &tmp_in);
         if (tmp_in != NULL) stat->pbs_scheduler = dec_string(tmp_in, &tmp_in);
         if (tmp_in != NULL) stat->pbs_dest_host = dec_string(tmp_in, &tmp_in);
         if (tmp_in != NULL) stat->pbs_pid = dec_int(tmp_in, &tmp_in);
         if (tmp_in != NULL) stat->pbs_exit_status = dec_int(tmp_in, &tmp_in);
+        if (tmp_in != NULL) stat->pbs_error = dec_string(tmp_in, &tmp_in);
 
        *rest = tmp_in;
 

diff --git a/org.glite.lb/project/status.T b/org.glite.lb/project/status.T
index 9095225..63dfc50 100644 (file)
--- a/org.glite.lb/project/status.T
+++ b/org.glite.lb/project/status.T
@@ -80,10 +80,13 @@ string      pbs_state       Job state which would probably return PBS qstat (Q/R/C/....)
 string  pbs_queue      Name of queue in which is job queued
 string  pbs_owner      Owner of job
 string  pbs_name       Name of job
+string  pbs_reason     Glued reasons/errors leading to pending events
+string  pbs_name       Name of job
 string  pbs_scheduler  Name of pbs scheduler
-string  pbs_dest_host  Hostname of node whre job is running
+string  pbs_dest_host  Hostname of node where job is running
 int    pbs_pid         PID of running job
 int    pbs_exit_status Job exit status
+string pbs_error       Glued error descriptions from error events
 
 string condor_status   Condor job status 
 string condor_universe Condor job Universe (in job ClassAds)