You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iggy.apache.org by gk...@apache.org on 2025/10/16 14:19:45 UTC
(iggy) branch io_uring_tpc updated: feat(io_uring): fix user scenario, invalid port in ws tests and lints (#2272)
This is an automated email from the ASF dual-hosted git repository.
gkoszyk pushed a commit to branch io_uring_tpc
in repository https://gitbox.apache.org/repos/asf/iggy.git
The following commit(s) were added to refs/heads/io_uring_tpc by this push:
new beb75dec8 feat(io_uring): fix user scenario, invalid port in ws tests and lints (#2272)
beb75dec8 is described below
commit beb75dec831fea4eb2f51ce423a5d93778f18e24
Author: Hubert Gruszecki <h....@gmail.com>
AuthorDate: Thu Oct 16 16:19:41 2025 +0200
feat(io_uring): fix user scenario, invalid port in ws tests and lints (#2272)
---
core/integration/tests/server/general.rs | 18 ++++++++-
core/sdk/src/websocket/websocket_client.rs | 4 +-
.../messages/flush_unsaved_buffer_handler.rs | 1 -
.../binary/handlers/streams/get_stream_handler.rs | 4 +-
core/server/src/http/messages.rs | 1 -
core/server/src/shard/mod.rs | 6 ++-
core/server/src/shard/system/messages.rs | 2 -
core/server/src/shard/system/users.rs | 34 +++++++++++------
core/server/src/slab/users.rs | 44 ++++++++++++++++++++++
.../server/src/websocket/websocket_tls_listener.rs | 3 +-
10 files changed, 92 insertions(+), 25 deletions(-)
diff --git a/core/integration/tests/server/general.rs b/core/integration/tests/server/general.rs
index 5f67c5c06..344b97d55 100644
--- a/core/integration/tests/server/general.rs
+++ b/core/integration/tests/server/general.rs
@@ -25,7 +25,7 @@ use test_case::test_matrix;
// TODO: Include other trasnsport protocols
#[test_matrix(
- [TransportProtocol::Http, TransportProtocol::Tcp, TransportProtocol::WebSocket],
+ [quic(), tcp(), http(), websocket()],
[
system_scenario(),
user_scenario(),
@@ -40,3 +40,19 @@ use test_case::test_matrix;
async fn matrix(transport: TransportProtocol, scenario: ScenarioFn) {
run_scenario(transport, scenario).await;
}
+
+fn quic() -> TransportProtocol {
+ TransportProtocol::Quic
+}
+
+fn tcp() -> TransportProtocol {
+ TransportProtocol::Tcp
+}
+
+fn http() -> TransportProtocol {
+ TransportProtocol::Http
+}
+
+fn websocket() -> TransportProtocol {
+ TransportProtocol::WebSocket
+}
diff --git a/core/sdk/src/websocket/websocket_client.rs b/core/sdk/src/websocket/websocket_client.rs
index a5d1414c2..44fcadaec 100644
--- a/core/sdk/src/websocket/websocket_client.rs
+++ b/core/sdk/src/websocket/websocket_client.rs
@@ -568,7 +568,7 @@ mod tests {
#[test]
fn should_be_created_with_default_config() {
let client = WebSocketClient::default();
- assert_eq!(client.config.server_address, "127.0.0.1:8080");
+ assert_eq!(client.config.server_address, "127.0.0.1:8092");
assert_eq!(
client.config.heartbeat_interval,
IggyDuration::from_str("5s").unwrap()
@@ -585,7 +585,7 @@ mod tests {
#[test]
fn should_succeed_from_connection_string() {
- let connection_string = "iggy+ws://user:secret@127.0.0.1:8080";
+ let connection_string = "iggy+ws://user:secret@127.0.0.1:8092";
let client = WebSocketClient::from_connection_string(connection_string);
assert!(client.is_ok());
}
diff --git a/core/server/src/binary/handlers/messages/flush_unsaved_buffer_handler.rs b/core/server/src/binary/handlers/messages/flush_unsaved_buffer_handler.rs
index 00f1f8aba..ab1da1ce8 100644
--- a/core/server/src/binary/handlers/messages/flush_unsaved_buffer_handler.rs
+++ b/core/server/src/binary/handlers/messages/flush_unsaved_buffer_handler.rs
@@ -20,7 +20,6 @@ use crate::binary::command::{BinaryServerCommand, ServerCommand, ServerCommandHa
use crate::binary::handlers::utils::receive_and_validate;
use crate::binary::{handlers::messages::COMPONENT, sender::SenderKind};
use crate::shard::IggyShard;
-use crate::shard::transmission::event::ShardEvent;
use crate::streaming::session::Session;
use anyhow::Result;
use error_set::ErrContext;
diff --git a/core/server/src/binary/handlers/streams/get_stream_handler.rs b/core/server/src/binary/handlers/streams/get_stream_handler.rs
index 2387df1b4..d84559cd7 100644
--- a/core/server/src/binary/handlers/streams/get_stream_handler.rs
+++ b/core/server/src/binary/handlers/streams/get_stream_handler.rs
@@ -53,9 +53,9 @@ impl ServerCommandHandler for GetStream {
.permissioner
.borrow()
.get_stream(session.get_user_id(), stream_id)
- .with_error_context(|_| {
+ .with_error_context(|e| {
format!(
- "permission denied to get stream with ID: {} for user with ID: {}",
+ "permission denied to get stream with ID: {} for user with ID: {}, error: {e}",
self.stream_id,
session.get_user_id(),
)
diff --git a/core/server/src/http/messages.rs b/core/server/src/http/messages.rs
index 61d1ee13a..84e1824e1 100644
--- a/core/server/src/http/messages.rs
+++ b/core/server/src/http/messages.rs
@@ -132,7 +132,6 @@ async fn flush_unsaved_buffer(
let stream_id = Identifier::from_str_value(&stream_id)?;
let topic_id = Identifier::from_str_value(&topic_id)?;
let partition_id = partition_id as usize;
- let session = Session::stateless(identity.user_id, identity.ip_address);
let flush_future = SendWrapper::new(state.shard.shard().flush_unsaved_buffer(
identity.user_id,
diff --git a/core/server/src/shard/mod.rs b/core/server/src/shard/mod.rs
index b0bc3058e..f65def97f 100644
--- a/core/server/src/shard/mod.rs
+++ b/core/server/src/shard/mod.rs
@@ -174,10 +174,12 @@ impl IggyShard {
// JWT token cleaner task is spawned inside HTTP server because it needs `AppState`.
- if self.config.quic.enabled {
+ // TODO(hubcio): QUIC doesn't properly work on all shards, especially tests `concurrent` and `system_scenario`.
+ // it's probably related to Endpoint not Cloned between shards, but all shards are creating its own instance.
+ // This way packet CID is invalid. (crypto-related stuff)
+ if self.config.quic.enabled && self.id == 0 {
continuous::spawn_quic_server(self.clone());
}
-
if self.config.websocket.enabled && self.id == 0 {
continuous::spawn_websocket_server(self.clone());
}
diff --git a/core/server/src/shard/system/messages.rs b/core/server/src/shard/system/messages.rs
index 74e0add16..967adb058 100644
--- a/core/server/src/shard/system/messages.rs
+++ b/core/server/src/shard/system/messages.rs
@@ -24,9 +24,7 @@ use crate::shard::transmission::frame::ShardResponse;
use crate::shard::transmission::message::{
ShardMessage, ShardRequest, ShardRequestPayload, ShardSendRequestResult,
};
-use crate::streaming::partitions::journal::Journal;
use crate::streaming::segments::{IggyIndexesMut, IggyMessagesBatchMut, IggyMessagesBatchSet};
-use crate::streaming::session::Session;
use crate::streaming::traits::MainOps;
use crate::streaming::utils::PooledBuffer;
use crate::streaming::{partitions, streams, topics};
diff --git a/core/server/src/shard/system/users.rs b/core/server/src/shard/system/users.rs
index 9ce5cb293..d4a952f95 100644
--- a/core/server/src/shard/system/users.rs
+++ b/core/server/src/shard/system/users.rs
@@ -114,13 +114,18 @@ impl IggyShard {
pub fn create_user_bypass_auth(
&self,
- _user_id: u32, // Ignored - Slab auto-assigns IDs
+ expected_user_id: u32,
username: &str,
password: &str,
status: UserStatus,
permissions: Option<Permissions>,
) -> Result<(), IggyError> {
- self.create_user_base(username, password, status, permissions)?;
+ let assigned_user_id = self.create_user_base(username, password, status, permissions)?;
+ assert_eq!(
+ assigned_user_id as u32, expected_user_id,
+ "User ID mismatch: expected {}, got {}. This indicates shards are out of sync.",
+ expected_user_id, assigned_user_id
+ );
Ok(())
}
@@ -226,6 +231,9 @@ impl IggyShard {
username: Option<String>,
status: Option<UserStatus>,
) -> Result<User, IggyError> {
+ let user = self.get_user(user_id)?;
+ let numeric_user_id = Identifier::numeric(user.id).unwrap();
+
if let Some(ref new_username) = username {
let user = self.get_user(user_id)?;
let existing_user = self.get_user(&new_username.to_owned().try_into()?);
@@ -233,19 +241,21 @@ impl IggyShard {
error!("User: {new_username} already exists.");
return Err(IggyError::UserAlreadyExists);
}
+
+ self.users.update_username(user_id, new_username.clone())?;
}
- self.users.with_user_mut(user_id, |user| {
- if let Some(username) = username {
- user.username = username;
- }
- if let Some(status) = status {
+ if let Some(status) = status {
+ self.users.with_user_mut(&numeric_user_id, |user| {
user.status = status;
- }
- user.clone()
- }).with_error_context(|error| {
- format!("{COMPONENT} update user (error: {error}) - failed to update user with id: {user_id}")
- })
+ }).with_error_context(|error| {
+ format!("{COMPONENT} update user (error: {error}) - failed to update user with id: {user_id}")
+ })?;
+ }
+ self.get_user(&numeric_user_id)
+ .with_error_context(|error| {
+ format!("{COMPONENT} update user (error: {error}) - failed to get updated user with id: {user_id}")
+ })
}
pub fn update_permissions(
diff --git a/core/server/src/slab/users.rs b/core/server/src/slab/users.rs
index 8a6949fa0..c4859a86e 100644
--- a/core/server/src/slab/users.rs
+++ b/core/server/src/slab/users.rs
@@ -137,4 +137,48 @@ impl Users {
pub fn get_id_by_username(&self, username: &str) -> Option<usize> {
self.index.borrow().get(username).copied()
}
+
+ pub fn update_username(
+ &self,
+ identifier: &Identifier,
+ new_username: String,
+ ) -> Result<(), IggyError> {
+ let id = match identifier.kind {
+ iggy_common::IdKind::Numeric => identifier.get_u32_value()? as usize,
+ iggy_common::IdKind::String => {
+ let username = identifier.get_string_value()?;
+ let index = self.index.borrow();
+ *index
+ .get(&username)
+ .ok_or_else(|| IggyError::ResourceNotFound(username.to_string()))?
+ }
+ };
+ let old_username = {
+ let users = self.users.borrow();
+ let user = users
+ .get(id)
+ .ok_or_else(|| IggyError::ResourceNotFound(identifier.to_string()))?;
+ user.username.clone()
+ };
+ if old_username == new_username {
+ return Ok(());
+ }
+ tracing::trace!(
+ "Updating username: '{}' → '{}' for user ID: {}",
+ old_username,
+ new_username,
+ id
+ );
+ {
+ let mut users = self.users.borrow_mut();
+ let user = users
+ .get_mut(id)
+ .ok_or_else(|| IggyError::ResourceNotFound(identifier.to_string()))?;
+ user.username = new_username.clone();
+ }
+ let mut index = self.index.borrow_mut();
+ index.remove(&old_username);
+ index.insert(new_username, id);
+ Ok(())
+ }
}
diff --git a/core/server/src/websocket/websocket_tls_listener.rs b/core/server/src/websocket/websocket_tls_listener.rs
index 4341a36e4..60a03ee91 100644
--- a/core/server/src/websocket/websocket_tls_listener.rs
+++ b/core/server/src/websocket/websocket_tls_listener.rs
@@ -152,7 +152,6 @@ async fn accept_loop(
loop {
let shard = shard.clone();
- let ws_config = ws_config.clone();
let acceptor = acceptor.clone();
let accept_future = listener.accept();
@@ -171,7 +170,7 @@ async fn accept_loop(
shard_info!(shard.id, "Accepted new TCP connection for WebSocket TLS handshake from: {}", remote_addr);
let shard_clone = shard.clone();
- let ws_config_clone = ws_config.clone();
+ let ws_config_clone = ws_config;
let registry = shard.task_registry.clone();
let registry_clone = registry.clone();