[lxc-devel] [lxd/master] lxd/migration: Negotiate ZFS compression
stgraber on Github
lxc-bot at linuxcontainers.org
Mon Nov 26 07:05:56 UTC 2018
A non-text attachment was scrubbed...
Name: not available
Type: text/x-mailbox
Size: 354 bytes
Desc: not available
URL: <http://lists.linuxcontainers.org/pipermail/lxc-devel/attachments/20181126/04d0961d/attachment.bin>
-------------- next part --------------
From e6198024b85ed488efcae9ad595ac9452439111d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Graber?= <stgraber at ubuntu.com>
Date: Mon, 26 Nov 2018 02:05:03 -0500
Subject: [PATCH] lxd/migration: Negotiate ZFS compression
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Signed-off-by: Stéphane Graber <stgraber at ubuntu.com>
---
lxd/migrate.go | 1 +
lxd/migrate_container.go | 44 ++++++---
lxd/migrate_storage_volumes.go | 44 ++++++---
lxd/migration/migrate.pb.go | 171 +++++++++++++++++++--------------
lxd/migration/migrate.proto | 5 +
lxd/storage_zfs.go | 8 +-
6 files changed, 178 insertions(+), 95 deletions(-)
diff --git a/lxd/migrate.go b/lxd/migrate.go
index 070c0fd044..d2589f3a5d 100644
--- a/lxd/migrate.go
+++ b/lxd/migrate.go
@@ -276,6 +276,7 @@ type MigrationSinkArgs struct {
type MigrationSourceArgs struct {
// transport specific fields
RsyncArgs []string
+ ZfsArgs []string
}
func (c *migrationSink) connectWithSecret(secret string) (*websocket.Conn, error) {
diff --git a/lxd/migrate_container.go b/lxd/migrate_container.go
index ec4f279c3e..e911784d38 100644
--- a/lxd/migrate_container.go
+++ b/lxd/migrate_container.go
@@ -378,7 +378,7 @@ func (s *migrationSourceWs) Do(migrateOp *operation) error {
// The protocol says we have to send a header no matter what, so let's
// do that, but then immediately send an error.
myType := s.container.Storage().MigrationType()
- rsyncHasFeature := true
+ hasFeature := true
header := migration.MigrationHeader{
Fs: &myType,
Criu: criuType,
@@ -387,13 +387,19 @@ func (s *migrationSourceWs) Do(migrateOp *operation) error {
Snapshots: snapshots,
Predump: proto.Bool(use_pre_dumps),
RsyncFeatures: &migration.RsyncFeatures{
- Xattrs: &rsyncHasFeature,
- Delete: &rsyncHasFeature,
- Compress: &rsyncHasFeature,
- Bidirectional: &rsyncHasFeature,
+ Xattrs: &hasFeature,
+ Delete: &hasFeature,
+ Compress: &hasFeature,
+ Bidirectional: &hasFeature,
},
}
+ if len(zfsVersion) >= 3 && zfsVersion[0:3] != "0.6" {
+ header.ZfsFeatures = &migration.ZfsFeatures{
+ Compress: &hasFeature,
+ }
+ }
+
err = s.send(&header)
if err != nil {
s.sendControl(err)
@@ -428,7 +434,17 @@ func (s *migrationSourceWs) Do(migrateOp *operation) error {
rsyncArgs = append(rsyncArgs, "--compress-level=2")
}
}
- sourceArgs := MigrationSourceArgs{rsyncArgs}
+
+ // Handle zfs options
+ zfsArgs := []string{}
+ zfsFeatures := header.GetZfsFeatures()
+ if zfsFeatures.GetCompress() && len(zfsVersion) >= 3 && zfsVersion[0:3] != "0.6" {
+ zfsArgs = append(zfsArgs, "-c")
+ zfsArgs = append(zfsArgs, "-L")
+ }
+
+ // Set source args
+ sourceArgs := MigrationSourceArgs{rsyncArgs, zfsArgs}
// Initialize storage driver
driver, fsErr := s.container.Storage().MigrationSource(s.container, s.containerOnly, sourceArgs)
@@ -845,7 +861,7 @@ func (c *migrationSink) Do(migrateOp *operation) error {
}
myType := c.src.container.Storage().MigrationType()
- rsyncHasFeature := true
+ hasFeature := true
resp := migration.MigrationHeader{
Fs: &myType,
Criu: criuType,
@@ -853,13 +869,19 @@ func (c *migrationSink) Do(migrateOp *operation) error {
SnapshotNames: header.SnapshotNames,
Refresh: &c.refresh,
RsyncFeatures: &migration.RsyncFeatures{
- Xattrs: &rsyncHasFeature,
- Delete: &rsyncHasFeature,
- Compress: &rsyncHasFeature,
- Bidirectional: &rsyncHasFeature,
+ Xattrs: &hasFeature,
+ Delete: &hasFeature,
+ Compress: &hasFeature,
+ Bidirectional: &hasFeature,
},
}
+ if len(zfsVersion) >= 3 && zfsVersion[0:3] != "0.6" {
+ resp.ZfsFeatures = &migration.ZfsFeatures{
+ Compress: &hasFeature,
+ }
+ }
+
if c.refresh {
// Get our existing snapshots
targetSnapshots, err := c.src.container.Snapshots()
diff --git a/lxd/migrate_storage_volumes.go b/lxd/migrate_storage_volumes.go
index 9b30157aea..66c8978873 100644
--- a/lxd/migrate_storage_volumes.go
+++ b/lxd/migrate_storage_volumes.go
@@ -47,17 +47,23 @@ func (s *migrationSourceWs) DoStorage(migrateOp *operation) error {
// The protocol says we have to send a header no matter what, so let's
// do that, but then immediately send an error.
myType := s.storage.MigrationType()
- rsyncHasFeature := true
+ hasFeature := true
header := migration.MigrationHeader{
Fs: &myType,
RsyncFeatures: &migration.RsyncFeatures{
- Xattrs: &rsyncHasFeature,
- Delete: &rsyncHasFeature,
- Compress: &rsyncHasFeature,
- Bidirectional: &rsyncHasFeature,
+ Xattrs: &hasFeature,
+ Delete: &hasFeature,
+ Compress: &hasFeature,
+ Bidirectional: &hasFeature,
},
}
+ if len(zfsVersion) >= 3 && zfsVersion[0:3] != "0.6" {
+ header.ZfsFeatures = &migration.ZfsFeatures{
+ Compress: &hasFeature,
+ }
+ }
+
err = s.send(&header)
if err != nil {
logger.Errorf("Failed to send storage volume migration header")
@@ -94,7 +100,17 @@ func (s *migrationSourceWs) DoStorage(migrateOp *operation) error {
rsyncArgs = append(rsyncArgs, "--compress-level=2")
}
}
- sourceArgs := MigrationSourceArgs{rsyncArgs}
+
+ // Handle zfs options
+ zfsArgs := []string{}
+ zfsFeatures := header.GetZfsFeatures()
+ if zfsFeatures.GetCompress() && len(zfsVersion) >= 3 && zfsVersion[0:3] != "0.6" {
+ zfsArgs = append(zfsArgs, "-c")
+ zfsArgs = append(zfsArgs, "-L")
+ }
+
+ // Set source args
+ sourceArgs := MigrationSourceArgs{rsyncArgs, zfsArgs}
driver, fsErr := s.storage.StorageMigrationSource(sourceArgs)
if fsErr != nil {
@@ -244,17 +260,23 @@ func (c *migrationSink) DoStorage(migrateOp *operation) error {
mySink := c.src.storage.StorageMigrationSink
myType := c.src.storage.MigrationType()
- rsyncHasFeature := true
+ hasFeature := true
resp := migration.MigrationHeader{
Fs: &myType,
RsyncFeatures: &migration.RsyncFeatures{
- Xattrs: &rsyncHasFeature,
- Delete: &rsyncHasFeature,
- Compress: &rsyncHasFeature,
- Bidirectional: &rsyncHasFeature,
+ Xattrs: &hasFeature,
+ Delete: &hasFeature,
+ Compress: &hasFeature,
+ Bidirectional: &hasFeature,
},
}
+ if len(zfsVersion) >= 3 && zfsVersion[0:3] != "0.6" {
+ resp.ZfsFeatures = &migration.ZfsFeatures{
+ Compress: &hasFeature,
+ }
+ }
+
// If the storage type the source has doesn't match what we have, then
// we have to use rsync.
if *header.Fs != *resp.Fs {
diff --git a/lxd/migration/migrate.pb.go b/lxd/migration/migrate.pb.go
index 9ba7f19cfc..c7e83a97d6 100644
--- a/lxd/migration/migrate.pb.go
+++ b/lxd/migration/migrate.pb.go
@@ -13,6 +13,7 @@ It has these top-level messages:
Device
Snapshot
RsyncFeatures
+ ZfsFeatures
MigrationHeader
MigrationControl
MigrationSync
@@ -335,6 +336,23 @@ func (m *RsyncFeatures) GetBidirectional() bool {
return false
}
+type ZfsFeatures struct {
+ Compress *bool `protobuf:"varint,1,opt,name=compress" json:"compress,omitempty"`
+ XXX_unrecognized []byte `json:"-"`
+}
+
+func (m *ZfsFeatures) Reset() { *m = ZfsFeatures{} }
+func (m *ZfsFeatures) String() string { return proto.CompactTextString(m) }
+func (*ZfsFeatures) ProtoMessage() {}
+func (*ZfsFeatures) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{5} }
+
+func (m *ZfsFeatures) GetCompress() bool {
+ if m != nil && m.Compress != nil {
+ return *m.Compress
+ }
+ return false
+}
+
type MigrationHeader struct {
Fs *MigrationFSType `protobuf:"varint,1,req,name=fs,enum=migration.MigrationFSType" json:"fs,omitempty"`
Criu *CRIUType `protobuf:"varint,2,opt,name=criu,enum=migration.CRIUType" json:"criu,omitempty"`
@@ -344,13 +362,14 @@ type MigrationHeader struct {
Predump *bool `protobuf:"varint,7,opt,name=predump" json:"predump,omitempty"`
RsyncFeatures *RsyncFeatures `protobuf:"bytes,8,opt,name=rsyncFeatures" json:"rsyncFeatures,omitempty"`
Refresh *bool `protobuf:"varint,9,opt,name=refresh" json:"refresh,omitempty"`
+ ZfsFeatures *ZfsFeatures `protobuf:"bytes,10,opt,name=zfsFeatures" json:"zfsFeatures,omitempty"`
XXX_unrecognized []byte `json:"-"`
}
func (m *MigrationHeader) Reset() { *m = MigrationHeader{} }
func (m *MigrationHeader) String() string { return proto.CompactTextString(m) }
func (*MigrationHeader) ProtoMessage() {}
-func (*MigrationHeader) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{5} }
+func (*MigrationHeader) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{6} }
func (m *MigrationHeader) GetFs() MigrationFSType {
if m != nil && m.Fs != nil {
@@ -408,6 +427,13 @@ func (m *MigrationHeader) GetRefresh() bool {
return false
}
+func (m *MigrationHeader) GetZfsFeatures() *ZfsFeatures {
+ if m != nil {
+ return m.ZfsFeatures
+ }
+ return nil
+}
+
type MigrationControl struct {
Success *bool `protobuf:"varint,1,req,name=success" json:"success,omitempty"`
// optional failure message if sending a failure
@@ -418,7 +444,7 @@ type MigrationControl struct {
func (m *MigrationControl) Reset() { *m = MigrationControl{} }
func (m *MigrationControl) String() string { return proto.CompactTextString(m) }
func (*MigrationControl) ProtoMessage() {}
-func (*MigrationControl) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{6} }
+func (*MigrationControl) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{7} }
func (m *MigrationControl) GetSuccess() bool {
if m != nil && m.Success != nil {
@@ -442,7 +468,7 @@ type MigrationSync struct {
func (m *MigrationSync) Reset() { *m = MigrationSync{} }
func (m *MigrationSync) String() string { return proto.CompactTextString(m) }
func (*MigrationSync) ProtoMessage() {}
-func (*MigrationSync) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{7} }
+func (*MigrationSync) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{8} }
func (m *MigrationSync) GetFinalPreDump() bool {
if m != nil && m.FinalPreDump != nil {
@@ -470,7 +496,7 @@ type DumpStatsEntry struct {
func (m *DumpStatsEntry) Reset() { *m = DumpStatsEntry{} }
func (m *DumpStatsEntry) String() string { return proto.CompactTextString(m) }
func (*DumpStatsEntry) ProtoMessage() {}
-func (*DumpStatsEntry) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{8} }
+func (*DumpStatsEntry) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{9} }
func (m *DumpStatsEntry) GetFreezingTime() uint32 {
if m != nil && m.FreezingTime != nil {
@@ -561,7 +587,7 @@ type RestoreStatsEntry struct {
func (m *RestoreStatsEntry) Reset() { *m = RestoreStatsEntry{} }
func (m *RestoreStatsEntry) String() string { return proto.CompactTextString(m) }
func (*RestoreStatsEntry) ProtoMessage() {}
-func (*RestoreStatsEntry) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{9} }
+func (*RestoreStatsEntry) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{10} }
func (m *RestoreStatsEntry) GetPagesCompared() uint64 {
if m != nil && m.PagesCompared != nil {
@@ -607,7 +633,7 @@ type StatsEntry struct {
func (m *StatsEntry) Reset() { *m = StatsEntry{} }
func (m *StatsEntry) String() string { return proto.CompactTextString(m) }
func (*StatsEntry) ProtoMessage() {}
-func (*StatsEntry) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{10} }
+func (*StatsEntry) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{11} }
func (m *StatsEntry) GetDump() *DumpStatsEntry {
if m != nil {
@@ -629,6 +655,7 @@ func init() {
proto.RegisterType((*Device)(nil), "migration.Device")
proto.RegisterType((*Snapshot)(nil), "migration.Snapshot")
proto.RegisterType((*RsyncFeatures)(nil), "migration.rsyncFeatures")
+ proto.RegisterType((*ZfsFeatures)(nil), "migration.zfsFeatures")
proto.RegisterType((*MigrationHeader)(nil), "migration.MigrationHeader")
proto.RegisterType((*MigrationControl)(nil), "migration.MigrationControl")
proto.RegisterType((*MigrationSync)(nil), "migration.MigrationSync")
@@ -642,69 +669,71 @@ func init() {
func init() { proto.RegisterFile("lxd/migration/migrate.proto", fileDescriptor0) }
var fileDescriptor0 = []byte{
- // 1022 bytes of a gzipped FileDescriptorProto
- 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x84, 0x55, 0x4d, 0x6f, 0xdb, 0x46,
- 0x13, 0x7e, 0x25, 0x51, 0xb6, 0x38, 0x92, 0x1c, 0x65, 0x13, 0xbc, 0x20, 0x92, 0x7e, 0xa8, 0x4c,
- 0x8a, 0xaa, 0x3e, 0xc4, 0xa9, 0x82, 0x02, 0xed, 0xa5, 0x40, 0x2d, 0xd7, 0x4d, 0x80, 0xc4, 0x35,
- 0x56, 0x36, 0x8a, 0xf6, 0x42, 0x6c, 0xc8, 0xa1, 0xbc, 0x30, 0xbf, 0xb0, 0x4b, 0xd9, 0x96, 0x2f,
- 0x45, 0x7f, 0x4c, 0x7f, 0x4f, 0x4f, 0x3d, 0xf7, 0xaf, 0x14, 0x3b, 0x4b, 0xd2, 0x94, 0x53, 0xa0,
- 0xb7, 0x9d, 0x67, 0x1e, 0xce, 0xcc, 0xce, 0x33, 0xb3, 0x84, 0xa7, 0xc9, 0x4d, 0x74, 0x90, 0xca,
- 0x95, 0x12, 0xa5, 0xcc, 0xb3, 0xea, 0x84, 0x2f, 0x0a, 0x95, 0x97, 0x39, 0x73, 0x1b, 0x87, 0xff,
- 0x1b, 0xb8, 0x6f, 0x8e, 0xde, 0x89, 0xe2, 0x6c, 0x53, 0x20, 0x7b, 0x0c, 0x7d, 0xa9, 0xd7, 0x32,
- 0xf2, 0x3a, 0xd3, 0xee, 0x6c, 0xc0, 0xad, 0x61, 0xd1, 0x95, 0x8c, 0xbc, 0x6e, 0x8d, 0xae, 0x64,
- 0xc4, 0xfe, 0x0f, 0x3b, 0x17, 0xb9, 0x2e, 0x65, 0xe4, 0xf5, 0xa6, 0xdd, 0x59, 0x9f, 0x57, 0x16,
- 0x63, 0xe0, 0x64, 0x5a, 0x46, 0x9e, 0x43, 0x28, 0x9d, 0xd9, 0x13, 0x18, 0xa4, 0xa2, 0x50, 0x22,
- 0x5b, 0xa1, 0xd7, 0x27, 0xbc, 0xb1, 0xfd, 0x97, 0xb0, 0xb3, 0xc8, 0xb3, 0x58, 0xae, 0xd8, 0x04,
- 0x7a, 0x97, 0xb8, 0xa1, 0xdc, 0x2e, 0x37, 0x47, 0x93, 0xf9, 0x4a, 0x24, 0x6b, 0xa4, 0xcc, 0x2e,
- 0xb7, 0x86, 0xff, 0x23, 0xec, 0x1c, 0xe1, 0x95, 0x0c, 0x91, 0x72, 0x89, 0x14, 0xab, 0x4f, 0xe8,
- 0xcc, 0xbe, 0x84, 0x9d, 0x90, 0xe2, 0x79, 0xdd, 0x69, 0x6f, 0x36, 0x9c, 0x3f, 0x7c, 0xd1, 0x5c,
- 0xf6, 0x85, 0x4d, 0xc4, 0x2b, 0x82, 0xff, 0x67, 0x17, 0x06, 0xcb, 0x4c, 0x14, 0xfa, 0x22, 0x2f,
- 0xff, 0x35, 0xd6, 0x2b, 0x18, 0x26, 0x79, 0x28, 0x92, 0xc5, 0x7f, 0x04, 0x6c, 0xb3, 0xcc, 0x65,
- 0x0b, 0x95, 0xc7, 0x32, 0x41, 0xed, 0xf5, 0xa6, 0xbd, 0x99, 0xcb, 0x1b, 0x9b, 0x7d, 0x04, 0x2e,
- 0x16, 0x17, 0x98, 0xa2, 0x12, 0x09, 0x75, 0x68, 0xc0, 0xef, 0x00, 0xf6, 0x35, 0x8c, 0x28, 0x90,
- 0xbd, 0x9d, 0xf6, 0xfa, 0x1f, 0xe4, 0xb3, 0x1e, 0xbe, 0x45, 0x63, 0x3e, 0x8c, 0x84, 0x0a, 0x2f,
- 0x64, 0x89, 0x61, 0xb9, 0x56, 0xe8, 0xed, 0x50, 0x87, 0xb7, 0x30, 0x53, 0x94, 0x2e, 0x45, 0x89,
- 0xf1, 0x3a, 0xf1, 0x76, 0x29, 0x6f, 0x63, 0xb3, 0x67, 0x30, 0x0e, 0x15, 0x52, 0x82, 0x20, 0x12,
- 0x25, 0x7a, 0x83, 0x69, 0x67, 0xd6, 0xe3, 0xa3, 0x1a, 0x3c, 0x12, 0x25, 0xb2, 0xe7, 0xb0, 0x97,
- 0x08, 0x5d, 0x06, 0x6b, 0x8d, 0x91, 0x65, 0xb9, 0x96, 0x65, 0xd0, 0x73, 0x8d, 0x91, 0x61, 0xf9,
- 0xbf, 0x77, 0x60, 0xac, 0xf4, 0x26, 0x0b, 0x8f, 0x51, 0x98, 0xbc, 0xda, 0x8c, 0xc9, 0x8d, 0x28,
- 0x4b, 0xa5, 0xbd, 0xce, 0xb4, 0x33, 0x1b, 0xf0, 0xca, 0x32, 0x78, 0x84, 0x09, 0x96, 0x46, 0x5b,
- 0xc2, 0xad, 0x65, 0x0a, 0x0d, 0xf3, 0xb4, 0x50, 0xa8, 0x4d, 0xf7, 0x8c, 0xa7, 0xb1, 0xd9, 0x73,
- 0x18, 0xbf, 0x97, 0x91, 0x54, 0x18, 0x9a, 0xb2, 0xa8, 0x83, 0x86, 0xb0, 0x0d, 0xfa, 0x7f, 0x77,
- 0xe1, 0xc1, 0xbb, 0xba, 0x63, 0xaf, 0x51, 0x44, 0xa8, 0xd8, 0x3e, 0x74, 0x63, 0x4d, 0xd2, 0xee,
- 0xcd, 0x9f, 0xb4, 0xfa, 0xd9, 0xf0, 0x8e, 0x97, 0x66, 0x01, 0x78, 0x37, 0xd6, 0xec, 0x0b, 0x70,
- 0x42, 0x25, 0xd7, 0x54, 0xd7, 0xde, 0xfc, 0x51, 0x5b, 0x6d, 0xfe, 0xe6, 0x9c, 0x68, 0x44, 0x60,
- 0xfb, 0xd0, 0x97, 0x51, 0x2a, 0x0a, 0x52, 0x79, 0x38, 0x7f, 0xdc, 0x62, 0x36, 0x2b, 0xc5, 0x2d,
- 0xc5, 0x94, 0xae, 0xab, 0x49, 0x3b, 0x11, 0x29, 0x6a, 0xcf, 0xa1, 0xc9, 0xd8, 0x06, 0xd9, 0x57,
- 0xe0, 0xd6, 0x40, 0xad, 0x7e, 0x3b, 0x7f, 0x3d, 0xab, 0xfc, 0x8e, 0xc5, 0x3c, 0xd8, 0x2d, 0x14,
- 0x46, 0xeb, 0xb4, 0xf0, 0x76, 0xa9, 0x1b, 0xb5, 0xc9, 0xbe, 0xbb, 0x27, 0x05, 0xc9, 0x3a, 0x9c,
- 0x7b, 0xad, 0x80, 0x5b, 0x7e, 0x7e, 0x4f, 0x39, 0x0f, 0x76, 0x15, 0xc6, 0x0a, 0xf5, 0x05, 0x49,
- 0x3d, 0xe0, 0xb5, 0xe9, 0x1f, 0xc3, 0xa4, 0x69, 0xdc, 0x22, 0xcf, 0x4a, 0x95, 0x27, 0x86, 0xad,
- 0xd7, 0x61, 0x68, 0x64, 0xb3, 0x8f, 0x47, 0x6d, 0x1a, 0x4f, 0x8a, 0x5a, 0x8b, 0x95, 0x95, 0xda,
- 0xe5, 0xb5, 0xe9, 0xbf, 0x82, 0x71, 0x13, 0x67, 0xb9, 0xc9, 0x42, 0x33, 0xc9, 0xb1, 0xcc, 0x44,
- 0x72, 0xaa, 0xf0, 0xc8, 0xdc, 0xc8, 0x46, 0xda, 0xc2, 0xfc, 0x3f, 0x7a, 0x30, 0x31, 0xf7, 0x0b,
- 0xcc, 0xfc, 0xea, 0x00, 0xb3, 0x52, 0x6d, 0xcc, 0x08, 0xc7, 0x0a, 0xf1, 0x56, 0x66, 0xab, 0xa0,
- 0x94, 0xd5, 0x16, 0x8f, 0xf9, 0xa8, 0x06, 0xcf, 0x64, 0x8a, 0xec, 0x53, 0x18, 0xc6, 0x2a, 0xbf,
- 0xc5, 0xcc, 0x52, 0xba, 0x44, 0x01, 0x0b, 0x11, 0xe1, 0x33, 0x18, 0xa5, 0x98, 0x52, 0x70, 0x62,
- 0xf4, 0x88, 0x31, 0xac, 0x30, 0xa2, 0x3c, 0x83, 0x71, 0x8a, 0xe9, 0xb5, 0x92, 0x25, 0x5a, 0x8e,
- 0x63, 0x13, 0xd5, 0x60, 0x4d, 0x2a, 0xc4, 0x0a, 0x75, 0xa0, 0x43, 0x91, 0x65, 0x18, 0xd1, 0x9b,
- 0xe7, 0xf0, 0x11, 0x81, 0x4b, 0x8b, 0xb1, 0x97, 0xf0, 0xb8, 0x22, 0x5d, 0xca, 0xa2, 0xc0, 0x28,
- 0x28, 0x84, 0xc2, 0xac, 0xa4, 0xed, 0x75, 0x38, 0xb3, 0x5c, 0xeb, 0x3a, 0x25, 0xcf, 0x5d, 0x58,
- 0x93, 0xa9, 0xc4, 0x8c, 0x16, 0xb9, 0x0e, 0xfb, 0xb3, 0xc5, 0x0c, 0x49, 0xaa, 0x54, 0x14, 0x81,
- 0x42, 0x9d, 0x27, 0x57, 0x76, 0x99, 0xc7, 0x7c, 0x44, 0x20, 0xb7, 0x18, 0xfb, 0x18, 0xc0, 0x46,
- 0x4a, 0xc4, 0xed, 0xc6, 0x73, 0x29, 0x8c, 0x4b, 0xc8, 0x5b, 0x71, 0xbb, 0xa9, 0xdd, 0x41, 0x21,
- 0x0b, 0xd4, 0x1e, 0x4c, 0x3b, 0xb5, 0xfb, 0xd4, 0x00, 0xe6, 0x29, 0x68, 0xdc, 0xc1, 0xfb, 0x75,
- 0xac, 0xbd, 0x21, 0x51, 0x46, 0x35, 0xe5, 0x70, 0x1d, 0x6b, 0xff, 0xaf, 0x0e, 0x3c, 0x52, 0xa8,
- 0xcb, 0x5c, 0xe1, 0x96, 0x54, 0x9f, 0xdb, 0xaf, 0x75, 0x60, 0xd6, 0x5a, 0x28, 0xb4, 0x3f, 0x1b,
- 0x87, 0xdb, 0xbb, 0x2d, 0x2a, 0x90, 0xed, 0xc3, 0xc3, 0xed, 0xf6, 0x84, 0xf9, 0x35, 0x49, 0xe6,
- 0xf0, 0x07, 0xed, 0xde, 0x2c, 0xf2, 0x6b, 0xa3, 0x5b, 0x9c, 0xab, 0xcb, 0x46, 0xfc, 0x4a, 0xb7,
- 0x0a, 0xab, 0xa5, 0xad, 0x8b, 0x69, 0xc9, 0x36, 0xac, 0x30, 0xa2, 0x34, 0x85, 0x55, 0xa0, 0x91,
- 0xad, 0xd3, 0x14, 0xc6, 0x2b, 0xd0, 0xbf, 0x81, 0x61, 0xfb, 0x3a, 0x07, 0xe0, 0x44, 0x76, 0x54,
- 0xcd, 0x72, 0x3d, 0x6d, 0x2d, 0xd7, 0xfd, 0x21, 0xe5, 0x44, 0x64, 0xdf, 0x98, 0xb5, 0xa2, 0x58,
- 0xb4, 0x0e, 0xc3, 0xf9, 0x27, 0xed, 0x85, 0xfc, 0xb0, 0x61, 0xbc, 0xa6, 0xef, 0x7f, 0xdb, 0x7a,
- 0xd7, 0xec, 0x7b, 0xc5, 0x5c, 0xe8, 0xf3, 0xe5, 0x2f, 0x27, 0x8b, 0xc9, 0xff, 0xcc, 0xf1, 0xf0,
- 0x8c, 0x1f, 0x2f, 0x27, 0x1d, 0xb6, 0x0b, 0xbd, 0x5f, 0x8f, 0x97, 0x93, 0xae, 0x39, 0xf0, 0xc3,
- 0xa3, 0x49, 0x6f, 0xff, 0x00, 0x06, 0xf5, 0xe3, 0xc5, 0xf6, 0x00, 0xcc, 0x39, 0x68, 0x7d, 0x78,
- 0xfa, 0xfa, 0xfb, 0xf3, 0xb7, 0x93, 0x0e, 0x1b, 0x80, 0x73, 0xf2, 0xd3, 0xc9, 0x0f, 0x93, 0xee,
- 0x3f, 0x01, 0x00, 0x00, 0xff, 0xff, 0xe0, 0xe0, 0x8b, 0x09, 0x3f, 0x08, 0x00, 0x00,
+ // 1047 bytes of a gzipped FileDescriptorProto
+ 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x84, 0x55, 0xdb, 0x6e, 0xdb, 0x46,
+ 0x10, 0xad, 0x6e, 0xb6, 0x38, 0x92, 0x1c, 0x65, 0x63, 0x04, 0x44, 0xd2, 0x8b, 0xca, 0xa4, 0xa8,
+ 0xe2, 0x07, 0x3b, 0x55, 0x50, 0x20, 0x7d, 0x29, 0x50, 0xcb, 0x75, 0x13, 0x20, 0x71, 0x8d, 0x95,
+ 0x8d, 0xa2, 0x7d, 0x21, 0x36, 0xe4, 0x50, 0x5e, 0x98, 0x37, 0xec, 0x52, 0xb6, 0xe5, 0x97, 0xa2,
+ 0x9f, 0xd1, 0x0f, 0xe8, 0xf7, 0xf4, 0xa9, 0xff, 0x53, 0xec, 0x2c, 0x49, 0x53, 0x4e, 0x81, 0xbe,
+ 0xed, 0x9c, 0x39, 0x3c, 0xb3, 0x3b, 0x37, 0xc2, 0xd3, 0xf8, 0x26, 0x3c, 0x48, 0xe4, 0x52, 0x89,
+ 0x42, 0x66, 0x69, 0x79, 0xc2, 0xfd, 0x5c, 0x65, 0x45, 0xc6, 0x9c, 0xda, 0xe1, 0xfd, 0x0e, 0xce,
+ 0xdb, 0xa3, 0xf7, 0x22, 0x3f, 0x5b, 0xe7, 0xc8, 0x76, 0xa1, 0x27, 0xf5, 0x4a, 0x86, 0x6e, 0x6b,
+ 0xd2, 0x9e, 0xf6, 0xb9, 0x35, 0x2c, 0xba, 0x94, 0xa1, 0xdb, 0xae, 0xd0, 0xa5, 0x0c, 0xd9, 0x63,
+ 0xd8, 0xba, 0xc8, 0x74, 0x21, 0x43, 0xb7, 0x33, 0x69, 0x4f, 0x7b, 0xbc, 0xb4, 0x18, 0x83, 0x6e,
+ 0xaa, 0x65, 0xe8, 0x76, 0x09, 0xa5, 0x33, 0x7b, 0x02, 0xfd, 0x44, 0xe4, 0x4a, 0xa4, 0x4b, 0x74,
+ 0x7b, 0x84, 0xd7, 0xb6, 0xf7, 0x12, 0xb6, 0xe6, 0x59, 0x1a, 0xc9, 0x25, 0x1b, 0x43, 0xe7, 0x12,
+ 0xd7, 0x14, 0xdb, 0xe1, 0xe6, 0x68, 0x22, 0x5f, 0x89, 0x78, 0x85, 0x14, 0xd9, 0xe1, 0xd6, 0xf0,
+ 0x7e, 0x82, 0xad, 0x23, 0xbc, 0x92, 0x01, 0x52, 0x2c, 0x91, 0x60, 0xf9, 0x09, 0x9d, 0xd9, 0x0b,
+ 0xd8, 0x0a, 0x48, 0xcf, 0x6d, 0x4f, 0x3a, 0xd3, 0xc1, 0xec, 0xe1, 0x7e, 0xfd, 0xd8, 0x7d, 0x1b,
+ 0x88, 0x97, 0x04, 0xef, 0xef, 0x36, 0xf4, 0x17, 0xa9, 0xc8, 0xf5, 0x45, 0x56, 0xfc, 0xa7, 0xd6,
+ 0x2b, 0x18, 0xc4, 0x59, 0x20, 0xe2, 0xf9, 0xff, 0x08, 0x36, 0x59, 0xe6, 0xb1, 0xb9, 0xca, 0x22,
+ 0x19, 0xa3, 0x76, 0x3b, 0x93, 0xce, 0xd4, 0xe1, 0xb5, 0xcd, 0x3e, 0x05, 0x07, 0xf3, 0x0b, 0x4c,
+ 0x50, 0x89, 0x98, 0x32, 0xd4, 0xe7, 0x77, 0x00, 0xfb, 0x16, 0x86, 0x24, 0x64, 0x5f, 0xa7, 0xdd,
+ 0xde, 0x47, 0xf1, 0xac, 0x87, 0x6f, 0xd0, 0x98, 0x07, 0x43, 0xa1, 0x82, 0x0b, 0x59, 0x60, 0x50,
+ 0xac, 0x14, 0xba, 0x5b, 0x94, 0xe1, 0x0d, 0xcc, 0x5c, 0x4a, 0x17, 0xa2, 0xc0, 0x68, 0x15, 0xbb,
+ 0xdb, 0x14, 0xb7, 0xb6, 0xd9, 0x33, 0x18, 0x05, 0x0a, 0x29, 0x80, 0x1f, 0x8a, 0x02, 0xdd, 0xfe,
+ 0xa4, 0x35, 0xed, 0xf0, 0x61, 0x05, 0x1e, 0x89, 0x02, 0xd9, 0x73, 0xd8, 0x89, 0x85, 0x2e, 0xfc,
+ 0x95, 0xc6, 0xd0, 0xb2, 0x1c, 0xcb, 0x32, 0xe8, 0xb9, 0xc6, 0xd0, 0xb0, 0xbc, 0x3f, 0x5a, 0x30,
+ 0x52, 0x7a, 0x9d, 0x06, 0xc7, 0x28, 0x4c, 0x5c, 0x6d, 0xda, 0xe4, 0x46, 0x14, 0x85, 0xd2, 0x6e,
+ 0x6b, 0xd2, 0x9a, 0xf6, 0x79, 0x69, 0x19, 0x3c, 0xc4, 0x18, 0x0b, 0x53, 0x5b, 0xc2, 0xad, 0x65,
+ 0x2e, 0x1a, 0x64, 0x49, 0xae, 0x50, 0x9b, 0xec, 0x19, 0x4f, 0x6d, 0xb3, 0xe7, 0x30, 0xfa, 0x20,
+ 0x43, 0xa9, 0x30, 0x30, 0xd7, 0xa2, 0x0c, 0x1a, 0xc2, 0x26, 0xe8, 0xbd, 0x80, 0xc1, 0x6d, 0xa4,
+ 0xeb, 0x0b, 0x34, 0x05, 0x5b, 0x9b, 0x82, 0xde, 0x9f, 0x1d, 0x78, 0xf0, 0xbe, 0x4a, 0xee, 0x1b,
+ 0x14, 0x21, 0x2a, 0xb6, 0x07, 0xed, 0x48, 0x53, 0x17, 0xec, 0xcc, 0x9e, 0x34, 0x52, 0x5f, 0xf3,
+ 0x8e, 0x17, 0x66, 0x56, 0x78, 0x3b, 0xd2, 0xec, 0x6b, 0xe8, 0x06, 0x4a, 0xae, 0xe8, 0x09, 0x3b,
+ 0xb3, 0x47, 0xcd, 0xc6, 0xe0, 0x6f, 0xcf, 0x89, 0x46, 0x04, 0xb6, 0x07, 0x3d, 0x19, 0x26, 0x22,
+ 0xa7, 0x86, 0x18, 0xcc, 0x76, 0x1b, 0xcc, 0x7a, 0xfa, 0xb8, 0xa5, 0x98, 0x57, 0xea, 0xb2, 0x29,
+ 0x4f, 0x44, 0x82, 0xda, 0xed, 0x52, 0x13, 0x6d, 0x82, 0xec, 0x1b, 0x70, 0x2a, 0xa0, 0x6a, 0x94,
+ 0x66, 0xfc, 0xaa, 0xad, 0xf9, 0x1d, 0x8b, 0xb9, 0xb0, 0x9d, 0x2b, 0x0c, 0x57, 0x49, 0xee, 0x6e,
+ 0x53, 0x22, 0x2a, 0x93, 0x7d, 0x7f, 0xaf, 0x6a, 0xd4, 0x01, 0x83, 0x99, 0xdb, 0x10, 0xdc, 0xf0,
+ 0xf3, 0x7b, 0x45, 0x76, 0x61, 0x5b, 0x61, 0xa4, 0x50, 0x5f, 0x50, 0x57, 0xf4, 0x79, 0x65, 0xb2,
+ 0xd7, 0x1b, 0xc5, 0x70, 0x81, 0x74, 0x1f, 0x37, 0x74, 0x1b, 0x5e, 0xde, 0xa4, 0x7a, 0xc7, 0x30,
+ 0xae, 0x53, 0x3e, 0xcf, 0xd2, 0x42, 0x65, 0xb1, 0x89, 0xa3, 0x57, 0x41, 0x60, 0x4b, 0x69, 0x9a,
+ 0xb8, 0x32, 0x8d, 0x27, 0x41, 0xad, 0xc5, 0xd2, 0xf6, 0x93, 0xc3, 0x2b, 0xd3, 0x7b, 0x05, 0xa3,
+ 0x5a, 0x67, 0xb1, 0x4e, 0x03, 0x33, 0x2e, 0x91, 0x4c, 0x45, 0x7c, 0xaa, 0xf0, 0xc8, 0xe4, 0xc2,
+ 0x2a, 0x6d, 0x60, 0xde, 0x5f, 0x1d, 0x18, 0x9b, 0xcc, 0xf8, 0x66, 0x48, 0xb4, 0x8f, 0x69, 0xa1,
+ 0xd6, 0x66, 0x4e, 0x22, 0x85, 0x78, 0x2b, 0xd3, 0xa5, 0x5f, 0xc8, 0x72, 0x55, 0x8c, 0xf8, 0xb0,
+ 0x02, 0xcf, 0x64, 0x82, 0xec, 0x0b, 0x18, 0x44, 0x2a, 0xbb, 0xc5, 0xd4, 0x52, 0xda, 0x44, 0x01,
+ 0x0b, 0x11, 0xe1, 0x4b, 0x18, 0x26, 0x98, 0x90, 0x38, 0x31, 0x3a, 0xc4, 0x18, 0x94, 0x18, 0x51,
+ 0x9e, 0xc1, 0x28, 0xc1, 0xe4, 0x5a, 0xc9, 0x02, 0x2d, 0xa7, 0x6b, 0x03, 0x55, 0x60, 0x45, 0xca,
+ 0xc5, 0x12, 0xb5, 0xaf, 0x03, 0x91, 0xa6, 0x18, 0xd2, 0x62, 0xed, 0xf2, 0x21, 0x81, 0x0b, 0x8b,
+ 0xb1, 0x97, 0xb0, 0x5b, 0x92, 0x2e, 0x65, 0x9e, 0x63, 0xe8, 0xe7, 0x42, 0x61, 0x5a, 0xd0, 0x8a,
+ 0xe8, 0x72, 0x66, 0xb9, 0xd6, 0x75, 0x4a, 0x9e, 0x3b, 0x59, 0x13, 0xa9, 0xc0, 0x94, 0xb6, 0x45,
+ 0x25, 0xfb, 0x8b, 0xc5, 0x0c, 0x49, 0xaa, 0x44, 0xe4, 0xbe, 0x42, 0x9d, 0xc5, 0x57, 0x76, 0x63,
+ 0x8c, 0xf8, 0x90, 0x40, 0x6e, 0x31, 0xf6, 0x19, 0x80, 0x55, 0x8a, 0xc5, 0xed, 0xda, 0x75, 0x48,
+ 0xc6, 0x21, 0xe4, 0x9d, 0xb8, 0x5d, 0x57, 0x6e, 0x3f, 0x97, 0x79, 0xd9, 0x18, 0xa5, 0xfb, 0xd4,
+ 0x00, 0x66, 0xdf, 0xd4, 0x6e, 0xff, 0xc3, 0x2a, 0xd2, 0xee, 0x80, 0x28, 0xc3, 0x8a, 0x72, 0xb8,
+ 0x8a, 0xb4, 0xf7, 0x4f, 0x0b, 0x1e, 0x29, 0xd4, 0x45, 0xa6, 0x70, 0xa3, 0x54, 0x5f, 0xd9, 0xaf,
+ 0xb5, 0x6f, 0x46, 0x5d, 0x28, 0xb4, 0x7f, 0xb4, 0x2e, 0xb7, 0x6f, 0x9b, 0x97, 0x20, 0xdb, 0x83,
+ 0x87, 0x9b, 0xe9, 0x09, 0xb2, 0x6b, 0x2a, 0x59, 0x97, 0x3f, 0x68, 0xe6, 0x66, 0x9e, 0x5d, 0x9b,
+ 0xba, 0x45, 0x99, 0xba, 0xac, 0x8b, 0x5f, 0xd6, 0xad, 0xc4, 0xaa, 0xd2, 0x56, 0x97, 0x69, 0x94,
+ 0x6d, 0x50, 0x62, 0x44, 0xa9, 0x2f, 0x56, 0x82, 0xa6, 0x6c, 0xad, 0xfa, 0x62, 0xbc, 0x04, 0xbd,
+ 0x1b, 0x18, 0x34, 0x9f, 0x73, 0x00, 0xdd, 0xd0, 0xb6, 0xaa, 0x19, 0x9f, 0xa7, 0x8d, 0xf1, 0xb9,
+ 0xdf, 0xa4, 0x9c, 0x88, 0xec, 0xb5, 0x19, 0x48, 0xd2, 0xa2, 0x71, 0x18, 0xcc, 0x3e, 0x6f, 0x8e,
+ 0xf2, 0xc7, 0x09, 0xe3, 0x15, 0x7d, 0xef, 0xbb, 0xc6, 0x46, 0xb4, 0x9b, 0x8e, 0x39, 0xd0, 0xe3,
+ 0x8b, 0x5f, 0x4f, 0xe6, 0xe3, 0x4f, 0xcc, 0xf1, 0xf0, 0x8c, 0x1f, 0x2f, 0xc6, 0x2d, 0xb6, 0x0d,
+ 0x9d, 0xdf, 0x8e, 0x17, 0xe3, 0xb6, 0x39, 0xf0, 0xc3, 0xa3, 0x71, 0x67, 0xef, 0x00, 0xfa, 0xd5,
+ 0xda, 0x63, 0x3b, 0x00, 0xe6, 0xec, 0x37, 0x3e, 0x3c, 0x7d, 0xf3, 0xc3, 0xf9, 0xbb, 0x71, 0x8b,
+ 0xf5, 0xa1, 0x7b, 0xf2, 0xf3, 0xc9, 0x8f, 0xe3, 0xf6, 0xbf, 0x01, 0x00, 0x00, 0xff, 0xff, 0xcf,
+ 0xd6, 0xdc, 0x0b, 0xa4, 0x08, 0x00, 0x00,
}
diff --git a/lxd/migration/migrate.proto b/lxd/migration/migrate.proto
index 938e73af0d..df01b51e5c 100644
--- a/lxd/migration/migrate.proto
+++ b/lxd/migration/migrate.proto
@@ -53,6 +53,10 @@ message rsyncFeatures {
optional bool bidirectional = 4;
}
+message zfsFeatures {
+ optional bool compress = 1;
+}
+
message MigrationHeader {
required MigrationFSType fs = 1;
optional CRIUType criu = 2;
@@ -62,6 +66,7 @@ message MigrationHeader {
optional bool predump = 7;
optional rsyncFeatures rsyncFeatures = 8;
optional bool refresh = 9;
+ optional zfsFeatures zfsFeatures = 10;
}
message MigrationControl {
diff --git a/lxd/storage_zfs.go b/lxd/storage_zfs.go
index 9f89244317..a008909172 100644
--- a/lxd/storage_zfs.go
+++ b/lxd/storage_zfs.go
@@ -2541,6 +2541,7 @@ type zfsMigrationSourceDriver struct {
zfs *storageZfs
runningSnapName string
stoppedSnapName string
+ zfsArgs []string
}
func (s *zfsMigrationSourceDriver) Snapshots() []container {
@@ -2550,7 +2551,9 @@ func (s *zfsMigrationSourceDriver) Snapshots() []container {
func (s *zfsMigrationSourceDriver) send(conn *websocket.Conn, zfsName string, zfsParent string, readWrapper func(io.ReadCloser) io.ReadCloser) error {
sourceParentName, _, _ := containerGetParentAndSnapshotName(s.container.Name())
poolName := s.zfs.getOnDiskPoolName()
- args := []string{"send", fmt.Sprintf("%s/containers/%s@%s", poolName, projectPrefix(s.container.Project(), sourceParentName), zfsName)}
+ args := []string{"send"}
+ args = append(args, s.zfsArgs...)
+ args = append(args, []string{fmt.Sprintf("%s/containers/%s@%s", poolName, projectPrefix(s.container.Project(), sourceParentName), zfsName)}...)
if zfsParent != "" {
args = append(args, "-i", fmt.Sprintf("%s/containers/%s@%s", poolName, projectPrefix(s.container.Project(), s.container.Name()), zfsParent))
}
@@ -2665,7 +2668,7 @@ func (s *storageZfs) MigrationSource(ct container, containerOnly bool, args Migr
* to send anything else, because that's all the user asked for.
*/
if ct.IsSnapshot() {
- return &zfsMigrationSourceDriver{container: ct, zfs: s}, nil
+ return &zfsMigrationSourceDriver{container: ct, zfs: s, zfsArgs: args.ZfsArgs}, nil
}
driver := zfsMigrationSourceDriver{
@@ -2673,6 +2676,7 @@ func (s *storageZfs) MigrationSource(ct container, containerOnly bool, args Migr
snapshots: []container{},
zfsSnapshotNames: []string{},
zfs: s,
+ zfsArgs: args.ZfsArgs,
}
if containerOnly {
More information about the lxc-devel
mailing list