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

app: Call Reload right after getting sysroot proxy

Browse Source 
A final followup to our pile of "add reload" PRs.  This one is
necessary to fix the `status` race.

Closes: #1312
Approved by: jlebon
This commit is contained in:
Colin Walters 2018-03-24 07:52:19 -04:00 committed by Atomic Bot
parent 706506b2d1
commit 779f764fcd
2 changed files with 26 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
src/app/rpmostree-dbus-helpers.c
View File

@ -128,6 +128,28 @@ get_connection_for_path (gchar *sysroot,
return connection;
}
/* Used to close race conditions by ensuring the daemon status is up-to-date */
static void
on_reload_done (GObject *src,
GAsyncResult *res,
gpointer user_data)
{
gboolean *donep = user_data;
*donep = TRUE;
(void) rpmostree_sysroot_call_reload_finish ((RPMOSTreeSysroot*)src, res, NULL);
}
/* This is an async call so that gdbus handles signals for changed
* properties. */
static void
await_reload_sync (RPMOSTreeSysroot *sysroot_proxy)
{
gboolean done = FALSE;
rpmostree_sysroot_call_reload (sysroot_proxy, NULL, on_reload_done, &done);
while (!done)
g_main_context_iteration (NULL, TRUE);
}
/**
* rpmostree_load_sysroot
@ -223,6 +245,9 @@ rpmostree_load_sysroot (gchar *sysroot,
if (sysroot_proxy == NULL)
return FALSE;
/* TODO: Change RegisterClient to also do a reload and do it async instead */
await_reload_sync (sysroot_proxy);
*out_sysroot_proxy = g_steal_pointer (&sysroot_proxy);
*out_peer_pid = peer_pid; peer_pid = 0;
if (out_bus_type)
@ -689,16 +714,6 @@ rpmostree_transaction_connect_active (RPMOSTreeSysroot *sysroot_proxy,
return FALSE;
}
static void
on_reload_done (GObject *src,
GAsyncResult *res,
gpointer user_data)
{
gboolean *donep = user_data;
*donep = TRUE;
(void) rpmostree_sysroot_call_reload_finish ((RPMOSTreeSysroot*)src, res, NULL);
}
/* Transactions need an explicit Start call so we can set up watches for signals
* beforehand and avoid losing information. We monitor the transaction,
* printing output it sends, and handle Ctrl-C, etc.
@ -797,12 +812,7 @@ rpmostree_transaction_get_response_sync (RPMOSTreeSysroot *sysroot_proxy,
/* On success, call Reload() as a way to sync with the daemon. Do this in async mode so
* that gdbus handles signals for changed properties. */
if (success)
{
gboolean done = FALSE;
rpmostree_sysroot_call_reload (sysroot_proxy, NULL, on_reload_done, &done);
while (!done)
g_main_context_iteration (NULL, TRUE);
}
await_reload_sync (sysroot_proxy);
out:
if (sigintid)

2
tests/vmcheck/test-basic.sh
View File

@ -116,11 +116,9 @@ echo "ok status -b"
# Pinning
vm_cmd ostree admin pin 0
vm_rpmostree reload # Try to avoid reload races
vm_rpmostree status > status.txt
assert_file_has_content_literal status.txt "Pinned: yes"
vm_cmd ostree admin pin -u 0
vm_rpmostree reload # Try to avoid reload races
vm_rpmostree status > status.txt
assert_not_file_has_content status.txt "Pinned: yes"
echo "ok pinning"