Report indexed cache purge tier ratios

Author: eldryoth

CHANGELOG.md

@@ -67,6 +67,8 @@ behavior when the change improves security or project direction.
   operators can quickly see how much of a requested purge batch matched.
 - Protected bulk cache purge responses now also echo the selected `route` and
   cache `scope`, matching single and indexed purge responses.
+- Protected indexed cache purge responses now include per-tier
+  `memory_purged_ratio_per_mille` and `disk_purged_ratio_per_mille` fields.
 - `server.default_vhost` validation now hints at `include_conf_d = true` or
   directory-based config loading when the named vhost is not loaded.
 - Cache policies can now set `stale_if_error_secs` to permit serving stale

docs/cache-backends.md

@@ -207,7 +207,10 @@ internal cache implementation.
   `x-fluxheim-cache-limit`, default to a bounded batch size, and return
   the effective `limit`, cache `scope`, and `purged_ratio_per_mille` in their
   response. The ratio reports how much of the matched batch was actually
-  purged, where `1000` means every matched entry was removed. They return
+  purged, where `1000` means every matched entry was removed. Indexed purge
+  responses also include `memory_purged_ratio_per_mille` and
+  `disk_purged_ratio_per_mille` so operators can see which tier needs cleanup.
+  They return
   `truncated = true` and `repeat_required = true` when more indexed entries
   remain for the requested scope and the same purge should be run again. The
   index is bounded in memory, mirrors disk-tier writes, and is designed for

src/admin.rs

@@ -668,7 +668,7 @@ impl AdminApp {
             }) {
             Ok(result) => {
                 let body = format!(
-                    r#"{{"status":"ok","matched":{},"purged":{},"purged_ratio_per_mille":{},"truncated":{},"repeat_required":{},"limit":{},"vhost":"{}","route":{},"scope":"{}","memory_matched":{},"memory_purged":{},"memory_truncated":{},"disk_matched":{},"disk_purged":{},"disk_truncated":{}}}"#,
+                    r#"{{"status":"ok","matched":{},"purged":{},"purged_ratio_per_mille":{},"truncated":{},"repeat_required":{},"limit":{},"vhost":"{}","route":{},"scope":"{}","memory_matched":{},"memory_purged":{},"memory_purged_ratio_per_mille":{},"memory_truncated":{},"disk_matched":{},"disk_purged":{},"disk_purged_ratio_per_mille":{},"disk_truncated":{}}}"#,
                     result.matched(),
                     result.purged(),
                     ratio_per_mille_usize(result.purged(), result.matched()),
@@ -680,9 +680,11 @@ impl AdminApp {
                     cache_scope(result.route.as_deref()),
                     result.memory_matched,
                     result.memory_purged,
+                    ratio_per_mille_usize(result.memory_purged, result.memory_matched),
                     result.memory_truncated,
                     result.disk_matched,
                     result.disk_purged,
+                    ratio_per_mille_usize(result.disk_purged, result.disk_matched),
                     result.disk_truncated
                 );
                 json_response(StatusCode::OK, body.as_bytes())
@@ -730,7 +732,7 @@ impl AdminApp {
         ) {
             Ok(result) => {
                 let body = format!(
-                    r#"{{"status":"ok","matched":{},"purged":{},"purged_ratio_per_mille":{},"truncated":{},"repeat_required":{},"limit":{},"vhost":"{}","route":{},"scope":"{}","path_prefix":"{}","memory_matched":{},"memory_purged":{},"memory_truncated":{},"disk_matched":{},"disk_purged":{},"disk_truncated":{}}}"#,
+                    r#"{{"status":"ok","matched":{},"purged":{},"purged_ratio_per_mille":{},"truncated":{},"repeat_required":{},"limit":{},"vhost":"{}","route":{},"scope":"{}","path_prefix":"{}","memory_matched":{},"memory_purged":{},"memory_purged_ratio_per_mille":{},"memory_truncated":{},"disk_matched":{},"disk_purged":{},"disk_purged_ratio_per_mille":{},"disk_truncated":{}}}"#,
                     result.matched(),
                     result.purged(),
                     ratio_per_mille_usize(result.purged(), result.matched()),
@@ -743,9 +745,11 @@ impl AdminApp {
                     json_escape(path_prefix),
                     result.memory_matched,
                     result.memory_purged,
+                    ratio_per_mille_usize(result.memory_purged, result.memory_matched),
                     result.memory_truncated,
                     result.disk_matched,
                     result.disk_purged,
+                    ratio_per_mille_usize(result.disk_purged, result.disk_matched),
                     result.disk_truncated
                 );
                 json_response(StatusCode::OK, body.as_bytes())
@@ -793,7 +797,7 @@ impl AdminApp {
         ) {
             Ok(result) => {
                 let body = format!(
-                    r#"{{"status":"ok","matched":{},"purged":{},"purged_ratio_per_mille":{},"truncated":{},"repeat_required":{},"limit":{},"vhost":"{}","route":{},"scope":"{}","path_pattern":"{}","memory_matched":{},"memory_purged":{},"memory_truncated":{},"disk_matched":{},"disk_purged":{},"disk_truncated":{}}}"#,
+                    r#"{{"status":"ok","matched":{},"purged":{},"purged_ratio_per_mille":{},"truncated":{},"repeat_required":{},"limit":{},"vhost":"{}","route":{},"scope":"{}","path_pattern":"{}","memory_matched":{},"memory_purged":{},"memory_purged_ratio_per_mille":{},"memory_truncated":{},"disk_matched":{},"disk_purged":{},"disk_purged_ratio_per_mille":{},"disk_truncated":{}}}"#,
                     result.matched(),
                     result.purged(),
                     ratio_per_mille_usize(result.purged(), result.matched()),
@@ -806,9 +810,11 @@ impl AdminApp {
                     json_escape(path_pattern),
                     result.memory_matched,
                     result.memory_purged,
+                    ratio_per_mille_usize(result.memory_purged, result.memory_matched),
                     result.memory_truncated,
                     result.disk_matched,
                     result.disk_purged,
+                    ratio_per_mille_usize(result.disk_purged, result.disk_matched),
                     result.disk_truncated
                 );
                 json_response(StatusCode::OK, body.as_bytes())
@@ -2305,6 +2311,8 @@ mod tests {
         assert!(body.contains(r#""matched":0"#));
         assert!(body.contains(r#""purged":0"#));
         assert!(body.contains(r#""purged_ratio_per_mille":0"#));
+        assert!(body.contains(r#""memory_purged_ratio_per_mille":0"#));
+        assert!(body.contains(r#""disk_purged_ratio_per_mille":0"#));
         assert!(body.contains(r#""truncated":false"#));
         assert!(body.contains(r#""repeat_required":false"#));
         assert!(body.contains(r#""limit":16"#));
@@ -2353,6 +2361,8 @@ mod tests {
         assert!(body.contains(r#""path_prefix":"/assets/""#));
         assert!(body.contains(r#""matched":0"#));
         assert!(body.contains(r#""purged_ratio_per_mille":0"#));
+        assert!(body.contains(r#""memory_purged_ratio_per_mille":0"#));
+        assert!(body.contains(r#""disk_purged_ratio_per_mille":0"#));
         assert!(body.contains(r#""repeat_required":false"#));
         assert!(body.contains(r#""limit":16"#));
         assert!(body.contains(r#""scope":"vhost""#));
@@ -2413,6 +2423,8 @@ mod tests {
         assert!(body.contains(r#""path_pattern":"/assets/*.png""#));
         assert!(body.contains(r#""matched":0"#));
         assert!(body.contains(r#""purged_ratio_per_mille":0"#));
+        assert!(body.contains(r#""memory_purged_ratio_per_mille":0"#));
+        assert!(body.contains(r#""disk_purged_ratio_per_mille":0"#));
         assert!(body.contains(r#""repeat_required":false"#));
         assert!(body.contains(r#""limit":16"#));
         assert!(body.contains(r#""scope":"vhost""#));