[ARVADOS] created: 2.1.0-1418-gaeee74bf7
Git user
git at public.arvados.org
Wed Sep 29 18:32:57 UTC 2021
at aeee74bf737c0ec04a7e2366e5531d299bd58063 (commit)
commit aeee74bf737c0ec04a7e2366e5531d299bd58063
Author: Tom Clegg <tom at curii.com>
Date: Wed Sep 29 14:32:00 2021 -0400
18216: Move keepstore into arvados-server binary.
Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom at curii.com>
diff --git a/build/run-build-packages.sh b/build/run-build-packages.sh
index 7829c8c6c..26ed168aa 100755
--- a/build/run-build-packages.sh
+++ b/build/run-build-packages.sh
@@ -295,7 +295,7 @@ package_go_binary services/keep-balance keep-balance \
"Rebalance and garbage-collect data blocks stored in Arvados Keep"
package_go_binary services/keepproxy keepproxy \
"Make a Keep cluster accessible to clients that are not on the LAN"
-package_go_binary services/keepstore keepstore \
+package_go_binary cmd/arvados-server keepstore \
"Keep storage daemon, accessible to clients on the LAN"
package_go_binary services/keep-web keep-web \
"Static web hosting service for user data stored in Arvados Keep"
diff --git a/build/run-tests.sh b/build/run-tests.sh
index 71da30ce4..d318bc60d 100755
--- a/build/run-tests.sh
+++ b/build/run-tests.sh
@@ -1082,9 +1082,7 @@ install_deps() {
do_install services/api
do_install services/arv-git-httpd go
do_install services/keepproxy go
- do_install services/keepstore go
do_install services/keep-web go
- do_install services/ws go
}
install_all() {
diff --git a/cmd/arvados-server/cmd.go b/cmd/arvados-server/cmd.go
index 4b94a7813..c8b945bea 100644
--- a/cmd/arvados-server/cmd.go
+++ b/cmd/arvados-server/cmd.go
@@ -17,6 +17,7 @@ import (
"git.arvados.org/arvados.git/lib/install"
"git.arvados.org/arvados.git/lib/lsf"
"git.arvados.org/arvados.git/lib/recovercollection"
+ "git.arvados.org/arvados.git/services/keepstore"
"git.arvados.org/arvados.git/services/ws"
)
@@ -37,6 +38,7 @@ var (
"dispatch-lsf": lsf.DispatchCommand,
"install": install.Command,
"init": install.InitCommand,
+ "keepstore": keepstore.Command,
"recover-collection": recovercollection.Command,
"ws": ws.Command,
})
diff --git a/services/keepstore/keepstore.service b/cmd/arvados-server/keepstore.service
similarity index 95%
rename from services/keepstore/keepstore.service
rename to cmd/arvados-server/keepstore.service
index 1f14c3f46..bcfde3a78 100644
--- a/services/keepstore/keepstore.service
+++ b/cmd/arvados-server/keepstore.service
@@ -6,6 +6,7 @@
Description=Arvados Keep Storage Daemon
Documentation=https://doc.arvados.org/
After=network.target
+AssertPathExists=/etc/arvados/config.yml
# systemd>=230 (debian:9) obeys StartLimitIntervalSec in the [Unit] section
StartLimitIntervalSec=0
diff --git a/sdk/python/tests/run_test_server.py b/sdk/python/tests/run_test_server.py
index c022e6c87..6d2643a96 100644
--- a/sdk/python/tests/run_test_server.py
+++ b/sdk/python/tests/run_test_server.py
@@ -473,7 +473,7 @@ def _start_keep(n, blob_signing=False):
confdata['Clusters']['zzzzz']['Collections']['BlobSigning'] = blob_signing
with open(conf, 'w') as f:
yaml.safe_dump(confdata, f)
- keep_cmd = ["keepstore", "-config", conf]
+ keep_cmd = ["arvados-server", "keepstore", "-config", conf]
with open(_logfilename('keep{}'.format(n)), WRITE_MODE) as logf:
with open('/dev/null') as _stdin:
diff --git a/services/keepstore/azure_blob_volume.go b/services/keepstore/azure_blob_volume.go
index 6e8def822..cf655c2a5 100644
--- a/services/keepstore/azure_blob_volume.go
+++ b/services/keepstore/azure_blob_volume.go
@@ -2,7 +2,7 @@
//
// SPDX-License-Identifier: AGPL-3.0
-package main
+package keepstore
import (
"bytes"
diff --git a/services/keepstore/azure_blob_volume_test.go b/services/keepstore/azure_blob_volume_test.go
index 3f395e40c..48d58ee9b 100644
--- a/services/keepstore/azure_blob_volume_test.go
+++ b/services/keepstore/azure_blob_volume_test.go
@@ -2,7 +2,7 @@
//
// SPDX-License-Identifier: AGPL-3.0
-package main
+package keepstore
import (
"bytes"
diff --git a/services/keepstore/bufferpool.go b/services/keepstore/bufferpool.go
index 623693cd1..b4cc5d38e 100644
--- a/services/keepstore/bufferpool.go
+++ b/services/keepstore/bufferpool.go
@@ -2,7 +2,7 @@
//
// SPDX-License-Identifier: AGPL-3.0
-package main
+package keepstore
import (
"sync"
diff --git a/services/keepstore/bufferpool_test.go b/services/keepstore/bufferpool_test.go
index 72b719ba2..13e1cb4f3 100644
--- a/services/keepstore/bufferpool_test.go
+++ b/services/keepstore/bufferpool_test.go
@@ -2,7 +2,7 @@
//
// SPDX-License-Identifier: AGPL-3.0
-package main
+package keepstore
import (
"context"
diff --git a/services/keepstore/collision.go b/services/keepstore/collision.go
index 4d6583b26..16f2d0923 100644
--- a/services/keepstore/collision.go
+++ b/services/keepstore/collision.go
@@ -2,7 +2,7 @@
//
// SPDX-License-Identifier: AGPL-3.0
-package main
+package keepstore
import (
"bytes"
diff --git a/services/keepstore/collision_test.go b/services/keepstore/collision_test.go
index 0d6fd6283..aa8f0cbaa 100644
--- a/services/keepstore/collision_test.go
+++ b/services/keepstore/collision_test.go
@@ -2,7 +2,7 @@
//
// SPDX-License-Identifier: AGPL-3.0
-package main
+package keepstore
import (
"bytes"
diff --git a/services/keepstore/command.go b/services/keepstore/command.go
index bf3bf1722..2a426936e 100644
--- a/services/keepstore/command.go
+++ b/services/keepstore/command.go
@@ -2,7 +2,7 @@
//
// SPDX-License-Identifier: AGPL-3.0
-package main
+package keepstore
import (
"context"
@@ -30,10 +30,6 @@ var (
Command = service.Command(arvados.ServiceNameKeepstore, newHandlerOrErrorHandler)
)
-func main() {
- os.Exit(runCommand(os.Args[0], os.Args[1:], os.Stdin, os.Stdout, os.Stderr))
-}
-
func runCommand(prog string, args []string, stdin io.Reader, stdout, stderr io.Writer) int {
args, ok := convertKeepstoreFlagsToServiceFlags(args, ctxlog.FromContext(context.Background()))
if !ok {
diff --git a/services/keepstore/command_test.go b/services/keepstore/command_test.go
index ad2aa0957..bbfae52f6 100644
--- a/services/keepstore/command_test.go
+++ b/services/keepstore/command_test.go
@@ -2,7 +2,7 @@
//
// SPDX-License-Identifier: AGPL-3.0
-package main
+package keepstore
import (
"bytes"
diff --git a/services/keepstore/count.go b/services/keepstore/count.go
index ccba4f135..272b5017c 100644
--- a/services/keepstore/count.go
+++ b/services/keepstore/count.go
@@ -2,7 +2,7 @@
//
// SPDX-License-Identifier: AGPL-3.0
-package main
+package keepstore
import (
"io"
diff --git a/services/keepstore/gocheck_test.go b/services/keepstore/gocheck_test.go
index 89d680fc1..90076db5b 100644
--- a/services/keepstore/gocheck_test.go
+++ b/services/keepstore/gocheck_test.go
@@ -2,7 +2,7 @@
//
// SPDX-License-Identifier: AGPL-3.0
-package main
+package keepstore
import (
"gopkg.in/check.v1"
diff --git a/services/keepstore/handler_test.go b/services/keepstore/handler_test.go
index 16dcd2aaf..cbb7f38bb 100644
--- a/services/keepstore/handler_test.go
+++ b/services/keepstore/handler_test.go
@@ -11,7 +11,7 @@
// The HTTP handlers are responsible for enforcing permission policy,
// so these tests must exercise all possible permission permutations.
-package main
+package keepstore
import (
"bytes"
diff --git a/services/keepstore/handlers.go b/services/keepstore/handlers.go
index 910033ebb..29e7b2ca9 100644
--- a/services/keepstore/handlers.go
+++ b/services/keepstore/handlers.go
@@ -2,7 +2,7 @@
//
// SPDX-License-Identifier: AGPL-3.0
-package main
+package keepstore
import (
"container/list"
diff --git a/services/keepstore/keepstore.go b/services/keepstore/keepstore.go
index 3c9d5d15e..b9dbe2777 100644
--- a/services/keepstore/keepstore.go
+++ b/services/keepstore/keepstore.go
@@ -2,7 +2,7 @@
//
// SPDX-License-Identifier: AGPL-3.0
-package main
+package keepstore
import (
"time"
diff --git a/services/keepstore/metrics.go b/services/keepstore/metrics.go
index b2f0aa663..d04601fbe 100644
--- a/services/keepstore/metrics.go
+++ b/services/keepstore/metrics.go
@@ -2,7 +2,7 @@
//
// SPDX-License-Identifier: AGPL-3.0
-package main
+package keepstore
import (
"fmt"
diff --git a/services/keepstore/mock_mutex_for_test.go b/services/keepstore/mock_mutex_for_test.go
index 484b17723..daf0ef05f 100644
--- a/services/keepstore/mock_mutex_for_test.go
+++ b/services/keepstore/mock_mutex_for_test.go
@@ -2,7 +2,7 @@
//
// SPDX-License-Identifier: AGPL-3.0
-package main
+package keepstore
type MockMutex struct {
AllowLock chan struct{}
diff --git a/services/keepstore/mounts_test.go b/services/keepstore/mounts_test.go
index b60bf9658..e8c248219 100644
--- a/services/keepstore/mounts_test.go
+++ b/services/keepstore/mounts_test.go
@@ -2,7 +2,7 @@
//
// SPDX-License-Identifier: AGPL-3.0
-package main
+package keepstore
import (
"bytes"
diff --git a/services/keepstore/perms.go b/services/keepstore/perms.go
index 7b962641e..7205a4594 100644
--- a/services/keepstore/perms.go
+++ b/services/keepstore/perms.go
@@ -2,7 +2,7 @@
//
// SPDX-License-Identifier: AGPL-3.0
-package main
+package keepstore
import (
"time"
diff --git a/services/keepstore/perms_test.go b/services/keepstore/perms_test.go
index 5460f8eda..132237470 100644
--- a/services/keepstore/perms_test.go
+++ b/services/keepstore/perms_test.go
@@ -2,7 +2,7 @@
//
// SPDX-License-Identifier: AGPL-3.0
-package main
+package keepstore
import (
"strconv"
diff --git a/services/keepstore/pipe_adapters.go b/services/keepstore/pipe_adapters.go
index 69ed6d2ff..6b555054b 100644
--- a/services/keepstore/pipe_adapters.go
+++ b/services/keepstore/pipe_adapters.go
@@ -2,7 +2,7 @@
//
// SPDX-License-Identifier: AGPL-3.0
-package main
+package keepstore
import (
"bytes"
diff --git a/services/keepstore/proxy_remote.go b/services/keepstore/proxy_remote.go
index 8c88a406f..526bc2529 100644
--- a/services/keepstore/proxy_remote.go
+++ b/services/keepstore/proxy_remote.go
@@ -2,7 +2,7 @@
//
// SPDX-License-Identifier: AGPL-3.0
-package main
+package keepstore
import (
"context"
diff --git a/services/keepstore/proxy_remote_test.go b/services/keepstore/proxy_remote_test.go
index 00161bf23..534371cc0 100644
--- a/services/keepstore/proxy_remote_test.go
+++ b/services/keepstore/proxy_remote_test.go
@@ -2,7 +2,7 @@
//
// SPDX-License-Identifier: AGPL-3.0
-package main
+package keepstore
import (
"context"
diff --git a/services/keepstore/pull_worker.go b/services/keepstore/pull_worker.go
index 57b946924..abe3dc385 100644
--- a/services/keepstore/pull_worker.go
+++ b/services/keepstore/pull_worker.go
@@ -2,7 +2,7 @@
//
// SPDX-License-Identifier: AGPL-3.0
-package main
+package keepstore
import (
"context"
diff --git a/services/keepstore/pull_worker_integration_test.go b/services/keepstore/pull_worker_integration_test.go
index eb7fe5fd6..3855b4ecd 100644
--- a/services/keepstore/pull_worker_integration_test.go
+++ b/services/keepstore/pull_worker_integration_test.go
@@ -2,7 +2,7 @@
//
// SPDX-License-Identifier: AGPL-3.0
-package main
+package keepstore
import (
"bytes"
diff --git a/services/keepstore/pull_worker_test.go b/services/keepstore/pull_worker_test.go
index 2013c8c04..2626e66d8 100644
--- a/services/keepstore/pull_worker_test.go
+++ b/services/keepstore/pull_worker_test.go
@@ -2,7 +2,7 @@
//
// SPDX-License-Identifier: AGPL-3.0
-package main
+package keepstore
import (
"bytes"
diff --git a/services/keepstore/s3_volume.go b/services/keepstore/s3_volume.go
index 4c43b3f46..ee89b156f 100644
--- a/services/keepstore/s3_volume.go
+++ b/services/keepstore/s3_volume.go
@@ -2,7 +2,7 @@
//
// SPDX-License-Identifier: AGPL-3.0
-package main
+package keepstore
import (
"bufio"
diff --git a/services/keepstore/s3_volume_test.go b/services/keepstore/s3_volume_test.go
index 5cb8a668a..a82098356 100644
--- a/services/keepstore/s3_volume_test.go
+++ b/services/keepstore/s3_volume_test.go
@@ -2,7 +2,7 @@
//
// SPDX-License-Identifier: AGPL-3.0
-package main
+package keepstore
import (
"bytes"
diff --git a/services/keepstore/s3aws_volume.go b/services/keepstore/s3aws_volume.go
index fb2e97efb..cb0b73cb8 100644
--- a/services/keepstore/s3aws_volume.go
+++ b/services/keepstore/s3aws_volume.go
@@ -2,7 +2,7 @@
//
// SPDX-License-Identifier: AGPL-3.0
-package main
+package keepstore
import (
"bytes"
diff --git a/services/keepstore/s3aws_volume_test.go b/services/keepstore/s3aws_volume_test.go
index fa9e270e0..c7e2d485d 100644
--- a/services/keepstore/s3aws_volume_test.go
+++ b/services/keepstore/s3aws_volume_test.go
@@ -2,7 +2,7 @@
//
// SPDX-License-Identifier: AGPL-3.0
-package main
+package keepstore
import (
"bytes"
diff --git a/services/keepstore/stats_ticker.go b/services/keepstore/stats_ticker.go
index 342b9e320..520d4530c 100644
--- a/services/keepstore/stats_ticker.go
+++ b/services/keepstore/stats_ticker.go
@@ -2,7 +2,7 @@
//
// SPDX-License-Identifier: AGPL-3.0
-package main
+package keepstore
import (
"sync"
diff --git a/services/keepstore/status_test.go b/services/keepstore/status_test.go
index cafe9f72f..80f98adb2 100644
--- a/services/keepstore/status_test.go
+++ b/services/keepstore/status_test.go
@@ -2,7 +2,7 @@
//
// SPDX-License-Identifier: AGPL-3.0
-package main
+package keepstore
import (
"encoding/json"
diff --git a/services/keepstore/trash_worker.go b/services/keepstore/trash_worker.go
index 406376572..3909d90d9 100644
--- a/services/keepstore/trash_worker.go
+++ b/services/keepstore/trash_worker.go
@@ -2,7 +2,7 @@
//
// SPDX-License-Identifier: AGPL-3.0
-package main
+package keepstore
import (
"errors"
diff --git a/services/keepstore/trash_worker_test.go b/services/keepstore/trash_worker_test.go
index 2b1ee2be1..4e20c3feb 100644
--- a/services/keepstore/trash_worker_test.go
+++ b/services/keepstore/trash_worker_test.go
@@ -2,7 +2,7 @@
//
// SPDX-License-Identifier: AGPL-3.0
-package main
+package keepstore
import (
"container/list"
diff --git a/services/keepstore/unix_volume.go b/services/keepstore/unix_volume.go
index 1706473cc..a74616604 100644
--- a/services/keepstore/unix_volume.go
+++ b/services/keepstore/unix_volume.go
@@ -2,7 +2,7 @@
//
// SPDX-License-Identifier: AGPL-3.0
-package main
+package keepstore
import (
"context"
diff --git a/services/keepstore/unix_volume_test.go b/services/keepstore/unix_volume_test.go
index 166085809..75d9b22de 100644
--- a/services/keepstore/unix_volume_test.go
+++ b/services/keepstore/unix_volume_test.go
@@ -2,7 +2,7 @@
//
// SPDX-License-Identifier: AGPL-3.0
-package main
+package keepstore
import (
"bytes"
diff --git a/services/keepstore/volume.go b/services/keepstore/volume.go
index cf0b7a390..c3b8cd628 100644
--- a/services/keepstore/volume.go
+++ b/services/keepstore/volume.go
@@ -2,7 +2,7 @@
//
// SPDX-License-Identifier: AGPL-3.0
-package main
+package keepstore
import (
"context"
diff --git a/services/keepstore/volume_generic_test.go b/services/keepstore/volume_generic_test.go
index a31b86123..0dd34e3af 100644
--- a/services/keepstore/volume_generic_test.go
+++ b/services/keepstore/volume_generic_test.go
@@ -2,7 +2,7 @@
//
// SPDX-License-Identifier: AGPL-3.0
-package main
+package keepstore
import (
"bytes"
diff --git a/services/keepstore/volume_test.go b/services/keepstore/volume_test.go
index cc2d21e5a..950b3989a 100644
--- a/services/keepstore/volume_test.go
+++ b/services/keepstore/volume_test.go
@@ -2,7 +2,7 @@
//
// SPDX-License-Identifier: AGPL-3.0
-package main
+package keepstore
import (
"bytes"
diff --git a/services/keepstore/work_queue.go b/services/keepstore/work_queue.go
index 56c6376ad..4c46ec8e6 100644
--- a/services/keepstore/work_queue.go
+++ b/services/keepstore/work_queue.go
@@ -2,7 +2,7 @@
//
// SPDX-License-Identifier: AGPL-3.0
-package main
+package keepstore
/* A WorkQueue is an asynchronous thread-safe queue manager. It
provides a channel from which items can be read off the queue, and
diff --git a/services/keepstore/work_queue_test.go b/services/keepstore/work_queue_test.go
index 8a26c090c..254f96cb2 100644
--- a/services/keepstore/work_queue_test.go
+++ b/services/keepstore/work_queue_test.go
@@ -2,7 +2,7 @@
//
// SPDX-License-Identifier: AGPL-3.0
-package main
+package keepstore
import (
"container/list"
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list