Revision acd65a16 lib/masterd/instance.py
| b/lib/masterd/instance.py | ||
|---|---|---|
| 1239 | 1239 |
|
| 1240 | 1240 |
ieloop = ImportExportLoop(self._lu) |
| 1241 | 1241 |
try: |
| 1242 |
for idx, (dev, (host, port, _, _)) in enumerate(zip(instance.disks,
|
|
| 1243 |
disk_info)):
|
|
| 1242 |
for idx, (dev, (host, port)) in enumerate(zip(instance.disks, |
|
| 1243 |
disk_info)): |
|
| 1244 | 1244 |
self._feedback_fn("Sending disk %s to %s:%s" % (idx, host, port))
|
| 1245 | 1245 |
finished_fn = compat.partial(self._TransferFinished, idx) |
| 1246 | 1246 |
ieloop.Add(DiskExport(self._lu, instance.primary_node, |
| ... | ... | |
| 1514 | 1514 |
if not utils.VerifySha1Hmac(cds, msg, hmac_digest, salt=hmac_salt): |
| 1515 | 1515 |
raise errors.GenericError("HMAC is wrong")
|
| 1516 | 1516 |
|
| 1517 |
return (host, port) |
|
| 1517 |
return (utils.HostInfo.NormalizeName(host), |
|
| 1518 |
utils.ValidateServiceName(port)) |
|
| 1518 | 1519 |
|
| 1519 | 1520 |
|
| 1520 | 1521 |
def ComputeRemoteImportDiskInfo(cds, salt, disk_index, host, port): |
Also available in: Unified diff