[ARVADOS] updated: 2.1.0-1135-g5d56a1af4

[Git user]

Summary of changes:
 build/run-build-packages-one-target.sh             |   1 +
 build/run-build-packages.sh                        |   2 +
 ...roller.service => arvados-dispatch-lsf.service} |   4 +-
 cmd/arvados-server/cmd.go                          |   2 +
 doc/_config.yml                                    |   2 +
 .../install-dispatch.html.textile.liquid           | 112 +++++++
 .../install-dispatch.html.textile.liquid           |   2 +-
 lib/config/config.default.yml                      |  16 +
 lib/config/export.go                               |   1 +
 lib/config/generated_config.go                     |  16 +
 lib/lsf/dispatch.go                                | 322 +++++++++++++++++++++
 lib/lsf/dispatch_test.go                           | 156 ++++++++++
 lib/lsf/lsfcli.go                                  |  92 ++++++
 lib/lsf/lsfqueue.go                                | 108 +++++++
 sdk/go/arvados/config.go                           |   7 +
 sdk/go/arvadostest/fixtures.go                     |   2 +
 sdk/go/dispatch/dispatch.go                        |  35 ++-
 sdk/go/dispatch/dispatch_test.go                   |   3 +-
 sdk/go/health/aggregator_test.go                   |   1 +
 .../crunch-dispatch-local/crunch-dispatch-local.go |   5 +-
 .../crunch-dispatch-local_test.go                  |  12 +-
 .../crunch-dispatch-slurm/crunch-dispatch-slurm.go |  40 +--
 .../crunch-dispatch-slurm_test.go                  |  35 +--
 23 files changed, 905 insertions(+), 71 deletions(-)
 copy cmd/arvados-server/{arvados-controller.service => arvados-dispatch-lsf.service} (90%)
 create mode 100644 doc/install/crunch2-lsf/install-dispatch.html.textile.liquid
 create mode 100644 lib/lsf/dispatch.go
 create mode 100644 lib/lsf/dispatch_test.go
 create mode 100644 lib/lsf/lsfcli.go
 create mode 100644 lib/lsf/lsfqueue.go

       via  5d56a1af42f64df57ef7a1bcef6d016ff2310900 (commit)
       via  efc1846a758929bdb57b87bdbb3f757f8907c69b (commit)
       via  e089871b753585b26f429968e865f8ae1e03b733 (commit)
       via  0f784d657527c998e7cd1d7aee8cbd8f0d75e04a (commit)
       via  7bebcf045b39a4bdecb345c9592c0515795c75aa (commit)
       via  3b63632698de9868a501191e8989f14c23e4e743 (commit)
       via  8145fbe8e6ab99184fcd41dea042ede63e9ff0d5 (commit)
       via  51afdd46ed4732d38496f80f7c07e05cfa15094e (commit)
       via  774d4659d60c017e9d3e0f68c5726abbe2465007 (commit)
       via  a58fb1d04bf2994de007e5347bd06d500ddbd68a (commit)
       via  5c8d598d480fb866b67f778cecbd93a6d4be148d (commit)
       via  86d0b4d05d9f6d89e281cd992584e729c4ad63bd (commit)
       via  ffa1fd1fdf584c71e248e9bb7d523f788a517510 (commit)
      from  c3e720561cc4c39b8e0ad5e01c825e6d4f44ed38 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit 5d56a1af42f64df57ef7a1bcef6d016ff2310900
Merge: c3e720561 efc1846a7
Author: Tom Clegg <tom at curii.com>
Date:   Thu Jul 29 09:57:48 2021 -0400

    Merge branch '17756-dispatch-lsf' into main
    
    closes #17756
    
    Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom at curii.com>

diff --cc services/crunch-dispatch-local/crunch-dispatch-local_test.go
index d976bf081,6ec31b173..92b8d2adc
--- a/services/crunch-dispatch-local/crunch-dispatch-local_test.go
+++ b/services/crunch-dispatch-local/crunch-dispatch-local_test.go
@@@ -81,11 -81,9 +81,11 @@@ func (s *TestSuite) TestIntegration(c *
  		return cmd.Start()
  	}
  
 +	cl := arvados.Cluster{Containers: arvados.ContainersConfig{RuntimeEngine: "docker"}}
 +
- 	dispatcher.RunContainer = func(d *dispatch.Dispatcher, c arvados.Container, s <-chan arvados.Container) {
- 		(&LocalRun{startCmd, make(chan bool, 8), ctx, &cl}).run(d, c, s)
- 		cancel()
+ 	dispatcher.RunContainer = func(d *dispatch.Dispatcher, c arvados.Container, s <-chan arvados.Container) error {
+ 		defer cancel()
 -		return (&LocalRun{startCmd, make(chan bool, 8), ctx}).run(d, c, s)
++		return (&LocalRun{startCmd, make(chan bool, 8), ctx, &cl}).run(d, c, s)
  	}
  
  	err = dispatcher.Run(ctx)
@@@ -186,11 -184,9 +186,11 @@@ func testWithServerStub(c *C, apiStubRe
  		return cmd.Start()
  	}
  
 +	cl := arvados.Cluster{Containers: arvados.ContainersConfig{RuntimeEngine: "docker"}}
 +
- 	dispatcher.RunContainer = func(d *dispatch.Dispatcher, c arvados.Container, s <-chan arvados.Container) {
- 		(&LocalRun{startCmd, make(chan bool, 8), ctx, &cl}).run(d, c, s)
- 		cancel()
+ 	dispatcher.RunContainer = func(d *dispatch.Dispatcher, c arvados.Container, s <-chan arvados.Container) error {
+ 		defer cancel()
 -		return (&LocalRun{startCmd, make(chan bool, 8), ctx}).run(d, c, s)
++		return (&LocalRun{startCmd, make(chan bool, 8), ctx, &cl}).run(d, c, s)
  	}
  
  	re := regexp.MustCompile(`(?ms).*` + expected + `.*`)

-----------------------------------------------------------------------


hooks/post-receive
--