remove options from BaoFileHandleInner

it is present in global, so now we don't need to impl drop, we have it in on_shutdown

Author: rklaehn

src/store/fs.rs

@@ -218,9 +218,16 @@ impl entity_manager::Params for EmParams {
     type EntityState = Slot;
 
     async fn on_shutdown(
-        _state: entity_manager::ActiveEntityState<Self>,
-        _cause: entity_manager::ShutdownCause,
+        state: entity_manager::ActiveEntityState<Self>,
+        cause: entity_manager::ShutdownCause,
     ) {
+        // this isn't strictly necessary. Drop will run anyway as soon as the
+        // state is reset to it's default value. Doing it here means that we
+        // have exact control over where it happens.
+        if let Some(mut handle) = state.state.0.lock().await.take() {
+            trace!("shutting down hash: {}, cause: {cause:?}", state.id);
+            handle.persist(&state.global.options);
+        }
     }
 }
 
@@ -312,10 +319,7 @@ impl HashContext {
                 let res = self.db().get(hash).await.map_err(io::Error::other)?;
                 let res = match res {
                     Some(state) => open_bao_file(&hash, state, &self.global).await,
-                    None => Ok(BaoFileHandle::new_partial_mem(
-                        hash,
-                        self.global.options.clone(),
-                    )),
+                    None => Ok(BaoFileHandle::new_partial_mem(hash)),
                 };
                 Ok((res?, ()))
             })
@@ -362,7 +366,7 @@ async fn open_bao_file(
                     MemOrFile::File(file)
                 }
             };
-            BaoFileHandle::new_complete(*hash, data, outboard, options.clone())
+            BaoFileHandle::new_complete(*hash, data, outboard)
         }
         EntryState::Partial { .. } => BaoFileHandle::new_partial_file(*hash, ctx).await?,
     })
@@ -618,12 +622,7 @@ impl Actor {
             options: options.clone(),
             db: meta::Db::new(db_send),
             internal_cmd_tx: fs_commands_tx,
-            empty: BaoFileHandle::new_complete(
-                Hash::EMPTY,
-                MemOrFile::empty(),
-                MemOrFile::empty(),
-                options,
-            ),
+            empty: BaoFileHandle::new_complete(Hash::EMPTY, MemOrFile::empty(), MemOrFile::empty()),
             protect,
         });
         rt.spawn(db_actor.run());

src/store/fs/bao_file.rs

@@ -507,7 +507,6 @@ impl BaoFileStorage {
 pub struct BaoFileHandleInner {
     pub(crate) storage: watch::Sender<BaoFileStorage>,
     hash: Hash,
-    options: Arc<Options>,
 }
 
 impl fmt::Debug for BaoFileHandleInner {
@@ -526,15 +525,14 @@ impl fmt::Debug for BaoFileHandleInner {
 pub struct BaoFileHandle(Arc<BaoFileHandleInner>);
 
 impl BaoFileHandle {
-    pub fn persist(&mut self) {
+    pub fn persist(&mut self, options: &Options) {
         self.0.storage.send_if_modified(|guard| {
             if Arc::strong_count(&self.0) > 1 {
                 return false;
             }
             let BaoFileStorage::Partial(fs) = guard.take() else {
                 return false;
             };
-            let options = &self.options;
             let path = options.path.bitfield_path(&self.hash);
             trace!(
                 "writing bitfield for hash {} to {}",
@@ -554,12 +552,6 @@ impl BaoFileHandle {
     }
 }
 
-impl Drop for BaoFileHandle {
-    fn drop(&mut self) {
-        self.persist();
-    }
-}
-
 /// A reader for a bao file, reading just the data.
 #[derive(Debug)]
 pub struct DataReader(BaoFileHandle);
@@ -601,12 +593,11 @@ impl BaoFileHandle {
     /// Create a new bao file handle.
     ///
     /// This will create a new file handle with an empty memory storage.
-    pub fn new_partial_mem(hash: Hash, options: Arc<Options>) -> Self {
+    pub fn new_partial_mem(hash: Hash) -> Self {
         let storage = BaoFileStorage::partial_mem();
         Self(Arc::new(BaoFileHandleInner {
             storage: watch::Sender::new(storage),
             hash,
-            options: options.clone(),
         }))
     }
 
@@ -626,7 +617,6 @@ impl BaoFileHandle {
         Ok(Self(Arc::new(BaoFileHandleInner {
             storage: watch::Sender::new(storage),
             hash,
-            options,
         })))
     }
 
@@ -635,13 +625,11 @@ impl BaoFileHandle {
         hash: Hash,
         data: MemOrFile<Bytes, FixedSize<File>>,
         outboard: MemOrFile<Bytes, File>,
-        options: Arc<Options>,
     ) -> Self {
         let storage = CompleteStorage { data, outboard }.into();
         Self(Arc::new(BaoFileHandleInner {
             storage: watch::Sender::new(storage),
             hash,
-            options,
         }))
     }