[ARVADOS] created: 2.1.0-2415-g86603190e

[Git user]

        at  86603190edbba4744ed60a3b3d7abe4d3a958090 (commit)


commit 86603190edbba4744ed60a3b3d7abe4d3a958090
Author: Tom Clegg <tom at curii.com>
Date:   Mon May 9 10:32:13 2022 -0400

    18947: Move arvados-health command 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 26705c066..377166242 100755
--- a/build/run-build-packages.sh
+++ b/build/run-build-packages.sh
@@ -254,7 +254,7 @@ package_go_binary cmd/arvados-server crunch-run "$FORMAT" "$ARCH" \
     "Supervise a single Crunch container"
 package_go_binary services/crunchstat crunchstat "$FORMAT" "$ARCH" \
     "Gather cpu/memory/network statistics of running Crunch jobs"
-package_go_binary services/health arvados-health "$FORMAT" "$ARCH" \
+package_go_binary cmd/arvados-server arvados-health "$FORMAT" "$ARCH" \
     "Check health of all Arvados cluster services"
 package_go_binary cmd/arvados-server keep-balance "$FORMAT" "$ARCH" \
     "Rebalance and garbage-collect data blocks stored in Arvados Keep"
diff --git a/services/health/arvados-health.service b/cmd/arvados-server/arvados-health.service
similarity index 92%
rename from services/health/arvados-health.service
rename to cmd/arvados-server/arvados-health.service
index 4b8745d15..cf246b0ee 100644
--- a/services/health/arvados-health.service
+++ b/cmd/arvados-server/arvados-health.service
@@ -12,7 +12,8 @@ AssertPathExists=/etc/arvados/config.yml
 StartLimitIntervalSec=0
 
 [Service]
-Type=simple
+Type=notify
+EnvironmentFile=-/etc/arvados/environment
 ExecStart=/usr/bin/arvados-health
 # Set a reasonable default for the open file limit
 LimitNOFILE=65536
diff --git a/cmd/arvados-server/cmd.go b/cmd/arvados-server/cmd.go
index c9a91c872..3324132b9 100644
--- a/cmd/arvados-server/cmd.go
+++ b/cmd/arvados-server/cmd.go
@@ -21,6 +21,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/sdk/go/health"
 	"git.arvados.org/arvados.git/services/githttpd"
 	keepbalance "git.arvados.org/arvados.git/services/keep-balance"
 	keepweb "git.arvados.org/arvados.git/services/keep-web"
@@ -45,6 +46,7 @@ var (
 		"dispatch-cloud":     dispatchcloud.Command,
 		"dispatch-lsf":       lsf.DispatchCommand,
 		"git-httpd":          githttpd.Command,
+		"health":             health.Command,
 		"install":            install.Command,
 		"init":               install.InitCommand,
 		"keep-balance":       keepbalance.Command,
diff --git a/sdk/go/health/aggregator.go b/sdk/go/health/aggregator.go
index 23d7e8d43..33a8a260e 100644
--- a/sdk/go/health/aggregator.go
+++ b/sdk/go/health/aggregator.go
@@ -14,10 +14,19 @@ import (
 	"sync"
 	"time"
 
+	"git.arvados.org/arvados.git/lib/cmd"
+	"git.arvados.org/arvados.git/lib/service"
 	"git.arvados.org/arvados.git/sdk/go/arvados"
 	"git.arvados.org/arvados.git/sdk/go/auth"
+	"github.com/prometheus/client_golang/prometheus"
 )
 
+var Command cmd.Handler = service.Command(arvados.ServiceNameHealth, newHandler)
+
+func newHandler(ctx context.Context, cluster *arvados.Cluster, _ string, _ *prometheus.Registry) service.Handler {
+	return &Aggregator{Cluster: cluster}
+}
+
 const defaultTimeout = arvados.Duration(2 * time.Second)
 
 // Aggregator implements http.Handler. It handles "GET /_health/all"
diff --git a/services/health/main.go b/services/health/main.go
deleted file mode 100644
index bc57d36d0..000000000
--- a/services/health/main.go
+++ /dev/null
@@ -1,29 +0,0 @@
-// Copyright (C) The Arvados Authors. All rights reserved.
-//
-// SPDX-License-Identifier: AGPL-3.0
-
-package main
-
-import (
-	"context"
-	"os"
-
-	"git.arvados.org/arvados.git/lib/cmd"
-	"git.arvados.org/arvados.git/lib/service"
-	"git.arvados.org/arvados.git/sdk/go/arvados"
-	"git.arvados.org/arvados.git/sdk/go/health"
-	"github.com/prometheus/client_golang/prometheus"
-)
-
-var (
-	version             = "dev"
-	command cmd.Handler = service.Command(arvados.ServiceNameHealth, newHandler)
-)
-
-func newHandler(ctx context.Context, cluster *arvados.Cluster, _ string, _ *prometheus.Registry) service.Handler {
-	return &health.Aggregator{Cluster: cluster}
-}
-
-func main() {
-	os.Exit(command.RunCommand(os.Args[0], os.Args[1:], os.Stdin, os.Stdout, os.Stderr))
-}

-----------------------------------------------------------------------


hooks/post-receive
--