Comment 3 for bug 1689282

For the record, I went for options 1 and 3 from my previous comment (i.e. fix the bug that caused retries not to be handled by celery, and perform the first few retries more quickly when we're just polling the status endpoint). That gets the "Store upload in progress" stage down to 15 seconds plus change for small snaps.