From 1b60c7c4a2d934554d3bea2fe20632599cf5a6f8 Mon Sep 17 00:00:00 2001
From: Barrett Smith <ba66e77@users.noreply.github.com>
Date: Thu, 6 Sep 2018 14:38:30 -0400
Subject: [PATCH] Fixes #3055: Update memcache settings to match changes in
 Drupal memcache module. (#3058)

* Require drupa/memcache equal or greater than 2.0-alpha7.

* Updating memcache settings based on change in drupal/memcache module.
---
 composer.suggested.json        |  4 ++--
 settings/memcache.settings.php | 16 ++++++++++++----
 2 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/composer.suggested.json b/composer.suggested.json
index ddab58364a..8f3336c165 100644
--- a/composer.suggested.json
+++ b/composer.suggested.json
@@ -6,14 +6,14 @@
     }
   },
   "require": {
-    "acquia/lightning": "~3.2.0",
     "acquia/drupal-spec-tool": "^2.0.0",
+    "acquia/lightning": "^3.1.0",
     "drupal/acquia_connector": "^1.5.0",
     "drupal/acquia_purge": "^1.0-beta3",
     "drupal/cog": "^1.0.0",
     "drupal/devel": "^1.0.0",
     "drupal/qa_accounts": "^1.0.0-alpha1",
-    "drupal/memcache": "2.0-alpha7",
+    "drupal/memcache": "^2.0-alpha7",
     "drupal/seckit": "^1.0.0-alpha2",
     "drupal/security_review": "*",
     "drupal/shield": "^1.0.0",
diff --git a/settings/memcache.settings.php b/settings/memcache.settings.php
index ffc90813a0..22b7b4bde7 100644
--- a/settings/memcache.settings.php
+++ b/settings/memcache.settings.php
@@ -24,8 +24,7 @@
 
     $settings['container_yamls'][] = DRUPAL_ROOT . '/modules/contrib/memcache/memcache.services.yml';
 
-    // Define custom bootstrap container definition to use Memcache for
-    // cache.container.
+    // Bootstrap cache.container with memcache rather than database.
     $settings['bootstrap_container_definition'] = [
       'parameters' => [],
       'services' => [
@@ -43,14 +42,18 @@
           'arguments' => ['@settings'],
         ],
         'memcache.backend.cache.factory' => [
-          'class' => 'Drupal\memcache\Driver\MemcacheDriverFactory',
-          'arguments' => ['@memcache.settings'],
+          'class' => 'Drupal\memcache\MemcacheDriverFactory',
+          'arguments' => ['@memcache.config'],
         ],
         'memcache.backend.cache.container' => [
           'class' => 'Drupal\memcache\DrupalMemcacheFactory',
           'factory' => ['@memcache.backend.cache.factory', 'get'],
           'arguments' => ['container'],
         ],
+        'lock.container' => [
+          'class' => 'Drupal\memcache\Lock\MemcacheLockBackend',
+          'arguments' => ['container', '@memcache.backend.cache.container'],
+        ],
         'cache_tags_provider.container' => [
           'class' => 'Drupal\Core\Cache\DatabaseCacheTagsChecksum',
           'arguments' => ['@database'],
@@ -60,6 +63,8 @@
           'arguments' => [
             'container',
             '@memcache.backend.cache.container',
+            '@lock.container',
+            '@memcache.config',
             '@cache_tags_provider.container',
           ],
         ],
@@ -77,5 +82,8 @@
 
     // Enable stampede protection.
     $settings['memcache']['stampede_protection'] = TRUE;
+
+    // Move locks to memcache.
+    $settings['container_yamls'][] = DRUPAL_ROOT . '/../vendor/acquia/blt/settings/memcache.yml';
   }
 }