Skip to content

Commit 739ee52

Browse files
authored
[AN-524] Switch docs to reference Batch instead of Papi (#7816)
1 parent d21586b commit 739ee52

File tree

21 files changed

+61
-987
lines changed

21 files changed

+61
-987
lines changed

docs/RuntimeAttributes.md

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,6 @@ There are a number of additional runtime attributes that apply to the Google Clo
6464
- [noAddress](#noaddress)
6565
- [gpuCount, gpuType, and nvidiaDriverVersion](#gpucount-gputype-and-nvidiadriverversion)
6666
- [cpuPlatform](#cpuplatform)
67-
- [useDockerImageCache](#usedockerimagecache)
6867

6968

7069
### AWS Specific Attributes
@@ -445,12 +444,6 @@ The following CPU platforms are currently supported by the Google Cloud backend:
445444
- `Intel Sandy Bridge`
446445
- `AMD Rome`
447446

448-
### 'useDockerImageCache'
449-
450-
This option is specific to the Google Cloud backend, moreover it is only supported by Google Life Sciences API starting from version v2 beta.
451-
In order to use this feature Cromwell has to have PAPI v2 backend configured with this feature enabled.
452-
More information about this feature and it's configuration can be found [in the Google backend section of documentation](backends/Google.md).
453-
454447
### `awsBatchRetryAttempts`
455448

456449
*Default: _0_*

docs/backends/Backends.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ Cromwell distribution:
99
* Run jobs as subprocesses or via a dispatcher.
1010
* Supports launching in Docker containers.
1111
* Use `bash`, `qsub`, and `bsub` to run scripts.
12-
* **[Google Cloud](Google)**
12+
* **[Google Cloud](GCPBatch)**
1313
* Launch jobs on Google Compute Engine through Google Batch.
1414
* **[GA4GH TES](TES)**
1515
* Launch jobs on servers that support the GA4GH Task Execution Schema (TES).

docs/backends/Google.md

Lines changed: 0 additions & 682 deletions
This file was deleted.

docs/backends/HPC.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ during execution as `/mnt/three` was not present inside the running container.
115115
### Additional FileSystems
116116

117117
HPC backends (as well as the Local backend) can be configured to be able to interact with other type of filesystems, where the input files can be located for example.
118-
Currently the only other filesystem supported is Google Cloud Storage (GCS). See the [Google section](Google) of the documentation for information on how to configure GCS in Cromwell.
118+
Currently the only other filesystem supported is Google Cloud Storage (GCS). See the [Google section](GCPBatch) of the documentation for information on how to configure GCS in Cromwell.
119119
Once you have a google authentication configured, you can simply add a `gcs` stanza in your configuration file to enable GCS:
120120

121121
```

docs/cromwell_features/CallCaching.md

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -112,18 +112,18 @@ allows Cromwell to record which file path prefixes were involved in cache result
112112
If Cromwell sees that the file paths for a candidate cache hit have a blacklisted prefix, Cromwell will quickly
113113
fail the copy attempt without doing any potentially expensive I/O.
114114

115-
Path prefix blacklisting could be supported by any backend type though it is currently implemented only for Google
116-
(PAPI) backends. For Google backends the GCS bucket is considered the prefix for blacklisting purposes.
115+
Path prefix blacklisting could be supported by any backend type though it is currently implemented only for Google backends.
116+
For Google backends the GCS bucket is considered the prefix for blacklisting purposes.
117117

118118

119119
***Call cache whitelisting***
120120

121121
In a multi-user environment where access to job outputs may be restricted among different users, it can be useful to limit
122122
cache hits to those that are more likely to actually be readable for cache hit copies.
123-
Cromwell now supports a `call_cache_hit_path_prefixes` workflow option for this purpose. This is particularly useful in the PAPI backend where the workflow
124-
root can be specified in workflow options via `jes_gcs_root`. The value of `call_cache_hit_path_prefixes` should be an array of strings representing
125-
prefixes that call cache hit output files should have in order to be considered as a cache hit. Using PAPI as an example and assuming Alice and Bob have
126-
made their data accessible to each other, Alice could submit a workflow with these options:
123+
Cromwell now supports a `call_cache_hit_path_prefixes` workflow option for this purpose. This is particularly useful in the GCP Batch backend where the workflow
124+
root can be specified in workflow options via `gcp_batch_gcs_root`. The value of `call_cache_hit_path_prefixes` should be an array of strings representing
125+
prefixes that call cache hit output files should have in order to be considered as a cache hit. Assuming Alice and Bob have made their data accessible to each other,
126+
Alice could submit a workflow with these options:
127127

128128
```
129129
{
@@ -133,10 +133,10 @@ made their data accessible to each other, Alice could submit a workflow with the
133133

134134
With these workflow options Cromwell would only look for cache hits for Alice's jobs in Alice's or Bob's buckets.
135135

136-
As a further optimization the PAPI backend has the concept of "this" bucket on a per-workflow basis, where "this" bucket is
136+
As a further optimization the Batch backend has the concept of "this" bucket on a per-workflow basis, where "this" bucket is
137137
the bucket that contains the current workflow root.
138138
If `call_cache_hit_path_prefixes` is specified in
139-
workflow options on the PAPI backend, Cromwell will automatically prepend "this" bucket to the call cache hit path prefixes to search.
139+
workflow options on the Batch backend, Cromwell will automatically prepend "this" bucket to the call cache hit path prefixes to search.
140140
For example, if Charles specified the same workflow options as in the example above and his workflow root was under `gs://charles_bucket`,
141141
Cromwell would search cache hits in all of the `gs://alice_bucket`, `gs://bob_bucket` and `gs://charles_bucket` buckets without having to specify
142142
`gs://charles_bucket` bucket explicitly in `call_cache_hit_path_prefixes`.

docs/cromwell_features/HogFactors.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ Additionally, you can override system-level hog-factor on a backend level, by se
6868
```conf
6969
backend {
7070
providers {
71-
PAPIv2 {
71+
GCPBatch {
7272
config {
7373
hog-factor: 2
7474
}
@@ -145,13 +145,13 @@ jobA1, jobB1, jobC1, jobD1, jobA2, jobB2, jobD2, jobA3, ..., jobA1000000
145145

146146
##### An administrator sets up a Cromwell server
147147

148-
- A Cromwell administrator sets the overall maximum concurrent job limit to 100,000 PAPIv2 jobs.
148+
- A Cromwell administrator sets the overall maximum concurrent job limit to 100,000 GCP Batch jobs.
149149
- The administrator also sets the hog factor to be 25.
150-
- Cromwell will therefore calculate a per-hog-group concurrent job limit of 4,000 PAPIv2 jobs.
150+
- Cromwell will therefore calculate a per-hog-group concurrent job limit of 4,000 GCP Batch jobs.
151151

152152
##### Our first hog group hits its limit
153153

154-
- 100 workflows are running in hog group "A" and between them have generated 20,000 jobs for PAPIv2.
154+
- 100 workflows are running in hog group "A" and between them have generated 20,000 jobs for GCP Batch.
155155
+ Cromwell initially starts 4,000 jobs.
156156
+ Cromwell then starts the remaining 16,000 new jobs as existing jobs from this group finish.
157157
+ New workflows in this group will not be able to start jobs either
@@ -160,7 +160,7 @@ jobA1, jobB1, jobC1, jobD1, jobA2, jobB2, jobD2, jobA3, ..., jobA1000000
160160

161161
##### Another hog group appears
162162

163-
- Now hog group B submits 1,000 workflows and between them they generate 200,000 jobs for PAPIv2.
163+
- Now hog group B submits 1,000 workflows and between them they generate 200,000 jobs for GCP Batch.
164164
- Even though 16,000 of group A's jobs are still queued, Cromwell starts 4,000 of group B's jobs immediately,
165165
- The remaining 196,000 of group B's jobs are queued up waiting for group B's existing jobs to complete.
166166

docs/developers/Centaur.md

Lines changed: 19 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -124,28 +124,23 @@ Note: To exclude a specific test from a test suite, find the `.sh` file that run
124124

125125
## Upgrade / Horicromtal / etc.
126126

127-
| CI Test Type | Cromwell Config | Centaur Config |
128-
|-------------------------------|------------------------------------------------------------------|--------------------------------------------------------|
129-
| Engine Upgrade | `(backend)_application.conf` | `centaur_application.conf`* |
130-
| Horicromtal | `papi_[v2beta or v2alpha1]_horicromtal_application.conf`** | `centaur_application_`<br>`horicromtal.conf` |
131-
| Horicromtal<br>Engine Upgrade | `papi_v2beta_application.conf`** | `centaur_application_`<br>`horicromtal_no_assert.conf` |
132-
| PAPI Upgrade | `papi_v1_v2alpha1_upgrade_application.conf`** | `centaur_application.conf`* |
133-
| Papi Upgrade<br>New Workflows | `(backend)_application.conf` | `centaur_application.conf`* |
134-
| WDL Upgrade | `(backend)_application.conf` | `centaur_application.conf`* |
135-
| (other) | `(backend)_application.conf` | `centaur_application.conf`* |
127+
| CI Test Type | Cromwell Config | Centaur Config |
128+
|--------------------------------|--------------------------------------------|--------------------------------------------------------|
129+
| Engine Upgrade | `(backend)_application.conf` | `centaur_application.conf`* |
130+
| Horicromtal | `(backend)_horicromtal_application.conf`** | `centaur_application_`<br>`horicromtal.conf` |
131+
| Horicromtal<br>Engine Upgrade | `(backend))_application.conf`** | `centaur_application_`<br>`horicromtal_no_assert.conf` |
132+
| WDL Upgrade | `(backend)_application.conf` | `centaur_application.conf`* |
133+
| (other) | `(backend)_application.conf` | `centaur_application.conf`* |
136134

137135
| CI Test Type | ScalaTest Spec | Test Directory |
138136
|-------------------------------|-----------------------------|-------------------------------------|
139137
| Engine Upgrade | `EngineUpgradeTestCaseSpec` | `engineUpgradeTestCases` |
140138
| Horicromtal | `CentaurTestSuite` | `standardTestCases`*** |
141139
| Horicromtal<br>Engine Upgrade | `EngineUpgradeTestCaseSpec` | `engineUpgradeTestCases`*** |
142-
| PAPI Upgrade | `PapiUpgradeTestCaseSpec` | `papiUpgradeTestCases` |
143-
| PAPI Upgrade<br>New Workflows | `CentaurTestSuite` | `papiUpgradeNewWorkflowsTestCases` |
144140
| (other) | `CentaurTestSuite` | `standardTestCases` |
145141

146142
<small>
147-
\* Centaur Config always uses `centaur_application.conf` except when overridden with `papi_v2alpha1_centaur_application.conf`
148-
or `papi_v2beta_centaur_application.conf`
143+
\* Centaur Config always uses `centaur_application.conf` except when overridden with `centaur_application_horicromtal.conf`
149144
([48 preview link](https://github.com/broadinstitute/cromwell/blob/a7d0601/src/ci/bin/test.inc.sh#L455-L457))
150145
\*\* Cromwell Config overrides
151146
([47 link](https://github.com/broadinstitute/cromwell/blob/47/src/ci/bin/test.inc.sh#L213-L221))
@@ -158,24 +153,23 @@ or `papi_v2beta_centaur_application.conf`
158153
1. db-mstr: started first
159154
2. sum-back: runs summarizer
160155
3. front-back: exposes HTTP
161-
- Horicromtal Engine Upgrade: Combination of Horicromtal and Engine Upgrade
162-
- PAPI Upgrade: Tests run with an older version of Papi and upon restart use a newer version of Papi
163-
- PAPI Upgrade New Workflows: Test definition [does not run any tests](https://travis-ci.org/broadinstitute/cromwell/jobs/475378412)
156+
- Horicromtal Engine Upgrade: Combination of Horicromtal and Engine Upgrade
164157
- WDL Upgrade: Upgrades WDL from draft-2 to 1.0 before testing
165158
- (other): Runs `*.test` files listing the configured backend names
166159

167160
## RDBMS
168161

169-
| Backend | MySQL | PostgreSQL | MariaDB |
170-
|---------|:------:|:-----------:|:--------:|
171-
| AWS || | |
172-
| Local || | |
173-
| PAPI V2 || | |
174-
| SLURM || | |
175-
| TES || | |
162+
| Backend | MySQL | PostgreSQL | MariaDB |
163+
|-----------|:------:|:-----------:|:--------:|
164+
| AWS | | | |
165+
| GCP Batch | | | |
166+
| Local || | |
167+
| SLURM || | |
168+
| TES || | |
176169

177170
<small>
178-
⭕ Tests Horicromtal Engine Upgrade versus standard Centaur suite
171+
⭕ Tests Horicromtal Engine versus standard Centaur suite
179172
</small>
180173

181-
All backends run against MySQL. The Local backend also test PostgreSQL, allowing contributors ensure WDLs work with PostgreSQL. MariaDB is tested on a specialized upgrade, where the MySQL connector client is used first, and the MariaDB client is used after restart.
174+
All backends run against MySQL. The Local backend also test PostgreSQL, allowing contributors ensure WDLs work with PostgreSQL.
175+
MariaDB is tested on a specialized upgrade, where the MySQL connector client is used first, and the MariaDB client is used after restart.

0 commit comments

Comments
 (0)