added diag

Author: ehsan6sha

crates/fula-cli/src/handlers/object.rs

@@ -808,11 +808,23 @@ pub async fn copy_object(
 /// RFC 7232 §3.1. True iff the If-Match precondition is satisfied.
 pub(crate) fn match_if_match(header: &str, current: Option<&str>) -> bool {
     let h = header.trim();
-    if h == "*" {
-        return current.is_some();
-    }
-    let Some(cur) = current else { return false; };
-    parse_etag_list(h).any(|t| t == cur)
+    let result = if h == "*" {
+        current.is_some()
+    } else {
+        match current {
+            Some(cur) => parse_etag_list(h).any(|t| t == cur),
+            None => false,
+        }
+    };
+    // TEMPORARY DIAGNOSTIC for #29 — emits exactly what's compared on every
+    // If-Match check. Remove once duplicate-bucket / 412-loop is closed.
+    tracing::warn!(
+        if_match = %h,
+        current = ?current,
+        result,
+        "match_if_match diag"
+    );
+    result
 }
 
 /// RFC 7232 §3.2. True iff the If-None-Match precondition is satisfied.

crates/fula-client/src/encryption.rs

@@ -3383,6 +3383,14 @@ impl EncryptedClient {
             .with_metadata("fula-bucket-lookup-h", &self.compute_bucket_lookup_h_hex(bucket))
             .with_metadata("fula-forest-manifest", "1");
 
+        // TEMPORARY DIAGNOSTIC for #29.
+        tracing::warn!(
+            bucket,
+            index_key,
+            prior_etag = ?prior_etag,
+            next_sequence,
+            "save_forest (v1 monolithic) conditional PUT diag"
+        );
         let put_result = self.inner.put_object_with_metadata_conditional(
             bucket,
             &index_key,
@@ -3724,6 +3732,14 @@ impl EncryptedClient {
             .with_metadata("fula-bucket-lookup-h", &lookup_h_hex)
             .with_metadata("fula-forest-manifest", "1");
 
+        // TEMPORARY DIAGNOSTIC for #29.
+        tracing::warn!(
+            bucket,
+            index_key,
+            prior_etag = ?prior_etag,
+            new_seq = next_seq,
+            "phase2 conditional PUT diag"
+        );
         let put_result = self.inner.put_object_with_metadata_conditional(
             bucket,
             &index_key,

scripts/watch-images-upload.sh

@@ -34,4 +34,4 @@ echo "===== Tailing $CONTAINER (Ctrl-C to stop). Now upload an image from FxFile
 echo "" >&2
 
 docker logs --since 5s -f "$CONTAINER" 2>&1 | grep --line-buffered -iE \
-    'images|bucket_lookup_h|forest_manifest_cid|flush.*bucket|persist.*registry|concurrent modification|412 Precondition|ConcurrentModificationExhausted|put_object_flat|Phase ?2|save_(sharded_hamt_)?forest|Populated|Restoring bucket|BucketAlreadyExists'
+    'images|bucket_lookup_h|forest_manifest_cid|flush.*bucket|persist.*registry|concurrent modification|412 Precondition|ConcurrentModificationExhausted|put_object_flat|Phase ?2|save_(sharded_hamt_)?forest|Populated|Restoring bucket|BucketAlreadyExists|match_if_match diag|conditional PUT diag'