Enhance the job-related timestamps

This patch adds start, stop, and received timestamp for jobs (and allows
querying of them), and allows querying of the opcode timestamps.

Reviewed-by: imsnah

diff --git a/lib/jqueue.py b/lib/jqueue.py
index ee9ee3c..1fdd1ec 100644 (file)
--- a/lib/jqueue.py
+++ b/lib/jqueue.py
@@ -107,6 +107,9 @@ class _QueuedJob(object):
     self.ops = [_QueuedOpCode(op) for op in ops]
     self.run_op_index = -1
     self.log_serial = 0
+    self.received_timestamp = TimeStampNow()
+    self.start_timestamp = None
+    self.end_timestamp = None
 
     # Condition to wait for changes
     self.change = threading.Condition(self.queue._lock)
@@ -117,6 +120,9 @@ class _QueuedJob(object):
     obj.queue = queue
     obj.id = state["id"]
     obj.run_op_index = state["run_op_index"]
+    obj.received_timestamp = state.get("received_timestamp", None)
+    obj.start_timestamp = state.get("start_timestamp", None)
+    obj.end_timestamp = state.get("end_timestamp", None)
 
     obj.ops = []
     obj.log_serial = 0
@@ -136,6 +142,9 @@ class _QueuedJob(object):
       "id": self.id,
       "ops": [op.Serialize() for op in self.ops],
       "run_op_index": self.run_op_index,
+      "start_timestamp": self.start_timestamp,
+      "end_timestamp": self.end_timestamp,
+      "received_timestamp": self.received_timestamp,
       }
 
   def CalcStatus(self):
@@ -203,6 +212,8 @@ class _JobQueueWorker(workerpool.BaseWorker):
               op.status = constants.OP_STATUS_RUNNING
               op.result = None
               op.start_timestamp = TimeStampNow()
+              if idx == 0: # first opcode
+                job.start_timestamp = op.start_timestamp
               queue.UpdateJobUnlocked(job)
 
               input_opcode = op.input
@@ -271,6 +282,7 @@ class _JobQueueWorker(workerpool.BaseWorker):
       try:
         try:
           job.run_op_idx = -1
+          job.end_timestamp = TimeStampNow()
           queue.UpdateJobUnlocked(job)
         finally:
           job_id = job.id
@@ -698,6 +710,16 @@ class JobQueue(object):
         row.append([op.status for op in job.ops])
       elif fname == "oplog":
         row.append([op.log for op in job.ops])
+      elif fname == "opstart":
+        row.append([op.start_timestamp for op in job.ops])
+      elif fname == "opend":
+        row.append([op.end_timestamp for op in job.ops])
+      elif fname == "received_ts":
+        row.append(job.received_timestamp)
+      elif fname == "start_ts":
+        row.append(job.start_timestamp)
+      elif fname == "end_ts":
+        row.append(job.end_timestamp)
       elif fname == "summary":
         row.append([op.input.Summary() for op in job.ops])
       else: