Improve node::process_confirmed () (#1664)

* Improve node::process_confirmed ()

Fixing rare node.vote_republish test failures

* Fix std::chrono::steady_clock::now ()

* Make static consexpr process_confirmed_interval

nano/node/node.cpp

@@ -23,6 +23,7 @@ std::chrono::minutes constexpr nano::node::backup_interval;
 std::chrono::seconds constexpr nano::node::search_pending_interval;
 std::chrono::seconds constexpr nano::node::peer_interval;
 std::chrono::hours constexpr nano::node::unchecked_cleaning_interval;
+std::chrono::milliseconds constexpr nano::node::process_confirmed_interval;
 
 int constexpr nano::port_mapping::mapping_timeout;
 int constexpr nano::port_mapping::check_timeout;
@@ -3264,18 +3265,10 @@ class confirmed_visitor : public nano::block_visitor
 };
 }
 
-void nano::node::process_confirmed (std::shared_ptr<nano::block> block_a)
+void nano::node::process_confirmed (std::shared_ptr<nano::block> block_a, uint8_t iteration)
 {
 	auto hash (block_a->hash ());
-	bool exists (ledger.block_exists (block_a->type (), hash));
-	// Attempt to process confirmed block if it's not in ledger yet
-	if (!exists)
-	{
-		auto transaction (store.tx_begin_write ());
-		block_processor.process_one (transaction, block_a);
-		exists = store.block_exists (transaction, block_a->type (), hash);
-	}
-	if (exists)
+	if (ledger.block_exists (block_a->type (), hash))
 	{
 		auto transaction (store.tx_begin_read ());
 		confirmed_visitor visitor (transaction, *this, block_a, hash);
@@ -3303,6 +3296,18 @@ void nano::node::process_confirmed (std::shared_ptr<nano::block> block_a)
 			}
 		}
 	}
+	// Limit to 0.5 * 20 = 10 seconds (more than max block_processor::process_batch finish time)
+	else if (iteration < 20)
+	{
+		iteration++;
+		std::weak_ptr<nano::node> node_w (shared ());
+		alarm.add (std::chrono::steady_clock::now () + process_confirmed_interval, [node_w, block_a, iteration]() {
+			if (auto node_l = node_w.lock ())
+			{
+				node_l->process_confirmed (block_a, iteration);
+			}
+		});
+	}
 }
 
 void nano::node::process_message (nano::message & message_a, nano::endpoint const & sender_a)

nano/node/node.hpp

@@ -546,7 +546,7 @@ class node : public std::enable_shared_from_this<nano::node>
 	void stop ();
 	std::shared_ptr<nano::node> shared ();
 	int store_version ();
-	void process_confirmed (std::shared_ptr<nano::block>);
+	void process_confirmed (std::shared_ptr<nano::block>, uint8_t = 0);
 	void process_message (nano::message &, nano::endpoint const &);
 	void process_active (std::shared_ptr<nano::block>);
 	nano::process_return process (nano::block const &);
@@ -623,6 +623,7 @@ class node : public std::enable_shared_from_this<nano::node>
 	static std::chrono::seconds constexpr peer_interval = search_pending_interval;
 	static std::chrono::hours constexpr unchecked_cleaning_interval = std::chrono::hours (2);
 	std::chrono::seconds unchecked_cutoff = std::chrono::seconds (7 * 24 * 60 * 60); // Week
+	static std::chrono::milliseconds constexpr process_confirmed_interval = (nano::nano_network == nano::nano_networks::nano_test_network) ? std::chrono::milliseconds (50) : std::chrono::milliseconds (500);
 };
 
 std::unique_ptr<seq_con_info_component> collect_seq_con_info (node & node, const std::string & name);