diff --git a/lib/jqueue.py b/lib/jqueue.py index 23e1d3bb8c3b84bee2542bbfe072224b93a62b95..b704c63b4fbe1e8092e958f752d5d01b9f338d5f 100644 --- a/lib/jqueue.py +++ b/lib/jqueue.py @@ -145,9 +145,6 @@ class _QueuedJob(object): @ivar id: the job ID @type ops: list @ivar ops: the list of _QueuedOpCode that constitute the job - @type run_op_index: int - @ivar run_op_index: the currently executing opcode, or -1 if - we didn't yet start executing @type log_serial: int @ivar log_serial: holds the index for the next log entry @ivar received_timestamp: the timestamp for when the job was received @@ -157,7 +154,7 @@ class _QueuedJob(object): @ivar change: a Condition variable we use for waiting for job changes """ - __slots__ = ["queue", "id", "ops", "run_op_index", "log_serial", + __slots__ = ["queue", "id", "ops", "log_serial", "received_timestamp", "start_timestamp", "end_timestamp", "lock_status", "change", "__weakref__"] @@ -181,7 +178,6 @@ class _QueuedJob(object): self.queue = queue self.id = job_id 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 @@ -208,7 +204,6 @@ class _QueuedJob(object): obj = _QueuedJob.__new__(cls) 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) @@ -239,7 +234,6 @@ class _QueuedJob(object): return { "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, @@ -462,7 +456,6 @@ class _JobQueueWorker(workerpool.BaseWorker): if op.status == constants.OP_STATUS_CANCELED: raise CancelJob() assert op.status == constants.OP_STATUS_QUEUED - job.run_op_index = idx op.status = constants.OP_STATUS_WAITLOCK op.result = None op.start_timestamp = TimeStampNow() @@ -525,7 +518,6 @@ class _JobQueueWorker(workerpool.BaseWorker): try: try: job.lock_status = None - job.run_op_index = -1 job.end_timestamp = TimeStampNow() queue.UpdateJobUnlocked(job) finally: