projecteru2 · CMGS · Oct 10, 2022 · Oct 10, 2022 · Oct 10, 2022 · Oct 10, 2022
diff --git a/cluster/calcium/calcium_test.go b/cluster/calcium/calcium_test.go
@@ -42,6 +42,7 @@ func NewTestCluster() *Calcium {
 		WALFile:             filepath.Join(walDir, "core.wal.log"),
 		MaxConcurrency:      100000,
 		HAKeepaliveInterval: 16 * time.Second,
+		ProbeTarget:         "8.8.8.8:80",
 	}
 	c.store = &storemocks.Store{}
 	c.source = &sourcemocks.Source{}

diff --git a/cluster/calcium/service.go b/cluster/calcium/service.go
@@ -24,7 +24,7 @@ func (c *Calcium) WatchServiceStatus(ctx context.Context) (<-chan types.ServiceS
 
 // RegisterService writes self service address in store
 func (c *Calcium) RegisterService(ctx context.Context) (unregister func(), err error) {
-	serviceAddress, err := utils.GetOutboundAddress(c.config.Bind)
+	serviceAddress, err := utils.GetOutboundAddress(c.config.Bind, c.config.ProbeTarget)
 	if err != nil {
 		log.Errorf(ctx, "[RegisterService] failed to get outbound address: %v", err)
 		return

diff --git a/core.yaml.sample b/core.yaml.sample
@@ -10,6 +10,7 @@ cert_path: "/etc/eru/tls"                                               # option
 max_concurrency: 100000                                                 # optional, default 100000 for pool size
 store: etcd                                                             # optional, default etcd can choose redis
 sentry_dsn: "https://[email protected]/0"            # optional
+probe_target: "8.8.8.8:80"                                              # optional
 
 wal_file: core.wal                                                      # required, default core.wal
 wal_open_timeout: 8s                                                    # required, default 8s

diff --git a/engine/docker/container.go b/engine/docker/container.go
@@ -13,17 +13,17 @@ import (
 	"strings"
 	"time"
 
-	"github.com/projecteru2/core/engine"
-	enginetypes "github.com/projecteru2/core/engine/types"
-	"github.com/projecteru2/core/log"
-	coretypes "github.com/projecteru2/core/types"
-
 	dockertypes "github.com/docker/docker/api/types"
 	dockercontainer "github.com/docker/docker/api/types/container"
 	dockernetwork "github.com/docker/docker/api/types/network"
 	dockerslice "github.com/docker/docker/api/types/strslice"
 	"github.com/docker/go-connections/nat"
 	"github.com/docker/go-units"
+
+	"github.com/projecteru2/core/engine"
+	enginetypes "github.com/projecteru2/core/engine/types"
+	"github.com/projecteru2/core/log"
+	coretypes "github.com/projecteru2/core/types"
 )
 
 const (

diff --git a/engine/docker/docker.go b/engine/docker/docker.go
@@ -5,13 +5,13 @@ import (
 	"net/http"
 	"strings"
 
+	dockerapi "github.com/docker/docker/client"
+
 	"github.com/projecteru2/core/engine"
 	enginetypes "github.com/projecteru2/core/engine/types"
 	"github.com/projecteru2/core/log"
 	coretypes "github.com/projecteru2/core/types"
 	"github.com/projecteru2/core/utils"
-
-	dockerapi "github.com/docker/docker/client"
 )
 
 const (

diff --git a/engine/docker/exec.go b/engine/docker/exec.go
@@ -4,11 +4,11 @@ import (
 	"context"
 	"io"
 
-	enginetypes "github.com/projecteru2/core/engine/types"
-	"github.com/projecteru2/core/log"
-
 	dockertypes "github.com/docker/docker/api/types"
 	"github.com/docker/docker/pkg/stdcopy"
+
+	enginetypes "github.com/projecteru2/core/engine/types"
+	"github.com/projecteru2/core/log"
 )
 
 // ExecCreate create a exec

diff --git a/engine/docker/helper.go b/engine/docker/helper.go
@@ -16,14 +16,6 @@ import (
 	"strings"
 	"text/template"
 
-	corecluster "github.com/projecteru2/core/cluster"
-	"github.com/projecteru2/core/engine"
-	enginetypes "github.com/projecteru2/core/engine/types"
-	"github.com/projecteru2/core/log"
-	"github.com/projecteru2/core/types"
-	coretypes "github.com/projecteru2/core/types"
-	"github.com/projecteru2/core/utils"
-
 	"github.com/docker/distribution/reference"
 	dockertypes "github.com/docker/docker/api/types"
 	"github.com/docker/docker/api/types/blkiodev"
@@ -33,6 +25,14 @@ import (
 	"github.com/docker/docker/pkg/stdcopy"
 	"github.com/docker/docker/registry"
 	"github.com/docker/go-units"
+
+	corecluster "github.com/projecteru2/core/cluster"
+	"github.com/projecteru2/core/engine"
+	enginetypes "github.com/projecteru2/core/engine/types"
+	"github.com/projecteru2/core/log"
+	"github.com/projecteru2/core/types"
+	coretypes "github.com/projecteru2/core/types"
+	"github.com/projecteru2/core/utils"
 )
 
 type fuckDockerStream struct {
@@ -101,7 +101,7 @@ func makeMountPaths(opts *enginetypes.VirtualizationCreateOptions) ([]string, ma
 	return binds, volumes
 }
 
-func makeResourceSetting(cpu float64, memory int64, cpuMap map[string]int64, numaNode string, iopsOptions map[string]string, remap bool) dockercontainer.Resources {
+func makeResourceSetting(cpu float64, memory int64, cpuMap map[string]int64, numaNode string, IOPSOptions map[string]string, remap bool) dockercontainer.Resources {
 	resource := dockercontainer.Resources{}
 
 	resource.CPUQuota = 0
@@ -140,9 +140,9 @@ func makeResourceSetting(cpu float64, memory int64, cpuMap map[string]int64, num
 		resource.MemoryReservation = int64(units.MiB * 4)
 	}
 
-	if len(iopsOptions) > 0 {
+	if len(IOPSOptions) > 0 {
 		var readIOPSDevices, writeIOPSDevices, readBPSDevices, writeBPSDevices []*blkiodev.ThrottleDevice
-		for device, options := range iopsOptions {
+		for device, options := range IOPSOptions {
 			parts := strings.Split(options, ":")
 			for len(parts) < 4 {
 				parts = append(parts, "0")

diff --git a/engine/docker/helper_test.go b/engine/docker/helper_test.go
@@ -3,19 +3,19 @@ package docker
 import (
 	"bytes"
 	"context"
-	"io"
+	"io/ioutil"
 	"os"
 	"strings"
 	"testing"
 
-	coreutils "github.com/projecteru2/core/utils"
-
 	"github.com/stretchr/testify/assert"
+
+	coreutils "github.com/projecteru2/core/utils"
 )
 
 func TestCreateTarStream(t *testing.T) {
 	buff := bytes.NewBufferString("test")
-	rc := io.NopCloser(buff)
+	rc := ioutil.NopCloser(buff)
 	fname, err := coreutils.TempFile(rc)
 	assert.NoError(t, err)
 	_, err = CreateTarStream(fname)

diff --git a/engine/docker/image.go b/engine/docker/image.go
@@ -5,10 +5,10 @@ import (
 	"fmt"
 	"io"
 
-	enginetypes "github.com/projecteru2/core/engine/types"
-
 	dockertypes "github.com/docker/docker/api/types"
 	dockerfilters "github.com/docker/docker/api/types/filters"
+
+	enginetypes "github.com/projecteru2/core/engine/types"
 )
 
 // ImageList list image

diff --git a/engine/docker/network.go b/engine/docker/network.go
@@ -4,12 +4,12 @@ import (
 	"context"
 	"net"
 
-	enginetypes "github.com/projecteru2/core/engine/types"
-	coretypes "github.com/projecteru2/core/types"
-
 	dockertypes "github.com/docker/docker/api/types"
 	dockerfilters "github.com/docker/docker/api/types/filters"
 	dockernetwork "github.com/docker/docker/api/types/network"
+
+	enginetypes "github.com/projecteru2/core/engine/types"
+	coretypes "github.com/projecteru2/core/types"
 )
 
 // NetworkConnect connect to a network

diff --git a/engine/factory/factory.go b/engine/factory/factory.go
@@ -36,21 +36,6 @@ var (
 	engineCache *EngineCache
 )
 
-func getEngineCacheKey(endpoint, ca, cert, key string) string {
-	return fmt.Sprintf("%v-%v", endpoint, utils.SHA256(fmt.Sprintf(":%v:%v:%v", ca, cert, key))[:8])
-}
-
-type engineParams struct {
-	endpoint string
-	ca       string
-	cert     string
-	key      string
-}
-
-func (ep engineParams) getCacheKey() string {
-	return getEngineCacheKey(ep.endpoint, ep.ca, ep.cert, ep.key)
-}
-
 // EngineCache .
 type EngineCache struct {
 	cache       *utils.EngineCache
@@ -145,13 +130,6 @@ func (e *EngineCache) CheckAlive(ctx context.Context) {
 	}
 }
 
-func validateEngine(ctx context.Context, engine engine.API, timeout time.Duration) (err error) {
-	utils.WithTimeout(ctx, timeout, func(ctx context.Context) {
-		err = engine.Ping(ctx)
-	})
-	return err
-}
-
 // GetEngineFromCache .
 func GetEngineFromCache(endpoint, ca, cert, key string) engine.API {
 	return engineCache.Get(getEngineCacheKey(endpoint, ca, cert, key))
@@ -190,6 +168,37 @@ func GetEngine(ctx context.Context, config types.Config, nodename, endpoint, ca,
 	return newEngine(ctx, config, nodename, endpoint, ca, cert, key)
 }
 
+type engineParams struct {
+	endpoint string
+	ca       string
+	cert     string
+	key      string
+}
+
+func (ep engineParams) getCacheKey() string {
+	return getEngineCacheKey(ep.endpoint, ep.ca, ep.cert, ep.key)
+}
+
+func validateEngine(ctx context.Context, engine engine.API, timeout time.Duration) (err error) {
+	utils.WithTimeout(ctx, timeout, func(ctx context.Context) {
+		err = engine.Ping(ctx)
+	})
+	return err
+}
+
+func getEnginePrefix(endpoint string) (string, error) {
+	for prefix := range engines {
+		if strings.HasPrefix(endpoint, prefix) {
+			return prefix, nil
+		}
+	}
+	return "", types.NewDetailedErr(types.ErrNodeFormat, fmt.Sprintf("endpoint invalid %v", endpoint))
+}
+
+func getEngineCacheKey(endpoint, ca, cert, key string) string {
+	return fmt.Sprintf("%v-%v", endpoint, utils.SHA256(fmt.Sprintf(":%v:%v:%v", ca, cert, key))[:8])
+}
+
 // newEngine get engine
 func newEngine(ctx context.Context, config types.Config, nodename, endpoint, ca, cert, key string) (client engine.API, err error) {
 	prefix, err := getEnginePrefix(endpoint)
@@ -212,12 +221,3 @@ func newEngine(ctx context.Context, config types.Config, nodename, endpoint, ca,
 	}
 	return client, nil
 }
-
-func getEnginePrefix(endpoint string) (string, error) {
-	for prefix := range engines {
-		if strings.HasPrefix(endpoint, prefix) {
-			return prefix, nil
-		}
-	}
-	return "", types.NewDetailedErr(types.ErrNodeFormat, fmt.Sprintf("endpoint invalid %v", endpoint))
-}
diff --git a/engine/mocks/fakeengine/mock.go b/engine/mocks/fakeengine/mock.go
@@ -109,6 +109,6 @@ func MakeClient(ctx context.Context, config coretypes.Config, nodename, endpoint
 	e.On("VirtualizationUpdateResource", mock.Anything, mock.Anything, mock.Anything).Return(nil)
 
 	e.On("VirtualizationCopyFrom", mock.Anything, mock.Anything, mock.Anything).Return([]byte("d1...\nd2...\n"), 0, 0, int64(0), nil)
-	e.On("ResourceValidate", mock.Anything, mock.Anything, mock.Anything, mock.Anything, mock.Anything).Return(nil)
+	//	e.On("ResourceValidate", mock.Anything, mock.Anything, mock.Anything, mock.Anything, mock.Anything).Return(nil)
 	return e, nil
 }
diff --git a/engine/types/virtualization.go b/engine/types/virtualization.go
@@ -11,7 +11,7 @@ type VirtualizationResource struct {
 	Volumes       []string                    `json:"volumes" mapstructure:"volumes"`
 	VolumePlan    map[string]map[string]int64 `json:"volume_plan" mapstructure:"volume_plan"`       // literal VolumePlan
 	VolumeChanged bool                        `json:"volume_changed" mapstructure:"volume_changed"` // indicate whether new volumes contained in realloc request
-	IOPSOptions   map[string]string           `json:"iops_options" mapstructure:"iops_options"`     // format: {device_name: "read-iops:write-iops:read-bps:write-bps"}
+	IOPSOptions   map[string]string           `json:"iops_options" mapstructure:"IOPS_options"`     // format: {device_name: "read-IOPS:write-IOPS:read-bps:write-bps"}
 	Remap         bool                        `json:"remap" mapstructure:"remap"`
 }
 

diff --git a/resources/binary.go b/resources/binary.go
@@ -33,22 +33,13 @@ func (bp *BinaryPlugin) GetNodesDeployCapacity(ctx context.Context, nodes []stri
 }
 
 // GetNodeResourceInfo .
-func (bp *BinaryPlugin) GetNodeResourceInfo(ctx context.Context, nodename string, workloads []*coretypes.Workload, fix bool) (resp *GetNodeResourceInfoResponse, err error) {
-	workloadMap := map[string]coretypes.WorkloadResourceArgs{}
-	for _, workload := range workloads {
-		workloadMap[workload.ID] = workload.ResourceArgs[bp.Name()]
-	}
+func (bp *BinaryPlugin) GetNodeResourceInfo(ctx context.Context, nodename string, workloads []*coretypes.Workload) (resp *GetNodeResourceInfoResponse, err error) {
+	return bp.getNodeResourceInfo(ctx, nodename, workloads, false)
+}
 
-	req := GetNodeResourceInfoRequest{
-		NodeName:    nodename,
-		WorkloadMap: workloadMap,
-		Fix:         fix,
-	}
-	resp = &GetNodeResourceInfoResponse{}
-	if err = bp.call(ctx, getNodeResourceInfoCommand, req, resp); err != nil {
-		return nil, err
-	}
-	return resp, nil
+// FixNodeResource .
+func (bp *BinaryPlugin) FixNodeResource(ctx context.Context, nodename string, workloads []*coretypes.Workload) (resp *GetNodeResourceInfoResponse, err error) {
+	return bp.getNodeResourceInfo(ctx, nodename, workloads, true)
 }
 
 // SetNodeResourceInfo .
@@ -282,3 +273,21 @@ func (bp *BinaryPlugin) call(ctx context.Context, cmd string, req interface{}, r
 	}
 	return nil
 }
+
+func (bp *BinaryPlugin) getNodeResourceInfo(ctx context.Context, nodename string, workloads []*coretypes.Workload, fix bool) (resp *GetNodeResourceInfoResponse, err error) {
+	workloadMap := map[string]coretypes.WorkloadResourceArgs{}
+	for _, workload := range workloads {
+		workloadMap[workload.ID] = workload.ResourceArgs[bp.Name()]
+	}
+
+	req := GetNodeResourceInfoRequest{
+		NodeName:    nodename,
+		WorkloadMap: workloadMap,
+		Fix:         fix,
+	}
+	resp = &GetNodeResourceInfoResponse{}
+	if err = bp.call(ctx, getNodeResourceInfoCommand, req, resp); err != nil {
+		return nil, err
+	}
+	return resp, nil
+}