fix the migrate failure when the process finished in worker
Merge branch 'master' into wj_dev