[ARVADOS] updated: c0ccea12dac59b30d3d86977aa70531e7b0126b5
git at public.curoverse.com
git at public.curoverse.com
Thu Jul 3 22:30:30 EDT 2014
Summary of changes:
.../_show_advanced_cli_example.html.erb | 4 +
.../_show_advanced_curl_example.html.erb | 1 +
.../_show_advanced_python_example.html.erb | 1 +
.../app/views/projects/_index_projects.html.erb | 11 +--
doc/Rakefile | 2 +-
doc/_includes/_alert_docker.liquid | 2 +-
doc/api/methods/jobs.html.textile.liquid | 20 ++++
doc/install/install-docker.html.textile.liquid | 53 ++++++++++-
docker/mkimage-debootstrap.sh | 2 +
sdk/cli/arvados-cli.gemspec | 1 +
sdk/cli/bin/arv-run-pipeline-instance | 16 ++--
sdk/python/bin/arv-ls | 3 +-
sdk/python/tests/test_arv_put.py | 5 +-
sdk/ruby/arvados.gemspec | 1 +
services/api/Gemfile | 2 +-
services/api/Gemfile.lock | 8 +-
.../app/controllers/arvados/v1/links_controller.rb | 26 ++++++
services/api/app/models/arvados_model.rb | 19 ++++
services/api/app/models/blob.rb | 2 +-
services/api/app/models/job.rb | 4 +
services/api/app/models/link.rb | 36 +++----
services/api/app/models/user.rb | 11 +++
services/api/config/routes.rb | 1 +
services/api/lib/load_param.rb | 6 +-
services/api/test/integration/permissions_test.rb | 89 ++++++++++++++++++
services/api/test/integration/websocket_test.rb | 2 +-
services/api/test/unit/link_test.rb | 4 +
services/api/test/unit/permission_test.rb | 103 +++++++++++++++++++++
services/keep/src/keep/keep.go | 5 +-
services/keep/src/keep/volume.go | 3 +-
30 files changed, 393 insertions(+), 50 deletions(-)
via c0ccea12dac59b30d3d86977aa70531e7b0126b5 (commit)
via 7dec0933c112ce80f5ccda3e223158b94d5bce4d (commit)
via 1cf15bae4e5236084c338fb557c749533adce679 (commit)
via 66efe78cdf4c28222a0e96ad4d614dce10f344ff (commit)
via ff6dfcb1b9bc2ed25466baffb8cacbf5daf49b57 (commit)
via df7ddbe4c94700abe695d8799b8fc1db1b48d02d (commit)
via 888c00d55b2a8beb463c35d5b91818adbba1609d (commit)
via f88096f61cd024b8d072d23f6c51f4d4cc0db451 (commit)
via 0ff12afbbf1eed7673d6a9a724f626643cc78ff0 (commit)
via 3657c576451610bc6e7f269cbf4f13cb18ff35ba (commit)
via ee99af104e445cabbe6a0389b9f3d1ac170ce6d5 (commit)
via ce69b2c94aeb8f897f41fbeaabfed3f3c55495d5 (commit)
via 5759cf04d9a87c1e0cb70ae0785ace15af6ee491 (commit)
via d0284f9f1af01be566d671e875f31b12eeca1960 (commit)
via 5126d94fd644a657243e5ec80d5ef1fc250f8b76 (commit)
via 10071dfd716b0131dfd5cd6d782422beef950f61 (commit)
via 350c01c50d131eaf01f52eb660ed8e63835177d6 (commit)
via c2278f1529e9c6d0488920ec924684208f56e6ee (commit)
via 22060b240f43ee4301032ba395ddd6ce59b4b581 (commit)
via 02226bdb54db7b8db0468409f6495b6daf82ad71 (commit)
via c806ef1d33a260fb736ab0268fbe993314256a4a (commit)
via a9980e0967507a3d74a12f93d82f8330c8ce3009 (commit)
via ae7e9e24a464aea23e60b914a527390bff579a7a (commit)
via 678f9f5f58048d5d378bdcc5f55a62c9305dcbc6 (commit)
via da4c5f6695602d612b657f209f705d04fae5eb38 (commit)
via bf688c8ccafa66caaa7694f770e69635f5f89249 (commit)
via 394a2035ac1a478e6ebb3fb52a2db4217968e5f2 (commit)
via 3b766a1b05358b182a0fa3bb58627fae75c60831 (commit)
via 40fe9c298a88cf2dd47b27b264573d571a90edda (commit)
via f22ca564a5b5caa0c86cee099b43df2038ccd5ca (commit)
via 5e36bba520468fdf2c8672cb27c57608a8b0b131 (commit)
via 6e5a55eb188b1c6e97b325dfe9338a7412da516c (commit)
via bbc3324f62acfda616c3ef867331bddcdc4f5114 (commit)
via 40b254ba9b7379f75da690a13aa0ec21707941bf (commit)
via 6f70a514652050bde05301a4715be8769f213ac6 (commit)
via 975b1912434cdd158abcf2d8b882d90c57c4299e (commit)
from 3650b57d77642a75fc7f21d339732c2d39431c39 (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 c0ccea12dac59b30d3d86977aa70531e7b0126b5
Author: Ward Vandewege <ward at curoverse.com>
Date: Thu Jul 3 22:29:18 2014 -0400
keep: MockVolume should return os.ErrNotExist instead of errors.New("not
found") when a block can not be found, just like a real volume.
diff --git a/services/keep/src/keep/volume.go b/services/keep/src/keep/volume.go
index fffc815..d195686 100644
--- a/services/keep/src/keep/volume.go
+++ b/services/keep/src/keep/volume.go
@@ -8,6 +8,7 @@ import (
"errors"
"fmt"
"strings"
+ "os"
)
type Volume interface {
@@ -38,7 +39,7 @@ func (v *MockVolume) Get(loc string) ([]byte, error) {
} else if block, ok := v.Store[loc]; ok {
return block, nil
}
- return nil, errors.New("not found")
+ return nil, os.ErrNotExist
}
func (v *MockVolume) Put(loc string, block []byte) error {
commit 7dec0933c112ce80f5ccda3e223158b94d5bce4d
Author: Ward Vandewege <ward at curoverse.com>
Date: Thu Jul 3 22:28:45 2014 -0400
Revert "Do not print an error when hitting 'not found' with a the MockVolume"
This reverts commit 97c9b2b49f94735c6d4d5b62b772089ef7e0e3bf.
Better solution in the next commit.
diff --git a/services/keep/src/keep/keep.go b/services/keep/src/keep/keep.go
index 373a36f..67c628d 100644
--- a/services/keep/src/keep/keep.go
+++ b/services/keep/src/keep/keep.go
@@ -575,13 +575,12 @@ func GetBlock(hash string) ([]byte, error) {
for _, vol := range KeepVM.Volumes() {
if buf, err := vol.Get(hash); err != nil {
// IsNotExist is an expected error and may be ignored.
- // "not found" is the equivalent for the MockVolume backend.
// (If all volumes report IsNotExist, we return a NotFoundError)
// A CorruptError should be returned immediately.
// Any other errors should be logged but we continue trying to
// read.
switch {
- case (os.IsNotExist(err) || err.Error() == "not found"):
+ case os.IsNotExist(err):
continue
default:
log.Printf("GetBlock: reading %s: %s\n", hash, err)
commit 1cf15bae4e5236084c338fb557c749533adce679
Merge: 3650b57 66efe78
Author: Ward Vandewege <ward at curoverse.com>
Date: Thu Jul 3 22:19:54 2014 -0400
Merge branch 'master' into 3141-keep-logging-improvements
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list