[ARVADOS] updated: 7e57f7b23f2580894e183ddb33c36e1556336a69
git at public.curoverse.com
git at public.curoverse.com
Thu Jun 12 10:20:10 EDT 2014
Summary of changes:
apps/workbench/app/assets/images/ajax-loader.gif | Bin 0 -> 3208 bytes
.../app/assets/javascripts/application.js | 12 +-
apps/workbench/app/assets/javascripts/editable.js | 3 +
apps/workbench/app/assets/javascripts/event_log.js | 25 +-
.../app/assets/javascripts/pipeline_instances.js | 15 +-
.../app/assets/stylesheets/application.css.scss | 3 +
.../app/controllers/application_controller.rb | 239 +++++++++++++++-
.../app/controllers/collections_controller.rb | 10 +-
.../workbench/app/controllers/groups_controller.rb | 1 +
apps/workbench/app/controllers/jobs_controller.rb | 4 +
.../controllers/pipeline_instances_controller.rb | 26 +-
.../app/controllers/sessions_controller.rb | 3 +
apps/workbench/app/helpers/application_helper.rb | 52 +++-
apps/workbench/app/models/arvados_api_client.rb | 4 +
.../app/views/application/_content.html.erb | 75 +++++-
.../app/views/application/_show_metadata.html.erb | 12 +
.../app/views/application/_svg_div.html.erb | 2 +-
apps/workbench/app/views/collections/show.html.erb | 7 +-
.../workbench/app/views/jobs/_show_status.html.erb | 2 +-
.../app/views/layouts/application.html.erb | 4 +-
.../pipeline_instances/_show_components.html.erb | 3 -
.../workbench/app/views/users/_show_admin.html.erb | 2 -
apps/workbench/app/views/users/_tables.html.erb | 51 +++-
.../test/functional/application_controller_test.rb | 299 +++++++++++++++++++++
.../test/integration/pipeline_instances_test.rb | 4 +
apps/workbench/test/integration/users_test.rb | 3 -
sdk/cli/bin/arv-run-pipeline-instance | 20 +-
sdk/go/src/arvados.org/keepclient/keepclient.go | 42 +--
.../src/arvados.org/keepclient/keepclient_test.go | 76 +++---
sdk/go/src/arvados.org/keepclient/support.go | 51 +---
sdk/go/src/arvados.org/sdk/sdk.go | 232 ++++++++++++++++
sdk/go/src/arvados.org/sdk/sdk_test.go | 92 +++++++
services/api/Gemfile | 2 +
services/api/Gemfile.lock | 3 +
.../app/controllers/arvados/v1/jobs_controller.rb | 2 +-
.../app/controllers/arvados/v1/nodes_controller.rb | 12 +-
.../controllers/arvados/v1/schema_controller.rb | 3 +-
services/api/app/middlewares/rack_socket.rb | 2 +-
services/api/app/models/node.rb | 9 +
services/api/script/cancel_stale_jobs.rb | 37 +++
services/api/script/crunch-dispatch.rb | 131 ++++++---
services/api/test/fixtures/nodes.yml | 1 +
.../arvados/v1/collections_controller_test.rb | 29 +-
.../functional/arvados/v1/nodes_controller_test.rb | 16 ++
services/api/test/unit/node_test.rb | 22 +-
.../src/arvados.org/crunchstat/crunchstat.go | 30 ++-
.../keep/src/arvados.org/keepproxy/keepproxy.go | 32 +--
.../src/arvados.org/keepproxy/keepproxy_test.go | 9 +-
services/keep/tools/traffic_test.py | 126 +++++++++
49 files changed, 1532 insertions(+), 308 deletions(-)
create mode 100644 apps/workbench/app/assets/images/ajax-loader.gif
create mode 100644 apps/workbench/test/functional/application_controller_test.rb
create mode 100644 sdk/go/src/arvados.org/sdk/sdk.go
create mode 100644 sdk/go/src/arvados.org/sdk/sdk_test.go
create mode 100755 services/api/script/cancel_stale_jobs.rb
create mode 100755 services/keep/tools/traffic_test.py
via 7e57f7b23f2580894e183ddb33c36e1556336a69 (commit)
via a9beb0e51fdd2782c4aeaa1f5c2d20d6ad7dd435 (commit)
via 9bda231180fc58e67b0c322c16be223154965b66 (commit)
via 85ce092000d72c5dda03bd4763c9613bb9a46437 (commit)
via 5da7bddd63790e524e4b22a6944a92065409241d (commit)
via 0548dd424d6f21f3eb97f3e98d37a604b44b025a (commit)
via 7ccba0ea6cb9916a1bad55f13cc45029f0bc37bd (commit)
via eaa312ea7c35e35c64dbef9624be1d9c7df034ef (commit)
via 70148c4918a95ee9a49a18bf5789801d02e8ef5e (commit)
via f0a048b4b9792550f59ee23b13c09cca21681eb4 (commit)
via d161e2280a03b4a1c9675f5ed1946310a9942acd (commit)
via 23fd8b137488baeb3138e2127294e8e14917d3ed (commit)
via 82c4697bf24b10f3fb66d303ae73499095b5742a (commit)
via 505f5c37bb9fe1fe93f8bdbd2d2072e783832f20 (commit)
via 541ce54ba2c7c8f9783da04f947ccf055b72ae2c (commit)
via 35db7f5c7f1d62f996550f51fc4f0dd4f77627fb (commit)
via 799e968ef79906bcd8b491f1ad99572b1cc21ccc (commit)
via a314e176f65f97059b43f50a84814f4fe5e5d73d (commit)
via f883adf66c3da731904d5c25c779a13416ce9193 (commit)
via 2bd11a587ca12d8921042d86df4d095c79243dbc (commit)
via d687fed365e545dea1c9283e917e05bb2a4ed07c (commit)
via 92594178fbe4155f3122a1b0a52b5b3da995aabb (commit)
via 4d73cd3503ca20ec4d1f8198617fea3bf481a48e (commit)
via 40e48b2aac96a71c8ae3c2265f43b882f415e63d (commit)
via 90f3d66faa1a87b0b230a8a9a7a9879e66f29cd0 (commit)
via 497ea8e6fd12ce91cad108af78df5e3802a79d69 (commit)
via 7e865395a4ccf9f17b904c3700064328d52db121 (commit)
via 9a48ecf1c92b9b8f513a5e621a0e263ccde076e4 (commit)
via 468a80200c8ef3e4a56700714e9af537d87a20bc (commit)
via 3692a4ac4d8f76d2e704af5e504652650b4a00cc (commit)
via 73c0b152d18774266e72916d6f8cedb3199b535c (commit)
via 0ef7495b59056c8f115a42bd843ce432c9282e8c (commit)
via 67578498c5de67fe2e821a3d91c1d2b7294df579 (commit)
via 2cdc648b5367efd4c8e7b2ede93a2b3ba0871c17 (commit)
via 97a1da1dfde9ef3ef195f7513309da8c6bb17978 (commit)
via 73688a1ef6387fe8a8b1b2f09a8936198f79d66e (commit)
via a2bcc06c1bda757ed8c869d7f9ad235f56abdcf4 (commit)
via dd6e25d53f9cf02f91b419584ff4c331e0618a24 (commit)
via 400829b3835f0a129116a2eed926d12a0636aeab (commit)
via f6e5ba4510e2072415a8d6b5369b11b8003ddafa (commit)
via 55b94087ff4590c54cf1f43d941c6cb24153dded (commit)
via ef3e10bdf2324f3c9e6427b3fd085e6b05e3877c (commit)
via 408649cc0e9ad3d30296b0750680fb62fefe6d82 (commit)
via 1bd85c64fbf485acceac4711ff06e6b2f548d40a (commit)
via 879e1f31b0165c6abaa35a023ff66400757bb44b (commit)
via 987b88a5441387ff91877464def7933064815b59 (commit)
via f3da69fb1b882c7fe8feb765ad0558f13706931a (commit)
via f0d8ab52b77f74e9294fe634207ce6e1ff9748a1 (commit)
via 620a10bed55b85294baad9dba965ea8dad59e884 (commit)
via 488a811374ff4bdeed9f2f2f57d9ef31d9369b5b (commit)
via 626db8559ebaa13df19dafe9bb03b1bd484b762c (commit)
via 2f3d49bde80526060d3337f13dfa91cd581ac222 (commit)
via 6a8463eea9e32cb5cffcaf2f04667520794404ec (commit)
via fa87d357fdefd594b378cda9b4d73487df60d262 (commit)
via 1f760632ae0fbb9f11af5cfb831b7c3ed49a7009 (commit)
via 428973c03d4b4cd96adc80a514beffbb739d987a (commit)
via 35c20b4ad8220131f7f6bad6b3806a7d28df3ef3 (commit)
via f48482bd37d3ae5a5f1aa488fa330f77c5fd640d (commit)
via 0e7e57bbd8030c8144a18e43e68945ab11ad094c (commit)
via 32f6ee6884704bde04878f5cbc176a7a819a50e8 (commit)
via 38a55a1518838ea68cba69b4e8d1c27d2128328d (commit)
via 0b4f867ef14af38c07b910643fbe8cc6a93e6bb6 (commit)
via cea92754dfacf2b409d1f5b45dd0775fc44c842d (commit)
via f0bf04abdbb7e4b47be85585fba5789d695bb31e (commit)
via a163b0c7b5afa782281f67f0fa0ca0e4b41c518f (commit)
via c4cfb4caca122ba09ab9153453650c308457e675 (commit)
via a46f0152c44fe20eba4db38858eaa2f99bae83f2 (commit)
via f3b4b263d8c656e15993ea71146747e8cf102bf9 (commit)
via 16cc50a4161448f9987635e06fe3d772ee0321ab (commit)
via 25f3a23bc8794b77a1b5fa1e5e7f9c38a152dd8f (commit)
via 33fed6bb30180c9dedb046d6266acbbc48dcfcd4 (commit)
via 87dc5129e903cb7452e06c936d8e5e581c4d2481 (commit)
via bc784d9eeadfc04aedea9772bb8913f5e8b86cd1 (commit)
via 10486fd2453c92a62c0a97491259d1391e5cb872 (commit)
via cdc46777d33cc341969ba791175a8ca0925e77dc (commit)
via 20ffc9676259b048a0cd08df8a54063e885b9f3e (commit)
via 570201300b90a676b4bc49ea02627d1057386615 (commit)
via 3674d731b92e091811872eef0b909171d3574614 (commit)
via 03812184bfa1ab7f17960ef48ff30798333bdd54 (commit)
via 1ec252c8087c1f167d969e26c584ff346f4ac457 (commit)
via 30d63b582ed093d235ae4a9efdeda5de1d4e2f24 (commit)
via 6b13646940de2e5a62e600f2d7d82c72e3a4ae59 (commit)
via dfe74093596d3d7378e6f0d3e5f843f44d987074 (commit)
via ca77755f57b0478e3f4fbe3e6a6d7ade95012808 (commit)
via 66da5859254325690a78512d03b6b02e3f69a237 (commit)
via 349ab8f9e11d462c878cd6be6d24bf5790af3d50 (commit)
via 8c9fa09deea0cb68b68f110fdbb1b1daa50a618c (commit)
via 161478d5be79e83f3e200b46f0d8d003caa2ffe0 (commit)
via ae09643622ecea00bab110f20029f01c83e1cf30 (commit)
via 2a64eae3cf8363c596feda5337ea20ce356ca11f (commit)
via 114df81b90be76e6921b9f20c9ddb272567c82e1 (commit)
via a276e40691a8f96b321879de2279159ef08b804f (commit)
via cb77d123755112d17f2e7bb2bd869d957d8a00f3 (commit)
via ec08a1b9aefcd801d1f0c0b282b268cbee6939bc (commit)
via 2f1baf225599d7ae5dec4611696774e6a7100d58 (commit)
via f10a7f68c6ef25cf4ba87045201b17093a11249e (commit)
via 37301d86406cc4991c6f149f00a6a0846d1808af (commit)
via fd1e12105ef7efb5e2642c8e20f032f5b15cd974 (commit)
via 3ed7de1ce58d88b95cd47dbb4c53811a8f13a91f (commit)
via 263c5c8d78109908fda64b6b327904f1d93e5c52 (commit)
via 3e3389504c6841e160ac086328693001261e016d (commit)
via b2da714edbcb2fc203d2cbc83a940ab776be73d0 (commit)
via 20c594c3c683a492132c0fc105241689ee116c10 (commit)
from 3273eb53cd985cf13e1e0785ba853af2d0a8c2c6 (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 7e57f7b23f2580894e183ddb33c36e1556336a69
Author: Peter Amstutz <peter.amstutz at curoverse.com>
Date: Thu Jun 12 10:19:18 2014 -0400
2882: Search subdirectories of cgroup for stats, because compute0 has a
slightly different cgroup layout from what's on my workstation (wtf?).
diff --git a/services/crunch/crunchstat/src/arvados.org/crunchstat/crunchstat.go b/services/crunch/crunchstat/src/arvados.org/crunchstat/crunchstat.go
index 7528485..09a99e5 100644
--- a/services/crunch/crunchstat/src/arvados.org/crunchstat/crunchstat.go
+++ b/services/crunch/crunchstat/src/arvados.org/crunchstat/crunchstat.go
@@ -42,6 +42,18 @@ func OutputChannel(stdout chan string, stderr chan string) {
}
}
+func FindStat(cgroup_path string, statgroup string, stat string) string {
+ path := fmt.Sprintf("%s/%s.%s", cgroup_path, statgroup, stat)
+ if _, err := os.Stat(path); err != nil {
+ return path
+ }
+ path = fmt.Sprintf("%s/%s/%s.%s", cgroup_path, statgroup, statgroup, stat)
+ if _, err := os.Stat(path); err != nil {
+ return path
+ }
+ return ""
+}
+
func PollCgroupStats(cgroup_path string, stderr chan string, poll int64) {
//var last_usage int64 = 0
var last_user int64 = 0
@@ -57,11 +69,11 @@ func PollCgroupStats(cgroup_path string, stderr chan string, poll int64) {
disk := make(map[string]*Disk)
- //cpuacct_usage := fmt.Sprintf("%s/cpuacct.usage", cgroup_path)
- cpuacct_stat := fmt.Sprintf("%s/cpuacct.stat", cgroup_path)
- blkio_io_service_bytes := fmt.Sprintf("%s/blkio.io_service_bytes", cgroup_path)
- cpuset_cpus := fmt.Sprintf("%s/cpuset.cpus", cgroup_path)
- memory_stat := fmt.Sprintf("%s/memory.stat", cgroup_path)
+ //cpuacct_usage := FindStat(cgroup_path, "cpuacct", "usage")
+ cpuacct_stat := FindStat(cgroup_path, "cpuacct", "stat")
+ blkio_io_service_bytes := FindStat(cgroup_path, "blkio", "io_service_bytes")
+ cpuset_cpus := FindStat(cgroup_path, "cpuset", "cpus")
+ memory_stat := FindStat(cgroup_path, "memory", "stat")
var elapsed int64 = poll
@@ -79,7 +91,7 @@ func PollCgroupStats(cgroup_path string, stderr chan string, poll int64) {
c.Close()
}*/
var cpus int64 = 0
- {
+ if cpuset_cpus != "" {
c, _ := os.Open(cpuset_cpus)
b, _ := ioutil.ReadAll(c)
sp := strings.Split(string(b), ",")
@@ -103,7 +115,7 @@ func PollCgroupStats(cgroup_path string, stderr chan string, poll int64) {
if cpus == 0 {
cpus = 1
}
- {
+ if cpuacct_stat != "" {
c, _ := os.Open(cpuacct_stat)
b, _ := ioutil.ReadAll(c)
var next_user int64
@@ -135,7 +147,7 @@ func PollCgroupStats(cgroup_path string, stderr chan string, poll int64) {
last_user = next_user
last_sys = next_sys
}
- {
+ if blkio_io_service_bytes != "" {
c, _ := os.Open(blkio_io_service_bytes)
b := bufio.NewScanner(c)
var device, op string
@@ -164,7 +176,7 @@ func PollCgroupStats(cgroup_path string, stderr chan string, poll int64) {
c.Close()
}
- {
+ if memory_stat != "" {
c, _ := os.Open(memory_stat)
b := bufio.NewScanner(c)
var stat string
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list