From: Michal Voců <michal@ruk.cuni.cz>
Date: Fri, 4 Nov 2011 11:40:45 +0000 (+0000)
Subject: added PBS status info and corresponding items to events
X-Git-Tag: merge_torque_to_head_src~12
X-Git-Url: http://scientific.zcu.cz/git/?a=commitdiff_plain;h=ef4d92b82459158a4710ac11351e34f8420c8506;p=jra1mw.git

added PBS status info and corresponding items to events
---

diff --git a/org.glite.lb.types/events.T b/org.glite.lb.types/events.T
index b725b97..4fc010d 100644
--- a/org.glite.lb.types/events.T
+++ b/org.glite.lb.types/events.T
@@ -292,6 +292,8 @@
 
 @type PBSQueued		Job enqued
 	string	queue		Queue name
+	string	name		Job name
+	string  owner		Job owner
 
 @type PBSDequeued	Job dequeued
 
@@ -324,10 +326,10 @@
 	int	usage		Type of record
 	_code_	REQUESTED	Requested value
 	_code_	USED		Consumed quantity
-	string	name		Name of resource
-	double	quantity	The quantity
-	_optional_		Bypass need of 'null value'
-	string	unit		Units (sec, kB, etc.)
+	string	resource	Resource's name.
+	double	quantity	Resources's quantity (how much).
+	_optional_
+	string	unit		Units (sec, kB, etc.).
 
 @type PBSError		Any error occured
 	string	error_desc	Error reason
diff --git a/org.glite.lb.types/status.T b/org.glite.lb.types/status.T
index d64f2ad..21aec7b 100644
--- a/org.glite.lb.types/status.T
+++ b/org.glite.lb.types/status.T
@@ -109,6 +109,7 @@ string	access_rights			List of access rights (human readable variant of acl)
 _pad_	55
 
 string	pbs_state	Job state which would probably return PBS qstat (Q/R/C/....)
+int	pbs_substate	Job substate
 string  pbs_queue	Name of queue in which is job queued
 string  pbs_owner	Owner of job
 string  pbs_name	Name of job
@@ -116,7 +117,10 @@ string  pbs_reason	Glued reasons/errors leading to pending events
 string  pbs_scheduler	Name of pbs scheduler
 string  pbs_dest_host	Hostname of node where job is running
 int	pbs_pid		PID of running job
-string	pbs_resource_usage	Glued resource usage
+taglist pbs_resource_requested	Resources requested
+	_special_	XMLstructured
+taglist	pbs_resource_usage	Resource usage
+	_special_	XMLstructured
 int	pbs_exit_status	Job exit status
 string	pbs_error_desc	Glued error descriptions from error events
 
@@ -190,4 +194,3 @@ _pad_	20
 @type Cancelled		Cancelled by user.
 @type Unknown		Status cannot be determined.
 @type Purged		Job has been purged from bookkeeping server (for LB-RGMA interface).
-