aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOla Aunronning <olaa@yahooinc.com>2023-08-31 14:58:19 +0200
committerOla Aunronning <olaa@yahooinc.com>2023-08-31 14:58:19 +0200
commit97ff76000328e6ac016d6b7022bc738eeadb7807 (patch)
tree451ecd7cfe866962a39e96935e738e293b554417
parent3c0574dacee144660f87685b86344d9b0292e6b3 (diff)
Add SystemCtlReload
-rw-r--r--node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/task/util/systemd/SystemCtl.java11
-rw-r--r--node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/task/util/systemd/SystemCtlTester.java5
2 files changed, 16 insertions, 0 deletions
diff --git a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/task/util/systemd/SystemCtl.java b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/task/util/systemd/SystemCtl.java
index 9662d4184df..4acdb51ee16 100644
--- a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/task/util/systemd/SystemCtl.java
+++ b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/task/util/systemd/SystemCtl.java
@@ -64,6 +64,7 @@ public class SystemCtl {
public SystemCtlStart start(String unit) { return new SystemCtlStart(unit); }
public SystemCtlStop stop(String unit) { return new SystemCtlStop(unit); }
public SystemCtlRestart restart(String unit) { return new SystemCtlRestart(unit); }
+ public SystemCtlReload reload(String unit) { return new SystemCtlReload(unit); }
public boolean serviceExists(TaskContext context, String unit) {
return newCommandLine(context)
@@ -155,6 +156,16 @@ public class SystemCtl {
}
}
+ public class SystemCtlReload extends SystemCtlCommand {
+ private SystemCtlReload(String unit) {
+ super("reload", unit);
+ }
+
+ protected boolean isAlreadyConverged(TaskContext context) {
+ return false;
+ }
+ }
+
public abstract class SystemCtlCommand {
private final String command;
diff --git a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/task/util/systemd/SystemCtlTester.java b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/task/util/systemd/SystemCtlTester.java
index 396a4f9f51f..21f060461af 100644
--- a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/task/util/systemd/SystemCtlTester.java
+++ b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/task/util/systemd/SystemCtlTester.java
@@ -40,6 +40,11 @@ public class SystemCtlTester extends SystemCtl {
return this;
}
+ public SystemCtlTester expectReload(String unit) {
+ expectCommand("systemctl reload " + unit + " 2>&1", 0, "");
+ return this;
+ }
+
public SystemCtlTester expectDaemonReload() {
expectCommand("systemctl daemon-reload 2>&1", 0, "");
return this;