Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
P
power-node
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Odysseus
power-node
Commits
4a0e0e4c
Commit
4a0e0e4c
authored
Mar 27, 2024
by
duanjinfei
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
add sys type
parent
0ef99653
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
22 additions
and
2 deletions
+22
-2
rootcmd.go
cmd/rootcmd.go
+8
-1
config.go
conf/config.go
+9
-0
config.json
config.json
+2
-1
model_handler.go
largeModel/model_handler.go
+2
-0
task_handler.go
nm/task_handler.go
+1
-0
No files found.
cmd/rootcmd.go
View file @
4a0e0e4c
...
...
@@ -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
)
...
...
conf/config.go
View file @
4a0e0e4c
...
...
@@ -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"
)
...
...
config.json
View file @
4a0e0e4c
...
...
@@ -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
largeModel/model_handler.go
View file @
4a0e0e4c
...
...
@@ -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
...
...
nm/task_handler.go
View file @
4a0e0e4c
...
...
@@ -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
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment