update log

server/service.go

@@ -6,7 +6,6 @@ import (
 	"github.com/odysseus/nodemanager/utils"
 	omanager "github.com/odysseus/odysseus-protocol/gen/proto/go/nodemanager/v2"
 	log "github.com/sirupsen/logrus"
-	"strings"
 )
 
 var (
@@ -51,11 +50,7 @@ func (n *NodeManagerService) DispatchTask(ctx context.Context, request *omanager
 	if request == nil {
 		return nil, errors.New("invalid request")
 	}
-	mids := strings.Split(request.Miner, "_")
-	if len(mids) != 2 {
-		return nil, errors.New("invalid miner")
-	}
-	workerAddr := mids[0]
+	workerAddr := request.Miner
 	worker := n.node.wm.GetWorkerByAddr(workerAddr)
 	if worker == nil {
 		return nil, errors.New("worker not found")

server/worker.go

@@ -106,7 +106,7 @@ func (w *Worker) SendMessage() {
 					m.callback(err)
 				}
 			}
-			log.WithField("worker-addr", w.workerAddr).WithField("send duration", time.Now().Sub(start).String()).Debug("send msg to worker")
+			log.WithField("worker-addr", w.workerAddr).WithField("send duration", time.Now().Sub(start).String()).Trace("send msg to worker")
 		}
 	}
 
@@ -157,13 +157,17 @@ func (w *Worker) doHeartBeat(msg *omanager.WorkerMessage_HeartbeatResponse) {
 	log.WithFields(log.Fields{
 		"worker-addr": w.workerAddr,
 		"TTL":         time.Now().Unix() - int64(msg.HeartbeatResponse.Timestamp),
-	}).Debug("receive worker heartbeat")
+	}).Trace("receive worker heartbeat")
 }
 
 func (w *Worker) doUpdateBenefit(msg *omanager.WorkerMessage_BenefitAddrUpdate) {
 	if w.info != nil {
 		w.info.Info.BenefitAddress = msg.BenefitAddrUpdate.BenefitAddress
 	}
+	log.WithFields(log.Fields{
+		"worker-addr": w.workerAddr,
+		"benefit":     msg.BenefitAddrUpdate.BenefitAddress,
+	}).Info("receive worker benefit address update")
 	// update to mogo.
 	w.infoOp.UpdateBenefitAddr(context.TODO(), w.workerAddr, msg.BenefitAddrUpdate.BenefitAddress)
 }
@@ -254,9 +258,10 @@ func (w *Worker) doAddRunningModel(msg *omanager.WorkerMessage_AddModelRunning)
 	}
 	models := make([]*types.RunningModel, 0)
 	log.WithFields(log.Fields{
-		"worker-addr": w.workerAddr,
-		"count":       len(msg.AddModelRunning.Models),
-	}).Debugf("receive worker add running model:%v", msg.AddModelRunning.Models)
+		"worker-addr":    w.workerAddr,
+		"running-models": msg.AddModelRunning.Models,
+		"count":          len(msg.AddModelRunning.Models),
+	}).Debugf("receive worker add running models")
 
 	for _, model := range msg.AddModelRunning.Models {
 		models = append(models, types.PbToRunningModel(model))
@@ -424,7 +429,8 @@ func (w *Worker) doGPUUsage(msg *omanager.WorkerMessage_GpuUsage) {
 	}
 	log.WithFields(log.Fields{
 		"worker-addr": w.workerAddr,
-	}).Debugf("receive worker gpu usage:%v", msg.GpuUsage)
+		"gpu-usage":   msg.GpuUsage,
+	}).Debugf("receive worker gpu usage")
 	// 1. update gpu usage to hardware mogo.
 	gpuusages := make([]types.GpuUsage, 0)
 	for _, gpu := range msg.GpuUsage.Usages {
@@ -451,6 +457,11 @@ func (w *Worker) doGPUUsage(msg *omanager.WorkerMessage_GpuUsage) {
 		// no need update
 		return
 	} else {
+		log.WithFields(log.Fields{
+			"worker-addr": w.workerAddr,
+			"gpu-free":    maxFree.MemFree,
+			"gpu-sed":     maxFree.Seq,
+		}).Debug("update worker gpu free")
 		w.installOp.UpdateGpuFree(context.TODO(), w.workerAddr, int64(maxFree.MemFree), int(maxFree.Seq))
 		w.lastFreeGpu = maxFree
 	}