Merge pull request #1895 from skalenetwork/enhancement/1890-add-logs

#1890 add more logs for archive node

libdevcore/LevelDB.h

@@ -71,6 +71,7 @@ class LevelDB : public DatabaseFace {
     static std::atomic< uint64_t > g_keyDeletesStats;
     // count of the keys that are scheduled to be deleted but are not yet deleted
     static std::atomic< uint64_t > g_keysToBeDeletedStats;
+    static uint64_t getCurrentTimeMs();
 
 private:
     std::unique_ptr< leveldb::DB > m_db;
@@ -123,7 +124,6 @@ class LevelDB : public DatabaseFace {
         }
     };
     void openDBInstanceUnsafe();
-    uint64_t getCurrentTimeMs();
     void reopenDataBaseIfNeeded();
 };
 

libethereum/Client.cpp

@@ -713,10 +713,13 @@ size_t Client::syncTransactions(
     // Tell network about the new transactions.
     m_skaleHost->noteNewTransactions();
 
-    ctrace << cc::debug( "Processed " ) << cc::size10( newPendingReceipts.size() )
-           << cc::debug( " transactions in " ) << cc::size10( timer.elapsed() * 1000 )
-           << cc::debug( "(" ) << ( bool ) m_syncTransactionQueue << cc::debug( ")" );
+    ctrace << "Processed " << newPendingReceipts.size() << " transactions in "
+           << timer.elapsed() * 1000 << "(" << ( bool ) m_syncTransactionQueue << ")";
 
+#ifdef HISTORIC_STATE
+    LOG( m_logger ) << "HSCT: "
+                    << m_working.mutableState().mutableHistoricState().getAndResetBlockCommitTime();
+#endif
     return goodReceipts;
 }
 

libethereum/SkaleHost.cpp

@@ -723,6 +723,7 @@ void SkaleHost::createBlock( const ConsensusExtFace::transactions_vector& _appro
                                    skaledTimeFinish - skaledTimeStart )
                                    .count();
     }
+
     latestBlockTime = skaledTimeFinish;
     LOG( m_debugLogger ) << "Successfully imported " << n_succeeded << " of " << out_txns.size()
                          << " transactions";

libhistoric/HistoricState.cpp

@@ -44,7 +44,8 @@ HistoricState::HistoricState( HistoricState const& _s )
       m_unchangedCacheEntries( _s.m_unchangedCacheEntries ),
       m_nonExistingAccountsCache( _s.m_nonExistingAccountsCache ),
       m_unrevertablyTouched( _s.m_unrevertablyTouched ),
-      m_accountStartNonce( _s.m_accountStartNonce ) {}
+      m_accountStartNonce( _s.m_accountStartNonce ),
+      m_totalTimeSpentInStateCommitsPerBlock( _s.m_totalTimeSpentInStateCommitsPerBlock ) {}
 
 OverlayDB HistoricState::openDB(
     fs::path const& _basePath, h256 const& _genesisHash, WithExisting _we ) {
@@ -137,6 +138,7 @@ HistoricState& HistoricState::operator=( HistoricState const& _s ) {
     m_nonExistingAccountsCache = _s.m_nonExistingAccountsCache;
     m_unrevertablyTouched = _s.m_unrevertablyTouched;
     m_accountStartNonce = _s.m_accountStartNonce;
+    m_totalTimeSpentInStateCommitsPerBlock = _s.m_totalTimeSpentInStateCommitsPerBlock;
     return *this;
 }
 
@@ -194,11 +196,20 @@ void HistoricState::clearCacheIfTooLarge() const {
 }
 
 void HistoricState::commitExternalChanges( AccountMap const& _accountMap ) {
+    auto historicStateStart = dev::db::LevelDB::getCurrentTimeMs();
     commitExternalChangesIntoTrieDB( _accountMap, m_state );
     m_state.db()->commit();
     m_changeLog.clear();
     m_cache.clear();
     m_unchangedCacheEntries.clear();
+    auto historicStateFinish = dev::db::LevelDB::getCurrentTimeMs();
+    m_totalTimeSpentInStateCommitsPerBlock += historicStateFinish - historicStateStart;
+}
+
+uint64_t HistoricState::getAndResetBlockCommitTime() {
+    uint64_t retVal = m_totalTimeSpentInStateCommitsPerBlock;
+    m_totalTimeSpentInStateCommitsPerBlock = 0;
+    return retVal;
 }
 
 

libhistoric/HistoricState.h

@@ -296,6 +296,8 @@ class HistoricState {
 
     void setRootFromDB();
 
+    uint64_t getAndResetBlockCommitTime();
+
 private:
     /// Turns all "touched" empty accounts into non-alive accounts.
     void removeEmptyAccounts();
@@ -345,6 +347,8 @@ class HistoricState {
 
     AddressHash commitExternalChangesIntoTrieDB(
         AccountMap const& _cache, SecureTrieDB< Address, OverlayDB >& _state );
+
+    uint64_t m_totalTimeSpentInStateCommitsPerBlock = 0;
 };
 
 std::ostream& operator<<( std::ostream& _out, HistoricState const& _s );