From e4c24cf0526d3c3e575323d49acdd0f91ff6f7f7 Mon Sep 17 00:00:00 2001 From: Martin Polden Date: Wed, 10 May 2023 11:20:18 +0200 Subject: Always complete non-retriable operations --- client/go/internal/vespa/document/dispatcher.go | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'client') 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) -- cgit v1.2.3 From 0a7e702eed1cdd472d2cb7f2582fb5e6bc1b9076 Mon Sep 17 00:00:00 2001 From: Martin Polden Date: Wed, 10 May 2023 11:21:13 +0200 Subject: Stop marking command as hidden --- client/go/internal/cli/cmd/feed.go | 1 - 1 file changed, 1 deletion(-) (limited to 'client') 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) -- cgit v1.2.3