Merge pull request #620 from eosnetworkfoundation/ship-reduce-logs

[3.2] Backport: [statehist] Ship logs reduction / optimization
eosnetworkfoundation · Jul 8, 2022 · 89a3a6c · 89a3a6c
2 parents 9bac82b + 0c0d148
commit 89a3a6c
Showing 1 changed file with 23 additions and 2 deletions.
diff --git a/plugins/state_history_plugin/state_history_plugin.cpp b/plugins/state_history_plugin/state_history_plugin.cpp
@@ -250,8 +250,29 @@ struct state_history_plugin_impl : std::enable_shared_from_this<state_history_pl
             }
             ++current_request->start_block_num;
          }
-         fc_ilog(_log, "pushing result {\"head\":{\"block_num\":${head}},\"last_irreversible\":{\"block_num\":${last_irr}},\"this_block\":{\"block_num\":${this_block}}} to send queue", 
-               ("head", result.head.block_num) ("last_irr", result.last_irreversible.block_num)("this_block", result.this_block->block_num));
+
+         auto& block_num = current_request->start_block_num;
+         auto get_blk = [&chain, block_num, block_state]() -> signed_block_ptr {
+            try {
+               if (block_state && block_state->block_num == block_num)
+                  return block_state->block;
+               return chain.fetch_block_by_number(block_num);
+            } catch (...) {
+               return {};
+            }
+         };
+         auto block = get_blk();
+
+         // during syncing if block is older than 5 min, log every 1000th block
+         bool fresh_block = block && fc::time_point::now() - block->timestamp < fc::minutes(5);
+         if( fresh_block || (result.this_block && result.this_block->block_num % 1000 == 0) ) {
+            fc_ilog(_log, "pushing result "
+                  "{\"head\":{\"block_num\":${head}},\"last_irreversible\":{\"block_num\":${last_irr}},\"this_block\":{"
+                  "\"block_num\":${this_block}}} to send queue",
+                  ("head", result.head.block_num)("last_irr", result.last_irreversible.block_num)(
+                        "this_block", result.this_block ? result.this_block->block_num : fc::variant()));
+         }
+
          send(std::move(result));
          --current_request->max_messages_in_flight;
          need_to_send_update = current_request->start_block_num <= current &&