18308: Merge branch 'main' into 18308-enable-collection-versioning

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

diff --combined lib/config/config.default.yml
index 51c59a8aac81b78efb71b987c947016056482831,7813db4f0988ade30e979ecf9d2f5533759e06dc..310191517552e3fab0e15408decde47d54f5e727
--- 1/lib/config/config.default.yml
--- 2/lib/config/config.default.yml
+++ b/lib/config/config.default.yml
@@@ -497,12 -497,12 +497,12 @@@ Clusters
        # is older than the amount of seconds defined on PreserveVersionIfIdle,
        # a snapshot of the collection's previous state is created and linked to
        # the current collection.
 -      CollectionVersioning: false
 +      CollectionVersioning: true
  
        #   0s = auto-create a new version on every update.
        #  -1s = never auto-create new versions.
        # > 0s = auto-create a new version when older than the specified number of seconds.
 -      PreserveVersionIfIdle: -1s
 +      PreserveVersionIfIdle: 10s
  
        # If non-empty, allow project and collection names to contain
        # the "/" character (slash/stroke/solidus), and replace "/" with
@@@ -1089,7 -1089,7 +1089,7 @@@
          # 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 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]"]
+         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]", "-R", "select[mem>=%MMB]", "-R", "select[tmp>=%TMB]", "-R", "select[ncpus>=%C]"]
  
          # Use sudo to switch to this user account when submitting LSF
          # jobs.

diff --combined lib/config/generated_config.go
index c10b12578f7cffbafa3efab962540fef47383e81,39e4ae00cbcc23d8e4a22bf2e30390e692d67ab4..0532d83bb3749245495126e0a3333702a6d19f9c
--- 1/lib/config/generated_config.go
--- 2/lib/config/generated_config.go
+++ b/lib/config/generated_config.go
@@@ -503,12 -503,12 +503,12 @@@ Clusters
        # is older than the amount of seconds defined on PreserveVersionIfIdle,
        # a snapshot of the collection's previous state is created and linked to
        # the current collection.
 -      CollectionVersioning: false
 +      CollectionVersioning: true
  
        #   0s = auto-create a new version on every update.
        #  -1s = never auto-create new versions.
        # > 0s = auto-create a new version when older than the specified number of seconds.
 -      PreserveVersionIfIdle: -1s
 +      PreserveVersionIfIdle: 10s
  
        # If non-empty, allow project and collection names to contain
        # the "/" character (slash/stroke/solidus), and replace "/" with
@@@ -1095,7 -1095,7 +1095,7 @@@
          # 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 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]"]
+         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]", "-R", "select[mem>=%MMB]", "-R", "select[tmp>=%TMB]", "-R", "select[ncpus>=%C]"]
  
          # Use sudo to switch to this user account when submitting LSF
          # jobs.