Revision 580b1fdd lib/jqueue.py
| b/lib/jqueue.py | ||
|---|---|---|
| 49 | 49 |
from ganeti import workerpool |
| 50 | 50 |
from ganeti import locking |
| 51 | 51 |
from ganeti import opcodes |
| 52 |
from ganeti import opcodes_base |
|
| 52 | 53 |
from ganeti import errors |
| 53 | 54 |
from ganeti import mcpu |
| 54 | 55 |
from ganeti import utils |
| ... | ... | |
| 231 | 232 |
count = 0 |
| 232 | 233 |
for queued_op in self.ops: |
| 233 | 234 |
op = queued_op.input |
| 234 |
reason_src = opcodes.NameToReasonSrc(op.__class__.__name__) |
|
| 235 |
reason_src = opcodes_base.NameToReasonSrc(op.__class__.__name__)
|
|
| 235 | 236 |
reason_text = "job=%d;index=%d" % (self.id, count) |
| 236 | 237 |
reason = getattr(op, "reason", []) |
| 237 | 238 |
reason.append((reason_src, reason_text, utils.EpochNano())) |
| ... | ... | |
| 910 | 911 |
self.summary = op.input.Summary() |
| 911 | 912 |
|
| 912 | 913 |
# Create local copy to modify |
| 913 |
if getattr(op.input, opcodes.DEPEND_ATTR, None): |
|
| 914 |
if getattr(op.input, opcodes_base.DEPEND_ATTR, None):
|
|
| 914 | 915 |
self.jobdeps = op.input.depends[:] |
| 915 | 916 |
else: |
| 916 | 917 |
self.jobdeps = None |
| ... | ... | |
| 2196 | 2197 |
" are %s" % (idx, op.priority, allowed)) |
| 2197 | 2198 |
|
| 2198 | 2199 |
# Check job dependencies |
| 2199 |
dependencies = getattr(op.input, opcodes.DEPEND_ATTR, None) |
|
| 2200 |
if not opcodes.TNoRelativeJobDependencies(dependencies): |
|
| 2200 |
dependencies = getattr(op.input, opcodes_base.DEPEND_ATTR, None)
|
|
| 2201 |
if not opcodes_base.TNoRelativeJobDependencies(dependencies):
|
|
| 2201 | 2202 |
raise errors.GenericError("Opcode %s has invalid dependencies, must"
|
| 2202 | 2203 |
" match %s: %s" % |
| 2203 |
(idx, opcodes.TNoRelativeJobDependencies, |
|
| 2204 |
(idx, opcodes_base.TNoRelativeJobDependencies,
|
|
| 2204 | 2205 |
dependencies)) |
| 2205 | 2206 |
|
| 2206 | 2207 |
# Write to disk |
| ... | ... | |
| 2298 | 2299 |
|
| 2299 | 2300 |
for (idx, (job_id, ops)) in enumerate(zip(job_ids, jobs)): |
| 2300 | 2301 |
for op in ops: |
| 2301 |
if getattr(op, opcodes.DEPEND_ATTR, None): |
|
| 2302 |
if getattr(op, opcodes_base.DEPEND_ATTR, None):
|
|
| 2302 | 2303 |
(status, data) = \ |
| 2303 | 2304 |
self._ResolveJobDependencies(compat.partial(resolve_fn, idx), |
| 2304 | 2305 |
op.depends) |
Also available in: Unified diff