Increase Solr cache write timeout to 30s (configurable)

Author: Robbie1977

Dockerfile

@@ -22,5 +22,6 @@ EXPOSE 8080
 #   VFBQUERY_MAX_CONCURRENT  (default: workers × 2)
 #   VFBQUERY_MAX_QUEUE_DEPTH (default: 200, 0 = unlimited)
 #   VFBQUERY_CACHE_TTL       (default: 300 seconds)
+#   VFBQUERY_SOLR_WRITE_TIMEOUT (default: 30 seconds)
 
 ENTRYPOINT ["python", "-m", "vfbquery.ha_api"]

release_notes.md

@@ -0,0 +1,8 @@
+## What's Changed (v1.6.13)
+
+### Increased Solr cache write timeout
+
+Solr cache writes are performed asynchronously after the query returns to the user.
+We now default to a **30 second write timeout** (configurable via `VFBQUERY_SOLR_WRITE_TIMEOUT`).
+
+This helps prevent large or slow cache writes from spamming errors while still allowing the cache to work when Solr is responsive.

setup.py

@@ -3,7 +3,7 @@
 
 here = path.abspath(path.dirname(__file__))
 
-__version__ = "1.6.12"
+__version__ = "1.6.13"
 
 # Get the long description from the README file
 with open(path.join(here, 'README.md')) as f:

src/vfbquery/solr_result_cache.py

@@ -73,6 +73,16 @@ def __init__(self,
         self._solr_disabled_until = 0.0  # epoch timestamp
         self._solr_backoff_seconds = int(os.getenv('VFBQUERY_SOLR_BACKOFF_SECONDS', '60'))
         self._solr_last_error = None
+
+    @property
+    def solr_cache_enabled(self) -> bool:
+        """True if Solr caching is currently enabled."""
+        return not self._solr_disabled
+
+    @property
+    def solr_cache_disabled_until(self) -> float:
+        """Epoch timestamp when Solr caching will be retried (or 0 if enabled)."""
+        return self._solr_disabled_until
 
     def _create_cache_metadata(self, result: Any, **params) -> Optional[Dict[str, Any]]:
         """Create metadata for cached result with 3-month expiration"""
@@ -313,7 +323,7 @@ def cache_result(self, query_type: str, term_id: str, result: Any, **params) ->
                 data=json.dumps([cache_doc]),
                 headers={"Content-Type": "application/json"},
                 params={"commit": "true"},  # Immediate commit for availability
-                timeout=10
+                timeout=int(os.getenv('VFBQUERY_SOLR_WRITE_TIMEOUT', '30'))
             )
 
             if response.status_code == 200: