fix: batch write race on commit (backport #983) (#992)

fix: batch write race on commit (backport #983) (#992) #937