Browse Source

修改调试问题;使用magefile代替makefile

gitlink
Sydonian 2 years ago
parent
commit
51b2223603
3 changed files with 37 additions and 21 deletions
  1. +0
    -15
      Makefile
  2. +15
    -6
      internal/services/object.go
  3. +22
    -0
      magefiles/magefile.go

+ 0
- 15
Makefile View File

@@ -1,15 +0,0 @@
OUTPUT_BINARY_NAME = "coordinator"
OUTPUT_DIR_NAME = "coordinator"


ASSETS_DIR_NAME = "assets"
BUILD_DIR = "../../build"

build:
go build -o ${BUILD_DIR}/${OUTPUT_DIR_NAME}/${OUTPUT_BINARY_NAME}${OUTPUT_BINARY_EXT}
@if [ -d ${ASSETS_DIR_NAME} ] && [ -n "`ls -A ${ASSETS_DIR_NAME}`" ] ;then \
cp -r ${ASSETS_DIR_NAME}/* ${BUILD_DIR}/${OUTPUT_DIR_NAME}/; \
fi
clean:
rm -f ${BUILD_DIR}/${OUTPUT_DIR_NAME}/${OUTPUT_BINARY_NAME}

+ 15
- 6
internal/services/object.go View File

@@ -26,8 +26,11 @@ func (svc *Service) PreDownloadObject(msg *coormsg.PreDownloadObject) *coormsg.P
} }


// 查询客户端所属节点 // 查询客户端所属节点
foundBelongNode := true
belongNode, err := svc.db.Node().GetByExternalIP(svc.db.SQLCtx(), msg.Body.ClientExternalIP) belongNode, err := svc.db.Node().GetByExternalIP(svc.db.SQLCtx(), msg.Body.ClientExternalIP)
if err != nil {
if err == sql.ErrNoRows {
foundBelongNode = false
} else if err != nil {
logger.WithField("ClientExternalIP", msg.Body.ClientExternalIP). logger.WithField("ClientExternalIP", msg.Body.ClientExternalIP).
Warnf("query client belong node failed, err: %s", err.Error()) Warnf("query client belong node failed, err: %s", err.Error())
return ramsg.ReplyFailed[coormsg.PreDownloadObjectResp](errorcode.OPERATION_FAILED, "query client belong node failed") return ramsg.ReplyFailed[coormsg.PreDownloadObjectResp](errorcode.OPERATION_FAILED, "query client belong node failed")
@@ -58,7 +61,7 @@ func (svc *Service) PreDownloadObject(msg *coormsg.PreDownloadObject) *coormsg.P
node.ExternalIP, node.ExternalIP,
node.LocalIP, node.LocalIP,
// LocationID 相同则认为是在同一个地域 // LocationID 相同则认为是在同一个地域
belongNode.LocationID == node.LocationID,
foundBelongNode && belongNode.LocationID == node.LocationID,
)) ))
} }


@@ -152,8 +155,11 @@ func (svc *Service) PreUploadRepObject(msg *coormsg.PreUploadRepObject) *coormsg
} }


// 查询客户端所属节点 // 查询客户端所属节点
foundBelongNode := true
belongNode, err := svc.db.Node().GetByExternalIP(svc.db.SQLCtx(), msg.Body.ClientExternalIP) belongNode, err := svc.db.Node().GetByExternalIP(svc.db.SQLCtx(), msg.Body.ClientExternalIP)
if err != nil {
if err == sql.ErrNoRows {
foundBelongNode = false
} else if err != nil {
logger.WithField("ClientExternalIP", msg.Body.ClientExternalIP). logger.WithField("ClientExternalIP", msg.Body.ClientExternalIP).
Warnf("query client belong node failed, err: %s", err.Error()) Warnf("query client belong node failed, err: %s", err.Error())
return ramsg.ReplyFailed[coormsg.PreUploadResp](errorcode.OPERATION_FAILED, "query client belong node failed") return ramsg.ReplyFailed[coormsg.PreUploadResp](errorcode.OPERATION_FAILED, "query client belong node failed")
@@ -166,7 +172,7 @@ func (svc *Service) PreUploadRepObject(msg *coormsg.PreUploadRepObject) *coormsg
node.ExternalIP, node.ExternalIP,
node.LocalIP, node.LocalIP,
// LocationID 相同则认为是在同一个地域 // LocationID 相同则认为是在同一个地域
belongNode.LocationID == node.LocationID,
foundBelongNode && belongNode.LocationID == node.LocationID,
)) ))
} }


@@ -226,8 +232,11 @@ func (svc *Service) PreUpdateRepObject(msg *coormsg.PreUpdateRepObject) *coormsg
} }


// 查询客户端所属节点 // 查询客户端所属节点
foundBelongNode := true
belongNode, err := svc.db.Node().GetByExternalIP(svc.db.SQLCtx(), msg.Body.ClientExternalIP) belongNode, err := svc.db.Node().GetByExternalIP(svc.db.SQLCtx(), msg.Body.ClientExternalIP)
if err != nil {
if err == sql.ErrNoRows {
foundBelongNode = false
} else if err != nil {
logger.WithField("ClientExternalIP", msg.Body.ClientExternalIP). logger.WithField("ClientExternalIP", msg.Body.ClientExternalIP).
Warnf("query client belong node failed, err: %s", err.Error()) Warnf("query client belong node failed, err: %s", err.Error())
return ramsg.ReplyFailed[coormsg.PreUpdateRepObjectResp](errorcode.OPERATION_FAILED, "query client belong node failed") return ramsg.ReplyFailed[coormsg.PreUpdateRepObjectResp](errorcode.OPERATION_FAILED, "query client belong node failed")
@@ -247,7 +256,7 @@ func (svc *Service) PreUpdateRepObject(msg *coormsg.PreUpdateRepObject) *coormsg
node.ExternalIP, node.ExternalIP,
node.LocalIP, node.LocalIP,
// LocationID 相同则认为是在同一个地域 // LocationID 相同则认为是在同一个地域
belongNode.LocationID == node.LocationID,
foundBelongNode && belongNode.LocationID == node.LocationID,
// 此节点存储了对象旧文件 // 此节点存储了对象旧文件
lo.ContainsBy(cachingNodes, func(n model.Node) bool { return n.NodeID == node.NodeID }), lo.ContainsBy(cachingNodes, func(n model.Node) bool { return n.NodeID == node.NodeID }),
)) ))


+ 22
- 0
magefiles/magefile.go View File

@@ -0,0 +1,22 @@
//go:build mage

package main

import (
"magefiles"
"magefiles/utils"

//mage:import
"magefiles/targets"
)

var Default = Build

func Build() error {
return utils.Build(magefiles.BuildArgs{
OutputBinName: "coordinator",
OutputDirName: "coordinator",
AssetsDir: "assets",
PubArgs: targets.PubGoBuildArgs,
})
}

Loading…
Cancel
Save