Fix awslogs driver repeating last event - #34292 #34296
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: Justin Menga <justin.menga@gmail.com>
|
cc @samuelkarp |
samuelkarp
approved these changes
Jul 28, 2017
thaJeztah
reviewed
Jul 29, 2017
| @@ -641,14 +641,28 @@ func TestCollectBatchMultilinePatternMaxEventAge(t *testing.T) { | |||
| }) | |||
|
|
|||
| // Fire ticker batchPublishFrequency seconds later | |||
| ticks <- time.Now().Add(batchPublishFrequency * time.Second) | |||
| ticks <- time.Now().Add(batchPublishFrequency + time.Second) | |||
There was a problem hiding this comment.
Is this correct? The comment leads me to believe it should be "* time.Second";
// Fire ticker batchPublishFrequency seconds later
There was a problem hiding this comment.
batchPublishFrequency is already a time.Duration (see line 40 in cloudwatchlogs.go), so the existing code was an error.
There was a problem hiding this comment.
ah, makes sense (reading on my phone)
thaJeztah
approved these changes
Jul 31, 2017
thaJeztah
added
area/logging
kind/bug
|
All Jenkins tests passed. Merging. |
|
@yongtang @thaJeztah Would this be cherry-picked into Docker 17.06.1-ce? |
|
I opened an issue internally to consider backporting it yes. Not sure yet if it makes 17.06.1, otherwise it could be included in a .2 release. |
This was referenced Jul 31, 2017
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.
Signed-off-by: Justin Menga justin.menga@gmail.com
- What I did
Fixes #34292
- How I did it
Ensure event buffer used for storing log events is properly flushed
- How to verify it
The modifications to the test case in this PR fail with the old code and pass with the new code.
See #34292 for details on how to replicate the issue (I have verified this is no longer an issue with this PR)
- Description for the changelog
Fix awslogs driver repeating last event
- A picture of a cute animal (not mandatory but encouraged)