ZIL-5446: Fix txn import issues (#246)

Zilliqa · Oct 25, 2023 · 56f8cbe · 56f8cbe
1 parent 91068cf
commit 56f8cbe
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 11 deletions.
diff --git a/products/pdt/cd/base/configmap.yaml b/products/pdt/cd/base/configmap.yaml
@@ -10,7 +10,7 @@ data:
   NETWORK_TYPE_TESTNET: "testnet"
   NETWORK_TYPE_MAINNET: "mainnet"
   NETWORK_TESTNET: "testnet-v925"
-  NETWORK_MAINNET: "mainnet-v901"
+  NETWORK_MAINNET: "mainnet-v920"
   DOWNLOAD_DIR: "/data/download"
   UNPACK_DIR: "/data/download"
   NR_THREADS: "1"

diff --git a/products/pdt/cd/overlays/staging/configmap.yaml b/products/pdt/cd/overlays/staging/configmap.yaml
@@ -10,8 +10,8 @@ data:
   NETWORK_TYPE_TESTNET: "testnet"
   NETWORK_TYPE_MAINNET: "mainnet"
   NETWORK_TESTNET: "testnet-v925"
-  NETWORK_MAINNET: "mainnet-v901"
+  NETWORK_MAINNET: "mainnet-v920"
   DOWNLOAD_DIR: "/data/download"
   UNPACK_DIR: "/data/download"
   NR_THREADS: "1"
-  BATCH_BLOCKS: "1000"
+BATCH_BLOCKS: "10000"
diff --git a/products/pdt/pdt/src/bqimport.rs b/products/pdt/pdt/src/bqimport.rs
@@ -53,13 +53,17 @@ pub async fn bq_multi_import(
 
         jobs.spawn(async move {
             println!("Sync persistence to {:?}", &my_unpack_dir);
-            let unpack_str = my_unpack_dir
-                .to_str()
-                .ok_or(anyhow!("Cannot render thread-specific data dir"))?;
-            // Sync persistence
-            if duplicate_persistence {
-                pdtlib::utils::dup_directory(&orig_unpack_dir, &unpack_str)?;
-            }
+            let unpack_str = if nr_threads > 1 {
+                let new_unpack_dir = my_unpack_dir
+                    .to_str()
+                    .ok_or(anyhow!("Cannot render thread-specific data dir"))?;
+                // Sync persistence
+                pdtlib::utils::dup_directory(&orig_unpack_dir, &new_unpack_dir)?;
+                new_unpack_dir
+            } else {
+                &orig_unpack_dir
+            };
+
             println!("Starting thread {}/{}", idx, nr_threads);
             let exporter = Exporter::new(&unpack_str)?;
             let mut imp = TransactionMicroblockImporter::new();

diff --git a/products/pdt/pdtlisten/src/lib.rs b/products/pdt/pdtlisten/src/lib.rs
@@ -227,7 +227,6 @@ pub async fn listen_bq(bq_project_id: &str, bq_dataset_id: &str, api_url: &str)
 
     println!("checking schemas..");
     ZilliqaBQProject::ensure_schema(&loc).await?;
-    // ZilliqaPSQLProject::ensure_schema(&p_client).await?;
     println!("all good.");
 
     let zilliqa_bq_proj = ZilliqaBQProject::new(