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.

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

[esArchiver] replace windows line-endings on parse #21111

Merged
merged 4 commits into from Jul 24, 2018

Conversation

spalger
Copy link
Contributor

@spalger spalger commented Jul 23, 2018

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 \n line endings to/from \r\n when they setup git on windows, which is causing the es archiver to fail when it reads a mappings file and looks for \n\n to split the records. If that is what's causing #21006 then this should fix it by replacing all instances of \r\n in an archive with \n as it's being read off disk.

@spalger spalger added WIP Work in progress v7.0.0 v6.4.0 labels Jul 23, 2018
@cuff-links cuff-links self-requested a review July 23, 2018 23:22
@cuff-links
Copy link
Contributor

Tested on Windows with functional test runner. Running fine now. Great work, @spalger.

@elasticmachine
Copy link
Contributor

💔 Build Failed

@elasticmachine
Copy link
Contributor

💔 Build Failed

@cuff-links
Copy link
Contributor

cuff-links commented Jul 24, 2018 via email

@spalger spalger added review and removed WIP Work in progress labels Jul 24, 2018
@elasticmachine
Copy link
Contributor

💔 Build Failed

@spalger
Copy link
Contributor Author

spalger commented Jul 24, 2018

retest

@elasticmachine
Copy link
Contributor

💚 Build Succeeded

@cuff-links cuff-links merged commit e117ae2 into elastic:master Jul 24, 2018
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
* [esArchiver] replace windows line-endings on parse

* [esArchiver/parse/tests] feed a little extra data so replaceStream buffer is flushed
@spalger
Copy link
Contributor Author

spalger commented Jul 25, 2018

6.x/6.4: 928e6f0

@spalger spalger deleted the fix/es-archiver/windows-le-compat branch July 25, 2018 02:44
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

ES Archiver Test Fixtures Fail To Parse on Windows
3 participants