FIX: deal with event with object size zero #3806
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Signed-off-by: George Chen <[email protected]>
chenqi0805
requested review from
engechas,
graytaylor0,
dinujoh,
kkondaka,
asifsmohammed,
dlvenable and
oeyh
as code owners
asifsmohammed
requested changes
Dec 5, 2023
| @@ -53,6 +53,7 @@ public class SqsWorker implements Runnable { | |||
| static final String SQS_MESSAGES_DELETED_METRIC_NAME = "sqsMessagesDeleted"; | |||
| static final String SQS_MESSAGES_FAILED_METRIC_NAME = "sqsMessagesFailed"; | |||
| static final String SQS_MESSAGES_DELETE_FAILED_METRIC_NAME = "sqsMessagesDeleteFailed"; | |||
| static final String ZERO_SIZED_OBJECT_COUNT_METRIC_NAME = "zeroSizedObject"; | |||
There was a problem hiding this comment.
Everything looks good to me except the metrics name. All the s3 metrics starts with s3 or s3Object. It can be s3ObjectsWithSizeZero or s3Zero SizedObjects or if you have any other suggestions.
Or we already have s3ObjectSizeBytes metric, so it can be s3ObjectSizeZeroBytes.
Signed-off-by: George Chen <[email protected]>
oeyh
previously approved these changes
Dec 5, 2023
dlvenable
reviewed
Dec 5, 2023
| @@ -53,6 +53,7 @@ public class SqsWorker implements Runnable { | |||
| static final String SQS_MESSAGES_DELETED_METRIC_NAME = "sqsMessagesDeleted"; | |||
| static final String SQS_MESSAGES_FAILED_METRIC_NAME = "sqsMessagesFailed"; | |||
| static final String SQS_MESSAGES_DELETE_FAILED_METRIC_NAME = "sqsMessagesDeleteFailed"; | |||
| static final String S3_OBJECTS_WITH_SIZE_ZERO_METRIC_NAME = "s3ObjectsWithSizeZero"; | |||
There was a problem hiding this comment.
Would s3ObjectsEmpty be a clearer and more concise name?
Signed-off-by: George Chen <[email protected]>
asifsmohammed
approved these changes
Dec 5, 2023
dlvenable
approved these changes
Dec 5, 2023
|
@chenqi0805 , Should we backport this to 2.6.1? |
opensearch-trigger-bot bot
pushed a commit
that referenced
this pull request
Dec 5, 2023
* FIX: deal with event with object size zero Signed-off-by: George Chen <[email protected]> (cherry picked from commit ad62f74)
chenqi0805
added a commit
that referenced
this pull request
Dec 6, 2023
* FIX: deal with event with object size zero Signed-off-by: George Chen <[email protected]> (cherry picked from commit ad62f74) Co-authored-by: Qi Chen <[email protected]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
This PR fixes parsing on empty folder creation S3 event in s3 source by skipping the zero size object processing.
Issues Resolved
Resolves #3727
Check List
By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.
For more information on following Developer Certificate of Origin and signing off your commits, please check here.