Revision da4a52a3 lib/cmdlib/base.py
| b/lib/cmdlib/base.py | ||
|---|---|---|
| 28 | 28 |
from ganeti import locking |
| 29 | 29 |
from ganeti import query |
| 30 | 30 |
from ganeti import utils |
| 31 |
from ganeti.cmdlib.common import ExpandInstanceName |
|
| 31 |
from ganeti.cmdlib.common import ExpandInstanceUuidAndName
|
|
| 32 | 32 |
|
| 33 | 33 |
|
| 34 | 34 |
class ResultWithJobs: |
| ... | ... | |
| 322 | 322 |
else: |
| 323 | 323 |
assert locking.LEVEL_INSTANCE not in self.needed_locks, \ |
| 324 | 324 |
"_ExpandAndLockInstance called with instance-level locks set" |
| 325 |
self.op.instance_name = ExpandInstanceName(self.cfg, |
|
| 326 |
self.op.instance_name) |
|
| 325 |
(self.op.instance_uuid, self.op.instance_name) = \ |
|
| 326 |
ExpandInstanceUuidAndName(self.cfg, self.op.instance_uuid, |
|
| 327 |
self.op.instance_name) |
|
| 327 | 328 |
self.needed_locks[locking.LEVEL_INSTANCE] = self.op.instance_name |
| 328 | 329 |
|
| 329 | 330 |
def _LockInstancesNodes(self, primary_only=False, |
| ... | ... | |
| 361 | 362 |
# of self.recalculate_locks[locking.LEVEL_NODE] |
| 362 | 363 |
wanted_node_uuids = [] |
| 363 | 364 |
locked_i = self.owned_locks(locking.LEVEL_INSTANCE) |
| 364 |
for _, instance in self.cfg.GetMultiInstanceInfo(locked_i): |
|
| 365 |
for _, instance in self.cfg.GetMultiInstanceInfoByName(locked_i):
|
|
| 365 | 366 |
wanted_node_uuids.append(instance.primary_node) |
| 366 | 367 |
if not primary_only: |
| 367 | 368 |
wanted_node_uuids.extend(instance.secondary_nodes) |
Also available in: Unified diff