Avoid need to download remote config when pulling #2167
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
jlebon
reviewed
Aug 10, 2020
cgwalters
reviewed
Aug 17, 2020
| @@ -5823,6 +5823,24 @@ ostree_repo_regenerate_summary (OstreeRepo *self, | |||
| g_variant_new_uint64 (GUINT64_TO_BE (g_get_real_time () / G_USEC_PER_SEC))); | |||
| } | |||
|
|
|||
| { | |||
| g_autofree char *remote_mode_str = NULL; | |||
There was a problem hiding this comment.
We can land this hunk to simply add the data to the summary now as a prep patch.
|
/approve |
pwithnall
force-pushed
the
2165-dont-download-config
branch
from
b3b2d01
to
88a253f
Compare
|
Sorry for the delay. I’ve updated as per the review comments |
pwithnall
force-pushed
the
2165-dont-download-config
branch
from
88a253f
to
60f78b8
Compare
|
Looks like LGTM otherwise! |
pwithnall
force-pushed
the
2165-dont-download-config
branch
from
60f78b8
to
464d2a3
Compare
Currently, they are set in the `config` file and cause that to be downloaded on every pull. Given that the client is already pulling the `summary` file, it makes sense to avoid an additional network round trip and cache those options in the `summary` file. Signed-off-by: Philip Withnall <withnall@endlessm.com> Helps: ostreedev#2165
Otherwise, fall back to downloading and reading them from the `config` file. See the previous commit for details. Signed-off-by: Philip Withnall <withnall@endlessm.com> Fixes: ostreedev#2165
Re-using the `refs` variable for the main list of refs, plus the iterated lists, meant that the main list was never freed (although all the iterated ones were freed correctly). Fix this by using two variables rather than reusing the one. Signed-off-by: Philip Withnall <withnall@endlessm.com>
pwithnall
force-pushed
the
2165-dont-download-config
branch
from
464d2a3
to
23bdc4e
Compare
|
Adjusted that test. Not sure what the continuous-integration/jenkins/pr-merge failure is about. The Jenkins page shows only green ticks. |
|
Yeah there's a bug in the UI, you need to go to the old view to see it: Hmm but we didn't capture the logs from that it seems. |
|
Not sure, I tried retriggering. |
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: cgwalters, jlebon, pwithnall The full list of commands accepted by this bot can be found here. The pull request process is described here
Needs approval from an approver in each of these files:
Approvers can indicate their approval by writing |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes #2165. See that and the commit messages for details.
This doesn’t need additional changes in flatpak for it to be used there too. It does require repositories to regenerate their
summaryfiles before the non-fallback code path is taken in clients, though. That’ll happen soon enough naturally.