Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Round 2 for Drupal transaction isolation, fixes #4281 #4351

Merged
merged 3 commits into from Oct 31, 2022
Merged

Round 2 for Drupal transaction isolation, fixes #4281 #4351

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
235f441
Revert "Setting the MySQL transaction isolation level"
rfay Oct 30, 2022
35aa2ab
Use the other approach for mysql transaction isolation level, fixes #…
rfay Oct 30, 2022
886a14b
Add info about Drupal 9.5+ database to docs [skip ci]
rfay Oct 31, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
31 changes: 22 additions & 9 deletions pkg/ddevapp/drupal.go
View file
Open in desktop
Expand Up @@ -382,15 +382,28 @@ func drupal8PostStartAction(app *DdevApp) error {
}

func drupalPostStartAction(app *DdevApp) error {
// pg_trm extension is required
if app.Database.Type == nodeps.Postgres && (isDrupal9App(app) || isDrupal10App(app)) {
stdout, stderr, err := app.Exec(&ExecOpts{
Service: "db",
Cmd: `psql -q -c "CREATE EXTENSION IF NOT EXISTS pg_trgm;" 2>/dev/null`,
NoCapture: false,
})
if err != nil {
util.Warning("unable to CREATE EXTENSION pg_trm: stdout='%s', stderr='%s', err=%v", stdout, stderr, err)
if isDrupal9App(app) || isDrupal10App(app) {
// pg_trm extension is required in Drupal9.5+
if app.Database.Type == nodeps.Postgres {
stdout, stderr, err := app.Exec(&ExecOpts{
Service: "db",
Cmd: `psql -q -c "CREATE EXTENSION IF NOT EXISTS pg_trgm;" 2>/dev/null`,
NoCapture: false,
})
if err != nil {
util.Warning("unable to CREATE EXTENSION pg_trm: stdout='%s', stderr='%s', err=%v", stdout, stderr, err)
}
}
// SET GLOBAL TRANSACTION ISOLATION LEVEL READ COMMITTED required in Drupal 9.5+
if app.Database.Type == nodeps.MariaDB || app.Database.Type == nodeps.MySQL {
stdout, stderr, err := app.Exec(&ExecOpts{
Service: "db",
Cmd: `mysql -e "SET GLOBAL TRANSACTION ISOLATION LEVEL READ COMMITTED;" 2>/dev/null`,
NoCapture: false,
})
if err != nil {
util.Warning("unable to SET GLOBAL TRANSACTION ISOLATION LEVEL READ COMMITTED: stdout='%s', stderr='%s', err=%v", stdout, stderr, err)
}
}
}
// Return early because we aren't expected to manage settings.
Expand Down
7 changes: 0 additions & 7 deletions pkg/ddevapp/drupal/drupal10/settings.ddev.php
View file
Open in desktop
Expand Up @@ -28,13 +28,6 @@
'prefix' => "{{ $config.DatabasePrefix }}",
);


// Setting the MySQL transaction isolation level.
// @see https://www.drupal.org/docs/system-requirements/setting-the-mysql-transaction-isolation-level
if ($driver === "mysql") {
$databases['default']['default']['init_commands']['isolation_level'] = 'SET SESSION TRANSACTION ISOLATION LEVEL READ COMMITTED';
}

$settings['hash_salt'] = '{{ $config.HashSalt }}';

// This will prevent Drupal from setting read-only permissions on sites/default.
Expand Down
7 changes: 0 additions & 7 deletions pkg/ddevapp/drupal/drupal9/settings.ddev.php
View file
Open in desktop
Expand Up @@ -28,13 +28,6 @@
'prefix' => "{{ $config.DatabasePrefix }}",
);


// Setting the MySQL transaction isolation level.
// @see https://www.drupal.org/docs/system-requirements/setting-the-mysql-transaction-isolation-level
if ($driver === "mysql") {
$databases['default']['default']['init_commands']['isolation_level'] = 'SET SESSION TRANSACTION ISOLATION LEVEL READ COMMITTED';
}

$settings['hash_salt'] = '{{ $config.HashSalt }}';

// This will prevent Drupal from setting read-only permissions on sites/default.
Expand Down