snowykami/meilisearch
1
0
Fork 0
mirror of https://github.com/meilisearch/meilisearch.git synced 2024-11-30 00:55:00 +08:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

fix the import of dump without unprocessing updates

Browse Source
This commit is contained in:
tamo 2021-05-11 13:03:47 +02:00
parent 384afb3455
commit 9e798fea75
No known key found for this signature in database
GPG Key ID: 20CD8020AFA88D69
1 changed files with 15 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
meilisearch-http/src/index_controller/dump_actor/mod.rs
View File

@ -208,34 +208,27 @@ pub fn load_dump(
dump_path.display(), dump_path.display(),
db_path.display() db_path.display()
); );
metadata metadata.dump_version.import_index(
.dump_version
.import_index(
size, size,
uuid, uuid,
&dump_path, &dump_path,
&db_path, &db_path,
idx.meta.primary_key.as_ref().map(|s| s.as_ref()), idx.meta.primary_key.as_ref().map(|s| s.as_ref()),
) )?;
.unwrap();
info!("Dump importation from {} succeed", dump_path.display()); info!("Dump importation from {} succeed", dump_path.display());
} }
// finally we can move all the unprocessed update file into our new DB // finally we can move all the unprocessed update file into our new DB
// this directory may not exists
let update_path = tmp_dir_path.join("update_files"); let update_path = tmp_dir_path.join("update_files");
let db_update_path = db_path.join("updates/update_files"); let db_update_path = db_path.join("updates/update_files");
eprintln!("path {:?} exists: {:?}", update_path, update_path.exists()); if update_path.exists() {
eprintln!(
"path {:?} exists: {:?}",
db_update_path,
db_update_path.exists()
);
let _ = std::fs::remove_dir_all(db_update_path); let _ = std::fs::remove_dir_all(db_update_path);
std::fs::rename( std::fs::rename(
tmp_dir_path.join("update_files"), tmp_dir_path.join("update_files"),
db_path.join("updates/update_files"), db_path.join("updates/update_files"),
) )?;
.unwrap(); }
info!("Dump importation from {} succeed", dump_path.display()); info!("Dump importation from {} succeed", dump_path.display());
Ok(()) Ok(())