Merge pull request #27896 from shiavm006/fix-container-export-event

Fix container export emitting incorrect event type.
This commit is contained in:
Ashley Cui
2026-01-14 11:47:26 -05:00
committed by GitHub
2 changed files with 19 additions and 1 deletions

View File

@@ -545,7 +545,7 @@ func (c *Container) Export(out io.Writer) error {
return fmt.Errorf("cannot mount container %s as it is being removed: %w", c.ID(), define.ErrCtrStateInvalid)
}
defer c.newContainerEvent(events.Mount)
defer c.newContainerEvent(events.Export)
return c.export(out)
}

View File

@@ -51,4 +51,22 @@ var _ = Describe("Podman export", func() {
result.WaitWithDefaultTimeout()
Expect(result).To(ExitWithError(125, "invalid filename (should not contain ':')"))
})
It("podman export emits export event", func() {
_, ec, cid := podmanTest.RunLsContainer("")
Expect(ec).To(Equal(0))
outfile := filepath.Join(podmanTest.TempDir, "container.tar")
result := podmanTest.Podman([]string{"export", "-o", outfile, cid})
result.WaitWithDefaultTimeout()
Expect(result).Should(ExitCleanly())
eventsResult := podmanTest.Podman([]string{"events", "--stream=false", "--filter", "event=export", "--since", "30s"})
eventsResult.WaitWithDefaultTimeout()
Expect(eventsResult).Should(ExitCleanly())
events := eventsResult.OutputToStringArray()
Expect(events).ToNot(BeEmpty(), "export event should be present")
Expect(events[0]).To(ContainSubstring("export"))
Expect(events[0]).To(ContainSubstring(cid))
})
})