config: add a `PortSet` type #1106

hawkw · 2021-06-17T20:00:43Z

This branch adds a PortSet type that's a simple wrapper around
std::collections::HashSet but specialized for storing ports (u16
values). The PortSet type overrides the default hasher so that we
don't have to actually hash ports, and just use their numeric value.

See here for details:
#1048 (comment)

Depends on #1048

codecov-commenter · 2021-06-17T20:17:29Z

Codecov Report

Merging #1106 (df676fc) into main (cde2816) will increase coverage by 0.02%.
The diff coverage is 88.88%.

@@            Coverage Diff             @@
##             main    #1106      +/-   ##
==========================================
+ Coverage   74.43%   74.45%   +0.02%     
==========================================
  Files         233      233              
  Lines       14666    14675       +9     
==========================================
+ Hits        10917    10927      +10     
+ Misses       3749     3748       -1

Impacted Files	Coverage Δ
linkerd/app/inbound/src/lib.rs	`81.48% <ø> (ø)`
linkerd/app/inbound/src/require_identity.rs	`61.53% <ø> (ø)`
linkerd/app/core/src/config.rs	`92.30% <88.88%> (-7.70%)`	⬇️
linkerd/service-profiles/src/proto.rs	`69.23% <0.00%> (-1.71%)`	⬇️
linkerd/app/integration/src/tests/identity.rs	`54.40% <0.00%> (+0.51%)`	⬆️
linkerd/proxy/tap/src/grpc/match_.rs	`62.31% <0.00%> (+1.50%)`	⬆️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update cde2816...df676fc. Read the comment docs.

This branch adds a `PortSet` type that's a simple wrapper around `std::collections::HashSet` but specialized for storing ports (`u16` values). The `PortSet` type overrides the default hasher so that we don't have to actually hash ports, and just use their numeric value. See here for details: #1048 (comment)

that way, we get *all* the existing `HashSet` methods for free (although we don't currently use any of them besides `contains`). Signed-off-by: Eliza Weisman <eliza@buoyant.io>

kleimkuhler

Looks good! Have a question about something that really shouldn't be an issue but just wondering.

linkerd/app/core/src/config.rs

olix0r

wdyt about adding a quickcheck that roundtrips values through portset?

Signed-off-by: Eliza Weisman <eliza@buoyant.io>

hawkw · 2021-06-17T21:15:02Z

wdyt about adding a quickcheck that roundtrips values through portset?

done!

This release updates a wide variety of the proxy's dependencies. No user-facing changes are expected. --- * tap: Restore tap matching tests (linkerd/linkerd2-proxy#1042) * Add a 'rustfmt' feature to crates that use gRPC (linkerd/linkerd2-proxy#1041) * tap: return an error when a `PortRange`'s min > max (linkerd/linkerd2-proxy#1044) * retry: Enforce a cap on max replay buffer size (linkerd/linkerd2-proxy#1043) * Add codecov integration via cargo-tarpaulin (linkerd/linkerd2-proxy#1047) * Add a dependabot configuration (linkerd/linkerd2-proxy#1046) * Fixup dependabot configuration (linkerd/linkerd2-proxy#1049) * build(deps): bump actions/upload-artifact from 2.2.3 to 2.2.4 (linkerd/linkerd2-proxy#1050) * build(deps): bump softprops/action-gh-release from 0.1.5 to 1 (linkerd/linkerd2-proxy#1051) * build(deps): bump libfuzzer-sys in /linkerd/transport-header/fuzz (linkerd/linkerd2-proxy#1052) * build(deps): bump libfuzzer-sys from 0.4.0 to 0.4.2 in /linkerd/tls/fuzz (linkerd/linkerd2-proxy#1053) * build(deps): bump libfuzzer-sys in /linkerd/addr/fuzz (linkerd/linkerd2-proxy#1054) * build(deps): bump tokio from 1.5.0 to 1.7.0 in /linkerd/proxy/http/fuzz (linkerd/linkerd2-proxy#1056) * build(deps): bump tracing from 0.1.25 to 0.1.26 in /linkerd/dns/fuzz (linkerd/linkerd2-proxy#1055) * build(deps): bump libfuzzer-sys from 0.4.0 to 0.4.2 in /linkerd/dns/fuzz (linkerd/linkerd2-proxy#1058) * build(deps): bump tracing from 0.1.25 to 0.1.26 in /linkerd/addr/fuzz (linkerd/linkerd2-proxy#1059) * build(deps): bump libfuzzer-sys in /linkerd/proxy/http/fuzz (linkerd/linkerd2-proxy#1060) * build(deps): bump tracing in /linkerd/transport-header/fuzz (linkerd/linkerd2-proxy#1061) * build(deps): bump tokio from 1.5.0 to 1.7.0 in /linkerd/dns/fuzz (linkerd/linkerd2-proxy#1062) * build(deps): bump tokio in /linkerd/transport-header/fuzz (linkerd/linkerd2-proxy#1063) * build(deps): bump arbitrary in /linkerd/app/inbound/fuzz (linkerd/linkerd2-proxy#1064) * build(deps): bump tokio from 1.5.0 to 1.7.0 in /linkerd/app/inbound/fuzz (linkerd/linkerd2-proxy#1065) * build(deps): bump tracing in /linkerd/app/inbound/fuzz (linkerd/linkerd2-proxy#1066) * build(deps): bump hyper in /linkerd/app/inbound/fuzz (linkerd/linkerd2-proxy#1067) * build(deps): bump deflate from 0.7.20 to 0.9.1 (linkerd/linkerd2-proxy#1068) * build(deps): bump libfuzzer-sys in /linkerd/app/inbound/fuzz (linkerd/linkerd2-proxy#1069) * build(deps): bump tonic-build from 0.4.0 to 0.4.2 (linkerd/linkerd2-proxy#1070) * build(deps): bump linkerd2-proxy-api from `453ac1e` to `48f13d6` (linkerd/linkerd2-proxy#1071) * build(deps): bump ipnet from 2.3.0 to 2.3.1 (linkerd/linkerd2-proxy#1072) * build(deps): bump regex from 1.4.3 to 1.4.6 (linkerd/linkerd2-proxy#1073) * build(deps): bump arbitrary in /linkerd/transport-header/fuzz (linkerd/linkerd2-proxy#1057) * Update tonic to v0.4.3 (linkerd/linkerd2-proxy#1080) * ci: Skip coverage tests on dependencies-only changes (linkerd/linkerd2-proxy#1074) * build(deps): bump indexmap from 1.6.1 to 1.6.2 (linkerd/linkerd2-proxy#1075) * build(deps): bump rand from 0.8.3 to 0.8.4 (linkerd/linkerd2-proxy#1077) * build(deps): bump tokio-test from 0.4.0 to 0.4.2 (linkerd/linkerd2-proxy#1076) * build(deps): bump pin-project from 1.0.5 to 1.0.7 (linkerd/linkerd2-proxy#1078) * build(deps): bump arbitrary from 1.0.0 to 1.0.1 (linkerd/linkerd2-proxy#1083) * outbound: replace `sleep`s in test with `yield_now` (linkerd/linkerd2-proxy#1085) * build(deps): bump thiserror from 1.0.23 to 1.0.25 (linkerd/linkerd2-proxy#1081) * build(deps): bump async-stream from 0.3.0 to 0.3.2 (linkerd/linkerd2-proxy#1084) * build(deps): bump serde_json from 1.0.62 to 1.0.64 (linkerd/linkerd2-proxy#1086) * build(deps): bump tokio-stream from 0.1.5 to 0.1.6 (linkerd/linkerd2-proxy#1082) * build(deps): Skip coverage by PR title (linkerd/linkerd2-proxy#1087) * fuzz: Omit lockfiles from version control (linkerd/linkerd2-proxy#1088) * build(deps): bump tokio from 1.6.1 to 1.7.0 (linkerd/linkerd2-proxy#1079) * build(deps): bump mimalloc from 0.1.24 to 0.1.25 (linkerd/linkerd2-proxy#1089) * build(deps): bump tokio-util from 0.6.5 to 0.6.7 (linkerd/linkerd2-proxy#1090) * build(deps): bump libc from 0.2.86 to 0.2.97 (linkerd/linkerd2-proxy#1093) * build(deps): bump http from 0.2.3 to 0.2.4 (linkerd/linkerd2-proxy#1092) * build(deps): bump rustls from 0.19.0 to 0.19.1 (linkerd/linkerd2-proxy#1094) * build(deps): bump async-trait from 0.1.42 to 0.1.50 (linkerd/linkerd2-proxy#1095) * build(deps): bump tracing-subscriber from 0.2.17 to 0.2.18 (linkerd/linkerd2-proxy#1096) * build(deps): bump http-body from 0.4.0 to 0.4.2 (linkerd/linkerd2-proxy#1097) * build(deps): bump tracing from 0.1.25 to 0.1.26 (linkerd/linkerd2-proxy#1098) * build(deps): bump hdrhistogram from 7.2.0 to 7.3.0 (linkerd/linkerd2-proxy#1099) * build(deps): bump regex from 1.4.6 to 1.5.4 (linkerd/linkerd2-proxy#1100) * build(deps): bump tower from 0.4.7 to 0.4.8 (linkerd/linkerd2-proxy#1102) * build(deps): bump libfuzzer-sys from 0.4.0 to 0.4.2 (linkerd/linkerd2-proxy#1103) * build(deps): bump actions/download-artifact from 2.0.9 to 2.0.10 (linkerd/linkerd2-proxy#1104) * Remove unneeded uses of indexmap (linkerd/linkerd2-proxy#1048) * build(deps): Update trust-dns to v0.21.0-alpha.1 (linkerd/linkerd2-proxy#1105) * config: add a `PortSet` type (linkerd/linkerd2-proxy#1106) * replace `linkerd-concurrency-limit` with Tower (linkerd/linkerd2-proxy#1107) * build(deps): Update Rust to v1.53.0 (linkerd/linkerd2-proxy#1108)

hawkw requested review from olix0r and a team June 17, 2021 20:00

hawkw mentioned this pull request Jun 17, 2021

Remove unneeded uses of indexmap #1048

Merged

Base automatically changed from ver/no-indexmap to main June 17, 2021 20:25

hawkw added 2 commits June 17, 2021 13:26

actually, it can just be a type alias

0fa6cd5

that way, we get *all* the existing `HashSet` methods for free (although we don't currently use any of them besides `contains`). Signed-off-by: Eliza Weisman <eliza@buoyant.io>

hawkw force-pushed the eliza/port-set branch from 1d2d9d7 to 0fa6cd5 Compare June 17, 2021 20:26

kleimkuhler approved these changes Jun 17, 2021

View reviewed changes

linkerd/app/core/src/config.rs Outdated Show resolved Hide resolved

olix0r reviewed Jun 17, 2021

View reviewed changes

hawkw added 2 commits June 17, 2021 14:10

review feedback

65c6748

Signed-off-by: Eliza Weisman <eliza@buoyant.io>

add a quick quickcheck to placate coverage bot

8b871cb

Signed-off-by: Eliza Weisman <eliza@buoyant.io>

disable quickcheck features

df676fc

olix0r approved these changes Jun 17, 2021

View reviewed changes

olix0r merged commit 634a5fd into main Jun 17, 2021

olix0r deleted the eliza/port-set branch June 17, 2021 22:13

olix0r mentioned this pull request Jun 18, 2021

proxy: v2.148.0 linkerd/linkerd2#6314

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

config: add a `PortSet` type #1106

config: add a `PortSet` type #1106

hawkw commented Jun 17, 2021

codecov-commenter commented Jun 17, 2021 •

edited

Loading

kleimkuhler left a comment

olix0r left a comment

hawkw commented Jun 17, 2021

config: add a PortSet type #1106

config: add a PortSet type #1106

Conversation

hawkw commented Jun 17, 2021

codecov-commenter commented Jun 17, 2021 • edited Loading

Codecov Report

kleimkuhler left a comment

Choose a reason for hiding this comment

olix0r left a comment

Choose a reason for hiding this comment

hawkw commented Jun 17, 2021

config: add a `PortSet` type #1106

config: add a `PortSet` type #1106

codecov-commenter commented Jun 17, 2021 •

edited

Loading