diff options
| author | Paul Buetow <pbuetow@mimecast.com> | 2021-02-04 17:15:09 +0000 |
|---|---|---|
| committer | Paul Buetow <pbuetow@mimecast.com> | 2021-02-04 17:15:09 +0000 |
| commit | 8aebd03f5813ac0a181812d2557cef2208be5bc4 (patch) | |
| tree | 872e24270f6a348446b2f2c194b4be4c839b010d | |
| parent | 5b077bfcd68f84892a7ed66bbf92ec8d602ae8ec (diff) | |
| parent | 9853cac671ced4ce7b373fe4674a274369edd79c (diff) | |
merge develop
| -rw-r--r-- | internal/clients/maprclient.go | 4 | ||||
| -rw-r--r-- | internal/mapr/groupset.go | 2 | ||||
| -rw-r--r-- | internal/version/version.go | 2 |
3 files changed, 6 insertions, 2 deletions
diff --git a/internal/clients/maprclient.go b/internal/clients/maprclient.go index 1c0c2cc..1522537 100644 --- a/internal/clients/maprclient.go +++ b/internal/clients/maprclient.go @@ -131,6 +131,10 @@ func (c MaprClient) makeCommands() (commands []string) { } func (c *MaprClient) periodicReportResults(ctx context.Context) { + rampUpSleep := c.query.Interval / 2 + logger.Debug("Ramp up sleeping before processing mapreduce results", rampUpSleep) + time.Sleep(rampUpSleep) + for { select { case <-time.After(c.query.Interval): diff --git a/internal/mapr/groupset.go b/internal/mapr/groupset.go index 6ee2811..b5c8a48 100644 --- a/internal/mapr/groupset.go +++ b/internal/mapr/groupset.go @@ -68,7 +68,7 @@ func (g *GroupSet) WriteResult(query *Query) error { } // -1: Don't limit the result, include all data sets - result, _, err := g.limitedResult(query, -1, "", ",", true) + result, _, err := g.limitedResult(query, query.Limit, "", ",", true) if err != nil { return err } diff --git a/internal/version/version.go b/internal/version/version.go index c0f349c..c117b43 100644 --- a/internal/version/version.go +++ b/internal/version/version.go @@ -11,7 +11,7 @@ const ( // Name of DTail. Name string = "DTail" // Version of DTail. - Version string = "3.2.0" + Version string = "3.2.1" // Additional information for DTail Additional string = "" // ProtocolCompat -ibility version. |