-
Notifications
You must be signed in to change notification settings - Fork 13
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
fix(dgw) : improvement in network-scanner-net #665
Conversation
@irvingoujAtDevolution Do you know what was the problem exactly? |
parking_lot = "0.12.1" | ||
polling = "3.3.2" | ||
polling = {git = "https://github.com/irvingoujAtDevolution/polling.git"} |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
a updated version to polling, allow us to kown weather tcp connection has failed or not.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
waiting to be merged into polling main branch smol-rs/polling#185
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It is merged, I will update it once they publish a new version
My guess is race condition, the event is fired before it actually received, then we let the event slide which causes deadlock (tokio waiting for waker to be called). The dev computer has a much faster cpu core, hence it might able to capture it before it slides away. Of course, all of these are just hypothesis, but it does seem like solved the problem. |
@irvingoujAtDevolution It might be the case that the problem is still not solved unfortunately :/ |
@CBenoit |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I officially, albeit temporarily, give up on fixing the test. I have about a 10% chance of failing the tests with tracing_subscriber turned off, and 0% when it's turned on. I'm confident that it will work fine with TCP, as seen in intense_tcp.rs. For now, I've added an ignore tag to all the tests, but I plan to return and fix them in the future. The progress I've made along the way is encouraging: the async runtime now drops correctly, the first event information after calling add is registered correctly, and the TCP connection can correctly detect weather or not the connection fails (not just guessing anymore). @CBenoit, thank you very much for your help; I'll try to figure it out later next time. |
Sorry, I reviewed the code in the other PR: #637 |
Updated according to the reviews |
I updated to point on a commit from the official polling repo, it’s less likely to break in the future. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thank you!
…n-Master commit 66249d6 Author: irving ou <[email protected]> Date: Mon Feb 5 13:47:50 2024 -0500 Fix tests commit a227487 Author: Irving Ou <[email protected]> Date: Mon Feb 5 12:12:54 2024 -0500 CI and Review fix rm bench marks remove clone functions remove unnessary Ok!() macro commit 00e2865 Author: Irving Ou <[email protected]> Date: Mon Feb 5 12:06:05 2024 -0500 review fix commit e68b37d Author: Irving Ou <[email protected]> Date: Mon Feb 5 12:02:09 2024 -0500 fix connect logic commit 20df4fd Author: Irving Ou <[email protected]> Date: Mon Feb 5 11:56:38 2024 -0500 Fix Runtime Logic commit 6325c7f Author: Irving Ou <[email protected]> Date: Mon Feb 5 11:50:38 2024 -0500 Debuggin test commit a9c41a9 Author: irving ou <[email protected]> Date: Mon Feb 5 12:26:38 2024 -0500 Update test.rs commit b145e36 Author: irving ou <[email protected]> Date: Mon Feb 5 09:09:36 2024 -0500 clippy and fmt commit 2d2f054 Author: irving ou <[email protected]> Date: Mon Feb 5 09:08:37 2024 -0500 fix ci test commit c9d7af4 Author: irving ou <[email protected]> Date: Sun Feb 4 23:26:28 2024 -0500 checkout master for tests commit 7c6f256 Author: irving ou <[email protected]> Date: Sun Feb 4 23:24:52 2024 -0500 checkout master for examples commit 178c6c0 Author: irving ou <[email protected]> Date: Sun Feb 4 23:24:17 2024 -0500 remove drop runtime commit cda38e5 Author: irving ou <[email protected]> Date: Sun Feb 4 23:23:35 2024 -0500 update cargo commit 4c60074 Author: irving ou <[email protected]> Date: Sun Feb 4 23:19:47 2024 -0500 Cargo.lock commit bc31f68 Author: irving ou <[email protected]> Date: Sun Feb 4 23:18:58 2024 -0500 Network Scanner finished commit 6665340 Author: Krista House <[email protected]> Date: Sat Feb 3 03:48:34 2024 -0500 feat(webapp): KDC proxy support for RDP sessions (#682) commit 7333e1e Author: Benoît Cortier <[email protected]> Date: Fri Feb 2 23:29:23 2024 +0900 refactor(dgw): fix clippy warnings in network scan (#680) commit 9e956f2 Author: irvingouj @ Devolutions <[email protected]> Date: Thu Feb 1 09:03:55 2024 -0500 refactor(dgw): improve network-scanner-net crate (#665) commit fd049af Author: Krista House <[email protected]> Date: Thu Feb 1 01:17:41 2024 -0500 fix(webapp): fix bug managing active sessions in the left sidebar menu (#679) commit 8a62ff5 Author: Krista House <[email protected]> Date: Tue Jan 30 23:54:51 2024 -0500 feat(webapp): add full screen mode for monitor screen commit d358815 Author: Richard Markiewicz <[email protected]> Date: Tue Jan 30 15:05:58 2024 -0500 fix(ci): fix invalid path in package workflow (#677) commit 6980cbf Author: irvingouj @ Devolutions <[email protected]> Date: Tue Jan 30 11:33:26 2024 -0500 fix (network scan) : rename network scan claim type and update .Net lib version (#676) * rename network scan claim type and update .Net lib version * update enum names * Update NetworkScanClaims.cs * fix commit 039cd56 Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon Jan 29 23:17:09 2024 -0500 build(deps): bump the serde group with 2 updates (#674) Bumps the serde group with 2 updates: [serde](https://github.com/serde-rs/serde) and [serde_json](https://github.com/serde-rs/json). Updates `serde` from 1.0.195 to 1.0.196 - [Release notes](https://github.com/serde-rs/serde/releases) - [Commits](serde-rs/serde@v1.0.195...v1.0.196) Updates `serde_json` from 1.0.111 to 1.0.113 - [Release notes](https://github.com/serde-rs/json/releases) - [Commits](serde-rs/json@v1.0.111...v1.0.113) --- updated-dependencies: - dependency-name: serde dependency-type: direct:production update-type: version-update:semver-patch dependency-group: serde - dependency-name: serde_json dependency-type: direct:production update-type: version-update:semver-patch dependency-group: serde ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> commit f8ac4da Author: irvingouj @ Devolutions <[email protected]> Date: Mon Jan 29 16:00:22 2024 -0500 feat(Network-Scan): Added Network Scan JWT token type (#673) * Network-Scan: Token Generation for both Gateway and .Net side Another half * ci,fmt * add test * small fix * ci, fmt Squashed commit of the following: commit 2411062 Author: irving ou <[email protected]> Date: Mon Feb 5 17:48:56 2024 -0500 clippy commit 1b37f06 Author: irving ou <[email protected]> Date: Mon Feb 5 17:41:30 2024 -0500 small fixes, change log level commit d92ec84 Author: irving ou <[email protected]> Date: Mon Feb 5 17:34:05 2024 -0500 remove code not related to PR commit d05cf0b Author: Irving Ou <[email protected]> Date: Mon Feb 5 16:31:50 2024 -0500 Fix linux test commit 66249d6 Author: irving ou <[email protected]> Date: Mon Feb 5 13:47:50 2024 -0500 Fix tests commit a227487 Author: Irving Ou <[email protected]> Date: Mon Feb 5 12:12:54 2024 -0500 CI and Review fix rm bench marks remove clone functions remove unnessary Ok!() macro commit 00e2865 Author: Irving Ou <[email protected]> Date: Mon Feb 5 12:06:05 2024 -0500 review fix commit e68b37d Author: Irving Ou <[email protected]> Date: Mon Feb 5 12:02:09 2024 -0500 fix connect logic commit 20df4fd Author: Irving Ou <[email protected]> Date: Mon Feb 5 11:56:38 2024 -0500 Fix Runtime Logic commit 6325c7f Author: Irving Ou <[email protected]> Date: Mon Feb 5 11:50:38 2024 -0500 Debuggin test commit a9c41a9 Author: irving ou <[email protected]> Date: Mon Feb 5 12:26:38 2024 -0500 Update test.rs commit b145e36 Author: irving ou <[email protected]> Date: Mon Feb 5 09:09:36 2024 -0500 clippy and fmt commit 2d2f054 Author: irving ou <[email protected]> Date: Mon Feb 5 09:08:37 2024 -0500 fix ci test commit c9d7af4 Author: irving ou <[email protected]> Date: Sun Feb 4 23:26:28 2024 -0500 checkout master for tests commit 7c6f256 Author: irving ou <[email protected]> Date: Sun Feb 4 23:24:52 2024 -0500 checkout master for examples commit 178c6c0 Author: irving ou <[email protected]> Date: Sun Feb 4 23:24:17 2024 -0500 remove drop runtime commit cda38e5 Author: irving ou <[email protected]> Date: Sun Feb 4 23:23:35 2024 -0500 update cargo commit 4c60074 Author: irving ou <[email protected]> Date: Sun Feb 4 23:19:47 2024 -0500 Cargo.lock commit bc31f68 Author: irving ou <[email protected]> Date: Sun Feb 4 23:18:58 2024 -0500 Network Scanner finished commit 6665340 Author: Krista House <[email protected]> Date: Sat Feb 3 03:48:34 2024 -0500 feat(webapp): KDC proxy support for RDP sessions (#682) commit 7333e1e Author: Benoît Cortier <[email protected]> Date: Fri Feb 2 23:29:23 2024 +0900 refactor(dgw): fix clippy warnings in network scan (#680) commit 9e956f2 Author: irvingouj @ Devolutions <[email protected]> Date: Thu Feb 1 09:03:55 2024 -0500 refactor(dgw): improve network-scanner-net crate (#665) commit fd049af Author: Krista House <[email protected]> Date: Thu Feb 1 01:17:41 2024 -0500 fix(webapp): fix bug managing active sessions in the left sidebar menu (#679) commit 8a62ff5 Author: Krista House <[email protected]> Date: Tue Jan 30 23:54:51 2024 -0500 feat(webapp): add full screen mode for monitor screen commit d358815 Author: Richard Markiewicz <[email protected]> Date: Tue Jan 30 15:05:58 2024 -0500 fix(ci): fix invalid path in package workflow (#677) commit 6980cbf Author: irvingouj @ Devolutions <[email protected]> Date: Tue Jan 30 11:33:26 2024 -0500 fix (network scan) : rename network scan claim type and update .Net lib version (#676) * rename network scan claim type and update .Net lib version * update enum names * Update NetworkScanClaims.cs * fix commit 039cd56 Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon Jan 29 23:17:09 2024 -0500 build(deps): bump the serde group with 2 updates (#674) Bumps the serde group with 2 updates: [serde](https://github.com/serde-rs/serde) and [serde_json](https://github.com/serde-rs/json). Updates `serde` from 1.0.195 to 1.0.196 - [Release notes](https://github.com/serde-rs/serde/releases) - [Commits](serde-rs/serde@v1.0.195...v1.0.196) Updates `serde_json` from 1.0.111 to 1.0.113 - [Release notes](https://github.com/serde-rs/json/releases) - [Commits](serde-rs/json@v1.0.111...v1.0.113) --- updated-dependencies: - dependency-name: serde dependency-type: direct:production update-type: version-update:semver-patch dependency-group: serde - dependency-name: serde_json dependency-type: direct:production update-type: version-update:semver-patch dependency-group: serde ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> commit f8ac4da Author: irvingouj @ Devolutions <[email protected]> Date: Mon Jan 29 16:00:22 2024 -0500 feat(Network-Scan): Added Network Scan JWT token type (#673) * Network-Scan: Token Generation for both Gateway and .Net side Another half * ci,fmt * add test * small fix * ci, fmt
commit a81b396 Author: irving ou <[email protected]> Date: Wed Feb 7 13:20:18 2024 -0500 fix linux commit a68569f Author: irving ou <[email protected]> Date: Wed Feb 7 13:14:56 2024 -0500 fix linux commit 8941a61 Author: irving ou <[email protected]> Date: Wed Feb 7 13:10:19 2024 -0500 fix linux commit 1dac52d Author: irving ou <[email protected]> Date: Wed Feb 7 13:02:36 2024 -0500 update polling commit 29a227c Author: irving ou <[email protected]> Date: Wed Feb 7 11:12:04 2024 -0500 remove unnecessary count commit 1d0f4e1 Merge: 857510c 7f36173 Author: irving ou <[email protected]> Date: Wed Feb 7 11:04:35 2024 -0500 Merge branch 'Network-Scan-Scanner' of github.com:Devolutions/devolutions-gateway into Network-Scan-Scanner commit 7f36173 Author: irvingouj @ Devolutions <[email protected]> Date: Wed Feb 7 11:02:04 2024 -0500 Update crates/network-scanner-proto/README.md Co-authored-by: Benoît Cortier <[email protected]> commit 857510c Author: irving ou <[email protected]> Date: Wed Feb 7 10:59:19 2024 -0500 remove dashmap commit 8d5e3ce Author: irving ou <[email protected]> Date: Wed Feb 7 10:15:43 2024 -0500 Fix, add task mamanger commit fd41583 Author: irvingouj @ Devolutions <[email protected]> Date: Tue Feb 6 11:09:44 2024 -0500 Update crates/network-scanner-proto/Cargo.toml Co-authored-by: Benoît Cortier <[email protected]> commit 14277e0 Merge: 2411062 a9bd1cc Author: irvingouj @ Devolutions <[email protected]> Date: Mon Feb 5 22:47:52 2024 -0500 Merge branch 'master' into Network-Scan-Scanner commit a9bd1cc Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon Feb 5 21:54:21 2024 -0500 build(deps): bump the tokio group with 1 update (#685) Bumps the tokio group with 1 update: [tokio](https://github.com/tokio-rs/tokio). Updates `tokio` from 1.35.1 to 1.36.0 - [Release notes](https://github.com/tokio-rs/tokio/releases) - [Commits](tokio-rs/tokio@tokio-1.35.1...tokio-1.36.0) --- updated-dependencies: - dependency-name: tokio dependency-type: direct:production update-type: version-update:semver-minor dependency-group: tokio ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> commit 2411062 Author: irving ou <[email protected]> Date: Mon Feb 5 17:48:56 2024 -0500 clippy commit 1b37f06 Author: irving ou <[email protected]> Date: Mon Feb 5 17:41:30 2024 -0500 small fixes, change log level commit d92ec84 Author: irving ou <[email protected]> Date: Mon Feb 5 17:34:05 2024 -0500 remove code not related to PR commit d05cf0b Author: Irving Ou <[email protected]> Date: Mon Feb 5 16:31:50 2024 -0500 Fix linux test commit 66249d6 Author: irving ou <[email protected]> Date: Mon Feb 5 13:47:50 2024 -0500 Fix tests commit a227487 Author: Irving Ou <[email protected]> Date: Mon Feb 5 12:12:54 2024 -0500 CI and Review fix rm bench marks remove clone functions remove unnessary Ok!() macro commit 00e2865 Author: Irving Ou <[email protected]> Date: Mon Feb 5 12:06:05 2024 -0500 review fix commit e68b37d Author: Irving Ou <[email protected]> Date: Mon Feb 5 12:02:09 2024 -0500 fix connect logic commit 20df4fd Author: Irving Ou <[email protected]> Date: Mon Feb 5 11:56:38 2024 -0500 Fix Runtime Logic commit 6325c7f Author: Irving Ou <[email protected]> Date: Mon Feb 5 11:50:38 2024 -0500 Debuggin test commit a9c41a9 Author: irving ou <[email protected]> Date: Mon Feb 5 12:26:38 2024 -0500 Update test.rs commit f72c198 Author: Richard Markiewicz <[email protected]> Date: Mon Feb 5 11:02:43 2024 -0500 feat(installer): rework properties, conditions; UI polish and bug fixes (#684) commit b145e36 Author: irving ou <[email protected]> Date: Mon Feb 5 09:09:36 2024 -0500 clippy and fmt commit 2d2f054 Author: irving ou <[email protected]> Date: Mon Feb 5 09:08:37 2024 -0500 fix ci test commit c9d7af4 Author: irving ou <[email protected]> Date: Sun Feb 4 23:26:28 2024 -0500 checkout master for tests commit 7c6f256 Author: irving ou <[email protected]> Date: Sun Feb 4 23:24:52 2024 -0500 checkout master for examples commit 178c6c0 Author: irving ou <[email protected]> Date: Sun Feb 4 23:24:17 2024 -0500 remove drop runtime commit cda38e5 Author: irving ou <[email protected]> Date: Sun Feb 4 23:23:35 2024 -0500 update cargo commit 4c60074 Author: irving ou <[email protected]> Date: Sun Feb 4 23:19:47 2024 -0500 Cargo.lock commit bc31f68 Author: irving ou <[email protected]> Date: Sun Feb 4 23:18:58 2024 -0500 Network Scanner finished commit 6665340 Author: Krista House <[email protected]> Date: Sat Feb 3 03:48:34 2024 -0500 feat(webapp): KDC proxy support for RDP sessions (#682) commit 7333e1e Author: Benoît Cortier <[email protected]> Date: Fri Feb 2 23:29:23 2024 +0900 refactor(dgw): fix clippy warnings in network scan (#680) commit 9e956f2 Author: irvingouj @ Devolutions <[email protected]> Date: Thu Feb 1 09:03:55 2024 -0500 refactor(dgw): improve network-scanner-net crate (#665) commit fd049af Author: Krista House <[email protected]> Date: Thu Feb 1 01:17:41 2024 -0500 fix(webapp): fix bug managing active sessions in the left sidebar menu (#679) commit 8a62ff5 Author: Krista House <[email protected]> Date: Tue Jan 30 23:54:51 2024 -0500 feat(webapp): add full screen mode for monitor screen commit d358815 Author: Richard Markiewicz <[email protected]> Date: Tue Jan 30 15:05:58 2024 -0500 fix(ci): fix invalid path in package workflow (#677) commit 6980cbf Author: irvingouj @ Devolutions <[email protected]> Date: Tue Jan 30 11:33:26 2024 -0500 fix (network scan) : rename network scan claim type and update .Net lib version (#676) * rename network scan claim type and update .Net lib version * update enum names * Update NetworkScanClaims.cs * fix commit 039cd56 Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon Jan 29 23:17:09 2024 -0500 build(deps): bump the serde group with 2 updates (#674) Bumps the serde group with 2 updates: [serde](https://github.com/serde-rs/serde) and [serde_json](https://github.com/serde-rs/json). Updates `serde` from 1.0.195 to 1.0.196 - [Release notes](https://github.com/serde-rs/serde/releases) - [Commits](serde-rs/serde@v1.0.195...v1.0.196) Updates `serde_json` from 1.0.111 to 1.0.113 - [Release notes](https://github.com/serde-rs/json/releases) - [Commits](serde-rs/json@v1.0.111...v1.0.113) --- updated-dependencies: - dependency-name: serde dependency-type: direct:production update-type: version-update:semver-patch dependency-group: serde - dependency-name: serde_json dependency-type: direct:production update-type: version-update:semver-patch dependency-group: serde ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> commit f8ac4da Author: irvingouj @ Devolutions <[email protected]> Date: Mon Jan 29 16:00:22 2024 -0500 feat(Network-Scan): Added Network Scan JWT token type (#673) * Network-Scan: Token Generation for both Gateway and .Net side Another half * ci,fmt * add test * small fix * ci, fmt
The tests were always running fine on my machine, trying to figure out why it does not work in CI.
Edit 0: looks like it works in this run, try remove tracing
Edit 1: looks like it is working again, re-run to make sure it really really works.
Edit 2:CI test is working again with this change, I'm confident this will fix the test