ARCHIVE/rippled
1
0
Fork 0
mirror of https://github.com/XRPLF/rippled.git synced 2026-07-25 16:10:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

Rescue node from copyNode as NodeType::AccountNode

Browse Source 
- Nodes rescued from freshenCaches are checked dynamically, and not
  written if not AccountNode.
This commit is contained in:
Ed Hennis
2026-07-24 18:34:24 -04:00
parent 2ba3edaf14
commit e61b134742
2 changed files with 23 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/xrpld/app/misc/SHAMapStoreImp.cpp
View File

@@ -263,7 +263,7 @@ SHAMapStoreImp::fdRequired() const
}
void
SHAMapStoreImp::rescueNode(SHAMapTreeNode const& node)
SHAMapStoreImp::rescueNode(SHAMapTreeNode const& node, std::optional<NodeObjectType> expectedType)
{
XRPL_ASSERT(node.cowid() == 0, "SHAMapStoreImp::copyNode : rescued node must be clean");
// Reachable from the validated state map in memory, but present in
@@ -274,25 +274,39 @@ SHAMapStoreImp::rescueNode(SHAMapTreeNode const& node)
// instead of later surfacing as an unresolvable SHAMapMissingNode.
auto const nodeType = node.getType();
auto const objectType = std::invoke([nodeType] {
auto const objectType = std::invoke([nodeType, expectedType] {
switch (nodeType)
{
case SHAMapNodeType::TnAccountState:
return NodeObjectType::AccountNode;
// We don't expect to see transaction nodes. The check below will prevent writing them.
case SHAMapNodeType::TnTransactionNm:
case SHAMapNodeType::TnTransactionMd:
return NodeObjectType::TransactionNode;
case SHAMapNodeType::TnInner:
return expectedType.value_or(NodeObjectType::Unknown);
default:
return NodeObjectType::Unknown;
}
});
auto const hash = node.getHash().asUInt256();
if (objectType == NodeObjectType::Unknown)
XRPL_ASSERT_IF(
expectedType,
*expectedType == objectType,
"SHAMapStoreImp::rescueNode : expected node type");
if (objectType != NodeObjectType::AccountNode || (expectedType && *expectedType != objectType))
{
JLOG(journal_.warn()) << "copyNode: unable to re-store node with unknown type, hash="
<< hash << " type=" << static_cast<int>(nodeType);
// LCOV_EXCL_START
JLOG(journal_.warn())
<< "copyNode: unable to re-store node with unsupported/unknown type, hash=" << hash
<< " type=" << static_cast<int>(nodeType);
UNREACHABLE("SHAMapStoreImp::rescueNode : unsupported node type");
return;
// LCOV_EXCL_STOP
}
Serializer s;
node.serializeWithPrefix(s);
dbRotating_->store(objectType, std::move(s.modData()), hash, 0);
@@ -309,7 +323,7 @@ SHAMapStoreImp::copyNode(std::uint64_t& nodeCount, SHAMapTreeNode const& node)
node.getHash().asUInt256(), 0, NodeStore::FetchType::Synchronous, true);
if (!obj)
{
rescueNode(node);
rescueNode(node, NodeObjectType::AccountNode);
}
if ((++nodeCount % checkHealthInterval_) == 0u)
{

4
src/xrpld/app/misc/SHAMapStoreImp.h
View File

@@ -180,7 +180,9 @@ public:
private:
// Force write a node to the writable backend during rotation so it doesn't get lost
void
rescueNode(SHAMapTreeNode const& node);
rescueNode(
SHAMapTreeNode const& node,
std::optional<NodeObjectType> expectedType = std::nullopt);
// callback for visitNodes
bool
copyNode(std::uint64_t& nodeCount, SHAMapTreeNode const& node);