Make the log checks more precise and use the retry() function for
repeating the checks.
(cherry picked from commit 9b43e65c01)
Make the log checks more precise and use the retry() function for
repeating the checks.
(cherry picked from commit 9b43e65c01)