Fix rare case where eof was sent on buf_channel when retry happens

Fix rare case where eof was sent on buf_channel when retry happens #2583