[arvados] updated: 2.7.0-5889-gae7a179649
git repository hosting
git at public.arvados.org
Mon Mar 11 19:28:36 UTC 2024
Summary of changes:
services/keep-web/metrics.go | 11 ++++++-----
services/keep-web/server_test.go | 14 ++++++--------
2 files changed, 12 insertions(+), 13 deletions(-)
via ae7a179649bbe19761c49de65b10127592ef646b (commit)
via a4a14d30f7fd703dbc999ca8bacd02cd00dda46c (commit)
via 918edd276441e29b249d881001eb712a06cc8509 (commit)
via 9ad1be8f5e545fef32b0317f04a17f34ba762497 (commit)
from 6d868844fae9f52455b2e1954382bf9e4bb66c22 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
commit ae7a179649bbe19761c49de65b10127592ef646b
Author: Tom Clegg <tom at curii.com>
Date: Mon Mar 11 15:15:38 2024 -0400
15317: Rename limiting -> apparent speed, link to explanation.
Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom at curii.com>
diff --git a/services/keep-web/metrics.go b/services/keep-web/metrics.go
index 60964f409b..bfc533a73e 100644
--- a/services/keep-web/metrics.go
+++ b/services/keep-web/metrics.go
@@ -32,8 +32,8 @@ func newMetrics(reg *prometheus.Registry) *metrics {
mDownloadBackendSpeed: prometheus.NewHistogramVec(prometheus.HistogramOpts{
Namespace: "arvados",
Subsystem: "keepweb",
- Name: "download_limiting_backend_speed",
- Help: "Limiting backend speed (bytes per second) when serving file downloads, bucketed by transfer size range",
+ Name: "download_apparent_backend_speed",
+ Help: "Apparent download speed from the backend (bytes per second) when serving file downloads, bucketed by transfer size range (see https://dev.arvados.org/issues/15317#note-25 for explanation)",
Buckets: []float64{10_000, 1_000_000, 10_000_000, 100_000_000, 1_000_000_000, math.Inf(+1)},
}, []string{"size_range"}),
mUploadSpeed: prometheus.NewHistogramVec(prometheus.HistogramOpts{
diff --git a/services/keep-web/server_test.go b/services/keep-web/server_test.go
index 0d5ea4df3a..f79df20212 100644
--- a/services/keep-web/server_test.go
+++ b/services/keep-web/server_test.go
@@ -518,7 +518,7 @@ func (s *IntegrationSuite) TestMetrics(c *check.C) {
allmetrics, err := ioutil.ReadAll(resp.Body)
c.Check(err, check.IsNil)
- c.Check(string(allmetrics), check.Matches, `(?ms).*\narvados_keepweb_download_limiting_backend_speed_bucket{size_range="0",le="1e\+06"} 4\n.*`)
+ c.Check(string(allmetrics), check.Matches, `(?ms).*\narvados_keepweb_download_apparent_backend_speed_bucket{size_range="0",le="1e\+06"} 4\n.*`)
c.Check(string(allmetrics), check.Matches, `(?ms).*\narvados_keepweb_download_speed_bucket{size_range="0",le="\+Inf"} 4\n.*`)
c.Check(string(allmetrics), check.Matches, `(?ms).*\narvados_keepweb_upload_speed_bucket{size_range="0",le="\+Inf"} 2\n.*`)
c.Check(string(allmetrics), check.Matches, `(?ms).*\narvados_keepweb_upload_sync_delay_seconds_bucket{size_range="0",le="10"} 2\n.*`)
commit a4a14d30f7fd703dbc999ca8bacd02cd00dda46c
Author: Tom Clegg <tom at curii.com>
Date: Mon Mar 11 15:09:31 2024 -0400
15317: Tweak size ranges so they include the nominal size.
Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom at curii.com>
diff --git a/services/keep-web/metrics.go b/services/keep-web/metrics.go
index 2f230e5265..60964f409b 100644
--- a/services/keep-web/metrics.go
+++ b/services/keep-web/metrics.go
@@ -93,11 +93,11 @@ func (m *metrics) track(handler http.Handler, w http.ResponseWriter, r *http.Req
// transfer).
func sizeRange(size int64) string {
switch {
- case size <= 1_000_000:
+ case size < 1_000_000:
return "0"
- case size <= 10_000_000:
+ case size < 10_000_000:
return "1M"
- case size <= 100_000_000:
+ case size < 100_000_000:
return "10M"
default:
return "100M"
commit 918edd276441e29b249d881001eb712a06cc8509
Author: Tom Clegg <tom at curii.com>
Date: Mon Mar 11 15:08:53 2024 -0400
15317: Replace comment with better variable name.
Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom at curii.com>
diff --git a/services/keep-web/server_test.go b/services/keep-web/server_test.go
index a418e84d5a..0d5ea4df3a 100644
--- a/services/keep-web/server_test.go
+++ b/services/keep-web/server_test.go
@@ -509,23 +509,21 @@ func (s *IntegrationSuite) TestMetrics(c *check.C) {
c.Check(resp.StatusCode, check.Equals, http.StatusNotFound)
}
- // Dump entire metrics output in test logs
req, _ = http.NewRequest("GET", srvaddr+"/metrics", nil)
req.Host = cluster.Services.WebDAVDownload.ExternalURL.Host
req.Header.Set("Authorization", "Bearer "+arvadostest.ManagementToken)
resp, err = http.DefaultClient.Do(req)
c.Assert(err, check.IsNil)
c.Check(resp.StatusCode, check.Equals, http.StatusOK)
- buf, err := ioutil.ReadAll(resp.Body)
+ allmetrics, err := ioutil.ReadAll(resp.Body)
c.Check(err, check.IsNil)
- c.Check(string(buf), check.Matches, `(?ms).*\narvados_keepweb_download_limiting_backend_speed_bucket{size_range="0",le="1e\+06"} 4\n.*`)
- c.Check(string(buf), check.Matches, `(?ms).*\narvados_keepweb_download_speed_bucket{size_range="0",le="\+Inf"} 4\n.*`)
- c.Check(string(buf), check.Matches, `(?ms).*\narvados_keepweb_upload_speed_bucket{size_range="0",le="\+Inf"} 2\n.*`)
- c.Check(string(buf), check.Matches, `(?ms).*\narvados_keepweb_upload_sync_delay_seconds_bucket{size_range="0",le="10"} 2\n.*`)
+ c.Check(string(allmetrics), check.Matches, `(?ms).*\narvados_keepweb_download_limiting_backend_speed_bucket{size_range="0",le="1e\+06"} 4\n.*`)
+ c.Check(string(allmetrics), check.Matches, `(?ms).*\narvados_keepweb_download_speed_bucket{size_range="0",le="\+Inf"} 4\n.*`)
+ c.Check(string(allmetrics), check.Matches, `(?ms).*\narvados_keepweb_upload_speed_bucket{size_range="0",le="\+Inf"} 2\n.*`)
+ c.Check(string(allmetrics), check.Matches, `(?ms).*\narvados_keepweb_upload_sync_delay_seconds_bucket{size_range="0",le="10"} 2\n.*`)
- // Dump entire metrics output in test logs
- c.Logf("%s", buf)
+ c.Logf("%s", allmetrics)
}
func (s *IntegrationSuite) SetUpSuite(c *check.C) {
commit 9ad1be8f5e545fef32b0317f04a17f34ba762497
Author: Tom Clegg <tom at curii.com>
Date: Mon Mar 11 15:05:56 2024 -0400
15317: Fix missing blank line between funcs.
Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom at curii.com>
diff --git a/services/keep-web/metrics.go b/services/keep-web/metrics.go
index fe27ba5ea6..2f230e5265 100644
--- a/services/keep-web/metrics.go
+++ b/services/keep-web/metrics.go
@@ -117,6 +117,7 @@ type downloadTracker struct {
func newDownloadTracker(w http.ResponseWriter) *downloadTracker {
return &downloadTracker{ResponseWriter: w, t0: time.Now()}
}
+
func (dt *downloadTracker) Write(p []byte) (int, error) {
if dt.lastByte.IsZero() {
dt.backendWait += time.Since(dt.t0)
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list