Changeset 30465 for trunk/tools/psstatus

Timestamp:

Feb 2, 2011, 3:27:26 PM (15 years ago)

Author:

bills

Message:

add dependent count

File:

• trunk/tools/psstatus (modified) (6 diffs)

trunk/tools/psstatus

@@ -57 +57 @@
     IFNULL(completedJobs,0) AS 'Completed Jobs',
     IFNULL(runningJobs, 0) AS 'Pending Jobs',
-    IFNULL(faultedJobs, 0) AS 'Faulted Jobs'
+    IFNULL(faultedJobs, 0) AS 'Faulted Jobs',
+    IFNULL(depcount, 0) AS 'Image updates'
     -- timestamp AS 'last state change (UTC)'
 FROM (
@@ -72 +73 @@
         OR pstampRequest.state = 'run.wait'
 ) as unfinishedReq
-JOIN (
+LEFT JOIN (
     SELECT req_id,
         count(job_id)          AS jobcount,
@@ -82 +83 @@
 ) as rowCounts
 ON unfinishedReq.req_id = rowCounts.req_id
+
+LEFT JOIN (
+    SELECT req_id,
+        count(distinct dep_id) AS depcount
+FROM pstampRequest
+    JOIN pstampJob USING(req_id)
+    JOIN pstampDependent USING(dep_id) 
+    WHERE (pstampRequest.state = 'run' or pstampRequest.state = 'new' 
+            OR pstampRequest.state = 'run.wait')
+        AND dep_id > 0
+        AND pstampDependent.state = 'full'
+    GROUP BY req_id
+) as depCounts
+ON unfinishedReq.req_id = depCounts.req_id
+
 LEFT JOIN (
     SELECT req_id,
@@ -93 +109 @@
 ) as runningJobs
 ON unfinishedReq.req_id = runningJobs.req_id
+
 LEFT JOIN (
     SELECT req_id,
@@ -178 +195 @@
 LEFT JOIN (
     SELECT req_id,
+        count(distinct dep_id) AS depcount
+FROM pstampRequest JOIN pstampJob USING(req_id)
+    WHERE pstampRequest.state = 'stop'
+        AND date_add(timestamp, interval 1 day) >=utc_timestamp()
+        AND dep_id > 0
+    GROUP BY req_id
+) as depCounts
+ON finishedReq.req_id = depCounts.req_id
+
+LEFT JOIN (
+    SELECT req_id,
         count(job_id) AS success
     FROM pstampRequest JOIN pstampJob USING(req_id)
@@ -216 +244 @@
 
 {
-#    print STDERR "$sql\n";
+    print STDERR "$sql\n" if $verbose;
     my @args = ( "--table", "--user=$dbuser",  "--host=$dbserver", "--password=$dbpassword", $dbname);