From 1a298f492683fc2e491cfca74cdab7d5af252838 Mon Sep 17 00:00:00 2001 From: Paul Buetow Date: Mon, 11 Jan 2021 16:07:32 +0000 Subject: cut new dev version --- internal/version/version.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/internal/version/version.go b/internal/version/version.go index a64417f..1d974f7 100644 --- a/internal/version/version.go +++ b/internal/version/version.go @@ -11,9 +11,9 @@ 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 = "develop-3" + Additional string = "develop" // ProtocolCompat -ibility version. ProtocolCompat string = "3" ) -- cgit v1.2.3 From c3f43dafd961c7d64e08bcfb76baaa4057754c0c Mon Sep 17 00:00:00 2001 From: Paul Buetow Date: Mon, 11 Jan 2021 17:28:09 +0000 Subject: Don't write outfile with empty result set --- internal/mapr/groupset.go | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/internal/mapr/groupset.go b/internal/mapr/groupset.go index 6ee2811..70ad28b 100644 --- a/internal/mapr/groupset.go +++ b/internal/mapr/groupset.go @@ -68,11 +68,15 @@ 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, count, err := g.limitedResult(query, -1, "", ",", true) if err != nil { return err } + if count == 0 { + logger.Warn("Not writing outfile this time as empty result set", query.Outfile) + } + logger.Info("Writing outfile", query.Outfile) tmpOutfile := fmt.Sprintf("%s.tmp", query.Outfile) -- cgit v1.2.3 From e811d1725ee5f931ece6fac01db70227b0fc8a7a Mon Sep 17 00:00:00 2001 From: Paul Buetow Date: Mon, 11 Jan 2021 17:29:26 +0000 Subject: also respect 'limit' when writing mapreduce result to outfile. --- internal/mapr/groupset.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/mapr/groupset.go b/internal/mapr/groupset.go index 70ad28b..50155f8 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, count, err := g.limitedResult(query, -1, "", ",", true) + result, count, err := g.limitedResult(query, query.Limit, "", ",", true) if err != nil { return err } -- cgit v1.2.3 From 3ebfee952559fccbbaeaa3fa61e6584b3504e1aa Mon Sep 17 00:00:00 2001 From: Paul Buetow Date: Tue, 12 Jan 2021 10:56:34 +0000 Subject: undo not writing empty result set --- internal/mapr/groupset.go | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/internal/mapr/groupset.go b/internal/mapr/groupset.go index 50155f8..b5c8a48 100644 --- a/internal/mapr/groupset.go +++ b/internal/mapr/groupset.go @@ -68,15 +68,11 @@ func (g *GroupSet) WriteResult(query *Query) error { } // -1: Don't limit the result, include all data sets - result, count, err := g.limitedResult(query, query.Limit, "", ",", true) + result, _, err := g.limitedResult(query, query.Limit, "", ",", true) if err != nil { return err } - if count == 0 { - logger.Warn("Not writing outfile this time as empty result set", query.Outfile) - } - logger.Info("Writing outfile", query.Outfile) tmpOutfile := fmt.Sprintf("%s.tmp", query.Outfile) -- cgit v1.2.3 From 8e93e53fb84951de68457cf96dc1c86e75749252 Mon Sep 17 00:00:00 2001 From: Paul Buetow Date: Tue, 12 Jan 2021 11:00:28 +0000 Subject: add rampUpSleep before processing mapreduce results --- internal/clients/maprclient.go | 4 ++++ 1 file changed, 4 insertions(+) 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): -- cgit v1.2.3 From 5c36631dfb08a6966eec1394910819ff97f59119 Mon Sep 17 00:00:00 2001 From: Philip Foulkes Date: Tue, 16 Mar 2021 08:22:35 +0200 Subject: Support ECDSA SSH key --- internal/ssh/client/authmethods.go | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/internal/ssh/client/authmethods.go b/internal/ssh/client/authmethods.go index 2ff80b2..bbfb7be 100644 --- a/internal/ssh/client/authmethods.go +++ b/internal/ssh/client/authmethods.go @@ -77,6 +77,15 @@ func initKnownHostsAuthMethods(trustAllHosts bool, throttleCh chan struct{}, pri } logger.Debug("initKnownHostsAuthMethods", "Unable to use private key", privateKeyPath, err) + privateKeyPath = os.Getenv("HOME") + "/.ssh/id_ecdsa" + authMethod, err = ssh.PrivateKey(privateKeyPath) + if err == nil { + sshAuthMethods = append(sshAuthMethods, authMethod) + logger.Debug("initKnownHostsAuthmethods", "Added path to list of auth methods, not adding further methods", privateKeyPath) + return sshAuthMethods, knownHostsCallback + } + logger.Debug("initKnownHostsAuthMethods", "Unable to use private key", privateKeyPath, err) + logger.FatalExit("Unable to find private SSH key information") // Never reach this point. -- cgit v1.2.3 From 9efd8680de471e5203d77363622b2c2faa45ff54 Mon Sep 17 00:00:00 2001 From: Paul Buetow Date: Tue, 16 Mar 2021 10:59:49 +0000 Subject: fix gitignore --- .gitignore | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/.gitignore b/.gitignore index c9e8333..2524196 100644 --- a/.gitignore +++ b/.gitignore @@ -1,14 +1,9 @@ -*_proprietary.go -<<<<<<< HEAD -cache/ -log/ -tags -======= -/cache/ -/log/ +/cache +/log +/tags /dtail /dgrep /dcat /dmap /dserver ->>>>>>> 7ee0121afed3e7cab6457142f70e411020ab2b21 +/bin -- cgit v1.2.3 From 692393e0357c3a46939f9fdc7729e8269705fade Mon Sep 17 00:00:00 2001 From: Paul Buetow Date: Tue, 16 Mar 2021 11:00:04 +0000 Subject: bump version --- internal/version/version.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/version/version.go b/internal/version/version.go index c117b43..a6d6b05 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.1" + Version string = "3.2.2" // Additional information for DTail Additional string = "" // ProtocolCompat -ibility version. -- cgit v1.2.3