18290: Merge branch 'main' into 18290-lsf-bsub-args-template

Arvados-DCO-1.1-Signed-off-by: Ward Vandewege <ward@curii.com>

diff --combined lib/config/config.default.yml
index 52e35d83ff76296ee9d5f14202492e02e955375d,49f35d15cf4addb7691a8d23119dd616a29c8b39..3ff5382059033d2987073207d7fd52a5b6969429
--- 1/lib/config/config.default.yml
--- 2/lib/config/config.default.yml
+++ b/lib/config/config.default.yml
@@@ -33,7 -33,7 +33,7 @@@ Clusters
  
        RailsAPI:
          InternalURLs: {SAMPLE: {}}
-         ExternalURL: "-"
+         ExternalURL: ""
        Controller:
          InternalURLs: {SAMPLE: {}}
          ExternalURL: ""
@@@ -42,7 -42,7 +42,7 @@@
          ExternalURL: ""
        Keepbalance:
          InternalURLs: {SAMPLE: {}}
-         ExternalURL: "-"
+         ExternalURL: ""
        GitHTTP:
          InternalURLs: {SAMPLE: {}}
          ExternalURL: ""
@@@ -51,10 -51,10 +51,10 @@@
          ExternalURL: ""
        DispatchCloud:
          InternalURLs: {SAMPLE: {}}
-         ExternalURL: "-"
+         ExternalURL: ""
        DispatchLSF:
          InternalURLs: {SAMPLE: {}}
-         ExternalURL: "-"
+         ExternalURL: ""
        Keepproxy:
          InternalURLs: {SAMPLE: {}}
          ExternalURL: ""
@@@ -119,7 -119,7 +119,7 @@@
              # the old URL (with trailing slash omitted) to preserve
              # rendezvous ordering.
              Rendezvous: ""
-         ExternalURL: "-"
+         ExternalURL: ""
        Composer:
          InternalURLs: {SAMPLE: {}}
          ExternalURL: ""
@@@ -142,7 -142,7 +142,7 @@@
          ExternalURL: ""
        Health:
          InternalURLs: {SAMPLE: {}}
-         ExternalURL: "-"
+         ExternalURL: ""
  
      PostgreSQL:
        # max concurrent connections per arvados server daemon
@@@ -1021,23 -1021,14 +1021,23 @@@
            AssignNodeHostname: "compute%<slot_number>d"
  
        LSF:
 -        # Additional arguments to bsub when submitting Arvados
 -        # containers as LSF jobs.
 +        # Arguments to bsub when submitting Arvados containers as LSF jobs.
 +        #
 +        # Template variables starting with % will be substituted as follows:
 +        #
 +        # %U uuid
 +        # %C number of VCPUs
 +        # %M memory in MB
 +        # %T tmp in MB
 +        #
 +        # Use %% to express a literal %. The %%J in the default will be changed
 +        # to %J, which is interpreted by bsub itself.
          #
          # Note that the default arguments cause LSF to write two files
          # in /tmp on the compute node each time an Arvados container
          # runs. Ensure you have something in place to delete old files
 -        # from /tmp, or adjust these arguments accordingly.
 -        BsubArgumentsList: ["-o", "/tmp/crunch-run.%J.out", "-e", "/tmp/crunch-run.%J.err"]
 +        # from /tmp, or adjust the "-o" and "-e" arguments accordingly.
 +        BsubArgumentsList: ["-o", "/tmp/crunch-run.%%J.out", "-e", "/tmp/crunch-run.%%J.err", "-J", "%U", "-n", "%C", "-D", "%MMB", "-R", "rusage[mem=%MMB:tmp=%TMB] span[hosts=1]"]
  
          # Use sudo to switch to this user account when submitting LSF
          # jobs.

diff --combined lib/config/generated_config.go
index c58bbe1784ea48a5468613666ce4b834f143366b,6244b8dbdaba06d8ec8a9528bae601026872a6d1..2fe207eff8c500cdb4d71c7c45588449a57d681f
--- 1/lib/config/generated_config.go
--- 2/lib/config/generated_config.go
+++ b/lib/config/generated_config.go
@@@ -39,7 -39,7 +39,7 @@@ Clusters
  
        RailsAPI:
          InternalURLs: {SAMPLE: {}}
-         ExternalURL: "-"
+         ExternalURL: ""
        Controller:
          InternalURLs: {SAMPLE: {}}
          ExternalURL: ""
@@@ -48,7 -48,7 +48,7 @@@
          ExternalURL: ""
        Keepbalance:
          InternalURLs: {SAMPLE: {}}
-         ExternalURL: "-"
+         ExternalURL: ""
        GitHTTP:
          InternalURLs: {SAMPLE: {}}
          ExternalURL: ""
@@@ -57,10 -57,10 +57,10 @@@
          ExternalURL: ""
        DispatchCloud:
          InternalURLs: {SAMPLE: {}}
-         ExternalURL: "-"
+         ExternalURL: ""
        DispatchLSF:
          InternalURLs: {SAMPLE: {}}
-         ExternalURL: "-"
+         ExternalURL: ""
        Keepproxy:
          InternalURLs: {SAMPLE: {}}
          ExternalURL: ""
@@@ -125,7 -125,7 +125,7 @@@
              # the old URL (with trailing slash omitted) to preserve
              # rendezvous ordering.
              Rendezvous: ""
-         ExternalURL: "-"
+         ExternalURL: ""
        Composer:
          InternalURLs: {SAMPLE: {}}
          ExternalURL: ""
@@@ -148,7 -148,7 +148,7 @@@
          ExternalURL: ""
        Health:
          InternalURLs: {SAMPLE: {}}
-         ExternalURL: "-"
+         ExternalURL: ""
  
      PostgreSQL:
        # max concurrent connections per arvados server daemon
@@@ -1027,23 -1027,14 +1027,23 @@@
            AssignNodeHostname: "compute%<slot_number>d"
  
        LSF:
 -        # Additional arguments to bsub when submitting Arvados
 -        # containers as LSF jobs.
 +        # Arguments to bsub when submitting Arvados containers as LSF jobs.
 +        #
 +        # Template variables starting with % will be substituted as follows:
 +        #
 +        # %U uuid
 +        # %C number of VCPUs
 +        # %M memory in MB
 +        # %T tmp in MB
 +        #
 +        # Use %% to express a literal %. The %%J in the default will be changed
 +        # to %J, which is interpreted by bsub itself.
          #
          # Note that the default arguments cause LSF to write two files
          # in /tmp on the compute node each time an Arvados container
          # runs. Ensure you have something in place to delete old files
 -        # from /tmp, or adjust these arguments accordingly.
 -        BsubArgumentsList: ["-o", "/tmp/crunch-run.%J.out", "-e", "/tmp/crunch-run.%J.err"]
 +        # from /tmp, or adjust the "-o" and "-e" arguments accordingly.
 +        BsubArgumentsList: ["-o", "/tmp/crunch-run.%%J.out", "-e", "/tmp/crunch-run.%%J.err", "-J", "%U", "-n", "%C", "-D", "%MMB", "-R", "rusage[mem=%MMB:tmp=%TMB] span[hosts=1]"]
  
          # Use sudo to switch to this user account when submitting LSF
          # jobs.