Merge pull request #1948 from MonsieurNicolas/delayedSCPStatus

Delayed scp status Reviewed-by: graydon
stellar · Feb 5, 2019 · a9e4c5e · a9e4c5e
2 parents 2f09237 + 5af207e
commit a9e4c5e
Show file tree

Hide file tree

Showing 3 changed files with 56 additions and 35 deletions.
diff --git a/docs/software/admin.md b/docs/software/admin.md
@@ -481,11 +481,12 @@ Until the node sees a quorum, it will say
 After observing consensus, a new field `quorum` will be set with information on what the network decided on, at this point the node will switch to "*Catching up*":
 ```json
       "quorum" : {
-         "7667384" : {
-            "agree" : 3,
+         "22267866" : {
+            "agree" : 5,
+            "delayed" : 0,
             "disagree" : 0,
-            "fail_at" : 2,
-            "hash" : "273af2",
+            "fail_at" : 3,
+            "hash" : "980a24",
             "missing" : 0,
             "phase" : "EXTERNALIZE"
          }
@@ -548,37 +549,39 @@ Information provided here can be used for both human operators and programmatic
 Run `$ stellar-core http-command 'info'`
 The output will look something like
 ```json
- {
-   "info" : {
-      "UNSAFE_QUORUM" : "UNSAFE QUORUM ALLOWED",
-      "build" : "v9.2.0",
+{
+      "build" : "v10.2.0",
+      "history_failure_rate" : "0",
       "ledger" : {
-         "age" : 1,
+         "age" : 1549052313,
          "baseFee" : 100,
-         "baseReserve" : 5000000,
-         "closeTime" : 1519857801,
-         "hash" : "c8e484c665cdb8280cc2923d1ead5277f6c31f5baab382f54b22c801e2c50a66",
-         "num" : 7667629,
-         "version" : 9
+         "baseReserve" : 100000000,
+         "closeTime" : 0,
+         "hash" : "39c2a3cd4141b2853e70d84601faa44744660334b48f3228e0309342e3f4eb48",
+         "maxTxSetSize" : 100,
+         "num" : 1,
+         "version" : 0
       },
-      "network" : "Test SDF Network ; September 2015",
+      "network" : "Public Global Stellar Network ; September 2015",
       "peers" : {
-         "authenticated_count" : 3,
-         "pending_count" : 5
+         "authenticated_count" : 5,
+         "pending_count" : 0
       },
-      "protocol_version" : 9,
+      "protocol_version" : 10,
       "quorum" : {
-         "7667628" : {
-            "agree" : 3,
+         "22267866" : {
+            "agree" : 5,
+            "delayed" : 0,
             "disagree" : 0,
-            "fail_at" : 2,
-            "hash" : "273af2",
+            "fail_at" : 3,
+            "hash" : "980a24",
             "missing" : 0,
             "phase" : "EXTERNALIZE"
          }
       },
-      "startedOn" : "2018-02-28T22:38:20Z",
-      "state" : "Synced!"
+      "startedOn" : "2019-02-01T20:13:43Z",
+      "state" : "Catching up",
+      "status" : [ "Catching up: downloading and verifying buckets: 30/30 (100%)" ]
    }
 }
 ```
@@ -671,6 +674,7 @@ The output looks something like:
 ```json
 "474313" : {
          "agree" : 6,
+         "delayed" : null,
          "disagree" : null,
          "fail_at" : 2,
          "fail_with" : [ "lab1", "lab2" ],
@@ -685,6 +689,7 @@ The output looks something like:
 
 Entries to watch for are:
   * `agree` : the number of nodes in the quorum set that agree with this instance.
+  * `delayed` : the nodes that are participating to consensus but seem to be behind.
   * `disagree`: the nodes that were participating but disagreed with this instance.
   * `fail_at` : the number of failed nodes that *would* cause this instance to halt.
   * `fail_with`: an example of such potential failure.

diff --git a/src/overlay/PeerManager.cpp b/src/overlay/PeerManager.cpp
@@ -171,8 +171,8 @@ PeerManager::getPeersToSend(int size, PeerBareAddress const& address)
     auto peers = mOutboundPeersToSend->getRandomPeers(size, keep);
     if (peers.size() < size)
     {
-        auto inbound =
-            mInboundPeersToSend->getRandomPeers(size - peers.size(), keep);
+        auto inbound = mInboundPeersToSend->getRandomPeers(
+            size - static_cast<int>(peers.size()), keep);
         std::copy(std::begin(inbound), std::end(inbound),
                   std::back_inserter(peers));
     }

diff --git a/src/scp/BallotProtocol.cpp b/src/scp/BallotProtocol.cpp
@@ -2008,8 +2008,9 @@ BallotProtocol::getJsonQuorumInfo(NodeID const& id, bool summary)
 
     Json::Value& disagree = ret["disagree"];
     Json::Value& missing = ret["missing"];
+    Json::Value& delayed = ret["delayed"];
 
-    int n_missing = 0, n_disagree = 0;
+    int n_missing = 0, n_disagree = 0, n_delayed = 0;
 
     int agree = 0;
     auto qSet = mSlot.getSCPDriver().getQSet(qSetHash);
@@ -2028,24 +2029,39 @@ BallotProtocol::getJsonQuorumInfo(NodeID const& id, bool summary)
             }
             n_missing++;
         }
-        else if (areBallotsCompatible(getWorkingBallot(it->second.statement),
-                                      b))
-        {
-            agree++;
-        }
         else
         {
-            if (!summary)
+            auto& st = it->second.statement;
+            if (areBallotsCompatible(getWorkingBallot(st), b))
+            {
+                agree++;
+                auto t = st.pledges.type();
+                if (!(t == SCPStatementType::SCP_ST_EXTERNALIZE ||
+                      (t == SCPStatementType::SCP_ST_CONFIRM &&
+                       st.pledges.confirm().ballot.counter == UINT32_MAX)))
+                {
+                    if (!summary)
+                    {
+                        delayed.append(mSlot.getSCPDriver().toShortString(n));
+                    }
+                    n_delayed++;
+                }
+            }
+            else
             {
-                disagree.append(mSlot.getSCPDriver().toShortString(n));
+                if (!summary)
+                {
+                    disagree.append(mSlot.getSCPDriver().toShortString(n));
+                }
+                n_disagree++;
             }
-            n_disagree++;
         }
     });
     if (summary)
     {
         missing = n_missing;
         disagree = n_disagree;
+        delayed = n_delayed;
     }
 
     auto f = LocalNode::findClosestVBlocking(*qSet, mLatestEnvelopes,