Skip to content

Commit d6f8e91

Browse files
support non-newline-terminated ignore-list files (#3404)
Fixes DACH-NY/cn-test-failures#6660. before this change: $ cat project/ignore-patterns/canton-standalone-sv4-reonboarding-new.ignore.txt | remove_comment_and_blank_lines ACS_COMMITMENT_MISMATCH after this change: $ cat project/ignore-patterns/canton-standalone-sv4-reonboarding-new.ignore.txt | remove_comment_and_blank_lines ACS_COMMITMENT_MISMATCH 'sequencer-client' is now in state Failed.*The sequencer client's healthy subscriptions count is under the configured BFT threshold.* * remove "Make sure to have a trailing newline" notes --------- Signed-off-by: Stephen Compall <stephen.compall@digitalasset.com>
1 parent d5ee20c commit d6f8e91

10 files changed

+1
-19
lines changed

.github/actions/scripts/io-utils.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111

1212
# Copy stdin to stdout, while removing all lines that start with '#' or consist of blanks
1313
remove_comment_and_blank_lines() {
14-
while IFS= read -r # Read a file line by line; IFS= ensures that no separators other than newline are used
14+
while IFS= read -r || [[ -n $REPLY ]] # Read a file line by line; IFS= ensures that no separators other than newline are used
1515
do
1616
if [[ -n "${REPLY// }" ]] && [[ "$REPLY" != "#"* ]] # Filter out comment lines and blank lines
1717
then

project/ignore-patterns/canton-standalone-disaster-recovery-lost-all-sequencers-most-participants.ignore.txt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,3 @@ Using approximate topology snapshot.*.*StandaloneSequencer
77
Failed to acknowledge clean timestamp.*closed stream
88

99
The traffic balance request submission timed
10-
11-
# Make sure to have a trailing newline

project/ignore-patterns/canton-standalone-disaster-recovery-lost-domain.ignore.txt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,3 @@ Using approximate topology snapshot.*.*StandaloneSequencer
77
Response message for request.*timed out
88

99
The traffic balance request submission timed
10-
11-
# Make sure to have a trailing newline

project/ignore-patterns/canton-standalone-participants-before-disaster-lost-all-sequencers-most-participants.ignore.txt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,3 @@ SEQUENCER_SUBSCRIPTION_LOST
77
Failed to acknowledge clean timestamp.*closed stream
88

99
'sequencer-client' is now in state Failed
10-
11-
# Make sure to have a trailing newline

project/ignore-patterns/canton-standalone-participants-before-disaster-lost-domain.ignore.txt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,3 @@ SEQUENCER_SUBSCRIPTION_LOST
77
Failed to acknowledge clean timestamp.*CANCELLED
88

99
'sequencer-client' is now in state Failed
10-
11-
# Make sure to have a trailing newline

project/ignore-patterns/canton_log.ignore.txt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -165,5 +165,3 @@ Dynamic synchronizer parameters to compute earliest available pruning timestamp
165165

166166
# TODO(#3193): Likely a race in the shutdown of the actor system vs us scheduling something else on it
167167
java.lang.IllegalStateException: cannot enqueue after timer shutdown
168-
169-
# Make sure to have a trailing newline

project/ignore-patterns/canton_log_shutdown_extra.ignore.txt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,5 +30,3 @@ Trying to materialize stream after materializer has been shutdown
3030
ApiUpdateService.*AbruptTerminationException
3131
# Consequence of the AbruptTerminationException
3232
UpdateService/GetUpdates.*failed with INTERNAL
33-
34-
# Make sure to have a trailing newline

project/ignore-patterns/canton_log_simtime_extra.ignore.txt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,5 +35,3 @@ Request failed for sequencer.*GrpcServiceUnavailable: UNAVAILABLE/Health-check s
3535
# This kicks in when an interval is skipped which can easily be caused in simtime mode
3636
# by bumping the time by more than the reconciliation interval.
3737
ACS_COMMITMENT_DEGRADATION
38-
39-
# Make sure to have a trailing newline

project/ignore-patterns/canton_network_test_log.ignore.txt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -132,5 +132,3 @@ Circuit breaker .* tripped after .* failures.*(Command|Splice)CircuitBreakerTest
132132
# See DACH-NY/cn-test-failures#6328: In rare cases, creating an index asynchronously can fail.
133133
# This is more likely in test code where we run multiple apps against the same database, all trying to create the same index.
134134
Index .* should be created and is invalid, dropping it
135-
136-
# Make sure to have a trailing newline

project/ignore-patterns/sbt-output.ignore.txt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -128,5 +128,3 @@ Retried waiting for GCLocker too often allocating
128128
canton/base/errors
129129

130130
Cannot use file /tmp/hsperfdata_ci
131-
132-
# Make sure to have a trailing newline

0 commit comments

Comments
 (0)