isaacreath commented on code in PR #2058:
URL: https://github.com/apache/cassandra/pull/2058#discussion_r1061965731
##########
src/java/org/apache/cassandra/streaming/StreamSession.java:
##########
@@ -1027,9 +1022,30 @@ public void receive(IncomingStreamMessage message)
public void progress(String filename, ProgressInfo.Direction direction,
long bytes, long total)
{
ProgressInfo progress = new ProgressInfo(peer, index, filename,
direction, bytes, total);
+ updateMetricsOnProgress(progress);
streamResult.handleProgress(progress);
}
+ private void updateMetricsOnProgress(ProgressInfo progress)
+ {
+ ProgressInfo.Direction direction = progress.direction;
+ long lastSeenBytesStreamedForProgress =
lastSeenBytesStreamed.getOrDefault(progress, 0L);
+ long newBytesStreamed = progress.currentBytes -
lastSeenBytesStreamedForProgress;
+ if (direction == ProgressInfo.Direction.OUT)
+ {
+ StreamingMetrics.totalOutgoingBytes.inc(newBytesStreamed);
+ metrics.outgoingBytes.inc(newBytesStreamed);
+ }
+
+ else if (direction == ProgressInfo.Direction.IN)
+ {
+ StreamingMetrics.totalIncomingBytes.inc(newBytesStreamed);
+ metrics.incomingBytes.inc(newBytesStreamed);
+ }
+
+ lastSeenBytesStreamed.put(progress, lastSeenBytesStreamedForProgress +
newBytesStreamed);
Review Comment:
I tried out removing from the map when `progress.currentBytes ==
progress.totalBytes` and found that this function is called in
[CassandraCompressedStreamReader::read](https://github.com/apache/cassandra/blob/trunk/src/java/org/apache/cassandra/db/streaming/CassandraCompressedStreamReader.java#L96)
multiple times (seemingly once per partition written as a file). What this
results in is `progress` being called multiple times where `currentBytes ==
totalBytes`. I'm guessing this is a behavior we'd like to keep instead of
moving the call to progress outside of the `while` loop in
`CassandraCompressedStreamReader::read`.
Given that, I'm going to spend some time thinking of another way to clean up
this map when file streaming is done.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
