# feat: Support hot-update for VPC guest bandwidth and improve cross-…

pkg/cloudproxy/agent/worker/worker.go

@@ -16,13 +16,12 @@ package worker
 
 import (
 	"context"
+	"net"
 	"runtime"
 	"runtime/debug"
 	"sync"
 	"time"
 
-	"github.com/vishvananda/netlink"
-
 	"yunion.io/x/log"
 	"yunion.io/x/pkg/errors"
 	"yunion.io/x/pkg/util/version"
@@ -99,14 +98,15 @@ func (w *Worker) initProxyAgent_(ctx context.Context) error {
 	}
 
 	bindAddrExist := func(addr string) bool {
-		as, err := netlink.AddrList(nil, netlink.FAMILY_ALL)
+		addrs, err := net.InterfaceAddrs()
 		if err != nil {
 			log.Fatalf("list system available addresses: %v", err)
 		}
-		for _, a := range as {
-			ipstr := a.IPNet.IP.String()
-			if addr == ipstr {
-				return true
+		for _, a := range addrs {
+			if ipnet, ok := a.(*net.IPNet); ok {
+				if addr == ipnet.IP.String() {
+					return true
+				}
 			}
 		}
 		return false

pkg/hostimage/nbd.go

@@ -122,7 +122,7 @@ func (m *SNbdExportManager) QemuNbdStartExport(imageInfo qemuimg.SImageInfo, dis
 	cmdStr := strings.Join(cmd, " ")
 	err = procutils.NewRemoteCommandAsFarAsPossible("sh", "-c", cmdStr).Run()
 	if err != nil {
-		log.Errorf("qemu-nbd connect failed %s %s", err.Error())
+		log.Errorf("qemu-nbd connect failed %s %s", cmdStr, err.Error())
 		return -1, errors.Wrapf(err, "qemu-nbd connect failed")
 	}
 	return nbdPort, nil

pkg/hostman/container/snapshot_service/interfaces.go

@@ -0,0 +1,9 @@
+package snapshot_service
+
+type IGuestManager interface {
+	GetContainerManager(serverId string) (ISnapshotContainerManager, error)
+}
+
+type ISnapshotContainerManager interface {
+	GetRootFsMountPath(containerId string) (string, error)
+}

pkg/hostman/container/snapshot_service/snapshot_service.go → pkg/hostman/container/snapshot_service/snapshot_service_linux.go

@@ -1,3 +1,6 @@
+//go:build linux
+// +build linux
+
 package snapshot_service
 
 import (
@@ -38,14 +41,6 @@ func StartService(guestMan IGuestManager, root string) error {
 	return rpc.Serve(listener)
 }
 
-type IGuestManager interface {
-	GetContainerManager(serverId string) (ISnapshotContainerManager, error)
-}
-
-type ISnapshotContainerManager interface {
-	GetRootFsMountPath(containerId string) (string, error)
-}
-
 func NewSnapshotter(guestMan IGuestManager, root string, opts ...overlay.Opt) (snapshots.Snapshotter, error) {
 	sn, err := overlay.NewSnapshotter(root, opts...)
 	if err != nil {

pkg/hostman/container/snapshot_service/snapshot_service_others.go

@@ -0,0 +1,12 @@
+//go:build !linux
+// +build !linux
+
+package snapshot_service
+
+import (
+	"yunion.io/x/pkg/errors"
+)
+
+func StartService(guestMan IGuestManager, root string) error {
+	return errors.ErrNotImplemented
+}

pkg/hostman/guestman/qemu-kvm.go

@@ -2561,21 +2561,31 @@ func (s *SKVMGuestInstance) onNicChange(oldNic, newNic *desc.SGuestNetwork) erro
 		} else {
 			// bridge not changed
 			if oldifname == newifname {
-				if newvlan > 1 {
-					output, err := procutils.NewRemoteCommandAsFarAsPossible("ovs-vsctl", "set", "port", newifname, fmt.Sprintf("tag=%d", newvlan)).Output()
-					if err != nil {
-						return errors.Wrapf(err, "NewRemoteCommandAsFarAsPossible change vlan tag to %d: %s", newvlan, output)
+				if oldNic.Bw != newNic.Bw {
+					log.Infof("Nic %s bw changed %d -> %d", newNic.Mac, oldNic.Bw, newNic.Bw)
+					if err := s.generateNicScripts(newNic); err != nil {
+						return errors.Wrap(err, "generateNicScripts update bandwidth")
 					}
-				} else {
-					// clear vlan
-					output, err := procutils.NewRemoteCommandAsFarAsPossible("ovs-vsctl", "get", "port", newifname, "tag").Output()
-					if err != nil {
-						return errors.Wrapf(err, "NewRemoteCommandAsFarAsPossible get vlan tag: %s", output)
+					if err := s.SetNicUp(newNic); err != nil {
+						return errors.Wrap(err, "SetNicUp update bandwidth")
 					}
-					tagStr := strings.TrimSpace(string(output))
-					if tag, err := strconv.Atoi(tagStr); err == nil && tag > 1 {
-						if output, err := procutils.NewRemoteCommandAsFarAsPossible("ovs-vsctl", "remove", "port", newifname, "tag", tagStr).Output(); err != nil {
-							return errors.Wrapf(err, "NewRemoteCommandAsFarAsPossible remove vlan tag %s: %s", tagStr, output)
+				} else {
+					if newvlan > 1 {
+						output, err := procutils.NewRemoteCommandAsFarAsPossible("ovs-vsctl", "set", "port", newifname, fmt.Sprintf("tag=%d", newvlan)).Output()
+						if err != nil {
+							return errors.Wrapf(err, "NewRemoteCommandAsFarAsPossible change vlan tag to %d: %s", newvlan, output)
+						}
+					} else {
+						// clear vlan
+						output, err := procutils.NewRemoteCommandAsFarAsPossible("ovs-vsctl", "get", "port", newifname, "tag").Output()
+						if err != nil {
+							return errors.Wrapf(err, "NewRemoteCommandAsFarAsPossible get vlan tag: %s", output)
+						}
+						tagStr := strings.TrimSpace(string(output))
+						if tag, err := strconv.Atoi(tagStr); err == nil && tag > 1 {
+							if output, err := procutils.NewRemoteCommandAsFarAsPossible("ovs-vsctl", "remove", "port", newifname, "tag", tagStr).Output(); err != nil {
+								return errors.Wrapf(err, "NewRemoteCommandAsFarAsPossible remove vlan tag %s: %s", tagStr, output)
+							}
 						}
 					}
 				}

pkg/hostman/storageman/imagecache_local.go

@@ -137,8 +137,9 @@ func (l *SLocalImageCache) Load() error {
 			if fi != nil {
 				desc.SizeMb = fi.Size() / 1024 / 1024
 				if fi.Sys() != nil {
-					atime := fi.Sys().(*syscall.Stat_t).Atim
-					desc.AccessAt = time.Unix(atime.Sec, atime.Nsec)
+					if stat, ok := fi.Sys().(*syscall.Stat_t); ok {
+						desc.AccessAt = fileutils2.GetAtim(stat)
+					}
 				}
 			}
 

pkg/hostman/storageman/remotefile/remotefile.go

@@ -121,8 +121,9 @@ func (r *SRemoteFile) GetInfo() (*SImageDesc, error) {
 
 	var atime time.Time
 	if fi.Sys() != nil {
-		atm := fi.Sys().(*syscall.Stat_t).Atim
-		atime = time.Unix(atm.Sec, atm.Nsec)
+		if stat, ok := fi.Sys().(*syscall.Stat_t); ok {
+			atime = fileutils2.GetAtim(stat)
+		}
 	}
 
 	return &SImageDesc{

pkg/util/cgrouputils/cgroupv1/cpuutils.go

@@ -1,3 +1,6 @@
+//go:build linux
+// +build linux
+
 // Copyright 2019 Yunion
 //
 // Licensed under the Apache License, Version 2.0 (the "License");

pkg/util/cgrouputils/cgroupv1/cpuutils_test.go

@@ -1,3 +1,6 @@
+//go:build linux
+// +build linux
+
 // Copyright 2019 Yunion
 //
 // Licensed under the Apache License, Version 2.0 (the "License");

pkg/util/cgrouputils/cgroupv1/doc.go

@@ -1,3 +1,6 @@
+//go:build linux
+// +build linux
+
 // Copyright 2019 Yunion
 //
 // Licensed under the Apache License, Version 2.0 (the "License");

pkg/util/cgrouputils/cgroupv1/manager.go

@@ -1,3 +1,6 @@
+//go:build linux
+// +build linux
+
 // Copyright 2019 Yunion
 //
 // Licensed under the Apache License, Version 2.0 (the "License");

pkg/util/cgrouputils/manager.go

@@ -15,6 +15,7 @@
 package cgrouputils
 
 import (
+	"runtime"
 	"strings"
 
 	"yunion.io/x/pkg/errors"
@@ -89,29 +90,41 @@ func Init(ioScheduler string) error {
 		return nil
 	}
 
-	cgroupPath := ""
-	if fileutils2.Exists(CGROUP_PATH_SYSFS) {
-		cgroupPath = CGROUP_PATH_SYSFS
-	} else if fileutils2.Exists("CGROUP_PATH_ROOT") {
-		cgroupPath = CGROUP_PATH_ROOT
-	}
-	if cgroupPath == "" {
-		return errors.Errorf("Can't detect cgroup path")
-	}
-	output, err := procutils.NewCommand("stat", "-fc", "%T", cgroupPath).Output()
-	if err != nil {
-		return errors.Wrapf(err, "stat cgroup path %s", cgroupPath)
-	}
-	cgroupfs := strings.TrimSpace(string(output))
-	if cgroupfs == "cgroup2fs" {
-		// cgroup v2
-		cgroupManager, err = cgroupv2.Init(cgroupPath, ioScheduler)
+	if runtime.GOOS == "linux" {
+		var cgroupPath string
+		if fileutils2.Exists(CGROUP_PATH_SYSFS) {
+			cgroupPath = CGROUP_PATH_SYSFS
+		} else if fileutils2.Exists("CGROUP_PATH_ROOT") {
+			cgroupPath = CGROUP_PATH_ROOT
+		}
+		if cgroupPath == "" {
+			return errors.Errorf("Can't detect cgroup path")
+		}
+
+		output, err := procutils.NewCommand("stat", "-fc", "%T", cgroupPath).Output()
+		if err != nil {
+			return errors.Wrapf(err, "stat cgroup path %s", cgroupPath)
+		}
+		cgroupfs := strings.TrimSpace(string(output))
+		var mgr ICgroupManager
+		if cgroupfs == "cgroup2fs" {
+			// cgroup v2
+			mgr, err = cgroupv2.Init(cgroupPath, ioScheduler)
+		} else {
+			// cgroup v1
+			mgr, err = cgroupv1.Init(cgroupPath, ioScheduler)
+		}
+		if err != nil {
+			return errors.Wrap(err, "init cgroup")
+		}
+		cgroupManager = mgr
 	} else {
-		// cgroup v1
-		cgroupManager, err = cgroupv1.Init(cgroupPath, ioScheduler)
-	}
-	if err != nil {
-		return errors.Wrap(err, "init cgroup")
+		// fallback for non-linux
+		mgr, err := cgroupv1.Init("", ioScheduler)
+		if err != nil {
+			return errors.Wrap(err, "init cgroup stub")
+		}
+		cgroupManager = mgr
 	}
 	return nil
 }

pkg/util/fileutils2/fileutils_darwin.go

@@ -0,0 +1,13 @@
+//go:build !linux
+// +build !linux
+
+package fileutils2
+
+import (
+	"syscall"
+	"time"
+)
+
+func GetAtim(stat *syscall.Stat_t) time.Time {
+	return time.Unix(stat.Atimespec.Sec, stat.Atimespec.Nsec)
+}

pkg/util/fileutils2/fileutils_linux.go

@@ -0,0 +1,13 @@
+//go:build linux
+// +build linux
+
+package fileutils2
+
+import (
+	"syscall"
+	"time"
+)
+
+func GetAtim(stat *syscall.Stat_t) time.Time {
+	return time.Unix(stat.Atim.Sec, stat.Atim.Nsec)
+}

pkg/util/iproute2/address_linux.go

@@ -1,3 +1,6 @@
+//go:build linux
+// +build linux
+
 // Copyright 2019 Yunion
 //
 // Licensed under the Apache License, Version 2.0 (the "License");

pkg/util/iproute2/address_others.go

@@ -83,3 +83,17 @@ func (address *Address) Add() *Address {
 	}
 	return address
 }
+
+func (address *Address) Del() *Address {
+	link, ok := address.link()
+	if !ok {
+		return address
+	}
+	for _, addr := range address.addrs {
+		err := netlink.AddrDel(link, addr)
+		if err != nil {
+			address.addErr(err, "Del: AddrDel %s ", addr)
+		}
+	}
+	return address
+}

pkg/util/iproute2/address_test.go

@@ -1,3 +1,6 @@
+//go:build linux
+// +build linux
+
 // Copyright 2019 Yunion
 //
 // Licensed under the Apache License, Version 2.0 (the "License");

pkg/util/iproute2/link_test.go

@@ -1,3 +1,6 @@
+//go:build linux
+// +build linux
+
 // Copyright 2019 Yunion
 //
 // Licensed under the Apache License, Version 2.0 (the "License");

pkg/util/netutils2/netutils_others.go

@@ -1,3 +1,6 @@
+//go:build !linux
+// +build !linux
+
 // Copyright 2019 Yunion
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
@@ -12,9 +15,6 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-//go:build !linux
-// +build !linux
-
 package netutils2
 
 import (
@@ -42,6 +42,10 @@ func (n *SNetInterface) ClearAddrs() error {
 	return nil
 }
 
+func (n *SNetInterface) FlushAddrs() error {
+	return nil
+}
+
 func DefaultSrcIpDev() (srcIp net.IP, ifname string, err error) {
 	err = errors.ErrNotImplemented
 	return

pkg/util/netutils2/netutils_test.go

@@ -17,6 +17,7 @@ package netutils2
 import (
 	"os"
 	"reflect"
+	"runtime"
 	"testing"
 
 	"yunion.io/x/jsonutils"
@@ -97,6 +98,9 @@ func TestNewNetInterface(t *testing.T) {
 }
 
 func TestMyDefault(t *testing.T) {
+	if runtime.GOOS != "linux" {
+		t.Skip("DefaultSrcIpDev not implemented on non-linux")
+	}
 	myip, err := MyIP()
 	if err != nil {
 		// Skip if it's no route to host

pkg/util/pod/cadvisor/cadvisor.go

@@ -1,3 +1,6 @@
+//go:build linux
+// +build linux
+
 // Copyright 2019 Yunion
 //
 // Licensed under the Apache License, Version 2.0 (the "License");

pkg/util/pod/cadvisor/cadvisor_others.go

@@ -0,0 +1,12 @@
+//go:build !linux
+// +build !linux
+
+package cadvisor
+
+import (
+	"yunion.io/x/pkg/errors"
+)
+
+func New(imageFsInfoProvider ImageFsInfoProvider, rootPath string, cgroupRoots []string) (Interface, error) {
+	return nil, errors.ErrNotImplemented
+}

pkg/util/pod/cadvisor/doc.go

@@ -1,3 +1,6 @@
+//go:build linux
+// +build linux
+
 // Copyright 2019 Yunion
 //
 // Licensed under the Apache License, Version 2.0 (the "License");