ME Authority + Quota Resets + WEB Replacement Rollback fixes

src/transport/middle_proxy/pool_writer/publication.rs

@@ -43,9 +43,7 @@ impl MePool {
         let endpoint_is_current = self
             .endpoint_snapshot
             .load()
-            .preferred_endpoints_by_dc
-            .get(&writer.writer_dc)
-            .is_some_and(|endpoints| endpoints.contains(&writer.addr));
+            .contains_dc_endpoint(writer.writer_dc, writer.addr);
         if !endpoint_is_current {
             return Err(ProxyError::Proxy(
                 "ME writer target changed before publication".into(),
@@ -95,21 +93,29 @@ impl MePool {
             return Ok(());
         }
         let endpoint_snapshot = self.endpoint_snapshot.load();
-        let preferred = &endpoint_snapshot.preferred_endpoints_by_dc;
-        let Some(endpoints) = preferred.get(&writer.writer_dc) else {
+        if !endpoint_snapshot.contains_dc_endpoint(writer.writer_dc, writer.addr) {
             return Err(ProxyError::Proxy(
                 "ME writer target changed before publication".into(),
             ));
-        };
-        let required = match contour {
-            WriterContour::Active | WriterContour::Warm => self.required_writers_for_dc(
-                endpoints
-                    .iter()
-                    .filter(|endpoint| endpoint.is_ipv4() == writer.addr.is_ipv4())
-                    .count(),
-            ),
-            WriterContour::Draining => 0,
-        };
+        }
+        if contour == WriterContour::Active && intent == WriterOpenIntent::Normal {
+            let current = writers
+                .iter()
+                .filter(|candidate| {
+                    !candidate.draining.load(Ordering::Acquire)
+                        && WriterContour::from_u8(candidate.contour.load(Ordering::Acquire))
+                            == WriterContour::Active
+                })
+                .count();
+            if current >= self.adaptive_floor_active_cap_configured_total() {
+                return Err(ProxyError::Proxy(
+                    "ME active writer cap was reached before publication".into(),
+                ));
+            }
+            return Ok(());
+        }
+        let endpoints = endpoint_snapshot.endpoints_for_dc_family(writer.writer_dc, family);
+        let required = self.required_writers_for_dc(endpoints.len());
         let current = writers
             .iter()
             .filter(|candidate| {
@@ -119,7 +125,8 @@ impl MePool {
                     && WriterContour::from_u8(candidate.contour.load(Ordering::Acquire))
                         == contour
                     && candidate.addr.is_ipv4() == writer.addr.is_ipv4()
-                    && endpoints.contains(&candidate.addr)
+                    && endpoint_snapshot
+                        .contains_dc_endpoint(candidate.writer_dc, candidate.addr)
             })
             .count();
         if current >= required {

src/transport/middle_proxy/pool_writer/replacement.rs

@@ -86,7 +86,6 @@ impl MePool {
                 ));
             }
             let endpoint_snapshot = self.endpoint_snapshot.load();
-            let preferred = &endpoint_snapshot.preferred_endpoints_by_dc;
             let donor_count = writers
                 .iter()
                 .filter(|candidate| {
@@ -95,9 +94,8 @@ impl MePool {
                         && candidate.generation == expected_victim_role.generation
                         && WriterContour::from_u8(candidate.contour.load(Ordering::Acquire))
                             == WriterContour::Active
-                        && preferred
-                            .get(&candidate.writer_dc)
-                            .is_some_and(|endpoints| endpoints.contains(&candidate.addr))
+                        && endpoint_snapshot
+                            .contains_dc_endpoint(candidate.writer_dc, candidate.addr)
                         && (candidate.addr.is_ipv4()
                             == matches!(expected_victim_role.family, crate::network::IpFamily::V4))
                 })
@@ -115,9 +113,8 @@ impl MePool {
                         && candidate.generation == writer.generation
                         && WriterContour::from_u8(candidate.contour.load(Ordering::Acquire))
                             == WriterContour::Active
-                        && preferred
-                            .get(&candidate.writer_dc)
-                            .is_some_and(|endpoints| endpoints.contains(&candidate.addr))
+                        && endpoint_snapshot
+                            .contains_dc_endpoint(candidate.writer_dc, candidate.addr)
                         && (if candidate.addr.is_ipv4() {
                             crate::network::IpFamily::V4
                         } else {
@@ -223,11 +220,7 @@ mod tests {
                 WriterContour::Active,
                 WriterOpenIntent::Replacement,
                 writer_dc,
-                if addr.is_ipv4() {
-                    crate::network::IpFamily::V4
-                } else {
-                    crate::network::IpFamily::V6
-                },
+                addr,
             )
             .await
             .expect("replacement open must be admitted");

src/transport/middle_proxy/pool_writer/runtime.rs

@@ -96,11 +96,7 @@ impl MePool {
                 contour,
                 intent,
                 writer_dc,
-                if addr.is_ipv4() {
-                    crate::network::IpFamily::V4
-                } else {
-                    crate::network::IpFamily::V6
-                },
+                addr,
             )
             .await
         else {