[ARVADOS] updated: a0c7339018d20f9f2c0064c841053f6f1d1a2ccd
Git user
git at public.curoverse.com
Wed May 4 16:22:44 EDT 2016
Summary of changes:
build/run-build-packages-python-and-ruby.sh | 8 +-
build/run-build-packages.sh | 2 +-
build/run-tests.sh | 15 +-
sdk/cli/arvados-cli.gemspec | 3 +-
sdk/cli/bin/arv | 2 +-
sdk/cli/bin/crunch-job | 2 +-
sdk/cli/test/test_arv-collection-create.rb | 18 +-
sdk/cwl/arvados_cwl/__init__.py | 150 +++++++++--
sdk/cwl/setup.py | 2 +-
sdk/cwl/tests/matcher.py | 23 ++
sdk/cwl/tests/order/empty_order.json | 1 +
sdk/cwl/tests/order/inputs_test_order.json | 9 +
sdk/cwl/tests/test_job.py | 23 +-
sdk/cwl/tests/test_submit.py | 299 +++++++++++++++------
sdk/cwl/tests/wf/inputs_test.cwl | 27 ++
sdk/python/arvados/commands/put.py | 28 +-
sdk/python/arvados/keep.py | 46 +++-
sdk/python/tests/arvados_testutil.py | 3 +-
sdk/python/tests/keepstub.py | 14 +
sdk/python/tests/test_api.py | 2 +-
sdk/python/tests/test_arv_put.py | 53 +++-
sdk/python/tests/test_keep_client.py | 130 +++++++++
.../api/app/controllers/application_controller.rb | 4 +-
.../v1/api_client_authorizations_controller.rb | 2 +-
services/api/config/initializers/fix_www_decode.rb | 16 ++
services/api/lib/eventbus.rb | 2 +-
services/api/lib/load_param.rb | 8 +-
services/api/lib/record_filters.rb | 2 +
services/api/test/helpers/time_block.rb | 12 +
.../integration/collections_performance_test.rb | 16 +-
services/api/test/integration/websocket_test.rb | 36 +--
services/api/test/test_helper.rb | 2 +-
services/keepstore/azure_blob_volume.go | 33 ++-
services/keepstore/azure_blob_volume_test.go | 18 +-
services/keepstore/handler_test.go | 64 ++++-
services/keepstore/handlers.go | 85 ++++--
.../keepstore/handlers_with_generic_volume_test.go | 26 +-
services/keepstore/keepstore.go | 1 +
services/keepstore/keepstore_test.go | 50 ++--
services/keepstore/logging_router.go | 56 ++--
services/keepstore/logging_router_test.go | 10 +
services/keepstore/s3_volume.go | 10 +-
services/keepstore/trash_worker_test.go | 16 +-
services/keepstore/volume.go | 21 +-
services/keepstore/volume_generic_test.go | 168 ++++++------
services/keepstore/volume_test.go | 11 +-
services/keepstore/volume_unix.go | 24 +-
services/keepstore/volume_unix_test.go | 8 +-
.../arvnodeman/computenode/driver/__init__.py | 6 +-
.../nodemanager/tests/test_computenode_driver.py | 61 +++++
tools/arvbox/lib/arvbox/docker/crunch-setup.sh | 6 +-
51 files changed, 1227 insertions(+), 407 deletions(-)
create mode 100644 sdk/cwl/tests/matcher.py
create mode 100644 sdk/cwl/tests/order/empty_order.json
create mode 100644 sdk/cwl/tests/order/inputs_test_order.json
create mode 100644 sdk/cwl/tests/wf/inputs_test.cwl
create mode 100644 services/api/config/initializers/fix_www_decode.rb
create mode 100644 services/keepstore/logging_router_test.go
create mode 100644 services/nodemanager/tests/test_computenode_driver.py
via a0c7339018d20f9f2c0064c841053f6f1d1a2ccd (commit)
via 5bd65b09716c720ecdb154c7cbeb5be80a1b5e8f (commit)
via c7259164cd07f09b5d63f39ddc850c50f249ded2 (commit)
via 2814672fee49d8b02b7ea82a8e8a90504fc85d41 (commit)
via 8b1479352382feb55c576c00e797e50917c1d91c (commit)
via 959f37498c5f1610612452ab227ba4680b30e8e6 (commit)
via fba69e99ccafb4c956e688e8fef3d2f71100ed95 (commit)
via bd8aa1d7990b241639de4f200223da7794f14643 (commit)
via 497fdb2505efa9a3231c39ec696da6b749d30af2 (commit)
via 149957a7a86cd9fae98edfdc9c797d16656b3684 (commit)
via 721bd171547f1c1ddcce5532a96f9bb801800757 (commit)
via 96aad215edcc0f314216c07df9246799665dd19d (commit)
via 71cca58c580f919c01e0f5fc7b6f469cef3b03c6 (commit)
via e8ccb474e5dbfee3d600fdd5ac3218ccb4625eb6 (commit)
via 12b5d95d9d4f062539c3d7d7ac8dd5421dd6b6b0 (commit)
via 7ea58af581ad8d1af39d5cbcc18ebb69100e0a5c (commit)
via 8b097ea832516b3f5104c62a40a6d9cf4826232a (commit)
via 44764dd0eaf01c7a24539629c727ff31affa3b7e (commit)
via 513c30b5c5c2b3dd72894667eb0e51e24c9d4182 (commit)
via 25505fc5105bc776ed2d6d898f18f91d6451088b (commit)
via 01cf080f9983313a50b902e477d7b30b03afa131 (commit)
via 0278f7f56ed5ce972803079bdeb4ba031676a171 (commit)
via 7fecb3e2a7fc7aa5b7230f12b3cc3878872fff68 (commit)
via c9c39efa9118a4d30a422c26726076bc54e6da17 (commit)
via a829e7e14aa6380616337e0e7dda47c4f9f7022c (commit)
via 306747a2b8971f095a13a507b0155ea64d53c98d (commit)
via e62a18f3786d0f3c12865f865294a0f4d39ff548 (commit)
via d8c84ea91f8c4a26860e637197f234f2dd909abb (commit)
via 5e991889ca6c18cdd901b98b5083c4cee7d260c9 (commit)
via e09af1d4876cb1295785db9abb5f3d2d10323097 (commit)
via 6599824f22cdb45ab30657ac95071aa0beeee08b (commit)
via b6e5a10028551a1c2b1379c5c8ed039582434f25 (commit)
via ec9df4864de8033b4efd8b1cecfd1875fefc303e (commit)
via f22692a8fdf6610045db0c34c4827a0ebcb0ae0a (commit)
via 4c360c5a3a9564f584dac973810059d2d45d08ef (commit)
from 4cd888928e8789c5d05027a627989bf1cd10726d (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 a0c7339018d20f9f2c0064c841053f6f1d1a2ccd
Merge: 4cd8889 5bd65b0
Author: radhika <radhika at curoverse.com>
Date: Wed May 4 16:04:49 2016 -0400
Merge branch 'master' into 8556-trash-untrash-azure-volume
Conflicts:
services/keepstore/azure_blob_volume.go
services/keepstore/volume_generic_test.go
diff --cc services/keepstore/azure_blob_volume.go
index 444ecfa,9c03743..7c8f8aa
--- a/services/keepstore/azure_blob_volume.go
+++ b/services/keepstore/azure_blob_volume.go
@@@ -152,14 -139,11 +152,14 @@@ func (v *AzureBlobVolume) checkTrashed(
// If the block is younger than azureWriteRaceInterval and is
// unexpectedly empty, assume a PutBlob operation is in progress, and
// wait for it to finish writing.
- func (v *AzureBlobVolume) Get(loc string) ([]byte, error) {
+ func (v *AzureBlobVolume) Get(loc string, buf []byte) (int, error) {
+ if err := v.checkTrashed(loc); err != nil {
- return nil, err
++ return 0, err
+ }
var deadline time.Time
haveDeadline := false
- buf, err := v.get(loc)
- for err == nil && len(buf) == 0 && loc != "d41d8cd98f00b204e9800998ecf8427e" {
+ size, err := v.get(loc, buf)
+ for err == nil && size == 0 && loc != "d41d8cd98f00b204e9800998ecf8427e" {
// Seeing a brand new empty block probably means we're
// in a race with CreateBlob, which under the hood
// (apparently) does "CreateEmpty" and "CommitData"
diff --cc services/keepstore/volume_generic_test.go
index 35125b8,105795c..0f289ef
--- a/services/keepstore/volume_generic_test.go
+++ b/services/keepstore/volume_generic_test.go
@@@ -455,31 -449,10 +449,32 @@@ func testDeleteOldBlock(t TB, factory T
if err := v.Trash(TestHash); err != nil {
t.Error(err)
}
- _, err := v.Get(TestHash)
+ data := make([]byte, BlockSize)
- if _, err := v.Get(TestHash, data); err == nil || !os.IsNotExist(err) {
++ _, err := v.Get(TestHash, data)
+ if err == nil || (!os.IsNotExist(err) && !strings.Contains(err.Error(), "Not Found")) {
t.Errorf("os.IsNotExist(%v) should have been true", err)
}
+
+ _, err = v.Mtime(TestHash)
+ if err == nil || (!os.IsNotExist(err) && !strings.Contains(err.Error(), "Not Found")) {
+ t.Fatalf("os.IsNotExist(%v) should have been true", err)
+ }
+
+ err = v.Compare(TestHash, TestBlock)
+ if err == nil || (!os.IsNotExist(err) && !strings.Contains(err.Error(), "Not Found")) {
+ t.Fatalf("os.IsNotExist(%v) should have been true", err)
+ }
+
+ indexBuf := new(bytes.Buffer)
+ v.IndexTo("", indexBuf)
+ if strings.Contains(string(indexBuf.Bytes()), TestHash) {
+ t.Fatalf("Found trashed block in IndexTo")
+ }
+
+ err = v.Touch(TestHash)
+ if err == nil || (!os.IsNotExist(err) && !strings.Contains(err.Error(), "Not Found")) {
+ t.Fatalf("os.IsNotExist(%v) should have been true", err)
+ }
}
// Calling Delete() for a block that does not exist should result in error.
@@@ -756,12 -727,12 +749,12 @@@ func testTrashUntrash(t TB, factory Tes
}
} else if err != nil {
if err != ErrNotImplemented {
- t.Error(err)
+ t.Fatal(err)
}
} else {
- _, err = v.Get(TestHash)
+ _, err = v.Get(TestHash, buf)
- if err == nil || !os.IsNotExist(err) {
+ if err == nil || (!os.IsNotExist(err) && !strings.Contains(err.Error(), "Not Found")) {
- t.Fatalf("os.IsNotExist(%v) should have been true", err)
+ t.Errorf("os.IsNotExist(%v) should have been true", err)
}
// Untrash
@@@ -821,28 -791,7 +813,28 @@@ func testTrashEmptyTrashUntrash(t TB, f
}
err = checkGet()
- if err == nil || !os.IsNotExist(err) {
+ if err == nil || (!os.IsNotExist(err) && !strings.Contains(err.Error(), "Not Found")) {
+ t.Fatalf("os.IsNotExist(%v) should have been true", err)
+ }
+
+ _, err = v.Mtime(TestHash)
+ if err == nil || (!os.IsNotExist(err) && !strings.Contains(err.Error(), "Not Found")) {
+ t.Fatalf("os.IsNotExist(%v) should have been true", err)
+ }
+
+ err = v.Compare(TestHash, TestBlock)
+ if err == nil || (!os.IsNotExist(err) && !strings.Contains(err.Error(), "Not Found")) {
+ t.Fatalf("os.IsNotExist(%v) should have been true", err)
+ }
+
+ indexBuf := new(bytes.Buffer)
+ v.IndexTo("", indexBuf)
+ if strings.Contains(string(indexBuf.Bytes()), TestHash) {
- // t.Fatalf("Found trashed block in IndexTo")
++ //t.Fatalf("Found trashed block in IndexTo")
+ }
+
+ err = v.Touch(TestHash)
+ if err == nil || (!os.IsNotExist(err) && !strings.Contains(err.Error(), "Not Found")) {
t.Fatalf("os.IsNotExist(%v) should have been true", err)
}
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list