Skip to content

Commit

Permalink
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'main' into centralized-content-character-count
Browse files Browse the repository at this point in the history
davidmpickett authored Jan 18, 2024
2 parents ef9292f + 2dc5a04 commit bdf02a5
Showing 37 changed files with 1,439 additions and 1,059 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/actions-metrics.yml
Original file line number Diff line number Diff line change
@@ -11,7 +11,7 @@ jobs:
timeout-minutes: 10
steps:
- name: Send GitHub Actions metrics to DataDog
uses: int128/datadog-actions-metrics@6c6a657047c0452b33ec3c254009c331e47c1370 # v1.64.0
uses: int128/datadog-actions-metrics@12d225bf2f764e5103a994157c1316df39dc3fae # v1.68.0
with:
datadog-api-key: ${{ secrets.DATADOG_API_KEY }}
collect-job-metrics: true
2 changes: 1 addition & 1 deletion .github/workflows/tugboat-pr-closed.yml
Original file line number Diff line number Diff line change
@@ -14,7 +14,7 @@ jobs:
name: Delete Tugboat Preview
steps:
- name: Restore Preview ID
uses: actions/cache/restore@704facf57e6136b1bc63b828d79edcd491f0ee84 # v3.3.2
uses: actions/cache/restore@e12d46a63a90f2fae62d114769bbf2a179198b5c # v3.3.3
with:
path: .tugboat_preview.txt
key: ${{ runner.os }}-tugboat-preview-id-pr-${{ github.event.pull_request.number }}
2 changes: 1 addition & 1 deletion .github/workflows/tugboat-pr-opened.yml
Original file line number Diff line number Diff line change
@@ -39,7 +39,7 @@ jobs:
key: `${{ runner.os }}-tugboat-preview-id-pr-${{ github.event.pull_request.number }}`,
});
- name: Save Preview ID
uses: actions/cache/save@704facf57e6136b1bc63b828d79edcd491f0ee84 # v3.3.2
uses: actions/cache/save@e12d46a63a90f2fae62d114769bbf2a179198b5c # v3.3.3
with:
path: .tugboat_preview.txt
key: ${{ runner.os }}-tugboat-preview-id-pr-${{ github.event.pull_request.number }}
2 changes: 1 addition & 1 deletion .github/workflows/tugboat-pr-updated.yml
Original file line number Diff line number Diff line change
@@ -14,7 +14,7 @@ jobs:
name: Rebuild Tugboat Preview
steps:
- name: Restore Preview ID
uses: actions/cache/restore@704facf57e6136b1bc63b828d79edcd491f0ee84 # v3.3.2
uses: actions/cache/restore@e12d46a63a90f2fae62d114769bbf2a179198b5c # v3.3.3
with:
path: .tugboat_preview.txt
key: ${{ runner.os }}-tugboat-preview-id-pr-${{ github.event.pull_request.number }}
2 changes: 1 addition & 1 deletion .github/workflows/tugboat-refresh-cache-responder.yml
Original file line number Diff line number Diff line change
@@ -11,7 +11,7 @@ jobs:
if: ${{ github.event.label.name == 'refresh-tugboat-cache' }}
steps:
- name: Refresh Preview ID
uses: actions/cache/restore@704facf57e6136b1bc63b828d79edcd491f0ee84 # v3.3.2
uses: actions/cache/restore@e12d46a63a90f2fae62d114769bbf2a179198b5c # v3.3.3
with:
path: .tugboat_preview.txt
key: ${{ runner.os }}-tugboat-preview-id-pr-${{ github.event.pull_request.number }}
20 changes: 20 additions & 0 deletions READMES/devops/tugboat.md
Original file line number Diff line number Diff line change
@@ -33,3 +33,23 @@ Can only update CPU and memory at a project level, not repository level.
1. `tugboat ls 5fd3b8ee7b465711575722d5 -j | grep memory` # Get current limit
1. `tugboat update 5fd3b8ee7b465711575722d5 memory=16384` # Set limit to 16GB
1. `tugboat ls 5fd3b8ee7b465711575722d5 -j | grep memory` # Verify new limit

## Tugboat Crisis Intervention

### Overload

**Symptoms**: Tugboat is slow, requests to Tugboat dashboard return 502/504 status codes, previews disappear and reappear, etc.

**Diagnosis**: Tugboat might be overloaded; too many previews might be running simultaneously.

**Verification**:

1. Log into the Tugboat server (`ssm-session utility tugboat auto`).
2. Check system load and free memory (e.g. `top`).
3. If load is incredibly high, and available memory is very low, then the Tugboat server might be dealing with too many open previews.

**Remediation**:

1. Close unused previews in the CMS/Pull Requests project. Target older previews and those corresponding to closed/merged PRs; these should be closed automatically, but there may be issues somewhere in the system that impair communication and cause these to remain open.
2. Suspend older previews. This normally happens automatically (for Pull Request-based previews that haven't been touched in some period of time), but a flurry of previews might have been created inadvertently.
3. Consider upscaling the Tugboat server or migrating to an alternative architecture.
16 changes: 8 additions & 8 deletions composer.json
Original file line number Diff line number Diff line change
@@ -49,9 +49,8 @@
"drupal/consumers": "^1.17.0",
"drupal/content_lock": "^2.3",
"drupal/content_model_documentation": "^1.0.19",
"drupal/core": "10.1.7 as 9.5",
"drupal/core-composer-scaffold": "10.1.7 as 9.5",
"drupal/core-recommended": "10.1.7 as 9.5",
"drupal/core-composer-scaffold": "^10.2.0",
"drupal/core-recommended": "^10.2.0",
"drupal/crop": "^2.0",
"drupal/csv_serialization": "^4.0",
"drupal/ctools_block": "^4.0",
@@ -194,7 +193,7 @@
"drupal/views_local_tasks": "^1.0",
"drupal/workbench_access": "^2.0",
"drupal/workbench_menu_access": "^2.0",
"drush/drush": "^11",
"drush/drush": "^12",
"easyrdf/easyrdf": "1.1.1 as 0.9.1",
"geocoder-php/mapbox-provider": "^1.3",
"gitonomy/gitlib": "^1.2",
@@ -223,7 +222,7 @@
"symfony/phpunit-bridge": "^5.1",
"symfony/process": "^6.3",
"symfony/routing": "^6.3",
"va-gov/content-build": "^0.0.3418",
"va-gov/content-build": "^0.0.3422",
"vlucas/phpdotenv": "^5.3",
"webflo/drupal-finder": "^1.0.0",
"webmozart/path-util": "^2.3",
@@ -390,10 +389,10 @@
"2767243 - Create a theme suggestion for taxonomy terms by view mode": "https://www.drupal.org/files/issues/core-theme-suggestion-for-taxonomy-view-modes-2767243-14.patch",
"2775665 - MenuLinkContent updateLink function generates a PHP Warning for override-able keys that are not present in the loaded entity": "https://www.drupal.org/files/issues/2021-09-17/updateLink-2775665-14.patch",
"Claro claro_preprocess_input()": "patches/drupal-core-claro_preprocess_input.patch",
"1156338 - Fixed maximum number of field values, but use «add more» similar to when cardinality «unlimited» is used": "https://www.drupal.org/files/issues/2022-01-27/drupal-fix-limited-cardinality-fields-1156338-23.patch",
"1156338 - Fixed maximum number of field values, but use «add more» similar to when cardinality «unlimited» is used": "https://www.drupal.org/files/issues/2023-12-20/1156338-31.patch",
"2942404 - Contentinfo landmark" : "https://www.drupal.org/files/issues/2023-06-30/2942404-messages-should-have-role-status.patch",
"3047110 - Add workflow to taxonomy" : "https://www.drupal.org/files/issues/2023-04-14/3047110-45.patch",
"3106205 - Length of menu_tree.url and menu_tree.route_param_key are too short (255 characters)": "https://www.drupal.org/files/issues/2023-05-24/3106205-length-menu-tree-too-short.patch",
"3106205 - Length of menu_tree.url and menu_tree.route_param_key are too short (255 characters)": "https://www.drupal.org/files/issues/2024-01-02/3106205-length-menu-tree-too-short-48.patch",
"3333401 - Pager h4 cause accessibility flag on many pages": "https://www.drupal.org/files/issues/2023-11-01/3333401-64.patch",
"3382759 - Add multiple workflow content moderation filter to Views.": "https://www.drupal.org/files/issues/2023-08-24/3382759-8.patch",
"3241295 - CKEditor 5 isn't respecting field widgets row settings": "https://www.drupal.org/files/issues/2023-11-14/3241295-d10.1.6-114.patch",
@@ -508,7 +507,8 @@
},
"drupal/smart_date": {
"3260965 - Undefined index: #value": "https://www.drupal.org/files/issues/2022-01-27/smart_date_undefined_value_in_validation.patch",
"3385720 - Implement errorElement() in Widgets": "https://www.drupal.org/files/issues/2023-09-08/smart_date-implement-errorelement-3385720-3.patch"
"3385720 - Implement errorElement() in Widgets": "https://www.drupal.org/files/issues/2023-09-08/smart_date-implement-errorelement-3385720-3.patch",
"3413612 - The repeat end date should not be allowed to come before the start time": "https://www.drupal.org/files/issues/2024-01-11/smart_date-repeat-end-date-3413612-0.patch"
},
"drupal/tablefield": {
"3100109 - 0 string value in cell throws empty error": "https://www.drupal.org/files/issues/2019-12-10/0-value-throwing-empty-error.patch",
Loading

0 comments on commit bdf02a5

Please sign in to comment.