Migrate registry from previous incorrect path #10486
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
kvch
force-pushed
the
backward-compatibility-journalbeat
branch
from
71aceda to
8060df4
Compare
kvch
force-pushed
the
backward-compatibility-journalbeat
branch
from
8060df4 to
a9d4955
Compare
urso
reviewed
Feb 4, 2019
journalbeat/checkpoint/checkpoint.go
Outdated
| return err | ||
| } | ||
|
|
||
| err = helper.SafeFileRotate(c.file, c.file+".bak") |
There was a problem hiding this comment.
We should close the files before calling SafeFileRotate. Also check that Close does not error.
urso
reviewed
Feb 5, 2019
journalbeat/checkpoint/checkpoint.go
Outdated
|
|
||
| err = f.Close() | ||
| if err != nil { | ||
| return fmt.Errorf("error closing old registry file: %+v", err) |
There was a problem hiding this comment.
you still need to close target if this one fails.'
Why do we need to copy anyways? Isn't SafeFileRotate in order to move the file good enough?
The use of SafeFileRotate suggests a backup file is written and then rotated to c.file. When is c.file+".bak" written?
There was a problem hiding this comment.
It was a mistake from me. I removed it, because it was unnecessary.
urso
reviewed
Feb 5, 2019
| err = target.Close() | ||
| if err != nil { | ||
| return fmt.Errorf("error closing new registry file: %+v", err) | ||
| } |
There was a problem hiding this comment.
the copy is not 'safe' without extra call to target.Sync(). Some filesystems (without journaling) also require a sync operation on the parent directory in order to sync file + directory meta data.
kvch
force-pushed
the
backward-compatibility-journalbeat
branch
from
b9b2f74 to
6fc47dd
Compare
kvch
force-pushed
the
backward-compatibility-journalbeat
branch
from
6166aaf to
5c73b8e
Compare
urso
reviewed
Feb 5, 2019
| pf, _ := os.Open(p) | ||
| if err != nil { | ||
| return nil | ||
| } |
urso
approved these changes
Feb 5, 2019
|
All relevant tests are green. |
kvch
added a commit
to kvch/beats
that referenced
this pull request
Feb 5, 2019
In 6.x Journalbeat placed its registry file under the wrong path ignoring the data.path settings. This patch lets users migrate from registries under such paths when upgrading from 6.x to 7.x. (cherry picked from commit 9499811)
kvch
added
v6.7.0
and removed
needs_backport
kvch
added a commit
to kvch/beats
that referenced
this pull request
Feb 5, 2019
In 6.x Journalbeat placed its registry file under the wrong path ignoring the data.path settings. This patch lets users migrate from registries under such paths when upgrading from 6.x to 7.x. (cherry picked from commit 9499811)
urso
pushed a commit
that referenced
this pull request
Feb 6, 2019
In 6.x Journalbeat placed its registry file under the wrong path ignoring the data.path settings. This patch lets users migrate from registries under such paths when upgrading from 6.x to 7.x. (cherry picked from commit 9499811)
DStape
pushed a commit
to DStape/beats
that referenced
this pull request
Aug 20, 2019
In 6.x Journalbeat placed its registry file under the wrong path ignoring the data.path settings. This patch lets users migrate from registries under such paths when upgrading from 6.x to 7.x.
DStape
pushed a commit
to DStape/beats
that referenced
this pull request
Aug 20, 2019
…rrect path (elastic#10597) In 6.x Journalbeat placed its registry file under the wrong path ignoring the data.path settings. This patch lets users migrate from registries under such paths when upgrading from 6.x to 7.x. (cherry picked from commit 9499811)
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.
In 6.x Journalbeat placed its registry file under the wrong path ignoring the data.path settings.
This patch lets users migrate from registries under such paths when upgrading from 6.x to 7.x.