Merge pull request #496 from bergwolf/BlockdevInsertedEvent

laijs · web-flow · commit ac7c55a59867 · 2017-05-17T15:19:36.000+08:00
clean up BlockdevInsertedEvent
diff --git a/hypervisor/events.go b/hypervisor/events.go
@@ -50,10 +50,7 @@ type VolumeUnmounted struct {
 }
 
 type BlockdevInsertedEvent struct {
-	Name       string
-	SourceType string //image or volume
 	DeviceName string
-	ScsiId     int
 	ScsiAddr   string // pass scsi addr to hyperstart
 }
 
diff --git a/hypervisor/libvirt/libvirt.go b/hypervisor/libvirt/libvirt.go
@@ -907,9 +907,6 @@ func scsiId2Addr(id int) (int, int, error) {
 }
 
 func (lc *LibvirtContext) AddDisk(ctx *hypervisor.VmContext, sourceType string, blockInfo *hypervisor.DiskDescriptor, result chan<- hypervisor.VmEvent) {
-	name := blockInfo.Name
-	id := blockInfo.ScsiId
-
 	if lc.domain == nil {
 		glog.Error("Cannot find domain")
 		result <- &hypervisor.DeviceFailed{
@@ -945,12 +942,9 @@ func (lc *LibvirtContext) AddDisk(ctx *hypervisor.VmContext, sourceType string,
 		}
 		return
 	}
-	target, unit, err := scsiId2Addr(id)
+	target, unit, err := scsiId2Addr(blockInfo.ScsiId)
 	result <- &hypervisor.BlockdevInsertedEvent{
-		Name:       name,
-		SourceType: sourceType,
-		DeviceName: scsiId2Name(id),
-		ScsiId:     id,
+		DeviceName: scsiId2Name(blockInfo.ScsiId),
 		ScsiAddr:   fmt.Sprintf("%d:%d", target, unit),
 	}
 }
diff --git a/hypervisor/qemu/qemu.go b/hypervisor/qemu/qemu.go
@@ -222,7 +222,6 @@ func (qc *QemuContext) Pause(ctx *hypervisor.VmContext, pause bool) error {
 }
 
 func (qc *QemuContext) AddDisk(ctx *hypervisor.VmContext, sourceType string, blockInfo *hypervisor.DiskDescriptor, result chan<- hypervisor.VmEvent) {
-	name := blockInfo.Name
 	filename := blockInfo.Filename
 	format := blockInfo.Format
 	id := blockInfo.ScsiId
@@ -247,7 +246,7 @@ func (qc *QemuContext) AddDisk(ctx *hypervisor.VmContext, sourceType string, blo
 		}
 	}
 
-	newDiskAddSession(ctx, qc, name, sourceType, filename, format, id, result)
+	newDiskAddSession(ctx, qc, filename, format, id, result)
 }
 
 func (qc *QemuContext) RemoveDisk(ctx *hypervisor.VmContext, blockInfo *hypervisor.DiskDescriptor, callback hypervisor.VmEvent, result chan<- hypervisor.VmEvent) {
diff --git a/hypervisor/qemu/qmp_test.go b/hypervisor/qemu/qmp_test.go
@@ -2,10 +2,11 @@ package qemu
 
 import (
 	"encoding/json"
-	"github.com/hyperhq/runv/hypervisor"
 	"net"
 	"testing"
 	"time"
+
+	"github.com/hyperhq/runv/hypervisor"
 )
 
 func TestMessageParse(t *testing.T) {
@@ -261,7 +262,7 @@ func TestQmpDiskSession(t *testing.T) {
 	}
 
 	info := msg.(*hypervisor.BlockdevInsertedEvent)
-	t.Log("got block device", info.Name, info.SourceType, info.DeviceName)
+	t.Log("got block device", info.DeviceName)
 }
 
 func TestQmpFailOnce(t *testing.T) {
@@ -306,7 +307,7 @@ func TestQmpFailOnce(t *testing.T) {
 	}
 
 	info := msg.(*hypervisor.BlockdevInsertedEvent)
-	t.Log("got block device", info.Name, info.SourceType, info.DeviceName)
+	t.Log("got block device", info.DeviceName)
 }
 
 func TestQmpKeepFail(t *testing.T) {
diff --git a/hypervisor/qemu/qmp_wrapper.go b/hypervisor/qemu/qmp_wrapper.go
@@ -33,7 +33,7 @@ func defaultRespond(result chan<- hypervisor.VmEvent, callback hypervisor.VmEven
 	}
 }
 
-func newDiskAddSession(ctx *hypervisor.VmContext, qc *QemuContext, name, sourceType, filename, format string, id int, result chan<- hypervisor.VmEvent) {
+func newDiskAddSession(ctx *hypervisor.VmContext, qc *QemuContext, filename, format string, id int, result chan<- hypervisor.VmEvent) {
 	commands := make([]*QmpCommand, 2)
 	commands[0] = &QmpCommand{
 		Execute: "human-monitor-command",
@@ -53,10 +53,7 @@ func newDiskAddSession(ctx *hypervisor.VmContext, qc *QemuContext, name, sourceT
 	qc.qmp <- &QmpSession{
 		commands: commands,
 		respond: defaultRespond(result, &hypervisor.BlockdevInsertedEvent{
-			Name:       name,
-			SourceType: sourceType,
 			DeviceName: devName,
-			ScsiId:     id,
 		}),
 	}
 }
diff --git a/hypervisor/vbox/vbox.go b/hypervisor/vbox/vbox.go
@@ -279,10 +279,7 @@ func (vc *VBoxContext) AddDisk(ctx *hypervisor.VmContext, sourceType string, blo
 	}
 	devName := scsiId2Name(id)
 	callback := &hypervisor.BlockdevInsertedEvent{
-		Name:       name,
-		SourceType: sourceType,
 		DeviceName: devName,
-		ScsiId:     id,
 	}
 
 	glog.V(1).Infof("Disk %s (%s) add succeeded", name, filename)
@@ -461,10 +458,7 @@ func (vc *VBoxContext) LazyAddDisk(ctx *hypervisor.VmContext, name, sourceType,
 	}
 	devName := scsiId2Name(id)
 	callback := &hypervisor.BlockdevInsertedEvent{
-		Name:       name,
-		SourceType: sourceType,
 		DeviceName: devName,
-		ScsiId:     id,
 	}
 	vc.mediums = append(vc.mediums, medium)
 	vc.callbacks = append(vc.callbacks, callback)
diff --git a/hypervisor/xen/xen.go b/hypervisor/xen/xen.go
@@ -218,12 +218,11 @@ func (xc *XenContext) Stats(ctx *hypervisor.VmContext) (*types.PodStats, error)
 func (xc *XenContext) Close() {}
 
 func (xc *XenContext) AddDisk(ctx *hypervisor.VmContext, sourceType string, blockInfo *hypervisor.DiskDescriptor, result chan<- hypervisor.VmEvent) {
-	name := blockInfo.Name
 	filename := blockInfo.Filename
 	format := blockInfo.Format
 	id := blockInfo.ScsiId
 
-	go diskRoutine(true, xc, ctx, name, sourceType, filename, format, id, nil, result)
+	go diskRoutine(true, xc, ctx, sourceType, filename, format, id, nil, result)
 }
 
 func (xc *XenContext) RemoveDisk(ctx *hypervisor.VmContext, blockInfo *hypervisor.DiskDescriptor, callback hypervisor.VmEvent, result chan<- hypervisor.VmEvent) {
@@ -305,7 +304,7 @@ func (xd *XenDriver) SupportVmSocket() bool {
 }
 
 func diskRoutine(add bool, xc *XenContext, ctx *hypervisor.VmContext,
-	name, sourceType, filename, format string, id int, callback hypervisor.VmEvent, result chan<- hypervisor.VmEvent) {
+	sourceType, filename, format string, id int, callback hypervisor.VmEvent, result chan<- hypervisor.VmEvent) {
 	backend := LIBXL_DISK_BACKEND_TAP
 	if strings.HasPrefix(filename, "/dev/") {
 		backend = LIBXL_DISK_BACKEND_PHY
@@ -321,10 +320,7 @@ func diskRoutine(add bool, xc *XenContext, ctx *hypervisor.VmContext,
 	if add {
 		res = HyperxlDiskAdd(xc.driver.Ctx, uint32(xc.domId), filename, devName, LibxlDiskBackend(backend), LibxlDiskFormat(dfmt))
 		callback = &hypervisor.BlockdevInsertedEvent{
-			Name:       name,
-			SourceType: sourceType,
 			DeviceName: devName,
-			ScsiId:     id,
 		}
 	} else {
 		op = "remove"

Original file line number	Diff line number	Diff line change
`@@ -50,10 +50,7 @@ type VolumeUnmounted struct {`
`50`	`50`	`}`
`51`	`51`
`52`	`52`	`type BlockdevInsertedEvent struct {`
`53`		`- Name string`
`54`		`- SourceType string //image or volume`
`55`	`53`	`DeviceName string`
`56`		`- ScsiId int`
`57`	`54`	`ScsiAddr string // pass scsi addr to hyperstart`
`58`	`55`	`}`
`59`	`56`
Original file line number	Diff line number	Diff line change
`@@ -907,9 +907,6 @@ func scsiId2Addr(id int) (int, int, error) {`
`907`	`907`	`}`
`908`	`908`
`909`	`909`	`func (lc LibvirtContext) AddDisk(ctx hypervisor.VmContext, sourceType string, blockInfo *hypervisor.DiskDescriptor, result chan<- hypervisor.VmEvent) {`
`910`		`- name := blockInfo.Name`
`911`		`- id := blockInfo.ScsiId`
`912`		`-`
`913`	`910`	`if lc.domain == nil {`
`914`	`911`	`glog.Error("Cannot find domain")`
`915`	`912`	`result <- &hypervisor.DeviceFailed{`
`@@ -945,12 +942,9 @@ func (lc LibvirtContext) AddDisk(ctx hypervisor.VmContext, sourceType string,`
`945`	`942`	`}`
`946`	`943`	`return`
`947`	`944`	`}`
`948`		`- target, unit, err := scsiId2Addr(id)`
	`945`	`+ target, unit, err := scsiId2Addr(blockInfo.ScsiId)`
`949`	`946`	`result <- &hypervisor.BlockdevInsertedEvent{`
`950`		`- Name: name,`
`951`		`- SourceType: sourceType,`
`952`		`- DeviceName: scsiId2Name(id),`
`953`		`- ScsiId: id,`
	`947`	`+ DeviceName: scsiId2Name(blockInfo.ScsiId),`
`954`	`948`	`ScsiAddr: fmt.Sprintf("%d:%d", target, unit),`
`955`	`949`	`}`
`956`	`950`	`}`
Original file line number	Diff line number	Diff line change
`@@ -222,7 +222,6 @@ func (qc QemuContext) Pause(ctx hypervisor.VmContext, pause bool) error {`
`222`	`222`	`}`
`223`	`223`
`224`	`224`	`func (qc QemuContext) AddDisk(ctx hypervisor.VmContext, sourceType string, blockInfo *hypervisor.DiskDescriptor, result chan<- hypervisor.VmEvent) {`
`225`		`- name := blockInfo.Name`
`226`	`225`	`filename := blockInfo.Filename`
`227`	`226`	`format := blockInfo.Format`
`228`	`227`	`id := blockInfo.ScsiId`
`@@ -247,7 +246,7 @@ func (qc QemuContext) AddDisk(ctx hypervisor.VmContext, sourceType string, blo`
`247`	`246`	`}`
`248`	`247`	`}`
`249`	`248`
`250`		`- newDiskAddSession(ctx, qc, name, sourceType, filename, format, id, result)`
	`249`	`+ newDiskAddSession(ctx, qc, filename, format, id, result)`
`251`	`250`	`}`
`252`	`251`
`253`	`252`	`func (qc QemuContext) RemoveDisk(ctx hypervisor.VmContext, blockInfo *hypervisor.DiskDescriptor, callback hypervisor.VmEvent, result chan<- hypervisor.VmEvent) {`
Original file line number	Diff line number	Diff line change
`@@ -2,10 +2,11 @@ package qemu`
`2`	`2`
`3`	`3`	`import (`
`4`	`4`	`"encoding/json"`
`5`		`- "github.com/hyperhq/runv/hypervisor"`
`6`	`5`	`"net"`
`7`	`6`	`"testing"`
`8`	`7`	`"time"`
	`8`	`+`
	`9`	`+ "github.com/hyperhq/runv/hypervisor"`
`9`	`10`	`)`
`10`	`11`
`11`	`12`	`func TestMessageParse(t *testing.T) {`
`@@ -261,7 +262,7 @@ func TestQmpDiskSession(t *testing.T) {`
`261`	`262`	`}`
`262`	`263`
`263`	`264`	`info := msg.(*hypervisor.BlockdevInsertedEvent)`
`264`		`- t.Log("got block device", info.Name, info.SourceType, info.DeviceName)`
	`265`	`+ t.Log("got block device", info.DeviceName)`
`265`	`266`	`}`
`266`	`267`
`267`	`268`	`func TestQmpFailOnce(t *testing.T) {`
`@@ -306,7 +307,7 @@ func TestQmpFailOnce(t *testing.T) {`
`306`	`307`	`}`
`307`	`308`
`308`	`309`	`info := msg.(*hypervisor.BlockdevInsertedEvent)`
`309`		`- t.Log("got block device", info.Name, info.SourceType, info.DeviceName)`
	`310`	`+ t.Log("got block device", info.DeviceName)`
`310`	`311`	`}`
`311`	`312`
`312`	`313`	`func TestQmpKeepFail(t *testing.T) {`
Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@ func defaultRespond(result chan<- hypervisor.VmEvent, callback hypervisor.VmEven`
`33`	`33`	`}`
`34`	`34`	`}`
`35`	`35`
`36`		`-func newDiskAddSession(ctx hypervisor.VmContext, qc QemuContext, name, sourceType, filename, format string, id int, result chan<- hypervisor.VmEvent) {`
	`36`	`+func newDiskAddSession(ctx hypervisor.VmContext, qc QemuContext, filename, format string, id int, result chan<- hypervisor.VmEvent) {`
`37`	`37`	`commands := make([]*QmpCommand, 2)`
`38`	`38`	`commands[0] = &QmpCommand{`
`39`	`39`	`Execute: "human-monitor-command",`
`@@ -53,10 +53,7 @@ func newDiskAddSession(ctx hypervisor.VmContext, qc QemuContext, name, sourceT`
`53`	`53`	`qc.qmp <- &QmpSession{`
`54`	`54`	`commands: commands,`
`55`	`55`	`respond: defaultRespond(result, &hypervisor.BlockdevInsertedEvent{`
`56`		`- Name: name,`
`57`		`- SourceType: sourceType,`
`58`	`56`	`DeviceName: devName,`
`59`		`- ScsiId: id,`
`60`	`57`	`}),`
`61`	`58`	`}`
`62`	`59`	`}`
Original file line number	Diff line number	Diff line change
`@@ -279,10 +279,7 @@ func (vc VBoxContext) AddDisk(ctx hypervisor.VmContext, sourceType string, blo`
`279`	`279`	`}`
`280`	`280`	`devName := scsiId2Name(id)`
`281`	`281`	`callback := &hypervisor.BlockdevInsertedEvent{`
`282`		`- Name: name,`
`283`		`- SourceType: sourceType,`
`284`	`282`	`DeviceName: devName,`
`285`		`- ScsiId: id,`
`286`	`283`	`}`
`287`	`284`
`288`	`285`	`glog.V(1).Infof("Disk %s (%s) add succeeded", name, filename)`
`@@ -461,10 +458,7 @@ func (vc VBoxContext) LazyAddDisk(ctx hypervisor.VmContext, name, sourceType,`
`461`	`458`	`}`
`462`	`459`	`devName := scsiId2Name(id)`
`463`	`460`	`callback := &hypervisor.BlockdevInsertedEvent{`
`464`		`- Name: name,`
`465`		`- SourceType: sourceType,`
`466`	`461`	`DeviceName: devName,`
`467`		`- ScsiId: id,`
`468`	`462`	`}`
`469`	`463`	`vc.mediums = append(vc.mediums, medium)`
`470`	`464`	`vc.callbacks = append(vc.callbacks, callback)`