adjust cache size and age

Author: wangchao

src/ripple/app/ledger/LedgerHistory.cpp

@@ -53,7 +53,7 @@ LedgerHistory::LedgerHistory (
 				return ledger->info().validated;
 			}
 		,app.journal("TaggedCache"))
-    , m_consensus_validated ("ConsensusValidated", 64, 300,
+    , m_consensus_validated ("ConsensusValidated", 64, /*300*/60,
         stopwatch(), app_.journal("TaggedCache"))
     , j_ (app.journal ("LedgerHistory"))
 {

src/ripple/app/ledger/TransactionMaster.h

@@ -59,6 +59,8 @@ class TransactionMaster
 
     void canonicalize (std::shared_ptr<Transaction>* pTransaction);
 
+    void tune(int size, int age);
+
     void sweep (void);
 
     TaggedCache <uint256, Transaction>&

src/ripple/app/ledger/impl/TransactionMaster.cpp

@@ -188,6 +188,12 @@ TransactionMaster::canonicalize(std::shared_ptr<Transaction>* pTransaction)
     }
 }
 
+void TransactionMaster::tune(int size, int age)
+{
+    mCache.setTargetSize(size);
+    mCache.setTargetAge(age);
+}
+
 void TransactionMaster::sweep (void)
 {
     mCache.sweep ();

src/ripple/app/main/Application.cpp

@@ -426,7 +426,8 @@ class ApplicationImp
 
         , m_collectorManager (CollectorManager::New (
             config_->section (SECTION_INSIGHT), logs_->journal("Collector")))
-        , cachedSLEs_ (std::chrono::minutes(1), stopwatch())
+        //, cachedSLEs_ (std::chrono::minutes(1), stopwatch())
+        , cachedSLEs_(std::chrono::seconds(config_->getSize(siSLECacheAge)), stopwatch())
         , validatorKeys_(*config_, m_journal)
 
         , m_resourceManager (Resource::make_Manager (
@@ -472,7 +473,7 @@ class ApplicationImp
                 gotTXSet (set, fromAcquire);
             }))
 
-        , m_acceptedLedgerCache("AcceptedLedger", /*4*/16, /*60*/600, stopwatch(),
+        , m_acceptedLedgerCache("AcceptedLedger", 4, 60, stopwatch(),
             logs_->journal("TaggedCache"))
 
         , m_networkOPs (make_NetworkOPs (*this, stopwatch(),
@@ -1367,6 +1368,7 @@ bool ApplicationImp::setup()
 
     m_nodeStore->tune (config_->getSize (siNodeCacheSize), config_->getSize (siNodeCacheAge));
     m_ledgerMaster->tune (config_->getSize (siLedgerSize), config_->getSize (siLedgerAge));
+    m_txMaster.tune (config_->getSize(siTransactionSize), config_->getSize(siTransactionAge));
     family().treecache().setTargetSize (config_->getSize (siTreeCacheSize));
     family().treecache().setTargetAge (config_->getSize (siTreeCacheAge));
 

src/ripple/core/Config.h

@@ -56,6 +56,8 @@ enum SizedItemName
     siSLECacheAge,
     siLedgerSize,
     siLedgerAge,
+    siTransactionSize,
+    siTransactionAge,
     siLedgerFetch,
     siHashNodeDBCache,
     siTxnDBCache,

src/ripple/core/impl/Config.cpp

@@ -588,6 +588,9 @@ int Config::getSize (SizedItemName item) const
         { siLedgerSize,         {   32,     128,    256,    384,        768     } },
         { siLedgerAge,          {   30,     90,     180,    240,        900     } },
 
+        { siTransactionSize,    {   65536,  131072, 196608, 262144,     327680  } },
+        { siTransactionAge,     {   60,     90,     120,    900,        1800    } },
+
         { siHashNodeDBCache,    {   4,      12,     24,     64,         128     } },
         { siTxnDBCache,         {   4,      12,     24,     64,         128     } },
         { siLgrDBCache,         {   4,      8,      16,     32,         128     } },

src/ripple/ledger/CachedSLEs.h

@@ -98,6 +98,11 @@ class CachedSLEs
     double
     rate() const;
 
+    std::size_t size() const
+    {
+        return map_.size();
+    }
+
 private:
     std::size_t hit_ = 0;
     std::size_t miss_ = 0;

src/ripple/protocol/JsonFields.h

@@ -138,6 +138,7 @@ JSS ( both );                       // in: Subscribe, Unsubscribe
 JSS ( both_sides );                 // in: Subscribe, Unsubscribe
 JSS ( build_path );                 // in: TransactionSign
 JSS ( build_version );              // out: NetworkOPs
+JSS ( cachedSLE_size );
 JSS ( cancel_after );               // out: AccountChannels
 JSS ( can_delete );                 // out: CanDelete
 JSS ( channel_id );                 // out: AccountChannels

src/ripple/rpc/handlers/GetCounts.cpp

@@ -106,6 +106,8 @@ Json::Value doGetCounts (RPC::Context& context)
     ret[jss::ledger_hit_rate] = context.app.getLedgerMaster ().getCacheHitRate ();
     ret[jss::AL_hit_rate] = context.app.getAcceptedLedgerCache ().getHitRate ();
 
+    ret[jss::cachedSLE_size] = static_cast<unsigned int>(context.app.cachedSLEs().size());
+
     ret[jss::fullbelow_size] = static_cast<int>(context.app.family().fullbelow().size());
     ret[jss::treenode_cache_size] = context.app.family().treecache().getCacheSize();
     ret[jss::treenode_track_size] = context.app.family().treecache().getTrackSize();