ResetFailed and ResetFailedUnit

This PR will add bluechi the ability to reset failed all units or reset one failed unit. Solves: #932 Signed-off-by: Artiom Divak <[email protected]>
eclipse-bluechi · Sep 3, 2024 · 1a0192a · 1a0192a
1 parent a890cbb
commit 1a0192a
Show file tree

Hide file tree

Showing 9 changed files with 130 additions and 18 deletions.
diff --git a/data/org.eclipse.bluechi.Node.xml b/data/org.eclipse.bluechi.Node.xml
@@ -226,6 +226,22 @@
  <arg name="level" type="s" direction="in" />
  </method>
 
+ <!--
+ ResetFailed:
+ Reset all the failed units on the node
+ -->
+ <method name="ResetFailed" />
+
+ <!--
+ ResetFailedUnit:
+ Reset the failed state of a specific unit on the node.
+ @name Name of the unit to reset the failed state for.
+ 
+ -->
+ <method name="ResetFailedUnit">
+ <arg name="name" type="s" direction="in" />
+ </method>
+
 
  <!--
  Name:

diff --git a/data/org.eclipse.bluechi.internal.Agent.xml b/data/org.eclipse.bluechi.internal.Agent.xml
@@ -81,6 +81,10 @@
  <method name="SetLogLevel">
  <arg name="level" type="s" direction="in" />
  </method>
+ <method name="ResetFailed" />
+ <method name="ResetFailedUnit">
+ <arg name="name" type="s" direction="in" />
+ </method>
 
  <signal name="JobDone">
  <arg name="id" type="u" />

diff --git a/src/agent/agent.c b/src/agent/agent.c
@@ -1799,6 +1799,8 @@ static const sd_bus_vtable internal_agent_vtable[] = {
  SD_BUS_METHOD("EnableUnitFiles", "asbb", "ba(sss)", agent_method_passthrough_to_systemd, 0),
  SD_BUS_METHOD("DisableUnitFiles", "asb", "a(sss)", agent_method_passthrough_to_systemd, 0),
  SD_BUS_METHOD("Reload", "", "", agent_method_passthrough_to_systemd, 0),
+ SD_BUS_METHOD("ResetFailed", "", "", agent_method_passthrough_to_systemd, 0),
+ SD_BUS_METHOD("ResetFailedUnit", "s", "", agent_method_passthrough_to_systemd, 0),
  SD_BUS_VTABLE_END
 };
 

diff --git a/src/bindings/python/bluechi/api.py b/src/bindings/python/bluechi/api.py
@@ -963,6 +963,23 @@ def reload_unit(self, name: str, mode: str) -> ObjPath:
  mode,
  )
 
+ def reset_failed(self) -> None:
+ """
+ ResetFailed:
+ Reset all the failed units on the node
+ """
+ self.get_proxy().ResetFailed()
+
+ def reset_failed_unit(self, name: str) -> None:
+ """
+ ResetFailedUnit:
+ Reset the failed state of a specific unit on the node.
+ @name Name of the unit to reset the failed state for.
+ """
+ self.get_proxy().ResetFailedUnit(
+ name,
+ )
+
  def restart_unit(self, name: str, mode: str) -> ObjPath:
  """
  RestartUnit:

diff --git a/src/client/main.c b/src/client/main.c
@@ -34,24 +34,26 @@ int method_version(UNUSED Command *command, UNUSED void *userdata) {
 }
 
 const Method methods[] = {
- { "help", 0, 0, OPT_NONE, method_help, usage_bluechi },
- { "list-unit-files", 0, 1, OPT_FILTER, method_list_unit_files, usage_bluechi },
- { "list-units", 0, 1, OPT_FILTER, method_list_units, usage_bluechi },
- { "start", 2, 2, OPT_NONE, method_start, usage_bluechi },
- { "stop", 2, 2, OPT_NONE, method_stop, usage_bluechi },
- { "freeze", 2, 2, OPT_NONE, method_freeze, usage_bluechi },
- { "thaw", 2, 2, OPT_NONE, method_thaw, usage_bluechi },
- { "restart", 2, 2, OPT_NONE, method_restart, usage_bluechi },
- { "reload", 2, 2, OPT_NONE, method_reload, usage_bluechi },
- { "monitor", 0, 2, OPT_NONE, method_monitor, usage_bluechi },
- { "metrics", 1, 1, OPT_NONE, method_metrics, usage_bluechi },
- { "enable", 2, ARG_ANY, OPT_FORCE | OPT_RUNTIME | OPT_NO_RELOAD, method_enable, usage_bluechi },
- { "disable", 2, ARG_ANY, OPT_NO_RELOAD, method_disable, usage_bluechi },
- { "daemon-reload", 1, 1, OPT_NONE, method_daemon_reload, usage_bluechi },
- { "status", 0, ARG_ANY, OPT_WATCH, method_status, usage_bluechi },
- { "set-loglevel", 1, 2, OPT_NONE, method_set_loglevel, usage_bluechi },
- { "version", 0, 0, OPT_NONE, method_version, usage_bluechi },
- { NULL, 0, 0, 0, NULL, NULL }
+ { "help", 0, 0, OPT_NONE, method_help, usage_bluechi },
+ { "list-unit-files", 0, 1, OPT_FILTER, method_list_unit_files, usage_bluechi },
+ { "list-units", 0, 1, OPT_FILTER, method_list_units, usage_bluechi },
+ { "start", 2, 2, OPT_NONE, method_start, usage_bluechi },
+ { "stop", 2, 2, OPT_NONE, method_stop, usage_bluechi },
+ { "freeze", 2, 2, OPT_NONE, method_freeze, usage_bluechi },
+ { "thaw", 2, 2, OPT_NONE, method_thaw, usage_bluechi },
+ { "restart", 2, 2, OPT_NONE, method_restart, usage_bluechi },
+ { "reload", 2, 2, OPT_NONE, method_reload, usage_bluechi },
+ { "reset-failed", 1, 1, OPT_NONE, method_reset_failed, usage_bluechi },
+ { "reset-failed-unit", 2, 2, OPT_NONE, method_reset_failed_unit, usage_bluechi },
+ { "monitor", 0, 2, OPT_NONE, method_monitor, usage_bluechi },
+ { "metrics", 1, 1, OPT_NONE, method_metrics, usage_bluechi },
+ { "enable", 2, ARG_ANY, OPT_FORCE | OPT_RUNTIME | OPT_NO_RELOAD, method_enable, usage_bluechi },
+ { "disable", 2, ARG_ANY, OPT_NO_RELOAD, method_disable, usage_bluechi },
+ { "daemon-reload", 1, 1, OPT_NONE, method_daemon_reload, usage_bluechi },
+ { "status", 0, ARG_ANY, OPT_WATCH, method_status, usage_bluechi },
+ { "set-loglevel", 1, 2, OPT_NONE, method_set_loglevel, usage_bluechi },
+ { "version", 0, 0, OPT_NONE, method_version, usage_bluechi },
+ { NULL, 0, 0, 0, NULL, NULL }
 };
 
 const OptionType option_types[] = {

diff --git a/src/client/method-help.c b/src/client/method-help.c
@@ -28,6 +28,10 @@ void usage_bluechi() {
  printf(" usage: reload nodename unitname\n");
  printf(" - restart: restarts a specific systemd service (or timer, or slice) on a specific node\n");
  printf(" usage: restart nodename unitname\n");
+ printf(" - reset-failed: reset all failed units on a node\n");
+ printf(" usage: reset-failed nodename\n");
+ printf(" - reset-failed-unit: reset a failed unit on a node\n");
+ printf(" usage: reset-failed nodename\n");
  printf(" - enable: enables the specified systemd files on a specific node\n");
  printf(" usage: enable nodename unitfilename...\n");
  printf(" - disable: disables the specified systemd files on a specific node\n");

diff --git a/src/client/method-unit-actions.c b/src/client/method-unit-actions.c
@@ -248,6 +248,61 @@ static int method_daemon_reload_on(Client *client, char *node_name) {
  return 0;
 }
 
+static int method_reset_failed_on(Client *client, char *node_name) {
+ int r = 0;
+ _cleanup_sd_bus_error_ sd_bus_error error = SD_BUS_ERROR_NULL;
+ _cleanup_sd_bus_message_ sd_bus_message *result = NULL;
+
+ r = assemble_object_path_string(NODE_OBJECT_PATH_PREFIX, node_name, &client->object_path);
+ if (r < 0) {
+ return r;
+ }
+
+ r = sd_bus_call_method(
+ client->api_bus,
+ BC_INTERFACE_BASE_NAME,
+ client->object_path,
+ NODE_INTERFACE,
+ "ResetFailed",
+ &error,
+ &result,
+ "");
+ if (r < 0) {
+ fprintf(stderr, "Failed to issue method call: %s\n", error.message);
+ return r;
+ }
+
+ return 0;
+}
+
+static int method_reset_failed_unit_on(Client *client, char *node_name, char *unit) {
+ int r = 0;
+ _cleanup_sd_bus_error_ sd_bus_error error = SD_BUS_ERROR_NULL;
+ _cleanup_sd_bus_message_ sd_bus_message *result = NULL;
+
+ r = assemble_object_path_string(NODE_OBJECT_PATH_PREFIX, node_name, &client->object_path);
+ if (r < 0) {
+ return r;
+ }
+
+ r = sd_bus_call_method(
+ client->api_bus,
+ BC_INTERFACE_BASE_NAME,
+ client->object_path,
+ NODE_INTERFACE,
+ "ResetFailedUnit",
+ &error,
+ &result,
+ "s",
+ unit);
+ if (r < 0) {
+ fprintf(stderr, "Failed to issue method call: %s\n", error.message);
+ return r;
+ }
+
+ return 0;
+}
+
 static int method_freeze_unit_on(Client *client, char *node_name, char *unit) {
  int r = 0;
  _cleanup_sd_bus_error_ sd_bus_error error = SD_BUS_ERROR_NULL;
@@ -320,6 +375,14 @@ int method_restart(Command *command, void *userdata) {
  return method_lifecycle_action_on(userdata, command->opargv[0], command->opargv[1], "RestartUnit");
 }
 
+int method_reset_failed(Command *command, void *userdata) {
+ return method_reset_failed_on(userdata, command->opargv[0]);
+}
+
+int method_reset_failed_unit(Command *command, void *userdata) {
+ return method_reset_failed_unit_on(userdata, command->opargv[0], command->opargv[1]);
+}
+
 int method_reload(Command *command, void *userdata) {
  return method_lifecycle_action_on(userdata, command->opargv[0], command->opargv[1], "ReloadUnit");
 }

diff --git a/src/client/method-unit-actions.h b/src/client/method-unit-actions.h
@@ -10,6 +10,8 @@
 int method_start(Command *command, void *userdata);
 int method_stop(Command *command, void *userdata);
 int method_restart(Command *command, void *userdata);
+int method_reset_failed(Command *command, void *userdata);
+int method_reset_failed_unit(Command *command, void *userdata);
 int method_reload(Command *command, void *userdata);
 int method_freeze(Command *command, void *userdata);
 int method_thaw(Command *command, void *userdata);

diff --git a/src/controller/node.c b/src/controller/node.c
@@ -76,6 +76,8 @@ static const sd_bus_vtable node_vtable[] = {
  SD_BUS_METHOD("ThawUnit", "s", "", node_method_passthrough_to_agent, 0),
  SD_BUS_METHOD("RestartUnit", "ss", "o", node_method_restart_unit, 0),
  SD_BUS_METHOD("ReloadUnit", "ss", "o", node_method_reload_unit, 0),
+ SD_BUS_METHOD("ResetFailed", "", "", node_method_passthrough_to_agent, 0),
+ SD_BUS_METHOD("ResetFailedUnit", "s", "", node_method_passthrough_to_agent, 0),
  SD_BUS_METHOD("GetUnitProperties", "ss", "a{sv}", node_method_passthrough_to_agent, 0),
  SD_BUS_METHOD("GetUnitProperty", "sss", "v", node_method_passthrough_to_agent, 0),
  SD_BUS_METHOD("SetUnitProperties", "sba(sv)", "", node_method_set_unit_properties, 0),