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.

Sign up for GitHub

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

Jump to bottom

Release the read lock while creating connections inrefresh_connections #191

Merged
merged 2 commits into from
Oct 9, 2024
Merged

Release the read lock while creating connections inrefresh_connections #191

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
35c4775
Changed refresh_connections to release the connections container lock…
barshaul Sep 13, 2024
ec85a7b
Fixed PR comments
barshaul Oct 1, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
93 changes: 51 additions & 42 deletions redis/src/cluster_async/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1303,50 +1303,59 @@ where
check_existing_conn: bool,
) {
info!("Started refreshing connections to {:?}", addresses);
let connections_container = inner.conn_lock.read().await;
let cluster_params = &inner.cluster_params;
let subscriptions_by_address = &inner.subscriptions_by_address;
let glide_connection_optons = &inner.glide_connection_options;
let mut tasks = FuturesUnordered::new();
let inner = inner.clone();

stream::iter(addresses.into_iter())
.fold(
&*connections_container,
|connections_container, address| async move {
let node_option = if check_existing_conn {
connections_container.remove_node(&address)
} else {
None
};
for address in addresses.into_iter() {
let inner = inner.clone();

// override subscriptions for this connection
let mut cluster_params = cluster_params.clone();
let subs_guard = subscriptions_by_address.read().await;
cluster_params.pubsub_subscriptions = subs_guard.get(&address).cloned();
drop(subs_guard);
let node = get_or_create_conn(
&address,
node_option,
&cluster_params,
conn_type,
glide_connection_optons.clone(),
)
.await;
match node {
Ok(node) => {
connections_container
.replace_or_add_connection_for_address(address, node);
}
Err(err) => {
warn!(
"Failed to refresh connection for node {}. Error: `{:?}`",
address, err
);
}
}
connections_container
},
)
.await;
tasks.push(async move {
let connections_container = inner.conn_lock.read().await;
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Making a lock "public" is not a good idea. We should an atomic API and not the lock itself.

For example:

fn do_something() -> Result<(), Box<dyn Error>>{
  let _lk = self.lock.write()?;
  ...
}

if the "something" is complex, we should add an API:

fn write_lock_and_do<F>(callback: F) -> Result<(), Box<dyn Error>>
    where F: Fn() -> Result<(), Box<dyn Error>> {
    let _lk = self.lock.write()?;
    callback()
}

this way we have a full control over the lock and we can avoid misuse of the lock

Copy link
Author

@barshaul barshaul Oct 1, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think that's a good idea, lets do it in a seperate PR

let cluster_params = &inner.cluster_params;
let subscriptions_by_address = &inner.subscriptions_by_address;
let glide_connection_options = &inner.glide_connection_options;
barshaul marked this conversation as resolved.
Show resolved Hide resolved

let node_option = if check_existing_conn {
connections_container.remove_node(&address)
} else {
None
};

// Override subscriptions for this connection
let mut cluster_params = cluster_params.clone();
let subs_guard = subscriptions_by_address.read().await;
cluster_params.pubsub_subscriptions = subs_guard.get(&address).cloned();
drop(subs_guard);
drop(connections_container);

let node = get_or_create_conn(
&address,
node_option,
&cluster_params,
conn_type,
glide_connection_options.clone(),
barshaul marked this conversation as resolved.
Show resolved Hide resolved
)
.await;

(address, node)
});
}

// Poll connection tasks as soon as each one finishes
while let Some(result) = tasks.next().await {
match result {
(address, Ok(node)) => {
let connections_container = inner.conn_lock.read().await;
connections_container.replace_or_add_connection_for_address(address, node);
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We should expose API for inner for this function (replace_or_add_connection_for_address) and avoid exposing the lock here

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

same as above

}
(address, Err(err)) => {
warn!(
"Failed to refresh connection for node {}. Error: `{:?}`",
address, err
);
}
}
}
info!("refresh connections completed");
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is this something that happens often? if it does, please move this to debug!

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

changed

}

Expand Down