Merge pull request #559 from rgooch/master

Leave source VM in original state and new VM stopped when copying VM.

cmd/vm-control/copyVm.go

@@ -84,24 +84,17 @@ func copyVmFromHypervisor(sourceHypervisorAddress string, vmIP net.IP,
 	defer destHypervisor.Close()
 	request := hyper_proto.CopyVmRequest{
 		AccessToken:      accessToken,
-		DhcpTimeout:      *dhcpTimeout,
 		IpAddress:        vmIP,
 		SourceHypervisor: sourceHypervisorAddress,
 	}
 	var reply hyper_proto.CopyVmResponse
+	logger.Debugf(0, "copying VM to %s\n", destHypervisorAddress)
 	if err := callCopyVm(destHypervisor, request, &reply, logger); err != nil {
 		return err
 	}
 	if err := acknowledgeVm(destHypervisor, reply.IpAddress); err != nil {
 		return fmt.Errorf("error acknowledging VM: %s", err)
 	}
 	fmt.Println(reply.IpAddress)
-	if reply.DhcpTimedOut {
-		return errors.New("DHCP ACK timed out")
-	}
-	if *dhcpTimeout > 0 {
-		logger.Debugln(0, "Received DHCP ACK")
-	}
-	return maybeWatchVm(destHypervisor, destHypervisorAddress, reply.IpAddress,
-		logger)
+	return nil
 }

cmd/vm-control/migrateVm.go

@@ -71,6 +71,7 @@ func migrateVmFromHypervisor(sourceHypervisorAddress string, vmIP net.IP,
 		return err
 	}
 	defer destHypervisor.Close()
+	logger.Debugf(0, "migrating VM to %s\n", destHypervisorAddress)
 	conn, err := destHypervisor.Call("Hypervisor.MigrateVm")
 	if err != nil {
 		return err

hypervisor/manager/vm.go

@@ -346,15 +346,18 @@ func (m *Manager) copyVm(conn *srpc.Conn, request proto.CopyVmRequest,
 	if err != nil {
 		return err
 	}
+	switch getInfoReply.VmInfo.State {
+	case proto.StateStopped, proto.StateRunning:
+	default:
+		return errors.New("VM is not stopped or running")
+	}
 	accessToken := request.AccessToken
 	vmInfo := getInfoReply.VmInfo
 	vmInfo.Address = proto.Address{}
 	vmInfo.SecondaryAddresses = nil
 	vmInfo.Uncommitted = false
-	vm, err := m.allocateVm(proto.CreateVmRequest{
-		DhcpTimeout: request.DhcpTimeout,
-		VmInfo:      vmInfo,
-	}, conn.GetAuthInformation())
+	vm, err := m.allocateVm(proto.CreateVmRequest{VmInfo: vmInfo},
+		conn.GetAuthInformation())
 	vm.OwnerUsers = getInfoReply.VmInfo.OwnerUsers
 	vm.Volumes = vmInfo.Volumes
 	if err := <-tryAllocateMemory(vmInfo.MemoryInMiB); err != nil {
@@ -376,9 +379,6 @@ func (m *Manager) copyVm(conn *srpc.Conn, request proto.CopyVmRequest,
 			return
 		}
 		vm.cleanup()
-		if getInfoReply.VmInfo.State == proto.StateRunning {
-			hyperclient.StartVm(hypervisor, request.IpAddress, accessToken)
-		}
 	}()
 	vm.ownerUsers = make(map[string]struct{}, len(vm.OwnerUsers))
 	for _, username := range vm.OwnerUsers {
@@ -406,6 +406,7 @@ func (m *Manager) copyVm(conn *srpc.Conn, request proto.CopyVmRequest,
 		if err != nil {
 			return err
 		}
+		defer hyperclient.StartVm(hypervisor, request.IpAddress, accessToken)
 		err = sendVmCopyMessage(conn, encoder, "update volume(s)")
 		if err != nil {
 			return err
@@ -420,18 +421,11 @@ func (m *Manager) copyVm(conn *srpc.Conn, request proto.CopyVmRequest,
 	if err != nil {
 		return err
 	}
-	if err := sendVmCopyMessage(conn, encoder, "starting VM"); err != nil {
-		return err
-	}
-	dhcpTimedOut, err := vm.startManaging(request.DhcpTimeout, false)
-	if err != nil {
-		return err
-	}
+	vm.setState(proto.StateStopped)
 	vm.destroyTimer = time.AfterFunc(time.Second*15, vm.autoDestroy)
 	response := proto.CopyVmResponse{
-		DhcpTimedOut: dhcpTimedOut,
-		Final:        true,
-		IpAddress:    vm.Address.IpAddress,
+		Final:     true,
+		IpAddress: vm.Address.IpAddress,
 	}
 	if err := encoder.Encode(response); err != nil {
 		return err

lib/fsutil/api.go

@@ -5,11 +5,19 @@ import (
 	"hash"
 	"io"
 	"os"
+	"syscall"
 	"time"
 
 	"github.com/Symantec/Dominator/lib/log"
 )
 
+const (
+	DirPerms = syscall.S_IRWXU | syscall.S_IRGRP | syscall.S_IXGRP |
+		syscall.S_IROTH | syscall.S_IXOTH
+	PrivateFilePerms = syscall.S_IRUSR | syscall.S_IWUSR
+	PublicFilePerms  = PrivateFilePerms | syscall.S_IRGRP | syscall.S_IROTH
+)
+
 var (
 	ErrorChecksumMismatch = errors.New("checksum mismatch")
 )

proto/hypervisor/messages.go

@@ -97,13 +97,11 @@ type CommitImportedVmResponse struct {
 
 type CopyVmRequest struct {
 	AccessToken      []byte
-	DhcpTimeout      time.Duration
 	IpAddress        net.IP
 	SourceHypervisor string
 }
 
 type CopyVmResponse struct { // Multiple responses are sent.
-	DhcpTimedOut    bool
 	Error           string
 	Final           bool // If true, this is the final response.
 	IpAddress       net.IP