From c11065b535dfd51b00e73f02ecd3007f49a4dd1a Mon Sep 17 00:00:00 2001 From: Richard Fuchs Date: Wed, 17 Jul 2019 12:23:52 -0400 Subject: [PATCH] TT#63000 fix redis SCAN usage Redis is allowed to return an empty list in response to a SCAN even when the iteration isn't complete yet. Only a zero cursor value returned from a SCAN is indicative of the SCAN being complete. Change-Id: Ib5da589c6944fcd46b2bbdc11c200e6a4f7108cb (cherry picked from commit a29819349b90b5b2676c1741f2a21b2c2f2c4d60) --- debian/patches/series | 1 + .../patches/sipwise/db_redis_fix_scan_usage.patch | 14 ++++++++++++++ 2 files changed, 15 insertions(+) create mode 100644 debian/patches/sipwise/db_redis_fix_scan_usage.patch diff --git a/debian/patches/series b/debian/patches/series index 86856cb15..d362e03a2 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -41,3 +41,4 @@ sipwise/rtpengine-tcp-forwarding.patch sipwise/rtpengine-play-media.patch sipwise/registrar_add_path.patch upstream/limit_the_execution_of_dialplan_reload.patch +sipwise/db_redis_fix_scan_usage.patch diff --git a/debian/patches/sipwise/db_redis_fix_scan_usage.patch b/debian/patches/sipwise/db_redis_fix_scan_usage.patch new file mode 100644 index 000000000..d8860f236 --- /dev/null +++ b/debian/patches/sipwise/db_redis_fix_scan_usage.patch @@ -0,0 +1,14 @@ +--- a/src/modules/db_redis/redis_dbase.c ++++ b/src/modules/db_redis/redis_dbase.c +@@ -727,11 +727,6 @@ + table_name->len, table_name->s); + goto err; + } +- if (reply->element[1]->elements == 0) { +- LM_DBG("no matching entries found for scan on table '%.*s'\n", +- table_name->len, table_name->s); +- return 0; +- } + + *query_keys_count += reply->element[1]->elements; +