[ARVADOS] updated: 64437af24f74ec3f48b1a5694a5805d52dfc4967

[git at public.curoverse.com]

Summary of changes:
 .../workbench/app/assets/javascripts/log_viewer.js |   2 +-
 .../app/controllers/application_controller.rb      | 147 ++++++++++-----------
 .../app/controllers/collections_controller.rb      |   2 +-
 .../app/controllers/sessions_controller.rb         |   4 +-
 apps/workbench/test/integration/errors_test.rb     |  19 +++
 apps/workbench/test/integration/logins_test.rb     |  15 +--
 apps/workbench/test/integration_helper.rb          |  14 +-
 .../src/arvados.org/crunchstat/crunchstat.go       |   4 +-
 services/fuse/bin/arv-mount                        |  23 ++--
 9 files changed, 122 insertions(+), 108 deletions(-)
 create mode 100644 apps/workbench/test/integration/errors_test.rb

       via  64437af24f74ec3f48b1a5694a5805d52dfc4967 (commit)
       via  676dfa352dbf55a23e0123b47d1affe33c028908 (commit)
       via  f573c35a8f829ac4624f4ef9fbe0d0178a734fa3 (commit)
       via  bfaad44c23b334c91d347acb1517fd750f13e0c3 (commit)
       via  f2756832f844d78d782ff35e46b650c5501b0c47 (commit)
       via  c73e7333d5b55808c68d4f9a39501869e7baf009 (commit)
       via  07b681140d714b8df660ba247380e33208fa74cf (commit)
       via  36dcc9443ab7a079e6bcb6f874a19c740e5b8441 (commit)
       via  cf2a30aa6449f7ed9ac6c455842a23af44fb1509 (commit)
       via  bdc88877d3b4df3e9196e112b7e0bdce2f731998 (commit)
      from  0eb77fba3f7de714a7edef1c57491f3c285f6d67 (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 64437af24f74ec3f48b1a5694a5805d52dfc4967
Author: Peter Amstutz <peter.amstutz at curoverse.com>
Date:   Tue Jun 24 17:08:40 2014 -0400

    Don't print blkio stats if no reads or writes have occurred since the last poll.

diff --git a/services/crunch/crunchstat/src/arvados.org/crunchstat/crunchstat.go b/services/crunch/crunchstat/src/arvados.org/crunchstat/crunchstat.go
index f8d27ec..d61871d 100644
--- a/services/crunch/crunchstat/src/arvados.org/crunchstat/crunchstat.go
+++ b/services/crunch/crunchstat/src/arvados.org/crunchstat/crunchstat.go
@@ -182,14 +182,14 @@ func PollCgroupStats(cgroup_root string, cgroup_parent string, container_id stri
 					if op == "Read" {
 						disk[device].last_read = disk[device].next_read
 						disk[device].next_read = next
-						if disk[device].last_read > 0 {
+						if disk[device].last_read > 0 && (disk[device].next_read != disk[device].last_read) {
 							stderr <- fmt.Sprintf("crunchstat: blkio.io_service_bytes %s read %v", device, disk[device].next_read-disk[device].last_read)
 						}
 					}
 					if op == "Write" {
 						disk[device].last_write = disk[device].next_write
 						disk[device].next_write = next
-						if disk[device].last_write > 0 {
+						if disk[device].last_write > 0 && (disk[device].next_write != disk[device].last_write) {
 							stderr <- fmt.Sprintf("crunchstat: blkio.io_service_bytes %s write %v", device, disk[device].next_write-disk[device].last_write)
 						}
 					}

commit 676dfa352dbf55a23e0123b47d1affe33c028908
Merge: 0eb77fb f573c35
Author: Peter Amstutz <peter.amstutz at curoverse.com>
Date:   Tue Jun 24 16:04:10 2014 -0400

    Merge remote-tracking branch 'origin/master' into pete-fixes


-----------------------------------------------------------------------


hooks/post-receive
--