import: use memory to cache split sst instead of disk file (tikv#4566)

Signed-off-by: Lonng <chris@lonng.org>
jswh · May 27, 2019 · 6c67bfe · 6c67bfe
1 parent 681ec86
commit 6c67bfe
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/src/import/engine.rs b/src/import/engine.rs
@@ -222,7 +222,7 @@ pub struct SSTWriter {
 
 impl SSTWriter {
     pub fn new(db_cfg: &DbConfig, security_cfg: &SecurityConfig, path: &str) -> Result<SSTWriter> {
-        let mut env = Arc::new(Env::default());
+        let mut env = Arc::new(Env::new_mem());
         let mut base_env = None;
         if !security_cfg.cipher_file.is_empty() {
             base_env = Some(Arc::clone(&env));

diff --git a/src/import/import.rs b/src/import/import.rs
@@ -78,6 +78,12 @@ impl<Client: ImportClient> ImportJob<Client> {
                 "retry_count" => %retry_count,
                 "current_round" => %i,
             );
+            if i == MAX_RETRY_TIMES - 1 {
+                res = Err(Error::ImportJobFailed(format!(
+                    "retry {} times still {} ranges failed",
+                    i, retry_count
+                )))
+            }
         }
         IMPORT_EACH_PHASE.with_label_values(&["import"]).set(0.0);