Skip to content

Commit

Permalink
fcos.upgrade.basic: sync after untarring OSTree tarball
Browse files Browse the repository at this point in the history
This works around a subtle issue in rpm-ostree/libostree dropping D-Bus
transactions due to `mount` causing a cache flush and hanging for a
while due to slow I/O.

As mentioned in the comment there, we should drop this in the future and
rework things in the stack proper instead so we're not susceptible to
this.

See #1301.
  • Loading branch information
jlebon authored and openshift-merge-robot committed Apr 9, 2020
1 parent aef07a8 commit e9c6e55
Showing 1 changed file with 5 additions and 1 deletion.
6 changes: 5 additions & 1 deletion mantle/kola/tests/upgrade/basic.go
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,11 @@ func fcosUpgradeBasic(c cluster.TestCluster) {
c.Fatal(err)
}

c.MustSSHf(m, "tar -xf %s -C %s", kola.CosaBuild.Meta.BuildArtifacts.Ostree.Path, ostreeRepo)
// XXX: Note the '&& sync' here; this is to work around sysroot
// remounting in libostree forcing a cache flush and blocking D-Bus.
// Should drop this once we fix it more properly in {rpm-,}ostree.
// https://github.com/coreos/coreos-assembler/issues/1301
c.MustSSHf(m, "tar -xf %s -C %s && sync", kola.CosaBuild.Meta.BuildArtifacts.Ostree.Path, ostreeRepo)

graph.seedFromMachine(c, m)
graph.addUpdate(c, m, kola.CosaBuild.Meta.OstreeVersion, kola.CosaBuild.Meta.OstreeCommit)
Expand Down

0 comments on commit e9c6e55

Please sign in to comment.