Skip to content

Commit 5675a86

Browse files
aderevetsaderevets
committed
fix: Update BlockNodeSuite log assertions for block node connection rewrite
Update test assertions in BlockNodeSuite.java to match changed/removed log messages from the connection reconnect rewrite (#24377): - Remove "Selected block node" assertion (log removed) - Fix "Closing connection." -> "Closing connection" (period removed) - Replace old forced-switch message with "Streaming connection update requested" - Update worker loop exception messages to "connection worker thread" - Remove assertions for deleted reconnect-related messages - Update EndOfStream -> BehindPublisher in exceeded responses assertion
1 parent 7b7d456 commit 5675a86

File tree

1 file changed

+8
-19
lines changed
  • hedera-node/test-clients/src/main/java/com/hedera/services/bdd/suites/blocknode

1 file changed

+8
-19
lines changed

‎hedera-node/test-clients/src/main/java/com/hedera/services/bdd/suites/blocknode/BlockNodeSuite.java‎

Lines changed: 8 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,6 @@ final Stream<DynamicTest> node0StreamingBlockNodeConnectionDropsTrickle() {
9696
connectionDropTime::get,
9797
Duration.ofMinutes(1),
9898
Duration.ofSeconds(45),
99-
String.format("Selected block node localhost:%s for connection attempt", portNumbers.get(1)),
10099
String.format(
101100
"/localhost:%s/READY] Connection state transitioned from UNINITIALIZED to READY",
102101
portNumbers.get(1)),
@@ -150,7 +149,7 @@ final Stream<DynamicTest> node0StreamingBlockNodeConnectionDropsTrickle() {
150149
portNumbers.get(3)),
151150
String.format(
152151
"/localhost:%s/ACTIVE] Block boundary reached; closing connection", portNumbers.get(3)),
153-
String.format("/localhost:%s/CLOSING] Closing connection.", portNumbers.get(3)),
152+
String.format("/localhost:%s/CLOSING] Closing connection", portNumbers.get(3)),
154153
String.format(
155154
"/localhost:%s/CLOSING] Connection state transitioned from ACTIVE to CLOSING",
156155
portNumbers.get(3)),
@@ -221,7 +220,7 @@ final Stream<DynamicTest> testProactiveBlockBufferAction() {
221220
// look for the saturation reaching the action stage (50%)
222221
"saturation=50.0%",
223222
// look for the log that shows we are forcing a reconnect to a different block node
224-
"Attempting to forcefully switch block node connections due to increasing block buffer saturation",
223+
"Streaming connection update requested",
225224
"/localhost:" + portNumbers.get(1)
226225
+ "/ACTIVE] Connection state transitioned from READY to ACTIVE")),
227226
blockNode(0).updateSendingBlockAcknowledgements(true),
@@ -287,7 +286,7 @@ final Stream<DynamicTest> testBlockBufferDurability() {
287286
timeRef::get,
288287
duration,
289288
duration,
290-
"Attempting to forcefully switch block node connections due to increasing block buffer saturation")),
289+
"Streaming connection update requested")),
291290
doingContextual(spec -> timeRef.set(Instant.now())),
292291
// restart the consensus node
293292
// this should persist the buffer to disk on shutdown and load the buffer on startup
@@ -302,7 +301,7 @@ final Stream<DynamicTest> testBlockBufferDurability() {
302301
Duration.ofMinutes(3),
303302
"Block buffer persisted to disk",
304303
"Block buffer is being restored from disk",
305-
"Attempting to forcefully switch block node connections due to increasing block buffer saturation")),
304+
"Streaming connection update requested")),
306305
// restart the block node and let it catch up
307306
blockNode(0).startImmediately(),
308307
// create some more blocks and ensure the buffer/platform remains healthy
@@ -371,19 +370,9 @@ private Stream<DynamicTest> validateHappyPath(final int blocksToWait) {
371370
// Block node connection error assertions
372371
assertBlockNodeCommsLogDoesNotContainText(byNodeId(0), "Error received", Duration.ofSeconds(0)),
373372
assertBlockNodeCommsLogDoesNotContainText(
374-
byNodeId(0), "Exception caught in block stream worker loop", Duration.ofSeconds(0)),
373+
byNodeId(0), "Exception caught in connection worker thread", Duration.ofSeconds(0)),
375374
assertBlockNodeCommsLogDoesNotContainText(
376-
byNodeId(0), "UncheckedIOException caught in block stream worker loop", Duration.ofSeconds(0)),
377-
assertBlockNodeCommsLogDoesNotContainText(
378-
byNodeId(0), "Failed to establish connection to block node", Duration.ofSeconds(0)),
379-
assertBlockNodeCommsLogDoesNotContainText(
380-
byNodeId(0), "Failed to schedule connection task for block node", Duration.ofSeconds(0)),
381-
assertBlockNodeCommsLogDoesNotContainText(
382-
byNodeId(0), "Failed to reschedule connection attempt", Duration.ofSeconds(0)),
383-
assertBlockNodeCommsLogDoesNotContainText(
384-
byNodeId(0),
385-
"Closing and rescheduling connection for reconnect attempt",
386-
Duration.ofSeconds(0)),
375+
byNodeId(0), "UncheckedIOException caught in connection worker thread", Duration.ofSeconds(0)),
387376

388377
// EndOfStream error assertions
389378
assertBlockNodeCommsLogDoesNotContainText(
@@ -392,7 +381,7 @@ private Stream<DynamicTest> validateHappyPath(final int blocksToWait) {
392381
byNodeId(0), "Block node reported an unknown error at block", Duration.ofSeconds(0)),
393382
assertBlockNodeCommsLogDoesNotContainText(
394383
byNodeId(0),
395-
"Block node has exceeded the allowed number of EndOfStream responses",
384+
"Block node has exceeded the allowed number of BehindPublisher responses",
396385
Duration.ofSeconds(0)),
397386
assertBlockNodeCommsLogDoesNotContainText(
398387
byNodeId(0),
@@ -441,7 +430,7 @@ private Stream<DynamicTest> validateHappyPath(final int blocksToWait) {
441430
byNodeId(0), "Block buffer still not available to accept new blocks", Duration.ofSeconds(0)),
442431
assertBlockNodeCommsLogDoesNotContainText(
443432
byNodeId(0),
444-
"Attempting to forcefully switch block node connections due to increasing block buffer saturation",
433+
"Streaming connection update requested",
445434
Duration.ofSeconds(0)),
446435
assertBlockNodeCommsLogDoesNotContainText(
447436
byNodeId(0),

0 commit comments

Comments
 (0)