[ARVADOS] updated: 2.1.0-2400-gd70eee229

[Git user]

Summary of changes:
 build/run-build-packages.sh                                        | 2 +-
 {services/keep-balance => cmd/arvados-server}/keep-balance.service | 4 +++-
 lib/boot/supervisor.go                                             | 2 +-
 3 files changed, 5 insertions(+), 3 deletions(-)
 rename {services/keep-balance => cmd/arvados-server}/keep-balance.service (87%)

       via  d70eee2298afe8d082c72429a919bd94523c6bde (commit)
       via  4e8c19d6601b406b5624ffd152fa29385794192f (commit)
       via  f8f076dd5576da6e1ad09be10f1e2a59554e388c (commit)
      from  68200af27ac67509f15fea09459ff1f0d1b703f6 (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 d70eee2298afe8d082c72429a919bd94523c6bde
Author: Tom Clegg <tom at curii.com>
Date:   Mon May 2 15:18:51 2022 -0400

    18947: Update keep-balance package script.
    
    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 adcbab8a0..26705c066 100755
--- a/build/run-build-packages.sh
+++ b/build/run-build-packages.sh
@@ -256,7 +256,7 @@ 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" \
     "Check health of all Arvados cluster services"
-package_go_binary services/keep-balance keep-balance "$FORMAT" "$ARCH" \
+package_go_binary cmd/arvados-server keep-balance "$FORMAT" "$ARCH" \
     "Rebalance and garbage-collect data blocks stored in Arvados Keep"
 package_go_binary cmd/arvados-server keepproxy "$FORMAT" "$ARCH" \
     "Make a Keep cluster accessible to clients that are not on the LAN"

commit 4e8c19d6601b406b5624ffd152fa29385794192f
Author: Tom Clegg <tom at curii.com>
Date:   Mon May 2 15:18:10 2022 -0400

    18947: Update boot recipe for keep-balance.
    
    Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom at curii.com>

diff --git a/lib/boot/supervisor.go b/lib/boot/supervisor.go
index 143529487..a5d61b4a1 100644
--- a/lib/boot/supervisor.go
+++ b/lib/boot/supervisor.go
@@ -388,7 +388,7 @@ func (super *Supervisor) runCluster() error {
 	if super.ClusterType != "test" {
 		tasks = append(tasks,
 			runServiceCommand{name: "dispatch-cloud", svc: super.cluster.Services.DispatchCloud},
-			runGoProgram{src: "services/keep-balance", svc: super.cluster.Services.Keepbalance},
+			runServiceCommand{name: "keep-balance", svc: super.cluster.Services.Keepbalance},
 		)
 	}
 	super.tasksReady = map[string]chan bool{}

commit f8f076dd5576da6e1ad09be10f1e2a59554e388c
Author: Tom Clegg <tom at curii.com>
Date:   Mon May 2 15:17:18 2022 -0400

    18947: Move keep-balance systemd unit file.
    
    Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom at curii.com>

diff --git a/services/keep-balance/keep-balance.service b/cmd/arvados-server/keep-balance.service
similarity index 87%
rename from services/keep-balance/keep-balance.service
rename to cmd/arvados-server/keep-balance.service
index 859d70724..1c5808288 100644
--- a/services/keep-balance/keep-balance.service
+++ b/cmd/arvados-server/keep-balance.service
@@ -6,12 +6,14 @@
 Description=Arvados Keep Balance
 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
 
 [Service]
-Type=simple
+Type=notify
+EnvironmentFile=-/etc/arvados/environment
 ExecStart=/usr/bin/keep-balance -commit-pulls -commit-trash
 # Set a reasonable default for the open file limit
 LimitNOFILE=65536

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


hooks/post-receive
--