Optimize memory usage by reducing buffered batches by default

.github/workflows/main.yml

@@ -28,10 +28,9 @@ jobs:
         run: |
           go run honnef.co/go/tools/cmd/staticcheck ./...
       - name: Codecov
-        env:
-          CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
-        run: |
-          bash <(curl -s https://codecov.io/bash)
+        uses: codecov/codecov-action@v3
+        with:
+          token: ${{ secrets.CODECOV_TOKEN }}
       - name: Run GoReleaser
         uses: goreleaser/goreleaser-action@v1
         with:

README.md

@@ -87,6 +87,8 @@ Available tags:
 
 * `experimental` Enable experimental features (eg. fuzzy search)
 * `pcre2` Enables PCRE 2 (v10) where able. Currently linux only
+* `rare_no_pprof` Disables profiling capabilities, which reduces binary size
+* `urfave_cli_no_docs` Disables man and markdown documentation generation, which reduces binary size
 
 **A Note on PCRE (Perl Compatible Regex Library)**
 

cmd/helpers/extractorBuilder.go

@@ -30,6 +30,7 @@ func BuildBatcherFromArguments(c *cli.Context) *batchers.Batcher {
 		concurrentReaders = c.Int("readers")
 		gunzip            = c.Bool("gunzip")
 		batchSize         = c.Int("batch")
+		batchBuffer       = c.Int("batch-buffer")
 		recursive         = c.Bool("recursive")
 	)
 
@@ -55,14 +56,14 @@ func BuildBatcherFromArguments(c *cli.Context) *batchers.Batcher {
 		if follow {
 			logger.Println("Cannot follow a stdin stream, not a file")
 		}
-		return batchers.OpenReaderToChan("<stdin>", os.Stdin, batchSize)
+		return batchers.OpenReaderToChan("<stdin>", os.Stdin, batchSize, batchBuffer)
 	} else if follow { // Read from source file
 		if gunzip {
 			logger.Println("Cannot combine -f and -z")
 		}
-		return batchers.TailFilesToChan(dirwalk.GlobExpand(fileglobs, recursive), batchSize, followReopen, followPoll, followTail)
+		return batchers.TailFilesToChan(dirwalk.GlobExpand(fileglobs, recursive), batchSize, batchBuffer, followReopen, followPoll, followTail)
 	} else { // Read (no-follow) source file(s)
-		return batchers.OpenFilesToChan(dirwalk.GlobExpand(fileglobs, recursive), gunzip, concurrentReaders, batchSize)
+		return batchers.OpenFilesToChan(dirwalk.GlobExpand(fileglobs, recursive), gunzip, concurrentReaders, batchSize, batchBuffer)
 	}
 }
 
@@ -99,6 +100,8 @@ func BuildExtractorFromArgumentsEx(c *cli.Context, batcher *batchers.Batcher, se
 }
 
 func getExtractorFlags() []cli.Flag {
+	workerCount := runtime.NumCPU()/2 + 1
+
 	return []cli.Flag{
 		&cli.BoolFlag{
 			Name:     "follow",
@@ -173,12 +176,18 @@ func getExtractorFlags() []cli.Flag {
 			Usage:    "Specifies io batching size. Set to 1 for immediate input",
 			Value:    1000,
 		},
+		&cli.IntFlag{
+			Name:     "batch-buffer",
+			Category: cliCategoryTweaking,
+			Usage:    "Specifies how many batches to read-ahead. Impacts memory usage, can improve performance",
+			Value:    workerCount * 2, // Keep 2 batches ready for each worker
+		},
 		&cli.IntFlag{
 			Name:     "workers",
 			Aliases:  []string{"w"},
 			Category: cliCategoryTweaking,
 			Usage:    "Set number of data processors",
-			Value:    runtime.NumCPU()/2 + 1,
+			Value:    workerCount,
 		},
 		&cli.IntFlag{
 			Name:     "readers",

cmd/helpers/updatingAggregator_test.go

@@ -29,7 +29,7 @@ func (s *VirtualAggregator) ParseErrors() uint64 {
 
 func TestAggregationLoop(t *testing.T) {
 	// Build a real extractor
-	batcher := batchers.OpenReaderToChan("test", ioutil.NopCloser(strings.NewReader(testData)), 1)
+	batcher := batchers.OpenReaderToChan("test", ioutil.NopCloser(strings.NewReader(testData)), 1, 1)
 	ex, err := extractor.New(batcher.BatchChan(), &extractor.Config{
 		Regex:   `(\d+)`,
 		Extract: "val:{1}",

docs/index.md

@@ -83,6 +83,8 @@ Available tags:
 
 * `experimental` Enable experimental features (eg. fuzzy search)
 * `pcre2` Enables PCRE 2 (v10) where able. Currently linux only
+* `rare_no_pprof` Disables profiling capabilities, which reduces binary size
+* `urfave_cli_no_docs` Disables man and markdown documentation generation, which reduces binary size
 
 
 ## Quickstart

docs/usage/input.md

@@ -98,3 +98,7 @@ that the batch will be processed irregardless of its current size.
 You can tweak this value with `--batch`
 
 `rare <aggreagator> --batch=10 ...`
+
+In addition, you can tweak how many batches are buffered for the extractor with `--batch-buffer`.
+By default, it will buffer 2 batches for every worker. More buffers take more memory, and
+may slightly improve performance or handle intermittent IO better.

pkg/extractor/batchers/fileBatcher.go

@@ -10,8 +10,8 @@ import (
 
 // openFilesToChan takes an iterated channel of filenames, options, and loads them all with
 //  a max concurrency.  Returns a channel that will populate with input batches
-func OpenFilesToChan(filenames <-chan string, gunzip bool, concurrency int, batchSize int) *Batcher {
-	out := newBatcher(128)
+func OpenFilesToChan(filenames <-chan string, gunzip bool, concurrency int, batchSize, batchBuffer int) *Batcher {
+	out := newBatcher(batchBuffer)
 	sema := make(chan struct{}, concurrency)
 
 	// Load as many files as the sema allows

pkg/extractor/batchers/fileBatcher_test.go

@@ -13,7 +13,7 @@ func TestOpenFilesToChan(t *testing.T) {
 	filenames <- "fileBatcher_test.go" // me!
 	close(filenames)
 
-	batches := OpenFilesToChan(filenames, false, 1, 1)
+	batches := OpenFilesToChan(filenames, false, 1, 1, 1)
 
 	total := 0
 	var lastStart uint64 = 0

pkg/extractor/batchers/readerBatcher.go

@@ -4,8 +4,8 @@ import (
 	"io"
 )
 
-func OpenReaderToChan(sourceName string, reader io.ReadCloser, batchSize int) *Batcher {
-	out := newBatcher(128)
+func OpenReaderToChan(sourceName string, reader io.ReadCloser, batchSize, batchBuffer int) *Batcher {
+	out := newBatcher(batchBuffer)
 
 	go func() {
 		defer reader.Close()

pkg/extractor/batchers/readerBatcher_test.go

@@ -10,7 +10,7 @@ import (
 
 func TestOpenReaderToChan(t *testing.T) {
 	r := ioutil.NopCloser(strings.NewReader("Hello\nthere\nbob"))
-	b := OpenReaderToChan("src", r, 1)
+	b := OpenReaderToChan("src", r, 1, 1)
 
 	b1 := <-b.BatchChan()
 	assert.Equal(t, "src", b1.Source)

pkg/extractor/batchers/tailBatcher.go

@@ -8,8 +8,8 @@ import (
 
 // TailFilesToChan tails a set of files to an input batcher that can be consumed by extractor
 //  unlike a normal file batcher, this will attempt to tail all files at once
-func TailFilesToChan(filenames <-chan string, batchSize int, reopen, poll, tail bool) *Batcher {
-	out := newBatcher(128)
+func TailFilesToChan(filenames <-chan string, batchSize, batchBuffer int, reopen, poll, tail bool) *Batcher {
+	out := newBatcher(batchBuffer)
 
 	go func() {
 		var wg sync.WaitGroup

pkg/extractor/batchers/tailBatcher_test.go

@@ -13,7 +13,7 @@ func TestBatchFollowFile(t *testing.T) {
 	filenames := make(chan string, 1)
 	filenames <- "tailBatcher_test.go" // me
 
-	batcher := TailFilesToChan(filenames, 5, false, false, false)
+	batcher := TailFilesToChan(filenames, 5, 1, false, false, false)
 
 	batch := <-batcher.BatchChan()
 	assert.Equal(t, "tailBatcher_test.go", batch.Source)
@@ -38,7 +38,7 @@ func TestBatchFollowTailFile(t *testing.T) {
 	filenames := make(chan string, 1)
 	filenames <- tmp.Name()
 
-	batcher := TailFilesToChan(filenames, 1, false, false, true)
+	batcher := TailFilesToChan(filenames, 1, 1, false, false, true)
 
 	for batcher.ActiveFileCount() == 0 {
 		time.Sleep(time.Millisecond) // Semi-hack: Wait for the go-routine reader to start and the source to be drained