[ARVADOS] updated: 1.3.0-2140-g9a4fcabed
Git user
git at public.arvados.org
Tue Feb 4 14:48:11 UTC 2020
Summary of changes:
.../app/controllers/actions_controller.rb | 2 +-
.../app/controllers/application_controller.rb | 2 +-
apps/workbench/fpm-info.sh | 4 +-
build/rails-package-scripts/postinst.sh | 2 +-
build/run-build-packages.sh | 4 +-
cmd/arvados-client/Makefile | 1 +
cmd/arvados-server/arvados-controller.service | 2 +
cmd/arvados-server/arvados-dispatch-cloud.service | 2 +
doc/_config.yml | 10 ++--
.../collection-versioning.html.textile.liquid | 29 +++++----
doc/admin/config-migration.html.textile.liquid | 6 +-
...controlling-container-reuse.html.textile.liquid | 10 +---
.../logs-table-management.html.textile.liquid | 69 +++++++++++-----------
doc/admin/storage-classes.html.textile.liquid | 22 +++----
doc/admin/upgrade-crunch2.html.textile.liquid | 2 +-
doc/admin/upgrading.html.textile.liquid | 4 ++
.../workbench2-vocabulary.html.textile.liquid | 4 +-
doc/api/methods.html.textile.liquid | 1 -
doc/api/methods/links.html.textile.liquid | 43 +++++++++++++-
.../install-workbench2-app.html.textile.liquid | 4 +-
go.mod | 2 +-
go.sum | 4 +-
lib/controller/federation/list.go | 51 ++++++++--------
lib/controller/federation/list_test.go | 43 ++++++++++++++
lib/mount/command_test.go | 22 +++++++
.../crunch-dispatch-slurm.service | 2 +
services/health/arvados-health.service | 2 +
services/keep-balance/keep-balance.service | 2 +
services/keep-web/keep-web.service | 2 +
services/keepproxy/keepproxy.service | 2 +
services/keepstore/keepstore.service | 2 +
services/ws/arvados-ws.service | 2 +
32 files changed, 244 insertions(+), 115 deletions(-)
via 9a4fcabed1adeff0044d419977d5136c5cb1db3e (commit)
via ff58dd2e5cb37f652047b53064dd389b8cf05150 (commit)
via fa9a17bf1ea10d9130188730a1aa160e89daaa13 (commit)
via 4d969d35d1e1f022bd5ddcebb2de915bedd01334 (commit)
via 73018eed5cd93c9db7467760f5f1484fa2750554 (commit)
via 42ef5a07ca5fd2675f619d48de00c6f10143060c (commit)
via ce4675e0b3447611a0154de25ad89595f488890b (commit)
via 4e450b7c2ec9563dd6d670238d096d1bc9fd158f (commit)
via 74c70bf8c41ac135976f30784a4b5a3ab85dbe47 (commit)
via a66db11640b5552a1526e94891418139c6a6fde4 (commit)
via 01f800c72410babd4ed63c486033f83cc6d8e1b3 (commit)
via 9c35559a4e4f4fec24de6e2a412bf495ef9b6b15 (commit)
via 63de9493f14d062af48673fa1c4775d9c4e890fb (commit)
via 040db1debca6c5dccda5513fb6d42f14687ae910 (commit)
via 68a488a5a18d214a18016b4ef62137aafab0db8b (commit)
via cba44f28b4e932079f6bad2a478aa58fbcf9c24e (commit)
via c35311c706ed9c8c73ad5aa60285556f4ee266d7 (commit)
via 7c6defa86739291b44683395780559ce5ddc2b88 (commit)
from 6cea7a3a21ab1daa88278004745fed1fe994d751 (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 9a4fcabed1adeff0044d419977d5136c5cb1db3e
Merge: ff58dd2e5 fa9a17bf1
Author: Tom Clegg <tom at tomclegg.ca>
Date: Tue Feb 4 09:47:55 2020 -0500
12308: Merge branch 'master'
Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom at tomclegg.ca>
commit ff58dd2e5cb37f652047b53064dd389b8cf05150
Author: Tom Clegg <tom at tomclegg.ca>
Date: Tue Feb 4 09:45:18 2020 -0500
12308: Check contents of test mount.
Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom at tomclegg.ca>
diff --git a/lib/mount/command_test.go b/lib/mount/command_test.go
index 9cd413979..d222e8ccb 100644
--- a/lib/mount/command_test.go
+++ b/lib/mount/command_test.go
@@ -6,10 +6,12 @@ package mount
import (
"bytes"
+ "encoding/json"
"io/ioutil"
"os"
"time"
+ "git.arvados.org/arvados.git/sdk/go/arvadostest"
check "gopkg.in/check.v1"
)
@@ -42,6 +44,26 @@ func (s *CmdSuite) TestMount(c *check.C) {
go func() {
<-mountCmd.ready
ready = true
+
+ f, err := os.Open(s.mnt + "/by_id/" + arvadostest.FooCollection)
+ if c.Check(err, check.IsNil) {
+ dirnames, err := f.Readdirnames(-1)
+ c.Check(err, check.IsNil)
+ c.Check(dirnames, check.DeepEquals, []string{"foo"})
+ f.Close()
+ }
+
+ buf, err := ioutil.ReadFile(s.mnt + "/by_id/" + arvadostest.FooCollection + "/.arvados#collection")
+ if c.Check(err, check.IsNil) {
+ var m map[string]interface{}
+ err = json.Unmarshal(buf, &m)
+ c.Check(err, check.NotNil)
+ c.Check(m["manifest_text"], check.Matches, `\. acbd.* 0:3:foo\n`)
+ }
+
+ _, err = os.Open(s.mnt + "/by_id/zzzzz-4zz18-does-not-exist")
+ c.Check(os.IsNotExist(err), check.Equals, true)
+
ok := mountCmd.Unmount()
c.Check(ok, check.Equals, true)
}()
commit a66db11640b5552a1526e94891418139c6a6fde4
Author: Tom Clegg <tom at tomclegg.ca>
Date: Sat Feb 1 02:07:19 2020 -0500
12308: Note xgo limitation.
Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom at tomclegg.ca>
diff --git a/cmd/arvados-client/Makefile b/cmd/arvados-client/Makefile
index be5487a8e..b043fc90e 100644
--- a/cmd/arvados-client/Makefile
+++ b/cmd/arvados-client/Makefile
@@ -3,6 +3,7 @@
# SPDX-License-Identifier: Apache-2.0
all:
+ @printf "*** note *** due to an xgo limitation, this only works when the working tree is in GOPATH\n\n"
go mod download
docker build --tag=cgofuse --build-arg=http_proxy="$(http_proxy)" --build-arg=https_proxy="$(https_proxy)" https://github.com/arvados/cgofuse.git
go run github.com/karalabe/xgo --image=cgofuse --targets=linux/amd64,linux/386,darwin/amd64,darwin/386,windows/amd64,windows/386 .
commit 01f800c72410babd4ed63c486033f83cc6d8e1b3
Author: Tom Clegg <tom at tomclegg.ca>
Date: Sat Feb 1 02:07:08 2020 -0500
12308: Add xgo to go.mod.
Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom at tomclegg.ca>
diff --git a/go.mod b/go.mod
index 1051b46c8..2f1852734 100644
--- a/go.mod
+++ b/go.mod
@@ -31,6 +31,7 @@ require (
github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 // indirect
github.com/jmcvetta/randutil v0.0.0-20150817122601-2bb1b664bcff
github.com/julienschmidt/httprouter v1.2.0
+ github.com/karalabe/xgo v0.0.0-20191115072854-c5ccff8648a7 // indirect
github.com/kevinburke/ssh_config v0.0.0-20171013211458-802051befeb5 // indirect
github.com/lib/pq v0.0.0-20171126050459-83612a56d3dd
github.com/marstr/guid v1.1.1-0.20170427235115-8bdf7d1a087c // indirect
diff --git a/go.sum b/go.sum
index ab1693803..0a543fde9 100644
--- a/go.sum
+++ b/go.sum
@@ -104,6 +104,8 @@ github.com/json-iterator/go v1.1.7/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/u
github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1:6v2b51hI/fHJwM22ozAgKL4VKDeJcHhJFhtBdhmNjmU=
github.com/julienschmidt/httprouter v1.2.0 h1:TDTW5Yz1mjftljbcKqRcrYhd4XeOoI98t+9HbQbYf7g=
github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w=
+github.com/karalabe/xgo v0.0.0-20191115072854-c5ccff8648a7 h1:AYzjK/SHz6m6mg5iuFwkrAhCc14jvCpW9d6frC9iDPE=
+github.com/karalabe/xgo v0.0.0-20191115072854-c5ccff8648a7/go.mod h1:iYGcTYIPUvEWhFo6aKUuLchs+AV4ssYdyuBbQJZGcBk=
github.com/kevinburke/ssh_config v0.0.0-20171013211458-802051befeb5 h1:xXn0nBttYwok7DhU4RxqaADEpQn7fEMt5kKc3yoj/n0=
github.com/kevinburke/ssh_config v0.0.0-20171013211458-802051befeb5/go.mod h1:CT57kijsi8u/K/BOFA39wgDQJ9CxiF4nAY/ojJ6r6mM=
github.com/konsorten/go-windows-terminal-sequences v1.0.1 h1:mweAR1A6xJ3oS2pRaGiHgQ4OO8tzTaLawm8vnODuwDk=
commit 9c35559a4e4f4fec24de6e2a412bf495ef9b6b15
Author: Tom Clegg <tom at tomclegg.ca>
Date: Sat Feb 1 02:00:55 2020 -0500
12308: cgofuse v1.2.0
Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom at tomclegg.ca>
diff --git a/go.mod b/go.mod
index 0a4c18939..1051b46c8 100644
--- a/go.mod
+++ b/go.mod
@@ -9,7 +9,7 @@ require (
github.com/Microsoft/go-winio v0.4.5 // indirect
github.com/alcortesm/tgz v0.0.0-20161220082320-9c5fe88206d7 // indirect
github.com/anmitsu/go-shlex v0.0.0-20161002113705-648efa622239 // indirect
- github.com/arvados/cgofuse v1.2.1-0.20200117191602-0a6595d3faa1
+ github.com/arvados/cgofuse v1.2.0
github.com/aws/aws-sdk-go v1.25.30
github.com/coreos/go-oidc v2.1.0+incompatible
github.com/coreos/go-systemd v0.0.0-20180108085132-cc4f39464dc7
@@ -31,7 +31,6 @@ require (
github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 // indirect
github.com/jmcvetta/randutil v0.0.0-20150817122601-2bb1b664bcff
github.com/julienschmidt/httprouter v1.2.0
- github.com/karalabe/xgo v0.0.0-20191115072854-c5ccff8648a7 // indirect
github.com/kevinburke/ssh_config v0.0.0-20171013211458-802051befeb5 // indirect
github.com/lib/pq v0.0.0-20171126050459-83612a56d3dd
github.com/marstr/guid v1.1.1-0.20170427235115-8bdf7d1a087c // indirect
diff --git a/go.sum b/go.sum
index 152e35d60..ab1693803 100644
--- a/go.sum
+++ b/go.sum
@@ -17,8 +17,8 @@ github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRF
github.com/alecthomas/units v0.0.0-20190717042225-c3de453c63f4/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0=
github.com/anmitsu/go-shlex v0.0.0-20161002113705-648efa622239 h1:kFOfPq6dUM1hTo4JG6LR5AXSUEsOjtdm0kw0FtQtMJA=
github.com/anmitsu/go-shlex v0.0.0-20161002113705-648efa622239/go.mod h1:2FmKhYUyUczH0OGQWaF5ceTx0UBShxjsH6f8oGKYe2c=
-github.com/arvados/cgofuse v1.2.1-0.20200117191602-0a6595d3faa1 h1:rJ20nQahPEFL/f6v0a9dLVlkWs71qN7xGkmhzgGTCys=
-github.com/arvados/cgofuse v1.2.1-0.20200117191602-0a6595d3faa1/go.mod h1:79WFV98hrkRHK9XPhh2IGGOwpFSjocsWubgxAs2KhRc=
+github.com/arvados/cgofuse v1.2.0 h1:sWgVxyvSFjH965Uc7ReScn/cBl9Jemc9SeUNlEmjRH4=
+github.com/arvados/cgofuse v1.2.0/go.mod h1:79WFV98hrkRHK9XPhh2IGGOwpFSjocsWubgxAs2KhRc=
github.com/arvados/goamz v0.0.0-20190905141525-1bba09f407ef h1:cl7DIRbiAYNqaVxg3CZY8qfZoBOKrj06H/x9SPGaxas=
github.com/arvados/goamz v0.0.0-20190905141525-1bba09f407ef/go.mod h1:rCtgyMmBGEbjTm37fCuBYbNL0IhztiALzo3OB9HyiOM=
github.com/aws/aws-sdk-go v1.25.30 h1:I9qj6zW3mMfsg91e+GMSN/INcaX9tTFvr/l/BAHKaIY=
@@ -104,8 +104,6 @@ github.com/json-iterator/go v1.1.7/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/u
github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1:6v2b51hI/fHJwM22ozAgKL4VKDeJcHhJFhtBdhmNjmU=
github.com/julienschmidt/httprouter v1.2.0 h1:TDTW5Yz1mjftljbcKqRcrYhd4XeOoI98t+9HbQbYf7g=
github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w=
-github.com/karalabe/xgo v0.0.0-20191115072854-c5ccff8648a7 h1:AYzjK/SHz6m6mg5iuFwkrAhCc14jvCpW9d6frC9iDPE=
-github.com/karalabe/xgo v0.0.0-20191115072854-c5ccff8648a7/go.mod h1:iYGcTYIPUvEWhFo6aKUuLchs+AV4ssYdyuBbQJZGcBk=
github.com/kevinburke/ssh_config v0.0.0-20171013211458-802051befeb5 h1:xXn0nBttYwok7DhU4RxqaADEpQn7fEMt5kKc3yoj/n0=
github.com/kevinburke/ssh_config v0.0.0-20171013211458-802051befeb5/go.mod h1:CT57kijsi8u/K/BOFA39wgDQJ9CxiF4nAY/ojJ6r6mM=
github.com/konsorten/go-windows-terminal-sequences v1.0.1 h1:mweAR1A6xJ3oS2pRaGiHgQ4OO8tzTaLawm8vnODuwDk=
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list