Skip to content
Snippets Groups Projects
Commit 98764757 authored by Yas Naoi's avatar Yas Naoi
Browse files

Issue #3293949 by yas, baldwinlouie: Refactor to set the MySQL transaction...

Issue #3293949 by yas, baldwinlouie: Refactor to set the MySQL transaction isolation level (READ COMMITTED)
parent cb248274
No related branches found
No related tags found
3 merge requests!1316Issue #3310263: Release 4.5.0,!1260Issue #3307397: Release 4.4.0,!1153Issue #3293949: Set the MySQL transaction isolation level (READ COMMITTED)
......@@ -151,6 +151,9 @@ services:
# The settings must be written after enabling the memcache module.
tee -a "${SETTINGS_FILE}" > /dev/null << EOF
\$databases['default']['default']['init_commands'] = [
'isolation_level' => 'SET SESSION TRANSACTION ISOLATION LEVEL READ COMMITTED',
];
\$settings['memcache']['servers'] = ['memcached:11211' => 'default'];
\$settings['memcache']['bins'] = ['default' => 'default'];
\$settings['memcache']['key_prefix'] = 'cloud_orchestrator';
......
......@@ -225,20 +225,23 @@ Resources:
-d --name mariadb mariadb
settings_file=\$CO_DIR/docroot/sites/default/settings.php
sudo tee -a \$settings_file > /dev/null <<SETTINGS
\\\$databases['default']['default'] = array (
'database' => '${DatabaseName}',
'username' => 'administrator',
'password' => '\${!random_pass}',
'prefix' => '',
'host' => 'mysql',
'port' => '3306',
'namespace' => 'Drupal\\\\Core\\\\Database\\\\Driver\\\\mysql',
'driver' => 'mysql',
);
\\\$settings['file_private_path'] = '/var/www/cloud_orchestrator/files/private';
\\\$settings['config_sync_directory'] = '../files/config/sync';
SETTINGS
sudo tee -a \$settings_file > /dev/null << EOF
\\\$databases['default']['default'] = [
'database' => '${DatabaseName}',
'username' => 'administrator',
'password' => '\${!random_pass}',
'prefix' => '',
'host' => 'mysql',
'port' => '3306',
'namespace' => 'Drupal\\\\Core\\\\Database\\\\Driver\\\\mysql',
'driver' => 'mysql',
'init_commands' => [
'isolation_level' => 'SET SESSION TRANSACTION ISOLATION LEVEL READ COMMITTED',
],
];
\\\$settings['file_private_path'] = '/var/www/cloud_orchestrator/files/private';
\\\$settings['config_sync_directory'] = '../files/config/sync';
EOF
IMAGE_TAG=docomoinnovations/cloud_orchestrator
CONTAINER_NAME=cloud-orchestrator
......
......@@ -52,19 +52,22 @@ Fn::Base64:
sudo chown -R ubuntu:www-data $FILES_DIR
sudo chmod -R g+w $FILES_DIR
sudo tee -a $SETTINGS_FILE >/dev/null <<EOF
sudo tee -a $SETTINGS_FILE >/dev/null << EOF
\$settings['file_private_path'] = '/var/www/cloud_orchestrator/files/private';
\$settings['config_sync_directory'] = '../files/config/sync';
\$databases['default']['default'] = array (
'database' => '${DatabaseName}',
'username' => '${MySQLUserName}',
'password' => '${MySQLPassword}',
'prefix' => '',
'host' => '${DatabaseEndpointAddress}',
'port' => '${DatabasePort}',
'namespace' => 'Drupal\\\\Core\\\\Database\\\\Driver\\\\mysql',
'driver' => 'mysql',
);
\$databases['default']['default'] = [
'database' => '${DatabaseName}',
'username' => '${MySQLUserName}',
'password' => '${MySQLPassword}',
'prefix' => '',
'host' => '${DatabaseEndpointAddress}',
'port' => '${DatabasePort}',
'namespace' => 'Drupal\\\\Core\\\\Database\\\\Driver\\\\mysql',
'driver' => 'mysql',
'init_commands' => [
'isolation_level' => 'SET SESSION TRANSACTION ISOLATION LEVEL READ COMMITTED',
],
];
EOF
# Setup the docker
......@@ -111,14 +114,14 @@ Fn::Base64:
# AWS and K8s are enabled by default.
VERSION_REGEX="^(3.*)"
if [[ "${CloudOrchestratorVersion}" =~ $VERSION_REGEX ]]; then
# Install Cloud Orchestrator using Drush
sudo docker exec -w $DOCKER_DIR $CONTAINER_NAME sh -c "drush si -y \
--db-url=\'mysql://${MySQLUserName}:${MySQLPassword}@${DatabaseEndpointAddress}:${DatabasePort}/${DatabaseName}\' \
--account-name='${DrupalUserName}' \
--account-pass='${DrupalPassword}' \
--site-name='Cloud Orchestrator' \
--account-mail='${DrupalEmail}' \
cloud_orchestrator"
# Install Cloud Orchestrator using Drush
sudo docker exec -w $DOCKER_DIR $CONTAINER_NAME sh -c "drush si -y \
--db-url=\'mysql://${MySQLUserName}:${MySQLPassword}@${DatabaseEndpointAddress}:${DatabasePort}/${DatabaseName}\' \
--account-name='${DrupalUserName}' \
--account-pass='${DrupalPassword}' \
--site-name='Cloud Orchestrator' \
--account-mail='${DrupalEmail}' \
cloud_orchestrator"
else
# Install Cloud Orchestrator using Drush
sudo docker exec -w $DOCKER_DIR $CONTAINER_NAME sh -c "drush si -y \
......
......@@ -70,7 +70,10 @@ EOF
drush en -y memcache memcache_admin
tee -a "${SETTINGS_FILE}" > /dev/null <<EOF
tee -a "${SETTINGS_FILE}" > /dev/null << EOF
\$databases['default']['default']['init_commands'] = [
'isolation_level' => 'SET SESSION TRANSACTION ISOLATION LEVEL READ COMMITTED',
];
\$settings['memcache']['servers'] = ['${MEMCACHED_HOST}:${MEMCACHED_PORT}' => 'default'];
\$settings['memcache']['bins'] = ['default' => 'default'];
\$settings['memcache']['key_prefix'] = 'cloud_orchestrator';
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment