-
Notifications
You must be signed in to change notification settings - Fork 1.3k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #1113 from loadimpact/fix/influxdbUsingTooMuchMemory
Fix InfluxDB using too much memory
- Loading branch information
Showing
23 changed files
with
639 additions
and
358 deletions.
There are no files selected for viewing
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
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,59 @@ | ||
| package influxdb | ||
|
|
||
| import ( | ||
| "io" | ||
| "io/ioutil" | ||
| "net/http" | ||
| "testing" | ||
| "time" | ||
|
|
||
| "github.com/loadimpact/k6/stats" | ||
| ) | ||
|
|
||
| func benchmarkInfluxdb(b *testing.B, t time.Duration) { | ||
| testCollectorCycle(b, func(rw http.ResponseWriter, r *http.Request) { | ||
| for { | ||
| time.Sleep(t) | ||
| m, _ := io.CopyN(ioutil.Discard, r.Body, 1<<18) // read 1/4 mb a time | ||
| if m == 0 { | ||
| break | ||
| } | ||
| } | ||
| rw.WriteHeader(204) | ||
| }, func(tb testing.TB, c *Collector) { | ||
| b = tb.(*testing.B) | ||
| b.ResetTimer() | ||
|
|
||
| var samples = make(stats.Samples, 10) | ||
| for i := 0; i < len(samples); i++ { | ||
| samples[i] = stats.Sample{ | ||
| Metric: stats.New("testGauge", stats.Gauge), | ||
| Time: time.Now(), | ||
| Tags: stats.NewSampleTags(map[string]string{ | ||
| "something": "else", | ||
| "VU": "21", | ||
| "else": "something", | ||
| }), | ||
| Value: 2.0, | ||
| } | ||
| } | ||
|
|
||
| b.ResetTimer() | ||
| for i := 0; i < b.N; i++ { | ||
| c.Collect([]stats.SampleContainer{samples}) | ||
| time.Sleep(time.Nanosecond * 20) | ||
| } | ||
| }) | ||
| } | ||
|
|
||
| func BenchmarkInfluxdb1Second(b *testing.B) { | ||
| benchmarkInfluxdb(b, time.Second) | ||
| } | ||
|
|
||
| func BenchmarkInfluxdb2Second(b *testing.B) { | ||
| benchmarkInfluxdb(b, 2*time.Second) | ||
| } | ||
|
|
||
| func BenchmarkInfluxdb100Milliseconds(b *testing.B) { | ||
| benchmarkInfluxdb(b, 100*time.Millisecond) | ||
| } |
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,118 @@ | ||
| package influxdb | ||
|
|
||
| import ( | ||
| "bytes" | ||
| "context" | ||
| "io" | ||
| "net" | ||
| "net/http" | ||
| "sync" | ||
| "testing" | ||
| "time" | ||
|
|
||
| "github.com/loadimpact/k6/stats" | ||
| "github.com/stretchr/testify/require" | ||
| null "gopkg.in/guregu/null.v3" | ||
| ) | ||
|
|
||
| func TestBadConcurrentWrites(t *testing.T) { | ||
| c := NewConfig() | ||
| t.Run("0", func(t *testing.T) { | ||
| c.ConcurrentWrites = null.IntFrom(0) | ||
| _, err := New(*c) | ||
| require.Error(t, err) | ||
| require.Equal(t, err.Error(), "influxdb's ConcurrentWrites must be a positive number") | ||
| }) | ||
|
|
||
| t.Run("-2", func(t *testing.T) { | ||
| c.ConcurrentWrites = null.IntFrom(-2) | ||
| _, err := New(*c) | ||
| require.Error(t, err) | ||
| require.Equal(t, err.Error(), "influxdb's ConcurrentWrites must be a positive number") | ||
| }) | ||
|
|
||
| t.Run("2", func(t *testing.T) { | ||
| c.ConcurrentWrites = null.IntFrom(2) | ||
| _, err := New(*c) | ||
| require.NoError(t, err) | ||
| }) | ||
| } | ||
|
|
||
| func testCollectorCycle(t testing.TB, handler http.HandlerFunc, body func(testing.TB, *Collector)) { | ||
| s := &http.Server{ | ||
| Addr: ":", | ||
| Handler: handler, | ||
| MaxHeaderBytes: 1 << 20, | ||
| } | ||
| l, err := net.Listen("tcp", "127.0.0.1:0") | ||
| require.NoError(t, err) | ||
| defer func() { | ||
| _ = l.Close() | ||
| }() | ||
|
|
||
| defer func() { | ||
| require.NoError(t, s.Shutdown(context.Background())) | ||
| }() | ||
|
|
||
| go func() { | ||
| require.Equal(t, http.ErrServerClosed, s.Serve(l)) | ||
| }() | ||
|
|
||
| config := NewConfig() | ||
| config.Addr = null.StringFrom("http://" + l.Addr().String()) | ||
| c, err := New(*config) | ||
| require.NoError(t, err) | ||
|
|
||
| require.NoError(t, c.Init()) | ||
| ctx, cancel := context.WithCancel(context.Background()) | ||
| var wg sync.WaitGroup | ||
| defer cancel() | ||
| wg.Add(1) | ||
| go func() { | ||
| defer wg.Done() | ||
| c.Run(ctx) | ||
| }() | ||
|
|
||
| body(t, c) | ||
|
|
||
| cancel() | ||
| wg.Wait() | ||
| } | ||
| func TestCollector(t *testing.T) { | ||
| var samplesRead int | ||
| defer func() { | ||
| require.Equal(t, samplesRead, 20) | ||
| }() | ||
| testCollectorCycle(t, func(rw http.ResponseWriter, r *http.Request) { | ||
| var b = bytes.NewBuffer(nil) | ||
| _, _ = io.Copy(b, r.Body) | ||
| for { | ||
| s, err := b.ReadString('\n') | ||
| if len(s) > 0 { | ||
| samplesRead++ | ||
| } | ||
| if err != nil { | ||
| break | ||
| } | ||
| } | ||
|
|
||
| rw.WriteHeader(204) | ||
| }, func(tb testing.TB, c *Collector) { | ||
| var samples = make(stats.Samples, 10) | ||
| for i := 0; i < len(samples); i++ { | ||
| samples[i] = stats.Sample{ | ||
| Metric: stats.New("testGauge", stats.Gauge), | ||
| Time: time.Now(), | ||
| Tags: stats.NewSampleTags(map[string]string{ | ||
| "something": "else", | ||
| "VU": "21", | ||
| "else": "something", | ||
| }), | ||
| Value: 2.0, | ||
| } | ||
| } | ||
| c.Collect([]stats.SampleContainer{samples}) | ||
| c.Collect([]stats.SampleContainer{samples}) | ||
| }) | ||
|
|
||
| } |
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
Oops, something went wrong.