cleanup

Author: zeeshanlakhani

illumos-utils/src/opte/non_illumos.rs

@@ -5,7 +5,7 @@
 //! Mock / dummy versions of the OPTE module, for non-illumos platforms.
 //!
 //! Most methods are either `unimplemented!()` or silent no-ops.
-//! Multicast subscribe/unsubscribe is an exception,as it maintains real
+//! Multicast subscribe/unsubscribe is an exception, as it maintains real
 //! in-memory state because port manager tests assert on subscription contents.
 
 use crate::addrobj::AddrObject;

nexus/src/app/background/tasks/multicast/members.rs

@@ -1334,13 +1334,13 @@ impl MulticastGroupReconciler {
                 return Ok(None);
             }
             Err(e) => {
-                debug!(
+                warn!(
                     opctx.log,
                     "failed to look up instance state";
                     "member" => ?member,
                     "error" => ?e
                 );
-                return Ok(None);
+                return Err(e.into());
             }
         };
 

nexus/src/app/background/tasks/multicast/mod.rs

@@ -105,6 +105,8 @@
 //! - **Group lifecycle**: "Creating" → "Active" → "Deleting" → hard-deleted
 //! - **Member lifecycle**: "Joining" → "Joined" → "Left" → soft-deleted → hard-deleted
 //! - **Dataplane updates**: DPD API calls for P4 table updates
+//! - **Sled propagation**: M2P mappings and forwarding entries pushed to sled-agents
+//! - **OPTE subscriptions**: Per-VMM multicast group subscriptions on target sleds
 //! - **Topology mapping**: Sled-to-switch-port resolution (with caching)
 //!
 //! ## Deletion Semantics: Groups vs Members

nexus/src/app/multicast/sled.rs

@@ -118,12 +118,22 @@ impl MulticastSledClient {
         cached_propolis_id: Option<PropolisUuid>,
     ) -> Result<(), anyhow::Error> {
         let instance_id = InstanceUuid::from_untyped_uuid(member.parent_id);
+        // If the instance has no propolis_id (already stopped/destroyed),
+        // the OPTE port is gone and there's nothing to subscribe.
         let propolis_id = match cached_propolis_id {
             Some(id) => id,
-            None => self
-                .lookup_propolis_id(opctx, instance_id)
-                .await?
-                .context("instance has no propolis_id, cannot subscribe")?,
+            None => match self.lookup_propolis_id(opctx, instance_id).await? {
+                Some(id) => id,
+                None => {
+                    debug!(
+                        opctx.log,
+                        "no propolis_id for instance, skipping subscribe";
+                        "member_id" => %member.id,
+                        "instance_id" => %instance_id
+                    );
+                    return Ok(());
+                }
+            },
         };
 
         let client = self