Fix jetstream reconnect #610
Conversation
Jarema
commented
Aug 15, 2022
•
Jarema
commented
- Added sending new request when disconnect followed by connect state is detected
- Added checking for timeout of pull request
- improved nats-server crate to allow restarts
Jarema
force-pushed
the
jarema/fix-jetstream-reconnect
branch
from
e6a7883
to
3ae2a7e
Compare
Jarema
force-pushed
the
jarema/fix-jetstream-reconnect
branch
2 times, most recently
from
56e9836
to
9c65c78
Compare
| context.client.state.changed().await.ok(); | ||
| let state = context.client.state.borrow().to_owned(); | ||
|
|
||
| let timeout_threshold = { |
There was a problem hiding this comment.
Collapse this into map_or?
| @@ -392,6 +397,7 @@ pub struct Stream<'a> { | |||
| subject: String, | |||
| batch_config: BatchConfig, | |||
| request: Option<BoxFuture<'a, Result<(), Error>>>, | |||
| since_last_request: Arc<Mutex<Instant>>, | |||
There was a problem hiding this comment.
Don't have to point this out but, obviously preferable to not have a mutex here.
But for a fix, we can allow it with the intent to iterate soon.
There was a problem hiding this comment.
Yeah, we could go with pending as atomic shared between task and iterator fn, with Instant hold on task only and having task only sending requests, but that also needs returning error from it via channel to iterator. I would prefer revisit it soon and now focus on more important work.
Jarema
force-pushed
the
jarema/fix-jetstream-reconnect
branch
from
2d464af
to
c37a3af
Compare
async-nats/tests/jetstream_tests.rs
Outdated
| @@ -1280,6 +1281,73 @@ mod jetstream { | |||
| assert_eq!(info.num_ack_pending, 8); | |||
| } | |||
|
|
|||
| #[tokio::test] | |||
| #[cfg_attr(target_os = "windows", ignore)] | |||
There was a problem hiding this comment.
I take it that Windows reconnect remain flaky?
There was a problem hiding this comment.
Hm, i actually changed the reconnections, allowing reset of server, but I would limit windows tests where feasible. Those windows gha runners are so slow they have weird impact on nats-server and connection.
| @@ -24,6 +24,13 @@ use rand::Rng; | |||
| use regex::Regex; | |||
|
|
|||
| pub struct Server { | |||
| inner: Inner, | |||
There was a problem hiding this comment.
Because if you would assing new server directly to *self, drop() is called, which wipes the data etc. i want to keep wiping data on drop.
Other solution is to return big tuple from run_server internal fn, but thats ugly.
inner looked like most convenient and clean way to approach this.
Jarema
force-pushed
the
jarema/fix-jetstream-reconnect
branch
from
1af29ce
to
3af83a1
Compare
