[lxc-devel] [lxd/master] rsync: Tweak transfer options (delete & compress)
stgraber on Github
lxc-bot at linuxcontainers.org
Mon Oct 29 21:17:26 UTC 2018
A non-text attachment was scrubbed...
Name: not available
Type: text/x-mailbox
Size: 688 bytes
Desc: not available
URL: <http://lists.linuxcontainers.org/pipermail/lxc-devel/attachments/20181029/b23faafe/attachment.bin>
-------------- next part --------------
From 03ecaf4b2da0816ee8d9d617648a35522d050ae4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Graber?= <stgraber at ubuntu.com>
Date: Mon, 29 Oct 2018 17:14:57 -0400
Subject: [PATCH] rsync: Tweak transfer options (delete & compress)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
LXD when interacting with recent clients will now support:
- --delete (to avoid random conflicts)
- --compress --compress-level=2 (to reduce bandwidth usage)
The level 2 compress appears to be the best CPU/bandwidth tradeoff for
most common images and shouldn't cause slowdowns in most cases.
Closes #5215
Closes #5212
Signed-off-by: Stéphane Graber <stgraber at ubuntu.com>
---
lxc-to-lxd/transfer.go | 3 +
lxc-to-lxd/utils.go | 10 ++-
lxd-p2c/transfer.go | 3 +
lxd-p2c/utils.go | 10 ++-
lxd/migrate_container.go | 32 ++++++--
lxd/migrate_storage_volumes.go | 32 ++++++--
lxd/migration/migrate.pb.go | 141 ++++++++++++++++++---------------
lxd/migration/migrate.proto | 2 +
lxd/rsync.go | 3 +
9 files changed, 154 insertions(+), 82 deletions(-)
diff --git a/lxc-to-lxd/transfer.go b/lxc-to-lxd/transfer.go
index c0390321e9..57c85fbcb9 100644
--- a/lxc-to-lxd/transfer.go
+++ b/lxc-to-lxd/transfer.go
@@ -74,6 +74,9 @@ func rsyncSendSetup(path string, rsyncArgs string) (*exec.Cmd, net.Conn, io.Read
"--partial",
"--sparse",
"--xattrs",
+ "--delete",
+ "--compress",
+ "--compress-level=2",
}
// Ignore deletions (requires 3.1 or higher)
diff --git a/lxc-to-lxd/utils.go b/lxc-to-lxd/utils.go
index 2d3aea2381..6dcae9feec 100644
--- a/lxc-to-lxd/utils.go
+++ b/lxc-to-lxd/utils.go
@@ -31,10 +31,14 @@ func transferRootfs(dst lxd.ContainerServer, op lxd.Operation, rootfs string, rs
// Setup control struct
fs := migration.MigrationFSType_RSYNC
- rsyncXattrs := true
+ rsyncHasFeature := true
header := migration.MigrationHeader{
- Fs: &fs,
- RsyncFeatures: &migration.RsyncFeatures{Xattrs: &rsyncXattrs},
+ Fs: &fs,
+ RsyncFeatures: &migration.RsyncFeatures{
+ Xattrs: &rsyncHasFeature,
+ Delete: &rsyncHasFeature,
+ Compress: &rsyncHasFeature,
+ },
}
err = migration.ProtoSend(wsControl, &header)
diff --git a/lxd-p2c/transfer.go b/lxd-p2c/transfer.go
index d145eccf6e..4fb3068f5e 100644
--- a/lxd-p2c/transfer.go
+++ b/lxd-p2c/transfer.go
@@ -74,6 +74,9 @@ func rsyncSendSetup(path string, rsyncArgs string) (*exec.Cmd, net.Conn, io.Read
"--partial",
"--sparse",
"--xattrs",
+ "--delete",
+ "--compress",
+ "--compress-level=2",
}
// Ignore deletions (requires 3.1 or higher)
diff --git a/lxd-p2c/utils.go b/lxd-p2c/utils.go
index de82041c79..0dc44b2734 100644
--- a/lxd-p2c/utils.go
+++ b/lxd-p2c/utils.go
@@ -32,10 +32,14 @@ func transferRootfs(dst lxd.ContainerServer, op lxd.Operation, rootfs string, rs
// Setup control struct
fs := migration.MigrationFSType_RSYNC
- rsyncXattrs := true
+ rsyncHasFeature := true
header := migration.MigrationHeader{
- RsyncFeatures: &migration.RsyncFeatures{Xattrs: &rsyncXattrs},
- Fs: &fs,
+ RsyncFeatures: &migration.RsyncFeatures{
+ Xattrs: &rsyncHasFeature,
+ Delete: &rsyncHasFeature,
+ Compress: &rsyncHasFeature,
+ },
+ Fs: &fs,
}
err = migration.ProtoSend(wsControl, &header)
diff --git a/lxd/migrate_container.go b/lxd/migrate_container.go
index 013d03b931..8dc76acc0c 100644
--- a/lxd/migrate_container.go
+++ b/lxd/migrate_container.go
@@ -379,7 +379,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()
- rsyncXattrs := true
+ rsyncHasFeature := true
header := migration.MigrationHeader{
Fs: &myType,
Criu: criuType,
@@ -387,7 +387,11 @@ func (s *migrationSourceWs) Do(migrateOp *operation) error {
SnapshotNames: snapshotNames,
Snapshots: snapshots,
Predump: proto.Bool(use_pre_dumps),
- RsyncFeatures: &migration.RsyncFeatures{Xattrs: &rsyncXattrs},
+ RsyncFeatures: &migration.RsyncFeatures{
+ Xattrs: &rsyncHasFeature,
+ Delete: &rsyncHasFeature,
+ Compress: &rsyncHasFeature,
+ },
}
err = s.send(&header)
@@ -792,11 +796,15 @@ func (c *migrationSink) Do(migrateOp *operation) error {
mySink := c.src.container.Storage().MigrationSink
myType := c.src.container.Storage().MigrationType()
- rsyncXattrs := true
+ rsyncHasFeature := true
resp := migration.MigrationHeader{
- Fs: &myType,
- Criu: criuType,
- RsyncFeatures: &migration.RsyncFeatures{Xattrs: &rsyncXattrs},
+ Fs: &myType,
+ Criu: criuType,
+ RsyncFeatures: &migration.RsyncFeatures{
+ Xattrs: &rsyncHasFeature,
+ Delete: &rsyncHasFeature,
+ Compress: &rsyncHasFeature,
+ },
}
// If the storage type the source has doesn't match what we have, then
@@ -878,8 +886,18 @@ func (c *migrationSink) Do(migrateOp *operation) error {
args := MigrationSinkArgs{}
rsyncFeatures := header.GetRsyncFeatures()
+
+ // Handle rsync options
+ args.RsyncArgs = []string{}
if rsyncFeatures.GetXattrs() {
- args.RsyncArgs = []string{"--xattrs"}
+ args.RsyncArgs = append(args.RsyncArgs, "--xattrs")
+ }
+ if rsyncFeatures.GetDelete() {
+ args.RsyncArgs = append(args.RsyncArgs, "--delete")
+ }
+ if rsyncFeatures.GetCompress() {
+ args.RsyncArgs = append(args.RsyncArgs, "--compress")
+ args.RsyncArgs = append(args.RsyncArgs, "--compress-level=2")
}
err = mySink(sendFinalFsDelta, c.src.container,
diff --git a/lxd/migrate_storage_volumes.go b/lxd/migrate_storage_volumes.go
index b92cb3d7b5..eb10bafc33 100644
--- a/lxd/migrate_storage_volumes.go
+++ b/lxd/migrate_storage_volumes.go
@@ -47,10 +47,14 @@ 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()
- rsyncXattrs := true
+ rsyncHasFeature := true
header := migration.MigrationHeader{
- Fs: &myType,
- RsyncFeatures: &migration.RsyncFeatures{Xattrs: &rsyncXattrs},
+ Fs: &myType,
+ RsyncFeatures: &migration.RsyncFeatures{
+ Xattrs: &rsyncHasFeature,
+ Delete: &rsyncHasFeature,
+ Compress: &rsyncHasFeature,
+ },
}
err = s.send(&header)
@@ -215,10 +219,14 @@ func (c *migrationSink) DoStorage(migrateOp *operation) error {
mySink := c.src.storage.StorageMigrationSink
myType := c.src.storage.MigrationType()
- rsyncXattrs := true
+ rsyncHasFeature := true
resp := migration.MigrationHeader{
- Fs: &myType,
- RsyncFeatures: &migration.RsyncFeatures{Xattrs: &rsyncXattrs},
+ Fs: &myType,
+ RsyncFeatures: &migration.RsyncFeatures{
+ Xattrs: &rsyncHasFeature,
+ Delete: &rsyncHasFeature,
+ Compress: &rsyncHasFeature,
+ },
}
// If the storage type the source has doesn't match what we have, then
@@ -231,8 +239,18 @@ func (c *migrationSink) DoStorage(migrateOp *operation) error {
args := MigrationSinkArgs{}
rsyncFeatures := header.GetRsyncFeatures()
+
+ // Handle rsync options
+ args.RsyncArgs = []string{}
if rsyncFeatures.GetXattrs() {
- args.RsyncArgs = []string{"--xattrs"}
+ args.RsyncArgs = append(args.RsyncArgs, "--xattrs")
+ }
+ if rsyncFeatures.GetDelete() {
+ args.RsyncArgs = append(args.RsyncArgs, "--delete")
+ }
+ if rsyncFeatures.GetCompress() {
+ args.RsyncArgs = append(args.RsyncArgs, "--compress")
+ args.RsyncArgs = append(args.RsyncArgs, "--compress-level=2")
}
err = sender(&resp)
diff --git a/lxd/migration/migrate.pb.go b/lxd/migration/migrate.pb.go
index 456ffd16e3..682c71cb1e 100644
--- a/lxd/migration/migrate.pb.go
+++ b/lxd/migration/migrate.pb.go
@@ -296,6 +296,8 @@ func (m *Snapshot) GetLastUsedDate() int64 {
type RsyncFeatures struct {
Xattrs *bool `protobuf:"varint,1,opt,name=xattrs" json:"xattrs,omitempty"`
+ Delete *bool `protobuf:"varint,2,opt,name=delete" json:"delete,omitempty"`
+ Compress *bool `protobuf:"varint,3,opt,name=compress" json:"compress,omitempty"`
XXX_unrecognized []byte `json:"-"`
}
@@ -311,6 +313,20 @@ func (m *RsyncFeatures) GetXattrs() bool {
return false
}
+func (m *RsyncFeatures) GetDelete() bool {
+ if m != nil && m.Delete != nil {
+ return *m.Delete
+ }
+ return false
+}
+
+func (m *RsyncFeatures) 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"`
@@ -610,66 +626,67 @@ func init() {
func init() { proto.RegisterFile("lxd/migration/migrate.proto", fileDescriptor0) }
var fileDescriptor0 = []byte{
- // 972 bytes of a gzipped FileDescriptorProto
- 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x84, 0x54, 0xdd, 0x6e, 0xdb, 0x36,
- 0x14, 0x9e, 0x65, 0x39, 0xb1, 0x8e, 0xed, 0xd4, 0x65, 0x8b, 0x41, 0x68, 0xf7, 0xe3, 0xa9, 0x1d,
- 0xea, 0xe5, 0x22, 0xe9, 0x5c, 0x0c, 0xd8, 0x6e, 0x06, 0x2c, 0xce, 0xb2, 0x16, 0x68, 0xb3, 0x80,
- 0x4e, 0x30, 0x6c, 0x37, 0x02, 0x27, 0x1d, 0x39, 0x44, 0xf4, 0x07, 0x52, 0x4a, 0xe2, 0xdc, 0xec,
- 0x69, 0xf6, 0x28, 0xbb, 0xde, 0xd5, 0xde, 0x67, 0x20, 0x29, 0x2a, 0x72, 0x3b, 0x60, 0x77, 0x3c,
- 0xdf, 0xf9, 0x78, 0x3e, 0x9e, 0x3f, 0xc2, 0xd3, 0xf4, 0x36, 0x3e, 0xcc, 0xf8, 0x5a, 0xb0, 0x8a,
- 0x17, 0x79, 0x73, 0xc2, 0x83, 0x52, 0x14, 0x55, 0x41, 0xbc, 0xd6, 0x11, 0xfc, 0x01, 0xde, 0x9b,
- 0xe3, 0x77, 0xac, 0x3c, 0xdf, 0x94, 0x48, 0x1e, 0xc3, 0x80, 0xcb, 0x9a, 0xc7, 0x7e, 0x6f, 0xe6,
- 0xcc, 0x87, 0xd4, 0x18, 0x06, 0x5d, 0xf3, 0xd8, 0x77, 0x2c, 0xba, 0xe6, 0x31, 0xf9, 0x18, 0x76,
- 0x2e, 0x0b, 0x59, 0xf1, 0xd8, 0xef, 0xcf, 0x9c, 0xf9, 0x80, 0x36, 0x16, 0x21, 0xe0, 0xe6, 0x92,
- 0xc7, 0xbe, 0xab, 0x51, 0x7d, 0x26, 0x4f, 0x60, 0x98, 0xb1, 0x52, 0xb0, 0x7c, 0x8d, 0xfe, 0x40,
- 0xe3, 0xad, 0x1d, 0xbc, 0x84, 0x9d, 0x65, 0x91, 0x27, 0x7c, 0x4d, 0xa6, 0xd0, 0xbf, 0xc2, 0x8d,
- 0xd6, 0xf6, 0xa8, 0x3a, 0x2a, 0xe5, 0x6b, 0x96, 0xd6, 0xa8, 0x95, 0x3d, 0x6a, 0x8c, 0xe0, 0x27,
- 0xd8, 0x39, 0xc6, 0x6b, 0x1e, 0xa1, 0xd6, 0x62, 0x19, 0x36, 0x57, 0xf4, 0x99, 0x7c, 0x05, 0x3b,
- 0x91, 0x8e, 0xe7, 0x3b, 0xb3, 0xfe, 0x7c, 0xb4, 0x78, 0x78, 0xd0, 0x26, 0x7b, 0x60, 0x84, 0x68,
- 0x43, 0x08, 0xfe, 0x76, 0x60, 0xb8, 0xca, 0x59, 0x29, 0x2f, 0x8b, 0xea, 0x3f, 0x63, 0xbd, 0x82,
- 0x51, 0x5a, 0x44, 0x2c, 0x5d, 0xfe, 0x4f, 0xc0, 0x2e, 0x4b, 0x25, 0x5b, 0x8a, 0x22, 0xe1, 0x29,
- 0x4a, 0xbf, 0x3f, 0xeb, 0xcf, 0x3d, 0xda, 0xda, 0xe4, 0x13, 0xf0, 0xb0, 0xbc, 0xc4, 0x0c, 0x05,
- 0x4b, 0x75, 0x85, 0x86, 0xf4, 0x1e, 0x20, 0xdf, 0xc0, 0x58, 0x07, 0x32, 0xd9, 0x49, 0x7f, 0xf0,
- 0x81, 0x9e, 0xf1, 0xd0, 0x2d, 0x1a, 0x09, 0x60, 0xcc, 0x44, 0x74, 0xc9, 0x2b, 0x8c, 0xaa, 0x5a,
- 0xa0, 0xbf, 0xa3, 0x2b, 0xbc, 0x85, 0xa9, 0x47, 0xc9, 0x8a, 0x55, 0x98, 0xd4, 0xa9, 0xbf, 0xab,
- 0x75, 0x5b, 0x9b, 0x3c, 0x83, 0x49, 0x24, 0x50, 0x0b, 0x84, 0x31, 0xab, 0xd0, 0x1f, 0xce, 0x7a,
- 0xf3, 0x3e, 0x1d, 0x5b, 0xf0, 0x98, 0x55, 0x48, 0x9e, 0xc3, 0x5e, 0xca, 0x64, 0x15, 0xd6, 0x12,
- 0x63, 0xc3, 0xf2, 0x0c, 0x4b, 0xa1, 0x17, 0x12, 0x63, 0xc5, 0x0a, 0x5e, 0xc0, 0x44, 0xc8, 0x4d,
- 0x1e, 0x9d, 0x20, 0x53, 0xb2, 0x52, 0x4d, 0xc9, 0x2d, 0xab, 0x2a, 0x21, 0xfd, 0xde, 0xac, 0x37,
- 0x1f, 0xd2, 0xc6, 0x0a, 0xfe, 0x72, 0xe0, 0xc1, 0x3b, 0x9b, 0xd6, 0x6b, 0x64, 0x31, 0x0a, 0xb2,
- 0x0f, 0x4e, 0x22, 0x75, 0xfd, 0xf7, 0x16, 0x4f, 0x3a, 0x49, 0xb7, 0xbc, 0x93, 0x95, 0x9a, 0x52,
- 0xea, 0x24, 0x92, 0xbc, 0x00, 0x37, 0x12, 0xbc, 0xf6, 0x9d, 0x59, 0x6f, 0xbe, 0xb7, 0x78, 0xd4,
- 0x6d, 0x09, 0x7d, 0x73, 0xa1, 0x69, 0x9a, 0x40, 0xf6, 0x61, 0xc0, 0xe3, 0x8c, 0x95, 0xba, 0x15,
- 0xa3, 0xc5, 0xe3, 0x0e, 0xb3, 0x9d, 0x7b, 0x6a, 0x28, 0xe4, 0x39, 0x4c, 0x64, 0x33, 0x0e, 0xa7,
- 0x2c, 0x43, 0xe9, 0xbb, 0xba, 0x7d, 0xdb, 0x20, 0xf9, 0x1a, 0x3c, 0x0b, 0xd8, 0x16, 0x75, 0xf5,
- 0xed, 0x40, 0xd1, 0x7b, 0x16, 0xf1, 0x61, 0xb7, 0x14, 0x18, 0xd7, 0x59, 0xe9, 0xef, 0xea, 0x32,
- 0x58, 0x93, 0x7c, 0xff, 0x5e, 0xc1, 0x74, 0xed, 0x47, 0x0b, 0xbf, 0x13, 0x70, 0xcb, 0x4f, 0xb7,
- 0xe9, 0xc1, 0x09, 0x4c, 0xdb, 0xf2, 0x2c, 0x8b, 0xbc, 0x12, 0x45, 0xaa, 0xd4, 0x64, 0x1d, 0x45,
- 0x28, 0x65, 0xb3, 0xc7, 0xd6, 0x54, 0x9e, 0x0c, 0xa5, 0x64, 0x6b, 0xd4, 0x85, 0xf3, 0xa8, 0x35,
- 0x83, 0x57, 0x30, 0x69, 0xe3, 0xac, 0x36, 0x79, 0xa4, 0x86, 0x2a, 0xe1, 0x39, 0x4b, 0xcf, 0x04,
- 0x1e, 0xab, 0x77, 0x9b, 0x48, 0x5b, 0x58, 0xf0, 0x67, 0x1f, 0xa6, 0x2a, 0x8b, 0x50, 0x8d, 0x92,
- 0x0c, 0x31, 0xaf, 0xc4, 0x46, 0x4d, 0x53, 0x22, 0x10, 0xef, 0x78, 0xbe, 0x0e, 0x2b, 0xde, 0x2c,
- 0xd4, 0x84, 0x8e, 0x2d, 0x78, 0xce, 0x33, 0x24, 0x9f, 0xc3, 0x28, 0x11, 0xc5, 0x1d, 0xe6, 0x86,
- 0xe2, 0x68, 0x0a, 0x18, 0x48, 0x13, 0xbe, 0x80, 0x71, 0x86, 0x99, 0x0e, 0xae, 0x19, 0x7d, 0xcd,
- 0x18, 0x35, 0x98, 0xa6, 0x3c, 0x83, 0x49, 0x86, 0xd9, 0x8d, 0xe0, 0x15, 0x1a, 0x8e, 0x6b, 0x84,
- 0x2c, 0x68, 0x49, 0x25, 0x5b, 0xa3, 0x0c, 0x65, 0xc4, 0xf2, 0x1c, 0x63, 0xfd, 0xfd, 0xb8, 0x74,
- 0xac, 0xc1, 0x95, 0xc1, 0xc8, 0x4b, 0x78, 0xdc, 0x90, 0xae, 0x78, 0x59, 0x62, 0x1c, 0x96, 0x4c,
- 0x60, 0x5e, 0xe9, 0x45, 0x72, 0x29, 0x31, 0x5c, 0xe3, 0x3a, 0xd3, 0x9e, 0xfb, 0xb0, 0x4a, 0xa9,
- 0xc2, 0x5c, 0xef, 0x94, 0x0d, 0xfb, 0x8b, 0xc1, 0x14, 0x89, 0x8b, 0x8c, 0x95, 0xa1, 0x40, 0x59,
- 0xa4, 0xd7, 0x66, 0xaf, 0x26, 0x74, 0xac, 0x41, 0x6a, 0x30, 0xf2, 0x29, 0x80, 0x89, 0x94, 0xb2,
- 0xbb, 0x8d, 0xef, 0xe9, 0x30, 0x9e, 0x46, 0xde, 0xb2, 0xbb, 0x8d, 0x75, 0x87, 0x25, 0x2f, 0x51,
- 0xfa, 0x30, 0xeb, 0x59, 0xf7, 0x99, 0x02, 0xd4, 0x56, 0xb6, 0xee, 0xf0, 0xf7, 0x3a, 0x91, 0xfe,
- 0x48, 0x53, 0xc6, 0x96, 0x72, 0x54, 0x27, 0x32, 0xf8, 0xa7, 0x07, 0x8f, 0x04, 0xca, 0xaa, 0x10,
- 0xb8, 0xd5, 0xaa, 0x2f, 0xcd, 0x6d, 0x19, 0x46, 0x45, 0xa6, 0x52, 0x36, 0xff, 0xbe, 0x4b, 0x4d,
- 0x6e, 0xcb, 0x06, 0x24, 0xfb, 0xf0, 0x70, 0xbb, 0x3c, 0x51, 0x71, 0xa3, 0x5b, 0xe6, 0xd2, 0x07,
- 0xdd, 0xda, 0x2c, 0x8b, 0x1b, 0xd5, 0xb7, 0xa4, 0x10, 0x57, 0x6d, 0xf3, 0x9b, 0xbe, 0x35, 0x98,
- 0x6d, 0xad, 0x7d, 0x4c, 0xa7, 0x6d, 0xa3, 0x06, 0xd3, 0x94, 0xf6, 0x61, 0x0d, 0xa8, 0xda, 0xd6,
- 0x6b, 0x1f, 0x46, 0x1b, 0x30, 0xb8, 0x85, 0x51, 0x37, 0x9d, 0x43, 0x70, 0x63, 0x33, 0xaa, 0x6a,
- 0x85, 0x9e, 0x76, 0x56, 0xe8, 0xfd, 0x21, 0xa5, 0x9a, 0x48, 0xbe, 0x85, 0xdd, 0x46, 0x40, 0xaf,
- 0xc3, 0x68, 0xf1, 0x59, 0x77, 0xed, 0x3e, 0x2c, 0x18, 0xb5, 0xf4, 0xfd, 0xef, 0x3a, 0xbf, 0x97,
- 0xf9, 0x95, 0x88, 0x07, 0x03, 0xba, 0xfa, 0xf5, 0x74, 0x39, 0xfd, 0x48, 0x1d, 0x8f, 0xce, 0xe9,
- 0xc9, 0x6a, 0xda, 0x23, 0xbb, 0xd0, 0xff, 0xed, 0x64, 0x35, 0x75, 0xd4, 0x81, 0x1e, 0x1d, 0x4f,
- 0xfb, 0xfb, 0x87, 0x30, 0xb4, 0x5f, 0x14, 0xd9, 0x03, 0x50, 0xe7, 0xb0, 0x73, 0xf1, 0xec, 0xf5,
- 0x0f, 0x17, 0x6f, 0xa7, 0x3d, 0x32, 0x04, 0xf7, 0xf4, 0xe7, 0xd3, 0x1f, 0xa7, 0xce, 0xbf, 0x01,
- 0x00, 0x00, 0xff, 0xff, 0x2b, 0x3f, 0x34, 0xa3, 0xca, 0x07, 0x00, 0x00,
+ // 992 bytes of a gzipped FileDescriptorProto
+ 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x84, 0x55, 0x4d, 0x6f, 0xdb, 0x46,
+ 0x10, 0xad, 0x28, 0xca, 0x16, 0x47, 0x92, 0xa3, 0x6c, 0x82, 0x82, 0x48, 0xfa, 0xa1, 0x32, 0x29,
+ 0xaa, 0xfa, 0x60, 0xa7, 0x0a, 0x0a, 0xb4, 0x97, 0x02, 0xb5, 0x5c, 0x37, 0x01, 0x12, 0xd7, 0x58,
+ 0xd9, 0x28, 0xda, 0x1e, 0x88, 0x2d, 0x39, 0x94, 0x17, 0xe6, 0x17, 0x76, 0x97, 0xb6, 0xe5, 0x4b,
+ 0x7f, 0x4d, 0x7f, 0x4a, 0xcf, 0x3d, 0xf5, 0xff, 0x14, 0xbb, 0x4b, 0xd2, 0x54, 0x52, 0xa0, 0xb7,
+ 0x9d, 0x37, 0x4f, 0xf3, 0x76, 0xe7, 0xcd, 0x50, 0xf0, 0x34, 0xbd, 0x8d, 0x0f, 0x33, 0xbe, 0x16,
+ 0x4c, 0xf1, 0x22, 0xaf, 0x4f, 0x78, 0x50, 0x8a, 0x42, 0x15, 0xc4, 0x6b, 0x13, 0xc1, 0x1f, 0xe0,
+ 0xbd, 0x3e, 0x7e, 0xcb, 0xca, 0xf3, 0x4d, 0x89, 0xe4, 0x31, 0x0c, 0xb8, 0xac, 0x78, 0xec, 0xf7,
+ 0x66, 0xce, 0x7c, 0x48, 0x6d, 0x60, 0xd1, 0x35, 0x8f, 0x7d, 0xa7, 0x41, 0xd7, 0x3c, 0x26, 0x1f,
+ 0xc2, 0xce, 0x65, 0x21, 0x15, 0x8f, 0xfd, 0xfe, 0xcc, 0x99, 0x0f, 0x68, 0x1d, 0x11, 0x02, 0x6e,
+ 0x2e, 0x79, 0xec, 0xbb, 0x06, 0x35, 0x67, 0xf2, 0x04, 0x86, 0x19, 0x2b, 0x05, 0xcb, 0xd7, 0xe8,
+ 0x0f, 0x0c, 0xde, 0xc6, 0xc1, 0x0b, 0xd8, 0x59, 0x16, 0x79, 0xc2, 0xd7, 0x64, 0x0a, 0xfd, 0x2b,
+ 0xdc, 0x18, 0x6d, 0x8f, 0xea, 0xa3, 0x56, 0xbe, 0x66, 0x69, 0x85, 0x46, 0xd9, 0xa3, 0x36, 0x08,
+ 0x7e, 0x84, 0x9d, 0x63, 0xbc, 0xe6, 0x11, 0x1a, 0x2d, 0x96, 0x61, 0xfd, 0x13, 0x73, 0x26, 0x5f,
+ 0xc2, 0x4e, 0x64, 0xea, 0xf9, 0xce, 0xac, 0x3f, 0x1f, 0x2d, 0x1e, 0x1e, 0xb4, 0x8f, 0x3d, 0xb0,
+ 0x42, 0xb4, 0x26, 0x04, 0x7f, 0x3b, 0x30, 0x5c, 0xe5, 0xac, 0x94, 0x97, 0x85, 0xfa, 0xcf, 0x5a,
+ 0x2f, 0x61, 0x94, 0x16, 0x11, 0x4b, 0x97, 0xff, 0x53, 0xb0, 0xcb, 0xd2, 0x8f, 0x2d, 0x45, 0x91,
+ 0xf0, 0x14, 0xa5, 0xdf, 0x9f, 0xf5, 0xe7, 0x1e, 0x6d, 0x63, 0xf2, 0x11, 0x78, 0x58, 0x5e, 0x62,
+ 0x86, 0x82, 0xa5, 0xa6, 0x43, 0x43, 0x7a, 0x0f, 0x90, 0xaf, 0x61, 0x6c, 0x0a, 0xd9, 0xd7, 0x49,
+ 0x7f, 0xf0, 0x9e, 0x9e, 0xcd, 0xd0, 0x2d, 0x1a, 0x09, 0x60, 0xcc, 0x44, 0x74, 0xc9, 0x15, 0x46,
+ 0xaa, 0x12, 0xe8, 0xef, 0x98, 0x0e, 0x6f, 0x61, 0xfa, 0x52, 0x52, 0x31, 0x85, 0x49, 0x95, 0xfa,
+ 0xbb, 0x46, 0xb7, 0x8d, 0xc9, 0x33, 0x98, 0x44, 0x02, 0x8d, 0x40, 0x18, 0x33, 0x85, 0xfe, 0x70,
+ 0xd6, 0x9b, 0xf7, 0xe9, 0xb8, 0x01, 0x8f, 0x99, 0x42, 0xf2, 0x1c, 0xf6, 0x52, 0x26, 0x55, 0x58,
+ 0x49, 0x8c, 0x2d, 0xcb, 0xb3, 0x2c, 0x8d, 0x5e, 0x48, 0x8c, 0x35, 0x2b, 0xf8, 0x0d, 0x26, 0x42,
+ 0x6e, 0xf2, 0xe8, 0x04, 0x99, 0x96, 0x95, 0x7a, 0x4a, 0x6e, 0x99, 0x52, 0x42, 0xfa, 0xbd, 0x59,
+ 0x6f, 0x3e, 0xa4, 0x75, 0xa4, 0xf1, 0x18, 0x53, 0x54, 0xda, 0x5a, 0x83, 0xdb, 0x48, 0xdf, 0x33,
+ 0x2a, 0xb2, 0x52, 0xa0, 0xd4, 0xcd, 0xd3, 0x99, 0x36, 0x0e, 0xfe, 0x72, 0xe0, 0xc1, 0xdb, 0xa6,
+ 0x15, 0xaf, 0x90, 0xc5, 0x28, 0xc8, 0x3e, 0x38, 0x89, 0x34, 0x9e, 0xed, 0x2d, 0x9e, 0x74, 0x1a,
+ 0xd5, 0xf2, 0x4e, 0x56, 0x7a, 0xb2, 0xa9, 0x93, 0x48, 0xf2, 0x05, 0xb8, 0x91, 0xe0, 0x95, 0x51,
+ 0xdc, 0x5b, 0x3c, 0xea, 0xda, 0x48, 0x5f, 0x5f, 0x18, 0x9a, 0x21, 0x90, 0x7d, 0x18, 0xf0, 0x38,
+ 0x63, 0xa5, 0xb1, 0x6f, 0xb4, 0x78, 0xdc, 0x61, 0xb6, 0xbb, 0x42, 0x2d, 0x85, 0x3c, 0x87, 0x89,
+ 0xac, 0x47, 0xe8, 0x94, 0x65, 0x28, 0x7d, 0xd7, 0x58, 0xbe, 0x0d, 0x92, 0xaf, 0xc0, 0x6b, 0x80,
+ 0xc6, 0xd6, 0xae, 0x7e, 0x33, 0x84, 0xf4, 0x9e, 0x45, 0x7c, 0xd8, 0x2d, 0x05, 0xc6, 0x55, 0x56,
+ 0xfa, 0xbb, 0xa6, 0x11, 0x4d, 0x48, 0xbe, 0x7b, 0xa7, 0xc9, 0xc6, 0xaf, 0xd1, 0xc2, 0xef, 0x14,
+ 0xdc, 0xca, 0xd3, 0x6d, 0x7a, 0x70, 0x02, 0xd3, 0xb6, 0x3d, 0xcb, 0x22, 0x57, 0xa2, 0x48, 0xb5,
+ 0x9a, 0xac, 0xa2, 0x48, 0xb7, 0xdd, 0xee, 0x7e, 0x13, 0xea, 0x4c, 0x86, 0x52, 0xb2, 0xb5, 0xb5,
+ 0xca, 0xa3, 0x4d, 0x18, 0xbc, 0x84, 0x49, 0x5b, 0x67, 0xb5, 0xc9, 0x23, 0x3d, 0x88, 0x09, 0xcf,
+ 0x59, 0x7a, 0x26, 0xf0, 0x58, 0xdf, 0xdb, 0x56, 0xda, 0xc2, 0x82, 0x3f, 0xfb, 0x30, 0xd5, 0xaf,
+ 0x08, 0xf5, 0xf8, 0xc9, 0x10, 0x73, 0x25, 0x36, 0x7a, 0x02, 0x13, 0x81, 0x78, 0xc7, 0xf3, 0x75,
+ 0xa8, 0x78, 0xbd, 0x84, 0x13, 0x3a, 0x6e, 0xc0, 0x73, 0x9e, 0x21, 0xf9, 0x14, 0x46, 0x89, 0x28,
+ 0xee, 0x30, 0xb7, 0x14, 0xc7, 0x50, 0xc0, 0x42, 0x86, 0xf0, 0x19, 0x8c, 0x33, 0xcc, 0x4c, 0x71,
+ 0xc3, 0xe8, 0x1b, 0xc6, 0xa8, 0xc6, 0x0c, 0xe5, 0x19, 0x4c, 0x32, 0xcc, 0x6e, 0x04, 0x57, 0x68,
+ 0x39, 0xae, 0x15, 0x6a, 0xc0, 0x86, 0x54, 0xb2, 0x35, 0xca, 0x50, 0x46, 0x2c, 0xcf, 0x31, 0x36,
+ 0x9f, 0x2c, 0x97, 0x8e, 0x0d, 0xb8, 0xb2, 0x18, 0x79, 0x01, 0x8f, 0x6b, 0xd2, 0x15, 0x2f, 0x4b,
+ 0x8c, 0xc3, 0x92, 0x09, 0xcc, 0x95, 0x59, 0x3e, 0x97, 0x12, 0xcb, 0xb5, 0xa9, 0x33, 0x93, 0xb9,
+ 0x2f, 0xab, 0x95, 0x14, 0xe6, 0x66, 0x0f, 0x9b, 0xb2, 0x3f, 0x5b, 0x4c, 0x93, 0xb8, 0xc8, 0x58,
+ 0x19, 0x0a, 0x94, 0x45, 0x7a, 0x6d, 0x77, 0x71, 0x42, 0xc7, 0x06, 0xa4, 0x16, 0x23, 0x1f, 0x03,
+ 0xd8, 0x4a, 0x29, 0xbb, 0xdb, 0xf8, 0x9e, 0x29, 0xe3, 0x19, 0xe4, 0x0d, 0xbb, 0xdb, 0x34, 0xe9,
+ 0xb0, 0xe4, 0x25, 0x4a, 0x1f, 0x66, 0xbd, 0x26, 0x7d, 0xa6, 0x01, 0xbd, 0xc9, 0x6d, 0x3a, 0xfc,
+ 0xbd, 0x4a, 0xa4, 0x3f, 0x32, 0x94, 0x71, 0x43, 0x39, 0xaa, 0x12, 0x19, 0xfc, 0xd3, 0x83, 0x47,
+ 0x02, 0xa5, 0x2a, 0x04, 0x6e, 0x59, 0xf5, 0xb9, 0xfd, 0xb5, 0x0c, 0xf5, 0x5a, 0x32, 0x81, 0xf6,
+ 0xbf, 0xc2, 0xa5, 0xf6, 0x6d, 0xcb, 0x1a, 0x24, 0xfb, 0xf0, 0x70, 0xbb, 0x3d, 0x51, 0x71, 0x63,
+ 0x2c, 0x73, 0xe9, 0x83, 0x6e, 0x6f, 0x96, 0xc5, 0x8d, 0xf6, 0x2d, 0x29, 0xc4, 0x55, 0x6b, 0x7e,
+ 0xed, 0x5b, 0x8d, 0x35, 0xd6, 0x36, 0x97, 0xe9, 0xd8, 0x36, 0xaa, 0x31, 0x43, 0x69, 0x2f, 0x56,
+ 0x83, 0xda, 0xb6, 0x5e, 0x7b, 0x31, 0x5a, 0x83, 0xc1, 0x2d, 0x8c, 0xba, 0xcf, 0x39, 0x04, 0x37,
+ 0xb6, 0xa3, 0xaa, 0x57, 0xe8, 0x69, 0x67, 0x85, 0xde, 0x1d, 0x52, 0x6a, 0x88, 0xe4, 0x1b, 0xd8,
+ 0xad, 0x05, 0xcc, 0x3a, 0x8c, 0x16, 0x9f, 0x74, 0xd7, 0xee, 0xfd, 0x86, 0xd1, 0x86, 0xbe, 0xff,
+ 0x6d, 0xe7, 0xeb, 0x65, 0xbf, 0x4a, 0xc4, 0x83, 0x01, 0x5d, 0xfd, 0x72, 0xba, 0x9c, 0x7e, 0xa0,
+ 0x8f, 0x47, 0xe7, 0xf4, 0x64, 0x35, 0xed, 0x91, 0x5d, 0xe8, 0xff, 0x7a, 0xb2, 0x9a, 0x3a, 0xfa,
+ 0x40, 0x8f, 0x8e, 0xa7, 0xfd, 0xfd, 0x43, 0x18, 0x36, 0x9f, 0x28, 0xb2, 0x07, 0xa0, 0xcf, 0x61,
+ 0xe7, 0x87, 0x67, 0xaf, 0xbe, 0xbf, 0x78, 0x33, 0xed, 0x91, 0x21, 0xb8, 0xa7, 0x3f, 0x9d, 0xfe,
+ 0x30, 0x75, 0xfe, 0x0d, 0x00, 0x00, 0xff, 0xff, 0x0e, 0xf3, 0x76, 0x3c, 0xfe, 0x07, 0x00, 0x00,
}
diff --git a/lxd/migration/migrate.proto b/lxd/migration/migrate.proto
index 7ae4591d52..b9bbe6243d 100644
--- a/lxd/migration/migrate.proto
+++ b/lxd/migration/migrate.proto
@@ -48,6 +48,8 @@ message Snapshot {
message rsyncFeatures {
optional bool xattrs = 1;
+ optional bool delete = 2;
+ optional bool compress = 3;
}
message MigrationHeader {
diff --git a/lxd/rsync.go b/lxd/rsync.go
index cb1b7f4e38..cb8874ac12 100644
--- a/lxd/rsync.go
+++ b/lxd/rsync.go
@@ -111,6 +111,9 @@ func rsyncSendSetup(name string, path string, bwlimit string, execPath string) (
"--partial",
"--sparse",
"--xattrs",
+ "--delete",
+ "--compress",
+ "--compress-level=2",
path,
"localhost:/tmp/foo",
"-e",
More information about the lxc-devel
mailing list