diff options
| author | Paul Buetow <pbuetow@mimecast.com> | 2024-03-06 10:59:03 +0000 |
|---|---|---|
| committer | Paul Buetow <pbuetow@mimecast.com> | 2024-03-06 10:59:03 +0000 |
| commit | 49444cd13d78e540a88ff00b3dde5124ef770abd (patch) | |
| tree | 1ff51310dc2e001cf8aaf71c763023bba9f6656e /internal/clients | |
| parent | a3e10757a52fa47a0608afd88986162ca5eb22cc (diff) | |
| parent | c8265ec16e086c988868d8cc3b7bd854d213be90 (diff) | |
Merge branch 'PS-34477-csv.tmp' into 'master'v4.3.2
only rename .csv.tmp to .csv when the final result was written
See merge request Storage/dtail!8
Diffstat (limited to 'internal/clients')
| -rw-r--r-- | internal/clients/maprclient.go | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/internal/clients/maprclient.go b/internal/clients/maprclient.go index 2bc66a4..440cb91 100644 --- a/internal/clients/maprclient.go +++ b/internal/clients/maprclient.go @@ -101,7 +101,7 @@ func (c *MaprClient) Start(ctx context.Context, statsCh <-chan string) (status i status = c.baseClient.Start(ctx, statsCh) if c.cumulative { dlog.Client.Debug("Received final mapreduce result") - c.reportResults() + c.reportResults(true) } return @@ -145,16 +145,16 @@ func (c *MaprClient) periodicReportResults(ctx context.Context) { select { case <-time.After(c.query.Interval): dlog.Client.Debug("Gathering interim mapreduce result") - c.reportResults() + c.reportResults(false) case <-ctx.Done(): return } } } -func (c *MaprClient) reportResults() { +func (c *MaprClient) reportResults(finalResult bool) { if c.query.HasOutfile() { - c.writeResultsToOutfile() + c.writeResultsToOutfile(finalResult) return } c.printResults() @@ -208,14 +208,14 @@ func (c *MaprClient) printResults() { dlog.Client.Raw(fmt.Sprintf("%s\n", result)) } -func (c *MaprClient) writeResultsToOutfile() { +func (c *MaprClient) writeResultsToOutfile(finalResult bool) { if c.cumulative { - if err := c.globalGroup.WriteResult(c.query); err != nil { + if err := c.globalGroup.WriteResult(c.query, finalResult); err != nil { dlog.Client.FatalPanic(err) } return } - if err := c.globalGroup.SwapOut().WriteResult(c.query); err != nil { + if err := c.globalGroup.SwapOut().WriteResult(c.query, true); err != nil { dlog.Client.FatalPanic(err) } } |