fix: cherry-pick rebuild log store iter when exists for a timeout (#17009)

fix: cherry-pick rebuild log store iter when exists for a timeout (#17009) #35213