[ARVADOS] updated: 1.1.4-452-gfe561d69b
Git user
git at public.curoverse.com
Fri Jun 15 16:37:44 EDT 2018
Summary of changes:
build/build.list | 1 -
build/libcloud-pin.sh | 4 +-
build/run-build-packages.sh | 26 ++-
doc/api/methods.html.textile.liquid | 2 +-
doc/api/methods/collections.html.textile.liquid | 1 +
.../methods/container_requests.html.textile.liquid | 2 +-
doc/api/methods/groups.html.textile.liquid | 1 +
doc/api/methods/links.html.textile.liquid | 2 +-
doc/api/methods/nodes.html.textile.liquid | 3 +-
lib/dispatchcloud/node_size.go | 20 +-
lib/dispatchcloud/node_size_test.go | 30 ++-
sdk/cwl/arvados_cwl/__init__.py | 7 -
sdk/cwl/arvados_cwl/http.py | 16 +-
sdk/cwl/arvados_cwl/pathmapper.py | 21 +--
sdk/cwl/arvados_cwl/runner.py | 9 +-
sdk/cwl/setup.py | 2 +-
sdk/cwl/tests/test_pathmapper.py | 19 +-
sdk/go/arvados/config.go | 1 +
sdk/go/arvados/container.go | 3 +-
sdk/python/arvados/collection.py | 90 +++++++--
sdk/python/arvados/commands/run.py | 11 +-
sdk/python/tests/test_collections.py | 38 +++-
.../arvados/v1/containers_controller.rb | 6 +-
services/api/app/models/container_request.rb | 22 ++-
services/api/app/models/group.rb | 3 +
services/api/config/application.default.yml | 5 +
.../migrate/20180607175050_properties_to_jsonb.rb | 32 ++++
.../20180608123145_add_properties_to_groups.rb | 18 ++
services/api/db/structure.sql | 53 +++++-
services/api/test/unit/arvados_model_test.rb | 2 +-
services/api/test/unit/container_request_test.rb | 92 +++++++++
.../crunch-dispatch-slurm/crunch-dispatch-slurm.go | 18 +-
.../crunch-dispatch-slurm_test.go | 6 +-
services/keep-balance/balance.go | 162 ++++++++++++----
services/keep-balance/balance_test.go | 206 ++++++++++++++++++++-
.../arvnodeman/computenode/dispatch/__init__.py | 7 +-
.../arvnodeman/computenode/driver/__init__.py | 2 +-
.../arvnodeman/computenode/driver/azure.py | 5 +-
.../arvnodeman/computenode/driver/ec2.py | 9 +
.../arvnodeman/computenode/driver/gce.py | 22 ++-
services/nodemanager/arvnodeman/config.py | 44 +++--
services/nodemanager/arvnodeman/daemon.py | 6 +-
services/nodemanager/arvnodeman/jobqueue.py | 34 +++-
services/nodemanager/arvnodeman/launcher.py | 2 +-
services/nodemanager/arvnodeman/nodelist.py | 4 +-
.../nodemanager/arvnodeman/test/fake_driver.py | 15 +-
services/nodemanager/setup.py | 7 +-
.../nodemanager/tests/test_computenode_dispatch.py | 9 +
.../nodemanager/tests/test_computenode_driver.py | 2 +-
.../tests/test_computenode_driver_azure.py | 23 ++-
.../tests/test_computenode_driver_ec2.py | 27 ++-
.../tests/test_computenode_driver_gce.py | 11 ++
services/nodemanager/tests/test_config.py | 24 ++-
services/nodemanager/tests/test_nodelist.py | 1 +
services/nodemanager/tests/testutil.py | 4 +-
55 files changed, 1001 insertions(+), 191 deletions(-)
create mode 100644 services/api/db/migrate/20180607175050_properties_to_jsonb.rb
create mode 100644 services/api/db/migrate/20180608123145_add_properties_to_groups.rb
via fe561d69b42d55191d6d1f01d4f3cdcf1fc9faaa (commit)
via 94f2b439783a8e63d6d7b9ba2760f54fc642a8fb (commit)
via 0557b1dbb08d5328e29eac805824a8e21040f582 (commit)
via 4f1e8828caf40af5a80ca8189c46a6cdfe8d541f (commit)
via 0275a62826a50d84f8f633f475c930fde96af4a4 (commit)
via 9f768708156197decac1e6dc5dedf3a730a06fad (commit)
via e135f4e0f24442e009a60f2018d95c5e8cb63e5e (commit)
via 089b68192e6fd089c03331c389da1dace039c899 (commit)
via 2c68e941a15384cecb0e3b3df6def6c3e84d0a71 (commit)
via 115a5e8861ef0a46224b2cd64568b30c884908fb (commit)
via 42a0609a6e287a82ed565413c7392d40141388ae (commit)
via 71db701269dc5d2b5eb9239828a74e9c26cd7e66 (commit)
via 6714a5e7fcf4d5fde2ecd5a7f9f6504cb5ca374b (commit)
via 985ba2d04074d830fc2e8688f2d0f59a75a1c14c (commit)
via b70f9ce54f1f672b423999e6c07b2f0127b76666 (commit)
via 8fa57330875af11b7b61dfac6fc45080760afdf2 (commit)
via 17f521d7ffb4f3a58ca98a27395eb60d9fa34519 (commit)
via 5f42faf0818c229196b26535a0669eeb2bf27386 (commit)
via 06eb98871e82074b935d9da201118119e5719f96 (commit)
via 99887d1312315a5efb4d888251f90880846c073c (commit)
via 4ddcd079b0378d0a8556f528106ac7f60fe5cb1b (commit)
via 1e03ea4765bee6db9331a1265c8abf2c3e45caff (commit)
via a4991cffc83afea213125a24f01399d6f5707948 (commit)
via 8e31910034627dedd7259dd1e45a60768108c1e1 (commit)
via d2efca1759c9e104f67d1caf85c8e62ff06807bd (commit)
via 85c13201abf4a9f19dd112992a04fa65da63369c (commit)
via cefddd8efdc88c3d33e5aad4c02e96c64cbe8242 (commit)
via 0c458347e92967b5a1e6cce8267939d3ef204663 (commit)
via 54ee2b06add844efae0b0fcb97606102232974e6 (commit)
via f9347e2f053b645003d102f96a0aee49167baeef (commit)
via 5f75e2db42cea65e6f4e6b8c2b1b1dfb8e748c05 (commit)
via 333a30289f47c22956bcb6a045d1cd4c797e22c3 (commit)
via 31fd95388f035bba3e70d3e8861a14511f6281e6 (commit)
via 7d7eb76d319f1ab6faeb8634f13142e7147a45ea (commit)
via 8f4b1051209f78bff358069a2a3b2f646f7a38f8 (commit)
via a518eb2b3b743259fe51b1e61d2648677e583cac (commit)
via e3483661acc3d26d4532a536bd40ed761c21d7d1 (commit)
via 1dc6c511620a852f81d5179fd2f9fbecee472e71 (commit)
via 57fcaf45fe40806dca5f001aabed9b413243183e (commit)
via afbc818e5bbc667b69e9ae9b8f080cb50ca17c53 (commit)
via ad5f111b67e2bf1c43ce9bc37e6b11b8c753f62d (commit)
via 26d20f13895fdf5c9224a7aca2b33625c511e73e (commit)
via da40bd0960806df8e2799e4fb716d41ad08b169f (commit)
via 1714431955ac7b2a1d2fd3c2cda9b806bad624cb (commit)
via da2cfffb3a3ec92c3b15841255dc704a99748fea (commit)
via df8a51cd6b8a95475dfaef08c8a56b1e1643dbfc (commit)
via 1b183730bd6ec56d51b17020e63fb2cffa2ad764 (commit)
via c9143544609d90da33eb3c2d566fc5d6a25188b2 (commit)
via d5dd5dc2838fe420c8f835975bad7052a0df55e5 (commit)
via 1965e1793598c76ceef4decd4a5a6c7755c385e3 (commit)
via 4f0c3d501d19bed5915d5d188598d3a7f1dec7f8 (commit)
via 73872ccc5bb6b80a6049b44b0113085a9c2b6934 (commit)
via 76f6b358cf612e67b586452236394feabc464373 (commit)
via 5836e576fe0b78c50383cf56e1c4fb4521daeca1 (commit)
via 00cca6a192eb1ab38559bf5ed9044711ed56fc4a (commit)
via 9fcb58db8d47a42e52eead600ddabf57ab7c29ed (commit)
via 18b5ad828a4149c1b768d05e477982364002a647 (commit)
via b3e79afc9f6527927c6bf6e4ee35b11e6f20185e (commit)
via bb17ad738ed9c890881361232e0dfd84e50a529d (commit)
via 3c2266151711f532491a2369de37086bd7234dce (commit)
via 05f0008349efe56755c580e1e060115587aab352 (commit)
via 8afc85aabb9563da4de17b0b5f7d4fe574e9ad8d (commit)
via 3950ffc9481c25262f2db2b08a0f74664c433734 (commit)
via 1275e305f6d13785687c72b8609592094a067cef (commit)
via 7cc2336a974945d03649d924cf805fedf92bad41 (commit)
via f7029eca4ddc301167078827a6bed2219dd282a6 (commit)
via 9df819a55f00e893f2783c1e048a6d3c1cd391b2 (commit)
from 23d57ba45b348b580fc584bbd77fe3960796622d (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 fe561d69b42d55191d6d1f01d4f3cdcf1fc9faaa
Merge: 23d57ba45 94f2b4397
Author: Tom Clegg <tclegg at veritasgenetics.com>
Date: Fri Jun 15 16:18:09 2018 -0400
13497: Merge branch 'master' into 13497-controller
refs #13497
Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tclegg at veritasgenetics.com>
diff --cc sdk/go/arvados/config.go
index 8856c9295,b0c7069cd..841f95281
--- a/sdk/go/arvados/config.go
+++ b/sdk/go/arvados/config.go
@@@ -63,21 -62,24 +63,22 @@@ type InstanceType struct
RAM int64
Scratch int64
Price float64
+ Preemptable bool
}
-// GetThisSystemNode returns a SystemNode for the node we're running
-// on right now.
-func (cc *Cluster) GetThisSystemNode() (*SystemNode, error) {
- hostname, err := os.Hostname()
- if err != nil {
- return nil, err
+// GetNodeProfile returns a NodeProfile for the given hostname. An
+// error is returned if the appropriate configuration can't be
+// determined (e.g., this does not appear to be a system node). If
+// node is empty, use the OS-reported hostname.
+func (cc *Cluster) GetNodeProfile(node string) (*NodeProfile, error) {
+ if node == "" {
+ hostname, err := os.Hostname()
+ if err != nil {
+ return nil, err
+ }
+ node = hostname
}
- return cc.GetSystemNode(hostname)
-}
-
-// GetSystemNode returns a SystemNode for the given hostname. An error
-// is returned if the appropriate configuration can't be determined
-// (e.g., this does not appear to be a system node).
-func (cc *Cluster) GetSystemNode(node string) (*SystemNode, error) {
- if cfg, ok := cc.SystemNodes[node]; ok {
+ if cfg, ok := cc.NodeProfiles[node]; ok {
return &cfg, nil
}
// If node is not listed, but "*" gives a default system node
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list