SOLR-16886: Don't commit multi-part uploads that have been aborted #1773
Conversation
|
Nice catch. Is there a chance to cover it with some sort of unit test? |
| @@ -200,6 +202,10 @@ public MultipartUpload(String uploadId) { | |||
| } | |||
|
|
|||
| void uploadPart(ByteArrayInputStream inputStream, long partSize) { | |||
| if (aborted) { | |||
There was a problem hiding this comment.
this could just return like complete() below. Any reason to error here and not there? It'd make the logic a bit simpler in close() as well.
There was a problem hiding this comment.
It's true that this isn't consistent with the logic added in close. I kind of like throwing the error instead of just ignoring things because it otherwise hides the fact that the component is being misused (an upload after an abort). The reality is that none of the error paths should happen with the current code. I'm more inclined to throw the ISE exception in the compoete() if aborted than going the other way around.
It'd make the logic a bit simpler in close() as well.
Maybe it's simpler if I check for aborted in close() too and handled separately? let me push a change and see
There was a problem hiding this comment.
yeah that makes sense to me.
I was trying to see if it was possible with |
| @@ -200,6 +202,10 @@ public MultipartUpload(String uploadId) { | |||
| } | |||
|
|
|||
| void uploadPart(ByteArrayInputStream inputStream, long partSize) { | |||
| if (aborted) { | |||
There was a problem hiding this comment.
yeah that makes sense to me.
| verify(clientMock).uploadPart((UploadPartRequest) any(), (RequestBody) any()); | ||
| verify(clientMock, never()) | ||
| .completeMultipartUpload((Consumer<CompleteMultipartUploadRequest.Builder>) any()); | ||
| verify(clientMock, times(2)) |
There was a problem hiding this comment.
why does it call abort twice?
There was a problem hiding this comment.
The first time is after calling write for the first time (in line 102 in this test). The S3 client's uploadPart will fail, and after that our S3OutputStream will capture the exception and call abort. The second time is because we call write again in line 109 of this test, in this case, the exception i thrown by our MultipartUpload code (the IllegalStateException) because MPU has already been aborted. This will call abort again. This shouldn't be a problem, since one can call abort on the same ID multiple times (in fact, the javadocs say that one should, to ensure better cleanup of multipart objects, but this isn't really addressing that part)
There was a problem hiding this comment.
Thanks for the explanation!
The
complete()method is currently being called from theclose(), which is called from try-with-resources