Sync to latest rhel8 branch g52714b51
Resolves: rhbz#2192235
This commit is contained in:
Joseph Marrero
parent
6d54ac503c
commit
6d915bc6a6
1
.gitignore
vendored
1
.gitignore
vendored
@ -1,2 +1,3 @@
|
||||
SOURCES/rpm-ostree-2022.10.112.g3d0ac35b.tar.xz
|
||||
/rpm-ostree-2022.10.112.g3d0ac35b.tar.xz
|
||||
/rpm-ostree-2022.10.117.g52714b51.tar.xz
|
||||
|
||||
@ -1,74 +0,0 @@
|
||||
From a0f1275dfbd835b704355d095e610ac1f1254f25 Mon Sep 17 00:00:00 2001
|
||||
From: Colin Walters <walters@verbum.org>
|
||||
Date: Sun, 11 Dec 2022 13:40:15 -0500
|
||||
Subject: [PATCH] daemon: Make failure to query base image non-fatal
|
||||
|
||||
We had a GC bug which then propagates into a hard daemon
|
||||
failure right now because we try to gather data on all deployments.
|
||||
|
||||
Make this non-fatal; we should try to stumble forward as much
|
||||
as possible so that one can e.g. perform an upgrade operation.
|
||||
|
||||
(cherry picked from commit 8dd45f293afc1ca32b42bda86dde47c66e652dda)
|
||||
---
|
||||
src/app/rpmostree-builtin-status.cxx | 12 +++++++++---
|
||||
src/daemon/rpmostreed-deployment-utils.cxx | 20 ++++++++++++++------
|
||||
2 files changed, 23 insertions(+), 9 deletions(-)
|
||||
|
||||
diff --git a/src/app/rpmostree-builtin-status.cxx b/src/app/rpmostree-builtin-status.cxx
|
||||
index cec0a2e3..ee82e589 100644
|
||||
--- a/src/app/rpmostree-builtin-status.cxx
|
||||
+++ b/src/app/rpmostree-builtin-status.cxx
|
||||
@@ -688,9 +688,15 @@ print_one_deployment (RPMOSTreeSysroot *sysroot_proxy, GVariant *child, gint ind
|
||||
break;
|
||||
case rpmostreecxx::RefspecType::Container:
|
||||
{
|
||||
- g_assert (g_variant_dict_lookup (dict, "container-image-reference-digest", "s",
|
||||
- &container_image_reference_digest));
|
||||
- g_print ("%s", origin_refspec);
|
||||
+ if (g_variant_dict_lookup (dict, "container-image-reference-digest", "s",
|
||||
+ &container_image_reference_digest))
|
||||
+ {
|
||||
+ g_print ("%s", origin_refspec);
|
||||
+ }
|
||||
+ else
|
||||
+ {
|
||||
+ g_print ("(error fetching image metadata)");
|
||||
+ }
|
||||
}
|
||||
break;
|
||||
}
|
||||
diff --git a/src/daemon/rpmostreed-deployment-utils.cxx b/src/daemon/rpmostreed-deployment-utils.cxx
|
||||
index b7b27fed..48480509 100644
|
||||
--- a/src/daemon/rpmostreed-deployment-utils.cxx
|
||||
+++ b/src/daemon/rpmostreed-deployment-utils.cxx
|
||||
@@ -214,12 +214,20 @@ rpmostreed_deployment_generate_variant (OstreeSysroot *sysroot, OstreeDeployment
|
||||
case rpmostreecxx::RefspecType::Container:
|
||||
{
|
||||
g_variant_dict_insert (dict, "container-image-reference", "s", refspec);
|
||||
- CXX_TRY_VAR (state, rpmostreecxx::query_container_image_commit (*repo, base_checksum),
|
||||
- error);
|
||||
- g_variant_dict_insert (dict, "container-image-reference-digest", "s",
|
||||
- state->image_digest.c_str ());
|
||||
- if (state->version.size () > 0)
|
||||
- g_variant_dict_insert (dict, "version", "s", state->version.c_str ());
|
||||
+ // For now, make this non-fatal https://github.com/coreos/rpm-ostree/issues/4185
|
||||
+ try
|
||||
+ {
|
||||
+ auto state = rpmostreecxx::query_container_image_commit (*repo, base_checksum);
|
||||
+ g_variant_dict_insert (dict, "container-image-reference-digest", "s",
|
||||
+ state->image_digest.c_str ());
|
||||
+ if (state->version.size () > 0)
|
||||
+ g_variant_dict_insert (dict, "version", "s", state->version.c_str ());
|
||||
+ }
|
||||
+ catch (std::exception &e)
|
||||
+ {
|
||||
+ sd_journal_print (LOG_ERR, "failed to query container image base metadata: %s",
|
||||
+ e.what ());
|
||||
+ }
|
||||
}
|
||||
break;
|
||||
case rpmostreecxx::RefspecType::Checksum:
|
||||
--
|
||||
2.31.1
|
||||
|
||||
@ -3,16 +3,14 @@
|
||||
|
||||
Summary: Hybrid image/package system
|
||||
Name: rpm-ostree
|
||||
Version: 2022.10.112.g3d0ac35b
|
||||
Release: 3%{?dist}
|
||||
Version: 2022.10.117.g52714b51
|
||||
Release: 1%{?dist}
|
||||
License: LGPLv2+
|
||||
URL: https://github.com/coreos/rpm-ostree
|
||||
# This tarball is generated via "cd packaging && make -f Makefile.dist-packaging dist-snapshot"
|
||||
# in the upstream git. It also contains vendored Rust sources. This is generated from the "rhel8" branch.
|
||||
Source0: https://github.com/coreos/rpm-ostree/releases/download/v%{version}/rpm-ostree-%{version}.tar.xz
|
||||
|
||||
Patch0: 0001-daemon-Make-failure-to-query-base-image-non-fatal.patch
|
||||
|
||||
ExclusiveArch: %{rust_arches}
|
||||
|
||||
BuildRequires: make
|
||||
@ -229,6 +227,10 @@ $PYTHON autofiles.py > files.devel \
|
||||
%files devel -f files.devel
|
||||
|
||||
%changelog
|
||||
* Sun Apr 30 2023 Joseph Marrero <jmarrero@fedoraproject.org> - 2022.10.117.g52714b51-1
|
||||
- Sync to latest rhel8 branch
|
||||
Resolves: rhbz#2192235
|
||||
|
||||
* Thu Feb 16 2023 Colin Walters <walters@verbum.org> - 2022.10.112.g3d0ac35b-3
|
||||
- Cherry pick
|
||||
https://github.com/coreos/rpm-ostree/pull/4311/commits/a0f1275dfbd835b704355d095e610ac1f1254f25
|
||||
|
||||
2
sources
2
sources
@ -1 +1 @@
|
||||
SHA512 (rpm-ostree-2022.10.112.g3d0ac35b.tar.xz) = 8c4b2507bee13a95e7128b7adb7fc2ca0e96a3bc2fcc89517c034434ac5fea430bea3a7ac2630a5f48388c7a86fa4fdda6451e65a6a37dfb010e812b5d247f03
|
||||
SHA512 (rpm-ostree-2022.10.117.g52714b51.tar.xz) = 53533c8d878b3174fb2f0017660a1b5f14e6bcea2686c95c354baa1cb5c1bdec71443c190eab762f5cf3bfb744f1bf15800b2484cdbda7bb84d24342ae1fbdef
|
||||
|
||||
Loading…
Reference in New Issue
Block a user