Fix Reshard Cancel behavior#18020

rohit-nayak-ps merged 4 commits intovitessio:mainvitessio/vitess:mainfrom

github:arthur/fix-reshard-cancelgithub/vitess-gh:arthur/fix-reshard-cancelCopy head branch name to clipboard