Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore(deps): bump tokio from 1.6.1 to 1.6.2 #7858

Merged
merged 8 commits into from
Jun 22, 2021

Conversation

dependabot[bot]
Copy link
Contributor

@dependabot dependabot bot commented on behalf of github Jun 15, 2021

Bumps tokio from 1.6.1 to 1.6.2.

Release notes

Sourced from tokio's releases.

Tokio v1.6.2

Fixes

  • test: sub-ms time:advance regression introduced in 1.6 (#3852)

#3852: tokio-rs/tokio#3852

Commits

Dependabot compatibility score

Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting @dependabot rebase.


Dependabot commands and options

You can trigger Dependabot actions by commenting on this PR:

  • @dependabot rebase will rebase this PR
  • @dependabot recreate will recreate this PR, overwriting any edits that have been made to it
  • @dependabot merge will merge this PR after your CI passes on it
  • @dependabot squash and merge will squash and merge this PR after your CI passes on it
  • @dependabot cancel merge will cancel a previously requested merge and block automerging
  • @dependabot reopen will reopen this PR if it is closed
  • @dependabot close will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually
  • @dependabot ignore this major version will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself)
  • @dependabot ignore this minor version will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself)
  • @dependabot ignore this dependency will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)

Bumps [tokio](https://github.com/tokio-rs/tokio) from 1.6.1 to 1.6.2.
- [Release notes](https://github.com/tokio-rs/tokio/releases)
- [Commits](tokio-rs/tokio@tokio-1.6.1...tokio-1.6.2)

---
updated-dependencies:
- dependency-name: tokio
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
@dependabot dependabot bot requested review from a team June 15, 2021 04:09
@dependabot dependabot bot added the domain: deps Anything related to Vector's dependencies label Jun 15, 2021
@dependabot dependabot bot requested review from nicolequ and removed request for a team June 15, 2021 04:09
Given that this tokio upgrade fixes the imprecision

https://github-redirect.dependabot.com/tokio-rs/tokio/issues/3852

Signed-off-by: Jesse Szwedko <jesse@szwedko.me>
@dependabot dependabot bot requested review from a team and vladimir-dd and removed request for a team June 15, 2021 16:54
@jszwedko
Copy link
Member

@bruceg looks like time::advance did have a regression. I was able to put back the assert_eq! as part of this minor version upgrade.

@bruceg
Copy link
Member

bruceg commented Jun 15, 2021

Yeah, I was seeing that. 😮

@dependabot @github
Copy link
Contributor Author

dependabot bot commented on behalf of github Jun 16, 2021

A newer version of tokio exists, but since this PR has been edited by someone other than Dependabot I haven't updated it. You'll get a PR for the updated version as normal once this PR is merged.

@jszwedko jszwedko enabled auto-merge (squash) June 16, 2021 16:33
jszwedko added 2 commits June 16, 2021 09:36
Signed-off-by: Jesse Szwedko <jesse@szwedko.me>
@jszwedko
Copy link
Member

Hmm, it looks like this upgrade is causing sinks::util::adaptive_concurrency::tests::all_tests to hang now. @bruceg if you get some time, would you mind poking at it? Otherwise I can try to poke it it later. I tried upgrading to Tokio 1.7 just to see if that'd fix it, but it didn't.

The diff between 1.6.1, which works, and 1.6.2 is pretty small so hopefully it won't be too hard to track down. tokio-rs/tokio@tokio-1.6.1...tokio-1.6.2

This gets rid of the blocking behavior I was seeing, but ends up
breaking, at least one of, the tests:

```
Running test in "tests/data/adaptive-concurrency/constant-link.toml"
Comparison failed: controller observed_rtt max = 0.103; maximum = 0.102
Comparison failed: controller observed_rtt mean = 0.10200030637254906; maximum = 0.102
Comparison failed: controller averaged_rtt max = 0.10203225806451613; maximum = 0.102
Comparison failed: controller averaged_rtt mean = 0.10200104058272637; maximum = 0.102
thread 'sinks::util::adaptive_concurrency::tests::all_tests' panicked at 'TestResults {
    stats: Statistics {
        completed: 500,
        in_flight: LevelTimeHistogram {
            level: 0,
            histogram: TimeHistogram {
                histogram: Histogram {
                    totals: [
                        0.0,
                        0.204,
                        0.102,
                        0.203,
                        0.103,
                        0.102,
                        0.102,
                        0.102,
                        0.102,
                        0.102,
                        0.102,
                        0.102,
                        0.102,
                        0.102,
                        0.102,
                        0.102,
                        0.102,
                        0.102,
                        0.102,
                        0.102,
                        0.102,
                        0.102,
                        0.102,
                        0.102,
                        0.102,
                        0.102,
                        0.102,
                        0.102,
                        0.102,
                        0.102,
                        0.102,
                        0.102,
                    ],
                },
                last_time: Some(
                    Instant {
                        t: 587447403828567,
                    },
                ),
            },
        },
        rate: Some(
            HistogramStats {
                min: 1,
                max: 246,
                mode: 243,
                total: 3.365999999999999,
                mean: 111.03713606654783,
            },
        ),
        requests: 223,
    },
    cstats: ControllerStatistics {
        in_flight: TimeHistogram {
            histogram: Histogram {
                totals: [
                    0.0,
                    0.204,
                    0.102,
                    0.203,
                    0.103,
                    0.102,
                    0.102,
                    0.102,
                    0.102,
                    0.102,
                    0.102,
                    0.102,
                    0.102,
                    0.102,
                    0.102,
                    0.102,
                    0.102,
                    0.102,
                    0.102,
                    0.102,
                    0.102,
                    0.102,
                    0.102,
                    0.102,
                    0.102,
                    0.102,
                    0.102,
                    0.102,
                    0.102,
                    0.102,
                    0.102,
                    0.102,
                ],
            },
            last_time: Some(
                Instant {
                    t: 587447403828567,
                },
            ),
        },
        concurrency_limit: TimeHistogram {
            histogram: Histogram {
                totals: [
                    0.0,
                    0.0,
                    0.102,
                    0.102,
                    0.102,
                    0.102,
                    0.102,
                    0.102,
                    0.102,
                    0.102,
                    0.102,
                    0.102,
                    0.102,
                    0.102,
                    0.102,
                    0.102,
                    0.102,
                    0.102,
                    0.102,
                    0.102,
                    0.102,
                    0.102,
                    0.102,
                    0.102,
                    0.102,
                    0.102,
                    0.102,
                    0.102,
                    0.102,
                    0.102,
                    0.102,
                    0.102,
                    0.102,
                ],
            },
            last_time: Some(
                Instant {
                    t: 587447403828567,
                },
            ),
        },
        observed_rtt: TimeWeightedSum {
            sum: WeightedSum {
                total: 0.3329290000000001,
                weights: 3.2639999999999993,
                min: Some(
                    0.102,
                ),
                max: Some(
                    0.103,
                ),
            },
            last_observation: Some(
                Instant {
                    t: 587447403828567,
                },
            ),
        },
        averaged_rtt: TimeWeightedSum {
            sum: WeightedSum {
                total: 0.3225272903225807,
                weights: 3.1619999999999995,
                min: Some(
                    0.102,
                ),
                max: Some(
                    0.10203225806451613,
                ),
            },
            last_observation: Some(
                Instant {
                    t: 587447403828567,
                },
            ),
        },
    },
}', src/sinks/util/adaptive_concurrency/tests.rs:608:5
```

Signed-off-by: Jesse Szwedko <jesse@szwedko.me>
@jszwedko
Copy link
Member

I pushed 7be7347 which fixes the issue with the tests hanging but ends up causing a test failure:

Running test in "tests/data/adaptive-concurrency/constant-link.toml"
Comparison failed: controller observed_rtt max = 0.103; maximum = 0.102
Comparison failed: controller observed_rtt mean = 0.10200030637254906; maximum = 0.102
Comparison failed: controller averaged_rtt max = 0.10203225806451613; maximum = 0.102
Comparison failed: controller averaged_rtt mean = 0.10200104058272637; maximum = 0.102
thread 'sinks::util::adaptive_concurrency::tests::all_tests' panicked at 'TestResults {
    stats: Statistics {
        completed: 500,
        in_flight: LevelTimeHistogram {
            level: 0,
            histogram: TimeHistogram {
                histogram: Histogram {
                    totals: [
                        0.0,
                        0.204,
                        0.102,
                        0.203,
                        0.103,
                        0.102,
                        0.102,
                        0.102,
                        0.102,
                        0.102,
                        0.102,
                        0.102,
                        0.102,
                        0.102,
                        0.102,
                        0.102,
                        0.102,
                        0.102,
                        0.102,
                        0.102,
                        0.102,
                        0.102,
                        0.102,
                        0.102,
                        0.102,
                        0.102,
                        0.102,
                        0.102,
                        0.102,
                        0.102,
                        0.102,
                        0.102,
                    ],
                },
                last_time: Some(
                    Instant {
                        t: 587447403828567,
                    },
                ),
            },
        },
        rate: Some(
            HistogramStats {
                min: 1,
                max: 246,
                mode: 243,
                total: 3.365999999999999,
                mean: 111.03713606654783,
            },
        ),
        requests: 223,
    },
    cstats: ControllerStatistics {
        in_flight: TimeHistogram {
            histogram: Histogram {
                totals: [
                    0.0,
                    0.204,
                    0.102,
                    0.203,
                    0.103,
                    0.102,
                    0.102,
                    0.102,
                    0.102,
                    0.102,
                    0.102,
                    0.102,
                    0.102,
                    0.102,
                    0.102,
                    0.102,
                    0.102,
                    0.102,
                    0.102,
                    0.102,
                    0.102,
                    0.102,
                    0.102,
                    0.102,
                    0.102,
                    0.102,
                    0.102,
                    0.102,
                    0.102,
                    0.102,
                    0.102,
                    0.102,
                ],
            },
            last_time: Some(
                Instant {
                    t: 587447403828567,
                },
            ),
        },
        concurrency_limit: TimeHistogram {
            histogram: Histogram {
                totals: [
                    0.0,
                    0.0,
                    0.102,
                    0.102,
                    0.102,
                    0.102,
                    0.102,
                    0.102,
                    0.102,
                    0.102,
                    0.102,
                    0.102,
                    0.102,
                    0.102,
                    0.102,
                    0.102,
                    0.102,
                    0.102,
                    0.102,
                    0.102,
                    0.102,
                    0.102,
                    0.102,
                    0.102,
                    0.102,
                    0.102,
                    0.102,
                    0.102,
                    0.102,
                    0.102,
                    0.102,
                    0.102,
                    0.102,
                ],
            },
            last_time: Some(
                Instant {
                    t: 587447403828567,
                },
            ),
        },
        observed_rtt: TimeWeightedSum {
            sum: WeightedSum {
                total: 0.3329290000000001,
                weights: 3.2639999999999993,
                min: Some(
                    0.102,
                ),
                max: Some(
                    0.103,
                ),
            },
            last_observation: Some(
                Instant {
                    t: 587447403828567,
                },
            ),
        },
        averaged_rtt: TimeWeightedSum {
            sum: WeightedSum {
                total: 0.3225272903225807,
                weights: 3.1619999999999995,
                min: Some(
                    0.102,
                ),
                max: Some(
                    0.10203225806451613,
                ),
            },
            last_observation: Some(
                Instant {
                    t: 587447403828567,
                },
            ),
        },
    },
}', src/sinks/util/adaptive_concurrency/tests.rs:608:5
note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace
test sinks::util::adaptive_concurrency::tests::all_tests ... FAILED

jszwedko added 3 commits June 22, 2021 13:39
…kio-1.6.2

Signed-off-by: Jesse Szwedko <jesse@szwedko.me>
Signed-off-by: Jesse Szwedko <jesse@szwedko.me>
Signed-off-by: Jesse Szwedko <jesse@szwedko.me>
@jszwedko jszwedko merged commit e6d279e into master Jun 22, 2021
@jszwedko jszwedko deleted the dependabot/cargo/tokio-1.6.2 branch June 22, 2021 22:19
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
domain: deps Anything related to Vector's dependencies
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants