From: Michael Wallner <mike@php.net>
Date: Fri, 10 Jan 2020 16:35:12 +0000 (+0100)
Subject: memcached_dump: ignore CLIENT_ERROR Illegal slab id
X-Git-Tag: pre_cmake~52
X-Git-Url: https://git.m6w6.name/?a=commitdiff_plain;h=1d0993d84fd87ef620f60380745914bac3e77d34;p=m6w6%2Flibmemcached

memcached_dump: ignore CLIENT_ERROR Illegal slab id
---

diff --git a/libmemcached/dump.cc b/libmemcached/dump.cc
index fcb66604..f74f3ed1 100644
--- a/libmemcached/dump.cc
+++ b/libmemcached/dump.cc
@@ -126,6 +126,18 @@ static memcached_return_t ascii_dump(Memcached *memc, memcached_dump_fn *callbac
         assert(response_rc == MEMCACHED_SUCCESS); // Just fail
         return response_rc;
       }
+      else if (response_rc == MEMCACHED_CLIENT_ERROR)
+      {
+        /* The maximum number of slabs has changed in the past (currently 1<<6-1),
+         * so ignore any client errors complaining about an illegal slab id.
+         */
+        if (0 == strncmp(buffer, "CLIENT_ERROR Illegal slab id", sizeof("CLIENT_ERROR Illegal slab id") - 1)) {
+          memcached_error_free(*instance);
+          memcached_error_free(*memc);
+        } else {
+          return response_rc;
+        }
+      }
       else
       {
         // IO error of some sort must have occurred