mirror of https://github.com/containers/podman.git
0136a66a83
The OCICNI port format has one big problem: It does not support ranges. So if a users forwards a range of 1k ports with podman run -p 1001-2000 we have to store each of the thousand ports individually as array element. This bloats the db and makes the JSON encoding and decoding much slower. In many places we already use a better port struct type which supports ranges, e.g. `pkg/specgen` or the new network interface. Because of this we have to do many runtime conversions between the two port formats. If everything uses the new format we can skip the runtime conversions. This commit adds logic to replace all occurrences of the old format with the new one. The database will automatically migrate the ports to new format when the container config is read for the first time after the update. The `ParsePortMapping` function is `pkg/specgen/generate` has been reworked to better work with the new format. The new logic is able to deduplicate the given ports. This is necessary the ensure we store them efficiently in the DB. The new code should also be more performant than the old one. To prove that the code is fast enough I added go benchmarks. Parsing 1 million ports took less than 0.5 seconds on my laptop. Benchmark normalize PortMappings in specgen: Please note that the 1 million ports are actually 20x 50k ranges because we cannot have bigger ranges than 65535 ports. ``` $ go test -bench=. -benchmem ./pkg/specgen/generate/ goos: linux goarch: amd64 pkg: github.com/containers/podman/v3/pkg/specgen/generate cpu: Intel(R) Core(TM) i7-10850H CPU @ 2.70GHz BenchmarkParsePortMappingNoPorts-12 480821532 2.230 ns/op 0 B/op 0 allocs/op BenchmarkParsePortMapping1-12 38972 30183 ns/op 131584 B/op 9 allocs/op BenchmarkParsePortMapping100-12 18752 60688 ns/op 141088 B/op 315 allocs/op BenchmarkParsePortMapping1k-12 3104 331719 ns/op 223840 B/op 3018 allocs/op BenchmarkParsePortMapping10k-12 376 3122930 ns/op 1223650 B/op 30027 allocs/op BenchmarkParsePortMapping1m-12 3 390869926 ns/op 124593840 B/op 4000624 allocs/op BenchmarkParsePortMappingReverse100-12 18940 63414 ns/op 141088 B/op 315 allocs/op BenchmarkParsePortMappingReverse1k-12 3015 362500 ns/op 223841 B/op 3018 allocs/op BenchmarkParsePortMappingReverse10k-12 343 3318135 ns/op 1223650 B/op 30027 allocs/op BenchmarkParsePortMappingReverse1m-12 3 403392469 ns/op 124593840 B/op 4000624 allocs/op BenchmarkParsePortMappingRange1-12 37635 28756 ns/op 131584 B/op 9 allocs/op BenchmarkParsePortMappingRange100-12 39604 28935 ns/op 131584 B/op 9 allocs/op BenchmarkParsePortMappingRange1k-12 38384 29921 ns/op 131584 B/op 9 allocs/op BenchmarkParsePortMappingRange10k-12 29479 40381 ns/op 131584 B/op 9 allocs/op BenchmarkParsePortMappingRange1m-12 927 1279369 ns/op 143022 B/op 164 allocs/op PASS ok github.com/containers/podman/v3/pkg/specgen/generate 25.492s ``` Benchmark convert old port format to new one: ``` go test -bench=. -benchmem ./libpod/ goos: linux goarch: amd64 pkg: github.com/containers/podman/v3/libpod cpu: Intel(R) Core(TM) i7-10850H CPU @ 2.70GHz Benchmark_ocicniPortsToNetTypesPortsNoPorts-12 663526126 1.663 ns/op 0 B/op 0 allocs/op Benchmark_ocicniPortsToNetTypesPorts1-12 7858082 141.9 ns/op 72 B/op 2 allocs/op Benchmark_ocicniPortsToNetTypesPorts10-12 2065347 571.0 ns/op 536 B/op 4 allocs/op Benchmark_ocicniPortsToNetTypesPorts100-12 138478 8641 ns/op 4216 B/op 4 allocs/op Benchmark_ocicniPortsToNetTypesPorts1k-12 9414 120964 ns/op 41080 B/op 4 allocs/op Benchmark_ocicniPortsToNetTypesPorts10k-12 781 1490526 ns/op 401528 B/op 4 allocs/op Benchmark_ocicniPortsToNetTypesPorts1m-12 4 250579010 ns/op 40001656 B/op 4 allocs/op PASS ok github.com/containers/podman/v3/libpod 11.727s ``` Signed-off-by: Paul Holzinger <pholzing@redhat.com> |
||
|---|---|---|
| .. | ||
| common | ||
| define | ||
| driver | ||
| events | ||
| layers | ||
| linkmode | ||
| lock | ||
| logs | ||
| network | ||
| plugin | ||
| shutdown | ||
| boltdb_state.go | ||
| boltdb_state_internal.go | ||
| boltdb_state_linux.go | ||
| common_test.go | ||
| container.go | ||
| container_api.go | ||
| container_commit.go | ||
| container_config.go | ||
| container_copy_linux.go | ||
| container_exec.go | ||
| container_graph.go | ||
| container_graph_test.go | ||
| container_inspect.go | ||
| container_internal.go | ||
| container_internal_linux.go | ||
| container_internal_linux_test.go | ||
| container_internal_test.go | ||
| container_linux.go | ||
| container_log.go | ||
| container_log_linux.go | ||
| container_log_unsupported.go | ||
| container_path_resolution.go | ||
| container_stat_linux.go | ||
| container_top_linux.go | ||
| container_validate.go | ||
| diff.go | ||
| events.go | ||
| healthcheck.go | ||
| healthcheck_linux.go | ||
| info.go | ||
| kube.go | ||
| mounts_linux.go | ||
| networking_linux.go | ||
| networking_linux_test.go | ||
| networking_slirp4netns.go | ||
| oci.go | ||
| oci_attach_linux.go | ||
| oci_conmon.go | ||
| oci_conmon_exec_linux.go | ||
| oci_conmon_linux.go | ||
| oci_missing.go | ||
| oci_util.go | ||
| options.go | ||
| pod.go | ||
| pod_api.go | ||
| pod_internal.go | ||
| pod_status.go | ||
| pod_top_linux.go | ||
| reset.go | ||
| runtime.go | ||
| runtime_cstorage.go | ||
| runtime_ctr.go | ||
| runtime_img.go | ||
| runtime_migrate.go | ||
| runtime_pod.go | ||
| runtime_pod_linux.go | ||
| runtime_renumber.go | ||
| runtime_volume.go | ||
| runtime_volume_linux.go | ||
| state.go | ||
| state_test.go | ||
| stats.go | ||
| storage.go | ||
| util.go | ||
| util_linux.go | ||
| util_linux_test.go | ||
| util_test.go | ||
| volume.go | ||
| volume_inspect.go | ||
| volume_internal.go | ||
| volume_internal_linux.go | ||