dn724/dncurrency
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Add observer stats for confirmations (#2100)

Browse source 
* Add observer stats for confirmations

* Test that observer stats are updated
This commit is contained in:
cryptocode 2019-06-23 18:22:32 +02:00 • committed by GitHub
commit 7b957a8a00
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 47 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

11
nano/core_test/node.cpp
View file

@ -256,6 +256,12 @@ TEST (node, auto_bootstrap)
{ {
ASSERT_NO_ERROR (system.poll ()); ASSERT_NO_ERROR (system.poll ());
}; };
system.deadline_set (5s);
while (node1->stats.count (nano::stat::type::observer, nano::stat::detail::observer_confirmation_active_quorum, nano::stat::dir::out) < 0 || node1->stats.count (nano::stat::type::observer, nano::stat::detail::observer_confirmation_active_conf_height, nano::stat::dir::out) < 0)
{
ASSERT_NO_ERROR (system.poll ());
}
node1->stop (); node1->stop ();
} }
@ -1565,6 +1571,11 @@ TEST (node, broadcast_elected)
ASSERT_TRUE (node1->ledger.block_exists (fork0->hash ())); ASSERT_TRUE (node1->ledger.block_exists (fork0->hash ()));
ASSERT_NO_ERROR (ec); ASSERT_NO_ERROR (ec);
} }
system.deadline_set (5s);
while (node1->stats.count (nano::stat::type::observer, nano::stat::detail::observer_confirmation_inactive, nano::stat::dir::out) < 0)
{
ASSERT_NO_ERROR (system.poll ());
}
} }
} }

12
nano/lib/stats.cpp
View file

@ -377,6 +377,9 @@ std::string nano::stat::type_to_string (uint32_t key)
case nano::stat::type::message: case nano::stat::type::message:
res = "message"; res = "message";
break; break;
case nano::stat::type::observer:
res = "observer";
break;
case nano::stat::type::confirmation_height: case nano::stat::type::confirmation_height:
res = "confirmation_height"; res = "confirmation_height";
break; break;
@ -422,6 +425,15 @@ std::string nano::stat::detail_to_string (uint32_t key)
case nano::stat::detail::bulk_push: case nano::stat::detail::bulk_push:
res = "bulk_push"; res = "bulk_push";
break; break;
case nano::stat::detail::observer_confirmation_active_quorum:
res = "observer_confirmation_active_quorum";
break;
case nano::stat::detail::observer_confirmation_active_conf_height:
res = "observer_confirmation_active_conf_height";
break;
case nano::stat::detail::observer_confirmation_inactive:
res = "observer_confirmation_inactive";
break;
case nano::stat::detail::error_socket_close: case nano::stat::detail::error_socket_close:
res = "error_socket_close"; res = "error_socket_close";
break; break;

6
nano/lib/stats.hpp
View file

@ -232,6 +232,7 @@ public:
ipc, ipc,
tcp, tcp,
udp, udp,
observer,
confirmation_height, confirmation_height,
drop drop
}; };
@ -247,6 +248,11 @@ public:
http_callback, http_callback,
unreachable_host, unreachable_host,
// observer specific
observer_confirmation_active_quorum,
observer_confirmation_active_conf_height,
observer_confirmation_inactive,
// ledger, block, bootstrap // ledger, block, bootstrap
send, send,
receive, receive,

18
nano/node/node.cpp
View file

@ -352,6 +352,24 @@ startup_time (std::chrono::steady_clock::now ())
} }
}); });
} }
// Add block confirmation type stats regardless of http-callback and websocket subscriptions
observers.blocks.add ([this](nano::election_status const & status_a, nano::account const & account_a, nano::amount const & amount_a, bool is_state_send_a) {
assert (status_a.type != nano::election_status_type::ongoing);
switch (status_a.type)
{
case nano::election_status_type::active_confirmed_quorum:
this->stats.inc (nano::stat::type::observer, nano::stat::detail::observer_confirmation_active_quorum, nano::stat::dir::out);
break;
case nano::election_status_type::active_confirmation_height:
this->stats.inc (nano::stat::type::observer, nano::stat::detail::observer_confirmation_active_conf_height, nano::stat::dir::out);
break;
case nano::election_status_type::inactive_confirmation_height:
this->stats.inc (nano::stat::type::observer, nano::stat::detail::observer_confirmation_inactive, nano::stat::dir::out);
break;
default:
break;
}
});
observers.endpoint.add ([this](std::shared_ptr<nano::transport::channel> channel_a) { observers.endpoint.add ([this](std::shared_ptr<nano::transport::channel> channel_a) {
if (channel_a->get_type () == nano::transport::transport_type::udp) if (channel_a->get_type () == nano::transport::transport_type::udp)
{ {