v0.1.6: Only create /pfs/out once (bug fix)

This fixes a bug in the v0.1.5 release. We need to get some on-cluster integration tests up and running to catch things like this.
faradayio · Aug 27, 2018 · 67e2c89 · 67e2c89
1 parent 0ed34ce
commit 67e2c89
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 10 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/falconeri-worker/Cargo.toml b/falconeri-worker/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "falconeri-worker"
-version = "0.1.5"
+version = "0.1.6"
 authors = ["Eric Kidd <[email protected]>"]
 
 [dependencies]

diff --git a/falconeri-worker/src/main.rs b/falconeri-worker/src/main.rs
@@ -122,11 +122,12 @@ fn process_datum(
 /// Reset our working directories to a default, clean state.
 fn reset_work_dirs() -> Result<()> {
     reset_work_dir("/pfs/*")?;
+    fs::create_dir("/pfs/out").context("cannot create /pfs/out")?;
     reset_work_dir("/scratch/*")?;
     Ok(())
 }
 
-/// Restore our `/pfs` directory to its default, clean state.
+/// Restore a directory to a default, clean state.
 fn reset_work_dir(work_dir_glob: &str) -> Result<()> {
     let paths = glob::glob(work_dir_glob)
         .with_context(|_| format!("error listing directory {}", work_dir_glob))?;
@@ -142,7 +143,6 @@ fn reset_work_dir(work_dir_glob: &str) -> Result<()> {
                 .with_context(|_| format!("cannot delete {}", path.display()))?;
         }
     }
-    fs::create_dir("/pfs/out").context("cannot create /pfs/out")?;
     Ok(())
 }
 

diff --git a/falconeri/Cargo.toml b/falconeri/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 authors = ["Eric Kidd <[email protected]>"]
 name = "falconeri"
-version = "0.1.5"
+version = "0.1.6"
 
 [dependencies]
 base64 = "0.9.2"

diff --git a/falconeri_common/Cargo.toml b/falconeri_common/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "falconeri_common"
-version = "0.1.5"
+version = "0.1.6"
 authors = ["Eric Kidd <[email protected]>"]
 
 [dependencies]