ridv/gorealis-v2
1
0
Fork 0
Code Issues Pull requests Projects Releases 13 Packages Wiki Activity Actions

Rebasing

Browse source
This commit is contained in:
Renán Del Valle 2021-10-15 13:54:13 -07:00
parent fe664178ce
commit ff603c67a5
No known key found for this signature in database
GPG key ID: C240AD6D6F443EC9
3 changed files with 32 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

7
monitors.go
View file

@ -245,7 +245,7 @@ func (c *Client) MonitorHostMaintenance(hosts []string,
} }
} }
// AutoPaused monitor is a special monitor for auto pause enabled batch updates. This monitor ensures that the update // MonitorAutoPausedUpdate is a special monitor for auto pause enabled batch updates. This monitor ensures that the update
// being monitored is capable of auto pausing and has auto pausing enabled. After verifying this information, // being monitored is capable of auto pausing and has auto pausing enabled. After verifying this information,
// the monitor watches for the job to enter the ROLL_FORWARD_PAUSED state and calculates the current batch // the monitor watches for the job to enter the ROLL_FORWARD_PAUSED state and calculates the current batch
// the update is in using information from the update configuration. // the update is in using information from the update configuration.
@ -294,8 +294,9 @@ func (c *Client) MonitorAutoPausedUpdate(key aurora.JobUpdateKey, interval, time
return -1, err return -1, err
} }
// Summary 0 is assumed to exist because MonitorJobUpdateQuery will return an error if there is Summaries // Summary 0 is assumed to exist because MonitorJobUpdateQuery will return an error if there is no summaries
if summary[0].State.Status != aurora.JobUpdateStatus_ROLL_FORWARD_PAUSED { if !(summary[0].State.Status == aurora.JobUpdateStatus_ROLL_FORWARD_PAUSED ||
summary[0].State.Status == aurora.JobUpdateStatus_ROLLED_FORWARD) {
return -1, errors.Errorf("update is in a terminal state %v", summary[0].State.Status) return -1, errors.Errorf("update is in a terminal state %v", summary[0].State.Status)
} }

38
realis_e2e_test.go
View file

@ -54,6 +54,8 @@ func TestMain(m *testing.M) {
} }
func TestNonExistentEndpoint(t *testing.T) { func TestNonExistentEndpoint(t *testing.T) {
t.Parallel()
backoff := realis.Backoff{ // Reduce penalties for this test to make it quick backoff := realis.Backoff{ // Reduce penalties for this test to make it quick
Steps: 5, Steps: 5,
Duration: 1 * time.Second, Duration: 1 * time.Second,
@ -84,6 +86,8 @@ func TestNonExistentEndpoint(t *testing.T) {
} }
func TestBadCredentials(t *testing.T) { func TestBadCredentials(t *testing.T) {
t.Parallel()
r, err := realis.NewClient(realis.SchedulerUrl("http://192.168.33.7:8081"), r, err := realis.NewClient(realis.SchedulerUrl("http://192.168.33.7:8081"),
realis.BasicAuth("incorrect", "password"), realis.BasicAuth("incorrect", "password"),
realis.Debug()) realis.Debug())
@ -94,7 +98,7 @@ func TestBadCredentials(t *testing.T) {
job := realis.NewJob(). job := realis.NewJob().
Environment("prod"). Environment("prod").
Role("vagrant"). Role("vagrant").
Name("create_thermos_job_test"). Name("create_thermos_job_bad_creds_test").
ThermosExecutor(thermosExec). ThermosExecutor(thermosExec).
CPU(.5). CPU(.5).
RAM(64). RAM(64).
@ -110,6 +114,8 @@ func TestBadCredentials(t *testing.T) {
} }
func TestThriftBinary(t *testing.T) { func TestThriftBinary(t *testing.T) {
t.Parallel()
r, err := realis.NewClient(realis.SchedulerUrl("http://192.168.33.7:8081"), r, err := realis.NewClient(realis.SchedulerUrl("http://192.168.33.7:8081"),
realis.BasicAuth("aurora", "secret"), realis.BasicAuth("aurora", "secret"),
realis.Timeout(20*time.Second), realis.Timeout(20*time.Second),
@ -131,6 +137,8 @@ func TestThriftBinary(t *testing.T) {
} }
func TestThriftJSON(t *testing.T) { func TestThriftJSON(t *testing.T) {
t.Parallel()
r, err := realis.NewClient(realis.SchedulerUrl("http://192.168.33.7:8081"), r, err := realis.NewClient(realis.SchedulerUrl("http://192.168.33.7:8081"),
realis.BasicAuth("aurora", "secret"), realis.BasicAuth("aurora", "secret"),
realis.Timeout(20*time.Second), realis.Timeout(20*time.Second),
@ -153,6 +161,8 @@ func TestThriftJSON(t *testing.T) {
} }
func TestNoopLogger(t *testing.T) { func TestNoopLogger(t *testing.T) {
t.Parallel()
r, err := realis.NewClient(realis.SchedulerUrl("http://192.168.33.7:8081"), r, err := realis.NewClient(realis.SchedulerUrl("http://192.168.33.7:8081"),
realis.BasicAuth("aurora", "secret"), realis.BasicAuth("aurora", "secret"),
realis.SetLogger(realis.NoopLogger{})) realis.SetLogger(realis.NoopLogger{}))
@ -173,6 +183,8 @@ func TestNoopLogger(t *testing.T) {
} }
func TestLeaderFromZK(t *testing.T) { func TestLeaderFromZK(t *testing.T) {
t.Parallel()
cluster := realis.GetDefaultClusterFromZKUrl("192.168.33.2:2181") cluster := realis.GetDefaultClusterFromZKUrl("192.168.33.2:2181")
url, err := realis.LeaderFromZK(*cluster) url, err := realis.LeaderFromZK(*cluster)
@ -181,6 +193,8 @@ func TestLeaderFromZK(t *testing.T) {
} }
func TestInvalidAuroraURL(t *testing.T) { func TestInvalidAuroraURL(t *testing.T) {
t.Parallel()
for _, url := range []string{ for _, url := range []string{
"http://doesntexist.com:8081/apitest", "http://doesntexist.com:8081/apitest",
"test://doesntexist.com:8081", "test://doesntexist.com:8081",
@ -193,6 +207,8 @@ func TestInvalidAuroraURL(t *testing.T) {
} }
func TestValidAuroraURL(t *testing.T) { func TestValidAuroraURL(t *testing.T) {
t.Parallel()
for _, url := range []string{ for _, url := range []string{
"http://domain.com:8081/api", "http://domain.com:8081/api",
"https://domain.com:8081/api", "https://domain.com:8081/api",
@ -209,7 +225,6 @@ func TestValidAuroraURL(t *testing.T) {
} }
func TestRealisClient_ReestablishConn(t *testing.T) { func TestRealisClient_ReestablishConn(t *testing.T) {
// Test that we're able to tear down the old connection and create a new one. // Test that we're able to tear down the old connection and create a new one.
err := r.ReestablishConn() err := r.ReestablishConn()
@ -217,14 +232,14 @@ func TestRealisClient_ReestablishConn(t *testing.T) {
} }
func TestGetCACerts(t *testing.T) { func TestGetCACerts(t *testing.T) {
t.Parallel()
certs, err := realis.GetCerts("./examples/certs") certs, err := realis.GetCerts("./examples/certs")
assert.NoError(t, err) assert.NoError(t, err)
assert.Equal(t, len(certs.Subjects()), 2) assert.Equal(t, len(certs.Subjects()), 2)
} }
func TestRealisClient_CreateJob_Thermos(t *testing.T) { func TestRealisClient_CreateJob_Thermos(t *testing.T) {
role := "vagrant" role := "vagrant"
job := realis.NewJob(). job := realis.NewJob().
Environment("prod"). Environment("prod").
@ -251,7 +266,7 @@ func TestRealisClient_CreateJob_Thermos(t *testing.T) {
// Fetch all Jobs // Fetch all Jobs
result, err := r.GetJobs(role) result, err := r.GetJobs(role)
fmt.Printf("GetJobs length: %+v \n", len(result.Configs)) fmt.Println("GetJobs length: ", len(result.Configs))
assert.Len(t, result.Configs, 1) assert.Len(t, result.Configs, 1)
assert.NoError(t, err) assert.NoError(t, err)
@ -280,7 +295,6 @@ func TestRealisClient_CreateJob_Thermos(t *testing.T) {
// Test configuring an executor that doesn't exist for CreateJob API // Test configuring an executor that doesn't exist for CreateJob API
func TestRealisClient_CreateJob_ExecutorDoesNotExist(t *testing.T) { func TestRealisClient_CreateJob_ExecutorDoesNotExist(t *testing.T) {
// Create a single job // Create a single job
job := realis.NewJob(). job := realis.NewJob().
Environment("prod"). Environment("prod").
@ -299,7 +313,6 @@ func TestRealisClient_CreateJob_ExecutorDoesNotExist(t *testing.T) {
// Test configuring an executor that doesn't exist for CreateJob API // Test configuring an executor that doesn't exist for CreateJob API
func TestRealisClient_GetPendingReason(t *testing.T) { func TestRealisClient_GetPendingReason(t *testing.T) {
env := "prod" env := "prod"
role := "vagrant" role := "vagrant"
name := "pending_reason_test" name := "pending_reason_test"
@ -333,7 +346,6 @@ func TestRealisClient_GetPendingReason(t *testing.T) {
} }
func TestRealisClient_CreateService_WithPulse_Thermos(t *testing.T) { func TestRealisClient_CreateService_WithPulse_Thermos(t *testing.T) {
fmt.Println("Creating service") fmt.Println("Creating service")
role := "vagrant" role := "vagrant"
job := realis.NewJobUpdate(). job := realis.NewJobUpdate().
@ -813,7 +825,7 @@ func TestRealisClient_BatchAwareAutoPause(t *testing.T) {
job := realis.NewJob(). job := realis.NewJob().
Environment("prod"). Environment("prod").
Role("vagrant"). Role("vagrant").
Name("BatchAwareAutoPauseTest"). Name("batch_aware_auto_pause_test").
ThermosExecutor(thermosExec). ThermosExecutor(thermosExec).
CPU(.01). CPU(.01).
RAM(4). RAM(4).
@ -844,7 +856,11 @@ func TestRealisClient_BatchAwareAutoPause(t *testing.T) {
} }
assert.Equal(t, i, curStep) assert.Equal(t, i, curStep)
require.NoError(t, r.ResumeJobUpdate(key, "auto resuming test"))
if i != len(updateGroups)-1 {
require.NoError(t, err)
require.NoError(t, r.ResumeJobUpdate(key, "auto resuming test"))
}
} }
assert.NoError(t, r.KillJob(strategy.JobKey())) assert.NoError(t, r.KillJob(strategy.JobKey()))
} }
@ -852,7 +868,7 @@ func TestRealisClient_BatchAwareAutoPause(t *testing.T) {
func TestRealisClient_GetJobSummary(t *testing.T) { func TestRealisClient_GetJobSummary(t *testing.T) {
role := "vagrant" role := "vagrant"
env := "prod" env := "prod"
name := "GetJobSummaryJob" name := "test_get_job_summary"
// Create a single job // Create a single job
job := realis.NewJob(). job := realis.NewJob().
Environment(env). Environment(env).

2
runTestsMac.sh
View file

@ -1,4 +1,4 @@
#!/bin/bash #!/bin/bash
# Since we run our docker compose setup in bridge mode to be able to run on MacOS, we have to launch a Docker container within the bridge network in order to avoid any routing issues. # Since we run our docker compose setup in bridge mode to be able to run on MacOS, we have to launch a Docker container within the bridge network in order to avoid any routing issues.
docker run --rm -t -v $(pwd):/go/src/github.com/aurora-scheduler/gorealis --network gorealis_aurora_cluster golang:1.13-stretch go test -v github.com/aurora-scheduler/gorealis $@ docker run --rm -t -w /gorealis -v $GOPATH/pkg:/go/pkg -v $(pwd):/gorealis --network scheduler_aurora_cluster golang:1.17-buster go test -v github.com/aurora-scheduler/gorealis/v2 $@