diff --git a/lib/backend.py b/lib/backend.py index c307619b402a485f117e7a4c0dde57ab4b656897..99cb3984f9c63f1b32246ff8f474cddecfcedac7 100644 --- a/lib/backend.py +++ b/lib/backend.py @@ -2696,6 +2696,9 @@ def StartImportExportDaemon(mode, opts, host, port, instance, ieio, ieioargs): if opts.compress: cmd.append("--compress=%s" % opts.compress) + if opts.magic: + cmd.append("--magic=%s" % opts.magic) + if exp_size is not None: cmd.append("--expected-size=%s" % exp_size) diff --git a/lib/masterd/instance.py b/lib/masterd/instance.py index 6eb01e16dfa620b50824d12a0aaffb65197b01dd..46eaabf10d37d56f0f578de54f780c529121d9ae 100644 --- a/lib/masterd/instance.py +++ b/lib/masterd/instance.py @@ -208,6 +208,13 @@ class _DiskImportExportBase(object): self._daemon.progress_percent, self._daemon.progress_eta) + @property + def magic(self): + """Returns the magic value for this import/export. + + """ + return self._opts.magic + @property def active(self): """Determines whether this transport is still active. diff --git a/lib/objects.py b/lib/objects.py index f954081fb39cd4e15cb162fb79c718935aefc4d1..19c6d8f8d0a88b9f7b99d83cf76435731c3ac0c7 100644 --- a/lib/objects.py +++ b/lib/objects.py @@ -1032,12 +1032,14 @@ class ImportExportOptions(ConfigObject): @ivar key_name: X509 key name (None for cluster certificate) @ivar ca_pem: Remote peer CA in PEM format (None for cluster certificate) @ivar compress: Compression method (one of L{constants.IEC_ALL}) + @ivar magic: Used to ensure the connection goes to the right disk """ __slots__ = [ "key_name", "ca_pem", "compress", + "magic", ]