packaging
/
ostree
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #2759 from oglok/http_500 

Enabling retry for HTTP 500 internal server error
This commit is contained in:
Colin Walters 2022-11-09 15:34:08 -05:00 committed by GitHub
parent e153720f89 6ce2324e4a
commit a6c97e9129
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 41 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/libostree/ostree-fetcher-util.c
View File

@ -239,6 +239,7 @@ _ostree_fetcher_should_retry_request (const GError *error,
g_error_matches (error, G_IO_ERROR, G_IO_ERROR_HOST_NOT_FOUND) || g_error_matches (error, G_IO_ERROR, G_IO_ERROR_HOST_NOT_FOUND) ||
g_error_matches (error, G_IO_ERROR, G_IO_ERROR_HOST_UNREACHABLE) || g_error_matches (error, G_IO_ERROR, G_IO_ERROR_HOST_UNREACHABLE) ||
g_error_matches (error, G_IO_ERROR, G_IO_ERROR_PARTIAL_INPUT) || g_error_matches (error, G_IO_ERROR, G_IO_ERROR_PARTIAL_INPUT) ||
g_error_matches (error, G_IO_ERROR, G_IO_ERROR_BUSY) ||
#if !GLIB_CHECK_VERSION(2, 44, 0) #if !GLIB_CHECK_VERSION(2, 44, 0)
g_error_matches (error, G_IO_ERROR, G_IO_ERROR_BROKEN_PIPE) || g_error_matches (error, G_IO_ERROR, G_IO_ERROR_BROKEN_PIPE) ||
#else #else
@ -269,6 +270,8 @@ _ostree_fetcher_http_status_code_to_io_error (guint status_code)
return G_IO_ERROR_NOT_FOUND; return G_IO_ERROR_NOT_FOUND;
case 408: /* SOUP_STATUS_REQUEST_TIMEOUT */ case 408: /* SOUP_STATUS_REQUEST_TIMEOUT */
return G_IO_ERROR_TIMED_OUT; return G_IO_ERROR_TIMED_OUT;
case 500: /* SOUP_STATUS_INTERNAL_SERVER_ERROR */
return G_IO_ERROR_BUSY;
default: default:
return G_IO_ERROR_FAILED; return G_IO_ERROR_FAILED;
} }

44
tests/test-pull-repeated.sh
View File

@ -26,18 +26,32 @@ if has_gpgme; then
COMMIT_SIGN="--gpg-homedir=${TEST_GPG_KEYHOME} --gpg-sign=${TEST_GPG_KEYID_1}" COMMIT_SIGN="--gpg-homedir=${TEST_GPG_KEYHOME} --gpg-sign=${TEST_GPG_KEYID_1}"
fi fi
echo "1..4" echo "1..6"
# Test pulling from a repo which gives error 500 (internal server error) a lot of the time. # Sanity check with no network retries and 500s given, pull should fail.
rm ostree-srv httpd repo -rf
setup_fake_remote_repo1 "archive" "${COMMIT_SIGN}" --random-500s=99
pushd ${test_tmpdir}
ostree_repo_init repo --mode=archive
${CMD_PREFIX} ostree --repo=repo remote add --set=gpg-verify=false origin $(cat httpd-address)/ostree/gnomerepo
assert_fail ${CMD_PREFIX} ostree --repo=repo pull --mirror origin --network-retries=0 main 2>err.txt
assert_file_has_content err.txt "\(500.*Internal Server Error\)\|\(HTTP 500\)"
popd
echo "ok no retries after a 500"
# Test pulling a repo which gives error 500 (internal server error) a lot of the time.
rm ostree-srv httpd repo -rf
setup_fake_remote_repo1 "archive" "${COMMIT_SIGN}" --random-500s=50 setup_fake_remote_repo1 "archive" "${COMMIT_SIGN}" --random-500s=50
pushd ${test_tmpdir} pushd ${test_tmpdir}
ostree_repo_init repo --mode=archive ostree_repo_init repo --mode=archive
${CMD_PREFIX} ostree --repo=repo remote add --set=gpg-verify=false origin $(cat httpd-address)/ostree/gnomerepo ${CMD_PREFIX} ostree --repo=repo remote add --set=gpg-verify=false origin $(cat httpd-address)/ostree/gnomerepo
for x in $(seq 200); do for x in $(seq 40); do
if ${CMD_PREFIX} ostree --repo=repo pull --mirror origin main 2>err.txt; then if ${CMD_PREFIX} ostree --repo=repo pull --mirror origin --network-retries=2 main 2>err.txt; then
echo "Success on iteration ${x}" echo "Success on iteration ${x}"
break; break;
fi fi
assert_file_has_content err.txt "\(500.*Internal Server Error\)\|\(HTTP 500\)" assert_file_has_content err.txt "\(500.*Internal Server Error\)\|\(HTTP 500\)"
done done
@ -48,6 +62,24 @@ ${CMD_PREFIX} ostree --repo=repo rev-parse main
popd popd
echo "ok repeated pull after 500s" echo "ok repeated pull after 500s"
# Test pulling a repo that gives 408s a lot of the time, with many network retries.
rm ostree-srv httpd repo -rf
setup_fake_remote_repo1 "archive" "${COMMIT_SIGN}" --random-500s=50
pushd ${test_tmpdir}
ostree_repo_init repo --mode=archive
${CMD_PREFIX} ostree --repo=repo remote add --set=gpg-verify=false origin $(cat httpd-address)/ostree/gnomerepo
# We limit 500s above to 100, so 100 retries should be enough always.
${CMD_PREFIX} ostree --repo=repo pull --mirror origin --network-retries=100 main
echo "Success with big number of network retries"
${CMD_PREFIX} ostree --repo=repo fsck
${CMD_PREFIX} ostree --repo=repo rev-parse main
popd
echo "ok big number of retries with one 500s"
# Sanity check with no network retries and 408s given, pull should fail. # Sanity check with no network retries and 408s given, pull should fail.
rm ostree-srv httpd repo -rf rm ostree-srv httpd repo -rf
setup_fake_remote_repo1 "archive" "${COMMIT_SIGN}" --random-408s=99 setup_fake_remote_repo1 "archive" "${COMMIT_SIGN}" --random-408s=99