forked from elastic/beats
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Improve registry file migration performance (elastic#20717)
## What does this PR do? Ensure that fsync is called only once after the migration of old state entries is complete. ## Why is it important? The registry uses a checkpoint-predicate that when true writes all state to disk and calls fsync. The checkpoint operation is supposed to be disabled when migration the old registry file. During migration, the old state will be directly copied (after cleanup and schema changes are applied). The old state will only be deleted after the migration of all states is complete. Unfortunately, the checkpoint predicate did return true, instead of false, which did trigger a checkpoint operation per state to be migrated. The fix disables fsync, and now finalizes the migration by calling Checkpoint directly. The PR also provides a benchmark (each "op" is one migration attempt). Before this fix (go test did kill the run after 10min for 10k entries): ``` BenchmarkMigration0To1/1-32 286 4203353 ns/op BenchmarkMigration0To1/10-32 34 35730680 ns/op BenchmarkMigration0To1/100-32 2 720890839 ns/op BenchmarkMigration0To1/1000-32 1 31633569085 ns/op ... test timed out after 10min ``` Benchmark results with the fix (migration 100k entries took ~7.6s): ``` BenchmarkMigration0To1/1-32 274 4371400 ns/op BenchmarkMigration0To1/10-32 259 4639209 ns/op BenchmarkMigration0To1/100-32 100 13374147 ns/op BenchmarkMigration0To1/1000-32 13 104220944 ns/op BenchmarkMigration0To1/10000-32 2 916656798 ns/op BenchmarkMigration0To1/100000-32 1 7616648790 ns/op PASS ``` Closes elastic#20705
- Loading branch information
Steffen Siering
committed
Aug 25, 2020
1 parent
8739dae
commit c2be4a7
Showing
6 changed files
with
165 additions
and
8 deletions.
There are no files selected for viewing
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
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,141 @@ | ||
| // Licensed to Elasticsearch B.V. under one or more contributor | ||
| // license agreements. See the NOTICE file distributed with | ||
| // this work for additional information regarding copyright | ||
| // ownership. Elasticsearch B.V. licenses this file to you under | ||
| // the Apache License, Version 2.0 (the "License"); you may | ||
| // not use this file except in compliance with the License. | ||
| // You may obtain a copy of the License at | ||
| // | ||
| // http://www.apache.org/licenses/LICENSE-2.0 | ||
| // | ||
| // Unless required by applicable law or agreed to in writing, | ||
| // software distributed under the License is distributed on an | ||
| // "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY | ||
| // KIND, either express or implied. See the License for the | ||
| // specific language governing permissions and limitations | ||
| // under the License. | ||
|
|
||
| // +build linux darwin | ||
|
|
||
| package registrar | ||
|
|
||
| import ( | ||
| "encoding/json" | ||
| "flag" | ||
| "fmt" | ||
| "io/ioutil" | ||
| "os" | ||
| "path/filepath" | ||
| "testing" | ||
|
|
||
| "github.com/elastic/beats/v7/filebeat/input/file" | ||
| libfile "github.com/elastic/beats/v7/libbeat/common/file" | ||
| ) | ||
|
|
||
| var keep bool | ||
|
|
||
| func init() { | ||
| flag.BoolVar(&keep, "keep", false, "do not delete test directories") | ||
| } | ||
|
|
||
| func BenchmarkMigration0To1(b *testing.B) { | ||
| for _, entries := range []int{1, 10, 100, 1000, 10000, 100000} { | ||
| b.Run(fmt.Sprintf("%v", entries), func(b *testing.B) { | ||
| b.StopTimer() | ||
|
|
||
| dataHome := tempDir(b) | ||
| registryHome := filepath.Join(dataHome, "filebeat") | ||
| mkDir(b, registryHome) | ||
|
|
||
| metaPath := filepath.Join(registryHome, "meta.json") | ||
| dataPath := filepath.Join(registryHome, "data.json") | ||
|
|
||
| states := make([]file.State, entries) | ||
| for i := range states { | ||
| states[i] = file.State{ | ||
| Id: fmt.Sprintf("123455-%v", i), | ||
| Source: fmt.Sprintf("/path/to/test/file-%v.log", i), | ||
| FileStateOS: libfile.StateOS{ | ||
| Inode: uint64(i), | ||
| Device: 123455, | ||
| }, | ||
| } | ||
| } | ||
|
|
||
| for i := 0; i < b.N; i++ { | ||
| b.StopTimer() | ||
| clearDir(b, registryHome) | ||
| // cleanup older run | ||
|
|
||
| writeFile(b, metaPath, []byte(`{"version": "0"}`)) | ||
| func() { | ||
| f, err := os.Create(dataPath) | ||
| if err != nil { | ||
| b.Fatal(err) | ||
| } | ||
| defer f.Close() | ||
|
|
||
| enc := json.NewEncoder(f) | ||
| if err := enc.Encode(states); err != nil { | ||
| b.Fatal(err) | ||
| } | ||
| }() | ||
|
|
||
| migrator := &Migrator{ | ||
| dataPath: dataHome, | ||
| permissions: 0600, | ||
| } | ||
|
|
||
| b.StartTimer() | ||
| if err := migrator.updateToVersion1(registryHome); err != nil { | ||
| b.Fatal(err) | ||
| } | ||
| } | ||
| }) | ||
| } | ||
| } | ||
|
|
||
| func tempDir(t testing.TB) string { | ||
| cwd, err := os.Getwd() | ||
| if err != nil { | ||
| t.Fatal(err) | ||
| } | ||
|
|
||
| path, err := ioutil.TempDir(cwd, "") | ||
| if err != nil { | ||
| t.Fatal(err) | ||
| } | ||
|
|
||
| if !keep { | ||
| t.Cleanup(func() { | ||
| os.RemoveAll(path) | ||
| }) | ||
| } | ||
| return path | ||
| } | ||
|
|
||
| func mkDir(t testing.TB, path string) { | ||
| if err := os.MkdirAll(path, 0700); err != nil { | ||
| t.Fatal(err) | ||
| } | ||
| } | ||
|
|
||
| func clearDir(t testing.TB, path string) { | ||
| old, err := ioutil.ReadDir(path) | ||
| if err != nil { | ||
| t.Fatal(err) | ||
| } | ||
| for _, info := range old { | ||
| if err := os.RemoveAll(info.Name()); err != nil { | ||
| t.Fatal(err) | ||
| } | ||
| } | ||
| } | ||
|
|
||
| func writeFile(t testing.TB, path string, contents []byte) { | ||
| t.Helper() | ||
| err := ioutil.WriteFile(path, contents, 0600) | ||
| if err != nil { | ||
| t.Fatal(err) | ||
| } | ||
| } |
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
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
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