Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Improved error-handling in S3 completion callback #504

Merged
merged 1 commit into from
Sep 27, 2023
+32 −7
Merged

Improved error-handling in S3 completion callback #504

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion source/mqtt_client_connection.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -276,7 +276,6 @@ PyObject *aws_py_mqtt_client_connection_new(PyObject *self, PyObject *args) {

struct aws_allocator *allocator = aws_py_get_allocator();

PyObject *self_proxy;
PyObject *self_py;
PyObject *client_py;
PyObject *use_websocket_py;
Expand Down Expand Up @@ -307,6 +306,7 @@ PyObject *aws_py_mqtt_client_connection_new(PyObject *self, PyObject *args) {
}

/* From hereon, we need to clean up if errors occur */
PyObject *self_proxy = NULL;

if (client_version == 3) {
py_connection->native = aws_mqtt_client_connection_new(client);
Expand Down
37 changes: 31 additions & 6 deletions source/s3_meta_request.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,15 @@ static int s_s3_request_on_body(
if (request_binding->recv_file) {
/* The callback will be invoked with the right order, so we don't need to seek first. */
if (fwrite((void *)body->ptr, body->len, 1, request_binding->recv_file) < 1) {
return aws_translate_and_raise_io_error(errno);
int errno_value = ferror(request_binding->recv_file) ? errno : 0; /* Always cache errno */
aws_translate_and_raise_io_error_or(errno_value, AWS_ERROR_FILE_WRITE_FAILURE);
AWS_LOGF_ERROR(
AWS_LS_S3_META_REQUEST,
"id=%p Failed writing to file. errno:%d. aws-error:%s",
(void *)meta_request,
errno_value,
aws_error_name(aws_last_error()));
return AWS_OP_ERR;
}
if (!report_progress) {
return AWS_OP_SUCCESS;
Expand Down Expand Up @@ -212,8 +220,24 @@ static void s_s3_request_on_finish(
(void)meta_request;
struct s3_meta_request_binding *request_binding = user_data;

int error_code = meta_request_result->error_code;

if (request_binding->recv_file) {
fclose(request_binding->recv_file);
if (fclose(request_binding->recv_file) != 0) {
/* Failed to close file, so we can't guarantee it flushed to disk.
* If the meta-request's error_code was 0, change it to failure */
if (error_code == 0) {
int errno_value = errno; /* Always cache errno before potential side-effect */
aws_translate_and_raise_io_error_or(errno_value, AWS_ERROR_FILE_WRITE_FAILURE);
error_code = aws_last_error();
AWS_LOGF_ERROR(
AWS_LS_S3_META_REQUEST,
"id=%p Failed closing file. errno:%d. aws-error:%s",
(void *)meta_request,
errno_value,
aws_error_name(error_code));
}
}
request_binding->recv_file = NULL;
}
/*************** GIL ACQUIRE ***************/
Expand All @@ -227,12 +251,13 @@ static void s_s3_request_on_finish(

request_binding->copied_message = aws_http_message_release(request_binding->copied_message);

if (request_binding->size_transferred) {
if (request_binding->size_transferred && (error_code == 0)) {
/* report the remaining progress */
result =
PyObject_CallMethod(request_binding->py_core, "_on_progress", "(K)", request_binding->size_transferred);
if (!result) {
PyErr_WriteUnraisable(request_binding->py_core);
/* We MUST keep going and invoke the final callback */
} else {
Py_DECREF(result);
}
Expand All @@ -245,7 +270,7 @@ static void s_s3_request_on_finish(
header_list = s_get_py_headers(meta_request_result->error_response_headers);
if (!header_list) {
PyErr_WriteUnraisable(request_binding->py_core);
goto done;
/* We MUST keep going and invoke the final callback. These headers were optional anyway. */
}
}
if (meta_request_result->error_response_body) {
Expand All @@ -255,7 +280,7 @@ static void s_s3_request_on_finish(
request_binding->py_core,
"_on_finish",
"(iOy#)",
meta_request_result->error_code,
error_code,
header_list ? header_list : Py_None,
(const char *)(error_body.buffer),
(Py_ssize_t)error_body.len);
Expand All @@ -266,7 +291,7 @@ static void s_s3_request_on_finish(
/* Callback might fail during application shutdown */
PyErr_WriteUnraisable(request_binding->py_core);
}
done:

Py_XDECREF(header_list);
PyGILState_Release(state);
/*************** GIL RELEASE ***************/
Expand Down