diff options
| author | Kristian Aune <kkraune@users.noreply.github.com> | 2023-05-10 12:42:17 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-05-10 12:42:17 +0200 |
| commit | f6eb575c6e3006f9fdcb5218cc4f6d67c515bc3c (patch) | |
| tree | 465811e5cf61838161fca2fc330c670871529ca9 /client | |
| parent | 17a5e0c85896e2eeeb62af29b014e5d377983b90 (diff) | |
| parent | 0a7e702eed1cdd472d2cb7f2582fb5e6bc1b9076 (diff) | |
Merge pull request #27060 from vespa-engine/mpolden/always-complete-non-retry
Always complete non-retriable operations
Diffstat (limited to 'client')
| -rw-r--r-- | client/go/internal/cli/cmd/feed.go | 1 | ||||
| -rw-r--r-- | client/go/internal/vespa/document/dispatcher.go | 4 |
2 files changed, 1 insertions, 4 deletions
diff --git a/client/go/internal/cli/cmd/feed.go b/client/go/internal/cli/cmd/feed.go index 5e9bb8c6304..a8d8c9d284b 100644 --- a/client/go/internal/cli/cmd/feed.go +++ b/client/go/internal/cli/cmd/feed.go @@ -70,7 +70,6 @@ If FILE is a single dash ('-'), documents will be read from standard input. $ cat docs.jsonl | vespa feed -`, DisableAutoGenTag: true, SilenceUsage: true, - Hidden: true, // TODO(mpolden): Remove when ready for public use RunE: func(cmd *cobra.Command, args []string) error { if options.cpuprofile != "" { f, err := os.Create(options.cpuprofile) diff --git a/client/go/internal/vespa/document/dispatcher.go b/client/go/internal/vespa/document/dispatcher.go index 00b7dbb411a..7237a87b7e2 100644 --- a/client/go/internal/vespa/document/dispatcher.go +++ b/client/go/internal/vespa/document/dispatcher.go @@ -48,8 +48,6 @@ func (op documentOp) resetResult() documentOp { return op } -func (op documentOp) complete() bool { return op.result.Success() || op.attempts == maxAttempts } - func NewDispatcher(feeder Feeder, throttler Throttler, breaker CircuitBreaker, output io.Writer, verbose bool) *Dispatcher { d := &Dispatcher{ feeder: feeder, @@ -150,7 +148,7 @@ func (d *Dispatcher) processResults() { d.statsMu.Unlock() if d.shouldRetry(op, op.result) { d.enqueue(op.resetResult(), true) - } else if op.complete() { + } else { d.inflightWg.Done() } d.dispatchNext(op.document.Id) |