[ARVADOS] updated: 1.3.0-2203-ge99c1a472
Git user
git at public.arvados.org
Tue Feb 18 20:28:43 UTC 2020
Summary of changes:
CODE_OF_CONDUCT.md | 96 +++++
CONTRIBUTING.md | 75 ++++
COPYING | 4 +
README.md | 91 +++--
build/package-build-dockerfiles/centos7/Dockerfile | 2 +-
.../ubuntu1604/Dockerfile | 2 +-
.../ubuntu1804/Dockerfile | 2 +-
build/package-test-dockerfiles/centos7/Dockerfile | 2 +-
build/package-test-dockerfiles/debian10/Dockerfile | 2 +-
build/package-test-dockerfiles/debian9/Dockerfile | 2 +-
.../package-test-dockerfiles/ubuntu1604/Dockerfile | 2 +-
.../package-test-dockerfiles/ubuntu1804/Dockerfile | 2 +-
build/run-tests.sh | 6 +-
cmd/arvados-client/Makefile | 11 +
cmd/arvados-client/cmd.go | 3 +
go.mod | 2 +
go.sum | 6 +-
lib/mount/command.go | 86 +++++
lib/mount/command_test.go | 81 +++++
lib/mount/fs.go | 392 +++++++++++++++++++++
lib/mount/fs_test.go | 49 +++
sdk/cwl/setup.py | 7 +-
sdk/pam/setup.py | 4 +-
sdk/python/arvados/api.py | 1 +
sdk/python/arvados/util.py | 8 +
services/fuse/arvados_fuse/__init__.py | 2 +-
services/fuse/arvados_fuse/command.py | 2 +-
services/fuse/arvados_fuse/fusedir.py | 113 ++++--
services/fuse/tests/test_mount.py | 76 +++-
services/nodemanager/setup.py | 4 +-
tools/crunchstat-summary/setup.py | 4 +-
31 files changed, 1035 insertions(+), 104 deletions(-)
create mode 100644 CODE_OF_CONDUCT.md
create mode 100644 CONTRIBUTING.md
create mode 100644 cmd/arvados-client/Makefile
create mode 100644 lib/mount/command.go
create mode 100644 lib/mount/command_test.go
create mode 100644 lib/mount/fs.go
create mode 100644 lib/mount/fs_test.go
discards 7778bf75e8ef5b9775c1f9af2b964f333b6f9226 (commit)
via e99c1a4727f3042905fa9f44a5be98ce2fb0fae3 (commit)
via b9e15eb4acf18db8bc409d23dfdbe2cf9cf986d4 (commit)
via db791b7a682627e0d3e2f1efc821dc3b0f311942 (commit)
via 48c38895200cdafaaeca37299bf8352878389a77 (commit)
via 166f27869b2f530aa3dd05b02cdc46f787dd8216 (commit)
via 504e09d413026fcac8ac94530134da2fce4dc0f2 (commit)
via b8c59c037a0f4cf1f98ebd2c1711d8fe4d110897 (commit)
via 3d4de36a24221e499ed944f5472925581d4e276a (commit)
via f665c9b9428b4e756c2b0667b59b1410a533da77 (commit)
via 372378584b1d5ab45cde8e3914087d00327777fe (commit)
via d94b38ff393a39485f88a156b90697ac357583d3 (commit)
via 69b680ddce0a84d7fccc5acbf6cfd01f1401317a (commit)
via f0018dabe36d841c64efb9bdf79ce72ec6977350 (commit)
via aed18d3ea1c14c6b8eac261b08c7a4499eabfc87 (commit)
via 79d8c1932e7cbb42ef4863ebd11490bb7fd79c0e (commit)
via a4f57793d8757c451330e6d861eb3c5af2bff3b8 (commit)
via 3d22ea5b14644b8b66556fb5db5f41a6d84374d5 (commit)
via 03a9e4186c0d3b9267b1a83bb65699a6730f653f (commit)
via c7cd69df4727d7e3ea6469c94a905465a2dcdd47 (commit)
via 3a2006d29fc38596a4dfb19b331bf2c86a9185ae (commit)
via a1dcbbc1ea60c32adb7bd97e77d2397d0195d437 (commit)
via 3ae251039c2781d13993f4aac24290d881821f12 (commit)
via 209ff863b0659851e6eeae6d5405a02df906322f (commit)
via cfcfab92f12cf26e5a5b55d5a473408098599283 (commit)
via 487e8f756d63c6e68eb300a559eccb504f78c40b (commit)
via e54bbc170b78f3f4c90be7c8b314d58e559cd73c (commit)
via 9a4fcabed1adeff0044d419977d5136c5cb1db3e (commit)
via ff58dd2e5cb37f652047b53064dd389b8cf05150 (commit)
via a66db11640b5552a1526e94891418139c6a6fde4 (commit)
via 01f800c72410babd4ed63c486033f83cc6d8e1b3 (commit)
via 9c35559a4e4f4fec24de6e2a412bf495ef9b6b15 (commit)
via 6cea7a3a21ab1daa88278004745fed1fe994d751 (commit)
via 4ea1be700f86adf823856e8d14d2224b90e73c58 (commit)
via 315e9b521f97a408e3bc079d6f7e5f110cbf70a9 (commit)
via 44ddbde1cd9945778ed7e4ae1d96c65e24f17742 (commit)
via 34571842b78a039ebf931307daf9b5d87f88645a (commit)
via b2b6c8a9ac127ba76dc0421782503e4574837f4d (commit)
via 7d4e2e418a987a454d18902a937fc91bed69ce75 (commit)
This update added new revisions after undoing existing revisions. That is
to say, the old revision is not a strict subset of the new revision. This
situation occurs when you --force push a change and generate a repository
containing something like this:
* -- * -- B -- O -- O -- O (7778bf75e8ef5b9775c1f9af2b964f333b6f9226)
\
N -- N -- N (e99c1a4727f3042905fa9f44a5be98ce2fb0fae3)
When this happens we assume that you've already had alert emails for all
of the O revisions, and so we here report only the revisions in the N
branch from the common base, B.
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 e99c1a4727f3042905fa9f44a5be98ce2fb0fae3
Author: Ward Vandewege <ward at jhvc.com>
Date: Fri Feb 14 14:54:23 2020 -0500
arvados-dispatch-cloud: metrics improvement
Expose instance_type in the instances_total Prometheus metric.
refs #16157
Arvados-DCO-1.1-Signed-off-by: Ward Vandewege <ward at jhvc.com>
diff --git a/lib/dispatchcloud/worker/pool.go b/lib/dispatchcloud/worker/pool.go
index c52422c41..0636fcee8 100644
--- a/lib/dispatchcloud/worker/pool.go
+++ b/lib/dispatchcloud/worker/pool.go
@@ -570,7 +570,7 @@ func (wp *Pool) registerMetrics(reg *prometheus.Registry) {
Subsystem: "dispatchcloud",
Name: "instances_total",
Help: "Number of cloud VMs.",
- }, []string{"category"})
+ }, []string{"category", "instance_type"})
reg.MustRegister(wp.mInstances)
wp.mInstancesPrice = prometheus.NewGaugeVec(prometheus.GaugeOpts{
Namespace: "arvados",
@@ -618,7 +618,11 @@ func (wp *Pool) updateMetrics() {
wp.mtx.RLock()
defer wp.mtx.RUnlock()
- instances := map[string]int64{}
+ type entKey struct {
+ cat string
+ instType string
+ }
+ instances := map[entKey]int64{}
price := map[string]float64{}
cpu := map[string]int64{}
mem := map[string]int64{}
@@ -637,17 +641,25 @@ func (wp *Pool) updateMetrics() {
default:
cat = "idle"
}
- instances[cat]++
+ instances[entKey{cat, wkr.instType.Name}]++
price[cat] += wkr.instType.Price
cpu[cat] += int64(wkr.instType.VCPUs)
mem[cat] += int64(wkr.instType.RAM)
running += int64(len(wkr.running) + len(wkr.starting))
}
for _, cat := range []string{"inuse", "hold", "booting", "unknown", "idle"} {
- wp.mInstances.WithLabelValues(cat).Set(float64(instances[cat]))
wp.mInstancesPrice.WithLabelValues(cat).Set(price[cat])
wp.mVCPUs.WithLabelValues(cat).Set(float64(cpu[cat]))
wp.mMemory.WithLabelValues(cat).Set(float64(mem[cat]))
+ // make sure to reset gauges for non-existing category/nodetype combinations
+ for _, it := range wp.instanceTypes {
+ if _, ok := instances[entKey{cat, it.Name}]; !ok {
+ wp.mInstances.WithLabelValues(cat, it.Name).Set(float64(0))
+ }
+ }
+ }
+ for k, v := range instances {
+ wp.mInstances.WithLabelValues(k.cat, k.instType).Set(float64(v))
}
wp.mContainersRunning.Set(float64(running))
}
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list