Commit 4a0e0e4c authored by duanjinfei's avatar duanjinfei

add sys type

parent 0ef99653
......@@ -17,13 +17,14 @@ import (
)
var (
rewardAddr, dockerServer, externalIp string
rewardAddr, dockerServer, externalIp, opSys string
)
func init() {
RootCmd.PersistentFlags().StringVarP(&rewardAddr, "reward", "r", "", "please enter a reward address")
RootCmd.PersistentFlags().StringVarP(&dockerServer, "docker_server", "d", "", "please enter docker server address")
RootCmd.PersistentFlags().StringVarP(&externalIp, "externalIp", "e", "", "please enter server external ip address")
RootCmd.PersistentFlags().StringVarP(&opSys, "opSys", "s", "", "please enter you op sys name : win、linux、mac")
cobra.OnInitialize(initConfig)
}
......@@ -37,6 +38,12 @@ var RootCmd = &cobra.Command{
log.Error("Enter reward address is not nil")
return
}
if opSys != "" {
if !conf.GetConfig().SetOpSys(opSys) {
log.Error("Enter op sys no support")
return
}
}
isSetDockerServer := conf.GetConfig().SetDockerServerUrl(dockerServer)
if !isSetDockerServer {
log.Error("Enter right docker server address:", dockerServer)
......
......@@ -27,6 +27,7 @@ type Config struct {
ValidatorUrl string `json:"validator_url"`
OssUrl string `json:"oss_url"`
WaitLastTaskExecTime int64 `json:"wait_last_task_exec_time"`
OpSys string `json:"op_sys"`
}
var _cfg *Config = nil
......@@ -69,6 +70,14 @@ func (c *Config) SetNmSeed(seed string) {
c.NmSeed = seed
}
func (c *Config) SetOpSys(sys string) bool {
if sys != "win" && sys != "mac" && sys != "linux" {
return false
}
c.OpSys = sys
return true
}
func checkDockerServer(rawURL string) (bool, string) {
if rawURL == "" {
return true, fmt.Sprintf("tcp://%s:%s", "host.docker.internal", "2375")
......
......@@ -8,5 +8,6 @@
"chain_id": 100,
"validator_url": "18.167.203.17:20011",
"oss_url": "https://tmp-file.agicoin.ai/api/v1/upload",
"wait_last_task_exec_time": 60
"wait_last_task_exec_time": 60,
"op_sys": "linux"
}
\ No newline at end of file
......@@ -6,6 +6,7 @@ import (
"example.com/m/log"
"example.com/m/models"
"example.com/m/operate"
"fmt"
"io"
"net/http"
"os"
......@@ -67,6 +68,7 @@ func (m *ModelHandler) MonitorModelInfo() {
if modelInfo.ImageName == "" {
continue
}
modelInfo.ImageName = fmt.Sprintf("%s-%s", modelInfo.ImageName, conf.GetConfig().OpSys)
split := strings.Split(modelInfo.ImageName, ":")
if len(split) != 2 {
continue
......
......@@ -126,6 +126,7 @@ func (t *TaskHandler) ComputeTaskHandler(taskMsg *nodeManagerV1.PushTaskMessage)
t.ExecTaskIdIsSuccess.Store(taskMsg.TaskId, true)
return
}
taskCmd.ImageName = fmt.Sprintf("%s-%s", taskCmd.ImageName, conf.GetConfig().OpSys)
log.Info("received task cmd :", taskCmd)
log.WithField("t.oldTaskImageName", t.oldTaskImageName).WithField("newTaskImageName", taskCmd.ImageName).Info("task image info")
if taskMsg.TaskKind != baseV1.TaskKind_StandardTask {
......
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