← Back to branch summary

~juju-qa/ubuntu/xenial/juju/xenial-2.0-beta3

« back to all changes in this revision

Viewing changes to src/github.com/lxc/lxd/lxd/storage_lvm.go

  • Committer: Martin Packman
  • Date: 2016-03-30 19:31:08 UTC
  • mfrom: (1.1.41)
  • Revision ID: martin.packman@canonical.com-20160330193108-h9iz3ak334uk0z5r
Merge new upstream source 2.0~beta3

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/github.com/lxc/lxd/lxd/storage_lvm.go
952
952
                }
953
953
        }
954
954
 
 
955
        lvSize := os.Getenv("LXD_LVM_LVSIZE")
 
956
        if lvSize == "" {
 
957
                lvSize = storageLvmDefaultThinLVSize
 
958
        }
 
959
 
955
960
        output, err := s.tryExec(
956
961
                "lvcreate",
957
962
                "--thin",
958
963
                "-n", lvname,
959
 
                "--virtualsize", storageLvmDefaultThinLVSize,
 
964
                "--virtualsize", lvSize,
960
965
                fmt.Sprintf("%s/%s", s.vgName, poolname))
961
966
 
962
967
        if err != nil {
1056
1061
        return MigrationFSType_RSYNC
1057
1062
}
1058
1063
 
1059
 
func (s *storageLvm) MigrationSource(container container) ([]MigrationStorageSource, error) {
 
1064
func (s *storageLvm) MigrationSource(container container) (MigrationStorageSourceDriver, error) {
1060
1065
        return rsyncMigrationSource(container)
1061
1066
}
1062
1067
 
1063
 
func (s *storageLvm) MigrationSink(container container, snapshots []container, conn *websocket.Conn) error {
1064
 
        return rsyncMigrationSink(container, snapshots, conn)
 
1068
func (s *storageLvm) MigrationSink(live bool, container container, snapshots []container, conn *websocket.Conn) error {
 
1069
        return rsyncMigrationSink(live, container, snapshots, conn)
1065
1070
}