[Fix CQL Sticher 3/4] Populate map of streams to frames during parsing #1716
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
ddelnano
reviewed
Oct 3, 2023
ddelnano
reviewed
Oct 3, 2023
Comment on lines
144
to
149
| for (auto& frame : new_frames) { | ||
| // GetStreamID returns 0 by default if not implemented in protocol. | ||
| TKey key = GetStreamID<TKey, TFrameType>(&frame); | ||
| (*frames)[key].push_back(frame); | ||
| } |
There was a problem hiding this comment.
Have you tried pushing the GetStreamID call into the ParseFramesLoop function? It seems like we could avoid this loop if GetStreamID could be called here as the frame is pushed into the deque.
This comment was marked as outdated.
This comment was marked as outdated.
Sorry, something went wrong.
There was a problem hiding this comment.
On second thought, I think it is better to have the call to GetStreamID in ParseFramesLoop. To avoid this PR getting too large, I've moved that change to #1732
benkilimnik
force-pushed
the
fix-cql-stitcher-3
branch
from
f2a75fe to
75ab302
Compare
ddelnano
reviewed
Oct 9, 2023
benkilimnik
force-pushed
the
fix-cql-stitcher-3
branch
from
cde760c to
b1020b9
Compare
benkilimnik
changed the title
vihangm
pushed a commit
that referenced
this pull request
Oct 11, 2023
…1731) Summary: Raises the stirling size limit for `dbg` builds by 5 MiB (to 300mb) to accommodate upcoming changes and additions, including mongodb parsing/stitching and `StitchFrames` interface changes (#1716). Type of change: /kind cleanup Test Plan: Existing targets Signed-off-by: Benjamin Kilimnik <bkilimnik@pixielabs.ai>
benkilimnik
force-pushed
the
fix-cql-stitcher-3
branch
from
fba504e to
5af5520
Compare
ddelnano
reviewed
Oct 25, 2023
src/stirling/source_connectors/socket_tracer/protocols/cql/types.h
Outdated
Show resolved
Hide resolved
Signed-off-by: Benjamin Kilimnik <bkilimnik@pixielabs.ai>
benkilimnik
force-pushed
the
fix-cql-stitcher-3
branch
from
5af5520 to
06b3c0b
Compare
Signed-off-by: Benjamin Kilimnik <bkilimnik@pixielabs.ai>
Signed-off-by: Benjamin Kilimnik <bkilimnik@pixielabs.ai>
Signed-off-by: Benjamin Kilimnik <bkilimnik@pixielabs.ai>
ddelnano
approved these changes
Oct 25, 2023
etep
reviewed
Oct 27, 2023
| std::get<std::deque<TFrameType>>(frames_).empty()); | ||
| bool data_buffer_empty = data_buffer_.empty(); | ||
| bool monostate = std::holds_alternative<std::monostate>(frames_); | ||
| if (data_buffer_empty || monostate) { |
There was a problem hiding this comment.
I believe the condition of the if statement depends on the runtime state of data_buffer_ and frames_, so we can't use a constexpr.
Comment on lines
789
to
793
| // std::monostate. | ||
| ECHECK((conn_tracker->send_data() | ||
| .Empty<protocols::http::stream_id_t, protocols::http::Message>())); | ||
| ECHECK((conn_tracker->recv_data() | ||
| .Empty<protocols::http::stream_id_t, protocols::http::Message>())); |
There was a problem hiding this comment.
We should probably make this a DCHECK.
Also, is it possible to create a type alias so that the line breaks are avoided, e.g.
using stream_id_t = protocols::http::stream_id_t;
using message_t = protocols::http::Message;
.Empty<stream_id_t, message_t>();
There was a problem hiding this comment.
Added type alias and changed to DCHECK
… function Signed-off-by: Benjamin Kilimnik <bkilimnik@pixielabs.ai>
JamesMBartlett
approved these changes
Nov 2, 2023
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.
Summary: Modifies all protocol parsers to use a map of streams to deques by default. Protocols which do not have a notion of streams are encoded as single keys in a map. This completes the CQL stitcher fix and should simplify stitching frames for protocols with streams.
The final PR in this sequence #1732 populates a map of streamIDs to deque of frames in ParseFramesLoop instead of ParseFrames. This should provide a small efficiency boost, as we won't have to loop over the frames twice.
Related issues: Closes #1375
Type of change: /kind bug
Test Plan: Updated parsing tests to use new interface.
Note: this PR relies on changes introduced in #1689 and #1715