-
Notifications
You must be signed in to change notification settings - Fork 5
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #6 from gfieni/master
Add flag for resource selection with OAR properties
- Loading branch information
Showing
3 changed files
with
154 additions
and
91 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,108 +1,129 @@ | ||
| package api | ||
|
|
||
| import ( | ||
| "encoding/json" | ||
| "fmt" | ||
| "time" | ||
| "encoding/json" | ||
| "fmt" | ||
| "time" | ||
| ) | ||
|
|
||
| type JobRequest struct { | ||
| Resources string `json:"resources"` | ||
| Command string `json:"command"` | ||
| Properties string `json:"properties,omitempty"` | ||
| Types []string `json:"types"` | ||
| } | ||
|
|
||
| type Job struct { | ||
| Uid int `json:"uid"` | ||
| State string `json:"state"` | ||
| Timelife int `json:"walltime"` | ||
| Types []string `json:"types"` | ||
| StartTime int `json:"started_at"` | ||
| Links []Link `json:"links"` | ||
| Nodes []string `json:"assigned_nodes"` | ||
| Uid int `json:"uid"` | ||
| State string `json:"state"` | ||
| Timelife int `json:"walltime"` | ||
| Types []string `json:"types"` | ||
| StartTime int `json:"started_at"` | ||
| Links []Link `json:"links"` | ||
| Nodes []string `json:"assigned_nodes"` | ||
| } | ||
|
|
||
| // convertDuration take a string "hh:mm:ss" and convert it in seconds | ||
| func convertDuration(t string) (int, error) { | ||
| var h, m, s int | ||
| var h, m, s int | ||
|
|
||
| if _, err := fmt.Sscanf(t, "%d:%d:%d", &h, &m, &s); err != nil { | ||
| return 0, err | ||
| } | ||
| if _, err := fmt.Sscanf(t, "%d:%d:%d", &h, &m, &s); err != nil { | ||
| return 0, err | ||
| } | ||
|
|
||
| return (h * 3600) + (m * 60) + s, nil | ||
| return (h * 3600) + (m * 60) + s, nil | ||
| } | ||
|
|
||
| // Submit a job on G5K. Returns the job ID. | ||
| func (a *Api) SubmitJob(walltime string) (int, error) { | ||
| urlSubmit := fmt.Sprintf("%s/sites/%s/jobs", G5kApiFrontend, a.Site) | ||
| seconds, err := convertDuration(walltime) | ||
| if err != nil { | ||
| return 0, err | ||
| } | ||
| params := fmt.Sprintf(`{"resources": "nodes=1,walltime=%s", "command": "sleep %v", "types": ["deploy"]}`, walltime, seconds) | ||
| var job Job | ||
| var resp []byte | ||
|
|
||
| if resp, err = a.post(urlSubmit, params); err != nil { | ||
| return 0, err | ||
| } else { | ||
| err = json.Unmarshal(resp, &job) | ||
| return job.Uid, err | ||
| } | ||
| func (a *Api) SubmitJob(walltime, resourceProperties string) (int, error) { | ||
| urlSubmit := fmt.Sprintf("%s/sites/%s/jobs", G5kApiFrontend, a.Site) | ||
|
|
||
| seconds, err := convertDuration(walltime) | ||
| if err != nil { | ||
| return 0, err | ||
| } | ||
|
|
||
| // create a new Job request (1 node) | ||
| params, err := json.Marshal(JobRequest{ | ||
| Resources: fmt.Sprintf("nodes=1,walltime=%s", walltime), | ||
| Command: fmt.Sprintf("sleep %v", seconds), | ||
| Properties: resourceProperties, | ||
| Types: []string{"deploy"}, | ||
| }) | ||
|
|
||
| if err != nil { | ||
| return 0, err | ||
| } | ||
|
|
||
| var job Job | ||
| var resp []byte | ||
|
|
||
| if resp, err = a.post(urlSubmit, string(params)); err != nil { | ||
| return 0, err | ||
| } else { | ||
| err = json.Unmarshal(resp, &job) | ||
| return job.Uid, err | ||
| } | ||
| } | ||
|
|
||
| // Refresh job's state | ||
| func (a *Api) GetJob(jobId int) (*Job, error) { | ||
| job := new(Job) | ||
| url := fmt.Sprintf("%s/sites/%s/jobs/%v", G5kApiFrontend, a.Site, jobId) | ||
|
|
||
| if resp, err := a.get(url); err != nil { | ||
| return &Job{}, err | ||
| } else { | ||
| err = json.Unmarshal(resp, &job) | ||
| return job, err | ||
| } | ||
| job := new(Job) | ||
| url := fmt.Sprintf("%s/sites/%s/jobs/%v", G5kApiFrontend, a.Site, jobId) | ||
|
|
||
| if resp, err := a.get(url); err != nil { | ||
| return &Job{}, err | ||
| } else { | ||
| err = json.Unmarshal(resp, &job) | ||
| return job, err | ||
| } | ||
| } | ||
|
|
||
| // Returns the job's current state | ||
| func (a *Api) GetJobState(jobId int) (string, error) { | ||
| if job, err := a.GetJob(jobId); err != nil { | ||
| return "", err | ||
| } else if a.jobIsOver(job) { | ||
| return "terminated", nil | ||
| } else { | ||
| return job.State, nil | ||
| } | ||
| if job, err := a.GetJob(jobId); err != nil { | ||
| return "", err | ||
| } else if a.jobIsOver(job) { | ||
| return "terminated", nil | ||
| } else { | ||
| return job.State, nil | ||
| } | ||
| } | ||
|
|
||
| // Returns true if the job expired, false otherwise | ||
| func (a *Api) jobIsOver(job *Job) bool { | ||
| currentTime := time.Now().Unix() | ||
| startTime := int64(job.StartTime) | ||
| timelife := int64(job.Timelife) | ||
| currentTime := time.Now().Unix() | ||
| startTime := int64(job.StartTime) | ||
| timelife := int64(job.Timelife) | ||
|
|
||
| return (currentTime - startTime) >= timelife | ||
| return (currentTime - startTime) >= timelife | ||
| } | ||
|
|
||
| // Free the nodes allocated to the jobs | ||
| func (a *Api) KillJob(jobId int) error { | ||
| url := fmt.Sprintf("%s/sites/%s/jobs/%v", G5kApiFrontend, a.Site, jobId) | ||
| url := fmt.Sprintf("%s/sites/%s/jobs/%v", G5kApiFrontend, a.Site, jobId) | ||
|
|
||
| _, err := a.del(url) | ||
| _, err := a.del(url) | ||
|
|
||
| return err | ||
| return err | ||
| } | ||
|
|
||
| func (a *Api) waitJobIsReady(job *Job) bool { | ||
| var err error | ||
| tmp_job := new(Job) | ||
|
|
||
| for job.State == "waiting" || job.State == "tolaunch" || job.State == "launching" { | ||
| if tmp_job, err = a.GetJob(job.Uid); err != nil { | ||
| return false | ||
| } | ||
| *job = *tmp_job | ||
| time.Sleep(3*time.Second) | ||
| } | ||
|
|
||
| // If the launching failed | ||
| if job.State != "running" { | ||
| return false | ||
| } else { | ||
| return true | ||
| } | ||
| var err error | ||
| tmp_job := new(Job) | ||
|
|
||
| for job.State == "waiting" || job.State == "tolaunch" || job.State == "launching" { | ||
| if tmp_job, err = a.GetJob(job.Uid); err != nil { | ||
| return false | ||
| } | ||
| *job = *tmp_job | ||
| time.Sleep(3 * time.Second) | ||
| } | ||
|
|
||
| // If the launching failed | ||
| if job.State != "running" { | ||
| return false | ||
| } else { | ||
| return true | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters