Merge pull request #628 from urso/enh/default-bulk-sizes

default bulk sizes
elastic · Jan 7, 2016 · 9177c74 · 9177c74
2 parents 8f15afd + cb6eea1
commit 9177c74
Show file tree

Hide file tree

Showing 8 changed files with 9 additions and 7 deletions.
diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc
@@ -29,6 +29,7 @@ https://github.com/elastic/beats/compare/1.0.0...master[Check the HEAD diff]
 - Fix logging issue with file based output where newlines could be misplaced
   during concurrent logging {pull}650[650]
 - Reduce memory usage by separate queue sizes for single events and bulk events. {pull}649[649] {issue}516[516]
+- Set default default bulk_max_size value to 2048 {pull}628[628]
 
 *Packetbeat*
 - Fix setting direction to out and use its value to decide when dropping events if ignore_outgoing is enabled {pull}557[557]
@@ -37,6 +38,7 @@ https://github.com/elastic/beats/compare/1.0.0...master[Check the HEAD diff]
 
 *Filebeat*
 - Add exclude_files configuration option {pull}563[563]
+- Set spool_size default value to 2048 {pull}628[628]
 
 *Winlogbeat*
 

diff --git a/filebeat/config/config.go b/filebeat/config/config.go
@@ -17,7 +17,7 @@ const (
 	DefaultRegistryFile                      = ".filebeat"
 	DefaultIgnoreOlderDuration time.Duration = 24 * time.Hour
 	DefaultScanFrequency       time.Duration = 10 * time.Second
-	DefaultSpoolSize           uint64        = 1024
+	DefaultSpoolSize           uint64        = 2048
 	DefaultIdleTimeout         time.Duration = 5 * time.Second
 	DefaultHarvesterBufferSize int           = 16 << 10 // 16384
 	DefaultInputType                         = "log"

diff --git a/filebeat/config/config_test.go b/filebeat/config/config_test.go
@@ -20,7 +20,7 @@ func TestReadConfig(t *testing.T) {
 
 	assert.Nil(t, err)
 
-	assert.Equal(t, uint64(1024), config.Filebeat.SpoolSize)
+	assert.Equal(t, uint64(DefaultSpoolSize), config.Filebeat.SpoolSize)
 	assert.Equal(t, "/prospectorConfigs/", config.Filebeat.ConfigDir)
 
 	prospectors := config.Filebeat.Prospectors

diff --git a/filebeat/docs/configuration.asciidoc b/filebeat/docs/configuration.asciidoc
@@ -245,7 +245,7 @@ value is exceeded.
 [source,yaml]
 -------------------------------------------------------------------------------------
 filebeat:
-  spool_size: 1024
+  spool_size: 2048
 -------------------------------------------------------------------------------------
 
 

diff --git a/filebeat/etc/beat.yml b/filebeat/etc/beat.yml
@@ -143,7 +143,7 @@ filebeat:
   # General filebeat configuration options
   #
   # Event count spool threshold - forces network flush if exceeded
-  #spool_size: 1024
+  #spool_size: 2048
 
   # Defines how often the spooler is flushed. After idle_timeout the spooler is
   # Flush even though spool_size is not reached.

diff --git a/filebeat/etc/filebeat.yml b/filebeat/etc/filebeat.yml
@@ -143,7 +143,7 @@ filebeat:
   # General filebeat configuration options
   #
   # Event count spool threshold - forces network flush if exceeded
-  #spool_size: 1024
+  #spool_size: 2048
 
   # Defines how often the spooler is flushed. After idle_timeout the spooler is
   # Flush even though spool_size is not reached.

diff --git a/filebeat/tests/files/config.yml b/filebeat/tests/files/config.yml
@@ -25,7 +25,7 @@ filebeat:
       fields:
       input: stdin
       # Paths is not required
-  spool_size: 1024
+  spool_size: 2048
   idle_timeout: 5s
   config_dir: "/prospectorConfigs/"
 

diff --git a/libbeat/publisher/async.go b/libbeat/publisher/async.go
@@ -17,7 +17,7 @@ type asyncPublisher struct {
 
 const (
 	defaultFlushInterval = 1000 * time.Millisecond // 1s
-	defaultBulkSize      = 200
+	defaultBulkSize      = 2048
 )
 
 func newAsyncPublisher(pub *PublisherType, hwm, bulkHWM int) *asyncPublisher {