fix: hashset have 2 folders including txhashset and header

Author: garyyu

chain/src/chain.rs

@@ -183,7 +183,7 @@ impl Chain {
 
 			// open the txhashset, creating a new one if necessary
 			let mut txhashset =
-				txhashset::TxHashSet::open(db_root.clone(), store.clone(), None, None)?;
+				txhashset::TxHashSet::open(db_root.clone(), store.clone(), None)?;
 
 			setup_head(&genesis, &store, &mut txhashset)?;
 			Chain::log_heads(&store)?;
@@ -846,8 +846,8 @@ impl Chain {
 	}
 
 	/// Clean the temporary sandbox folder
-	pub fn clean_txhashset_sandbox(&self) {
-		txhashset::clean_txhashset_folder(&env::temp_dir());
+	pub fn clean_hashset_sandbox(&self) {
+		txhashset::clean_hashset_folder(&env::temp_dir());
 	}
 
 	/// Writes a reading view on a txhashset state that's been provided to us.
@@ -871,20 +871,17 @@ impl Chain {
 
 		let header = self.get_block_header(&h)?;
 
-		// Write txhashset to sandbox
-		txhashset::clean_txhashset_folder(&env::temp_dir());
+		// Write txhashset to sandbox (in the os temporary directory)
+		txhashset::clean_hashset_folder(&env::temp_dir());
 		txhashset::zip_write(env::temp_dir(), txhashset_data.try_clone()?, &header)?;
 
 		let mut txhashset = txhashset::TxHashSet::open(
-			self.db_root.clone(),
+			env::temp_dir()
+				.to_str()
+				.expect("invalid temp folder")
+				.to_owned(),
 			self.store.clone(),
 			Some(&header),
-			Some(
-				env::temp_dir()
-					.to_str()
-					.expect("invalid temp folder")
-					.to_owned(),
-			),
 		)?;
 
 		// The txhashset.zip contains the output, rangeproof and kernel MMRs.
@@ -937,21 +934,21 @@ impl Chain {
 
 		debug!("txhashset_write: finished committing the batch (head etc.)");
 
-		// sandbox full validation ok, go to overwrite txhashset on db root
+		// Sandbox full validation ok, go to overwrite txhashset on db root
 		{
-			// Before overwriting, drop file handles in underlying txhashset
+			// Before overwriting, drop file handlers in underlying txhashset
 			{
 				let mut txhashset_ref = self.txhashset.write();
 				txhashset_ref.release_backend_files();
 			}
 
-			txhashset::txhashset_replace(env::temp_dir(), PathBuf::from(self.db_root.clone()))?;
+			txhashset.release_backend_files();
+			txhashset::hashset_replace(env::temp_dir(), PathBuf::from(self.db_root.clone()))?;
 
 			txhashset = txhashset::TxHashSet::open(
 				self.db_root.clone(),
 				self.store.clone(),
 				Some(&header),
-				None,
 			)?;
 		}
 

chain/src/txhashset/txhashset.rs

@@ -114,13 +114,7 @@ impl TxHashSet {
 		root_dir: String,
 		commit_index: Arc<ChainStore>,
 		header: Option<&BlockHeader>,
-		sandbox_dir: Option<String>,
 	) -> Result<TxHashSet, Error> {
-		let txhashset_rootdir = if let Some(sandbox) = sandbox_dir {
-			sandbox.clone()
-		} else {
-			root_dir.clone()
-		};
 		Ok(TxHashSet {
 			header_pmmr_h: PMMRHandle::new(
 				&root_dir,
@@ -137,21 +131,21 @@ impl TxHashSet {
 				None,
 			)?,
 			output_pmmr_h: PMMRHandle::new(
-				&txhashset_rootdir,
+				&root_dir,
 				TXHASHSET_SUBDIR,
 				OUTPUT_SUBDIR,
 				true,
 				header,
 			)?,
 			rproof_pmmr_h: PMMRHandle::new(
-				&txhashset_rootdir,
+				&root_dir,
 				TXHASHSET_SUBDIR,
 				RANGE_PROOF_SUBDIR,
 				true,
 				header,
 			)?,
 			kernel_pmmr_h: PMMRHandle::new(
-				&txhashset_rootdir,
+				&root_dir,
 				TXHASHSET_SUBDIR,
 				KERNEL_SUBDIR,
 				false,
@@ -1468,35 +1462,49 @@ pub fn zip_write(
 	check_and_remove_files(&txhashset_path, header)
 }
 
-/// Rename a folder to another
-pub fn txhashset_replace(from: PathBuf, to: PathBuf) -> Result<(), Error> {
-	debug!("txhashset_replace: move from {:?} to {:?}", from, to);
+/// Overwrite 2 hashset folders ('txhashset' & 'header') in "to" folder with "from" folder
+pub fn hashset_replace(from: PathBuf, to: PathBuf) -> Result<(), Error> {
+	debug!("hashset_replace: move from {:?} to {:?}", from, to);
 
 	// clean the 'to' folder firstly
-	clean_txhashset_folder(&to);
+	clean_hashset_folder(&to);
 
 	// rename the 'from' folder as the 'to' folder
-	let txhashset_from_path = from.clone().join(TXHASHSET_SUBDIR);
-	let txhashset_to_path = to.clone().join(TXHASHSET_SUBDIR);
-	if let Err(e) = fs::rename(txhashset_from_path, txhashset_to_path) {
-		error!("txhashset_replace fail. err: {}", e);
-		Err(ErrorKind::TxHashSetErr(format!("txhashset replacing fail")).into())
-	} else {
-		Ok(())
+	if let Err(e) = fs::rename(from.clone().join(TXHASHSET_SUBDIR), to.clone().join(TXHASHSET_SUBDIR)) {
+		error!("hashset_replace fail on {}. err: {}", TXHASHSET_SUBDIR, e);
+		return Err(ErrorKind::TxHashSetErr(format!("txhashset replacing fail")).into());
 	}
+
+	// rename the 'from' folder as the 'to' folder
+	if let Err(e) = fs::rename(from.clone().join(HEADERHASHSET_SUBDIR), to.clone().join(HEADERHASHSET_SUBDIR)) {
+		error!("hashset_replace fail on {}. err: {}", HEADERHASHSET_SUBDIR, e);
+		return Err(ErrorKind::TxHashSetErr(format!("txhashset replacing fail")).into());
+	}
+
+	return Ok(());
 }
 
-/// Clean the txhashset folder
-pub fn clean_txhashset_folder(root_dir: &PathBuf) {
+/// Clean the hashset folder (txhashset and header hashset)
+pub fn clean_hashset_folder(root_dir: &PathBuf) {
 	let txhashset_path = root_dir.clone().join(TXHASHSET_SUBDIR);
 	if txhashset_path.exists() {
 		if let Err(e) = fs::remove_dir_all(txhashset_path.clone()) {
 			warn!(
-				"clean_txhashset_folder: fail on {:?}. err: {}",
+				"clean_hashset_folder: fail on {:?}. err: {}",
 				txhashset_path, e
 			);
 		}
 	}
+
+	let header_hashset_path = root_dir.clone().join(HEADERHASHSET_SUBDIR);
+	if header_hashset_path.exists() {
+		if let Err(e) = fs::remove_dir_all(header_hashset_path.clone()) {
+			warn!(
+				"clean_hashset_folder: fail on {:?}. err: {}",
+				header_hashset_path, e
+			);
+		}
+	}
 }
 
 fn expected_file(path: &Path) -> bool {

chain/tests/test_txhashset.rs

@@ -44,7 +44,7 @@ fn test_unexpected_zip() {
 	let db_env = Arc::new(store::new_env(db_root.clone()));
 	let chain_store = ChainStore::new(db_env).unwrap();
 	let store = Arc::new(chain_store);
-	txhashset::TxHashSet::open(db_root.clone(), store.clone(), None, None).unwrap();
+	txhashset::TxHashSet::open(db_root.clone(), store.clone(), None).unwrap();
 	// First check if everything works out of the box
 	assert!(txhashset::zip_read(db_root.clone(), &BlockHeader::default(), Some(rand)).is_ok());
 	let zip_path = Path::new(&db_root).join(format!("txhashset_snapshot_{}.zip", rand));

servers/src/common/adapters.rs

@@ -359,7 +359,7 @@ impl p2p::ChainAdapter for NetToChainAdapter {
 			.chain()
 			.txhashset_write(h, txhashset_data, self.sync_state.as_ref())
 		{
-			self.chain().clean_txhashset_sandbox();
+			self.chain().clean_hashset_sandbox();
 			error!("Failed to save txhashset archive: {}", e);
 			let is_good_data = !e.is_bad_data();
 			self.sync_state.set_sync_error(types::Error::Chain(e));