Fix race condition where log.whenComplete may not complete (#5986)

Fix race condition where log.whenComplete may not complete (#5986) #11731