Skip to content

P
power-node
Commit 42df2f4b authored by duanjinfei's avatar duanjinfei
Browse files
Options

test version

parent 98ee5dd2
Show whitespace changes
Inline Side-by-side
Showing with 80 additions and 28 deletions
config.json
View file @ 42df2f4b
{ {
"nm_seed": "52.221.177.10:10001", "nm_seed": "18.167.103.232:10001",
"api_url": "https://aigic.ai/admin/api/task/taskheat", "api_url": "http://18.167.103.232/admin/api/task/taskheat",
"node_manager_num": 1, "node_manager_num": 2,
"heart_response": 60, "heart_response": 60,
"share_gpu_memory_usage": 80, "share_gpu_memory_usage": 80,
"task_validator_time": 1,
"container_num": 1,
"chain_id": 100, "chain_id": 100,
"validator_url": "43.198.29.144:20011", "validator_url": "18.167.103.232:20011",
"oss_url": "https://tmp-file.aigic.ai/api/v1/upload", "oss_url": "https://tmp-file.aigic.ai/api/v1/upload",
"wait_last_task_exec_time": 60, "wait_last_task_exec_time": 60,
"op_sys": "linux", "op_sys": "linux",
......
nm/msg_resp.go
View file @ 42df2f4b
...@@ -29,7 +29,7 @@ type RespMsgWorker struct { ...@@ -29,7 +29,7 @@ type RespMsgWorker struct {
func NewMsgRespWorker() *RespMsgWorker { func NewMsgRespWorker() *RespMsgWorker {
return &RespMsgWorker{ return &RespMsgWorker{
MsgPool: make(chan *RespMsgHandler, 0), MsgPool: make(chan *RespMsgHandler, 10000),
} }
} }
...@@ -157,17 +157,20 @@ func DeviceInfoResp(params ...interface{}) *nodemanagerV2.WorkerMessage { ...@@ -157,17 +157,20 @@ func DeviceInfoResp(params ...interface{}) *nodemanagerV2.WorkerMessage {
func DeviceUsageResp(params ...interface{}) *nodemanagerV2.WorkerMessage { func DeviceUsageResp(params ...interface{}) *nodemanagerV2.WorkerMessage {
log.Info("DeviceUsageResp params :", params) log.Info("DeviceUsageResp params :", params)
hardwareInfo := GetHardwareInfo() //hardwareInfo := GetHardwareInfo()
ramUsage := int32((1 - float64(hardwareInfo.RAM.Free)/float64(hardwareInfo.RAM.Total)) * 100) //if hardwareInfo == nil {
diskUsage := int32((1 - float64(hardwareInfo.DISK.Free)/float64(hardwareInfo.DISK.Total)) * 100) // return nil
//}
//ramUsage := int32((1 - float64(hardwareInfo.RAM.Free)/float64(hardwareInfo.RAM.Total)) * 100)
//diskUsage := int32((1 - float64(hardwareInfo.DISK.Free)/float64(hardwareInfo.DISK.Total)) * 100)
deviceInfoRes := &nodemanagerV2.WorkerMessage{ deviceInfoRes := &nodemanagerV2.WorkerMessage{
Message: &nodemanagerV2.WorkerMessage_DeviceUsage{ Message: &nodemanagerV2.WorkerMessage_DeviceUsage{
DeviceUsage: &nodemanagerV2.DeviceUsageResponse{ DeviceUsage: &nodemanagerV2.DeviceUsageResponse{
Usage: &nodemanagerV2.HardwareUsage{ Usage: &nodemanagerV2.HardwareUsage{
CpuUsage: hardwareInfo.CPU.Usage, CpuUsage: 1,
RamUsage: ramUsage, RamUsage: 2,
DiskUsage: diskUsage, DiskUsage: 3,
NetBandwidth: hardwareInfo.NET.Bandwidth, NetBandwidth: 4,
}, },
}, },
}, },
......
utils/util.go
View file @ 42df2f4b
...@@ -311,21 +311,68 @@ func readAndDecryptFile(key []byte, filename string) ([]byte, error) { ...@@ -311,21 +311,68 @@ func readAndDecryptFile(key []byte, filename string) ([]byte, error) {
} }
func GetApiHardwareInfo(url string) *models.HardwareInfoRep { func GetApiHardwareInfo(url string) *models.HardwareInfoRep {
resp, err := http.Get(url) //resp, err := http.Get(url)
if err != nil { //if err != nil {
log.Error("Error creating request") // log.Error("Error creating request")
return nil // return nil
} //}
res := &models.HardwareInfoRep{} res := &models.HardwareInfoRep{
body, err := io.ReadAll(resp.Body) Data: &models.HardwareInfo{
if err != nil { Gpus: []*models.Gpu{
log.Error("io.ReadAll failed") {
return nil Seq: 1,
} Uuid: "111111",
err = json.Unmarshal(body, res) Model: "2222",
if err != nil { Performance: 1,
log.Error("json.Unmarshal failed") PowerRating: 111,
return nil PowerRt: 2,
} MemFree: 111,
MemTotal: 2222,
Usage: 12,
Temp: 12,
},
},
Cpus: &models.Cpu{
Model: "111",
Number: 1,
Cores: 16,
Threads: 12,
Usage: 12,
Frequency: "11",
},
Mem: models.Mem{
Total: 12,
Free: 12,
MemUtil: 12,
},
Disk: []*models.Disk{
{
Device: "11",
MountPoints: []string{"/"},
FreeBytes: 12,
SizeBytes: 32,
},
},
Networks: []*models.Net{
{
Device: "111",
Speed: 12,
SendRate: 3,
RecvRate: 22,
Mac: "1111",
},
},
},
}
//body, err := io.ReadAll(resp.Body)
//if err != nil {
// log.Error("io.ReadAll failed")
// return nil
//}
//err = json.Unmarshal(body, res)
//if err != nil {
// log.Error("json.Unmarshal failed")
// return nil
//}
return res return res
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment