-
Notifications
You must be signed in to change notification settings - Fork 980
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Rewrote batching logic to no longer rely on a results channel
- Loading branch information
Showing
4 changed files
with
136 additions
and
83 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,102 @@ | ||
| /* | ||
| Licensed 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. | ||
| */ | ||
|
|
||
| package provisioning | ||
|
|
||
| import ( | ||
| "context" | ||
| "sync" | ||
| "time" | ||
| ) | ||
|
|
||
| var ( | ||
| MaxBatchDuration = time.Second * 10 | ||
| BatchIdleDuration = time.Second * 1 | ||
| // MaxItemsPerBatch limits the number of items we process at one time to avoid using too much memory | ||
| MaxItemsPerBatch = 2_000 | ||
| ) | ||
|
|
||
| // Batcher separates a stream of Add(item) calls into windowed slices. The | ||
| // window is dynamic and will be extended if additional items are added up to a | ||
| // maximum batch duration or maximum items per batch. | ||
| type Batcher struct { | ||
| sync.RWMutex | ||
| running context.Context | ||
| queue chan interface{} | ||
| gate context.Context | ||
| flush context.CancelFunc | ||
| } | ||
|
|
||
| // NewBatcher is a constructor | ||
| func NewBatcher(running context.Context) *Batcher { | ||
| gate, flush := context.WithCancel(running) | ||
| return &Batcher{ | ||
| running: running, | ||
| queue: make(chan interface{}), | ||
| gate: gate, | ||
| flush: flush, | ||
| } | ||
| } | ||
|
|
||
| // Add an item to the batch, returning the next gate which the caller may block | ||
| // on. The gate is protected by a read-write mutex, and may be modified by | ||
| // Flush(), which makes a new gate. | ||
| func (b *Batcher) Add(ctx context.Context, item interface{}) <-chan struct{} { | ||
| b.RLock() | ||
| defer b.RUnlock() | ||
| select { | ||
| case b.queue <- item: | ||
| return b.gate.Done() | ||
| case <-b.gate.Done(): | ||
| return b.gate.Done() | ||
| case <-ctx.Done(): | ||
| return ctx.Done() | ||
| } | ||
| } | ||
|
|
||
| // Flush all goroutines blocking on the current gate and create a new gate. | ||
| func (b *Batcher) Flush() { | ||
| b.Lock() | ||
| defer b.Unlock() | ||
| b.flush() | ||
| b.gate, b.flush = context.WithCancel(b.running) | ||
| } | ||
|
|
||
| // Wait returns a slice of enqueued items after idle or timeout | ||
| func (b *Batcher) Wait(ctx context.Context) (items []interface{}, window time.Duration) { | ||
| // Start the batching window after the first item is received | ||
| items = append(items, <-b.queue) | ||
| start := time.Now() | ||
| defer func() { | ||
| window = time.Since(start) | ||
| }() | ||
| timeout := time.NewTimer(MaxBatchDuration) | ||
| idle := time.NewTimer(BatchIdleDuration) | ||
| for { | ||
| if len(items) >= MaxItemsPerBatch { | ||
| return | ||
| } | ||
| select { | ||
| case task := <-b.queue: | ||
| idle.Reset(BatchIdleDuration) | ||
| items = append(items, task) | ||
| case <-ctx.Done(): | ||
| return | ||
| case <-timeout.C: | ||
| return | ||
| case <-idle.C: | ||
| return | ||
| } | ||
| } | ||
| } |
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