add unit test
This commit is contained in:
parent
9e166fae54
commit
c985d9170f
2 changed files with 66 additions and 8 deletions
18
realis.go
18
realis.go
|
@ -524,17 +524,19 @@ func (c *Client) RestartInstances(key aurora.JobKey, instances ...int32) error {
|
|||
|
||||
// Restarts specific instances specified with slaAware.
|
||||
// If slaPolicy is nil, uses the existing slaPolicy of taskConfig.
|
||||
func (c *Client) SlaRestartInstances(slaPolicy *aurora.SlaPolicy, jobKey *aurora.JobKey, instances ...int32) error {
|
||||
func (c *Client) SlaRestartInstances(jobKey aurora.JobKey,
|
||||
slaPolicy *aurora.SlaPolicy,
|
||||
instances ...int32) (*aurora.StartJobUpdateResult_, error) {
|
||||
c.logger.DebugPrintf("SlaRestartInstances Thrift Payload: %v %+v %v\n", slaPolicy, jobKey, instances)
|
||||
|
||||
if len(instances) == 0 {
|
||||
c.logger.DebugPrintf("it is not necessary to restart 0 instances")
|
||||
return nil
|
||||
return nil, nil
|
||||
}
|
||||
|
||||
jobSummary, err := c.GetJobSummary(jobKey.Role)
|
||||
if err != nil {
|
||||
return err
|
||||
return nil, err
|
||||
}
|
||||
var jobConfig *aurora.JobConfiguration
|
||||
for _, s := range jobSummary.Summaries {
|
||||
|
@ -543,7 +545,7 @@ func (c *Client) SlaRestartInstances(slaPolicy *aurora.SlaPolicy, jobKey *aurora
|
|||
}
|
||||
}
|
||||
if jobConfig == nil {
|
||||
return fmt.Errorf("failed to find %v", jobKey)
|
||||
return nil, fmt.Errorf("failed to find %v", jobKey)
|
||||
}
|
||||
|
||||
// create job update request
|
||||
|
@ -559,11 +561,11 @@ func (c *Client) SlaRestartInstances(slaPolicy *aurora.SlaPolicy, jobKey *aurora
|
|||
}
|
||||
|
||||
msg := fmt.Sprintf("SlaRestartInstances %v-%v via StartJobUpdate", jobKey, instances)
|
||||
if _, err := c.StartJobUpdate(jobUpdate, ""); err != nil {
|
||||
return errors.Wrap(err, msg)
|
||||
if result, err := c.StartJobUpdate(jobUpdate, fmt.Sprintf("restart instances %v", instances)); err != nil {
|
||||
return nil, errors.Wrap(err, msg)
|
||||
} else {
|
||||
return result, nil
|
||||
}
|
||||
|
||||
return nil
|
||||
}
|
||||
|
||||
// Restarts all active tasks under a job configuration.
|
||||
|
|
|
@ -871,3 +871,59 @@ func TestRealisClient_GetJobSummary(t *testing.T) {
|
|||
|
||||
assert.NoError(t, err)
|
||||
}
|
||||
|
||||
func TestRealisClient_SlaRestartInstances(t *testing.T) {
|
||||
// Create a single job
|
||||
role := "vagrant"
|
||||
env := "prod"
|
||||
name := "slaRestartInstances"
|
||||
|
||||
job := realis.NewJob().
|
||||
Environment(env).
|
||||
Role(role).
|
||||
Name(name).
|
||||
ThermosExecutor(thermosExec).
|
||||
CPU(.01).
|
||||
RAM(4).
|
||||
Disk(10).
|
||||
Tier("preferred").
|
||||
InstanceCount(3).
|
||||
IsService(true)
|
||||
|
||||
// Needed to populate the task config correctly
|
||||
assert.NoError(t, job.BuildThermosPayload())
|
||||
|
||||
var cpu = 3.5
|
||||
var ram int64 = 20480
|
||||
var disk int64 = 10240
|
||||
err := r.SetQuota(role, &cpu, &ram, &disk)
|
||||
assert.NoError(t, err)
|
||||
|
||||
err = r.CreateJob(job)
|
||||
assert.NoError(t, err)
|
||||
|
||||
// waiting until all instances running
|
||||
success, err := r.MonitorScheduleStatus(job.JobKey(),
|
||||
job.GetInstanceCount(),
|
||||
[]aurora.ScheduleStatus{aurora.ScheduleStatus_RUNNING},
|
||||
1*time.Second,
|
||||
150*time.Second)
|
||||
assert.True(t, success)
|
||||
assert.NoError(t, err)
|
||||
|
||||
slaPolicy := &aurora.SlaPolicy{
|
||||
PercentageSlaPolicy: &aurora.PercentageSlaPolicy{
|
||||
Percentage: 50,
|
||||
DurationSecs: 0,
|
||||
},
|
||||
}
|
||||
|
||||
t.Run("TestRealisClient_SlaRestartInstances", func(t *testing.T) {
|
||||
result, err := r.SlaRestartInstances(job.JobKey(), slaPolicy, 0)
|
||||
assert.NoError(t, err)
|
||||
assert.NotNil(t, result)
|
||||
|
||||
assert.NoError(t, r.AbortJobUpdate(*result.GetKey(), "abort update to kill the job"))
|
||||
assert.NoError(t, r.KillJob(job.JobKey()))
|
||||
})
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue