packaging
/
ostree
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #2493 from cgwalters/summary-lock-shared 

repo: Change locking for summary regeneration to be shared
This commit is contained in:
Colin Walters 2021-12-06 08:19:12 -05:00 committed by GitHub
parent 267ca93da2 2c39bd88a9
commit a07b8d6c00
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/libostree/ostree-repo.c
View File

@ -6105,7 +6105,7 @@ summary_add_ref_entry (OstreeRepo *self,
* and refs in %OSTREE_SUMMARY_COLLECTION_MAP are guaranteed to be in * and refs in %OSTREE_SUMMARY_COLLECTION_MAP are guaranteed to be in
* lexicographic order. * lexicographic order.
* *
* Locking: exclusive * Locking: shared (Prior to 2021.7, this was exclusive)
*/ */
gboolean gboolean
ostree_repo_regenerate_summary (OstreeRepo *self, ostree_repo_regenerate_summary (OstreeRepo *self,
@ -6113,16 +6113,10 @@ ostree_repo_regenerate_summary (OstreeRepo *self,
GCancellable *cancellable, GCancellable *cancellable,
GError **error) GError **error)
{ {
/* Take an exclusive lock. This makes sure the commits and deltas don't get
* deleted while generating the summary. It also means we can be sure refs
* won't be created/updated/deleted during the operation, without having to
* add exclusive locks to those operations which would prevent concurrent
* commits from working.
*/
g_autoptr(OstreeRepoAutoLock) lock = NULL; g_autoptr(OstreeRepoAutoLock) lock = NULL;
gboolean no_deltas_in_summary = FALSE; gboolean no_deltas_in_summary = FALSE;
lock = ostree_repo_auto_lock_push (self, OSTREE_REPO_LOCK_EXCLUSIVE, lock = ostree_repo_auto_lock_push (self, OSTREE_REPO_LOCK_SHARED,
cancellable, error); cancellable, error);
if (!lock) if (!lock)
return FALSE; return FALSE;