Eliminate redundant getContainers/inspectContainer calls #1350
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
Closed
marusak
reviewed
Jul 12, 2023
src/ContainerIntegration.jsx
Outdated
| ); | ||
| const items = []; | ||
| Object.entries(ports).forEach(([containerPort, hostBindings]) => { | ||
| hostBindings.forEach(binding => { |
There was a problem hiding this comment.
I managed to get error:
Uncaught TypeError: hostBindings is null
renderContainerPublishedPorts ContainerIntegration.jsx:20
renderContainerPublishedPorts ContainerIntegration.jsx:19
ContainerIntegration ContainerIntegration.jsx:97
React 11
These are my ports:
"Ports": {
"3400/tcp": null,
"8080/tcp": [
{
"HostIp": "",
"HostPort": "3404"
}
]
},
I am actually not sure how I created this 🤷♂️
There was a problem hiding this comment.
Eww -- Not sure either, but let's not crash the UI on it. Fixed.
marusak
previously approved these changes
Jul 12, 2023
Both the initial container scan and each update called getContainers()
once and inspectContainer() twice (!!). But this is very redundant: The
objects returned by getContainers() and inspectContainer() have a very
similar structure. The latter does not have `Pid` and `PodName`, but we
don't use these properties anyway. The others map in a straightforward
way:
* `Names[]` → single `Name`
* `Ports` list → `NetworkSettings.Ports` map
* `Mounts` (simple target dir list) → list of objects with lots of
info; direct translation is `.Destination`
* `Started/Exited...At` → `State.*`
* `State` → `State.Status`
* `Command` → `Config.Cmd`
* `Labels` → `Config.Labels`
* `ImageID` → `Image`
* `Image` → `ImageName`
So change the state keeping to call getContainers() only once at
initialization, and from then on only a single inspectContainer() for
each state update. Adjust the code for the above property structure
changes.
The function already handles falsy values, and other places also call it unguarded. This fixes some Coverage complaints.
These cannot be triggered at will from the UI, as it already prevents actions which won't work. This reduces the coverage report noise.
image.Env ought to always exist. Fixes a coverage complaint.
|
I also took the opportunity to clean up the coverage report. As I touch so much code here, I got a ton of uncovered code complaints. Update: Hmm -- that link is gone now, apparently each force-push completely deletes and replaces the previous version. Good for reducing the noise in a PR of course, but bad for proving that the proposed changes are necessary.. |
These only apply to old podman versions (where we don't run coverage), are "play it safe" fallbacks which Should Not Happen™, or are transient "Loading..." states which cannot reliably be caught in tests.
martinpitt
commented
Jul 13, 2023
martinpitt
commented
Jul 13, 2023
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.
Both the initial container scan and each update called getContainers() once and inspectContainer() twice (!!). But this is very redundant: The objects returned by getContainers() and inspectContainer() have a very similar structure. The latter does not have
PidandPodName, but we don't use these properties anyway. The others map in a straightforward way:Names[]→ singleNamePortslist →NetworkSettings.PortsmapMounts(simple target dir list) → list of objects with lots of info; direct translation is.DestinationStarted/Exited...At→State.*State→State.StatusCommand→Config.CmdLabels→Config.LabelsImageID→ImageImage→ImageNameSo change the state keeping to call getContainers() only once at initialization, and from then on only a single inspectContainer() for each state update. Adjust the code for the above property structure changes.
Another big outcome from #1324, and stress-tested there.