From 6f320b4b986a73c696e4319ddf9a04f0ac0bec0a Mon Sep 17 00:00:00 2001
From: Vincent Untz <vuntz@suse.com>
Date: Mon, 13 Nov 2017 14:36:19 +0100
Subject: [PATCH] Change memcache_socket_timeout to a float

It's not unusual to set 0.25 as a socket_timeout value, and this was
not possible. This can have a dramatic impact for performance when one
memcached server is down, especially when keystone is involved.

Change-Id: I01356b7873ad78cb38779f5c5ddd2b932889c911
Partial-Bug: #1731921
---
 oslo_cache/_opts.py                                    | 10 +++++-----
 oslo_cache/backends/memcache_pool.py                   |  2 +-
 .../memcache_socket_timeout-a7db772f052c107e.yaml      |  5 +++++
 3 files changed, 11 insertions(+), 6 deletions(-)
 create mode 100644 releasenotes/notes/memcache_socket_timeout-a7db772f052c107e.yaml

diff --git a/oslo_cache/_opts.py b/oslo_cache/_opts.py
index 6c8a7132..d90fd8c1 100644
--- a/oslo_cache/_opts.py
+++ b/oslo_cache/_opts.py
@@ -76,11 +76,11 @@ FILE_OPTIONS = {
                    help='Number of seconds memcached server is considered dead'
                    ' before it is tried again. (dogpile.cache.memcache and'
                    ' oslo_cache.memcache_pool backends only).'),
-        cfg.IntOpt('memcache_socket_timeout',
-                   default=3,
-                   help='Timeout in seconds for every call to a server.'
-                   ' (dogpile.cache.memcache and oslo_cache.memcache_pool'
-                   ' backends only).'),
+        cfg.FloatOpt('memcache_socket_timeout',
+                     default=3.0,
+                     help='Timeout in seconds for every call to a server.'
+                     ' (dogpile.cache.memcache and oslo_cache.memcache_pool'
+                     ' backends only).'),
         cfg.IntOpt('memcache_pool_maxsize',
                    default=10,
                    help='Max total number of open connections to every'
diff --git a/oslo_cache/backends/memcache_pool.py b/oslo_cache/backends/memcache_pool.py
index df0f37e9..8703fd1a 100644
--- a/oslo_cache/backends/memcache_pool.py
+++ b/oslo_cache/backends/memcache_pool.py
@@ -45,7 +45,7 @@ class PooledMemcachedBackend(memcached_backend.MemcachedBackend):
             self.url,
             arguments={
                 'dead_retry': arguments.get('dead_retry', 5 * 60),
-                'socket_timeout': arguments.get('socket_timeout', 3),
+                'socket_timeout': arguments.get('socket_timeout', 3.0),
             },
             maxsize=arguments.get('pool_maxsize', 10),
             unused_timeout=arguments.get('pool_unused_timeout', 60),
diff --git a/releasenotes/notes/memcache_socket_timeout-a7db772f052c107e.yaml b/releasenotes/notes/memcache_socket_timeout-a7db772f052c107e.yaml
new file mode 100644
index 00000000..d974c554
--- /dev/null
+++ b/releasenotes/notes/memcache_socket_timeout-a7db772f052c107e.yaml
@@ -0,0 +1,5 @@
+---
+features:
+  - |
+    `memcache_socket_timeout` is changed to float, given the same default value
+    '3.0'.