[esArchiver] replace windows line-endings on parse#21111
Merged
cuff-links merged 4 commits intoelastic:masterfrom Jul 24, 2018
Merged
[esArchiver] replace windows line-endings on parse#21111cuff-links merged 4 commits intoelastic:masterfrom
cuff-links merged 4 commits intoelastic:masterfrom
Conversation
Contributor
|
Tested on Windows with functional test runner. Running fine now. Great work, @spalger. |
cuff-links
approved these changes
Jul 23, 2018
Contributor
💔 Build Failed |
added 2 commits
July 23, 2018 17:20
Contributor
💔 Build Failed |
Contributor
|
Jenkins test this
…On Mon, Jul 23, 2018, 9:28 PM Elastic Machine ***@***.***> wrote:
💔 Build Failed
- continuous-integration/kibana-ci/pull-request
<https://kibana-ci.elastic.co/job/elastic-kibana-pull-request/7639/>
—
You are receiving this because your review was requested.
Reply to this email directly, view it on GitHub
<#21111 (comment)>, or mute
the thread
<https://github.com/notifications/unsubscribe-auth/ABXaDnkSdUOu5CsCMVlUGsuPaEYSODx8ks5uJngvgaJpZM4Vbvqy>
.
|
Contributor
💔 Build Failed |
Contributor
Author
|
retest |
Contributor
💚 Build Succeeded |
spalger
pushed a commit
to spalger/kibana
that referenced
this pull request
Jul 24, 2018
* [esArchiver] replace windows line-endings on parse * [esArchiver/parse/tests] feed a little extra data so replaceStream buffer is flushed
spalger
pushed a commit
that referenced
this pull request
Jul 25, 2018
Contributor
Author
|
6.x/6.4: 928e6f0 |
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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.
Fixes #21006 (I think)
I don't have a windows machine around to test this out, but I have a hunch that some users setup git to automatically convert
\nline endings to/from\r\nwhen they setup git on windows, which is causing the es archiver to fail when it reads a mappings file and looks for\n\nto split the records. If that is what's causing #21006 then this should fix it by replacing all instances of\r\nin an archive with\nas it's being read off disk.