battle test --idempotent

[xixiaofinland]

The new battle test with --idempotent flag reveals a couple of idempotent issues.

They are to be tackled and then the flag should be added into CI/CD.

[xixiaofinland]

after latest a couple of patches, still 2 error left.