LocalTxMonitor: Add support for GetMeasures #4918
Open
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
5 tasks
fraser-iohk
force-pushed
the
fraser-iohk/localtxmonitor-measures
branch
from
d45e534 to
7398881
Compare
amesgen
reviewed
Sep 3, 2024
ouroboros-network-protocols/src/Ouroboros/Network/Protocol/LocalTxMonitor/Type.hs
Outdated
Show resolved
Hide resolved
fraser-iohk
force-pushed
the
fraser-iohk/localtxmonitor-measures
branch
from
9488451 to
d6eb7bb
Compare
fraser-iohk
force-pushed
the
fraser-iohk/localtxmonitor-measures
branch
from
d6eb7bb to
0a00293
Compare
fraser-iohk
force-pushed
the
fraser-iohk/localtxmonitor-measures
branch
3 times, most recently
from
1007422 to
e415888
Compare
fraser-iohk
added
consensus
coot
reviewed
Jan 3, 2025
Comment on lines
87
to
91
| MsgReplyGetMeasures measures -> | ||
| CBOR.encodeListLen 2 | ||
| <> CBOR.encodeWord 12 | ||
| <> CBOR.encodeListLen 2 | ||
| <> CBOR.encodeWord32 (txCount measures) | ||
| <> encodeMeasureMap (measuresMap measures) |
There was a problem hiding this comment.
Why not?
Suggested change
| MsgReplyGetMeasures measures -> | |
| CBOR.encodeListLen 2 | |
| <> CBOR.encodeWord 12 | |
| <> CBOR.encodeListLen 2 | |
| <> CBOR.encodeWord32 (txCount measures) | |
| <> encodeMeasureMap (measuresMap measures) | |
| MsgReplyGetMeasures measures -> | |
| CBOR.encodeListLen 3 | |
| <> CBOR.encodeWord 12 | |
| <> CBOR.encodeWord32 (txCount measures) | |
| <> encodeMeasureMap (measuresMap measures) |
Comment on lines
+162
to
+161
| f mn sc = | ||
| encodeMeasureName mn <> encodeSizeAndCapacity sc |
There was a problem hiding this comment.
Shouldn't it be ⬇️ for it to produce valid CBOR?
Suggested change
| f mn sc = | |
| encodeMeasureName mn <> encodeSizeAndCapacity sc | |
| f mn sc = | |
| encodeListLen 2 | |
| <> encodeMeasureName mn | |
| <> encodeSizeAndCapacity sc |
There was a problem hiding this comment.
am I misunderstanding how CBOR's map encoding works? I was under the impression that they were encoded as a length N followed by N pairs of elements that constitute the map, which should be what this code is doing (?)
There was a problem hiding this comment.
the CDDL tests pass, which I wouldn't expect if the encoding were invalid
ouroboros-network-protocols/testlib/Ouroboros/Network/Protocol/LocalTxMonitor/Examples.hs
Outdated
Show resolved
Hide resolved
Comment on lines
309
to
313
| data TokBusyKind (k :: StBusyKind) where | ||
| TokNextTx :: TokBusyKind NextTx | ||
| TokHasTx :: TokBusyKind HasTx | ||
| TokGetSizes :: TokBusyKind GetSizes | ||
| TokNextTx :: TokBusyKind NextTx | ||
| TokHasTx :: TokBusyKind HasTx | ||
| TokGetSizes :: TokBusyKind GetSizes | ||
| TokGetMeasures :: TokBusyKind GetMeasures |
There was a problem hiding this comment.
We have SingBusyKind; I suspect TokBusyKind is not needed at all (either I missed removing it, or it resurfaced after a rebase).
There was a problem hiding this comment.
yep, I was a little puzzled about this after the commit that changed the API -- I'm happy to remove it in this change though (unless that's a breaking change that would somehow cause downstream issues?)
…reName just a newtype around Text, so that network doesn't need to know about anything ledger-specific
…he new typed-protocols API
…gGetMeasures and MsgReplyGetMeasures
fraser-iohk
force-pushed
the
fraser-iohk/localtxmonitor-measures
branch
from
e415888 to
48b514c
Compare
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.
Description
This PR adds a new message to
LocalTxMonitor,GetMeasures, which is similar toGetSize(returning the current mempool transaction count, the size of those transactions, and the total mempool capacity), but returns information about several other metrics in addition to the byte size and capacity of the mempool.GetMeasurescurrently returns size and capacity information for transaction byte size, ledger's execution units (both their memory and execution steps), and the reference scripts size, but can easily be extended to support any new metric types in future while remaining backwards compatible.This change works towards ouroboros-consensus#1178, and has a dependent PR in ouroboros-consensus
Checklist
Quality
Maintenance
ouroboros-networkproject.