use temporary directory below docs.rs-prefix, so we can move files

Author: syphar

src/storage/archive_index.rs

@@ -288,13 +288,16 @@ pub(crate) fn find_in_file<P: AsRef<Path>>(
     }
 }
 
-pub(crate) fn convert_to_sqlite_index<P: AsRef<Path>>(path: P) -> Result<TempPath> {
+pub(crate) fn convert_to_sqlite_index<P: AsRef<Path>>(
+    path: P,
+    tmpdir: impl AsRef<Path>,
+) -> Result<TempPath> {
     let path = path.as_ref();
     let index: Index = { serde_cbor::from_reader(BufReader::new(File::open(path)?))? };
 
     // write the new index into a temporary file so reads from ongoing requests
     // can continue on the old index until the new one is fully written.
-    let tmp_path = tempfile::NamedTempFile::new()?.into_temp_path();
+    let tmp_path = tempfile::NamedTempFile::new_in(tmpdir)?.into_temp_path();
     index
         .write_sqlite(&tmp_path)
         .context("error writing SQLite index")?;
@@ -351,7 +354,8 @@ mod tests {
         .unwrap()
         .unwrap();
 
-        let sqlite_index_file = convert_to_sqlite_index(cbor_index_file).unwrap();
+        let temp_dir = tempfile::TempDir::new().unwrap();
+        let sqlite_index_file = convert_to_sqlite_index(cbor_index_file, &temp_dir).unwrap();
         assert!(is_sqlite_file(&sqlite_index_file).unwrap());
 
         let migrated_fi = find_in_file(

src/storage/mod.rs

@@ -588,7 +588,7 @@ pub(crate) fn source_archive_path(name: &str, version: &str) -> String {
 }
 
 #[instrument(skip(storage))]
-fn migrate_one(storage: &Storage, archive_path: &str) -> Result<()> {
+fn migrate_one(storage: &Storage, archive_path: &str, tmpdir: &Path) -> Result<()> {
     // this will also download the index if it doesn't exist locally
     let local_index_filename = storage.get_index_filename(archive_path)?;
 
@@ -599,7 +599,8 @@ fn migrate_one(storage: &Storage, archive_path: &str) -> Result<()> {
 
     info!("converting local index...");
     let remote_index_path = format!("{}.index", &archive_path);
-    let new_index_temp_path = archive_index::convert_to_sqlite_index(&local_index_filename)?;
+    let new_index_temp_path =
+        archive_index::convert_to_sqlite_index(&local_index_filename, tmpdir)?;
 
     // first upload to S3, ongoing requests will still use the local CBOR index
     info!("uplading to S3...");
@@ -621,6 +622,11 @@ pub fn migrate_old_archive_indexes(
     storage: &Storage,
     conn: &mut impl postgres::GenericClient,
 ) -> Result<()> {
+    let tmpdir = storage.config.prefix.join("archive_cache_tmp");
+    if !tmpdir.exists() {
+        fs::create_dir(&tmpdir)?;
+    }
+
     for row in conn
         .query_raw(
             "
@@ -643,10 +649,10 @@ pub fn migrate_old_archive_indexes(
         let version: &str = row.get(1);
         info!("converting archive index for {} {}...", name, version);
 
-        if let Err(err) = migrate_one(storage, &rustdoc_archive_path(name, version)) {
+        if let Err(err) = migrate_one(storage, &rustdoc_archive_path(name, version), &tmpdir) {
             error!("error converting rustdoc archive index: {:?}", err);
         }
-        if let Err(err) = migrate_one(storage, &source_archive_path(name, version)) {
+        if let Err(err) = migrate_one(storage, &source_archive_path(name, version), &tmpdir) {
             error!("error converting source archive index: {:?}", err);
         }
     }