Merge ~paelzer/ubuntu/+source/memcached:fix-focal-ftbfs into ubuntu/+source/memcached:ubuntu/focal-devel

[Christian Ehrhardt ]

[Christian Ehrhardt  (paelzer)]

PPA: https://launchpad.net/~ci-train-ppa-service/+archive/ubuntu/3910/+packages
Ticket: https://bileto.ubuntu.com/#/ticket/3910
Tests: https://bileto.ubuntu.com/excuses/3910/focal.html
Bug: https://bugs.launchpad.net/ubuntu/+source/memcached/+bug/1861783

Don't stumble over the flask-limiter/python-limits tests.
Both of these packages exist in focal, but only in proposed atm.
Therefore the tests need to re-run with proposed-enabled for them.

[Christian Ehrhardt  (paelzer)]

FYI Debian MP up as well: https://salsa.debian.org/lamby/pkg-memcached/merge_requests/1

[Christian Ehrhardt  (paelzer)]

Upstream issue: https://github.com/memcached/memcached/issues/606

[Bryce Harrington (bryce)]

LGTM, +1

* Changelog:
  - [-] old content and logical tag match as expected
  - [√] changelog entry correct version and targeted codename
  - [√] changelog entries correct
  - [√] update-maintainer has been run

* Actual changes:
  - [√] no upstream changes to consider
  - [-] no further upstream version to consider
  - [-] debian changes look safe

* Old Delta:
  - [-] dropped changes are ok to be dropped
  - [-] nothing else to drop
  - [√] changes forwarded upstream/debian (if appropriate)
    + https://github.com/memcached/memcached/issues/606

* New Delta:
  - [-] no new patches added
  - [√] patches match what was proposed upstream
    + https://github.com/kanak/memcached/commit/0ffde456cb21a7a03ee263f026edd565bb0f2123
  - [√] patches correctly included in debian/patches/series
  - [√] patches have correct DEP3 metadata

* Build/Test:
  - [√] build is ok
    + PPA built fine
    + Built locally in lxc using `debuild -uc -is -i`, incl. testsuite
  - [√] verified PPA package installs/uninstalls/purges
  - [√] autopkgtest against the PPA package passes
  - [√] sanity checks test fine

debuild built it fine, I did notice a couple errors but they appear non-fatal, and sound like non-issues for this fix, and so safe to ignore:
  E: memcached source: license-problem-non-free-RFC-BCP78 doc/protocol-binary-range.txt
  E: memcached source: license-problem-non-free-RFC-BCP78 doc/protocol-binary.txt

autopkgtest [18:43:43]: test client.pl: [-----------------------
netstat:
[*] memcached not listen udp
[*] stats OK
[*] Store key and value pair
 mykey:mycustomvalue stored
[*] Get mykey value
 mykey value found: 'mycustomvalue'
[*] Flush all keys
[*] Verify that mykey is missing
 mykey is not found (OK because of previous flush)
autopkgtest [18:43:44]: test client.pl: -----------------------]
autopkgtest [18:43:44]: test client.pl: - - - - - - - - - - results - - - - - - - - - -
client.pl PASS
autopkgtest [18:43:44]: @@@@@@@@@@@@@@@@@@@@ summary
daemon PASS
client.pl PASS

review: Approve

[Christian Ehrhardt  (paelzer)]

Thanks for the extra checks!

Upstream released a new version before the fix for this got merged.
We could rebase onto that new version, but now also arm64 is broken.

Aarr - this isn't fun :-/

[Christian Ehrhardt  (paelzer)]

Maybe I need to file a bug to Debian on top of the MP ...
=> https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=950777

I rebased exactly what was approved and it works on top of 1.5.22 as well.
Doing an an upload of that now

To ssh://git.launchpad.net/~usd-import-team/ubuntu/+source/memcached
 * [new tag] upload/1.5.22-1ubuntu1 -> upload/1.5.22-1ubuntu1

Uploading to ubuntu (via ftp to upload.ubuntu.com):
  Uploading memcached_1.5.22-1ubuntu1.dsc: done.
  Uploading memcached_1.5.22-1ubuntu1.debian.tar.xz: done.
  Uploading memcached_1.5.22-1ubuntu1_source.buildinfo: done.
  Uploading memcached_1.5.22-1ubuntu1_source.changes: done.
Successfully uploaded packages.

diff --git a/debian/changelog b/debian/changelog
index 0775bd3..3a00fed 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+memcached (1.5.21-1ubuntu1) focal; urgency=medium
+
+  * d/p/stats_prefix-Remove-test-failure-due-to-non-determin.patch: fix FTFBS
+    on s390x (LP: #1861783)
+
+ -- Christian Ehrhardt <[e-mail]>  Tue, 04 Feb 2020 10:02:44 +0100
+
 memcached (1.5.21-1) unstable; urgency=medium
 
   * New upstream release.
diff --git a/debian/control b/debian/control
index c2b1691..caf9830 100644
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,8 @@
 Source: memcached
 Section: web
 Priority: optional
-Maintainer: Chris Lamb <[e-mail]>
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: Chris Lamb <[e-mail]>
 Build-Depends:
  adduser,
  debhelper-compat (= 12),
diff --git a/debian/patches/series b/debian/patches/series
index 5f3753c..dd01f20 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,3 +3,4 @@
 0003-Uses-retry-to-wait-up-to-5-seconds-for-the-killed-pr.patch
 0004-Don-t-run-some-upstream-tests.patch
 0005-Source-etc-default-memcached-in-etc-init.d-memcached.patch
+stats_prefix-Remove-test-failure-due-to-non-determin.patch
diff --git a/debian/patches/stats_prefix-Remove-test-failure-due-to-non-determin.patch b/debian/patches/stats_prefix-Remove-test-failure-due-to-non-determin.patch
new file mode 100644
index 0000000..5792fb0
--- /dev/null
+++ b/debian/patches/stats_prefix-Remove-test-failure-due-to-non-determin.patch
@@ -0,0 +1,67 @@
+From 0ffde456cb21a7a03ee263f026edd565bb0f2123 Mon Sep 17 00:00:00 2001
+From: Kanak Kshetri <[e-mail]>
+Date: Fri, 31 Jan 2020 07:33:15 -0600
+Subject: [PATCH] stats_prefix: Remove test failure due to non-determinism
+
+If you have multiple keys, the order in which they are dumped is
+non-deterministic because it is iterating over a hash table used by
+prefix stats.
+
+Fix the assertions by searching for expected lines in output instead
+of checking that the strings are exactly the same.
+
+Origin: upstream, https://github.com/memcached/memcached/commit/0ffde456cb21a7a03ee263f026edd565bb0f2123
+Last-Update: 2020-02-04
+
+---
+ testapp.c | 26 +++++++++++++-------------
+ 1 file changed, 13 insertions(+), 13 deletions(-)
+
+diff --git a/testapp.c b/testapp.c
+index b670708e..9819172e 100644
+--- a/testapp.c
++++ b/testapp.c
+@@ -347,13 +347,13 @@ static enum test_return test_stats_prefix_dump(void) {
+     assert(strcmp(expected, stats_prefix_dump(&length)) == 0);
+     assert(strlen(expected) == length);
+ 
+-    /* The order of results might change if we switch hash functions. */
+     stats_prefix_record_delete("def:123", 7);
+-    expected = "PREFIX abc get 2 hit 1 set 1 del 1\r\n"
+-               "PREFIX def get 0 hit 0 set 0 del 1\r\n"
+-               "END\r\n";
+-    assert(strcmp(expected, stats_prefix_dump(&length)) == 0);
+-    assert(strlen(expected) == length);
++    /* NOTE: The prefixes can be dumped in any order, so verification
++       does not just check that the strings are exactly the same as before. */
++    const char *actual = stats_prefix_dump(&length);
++    assert(strstr(actual, "PREFIX abc get 2 hit 1 set 1 del 1\r\n") != NULL);
++    assert(strstr(actual, "PREFIX def get 0 hit 0 set 0 del 1\r\n") != NULL);
++    assert(strstr(actual, "END\r\n") != NULL);
+ 
+     /* Find a key that hashes to the same bucket as "abc" */
+     bool found_match = false;
+@@ -367,13 +367,13 @@ static enum test_return test_stats_prefix_dump(void) {
+     }
+     assert(found_match);
+     stats_prefix_record_set(tmp, strlen(tmp));
+-    snprintf(tmp, sizeof(tmp),
+-             "PREFIX %d get 0 hit 0 set 1 del 0\r\n"
+-             "PREFIX abc get 2 hit 1 set 1 del 1\r\n"
+-             "PREFIX def get 0 hit 0 set 0 del 1\r\n"
+-             "END\r\n", keynum);
+-    assert(strcmp(tmp, stats_prefix_dump(&length)) == 0);
+-    assert(strlen(tmp) == length);
++
++    actual = stats_prefix_dump(&length);
++    assert(strstr(actual, "PREFIX abc get 2 hit 1 set 1 del 1\r\n") != NULL);
++    assert(strstr(actual, "PREFIX def get 0 hit 0 set 0 del 1\r\n") != NULL);
++    assert(strstr(actual, "END\r\n") != NULL);
++    snprintf(tmp, sizeof(tmp), "PREFIX %d get 0 hit 0 set 1 del 0\r\n", keynum);
++    assert(strstr(actual, tmp) != NULL);
+ 
+     return TEST_PASS;
+ }
+-- 
+2.25.0
+