X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/9e19b42c932e3c203a6e45d883b807d9dcc2c921..b1ffc878a5ea6ba083b8fbc8f20c15c7a6f1e1ec:/lib/config/config.default.yml diff --git a/lib/config/config.default.yml b/lib/config/config.default.yml index fa74e8e6c6..3fef27a736 100644 --- a/lib/config/config.default.yml +++ b/lib/config/config.default.yml @@ -74,12 +74,6 @@ Clusters: Keepbalance: InternalURLs: {SAMPLE: {ListenURL: ""}} ExternalURL: "" - GitHTTP: - InternalURLs: {SAMPLE: {ListenURL: ""}} - ExternalURL: "" - GitSSH: - InternalURLs: {SAMPLE: {ListenURL: ""}} - ExternalURL: "" DispatchCloud: InternalURLs: {SAMPLE: {ListenURL: ""}} ExternalURL: "" @@ -340,7 +334,6 @@ Clusters: # AutoSetupUsernameBlacklist is a list of usernames to be blacklisted for auto setup. AutoSetupNewUsers: false AutoSetupNewUsersWithVmUUID: "" - AutoSetupNewUsersWithRepository: false AutoSetupUsernameBlacklist: arvados: {} git: {} @@ -758,8 +751,8 @@ Clusters: TTL: 300s # Maximum amount of data cached in /var/cache/arvados/keep. - # Can be given as a percentage ("10%") or a number of bytes - # ("10 GiB") + # Can be given as a percentage of filesystem size ("10%") or a + # number of bytes ("10 GiB") DiskCacheSize: 10% # Approximate memory limit (in bytes) for session cache. @@ -801,6 +794,14 @@ Clusters: # load on the API server and you don't need it. WebDAVLogEvents: true + # Per-connection output buffer for WebDAV downloads. May improve + # throughput for large files, particularly when storage volumes + # have high latency. + # + # Size be specified as a number of bytes ("0") or with units + # ("128KiB", "1 MB"). + WebDAVOutputBuffer: 0 + Login: # One of the following mechanisms (Google, PAM, LDAP, or # LoginCluster) should be enabled; see @@ -1050,24 +1051,6 @@ Clusters: # production use. TrustPrivateNetworks: false - Git: - # Path to git or gitolite-shell executable. Each authenticated - # request will execute this program with the single argument "http-backend" - GitCommand: /usr/bin/git - - # Path to Gitolite's home directory. If a non-empty path is given, - # the CGI environment will be set up to support the use of - # gitolite-shell as a GitCommand: for example, if GitoliteHome is - # "/gh", then the CGI environment will have GITOLITE_HTTP_HOME=/gh, - # PATH=$PATH:/gh/bin, and GL_BYPASS_ACCESS_CHECKS=1. - GitoliteHome: "" - - # Git repositories must be readable by api server, or you won't be - # able to submit crunch jobs. To pass the test suites, put a clone - # of the arvados tree in {git_repositories_dir}/arvados.git or - # {git_repositories_dir}/arvados/.git - Repositories: /var/lib/arvados/git/repositories - TLS: # Use "file:///var/lib/acme/live/example.com/cert" and # ".../privkey" to load externally managed certificates. @@ -1327,47 +1310,6 @@ Clusters: SbatchArgumentsList: [] SbatchEnvironmentVariables: SAMPLE: "" - Managed: - # Path to dns server configuration directory - # (e.g. /etc/unbound.d/conf.d). If false, do not write any config - # files or touch restart.txt (see below). - DNSServerConfDir: "" - - # Template file for the dns server host snippets. See - # unbound.template in this directory for an example. If false, do - # not write any config files. - DNSServerConfTemplate: "" - - # String to write to {dns_server_conf_dir}/restart.txt (with a - # trailing newline) after updating local data. If false, do not - # open or write the restart.txt file. - DNSServerReloadCommand: "" - - # Command to run after each DNS update. Template variables will be - # substituted; see the "unbound" example below. If false, do not run - # a command. - DNSServerUpdateCommand: "" - - ComputeNodeDomain: "" - ComputeNodeNameservers: - "192.168.1.1": {} - SAMPLE: {} - - # Hostname to assign to a compute node when it sends a "ping" and the - # hostname in its Node record is nil. - # During bootstrapping, the "ping" script is expected to notice the - # hostname given in the ping response, and update its unix hostname - # accordingly. - # If false, leave the hostname alone (this is appropriate if your compute - # nodes' hostnames are already assigned by some other mechanism). - # - # One way or another, the hostnames of your node records should agree - # with your DNS records and your /etc/slurm-llnl/slurm.conf files. - # - # Example for compute0000, compute0001, ....: - # assign_node_hostname: compute%04d - # (See http://ruby-doc.org/core-2.2.2/Kernel.html#method-i-format for more.) - AssignNodeHostname: "compute%d" LSF: # Arguments to bsub when submitting Arvados containers as LSF jobs. @@ -1379,15 +1321,23 @@ Clusters: # %M memory in MB # %T tmp in MB # %G number of GPU devices (runtime_constraints.cuda.device_count) + # %W maximum run time in minutes (see MaxRunTimeOverhead and + # MaxRunTimeDefault below) # - # Use %% to express a literal %. The %%J in the default will be changed - # to %J, which is interpreted by bsub itself. + # Use %% to express a literal %. For example, the %%J in the + # default argument list 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 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]", "-R", "select[mem>=%MMB]", "-R", "select[tmp>=%TMB]", "-R", "select[ncpus>=%C]"] + # + # If ["-We", "%W"] or ["-W", "%W"] appear in this argument + # list, and MaxRunTimeDefault is not set (see below), both of + # those arguments will be dropped from the argument list when + # running a container that has no max_run_time value. + 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]", "-We", "%W"] # Arguments that will be appended to the bsub command line # when submitting Arvados containers as LSF jobs with @@ -1402,6 +1352,19 @@ Clusters: # Arvados LSF dispatcher runs ("submission host"). BsubSudoUser: "crunch" + # When passing the scheduling_constraints.max_run_time value + # to LSF via "%W", add this much time to account for + # crunch-run startup/shutdown overhead. + MaxRunTimeOverhead: 5m + + # If non-zero, MaxRunTimeDefault is used as the default value + # for max_run_time for containers that do not specify a time + # limit. MaxRunTimeOverhead will be added to this. + # + # Example: + # MaxRunTimeDefault: 2h + MaxRunTimeDefault: 0 + JobsAPI: # Enable the legacy 'jobs' API (crunch v1). This value must be a string. # @@ -1414,12 +1377,6 @@ Clusters: # 'false' -- disable the Jobs API despite presence of existing records. Enable: 'auto' - # Git repositories must be readable by api server, or you won't be - # able to submit crunch jobs. To pass the test suites, put a clone - # of the arvados tree in {git_repositories_dir}/arvados.git or - # {git_repositories_dir}/arvados/.git - GitInternalDir: /var/lib/arvados/internal.git - CloudVMs: # Enable the cloud scheduler. Enable: false