From 307bcb8d4df2a31197ad15cbd4f380bd6c062973 Mon Sep 17 00:00:00 2001 From: hagen1778 Date: Mon, 11 Dec 2023 15:30:47 +0100 Subject: [PATCH] app/vmctl: follow-up after 27668c9d011ea63cc3044d96fb882eac61ac81bd * remove duplications in error messages * mention the change in CHANGELOG.md https://github.com/VictoriaMetrics/VictoriaMetrics/commit/27668c9d011ea63cc3044d96fb882eac61ac81bd Signed-off-by: hagen1778 (cherry picked from commit 39c405ed4d854d4eeebdcb1b118a8a615bbc9c3f) --- app/vmctl/influx/influx.go | 6 +++--- docs/CHANGELOG.md | 1 + 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/app/vmctl/influx/influx.go b/app/vmctl/influx/influx.go index b2e34970fc..13b374a633 100644 --- a/app/vmctl/influx/influx.go +++ b/app/vmctl/influx/influx.go @@ -358,13 +358,13 @@ func (c *Client) getSeries() ([]*Series, error) { func (c *Client) do(q influx.Query) ([]queryValues, error) { res, err := c.Query(q) if err != nil { - return nil, fmt.Errorf("query %q err: %s", q.Command, err) + return nil, fmt.Errorf("query error: %s", err) } if res.Error() != nil { - return nil, fmt.Errorf("query %q err: %s", q.Command, res.Error()) + return nil, fmt.Errorf("response error: %s", res.Error()) } if len(res.Results) < 1 { - return nil, fmt.Errorf("exploration query %q returned 0 results", q.Command) + return nil, fmt.Errorf("query returned 0 results") } return parseResult(res.Results[0]) } diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md index f43c9a8252..2097f29e2f 100644 --- a/docs/CHANGELOG.md +++ b/docs/CHANGELOG.md @@ -66,6 +66,7 @@ The sandbox cluster installation is running under the constant load generated by * BUGFIX: [vmbackupmanager](https://docs.victoriametrics.com/vmbackupmanager.html): fix `vmbackupmanager` not deleting previous object versions from S3 when applying retention policy with `-deleteAllObjectVersions` command-line flag. * BUGFIX: [vminsert](https://docs.victoriametrics.com/Cluster-VictoriaMetrics.html): fix panic when ingesting data via [NewRelic protocol](https://docs.victoriametrics.com/#how-to-send-data-from-newrelic-agent) into VictoriaMetrics cluster. See [this issue](https://github.com/VictoriaMetrics/VictoriaMetrics/issues/5416). * BUGFIX: properly escape `<` character in responses returned via [`/federate`](https://docs.victoriametrics.com/#federation) endpoint. See [this issue](https://github.com/VictoriaMetrics/VictoriaMetrics/issues/5431). +* BUGFIX: [vmctl](https://docs.victoriametrics.com/vmctl.html): check for Error field in response from influx client during migration. Before, only network errors were checked. Thanks to @wozz for the [pull request](https://github.com/VictoriaMetrics/VictoriaMetrics/pull/5446). ## [v1.95.1](https://github.com/VictoriaMetrics/VictoriaMetrics/releases/tag/v1.95.1)