Remove persistence of PeerStore to DB (#8617)

* remove persistence of PeerStore to DB * restore ban_store test * remove dead variable touch_other * delete_peers doesn't error * restore check_ignore_blacklisted_peers test * add high-level comment on PeerStore * deprecate Peers column * finish deprecating Peers column and add DB migration * fix test referencing DBCol::Peers * update CHANGELOG.md
near · Feb 28, 2023 · 4d94a02 · 4d94a02
1 parent 6461060
commit 4d94a02
Show file tree

Hide file tree

Showing 19 changed files with 191 additions and 616 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -28,6 +28,7 @@ to pay for the storage of their accounts.
 * `ClientConfig` can be updated while the node is running.
   `dyn_config.json` is no longer needed as its contents were merged into `config.json`.
   [#8240](https://github.com/near/nearcore/pull/8240)
+* TIER2 network stabilization. Long-lasting active connections are persisted to DB and are re-established automatically if either node restarts. A new neard flag `--connect-to-reliable-peers-on-startup` is provided to toggle this behavior; it defaults to true. The PeerStore is no longer persisted to DB and is now kept in-memory. [#8579](https://github.com/near/nearcore/issues/8579), [#8580](https://github.com/near/nearcore/issues/8580).
 
 ## 1.31.0
 

diff --git a/chain/chain/src/store.rs b/chain/chain/src/store.rs
@@ -2394,7 +2394,7 @@ impl<'a> ChainStoreUpdate<'a> {
             | DBCol::BlockMisc
             | DBCol::_GCCount
             | DBCol::BlockHeight  // block sync needs it + genesis should be accessible
-            | DBCol::Peers
+            | DBCol::_Peers
             | DBCol::RecentOutboundConnections
             | DBCol::BlockMerkleTree
             | DBCol::AccountAnnouncements

diff --git a/chain/network/src/lib.rs b/chain/network/src/lib.rs
@@ -1,5 +1,4 @@
 pub use crate::peer_manager::peer_manager_actor::{Event, PeerManagerActor};
-pub use crate::peer_manager::peer_store::iter_peers_from_store;
 
 mod accounts_data;
 mod network_protocol;

diff --git a/chain/network/src/peer/peer_actor.rs b/chain/network/src/peer/peer_actor.rs
@@ -834,11 +834,7 @@ impl PeerActor {
                     }
                     HandshakeFailureReason::InvalidTarget => {
                         tracing::debug!(target: "network", "Peer found was not what expected. Updating peer info with {:?}", peer_info);
-                        if let Err(err) =
-                            self.network_state.peer_store.add_direct_peer(&self.clock, peer_info)
-                        {
-                            tracing::error!(target: "network", ?err, "Fail to update peer store");
-                        }
+                        self.network_state.peer_store.add_direct_peer(&self.clock, peer_info);
                         self.stop(ctx, ClosingReason::HandshakeFailed);
                     }
                 }
@@ -1133,12 +1129,10 @@ impl PeerActor {
             PeerMessage::PeersResponse(peers) => {
                 tracing::debug!(target: "network", "Received peers from {}: {} peers.", self.peer_info, peers.len());
                 let node_id = self.network_state.config.node_id();
-                if let Err(err) = self.network_state.peer_store.add_indirect_peers(
+                self.network_state.peer_store.add_indirect_peers(
                     &self.clock,
                     peers.into_iter().filter(|peer_info| peer_info.id != node_id),
-                ) {
-                    tracing::error!(target: "network", ?err, "Fail to update peer store");
-                };
+                );
                 self.network_state
                     .config
                     .event_sink

diff --git a/chain/network/src/peer/testonly.rs b/chain/network/src/peer/testonly.rs
@@ -103,8 +103,7 @@ impl PeerHandle {
         let network_state = Arc::new(NetworkState::new(
             &clock,
             store.clone(),
-            peer_store::PeerStore::new(&clock, network_cfg.peer_store.clone(), store.clone())
-                .unwrap(),
+            peer_store::PeerStore::new(&clock, network_cfg.peer_store.clone()).unwrap(),
             network_cfg.verify().unwrap(),
             cfg.chain.genesis_id.clone(),
             fc.clone(),

diff --git a/chain/network/src/peer_manager/network_state/mod.rs b/chain/network/src/peer_manager/network_state/mod.rs
@@ -326,10 +326,8 @@ impl NetworkState {
                         .await
                         .map_err(|_: ReasonForBan| RegisterPeerError::InvalidEdge)?;
                     this.tier2.insert_ready(conn.clone()).map_err(RegisterPeerError::PoolError)?;
-                    // Best effort write to DB.
-                    if let Err(err) = this.peer_store.peer_connected(&clock, peer_info) {
-                        tracing::error!(target: "network", ?err, "Failed to save peer data");
-                    }
+                    // Write to the peer store
+                    this.peer_store.peer_connected(&clock, peer_info);
                 }
             }
             Ok(())

diff --git a/chain/network/src/peer_manager/peer_manager_actor.rs b/chain/network/src/peer_manager/peer_manager_actor.rs
@@ -208,9 +208,8 @@ impl PeerManagerActor {
     ) -> anyhow::Result<actix::Addr<Self>> {
         let config = config.verify().context("config")?;
         let store = store::Store::from(store);
-        let peer_store =
-            peer_store::PeerStore::new(&clock, config.peer_store.clone(), store.clone())
-                .context("PeerStore::new")?;
+        let peer_store = peer_store::PeerStore::new(&clock, config.peer_store.clone())
+            .context("PeerStore::new")?;
         tracing::debug!(target: "network",
                len = peer_store.len(),
                boot_nodes = config.peer_store.boot_nodes.len(),