performance improvements and network bug fixes #131
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
(cherry picked from commit 695d5fd)
(cherry picked from commit e4b8695)
…after that correspond to our blocks. GH EOSIO#6755 (cherry picked from commit e9a6c08)
…her connected nodeos. GH EOSIO#6755 (cherry picked from commit 2b3f266)
(cherry picked from commit 4c9dbdc)
(cherry picked from commit c9c02f0)
(cherry picked from commit 797f194)
…ilure if passed in a block number; also update fc submodule (cherry picked from commit 09737b4)
…s not actually contain a transaction (cherry picked from commit ad6bdf8)
…. Added better error messages for common mistakes. (cherry picked from commit 0f7709f)
(cherry picked from commit b70da87)
(cherry picked from commit 8697e70)
…ortcut out in that situation. (cherry picked from commit f1a4b5c)
…ct they are on a fork (cherry picked from commit ffbf338)
(cherry picked from commit 1eecbf2)
# Conflicts: # libraries/chain/pbft_database.cpp
(cherry picked from commit 9aa7f69)
…; contruct_index should leave index file empty if block log contains no blocks (cherry picked from commit 80f4551)
(cherry picked from commit 3f03ede)
…ct if unexpected (cherry picked from commit 79c90ff)
(cherry picked from commit 0a61350)
…m is not found (cherry picked from commit 58fee31)
(cherry picked from commit c1ba6eb)
(cherry picked from commit 130cc1c)
…cause plugin_shutdown not called. Moved the creation of keepalive timer to after acceptor bind which can easily fail if port already in use. Changed fc_elog to elog for port already in use so that it is always logged regardless of net_plugin_impl logger setting. Also move the setup of logger to start of plugin_startup since logging is used within the method. (cherry picked from commit e796f37)
BOS-boscore
reviewed
Oct 17, 2019
BOS-boscore
reviewed
Oct 17, 2019
| @@ -917,6 +917,7 @@ namespace eosio { | |||
| void connection::close() { | |||
| if(socket) { | |||
| socket->close(); | |||
| socket.reset( new tcp::socket( std::ref(app().get_io_service())) ); | |||
There was a problem hiding this comment.
这个是因为 boost 库没升级？之前没加reset 不出错万幸。
There was a problem hiding this comment.
reset 这块一直没有，这个bug他们也是最近刚解。get_io_service 应该还在用，不过之后用多线程了这边都要替换掉。
BOS-boscore
reviewed
Oct 17, 2019
| auto conn = weak_conn.lock(); | ||
| if (!conn || !conn->socket || !conn->socket->is_open()) { | ||
| if (!conn || !conn->socket || !conn->socket->is_open() || !socket->is_open()) { |
There was a problem hiding this comment.
重连以后有可能会不一样，再加上接下来还有net_plugin的多线程要加进来。
BOS-boscore
reviewed
Oct 17, 2019
| } | ||
| } | ||
|
|
||
| bool net_plugin_impl::process_next_message(const connection_ptr& conn, uint32_t message_length) { |
There was a problem hiding this comment.
EOS “if next message is a block we already have, exit early ” 逻辑 加上有什么问题吗？
There was a problem hiding this comment.
那段逻辑需要新版本的fc支持，fc的升级会跟boost升级一起做。
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Change Description
Consensus Changes
API Changes
Documentation Additions