Commit 83c338be authored by duanjinfei's avatar duanjinfei

update ReplicateImageNameSuffix

parent 685893ba
...@@ -9,25 +9,26 @@ import ( ...@@ -9,25 +9,26 @@ import (
) )
type Config struct { type Config struct {
SignPrv string SignPrv string
SignPub string SignPub string
DockerServer string DockerServer string
BenefitAddress string BenefitAddress string
HeartRespTimeMillis int64 HeartRespTimeMillis int64
ExternalIp string ExternalIp string
SignPublicAddress common.Address SignPublicAddress common.Address
SignPrivateKey *ecdsa.PrivateKey SignPrivateKey *ecdsa.PrivateKey
NmSeed string `json:"nm_seed"` NmSeed string `json:"nm_seed"`
HeartRespTimeSecond int64 `json:"heart_response"` HeartRespTimeSecond int64 `json:"heart_response"`
TaskValidatorTime float64 `json:"task_validator_time"` TaskValidatorTime float64 `json:"task_validator_time"`
ContainerNum int64 `json:"container_num"` ContainerNum int64 `json:"container_num"`
NodeManagerNum int64 `json:"node_manager_num"` NodeManagerNum int64 `json:"node_manager_num"`
ChainID int64 `json:"chain_id"` ChainID int64 `json:"chain_id"`
ApiUrl string `json:"api_url"` ApiUrl string `json:"api_url"`
ValidatorUrl string `json:"validator_url"` ValidatorUrl string `json:"validator_url"`
OssUrl string `json:"oss_url"` OssUrl string `json:"oss_url"`
WaitLastTaskExecTime int64 `json:"wait_last_task_exec_time"` WaitLastTaskExecTime int64 `json:"wait_last_task_exec_time"`
OpSys string `json:"op_sys"` OpSys string `json:"op_sys"`
ReplicateImageNameSuffix string `json:"replicate_image_name_suffix"`
} }
var _cfg *Config = nil var _cfg *Config = nil
......
...@@ -9,5 +9,6 @@ ...@@ -9,5 +9,6 @@
"validator_url": "172.31.35.130:20011", "validator_url": "172.31.35.130: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",
"replicate_image_name_suffix": "docker.aigic.ai/ai"
} }
\ No newline at end of file
package models package models
const ( const (
TaskType = "taskType" TaskType = "taskType"
ContainerSign = "container" ContainerSign = "container"
MinerSign = "miner" MinerSign = "miner"
ReqHash = "reqHash" ReqHash = "reqHash"
RespHash = "respHash" RespHash = "respHash"
ResultFileExpiresDB = "expires" ResultFileExpiresDB = "expires"
ContentType = "type" ContentType = "type"
RedirectCode = 303 RedirectCode = 303
UseFileCache = "Use-File-Cache" UseFileCache = "Use-File-Cache"
UseRedirect = "Use-Redirect" UseRedirect = "Use-Redirect"
Prefer = "Prefer" Prefer = "Prefer"
Async = "respond-async" Async = "respond-async"
MaxExecTime = "MaxExecTime" MaxExecTime = "MaxExecTime"
HealthCheckAPI = "/health-check" HealthCheckAPI = "/health-check"
ReplicateImageNameSuffix = "docker.agicoin.ai/agicoin" READY = "READY"
READY = "READY" ZeroHost = "0.0.0.0"
ZeroHost = "0.0.0.0" ModelPublishStatusYes = 1
ModelPublishStatusYes = 1 ModelPublishStatusNo = 2
ModelPublishStatusNo = 2 DefaultMaxExecTime = 300
DefaultMaxExecTime = 300 DefaultTaskTimer = 2
DefaultTaskTimer = 2
) )
...@@ -476,7 +476,7 @@ func (op *TaskOp) waitContainerRunning(handler *TaskWorker, imageId string) erro ...@@ -476,7 +476,7 @@ func (op *TaskOp) waitContainerRunning(handler *TaskWorker, imageId string) erro
if !running { if !running {
continue continue
} }
if isMatch := strings.HasPrefix(op.taskCmd.ImageName, models.ReplicateImageNameSuffix); isMatch { if isMatch := strings.HasPrefix(op.taskCmd.ImageName, conf.GetConfig().ReplicateImageNameSuffix); isMatch {
if isReqSuccess, err := op.checkContainerHealthy(internalIp, internalPort); err != nil { if isReqSuccess, err := op.checkContainerHealthy(internalIp, internalPort); err != nil {
log.WithField("err", err).Errorf("check container healthy failed") log.WithField("err", err).Errorf("check container healthy failed")
return fmt.Errorf("%s-%s", "check container healthy failed", err.Error()) return fmt.Errorf("%s-%s", "check container healthy failed", err.Error())
......
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