Revision 0c3d9c7c lib/masterd/instance.py
b/lib/masterd/instance.py | ||
---|---|---|
1209 | 1209 |
self._feedback_fn("Removing snapshot of disk/%s on node %s" % |
1210 | 1210 |
(disk_index, src_node)) |
1211 | 1211 |
|
1212 |
result = self._lu.rpc.call_blockdev_remove(src_node, disk) |
|
1212 |
result = self._lu.rpc.call_blockdev_remove(src_node, |
|
1213 |
(disk, self._instance)) |
|
1213 | 1214 |
if result.fail_msg: |
1214 | 1215 |
self._lu.LogWarning("Could not remove snapshot for disk/%d from node" |
1215 | 1216 |
" %s: %s", disk_index, src_node, result.fail_msg) |
... | ... | |
1242 | 1243 |
|
1243 | 1244 |
# FIXME: pass debug option from opcode to backend |
1244 | 1245 |
dt = DiskTransfer("snapshot/%s" % idx, |
1245 |
constants.IEIO_SCRIPT, (dev, idx),
|
|
1246 |
constants.IEIO_SCRIPT, ((dev, instance), idx),
|
|
1246 | 1247 |
constants.IEIO_FILE, (path, ), |
1247 | 1248 |
finished_fn) |
1248 | 1249 |
transfers.append(dt) |
... | ... | |
1300 | 1301 |
finished_fn = compat.partial(self._TransferFinished, idx) |
1301 | 1302 |
ieloop.Add(DiskExport(self._lu, instance.primary_node, |
1302 | 1303 |
opts, host, port, instance, "disk%d" % idx, |
1303 |
constants.IEIO_SCRIPT, (dev, idx),
|
|
1304 |
constants.IEIO_SCRIPT, ((dev, instance), idx),
|
|
1304 | 1305 |
timeouts, cbs, private=(idx, finished_fn))) |
1305 | 1306 |
|
1306 | 1307 |
ieloop.Run() |
... | ... | |
1482 | 1483 |
|
1483 | 1484 |
ieloop.Add(DiskImport(lu, instance.primary_node, opts, instance, |
1484 | 1485 |
"disk%d" % idx, |
1485 |
constants.IEIO_SCRIPT, (dev, idx),
|
|
1486 |
constants.IEIO_SCRIPT, ((dev, instance), idx),
|
|
1486 | 1487 |
timeouts, cbs, private=(idx, ))) |
1487 | 1488 |
|
1488 | 1489 |
ieloop.Run() |
Also available in: Unified diff