Revision 88acff3f
| b/lib/cmdlib/instance.py | ||
|---|---|---|
| 1431 | 1431 |
disk_results = \ |
| 1432 | 1432 |
masterd.instance.RemoteImport(self, feedback_fn, iobj, self.pnode, |
| 1433 | 1433 |
self.source_x509_ca, |
| 1434 |
self._cds, timeouts) |
|
| 1434 |
self._cds, self.op.compress, timeouts)
|
|
| 1435 | 1435 |
if not compat.all(disk_results): |
| 1436 | 1436 |
# TODO: Should the instance still be started, even if some disks |
| 1437 | 1437 |
# failed to import (valid for local imports, too)? |
| b/lib/masterd/instance.py | ||
|---|---|---|
| 1436 | 1436 |
|
| 1437 | 1437 |
|
| 1438 | 1438 |
def RemoteImport(lu, feedback_fn, instance, pnode, source_x509_ca, |
| 1439 |
cds, timeouts): |
|
| 1439 |
cds, compress, timeouts):
|
|
| 1440 | 1440 |
"""Imports an instance from another cluster. |
| 1441 | 1441 |
|
| 1442 | 1442 |
@param lu: Logical unit instance |
| ... | ... | |
| 1449 | 1449 |
@param source_x509_ca: Import source's X509 CA |
| 1450 | 1450 |
@type cds: string |
| 1451 | 1451 |
@param cds: Cluster domain secret |
| 1452 |
@type compress: string |
|
| 1453 |
@param compress: one of L{constants.IEC_ALL}
|
|
| 1452 | 1454 |
@type timeouts: L{ImportExportTimeouts}
|
| 1453 | 1455 |
@param timeouts: Timeouts for this import |
| 1454 | 1456 |
|
| ... | ... | |
| 1487 | 1489 |
# Import daemon options |
| 1488 | 1490 |
opts = objects.ImportExportOptions(key_name=x509_key_name, |
| 1489 | 1491 |
ca_pem=source_ca_pem, |
| 1490 |
magic=magic, ipv6=ipv6) |
|
| 1492 |
magic=magic, |
|
| 1493 |
compress=compress, |
|
| 1494 |
ipv6=ipv6) |
|
| 1491 | 1495 |
|
| 1492 | 1496 |
ieloop.Add(DiskImport(lu, instance.primary_node, opts, instance, |
| 1493 | 1497 |
"disk%d" % idx, |
| b/src/Ganeti/OpParams.hs | ||
|---|---|---|
| 1251 | 1251 |
|
| 1252 | 1252 |
pBackupCompress :: Field |
| 1253 | 1253 |
pBackupCompress = |
| 1254 |
withDoc "Compression mode to use for moves during backups" . |
|
| 1254 |
withDoc "Compression mode to use for moves during backups/imports" .
|
|
| 1255 | 1255 |
defaultField [| None |] $ |
| 1256 | 1256 |
simpleField "compress" [t| ImportExportCompression |] |
| 1257 | 1257 |
|
Also available in: Unified diff