Don't delay transaction fetches due to load, only ledger fetches.

modules/ripple_app/ledger/ripple_InboundLedger.cpp

@@ -13,7 +13,7 @@ SETUP_LOG (InboundLedger)
 #define LEDGER_TIMEOUT_AGGRESSIVE   6       // how many timeouts before we get aggressive
 
 InboundLedger::InboundLedger (uint256 const& hash, uint32 seq)
-    : PeerSet (hash, LEDGER_ACQUIRE_TIMEOUT)
+    : PeerSet (hash, LEDGER_ACQUIRE_TIMEOUT, false)
     , mHaveBase (false)
     , mHaveState (false)
     , mHaveTransactions (false)

modules/ripple_core/functional/ripple_Job.cpp

@@ -130,6 +130,9 @@ const char* Job::toString (JobType t)
     case jtTXN_PROC:
         return "processTransaction";
 
+    case jtTXN_DATA:
+        return "fetchTxnData";
+
     case jtOB_SETUP:
         return "orderBookSetup";
 

modules/ripple_core/functional/ripple_Job.h

@@ -17,20 +17,21 @@ enum JobType
     jtPUBOLDLEDGER  = 2,    // An old ledger has been accepted
     jtVALIDATION_ut = 3,    // A validation from an untrusted source
     jtPROOFWORK     = 4,    // A proof of work demand from another server
-    jtPROPOSAL_ut   = 5,    // A proposal from an untrusted source
-    jtLEDGER_DATA   = 6,    // Received data for a ledger we're acquiring
-    jtUPDATE_PF     = 7,    // Update pathfinding requests
-    jtCLIENT        = 8,    // A websocket command from the client
-    jtTRANSACTION   = 9,    // A transaction received from the network
-    jtPUBLEDGER     = 10,   // Publish a fully-accepted ledger
-    jtWAL           = 11,   // Write-ahead logging
-    jtVALIDATION_t  = 12,   // A validation from a trusted source
-    jtWRITE         = 13,   // Write out hashed objects
-    jtTRANSACTION_l = 14,   // A local transaction
-    jtPROPOSAL_t    = 15,   // A proposal from a trusted source
-    jtSWEEP         = 16,   // Sweep for stale structures
-    jtADMIN         = 17,   // An administrative operation
-    jtDEATH         = 18,   // job of death, used internally
+    jtTRANSACTION_l = 5,    // A local transaction
+    jtPROPOSAL_ut   = 6,    // A proposal from an untrusted source
+    jtLEDGER_DATA   = 7,    // Received data for a ledger we're acquiring
+    jtUPDATE_PF     = 8,    // Update pathfinding requests
+    jtCLIENT        = 9,    // A websocket command from the client
+    jtTRANSACTION   = 10,    // A transaction received from the network
+    jtPUBLEDGER     = 11,   // Publish a fully-accepted ledger
+    jtTXN_DATA      = 12,   // Fetch a proposed set
+    jtWAL           = 13,   // Write-ahead logging
+    jtVALIDATION_t  = 14,   // A validation from a trusted source
+    jtWRITE         = 15,   // Write out hashed objects
+    jtPROPOSAL_t    = 16,   // A proposal from a trusted source
+    jtSWEEP         = 17,   // Sweep for stale structures
+    jtADMIN         = 18,   // An administrative operation
+    jtDEATH         = 19,   // job of death, used internally
 
     // special types not dispatched by the job pool
     jtPEER          = 24,

src/cpp/ripple/ripple_PeerSet.cpp

@@ -6,7 +6,7 @@
 
 class InboundLedger;
 
-PeerSet::PeerSet (uint256 const& hash, int interval)
+PeerSet::PeerSet (uint256 const& hash, int interval, bool txnData)
     : mHash (hash)
     , mTimerInterval (interval)
     , mTimeouts (0)
@@ -14,6 +14,7 @@ PeerSet::PeerSet (uint256 const& hash, int interval)
     , mFailed (false)
     , mProgress (true)
     , mAggressive (false)
+    , mTxnData (txnData)
     , mTimer (getApp().getIOService ())
 {
     mLastAction = UptimeTimer::getInstance ().getElapsedSeconds ();
@@ -74,16 +75,24 @@ void PeerSet::TimerEntry (boost::weak_ptr<PeerSet> wptr, const boost::system::er
 
     if (ptr)
     {
-        int jc = getApp().getJobQueue ().getJobCountTotal (jtLEDGER_DATA);
-
-        if (jc > 4)
+        if (ptr->mTxnData)
         {
-            WriteLog (lsDEBUG, InboundLedger) << "Deferring PeerSet timer due to load";
-            ptr->setTimer ();
+            getApp().getJobQueue ().addLimitJob (jtTXN_DATA, "timerEntry", 2,
+                BIND_TYPE (&PeerSet::TimerJobEntry, P_1, ptr));
         }
         else
-            getApp().getJobQueue ().addLimitJob (jtLEDGER_DATA, "timerEntry", 2,
-                BIND_TYPE (&PeerSet::TimerJobEntry, P_1, ptr));
+        {
+            int jc = getApp().getJobQueue ().getJobCountTotal (jtLEDGER_DATA);
+
+            if (jc > 4)
+            {
+                WriteLog (lsDEBUG, InboundLedger) << "Deferring PeerSet timer due to load";
+                ptr->setTimer ();
+            }
+            else
+                getApp().getJobQueue ().addLimitJob (jtLEDGER_DATA, "timerEntry", 2,
+                    BIND_TYPE (&PeerSet::TimerJobEntry, P_1, ptr));
+	}
     }
 }
 

src/cpp/ripple/ripple_PeerSet.h

@@ -67,7 +67,7 @@ private:
 
     // VFALCO TODO try to make some of these private
 protected:
-    PeerSet (uint256 const& hash, int interval);
+    PeerSet (uint256 const& hash, int interval, bool txnData);
     virtual ~PeerSet () { }
 
     virtual void newPeer (Peer::ref) = 0;
@@ -95,6 +95,7 @@ protected:
     bool mFailed;
     bool mProgress;
     bool mAggressive;
+    bool mTxnData;
     int mLastAction;
 
 

src/cpp/ripple/ripple_TransactionAcquire.cpp

@@ -11,7 +11,9 @@ SETUP_LOG (TransactionAcquire)
 typedef std::map<uint160, LedgerProposal::pointer>::value_type u160_prop_pair;
 typedef std::map<uint256, DisputedTx::pointer>::value_type u256_lct_pair;
 
-TransactionAcquire::TransactionAcquire (uint256 const& hash) : PeerSet (hash, TX_ACQUIRE_TIMEOUT), mHaveRoot (false)
+TransactionAcquire::TransactionAcquire (uint256 const& hash)
+    : PeerSet (hash, TX_ACQUIRE_TIMEOUT, true)
+    , mHaveRoot (false)
 {
     mMap = boost::make_shared<SHAMap> (smtTRANSACTION, hash);
 }