THRIFT-3579 Introduce retry to make cross

This closes #817
5 files changed