Skip to content

Commit

Permalink
Ref. EOSIO#180: add incremental fixes for block storage and sharing. …
Browse files Browse the repository at this point in the history 
…Also minor mods for launcher and testnet.md
  • Loading branch information
@pmesnier
pmesnier committed Aug 29, 2017
1 parent ff5733e commit 1e7cdff
Show file tree
Hide file tree
Showing 2 changed files with 61 additions and 50 deletions.
106 changes: 57 additions & 49 deletions plugins/net_plugin/net_plugin.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,11 @@

namespace eos {
using std::vector;

using boost::asio::ip::tcp;
using boost::asio::ip::address_v4;
using boost::asio::ip::host_name;

using fc::time_point;
using fc::time_point_sec;
using eos::chain::transaction_id_type;
Expand Down Expand Up @@ -95,7 +97,6 @@ namespace eos {

struct handshake_initializer {
static void populate (handshake_message &hello);
static net_plugin_impl* info;
};

class connection : public std::enable_shared_from_this<connection> {
Expand All @@ -119,6 +120,8 @@ namespace eos {
auto *rnd = remote_node_id.data();
rnd[0] = 0;



}

~connection() {
Expand All @@ -130,10 +133,13 @@ namespace eos {
sync_request_index in_sync_state;
sync_request_index out_sync_state;
socket_ptr socket;
std::set<fc::sha256> shared_peers;
set<fc::sha256> shared_peers;
set<connection_ptr> mutual_peers;

uint32_t pending_message_size;
vector<char> pending_message_buffer;
vector<char> raw_recv;
vector<char> raw_send;

fc::sha256 remote_node_id;
handshake_message last_handshake;
Expand Down Expand Up @@ -172,18 +178,18 @@ namespace eos {
fc::raw::pack( ds, m );

boost::asio::async_write( *socket, boost::asio::buffer( buffer.data(), buffer.size() ),
[this,buf=std::move(buffer)]( boost::system::error_code ec, std::size_t bytes_transferred ) {
if( ec ) {
elog( "Error sending message: ${msg}", ("msg",ec.message() ) );
} else {
if (!out_queue.size()) {
elog ("out_queue underflow!");
} else {
out_queue.pop_front();
}
send_next_message();
}
});
[this,buf=std::move(buffer)]( boost::system::error_code ec, std::size_t bytes_transferred ) {
if( ec ) {
elog( "Error sending message: ${msg}", ("msg",ec.message() ) );
} else {
if (!out_queue.size()) {
elog ("out_queue underflow!");
} else {
out_queue.pop_front();
}
send_next_message();
}
});
}

void write_block_backlog ( ) {
Expand Down Expand Up @@ -431,8 +437,8 @@ namespace eos {
if (c->out_sync_state.size() == 0) {
const auto& bs = c->trx_state.find(msg.id());
if (bs == c->trx_state.end()) {
c->trx_state.insert((transaction_state){msg.id(),true,true,(uint32_t)-1,
fc::time_point(),fc::time_point()});
c->trx_state.insert(transaction_state({msg.id(),true,true,(uint32_t)-1,
fc::time_point(),fc::time_point()}));
}
c->send(msg);
}
Expand Down Expand Up @@ -555,6 +561,12 @@ namespace eos {
dlog ("skipping received connection's node");
continue;
}
for (auto &conn : connections) {
if (conn->remote_node_id == pnode) {
c->mutual_peers.insert (conn);
break;
}
}
c->shared_peers.insert (pnode);
}
}
Expand Down Expand Up @@ -646,7 +658,7 @@ namespace eos {
auto bs = itr.find(msg.block.id());
if (bs == c->block_state.end()) {
dlog ("not found, forwarding on");
c->block_state.insert ((block_state){msg.block.id(),true,true,fc::time_point()});
c->block_state.insert (block_state({msg.block.id(),true,true,fc::time_point()}));
forward (c, msg);
} else {
if (!bs->is_known) {
Expand Down Expand Up @@ -736,28 +748,29 @@ namespace eos {

void start_reading_pending_buffer( connection_ptr c ) {
boost::asio::async_read( *c->socket,
boost::asio::buffer(c->pending_message_buffer.data(),
c->pending_message_size ),
[this,c]( boost::system::error_code ec, std::size_t bytes_transferred ) {
if( !ec ) {
try {
auto msg = fc::raw::unpack<net_message>( c->pending_message_buffer );
start_read_message( c );

msgHandler m(*this, c);
msg.visit(m);
return;
} catch ( const fc::exception& e ) {
edump((e.to_detail_string() ));
}
} else {
elog( "Error reading message from connection: ${m}", ("m", ec.message() ) );
}
close( c );
if ( c->try_reconnect ) {

}
});
boost::asio::buffer(c->pending_message_buffer.data(), c->pending_message_size ),
[this,c]( boost::system::error_code ec, std::size_t bytes_transferred ) {
if( !ec ) {
try {
auto msg = fc::raw::unpack<net_message>( c->pending_message_buffer );
start_read_message( c );

msgHandler m(*this, c);
msg.visit(m);
return;
} catch ( const fc::exception& e ) {
edump((e.to_detail_string() ));
}
} else {
elog( "Error reading message from connection: ${m}", ("m", ec.message() ) );
}
if ( c->try_reconnect ) {
#warning ("TODO: Add reconnect logic after a read failure");
}
else {
close( c );
}
});
}


Expand Down Expand Up @@ -798,16 +811,12 @@ namespace eos {

}; // class net_plugin_impl



net_plugin_impl* handshake_initializer::info;

void
handshake_initializer::populate (handshake_message &hello) {
hello.network_version = 0;
hello.chain_id = info->chain_id;
hello.node_id = info->node_id;
hello.p2p_address = info->p2p_address;
hello.chain_id = my_impl->chain_id;
hello.node_id = my_impl->node_id;
hello.p2p_address = my_impl->p2p_address;
#if defined( __APPLE__ )
hello.os = "osx";
#elif defined( __linux__ )
Expand All @@ -817,10 +826,10 @@ namespace eos {
#else
hello.os = "other";
#endif
hello.agent = info->user_agent_name;
hello.agent = my_impl->user_agent_name;


chain_controller& cc = info->chain_plug->chain();
chain_controller& cc = my_impl->chain_plug->chain();
try {
hello.last_irreversible_block_id = cc.get_block_id_for_num
(hello.last_irreversible_block_num = cc.last_irreversible_block_num());
Expand All @@ -843,7 +852,6 @@ namespace eos {

net_plugin::net_plugin()
:my( new net_plugin_impl ) {
handshake_initializer::info = my.get();
my_impl = my.get();
}

Expand Down
5 changes: 4 additions & 1 deletion testnet.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,10 +32,13 @@ Note that the Launcher will not push instances of eosd to the remote hosts, you
Network topology or "shape" describes how the nodes are connected in order to share transaction and block data, and requests for the same. The idea for varying network topology is that there is a trade off between the number of times a node must send a message reporting a new transaction or block, vs the number of times that message must be repeated to ensure all nodes know of it.

The Launcher has definitions of three different network "shapes" based on inter-nodal connections, which can be selected by a command line option, or you can supply your own network topology by editing the Launcher generated configuration file.

####Ring network
This is the simplest network, where each node identifies just the node next to it as it's only peer.

####Star network
A "star" is intended to support the use larger number nodes in the testnet. In this case the number of peers connected to a node and the distribution of those nodes varies based on the number of nodes in the network.
A "star" is intended to support the use larger number nodes in the testnet. In this case the number of peers connected to a node and the distribution of those nodes varies based on the number of nodes in the network.

####Mesh network
In a "mesh" network, each node is connected to as many peer nodes as possible.

Expand Down

0 comments on commit 1e7cdff

Please sign in to comment.