improve clear-pending-ops to handle new failures as shown in prod

[merge]