Skip to content

Commit 40cfdf8

Browse files
committed
Fix restart test
1 parent 0487746 commit 40cfdf8

File tree

1 file changed

+9
-2
lines changed

1 file changed

+9
-2
lines changed

regression-tests/caff-node-restart.bash

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,8 @@ parse_block_number() {
3434
return
3535
fi
3636
echo $(echo "$log" | awk -F'\"block number\"=' '{print $2}' | awk '{print $1}')
37+
38+
echo $(echo "$log" | awk -F'nextHotshotBlock=' '{print $2}' | awk '{print $1}')
3739
}
3840

3941
get_log_count() {
@@ -84,6 +86,7 @@ last_processing_hotshot_block_log=$(read_last_log $container_name "processing ho
8486
last_processing_hotshot_block_num=$(parse_block_number "$last_processing_hotshot_block_log")
8587
echo "last processing hotshot block number: $last_processing_hotshot_block_num"
8688

89+
restart_ts="$(date -u +%Y-%m-%dT%H:%M:%SZ)"
8790
docker compose start $container_name
8891

8992
sleep 20
@@ -92,7 +95,11 @@ next_produced_block_log=$(docker compose logs $container_name 2>&1 | tail -n +$c
9295
echo "next log: $next_produced_block_log"
9396
next_produced_block_num=$(parse_block_number "$next_produced_block_log")
9497

95-
next_processing_hotshot_block_log=$(docker compose logs $container_name 2>&1 | tail -n +$count | grep "processing hotshot block" | head -1)
98+
next_processing_hotshot_block_log=$(
99+
docker compose logs --since "$restart_ts" "$container_name" 2>&1 \
100+
| grep "Starting streamer" \
101+
| head -1
102+
)
96103
next_processing_hotshot_block_num=$(parse_block_number "$next_processing_hotshot_block_log")
97104

98105
echo "last block number: $last_produced_block_num"
@@ -119,5 +126,5 @@ if [[ $next_processing_hotshot_block_num -le $((last_processing_hotshot_block_nu
119126
exit 0
120127
fi
121128
fi
122-
129+
echo "caff node next processing hotshot block check failed"
123130
exit 1

0 commit comments

Comments
 (0)