X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/659f1244e1d0b427317efa5550ee4f6e7f80ba96..c3d4f8a585202ec58df5506934b698039c200b68:/services/crunch-dispatch-slurm/crunch-dispatch-slurm_test.go diff --git a/services/crunch-dispatch-slurm/crunch-dispatch-slurm_test.go b/services/crunch-dispatch-slurm/crunch-dispatch-slurm_test.go index ede767c82a..8809e7bcc6 100644 --- a/services/crunch-dispatch-slurm/crunch-dispatch-slurm_test.go +++ b/services/crunch-dispatch-slurm/crunch-dispatch-slurm_test.go @@ -8,6 +8,7 @@ import ( "git.curoverse.com/arvados.git/sdk/go/arvadostest" "git.curoverse.com/arvados.git/sdk/go/dispatch" "io" + "io/ioutil" "log" "net/http" "net/http/httptest" @@ -80,7 +81,8 @@ func (s *TestSuite) TestIntegrationCancel(c *C) { return exec.Command("echo") } - container := s.integrationTest(c, func() *exec.Cmd { return exec.Command("echo", "zzzzz-dz642-queuedcontainer") }, + container := s.integrationTest(c, + func() *exec.Cmd { return exec.Command("echo", "zzzzz-dz642-queuedcontainer") }, []string(nil), func(dispatcher *dispatch.Dispatcher, container arvados.Container) { dispatcher.UpdateState(container.UUID, dispatch.Running) @@ -98,8 +100,7 @@ func (s *TestSuite) TestIntegrationMissingFromSqueue(c *C) { container := s.integrationTest(c, func() *exec.Cmd { return exec.Command("echo") }, []string{"sbatch", "--share", fmt.Sprintf("--job-name=%s", "zzzzz-dz642-queuedcontainer"), fmt.Sprintf("--mem-per-cpu=%d", 2862), - fmt.Sprintf("--cpus-per-task=%d", 4), - fmt.Sprintf("--priority=%d", 1)}, + fmt.Sprintf("--cpus-per-task=%d", 4)}, func(dispatcher *dispatch.Dispatcher, container arvados.Container) { dispatcher.UpdateState(container.UUID, dispatch.Running) time.Sleep(3 * time.Second) @@ -134,7 +135,7 @@ func (s *TestSuite) integrationTest(c *C, }(squeueCmd) squeueCmd = newSqueueCmd - // There should be no queued containers now + // There should be one queued container params := arvadosclient.Dict{ "filters": [][]string{{"state", "=", "Queued"}}, } @@ -143,28 +144,26 @@ func (s *TestSuite) integrationTest(c *C, c.Check(err, IsNil) c.Check(len(containers.Items), Equals, 1) - echo := "echo" - crunchRunCommand = &echo + theConfig.CrunchRunCommand = []string{"echo"} - doneProcessing := make(chan struct{}) dispatcher := dispatch.Dispatcher{ - Arv: arv, - PollInterval: time.Duration(1) * time.Second, + Arv: arv, + PollPeriod: time.Duration(1) * time.Second, RunContainer: func(dispatcher *dispatch.Dispatcher, container arvados.Container, status chan arvados.Container) { go runContainer(dispatcher, container) run(dispatcher, container, status) - doneProcessing <- struct{}{} + dispatcher.Stop() }, - DoneProcessing: doneProcessing} + } - squeueUpdater.StartMonitor(time.Duration(500) * time.Millisecond) + sqCheck = SqueueChecker{Period: 500 * time.Millisecond} - err = dispatcher.RunDispatcher() + err = dispatcher.Run() c.Assert(err, IsNil) - squeueUpdater.Done() + sqCheck.Stop() c.Check(sbatchCmdLine, DeepEquals, sbatchCmdComps) @@ -180,7 +179,7 @@ func (s *TestSuite) integrationTest(c *C, return container } -func (s *MockArvadosServerSuite) Test_APIErrorGettingContainers(c *C) { +func (s *MockArvadosServerSuite) TestAPIErrorGettingContainers(c *C) { apiStubResponses := make(map[string]arvadostest.StubResponse) apiStubResponses["/arvados/v1/api_client_authorizations/current"] = arvadostest.StubResponse{200, `{"uuid":"` + arvadostest.Dispatch1AuthUUID + `"}`} apiStubResponses["/arvados/v1/containers"] = arvadostest.StubResponse{500, string(`{}`)} @@ -194,7 +193,7 @@ func testWithServerStub(c *C, apiStubResponses map[string]arvadostest.StubRespon api := httptest.NewServer(&apiStub) defer api.Close() - arv := arvadosclient.ArvadosClient{ + arv := &arvadosclient.ArvadosClient{ Scheme: "http", ApiServer: api.URL[7:], ApiToken: "abc123", @@ -206,12 +205,11 @@ func testWithServerStub(c *C, apiStubResponses map[string]arvadostest.StubRespon log.SetOutput(io.MultiWriter(buf, os.Stderr)) defer log.SetOutput(os.Stderr) - crunchRunCommand = &crunchCmd + theConfig.CrunchRunCommand = []string{crunchCmd} - doneProcessing := make(chan struct{}) dispatcher := dispatch.Dispatcher{ - Arv: arv, - PollInterval: time.Duration(1) * time.Second, + Arv: arv, + PollPeriod: time.Duration(1) * time.Second, RunContainer: func(dispatcher *dispatch.Dispatcher, container arvados.Container, status chan arvados.Container) { @@ -221,19 +219,110 @@ func testWithServerStub(c *C, apiStubResponses map[string]arvadostest.StubRespon dispatcher.UpdateState(container.UUID, dispatch.Complete) }() run(dispatcher, container, status) - doneProcessing <- struct{}{} + dispatcher.Stop() }, - DoneProcessing: doneProcessing} + } go func() { for i := 0; i < 80 && !strings.Contains(buf.String(), expected); i++ { time.Sleep(100 * time.Millisecond) } - dispatcher.DoneProcessing <- struct{}{} + dispatcher.Stop() }() - err := dispatcher.RunDispatcher() + err := dispatcher.Run() c.Assert(err, IsNil) c.Check(buf.String(), Matches, `(?ms).*`+expected+`.*`) } + +func (s *MockArvadosServerSuite) TestNoSuchConfigFile(c *C) { + var config Config + err := readConfig(&config, "/nosuchdir89j7879/8hjwr7ojgyy7") + c.Assert(err, NotNil) +} + +func (s *MockArvadosServerSuite) TestBadSbatchArgsConfig(c *C) { + var config Config + + tmpfile, err := ioutil.TempFile(os.TempDir(), "config") + c.Check(err, IsNil) + defer os.Remove(tmpfile.Name()) + + _, err = tmpfile.Write([]byte(`{"SbatchArguments": "oops this is not a string array"}`)) + c.Check(err, IsNil) + + err = readConfig(&config, tmpfile.Name()) + c.Assert(err, NotNil) +} + +func (s *MockArvadosServerSuite) TestNoSuchArgInConfigIgnored(c *C) { + var config Config + + tmpfile, err := ioutil.TempFile(os.TempDir(), "config") + c.Check(err, IsNil) + defer os.Remove(tmpfile.Name()) + + _, err = tmpfile.Write([]byte(`{"NoSuchArg": "Nobody loves me, not one tiny hunk."}`)) + c.Check(err, IsNil) + + err = readConfig(&config, tmpfile.Name()) + c.Assert(err, IsNil) + c.Check(0, Equals, len(config.SbatchArguments)) +} + +func (s *MockArvadosServerSuite) TestReadConfig(c *C) { + var config Config + + tmpfile, err := ioutil.TempFile(os.TempDir(), "config") + c.Check(err, IsNil) + defer os.Remove(tmpfile.Name()) + + args := []string{"--arg1=v1", "--arg2", "--arg3=v3"} + argsS := `{"SbatchArguments": ["--arg1=v1", "--arg2", "--arg3=v3"]}` + _, err = tmpfile.Write([]byte(argsS)) + c.Check(err, IsNil) + + err = readConfig(&config, tmpfile.Name()) + c.Assert(err, IsNil) + c.Check(3, Equals, len(config.SbatchArguments)) + c.Check(args, DeepEquals, config.SbatchArguments) +} + +func (s *MockArvadosServerSuite) TestSbatchFuncWithNoConfigArgs(c *C) { + testSbatchFuncWithArgs(c, nil) +} + +func (s *MockArvadosServerSuite) TestSbatchFuncWithEmptyConfigArgs(c *C) { + testSbatchFuncWithArgs(c, []string{}) +} + +func (s *MockArvadosServerSuite) TestSbatchFuncWithConfigArgs(c *C) { + testSbatchFuncWithArgs(c, []string{"--arg1=v1", "--arg2"}) +} + +func testSbatchFuncWithArgs(c *C, args []string) { + theConfig.SbatchArguments = append(theConfig.SbatchArguments, args...) + + container := arvados.Container{UUID: "123", RuntimeConstraints: arvados.RuntimeConstraints{RAM: 250000000, VCPUs: 2}} + sbatchCmd := sbatchFunc(container) + + var expected []string + expected = append(expected, "sbatch", "--share") + expected = append(expected, theConfig.SbatchArguments...) + expected = append(expected, "--job-name=123", "--mem-per-cpu=120", "--cpus-per-task=2") + + c.Check(sbatchCmd.Args, DeepEquals, expected) +} + +func (s *MockArvadosServerSuite) TestSbatchPartition(c *C) { + theConfig.SbatchArguments = nil + container := arvados.Container{UUID: "123", RuntimeConstraints: arvados.RuntimeConstraints{RAM: 250000000, VCPUs: 1}, SchedulingParameters: arvados.SchedulingParameters{Partitions: []string{"blurb", "b2"}}} + sbatchCmd := sbatchFunc(container) + + var expected []string + expected = append(expected, "sbatch", "--share") + expected = append(expected, "--job-name=123", "--mem-per-cpu=239", "--cpus-per-task=1", "--partition=blurb,b2") + + c.Check(sbatchCmd.Args, DeepEquals, expected) +}