updates

jeffwashington · Aug 22, 2022 · 615ba6d · 615ba6d
1 parent a59f5bc
commit 615ba6d
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 3 deletions.
diff --git a/core/src/accounts_hash_verifier.rs b/core/src/accounts_hash_verifier.rs
@@ -130,7 +130,7 @@ impl AccountsHashVerifier {
         };
         timings.calc_storage_size_quartiles(&accounts_package.snapshot_storages);
 
-        error!("storing data in ahv");
+        error!("jw3: storing data in ahv");
         let (accounts_hash, lamports) = accounts_package
             .accounts
             .accounts_db
@@ -149,6 +149,8 @@ impl AccountsHashVerifier {
                 timings,
             )
             .unwrap();
+            error!("jw3: done storing data in ahv");
+
             error!("looping after ahv");
             loop {
 

diff --git a/runtime/src/accounts_db.rs b/runtime/src/accounts_db.rs
@@ -6948,6 +6948,8 @@ impl AccountsDb {
         storages: &SortedStorages<'_>,
         mut stats: HashStats,
     ) -> Result<(Hash, u64), BankHashVerificationError> {
+        error!("jw3: calculate_accounts_hash_without_index");
+
         let _guard = self.active_stats.activate(ActiveStatItem::Hash);
 
         stats.oldest_root = storages.range().start;
@@ -6963,7 +6965,7 @@ impl AccountsDb {
 
         // assert!(!(config.store_detailed_debug_info_on_failure && config.use_write_cache), "cannot accurately capture all data if accounts cache is being used");
 
-        let reference = (storages.max_slot_inclusive() == 145811791).then(|| {
+        let reference = (false && storages.max_slot_inclusive() == 145811791).then(|| {
             let mut one = DashMap::<Pubkey, Vec<crate::accounts_hash::hashentry>>::new();
             let cache_one = CacheHashData::new(&Path::new("/mnt/nvme1n1/succeeded_145811791_aug17"));
             let mut files = cache_one
@@ -7057,6 +7059,7 @@ impl AccountsDb {
             scan_and_hash()
         };
 
+        error!("jw: looking for differences");
         use crate::accounts_hash::ZERO_RAW_LAMPORTS_SENTINEL;
         if let Some(r) = reference2 {
             for entry in r.iter() {

diff --git a/runtime/src/active_stats.rs b/runtime/src/active_stats.rs
@@ -65,10 +65,12 @@ impl ActiveStats {
                 datapoint_info!("accounts_db_active", ("shrink", value, i64))
             }
             ActiveStatItem::Hash => {
+                let result = datapoint_info!("accounts_db_active", ("hash", value, i64));
                 if value > 1 {
                     panic!("too many calls");
                 }
-                datapoint_info!("accounts_db_active", ("hash", value, i64))},
+                result
+            },
             ActiveStatItem::Flush => datapoint_info!("accounts_db_active", ("flush", value, i64)),
         };
     }