1
0
mirror of https://github.com/newnius/YAO-scheduler.git synced 2025-06-06 05:51:54 +00:00

switch collector from kafka to http

This commit is contained in:
Newnius 2020-07-08 20:17:40 +08:00
parent 04232a34e5
commit 6c9e802a31
3 changed files with 30 additions and 1 deletions

View File

@ -14,6 +14,28 @@ var scheduler Scheduler
func serverAPI(w http.ResponseWriter, r *http.Request) {
switch r.URL.Query().Get("action") {
case "agent_report":
log.Debug("agent_report")
msgAgentReport := MsgAgentReport{Code: 0}
var nodeStatus NodeStatus
err := json.Unmarshal([]byte(string(r.PostFormValue("data"))), &nodeStatus)
if err != nil {
msgAgentReport.Code = 1
msgAgentReport.Error = err.Error()
log.Warn(err)
} else {
go func() {
InstanceOfResourcePool().update(nodeStatus)
}()
}
js, err := json.Marshal(msgAgentReport)
if err != nil {
log.Warn(err)
}
w.Header().Set("Content-Type", "application/json")
w.Write(js)
break
case "resource_list":
js, _ := json.Marshal(InstanceOfResourcePool().list())
w.Header().Set("Content-Type", "application/json")
@ -363,7 +385,7 @@ func main() {
/* init components */
InstanceOfResourcePool().init(config)
InstanceOfCollector().init(config)
//InstanceOfCollector().init(config)
InstanceJobHistoryLogger().init(config)
InstanceOfOptimizer().Init(config)
InstanceOfGroupManager().init(config)

View File

@ -1,5 +1,10 @@
package main
type MsgAgentReport struct {
Code int `json:"code"`
Error string `json:"error"`
}
type MsgSubmit struct {
Code int `json:"code"`
Error string `json:"error"`

View File

@ -105,6 +105,8 @@ func (optimizer *Optimizer) FeedTime(job Job, stats [][]TaskStatus) {
exceptions := map[string]bool{}
exceptions["train_dir"] = true
exceptions["data__dir"] = true
exceptions["tmp__dir"] = true
exceptions["variable_update"] = true
exceptions["ps_hosts"] = true
exceptions["worker_hosts"] = true