[arvados] created: 2.5.0-365-gb537db457
git repository hosting
git at public.arvados.org
Fri Apr 7 18:24:53 UTC 2023
at b537db457927b84dd18de604d916493a7f3a1397 (commit)
commit b537db457927b84dd18de604d916493a7f3a1397
Author: Tom Clegg <tom at curii.com>
Date: Fri Apr 7 14:22:38 2023 -0400
Move sdk/go/health to lib/health.
Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom at curii.com>
diff --git a/build/run-tests.sh b/build/run-tests.sh
index f4372c79a..ca9c0dcff 100755
--- a/build/run-tests.sh
+++ b/build/run-tests.sh
@@ -90,6 +90,7 @@ lib/dispatchcloud/container
lib/dispatchcloud/scheduler
lib/dispatchcloud/sshexecutor
lib/dispatchcloud/worker
+lib/health
lib/mount
lib/pam
lib/service
@@ -116,7 +117,6 @@ sdk/go/arvados
sdk/go/arvadosclient
sdk/go/auth
sdk/go/keepclient
-sdk/go/health
sdk/go/httpserver
sdk/go/manifest
sdk/go/blockdigest
diff --git a/cmd/arvados-server/cmd.go b/cmd/arvados-server/cmd.go
index 438ca206d..16def0747 100644
--- a/cmd/arvados-server/cmd.go
+++ b/cmd/arvados-server/cmd.go
@@ -22,12 +22,12 @@ import (
"git.arvados.org/arvados.git/lib/controller"
"git.arvados.org/arvados.git/lib/crunchrun"
"git.arvados.org/arvados.git/lib/dispatchcloud"
+ "git.arvados.org/arvados.git/lib/health"
"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/lib/service"
"git.arvados.org/arvados.git/sdk/go/arvados"
- "git.arvados.org/arvados.git/sdk/go/health"
dispatchslurm "git.arvados.org/arvados.git/services/crunch-dispatch-slurm"
"git.arvados.org/arvados.git/services/githttpd"
keepbalance "git.arvados.org/arvados.git/services/keep-balance"
diff --git a/lib/boot/supervisor.go b/lib/boot/supervisor.go
index 0f0600f18..2bbcb6fab 100644
--- a/lib/boot/supervisor.go
+++ b/lib/boot/supervisor.go
@@ -28,10 +28,10 @@ import (
"time"
"git.arvados.org/arvados.git/lib/config"
+ "git.arvados.org/arvados.git/lib/health"
"git.arvados.org/arvados.git/lib/service"
"git.arvados.org/arvados.git/sdk/go/arvados"
"git.arvados.org/arvados.git/sdk/go/ctxlog"
- "git.arvados.org/arvados.git/sdk/go/health"
"github.com/fsnotify/fsnotify"
"github.com/sirupsen/logrus"
)
diff --git a/lib/controller/federation/conn.go b/lib/controller/federation/conn.go
index 268b9eefb..5ff892496 100644
--- a/lib/controller/federation/conn.go
+++ b/lib/controller/federation/conn.go
@@ -19,10 +19,10 @@ import (
"git.arvados.org/arvados.git/lib/config"
"git.arvados.org/arvados.git/lib/controller/localdb"
"git.arvados.org/arvados.git/lib/controller/rpc"
+ "git.arvados.org/arvados.git/lib/health"
"git.arvados.org/arvados.git/sdk/go/arvados"
"git.arvados.org/arvados.git/sdk/go/auth"
"git.arvados.org/arvados.git/sdk/go/ctxlog"
- "git.arvados.org/arvados.git/sdk/go/health"
"github.com/jmoiron/sqlx"
)
diff --git a/lib/controller/handler.go b/lib/controller/handler.go
index 7b7378ac5..6ce778418 100644
--- a/lib/controller/handler.go
+++ b/lib/controller/handler.go
@@ -24,9 +24,9 @@ import (
"git.arvados.org/arvados.git/lib/controller/railsproxy"
"git.arvados.org/arvados.git/lib/controller/router"
"git.arvados.org/arvados.git/lib/ctrlctx"
+ "git.arvados.org/arvados.git/lib/health"
"git.arvados.org/arvados.git/sdk/go/arvados"
"git.arvados.org/arvados.git/sdk/go/ctxlog"
- "git.arvados.org/arvados.git/sdk/go/health"
"git.arvados.org/arvados.git/sdk/go/httpserver"
// sqlx needs lib/pq to talk to PostgreSQL
diff --git a/lib/diagnostics/cmd.go b/lib/diagnostics/cmd.go
index 8d89b84d3..f14bf6981 100644
--- a/lib/diagnostics/cmd.go
+++ b/lib/diagnostics/cmd.go
@@ -22,9 +22,9 @@ import (
"git.arvados.org/arvados.git/lib/cmd"
"git.arvados.org/arvados.git/lib/config"
+ "git.arvados.org/arvados.git/lib/health"
"git.arvados.org/arvados.git/sdk/go/arvados"
"git.arvados.org/arvados.git/sdk/go/ctxlog"
- "git.arvados.org/arvados.git/sdk/go/health"
"github.com/sirupsen/logrus"
)
diff --git a/lib/dispatchcloud/dispatcher.go b/lib/dispatchcloud/dispatcher.go
index 06a558d5f..9d7072338 100644
--- a/lib/dispatchcloud/dispatcher.go
+++ b/lib/dispatchcloud/dispatcher.go
@@ -21,10 +21,10 @@ import (
"git.arvados.org/arvados.git/lib/dispatchcloud/scheduler"
"git.arvados.org/arvados.git/lib/dispatchcloud/sshexecutor"
"git.arvados.org/arvados.git/lib/dispatchcloud/worker"
+ "git.arvados.org/arvados.git/lib/health"
"git.arvados.org/arvados.git/sdk/go/arvados"
"git.arvados.org/arvados.git/sdk/go/auth"
"git.arvados.org/arvados.git/sdk/go/ctxlog"
- "git.arvados.org/arvados.git/sdk/go/health"
"git.arvados.org/arvados.git/sdk/go/httpserver"
"github.com/julienschmidt/httprouter"
"github.com/prometheus/client_golang/prometheus"
diff --git a/sdk/go/health/aggregator.go b/lib/health/aggregator.go
similarity index 99%
rename from sdk/go/health/aggregator.go
rename to lib/health/aggregator.go
index 3bf37b129..af2023066 100644
--- a/sdk/go/health/aggregator.go
+++ b/lib/health/aggregator.go
@@ -1,6 +1,6 @@
// Copyright (C) The Arvados Authors. All rights reserved.
//
-// SPDX-License-Identifier: Apache-2.0
+// SPDX-License-Identifier: AGPL-3.0
package health
diff --git a/sdk/go/health/aggregator_test.go b/lib/health/aggregator_test.go
similarity index 99%
rename from sdk/go/health/aggregator_test.go
rename to lib/health/aggregator_test.go
index f76f7b8ea..fc617e217 100644
--- a/sdk/go/health/aggregator_test.go
+++ b/lib/health/aggregator_test.go
@@ -1,6 +1,6 @@
// Copyright (C) The Arvados Authors. All rights reserved.
//
-// SPDX-License-Identifier: Apache-2.0
+// SPDX-License-Identifier: AGPL-3.0
package health
diff --git a/sdk/go/health/handler.go b/lib/health/handler.go
similarity index 98%
rename from sdk/go/health/handler.go
rename to lib/health/handler.go
index 81b9587c3..adadbeacb 100644
--- a/sdk/go/health/handler.go
+++ b/lib/health/handler.go
@@ -1,6 +1,6 @@
// Copyright (C) The Arvados Authors. All rights reserved.
//
-// SPDX-License-Identifier: Apache-2.0
+// SPDX-License-Identifier: AGPL-3.0
package health
diff --git a/sdk/go/health/handler_test.go b/lib/health/handler_test.go
similarity index 98%
rename from sdk/go/health/handler_test.go
rename to lib/health/handler_test.go
index 097e292d3..bf679272a 100644
--- a/sdk/go/health/handler_test.go
+++ b/lib/health/handler_test.go
@@ -1,6 +1,6 @@
// Copyright (C) The Arvados Authors. All rights reserved.
//
-// SPDX-License-Identifier: Apache-2.0
+// SPDX-License-Identifier: AGPL-3.0
package health
diff --git a/lib/lsf/dispatch.go b/lib/lsf/dispatch.go
index cf2b25a9b..d01fef070 100644
--- a/lib/lsf/dispatch.go
+++ b/lib/lsf/dispatch.go
@@ -22,12 +22,12 @@ import (
"git.arvados.org/arvados.git/lib/ctrlctx"
"git.arvados.org/arvados.git/lib/dispatch"
"git.arvados.org/arvados.git/lib/dispatchcloud"
+ "git.arvados.org/arvados.git/lib/health"
"git.arvados.org/arvados.git/lib/service"
"git.arvados.org/arvados.git/sdk/go/arvados"
"git.arvados.org/arvados.git/sdk/go/arvadosclient"
"git.arvados.org/arvados.git/sdk/go/auth"
"git.arvados.org/arvados.git/sdk/go/ctxlog"
- "git.arvados.org/arvados.git/sdk/go/health"
"github.com/julienschmidt/httprouter"
"github.com/prometheus/client_golang/prometheus"
"github.com/prometheus/client_golang/prometheus/promhttp"
diff --git a/lib/service/cmd.go b/lib/service/cmd.go
index 20441c2a6..205d03fd2 100644
--- a/lib/service/cmd.go
+++ b/lib/service/cmd.go
@@ -19,9 +19,9 @@ import (
"git.arvados.org/arvados.git/lib/cmd"
"git.arvados.org/arvados.git/lib/config"
+ "git.arvados.org/arvados.git/lib/health"
"git.arvados.org/arvados.git/sdk/go/arvados"
"git.arvados.org/arvados.git/sdk/go/ctxlog"
- "git.arvados.org/arvados.git/sdk/go/health"
"git.arvados.org/arvados.git/sdk/go/httpserver"
"github.com/coreos/go-systemd/daemon"
"github.com/julienschmidt/httprouter"
diff --git a/services/keep-balance/main.go b/services/keep-balance/main.go
index 6bc998958..223f6f55a 100644
--- a/services/keep-balance/main.go
+++ b/services/keep-balance/main.go
@@ -14,10 +14,10 @@ import (
"git.arvados.org/arvados.git/lib/cmd"
"git.arvados.org/arvados.git/lib/config"
+ "git.arvados.org/arvados.git/lib/health"
"git.arvados.org/arvados.git/lib/service"
"git.arvados.org/arvados.git/sdk/go/arvados"
"git.arvados.org/arvados.git/sdk/go/ctxlog"
- "git.arvados.org/arvados.git/sdk/go/health"
"github.com/jmoiron/sqlx"
_ "github.com/lib/pq"
"github.com/prometheus/client_golang/prometheus"
diff --git a/services/keepproxy/keepproxy.go b/services/keepproxy/keepproxy.go
index f857ed3e4..29174971f 100644
--- a/services/keepproxy/keepproxy.go
+++ b/services/keepproxy/keepproxy.go
@@ -16,11 +16,11 @@ import (
"strings"
"time"
+ "git.arvados.org/arvados.git/lib/health"
"git.arvados.org/arvados.git/lib/service"
"git.arvados.org/arvados.git/sdk/go/arvados"
"git.arvados.org/arvados.git/sdk/go/arvadosclient"
"git.arvados.org/arvados.git/sdk/go/ctxlog"
- "git.arvados.org/arvados.git/sdk/go/health"
"git.arvados.org/arvados.git/sdk/go/httpserver"
"git.arvados.org/arvados.git/sdk/go/keepclient"
"github.com/gorilla/mux"
diff --git a/services/keepstore/handlers.go b/services/keepstore/handlers.go
index 63a23687e..8e51487d8 100644
--- a/services/keepstore/handlers.go
+++ b/services/keepstore/handlers.go
@@ -22,9 +22,9 @@ import (
"time"
"git.arvados.org/arvados.git/lib/cmd"
+ "git.arvados.org/arvados.git/lib/health"
"git.arvados.org/arvados.git/sdk/go/arvados"
"git.arvados.org/arvados.git/sdk/go/ctxlog"
- "git.arvados.org/arvados.git/sdk/go/health"
"git.arvados.org/arvados.git/sdk/go/httpserver"
"github.com/gorilla/mux"
"github.com/prometheus/client_golang/prometheus"
diff --git a/services/ws/router.go b/services/ws/router.go
index 878c282f8..2a53cc9b0 100644
--- a/services/ws/router.go
+++ b/services/ws/router.go
@@ -11,9 +11,9 @@ import (
"sync/atomic"
"time"
+ "git.arvados.org/arvados.git/lib/health"
"git.arvados.org/arvados.git/sdk/go/arvados"
"git.arvados.org/arvados.git/sdk/go/ctxlog"
- "git.arvados.org/arvados.git/sdk/go/health"
"github.com/prometheus/client_golang/prometheus"
"github.com/sirupsen/logrus"
"golang.org/x/net/websocket"
commit 9dc065449941884c1df40c6325f9de2d4556db79
Author: Tom Clegg <tom at curii.com>
Date: Fri Apr 7 14:17:04 2023 -0400
Move sdk/go/dispatch to lib/dispatch.
Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom at curii.com>
diff --git a/build/run-tests.sh b/build/run-tests.sh
index a5c727758..f4372c79a 100755
--- a/build/run-tests.sh
+++ b/build/run-tests.sh
@@ -84,6 +84,7 @@ lib/crunch-run
lib/cloud
lib/cloud/azure
lib/cloud/cloudtest
+lib/dispatch
lib/dispatchcloud
lib/dispatchcloud/container
lib/dispatchcloud/scheduler
@@ -114,7 +115,6 @@ sdk/ruby
sdk/go/arvados
sdk/go/arvadosclient
sdk/go/auth
-sdk/go/dispatch
sdk/go/keepclient
sdk/go/health
sdk/go/httpserver
diff --git a/sdk/go/dispatch/dispatch.go b/lib/dispatch/dispatch.go
similarity index 99%
rename from sdk/go/dispatch/dispatch.go
rename to lib/dispatch/dispatch.go
index d34ea68d7..367f87765 100644
--- a/sdk/go/dispatch/dispatch.go
+++ b/lib/dispatch/dispatch.go
@@ -1,6 +1,6 @@
// Copyright (C) The Arvados Authors. All rights reserved.
//
-// SPDX-License-Identifier: Apache-2.0
+// SPDX-License-Identifier: AGPL-3.0
// Package dispatch is a helper library for building Arvados container
// dispatchers.
diff --git a/sdk/go/dispatch/dispatch_test.go b/lib/dispatch/dispatch_test.go
similarity index 95%
rename from sdk/go/dispatch/dispatch_test.go
rename to lib/dispatch/dispatch_test.go
index 2a9d84639..854c2ba47 100644
--- a/sdk/go/dispatch/dispatch_test.go
+++ b/lib/dispatch/dispatch_test.go
@@ -1,6 +1,6 @@
// Copyright (C) The Arvados Authors. All rights reserved.
//
-// SPDX-License-Identifier: Apache-2.0
+// SPDX-License-Identifier: AGPL-3.0
package dispatch
diff --git a/sdk/go/dispatch/throttle.go b/lib/dispatch/throttle.go
similarity index 96%
rename from sdk/go/dispatch/throttle.go
rename to lib/dispatch/throttle.go
index fada6ffb3..14ad34ed4 100644
--- a/sdk/go/dispatch/throttle.go
+++ b/lib/dispatch/throttle.go
@@ -1,6 +1,6 @@
// Copyright (C) The Arvados Authors. All rights reserved.
//
-// SPDX-License-Identifier: Apache-2.0
+// SPDX-License-Identifier: AGPL-3.0
package dispatch
diff --git a/sdk/go/dispatch/throttle_test.go b/lib/dispatch/throttle_test.go
similarity index 96%
rename from sdk/go/dispatch/throttle_test.go
rename to lib/dispatch/throttle_test.go
index d12659645..966b2a825 100644
--- a/sdk/go/dispatch/throttle_test.go
+++ b/lib/dispatch/throttle_test.go
@@ -1,6 +1,6 @@
// Copyright (C) The Arvados Authors. All rights reserved.
//
-// SPDX-License-Identifier: Apache-2.0
+// SPDX-License-Identifier: AGPL-3.0
package dispatch
diff --git a/lib/lsf/dispatch.go b/lib/lsf/dispatch.go
index d1408d23c..cf2b25a9b 100644
--- a/lib/lsf/dispatch.go
+++ b/lib/lsf/dispatch.go
@@ -20,13 +20,13 @@ import (
"git.arvados.org/arvados.git/lib/cmd"
"git.arvados.org/arvados.git/lib/controller/dblock"
"git.arvados.org/arvados.git/lib/ctrlctx"
+ "git.arvados.org/arvados.git/lib/dispatch"
"git.arvados.org/arvados.git/lib/dispatchcloud"
"git.arvados.org/arvados.git/lib/service"
"git.arvados.org/arvados.git/sdk/go/arvados"
"git.arvados.org/arvados.git/sdk/go/arvadosclient"
"git.arvados.org/arvados.git/sdk/go/auth"
"git.arvados.org/arvados.git/sdk/go/ctxlog"
- "git.arvados.org/arvados.git/sdk/go/dispatch"
"git.arvados.org/arvados.git/sdk/go/health"
"github.com/julienschmidt/httprouter"
"github.com/prometheus/client_golang/prometheus"
diff --git a/services/api/db/migrate/20180820132617_add_lock_index_to_containers.rb b/services/api/db/migrate/20180820132617_add_lock_index_to_containers.rb
index 6d2261889..93f46f3bb 100644
--- a/services/api/db/migrate/20180820132617_add_lock_index_to_containers.rb
+++ b/services/api/db/migrate/20180820132617_add_lock_index_to_containers.rb
@@ -4,7 +4,7 @@
class AddLockIndexToContainers < ActiveRecord::Migration[4.2]
def change
- # For the current code in sdk/go/dispatch:
+ # For the current code in lib/dispatch:
add_index :containers, [:locked_by_uuid, :priority]
# For future dispatchers that use filters instead of offset for
# more predictable paging:
diff --git a/services/crunch-dispatch-local/crunch-dispatch-local.go b/services/crunch-dispatch-local/crunch-dispatch-local.go
index e45598189..b5804ff58 100644
--- a/services/crunch-dispatch-local/crunch-dispatch-local.go
+++ b/services/crunch-dispatch-local/crunch-dispatch-local.go
@@ -19,9 +19,9 @@ import (
"git.arvados.org/arvados.git/lib/cmd"
"git.arvados.org/arvados.git/lib/config"
+ "git.arvados.org/arvados.git/lib/dispatch"
"git.arvados.org/arvados.git/sdk/go/arvados"
"git.arvados.org/arvados.git/sdk/go/arvadosclient"
- "git.arvados.org/arvados.git/sdk/go/dispatch"
"github.com/sirupsen/logrus"
)
diff --git a/services/crunch-dispatch-local/crunch-dispatch-local_test.go b/services/crunch-dispatch-local/crunch-dispatch-local_test.go
index e5ce5c66c..a38a73a97 100644
--- a/services/crunch-dispatch-local/crunch-dispatch-local_test.go
+++ b/services/crunch-dispatch-local/crunch-dispatch-local_test.go
@@ -16,11 +16,11 @@ import (
"testing"
"time"
+ "git.arvados.org/arvados.git/lib/dispatch"
"git.arvados.org/arvados.git/sdk/go/arvados"
"git.arvados.org/arvados.git/sdk/go/arvadosclient"
"git.arvados.org/arvados.git/sdk/go/arvadostest"
"git.arvados.org/arvados.git/sdk/go/ctxlog"
- "git.arvados.org/arvados.git/sdk/go/dispatch"
. "gopkg.in/check.v1"
)
diff --git a/services/crunch-dispatch-slurm/crunch-dispatch-slurm.go b/services/crunch-dispatch-slurm/crunch-dispatch-slurm.go
index 1c0f6ad28..e52631683 100644
--- a/services/crunch-dispatch-slurm/crunch-dispatch-slurm.go
+++ b/services/crunch-dispatch-slurm/crunch-dispatch-slurm.go
@@ -21,12 +21,12 @@ import (
"git.arvados.org/arvados.git/lib/cmd"
"git.arvados.org/arvados.git/lib/controller/dblock"
"git.arvados.org/arvados.git/lib/ctrlctx"
+ "git.arvados.org/arvados.git/lib/dispatch"
"git.arvados.org/arvados.git/lib/dispatchcloud"
"git.arvados.org/arvados.git/lib/service"
"git.arvados.org/arvados.git/sdk/go/arvados"
"git.arvados.org/arvados.git/sdk/go/arvadosclient"
"git.arvados.org/arvados.git/sdk/go/ctxlog"
- "git.arvados.org/arvados.git/sdk/go/dispatch"
"github.com/coreos/go-systemd/daemon"
"github.com/prometheus/client_golang/prometheus"
"github.com/sirupsen/logrus"
diff --git a/services/crunch-dispatch-slurm/crunch-dispatch-slurm_test.go b/services/crunch-dispatch-slurm/crunch-dispatch-slurm_test.go
index fb433e65c..163543077 100644
--- a/services/crunch-dispatch-slurm/crunch-dispatch-slurm_test.go
+++ b/services/crunch-dispatch-slurm/crunch-dispatch-slurm_test.go
@@ -22,12 +22,12 @@ import (
"git.arvados.org/arvados.git/lib/cmd"
"git.arvados.org/arvados.git/lib/config"
+ "git.arvados.org/arvados.git/lib/dispatch"
"git.arvados.org/arvados.git/lib/dispatchcloud"
"git.arvados.org/arvados.git/sdk/go/arvados"
"git.arvados.org/arvados.git/sdk/go/arvadosclient"
"git.arvados.org/arvados.git/sdk/go/arvadostest"
"git.arvados.org/arvados.git/sdk/go/ctxlog"
- "git.arvados.org/arvados.git/sdk/go/dispatch"
"github.com/sirupsen/logrus"
. "gopkg.in/check.v1"
)
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list