keremet/rpm-ostree
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #2813 from kelvinfan001/pr/detect-inactive-driver

Browse Source 
app/clientlib: Don't error if updates driver inactive
This commit is contained in:
Jonathan Lebon 2021-05-07 17:12:42 -04:00 committed by GitHub
commit 57250d11ab
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 56 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
src/app/rpmostree-clientlib.cxx
View File

@ -1622,12 +1622,17 @@ get_sd_unit_objpath (GDBusConnection *connection,
* instance that holds the value for property_name GVariant in cache_val. */
static gboolean
get_sd_unit_property (GDBusConnection *connection,
const char *objpath,
const char *method_name,
GVariant *parameters,
const char *property_name,
GVariant **cache_val,
GCancellable *cancellable,
GError **error)
{
g_autofree const char *objpath = NULL;
if (!get_sd_unit_objpath (connection, method_name, parameters, &objpath, cancellable, error))
return FALSE;
/* Look up property_name property of systemd unit. */
g_autoptr(GDBusProxy) unit_obj_proxy =
g_dbus_proxy_new_sync (connection, G_DBUS_PROXY_FLAGS_DO_NOT_CONNECT_SIGNALS, NULL,
@ -1655,11 +1660,8 @@ append_docs_to_str (GString *str,
{
g_autoptr(GVariant) docs_array = NULL;
g_autoptr(GError) local_error = NULL;
const char *objpath = NULL;
if (!get_sd_unit_objpath (connection, "LoadUnit", g_variant_new ("(s)", sd_unit),
&objpath, cancellable, &local_error))
g_printerr ("%s", local_error->message);
if (!get_sd_unit_property (connection, objpath, "Documentation", &docs_array, cancellable, &local_error))
if (!get_sd_unit_property (connection, "LoadUnit", g_variant_new ("(s)", sd_unit),
"Documentation", &docs_array, cancellable, &local_error))
{
g_printerr ("%s", local_error->message);
}
@ -1682,7 +1684,29 @@ append_docs_to_str (GString *str,
}
}
/* Check whether sd_unit contains pid and return the boolean in sd_unit_contains_pid */
/* Check whether sd_unit's `ActiveState` is "active" and return the boolean
* in `sd_unit_is_active`. */
static gboolean
check_sd_unit_state_is_active (char *sd_unit,
gboolean *sd_unit_is_active,
GDBusConnection *connection,
GCancellable *cancellable,
GError **error)
{
g_autoptr(GVariant) active_state = NULL;
if (!get_sd_unit_property (connection, "LoadUnit", g_variant_new ("(s)", sd_unit),
"ActiveState", &active_state, cancellable, error))
return FALSE;
g_assert (active_state);
// NB: include "failed" in states we consider "active" so we do not ignore crashed
// updates drivers.
const char *states[] = {"active", "activating", "reloading", "failed", NULL};
const char *active_state_str = g_variant_get_string (active_state, NULL);
*sd_unit_is_active = (active_state_str && g_strv_contains (states, active_state_str));
return TRUE;
}
/* Check whether sd_unit contains pid and return the boolean in sd_unit_contains_pid. */
static gboolean
check_sd_unit_contains_pid (char *sd_unit,
pid_t pid,
@ -1692,13 +1716,10 @@ check_sd_unit_contains_pid (char *sd_unit,
GError **error)
{
// Get the systemd unit associated with pid.
const char *objpath = NULL;
g_autoptr(GVariant) process_sd_unit_val = NULL;
const char *process_sd_unit = NULL;
if (!get_sd_unit_objpath (connection, "GetUnitByPID", g_variant_new ("(u)", (guint32) pid),
&objpath, cancellable, error))
return FALSE;
if (!get_sd_unit_property (connection, objpath, "Id", &process_sd_unit_val, cancellable, error))
if (!get_sd_unit_property (connection, "GetUnitByPID", g_variant_new ("(u)", (guint32) pid),
"Id", &process_sd_unit_val, cancellable, error))
return FALSE;
process_sd_unit = g_variant_get_string (process_sd_unit_val, NULL);
if (g_strcmp0 (process_sd_unit, sd_unit) == 0)
@ -1708,7 +1729,7 @@ check_sd_unit_contains_pid (char *sd_unit,
return TRUE;
}
/* Throw an error if an updates driver is registered. */
/* Throw an error if an updates driver is registered and active. */
gboolean
error_if_driver_registered (GBusType bus_type,
RPMOSTreeSysroot *sysroot_proxy,
@ -1741,9 +1762,18 @@ error_if_driver_registered (GBusType bus_type,
g_string_printf (error_msg, "Updates and deployments are driven by %s (%s)\n",
update_driver_name, update_driver_sd_unit);
g_string_append_printf (error_msg, "See %s's documentation", update_driver_name);
/* only try to get unit's `Documentation` if we're on the system bus */
// Only try to get unit's `Documentation` and check unit's state if we're on the system bus.
if (bus_type == G_BUS_TYPE_SYSTEM)
{
gboolean sd_unit_is_active = TRUE;
if (!check_sd_unit_state_is_active (update_driver_sd_unit, &sd_unit_is_active,
connection, cancellable, error))
return FALSE;
// Ignore driver if driver's `ActiveState` is not "active", even if registered.
if (!sd_unit_is_active)
return TRUE;
append_docs_to_str (error_msg, connection, update_driver_sd_unit, cancellable);
}
g_string_append_printf (error_msg,
"Use --bypass-driver to bypass %s and perform the operation anyways",
update_driver_name);

12
tests/vmcheck/test-misc-2.sh
View File

@ -292,9 +292,12 @@ echo "ok previous staged failure in status"
# Test `deploy --register-driver` option
# Create and start a transient test-driver.service unit to register our fake driver
vm_cmd systemd-run --unit=test-driver.service --wait -q \
cursor=$(vm_get_journal_cursor)
vm_cmd systemd-run --unit=test-driver.service -q -r \
rpm-ostree deploy \'\' \
--register-driver=TestDriver
# wait for driver to register
vm_wait_content_after_cursor $cursor 'Txn Deploy on.*successful'
vm_cmd test -f /run/rpm-ostree/update-driver.gv
vm_cmd rpm-ostree status > status.txt
assert_file_has_content status.txt 'AutomaticUpdatesDriver: TestDriver'
@ -337,6 +340,13 @@ assert_not_file_has_content err.txt 'Updates and deployments are driven by TestD
vm_rpmostree cleanup -p
echo "ok upgrade when updates driver is registered"
# Check that drivers are ignored if inactive even if registered
vm_cmd systemctl stop test-driver.service
vm_rpmostree upgrade --unchanged-exit-77 2>err.txt # notice we do not `--bypass-driver`
assert_not_file_has_content err.txt 'Updates and deployments are driven by TestDriver'
vm_rpmostree cleanup -p
echo "ok ignore inactive registered driver"
# Test that we don't need to --bypass-driver if the systemd unit associated with
# the client's PID is the update driver's systemd unit.
vm_cmd rpm-ostree deploy \'\' \