From e7daa1baf4221688abd17124c94789d1c831252e Mon Sep 17 00:00:00 2001
From: abram axel booth <boothaa@gmail.com>
Date: Wed, 21 May 2025 13:29:46 -0400
Subject: [PATCH 1/2] fix: inackurate messaging

fix a bug in `sharev2_elastic8` that caused the indexer daemon to leave
some messages un-acked, which eventually prevents it from fetching more
---
 share/search/index_strategy/sharev2_elastic8.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/share/search/index_strategy/sharev2_elastic8.py b/share/search/index_strategy/sharev2_elastic8.py
index 886353eb1..ef1c38d6c 100644
--- a/share/search/index_strategy/sharev2_elastic8.py
+++ b/share/search/index_strategy/sharev2_elastic8.py
@@ -152,11 +152,11 @@ def _make_actionset(suid_id, *actions):
         for _leftover_suid in SourceUniqueIdentifier.objects.filter(id__in=_suid_ids):
             _suid_ids.discard(_leftover_suid.id)
             try:
-                _leftover_suid_id = _leftover_suid.get_backcompat_sharev2_suid().id
+                _suid_for_doc_id = _leftover_suid.get_backcompat_sharev2_suid().id
             except SourceUniqueIdentifier.DoesNotExist:
-                _leftover_suid_id = _leftover_suid.id
-            yield _make_actionset(_leftover_suid_id, self.build_delete_action(
-                self._get_doc_id(_leftover_suid_id),
+                _suid_for_doc_id = _leftover_suid.id
+            yield _make_actionset(_leftover_suid.id, self.build_delete_action(
+                self._get_doc_id(_suid_for_doc_id),
             ))
         # these ones don't even exist!
         for _leftover_suid_id in _suid_ids:

From 07db8cfdf06074d1f17ec04383a3336219f3c118 Mon Sep 17 00:00:00 2001
From: abram axel booth <boothaa@gmail.com>
Date: Wed, 21 May 2025 15:14:44 -0400
Subject: [PATCH 2/2] prepare 25.3.2

---
 CHANGELOG.md     | 3 +++
 share/version.py | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ca1059818..61c0a764a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,8 @@
 # Change Log
 
+# [25.3.2] - 2025-05-21
+- fix: avoid `sharev2_elastic` queue backups by `ack`ing more correctly
+
 # [25.3.1] - 2025-05-20
 - fix: more consistent `suggestedFilterOperator` values in json api
 - configurable rabbitmq connection heartbeat timeout via `RABBITMQ_HEARTBEAT_TIMEOUT` env var
diff --git a/share/version.py b/share/version.py
index b1442fef2..9d5ee7b28 100644
--- a/share/version.py
+++ b/share/version.py
@@ -1,4 +1,4 @@
-__version__ = '25.3.1'
+__version__ = '25.3.2'
 
 
 def get_share_version() -> str: