itsi-server 0.1.1 → 0.1.4
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Potentially problematic release.
This version of itsi-server might be problematic. Click here for more details.
- checksums.yaml +4 -4
- data/exe/itsi +88 -28
- data/ext/itsi_error/Cargo.toml +2 -0
- data/ext/itsi_error/src/from.rs +71 -0
- data/ext/itsi_error/src/lib.rs +12 -37
- data/ext/itsi_instrument_entry/Cargo.toml +15 -0
- data/ext/itsi_instrument_entry/src/lib.rs +31 -0
- data/ext/itsi_rb_helpers/Cargo.toml +2 -0
- data/ext/itsi_rb_helpers/src/heap_value.rs +121 -0
- data/ext/itsi_rb_helpers/src/lib.rs +90 -10
- data/ext/itsi_scheduler/Cargo.toml +24 -0
- data/ext/itsi_scheduler/extconf.rb +6 -0
- data/ext/itsi_scheduler/src/itsi_scheduler/io_helpers.rs +56 -0
- data/ext/itsi_scheduler/src/itsi_scheduler/io_waiter.rs +44 -0
- data/ext/itsi_scheduler/src/itsi_scheduler/timer.rs +44 -0
- data/ext/itsi_scheduler/src/itsi_scheduler.rs +308 -0
- data/ext/itsi_scheduler/src/lib.rs +38 -0
- data/ext/itsi_server/Cargo.toml +17 -3
- data/ext/itsi_server/extconf.rb +1 -1
- data/ext/itsi_server/src/body_proxy/big_bytes.rs +104 -0
- data/ext/itsi_server/src/body_proxy/itsi_body_proxy.rs +122 -0
- data/ext/itsi_server/src/body_proxy/mod.rs +2 -0
- data/ext/itsi_server/src/lib.rs +61 -7
- data/ext/itsi_server/src/request/itsi_request.rs +238 -104
- data/ext/itsi_server/src/response/itsi_response.rs +347 -0
- data/ext/itsi_server/src/response/mod.rs +1 -0
- data/ext/itsi_server/src/server/bind.rs +54 -23
- data/ext/itsi_server/src/server/bind_protocol.rs +37 -0
- data/ext/itsi_server/src/server/io_stream.rs +104 -0
- data/ext/itsi_server/src/server/itsi_ca/itsi_ca.crt +11 -30
- data/ext/itsi_server/src/server/itsi_ca/itsi_ca.key +3 -50
- data/ext/itsi_server/src/server/itsi_server.rs +196 -134
- data/ext/itsi_server/src/server/lifecycle_event.rs +9 -0
- data/ext/itsi_server/src/server/listener.rs +240 -132
- data/ext/itsi_server/src/server/mod.rs +7 -1
- data/ext/itsi_server/src/server/process_worker.rs +196 -0
- data/ext/itsi_server/src/server/serve_strategy/cluster_mode.rs +254 -0
- data/ext/itsi_server/src/server/serve_strategy/mod.rs +27 -0
- data/ext/itsi_server/src/server/serve_strategy/single_mode.rs +247 -0
- data/ext/itsi_server/src/server/signal.rs +70 -0
- data/ext/itsi_server/src/server/thread_worker.rs +368 -0
- data/ext/itsi_server/src/server/tls.rs +101 -51
- data/ext/itsi_tracing/Cargo.toml +4 -0
- data/ext/itsi_tracing/src/lib.rs +36 -6
- data/lib/itsi/request.rb +30 -14
- data/lib/itsi/server/rack/handler/itsi.rb +25 -0
- data/lib/itsi/server/scheduler_mode.rb +6 -0
- data/lib/itsi/server/version.rb +1 -1
- data/lib/itsi/server.rb +82 -2
- data/lib/itsi/signals.rb +23 -0
- data/lib/itsi/stream_io.rb +38 -0
- metadata +38 -25
- data/ext/itsi_server/src/server/transfer_protocol.rs +0 -23
- data/ext/itsi_server/src/stream_writer/mod.rs +0 -21
|
@@ -1,61 +1,138 @@
|
|
|
1
1
|
use super::bind::{Bind, BindAddress};
|
|
2
|
-
use super::
|
|
3
|
-
use
|
|
4
|
-
use
|
|
2
|
+
use super::bind_protocol::BindProtocol;
|
|
3
|
+
use super::io_stream::IoStream;
|
|
4
|
+
use super::tls::ItsiTlsAcceptor;
|
|
5
|
+
use itsi_error::{ItsiError, Result};
|
|
5
6
|
use itsi_tracing::info;
|
|
6
7
|
use socket2::{Domain, Protocol, Socket, Type};
|
|
7
|
-
use std::net::{IpAddr, SocketAddr, TcpListener
|
|
8
|
-
use std::pin::Pin;
|
|
8
|
+
use std::net::{IpAddr, SocketAddr, TcpListener};
|
|
9
9
|
use std::sync::Arc;
|
|
10
|
-
use std::{os::unix::net::UnixListener
|
|
11
|
-
use tokio::net::
|
|
10
|
+
use std::{os::unix::net::UnixListener, path::PathBuf};
|
|
11
|
+
use tokio::net::TcpListener as TokioTcpListener;
|
|
12
|
+
use tokio::net::UnixListener as TokioUnixListener;
|
|
13
|
+
use tokio::net::{unix, TcpStream, UnixStream};
|
|
12
14
|
use tokio_rustls::TlsAcceptor;
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
tokio::io::AsyncRead + tokio::io::AsyncWrite + Send + Unpin
|
|
16
|
-
{
|
|
17
|
-
}
|
|
18
|
-
impl<T: tokio::io::AsyncRead + tokio::io::AsyncWrite + Send + Unpin> IoStream for T {}
|
|
15
|
+
use tokio_stream::StreamExt;
|
|
16
|
+
use tracing::error;
|
|
19
17
|
|
|
20
18
|
pub(crate) enum Listener {
|
|
21
19
|
Tcp(TcpListener),
|
|
22
|
-
TcpTls((TcpListener,
|
|
20
|
+
TcpTls((TcpListener, ItsiTlsAcceptor)),
|
|
23
21
|
Unix(UnixListener),
|
|
24
|
-
UnixTls((UnixListener,
|
|
22
|
+
UnixTls((UnixListener, ItsiTlsAcceptor)),
|
|
25
23
|
}
|
|
26
24
|
|
|
27
|
-
enum
|
|
28
|
-
|
|
29
|
-
|
|
25
|
+
pub(crate) enum TokioListener {
|
|
26
|
+
Tcp {
|
|
27
|
+
listener: TokioTcpListener,
|
|
28
|
+
host: String,
|
|
29
|
+
port: u16,
|
|
30
|
+
},
|
|
31
|
+
TcpTls {
|
|
32
|
+
listener: TokioTcpListener,
|
|
33
|
+
acceptor: ItsiTlsAcceptor,
|
|
34
|
+
host: String,
|
|
35
|
+
port: u16,
|
|
36
|
+
},
|
|
37
|
+
Unix {
|
|
38
|
+
listener: TokioUnixListener,
|
|
39
|
+
},
|
|
40
|
+
UnixTls {
|
|
41
|
+
listener: TokioUnixListener,
|
|
42
|
+
acceptor: ItsiTlsAcceptor,
|
|
43
|
+
},
|
|
30
44
|
}
|
|
31
45
|
|
|
32
|
-
|
|
33
|
-
pub
|
|
34
|
-
Tcp(Arc<SocketAddr>),
|
|
35
|
-
Unix(Arc<unix::SocketAddr>),
|
|
36
|
-
}
|
|
37
|
-
impl std::fmt::Display for SockAddr {
|
|
38
|
-
fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
|
|
46
|
+
impl TokioListener {
|
|
47
|
+
pub fn unbind(self) {
|
|
39
48
|
match self {
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
49
|
+
TokioListener::Tcp { listener, .. } => drop(listener.into_std().unwrap()),
|
|
50
|
+
TokioListener::TcpTls { listener, .. } => drop(listener.into_std().unwrap()),
|
|
51
|
+
TokioListener::Unix { listener } => drop(listener.into_std().unwrap()),
|
|
52
|
+
TokioListener::UnixTls { listener, .. } => drop(listener.into_std().unwrap()),
|
|
53
|
+
};
|
|
54
|
+
}
|
|
55
|
+
pub(crate) async fn accept(&self) -> Result<IoStream> {
|
|
56
|
+
match self {
|
|
57
|
+
TokioListener::Tcp { listener, .. } => TokioListener::accept_tcp(listener).await,
|
|
58
|
+
TokioListener::TcpTls {
|
|
59
|
+
listener, acceptor, ..
|
|
60
|
+
} => TokioListener::accept_tls(listener, acceptor).await,
|
|
61
|
+
TokioListener::Unix { listener, .. } => TokioListener::accept_unix(listener).await,
|
|
62
|
+
TokioListener::UnixTls {
|
|
63
|
+
listener, acceptor, ..
|
|
64
|
+
} => TokioListener::accept_unix_tls(listener, acceptor).await,
|
|
45
65
|
}
|
|
46
66
|
}
|
|
47
|
-
}
|
|
48
67
|
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
68
|
+
async fn accept_tcp(listener: &TokioTcpListener) -> Result<IoStream> {
|
|
69
|
+
let tcp_stream = listener.accept().await?;
|
|
70
|
+
Self::to_tokio_io(Stream::TcpStream(tcp_stream), None).await
|
|
71
|
+
}
|
|
72
|
+
|
|
73
|
+
pub async fn spawn_state_task(&self) {
|
|
74
|
+
if let TokioListener::TcpTls {
|
|
75
|
+
acceptor: ItsiTlsAcceptor::Automatic(_acme_acceptor, state, _server_config),
|
|
76
|
+
..
|
|
77
|
+
} = self
|
|
78
|
+
{
|
|
79
|
+
let mut state = state.lock().await;
|
|
80
|
+
loop {
|
|
81
|
+
if let Some(event) = StreamExt::next(&mut *state).await {
|
|
82
|
+
info!("Received acme event: {:?}", event)
|
|
83
|
+
}
|
|
55
84
|
}
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
85
|
+
}
|
|
86
|
+
}
|
|
87
|
+
|
|
88
|
+
async fn accept_tls(
|
|
89
|
+
listener: &TokioTcpListener,
|
|
90
|
+
acceptor: &ItsiTlsAcceptor,
|
|
91
|
+
) -> Result<IoStream> {
|
|
92
|
+
let tcp_stream = listener.accept().await?;
|
|
93
|
+
match acceptor {
|
|
94
|
+
ItsiTlsAcceptor::Manual(tls_acceptor) => {
|
|
95
|
+
Self::to_tokio_io(Stream::TcpStream(tcp_stream), Some(tls_acceptor)).await
|
|
96
|
+
}
|
|
97
|
+
ItsiTlsAcceptor::Automatic(acme_acceptor, _, rustls_config) => {
|
|
98
|
+
let accept_future = acme_acceptor.accept(tcp_stream.0);
|
|
99
|
+
match accept_future.await.unwrap() {
|
|
100
|
+
None => Err(ItsiError::Pass()),
|
|
101
|
+
Some(start_handshake) => {
|
|
102
|
+
let tls_stream = start_handshake
|
|
103
|
+
.into_stream(rustls_config.clone())
|
|
104
|
+
.await
|
|
105
|
+
.unwrap();
|
|
106
|
+
// Wrap in your IoStream::TcpTls variant
|
|
107
|
+
Ok(IoStream::TcpTls {
|
|
108
|
+
stream: tls_stream,
|
|
109
|
+
addr: SockAddr::Tcp(Arc::new(tcp_stream.1)),
|
|
110
|
+
})
|
|
111
|
+
}
|
|
112
|
+
}
|
|
113
|
+
}
|
|
114
|
+
}
|
|
115
|
+
}
|
|
116
|
+
|
|
117
|
+
async fn accept_unix(listener: &TokioUnixListener) -> Result<IoStream> {
|
|
118
|
+
let unix_stream = listener.accept().await?;
|
|
119
|
+
Self::to_tokio_io(Stream::UnixStream(unix_stream), None).await
|
|
120
|
+
}
|
|
121
|
+
|
|
122
|
+
async fn accept_unix_tls(
|
|
123
|
+
listener: &TokioUnixListener,
|
|
124
|
+
acceptor: &ItsiTlsAcceptor,
|
|
125
|
+
) -> Result<IoStream> {
|
|
126
|
+
let unix_stream = listener.accept().await?;
|
|
127
|
+
match acceptor {
|
|
128
|
+
ItsiTlsAcceptor::Manual(tls_acceptor) => {
|
|
129
|
+
Self::to_tokio_io(Stream::UnixStream(unix_stream), Some(tls_acceptor)).await
|
|
130
|
+
}
|
|
131
|
+
ItsiTlsAcceptor::Automatic(_, _, _) => {
|
|
132
|
+
error!("Automatic TLS not supported on Unix sockets");
|
|
133
|
+
Err(ItsiError::UnsupportedProtocol(
|
|
134
|
+
"Automatic TLS on Unix Sockets".to_owned(),
|
|
135
|
+
))
|
|
59
136
|
}
|
|
60
137
|
}
|
|
61
138
|
}
|
|
@@ -63,156 +140,187 @@ impl Listener {
|
|
|
63
140
|
async fn to_tokio_io(
|
|
64
141
|
input_stream: Stream,
|
|
65
142
|
tls_acceptor: Option<&TlsAcceptor>,
|
|
66
|
-
) -> Result<
|
|
143
|
+
) -> Result<IoStream> {
|
|
67
144
|
match tls_acceptor {
|
|
68
145
|
Some(acceptor) => match input_stream {
|
|
69
146
|
Stream::TcpStream((tcp_stream, socket_address)) => {
|
|
70
147
|
match acceptor.accept(tcp_stream).await {
|
|
71
|
-
Ok(tls_stream) => Ok(
|
|
72
|
-
|
|
73
|
-
SockAddr::Tcp(Arc::new(socket_address)),
|
|
74
|
-
)
|
|
148
|
+
Ok(tls_stream) => Ok(IoStream::TcpTls {
|
|
149
|
+
stream: tls_stream,
|
|
150
|
+
addr: SockAddr::Tcp(Arc::new(socket_address)),
|
|
151
|
+
}),
|
|
75
152
|
Err(err) => Err(err.into()),
|
|
76
153
|
}
|
|
77
154
|
}
|
|
78
155
|
Stream::UnixStream((unix_stream, socket_address)) => {
|
|
79
156
|
match acceptor.accept(unix_stream).await {
|
|
80
|
-
Ok(tls_stream) => Ok(
|
|
81
|
-
|
|
82
|
-
SockAddr::Unix(Arc::new(socket_address)),
|
|
83
|
-
)
|
|
157
|
+
Ok(tls_stream) => Ok(IoStream::UnixTls {
|
|
158
|
+
stream: tls_stream,
|
|
159
|
+
addr: SockAddr::Unix(Arc::new(socket_address)),
|
|
160
|
+
}),
|
|
84
161
|
Err(err) => Err(err.into()),
|
|
85
162
|
}
|
|
86
163
|
}
|
|
87
164
|
},
|
|
88
165
|
None => match input_stream {
|
|
89
|
-
Stream::TcpStream((tcp_stream, socket_address)) => Ok(
|
|
90
|
-
|
|
91
|
-
SockAddr::Tcp(Arc::new(socket_address)),
|
|
92
|
-
)
|
|
93
|
-
Stream::UnixStream((unix_stream, socket_address)) => Ok(
|
|
94
|
-
|
|
95
|
-
SockAddr::Unix(Arc::new(socket_address)),
|
|
96
|
-
)
|
|
166
|
+
Stream::TcpStream((tcp_stream, socket_address)) => Ok(IoStream::Tcp {
|
|
167
|
+
stream: tcp_stream,
|
|
168
|
+
addr: SockAddr::Tcp(Arc::new(socket_address)),
|
|
169
|
+
}),
|
|
170
|
+
Stream::UnixStream((unix_stream, socket_address)) => Ok(IoStream::Unix {
|
|
171
|
+
stream: unix_stream,
|
|
172
|
+
addr: SockAddr::Unix(Arc::new(socket_address)),
|
|
173
|
+
}),
|
|
97
174
|
},
|
|
98
175
|
}
|
|
99
176
|
}
|
|
100
177
|
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
|
|
105
|
-
|
|
178
|
+
pub(crate) fn scheme(&self) -> String {
|
|
179
|
+
match self {
|
|
180
|
+
TokioListener::Tcp { .. } => "http".to_string(),
|
|
181
|
+
TokioListener::TcpTls { .. } => "https".to_string(),
|
|
182
|
+
TokioListener::Unix { .. } => "http".to_string(),
|
|
183
|
+
TokioListener::UnixTls { .. } => "https".to_string(),
|
|
184
|
+
}
|
|
106
185
|
}
|
|
107
186
|
|
|
108
|
-
|
|
109
|
-
|
|
110
|
-
|
|
111
|
-
|
|
112
|
-
|
|
113
|
-
|
|
187
|
+
pub(crate) fn port(&self) -> u16 {
|
|
188
|
+
match self {
|
|
189
|
+
TokioListener::Tcp { port, .. } => *port,
|
|
190
|
+
TokioListener::TcpTls { port, .. } => *port,
|
|
191
|
+
TokioListener::Unix { .. } => 0,
|
|
192
|
+
TokioListener::UnixTls { .. } => 0,
|
|
193
|
+
}
|
|
114
194
|
}
|
|
115
195
|
|
|
116
|
-
|
|
117
|
-
|
|
118
|
-
|
|
119
|
-
|
|
120
|
-
|
|
196
|
+
pub(crate) fn host(&self) -> String {
|
|
197
|
+
match self {
|
|
198
|
+
TokioListener::Tcp { host, .. } => host.to_string(),
|
|
199
|
+
TokioListener::TcpTls { host, .. } => host.to_string(),
|
|
200
|
+
TokioListener::Unix { .. } => "unix".to_string(),
|
|
201
|
+
TokioListener::UnixTls { .. } => "unix".to_string(),
|
|
202
|
+
}
|
|
121
203
|
}
|
|
204
|
+
}
|
|
122
205
|
|
|
123
|
-
|
|
124
|
-
|
|
125
|
-
|
|
126
|
-
|
|
127
|
-
let unix_stream = listener.accept().await?;
|
|
128
|
-
Self::to_tokio_io(Stream::UnixStream(unix_stream), Some(acceptor)).await
|
|
129
|
-
}
|
|
206
|
+
enum Stream {
|
|
207
|
+
TcpStream((TcpStream, SocketAddr)),
|
|
208
|
+
UnixStream((UnixStream, unix::SocketAddr)),
|
|
209
|
+
}
|
|
130
210
|
|
|
131
|
-
|
|
211
|
+
#[derive(Clone, Debug)]
|
|
212
|
+
pub enum SockAddr {
|
|
213
|
+
Tcp(Arc<SocketAddr>),
|
|
214
|
+
Unix(Arc<unix::SocketAddr>),
|
|
215
|
+
}
|
|
216
|
+
impl std::fmt::Display for SockAddr {
|
|
217
|
+
fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
|
|
132
218
|
match self {
|
|
133
|
-
|
|
134
|
-
|
|
135
|
-
|
|
136
|
-
|
|
219
|
+
SockAddr::Tcp(socket_addr) => write!(f, "{}", socket_addr.ip().to_canonical()),
|
|
220
|
+
SockAddr::Unix(socket_addr) => match socket_addr.as_pathname() {
|
|
221
|
+
Some(path) => write!(f, "{:?}", path),
|
|
222
|
+
None => write!(f, ""),
|
|
223
|
+
},
|
|
137
224
|
}
|
|
138
225
|
}
|
|
226
|
+
}
|
|
139
227
|
|
|
140
|
-
|
|
228
|
+
impl Listener {
|
|
229
|
+
pub fn unbind(self) {
|
|
141
230
|
match self {
|
|
142
|
-
Listener::Tcp(listener) => listener
|
|
143
|
-
Listener::TcpTls((listener, _)) => listener
|
|
144
|
-
Listener::Unix(
|
|
145
|
-
Listener::UnixTls(_) =>
|
|
146
|
-
}
|
|
231
|
+
Listener::Tcp(listener) => drop(listener),
|
|
232
|
+
Listener::TcpTls((listener, _)) => drop(listener),
|
|
233
|
+
Listener::Unix(listener) => drop(listener),
|
|
234
|
+
Listener::UnixTls((listener, _)) => drop(listener),
|
|
235
|
+
};
|
|
147
236
|
}
|
|
148
|
-
|
|
149
|
-
pub(crate) fn host(&self) -> String {
|
|
237
|
+
pub fn to_tokio_listener(&self) -> TokioListener {
|
|
150
238
|
match self {
|
|
151
|
-
Listener::Tcp(listener) =>
|
|
152
|
-
|
|
153
|
-
|
|
154
|
-
|
|
239
|
+
Listener::Tcp(listener) => TokioListener::Tcp {
|
|
240
|
+
listener: TokioTcpListener::from_std(TcpListener::try_clone(listener).unwrap())
|
|
241
|
+
.unwrap(),
|
|
242
|
+
host: listener
|
|
243
|
+
.local_addr()
|
|
244
|
+
.unwrap()
|
|
245
|
+
.ip()
|
|
246
|
+
.to_canonical()
|
|
247
|
+
.to_string(),
|
|
248
|
+
port: listener.local_addr().unwrap().port(),
|
|
249
|
+
},
|
|
250
|
+
Listener::TcpTls((listener, acceptor)) => TokioListener::TcpTls {
|
|
251
|
+
listener: TokioTcpListener::from_std(TcpListener::try_clone(listener).unwrap())
|
|
252
|
+
.unwrap(),
|
|
253
|
+
acceptor: acceptor.clone(),
|
|
254
|
+
host: listener
|
|
255
|
+
.local_addr()
|
|
256
|
+
.unwrap()
|
|
257
|
+
.ip()
|
|
258
|
+
.to_canonical()
|
|
259
|
+
.to_string(),
|
|
260
|
+
port: listener.local_addr().unwrap().port(),
|
|
261
|
+
},
|
|
262
|
+
Listener::Unix(listener) => TokioListener::Unix {
|
|
263
|
+
listener: TokioUnixListener::from_std(UnixListener::try_clone(listener).unwrap())
|
|
264
|
+
.unwrap(),
|
|
265
|
+
},
|
|
266
|
+
Listener::UnixTls((listener, acceptor)) => TokioListener::UnixTls {
|
|
267
|
+
listener: TokioUnixListener::from_std(UnixListener::try_clone(listener).unwrap())
|
|
268
|
+
.unwrap(),
|
|
269
|
+
acceptor: acceptor.clone(),
|
|
270
|
+
},
|
|
155
271
|
}
|
|
156
272
|
}
|
|
157
273
|
}
|
|
158
274
|
|
|
159
|
-
impl
|
|
160
|
-
|
|
161
|
-
|
|
275
|
+
impl TryFrom<Bind> for Listener {
|
|
276
|
+
type Error = itsi_error::ItsiError;
|
|
277
|
+
|
|
278
|
+
fn try_from(bind: Bind) -> std::result::Result<Self, Self::Error> {
|
|
279
|
+
let bound = match bind.address {
|
|
162
280
|
BindAddress::Ip(addr) => match bind.protocol {
|
|
163
|
-
|
|
164
|
-
|
|
165
|
-
|
|
166
|
-
|
|
167
|
-
let tcp_listener =
|
|
168
|
-
TcpListener::from_std(connect_tcp_socket(addr, bind.port.unwrap()))
|
|
169
|
-
.unwrap();
|
|
170
|
-
let tls_acceptor = TlsAcceptor::from(Arc::new(bind.tls_config.unwrap()));
|
|
171
|
-
Listener::TcpTls((tcp_listener, tls_acceptor))
|
|
281
|
+
BindProtocol::Http => Listener::Tcp(connect_tcp_socket(addr, bind.port.unwrap())?),
|
|
282
|
+
BindProtocol::Https => {
|
|
283
|
+
let tcp_listener = connect_tcp_socket(addr, bind.port.unwrap())?;
|
|
284
|
+
Listener::TcpTls((tcp_listener, bind.tls_config.unwrap()))
|
|
172
285
|
}
|
|
173
286
|
_ => unreachable!(),
|
|
174
287
|
},
|
|
175
288
|
BindAddress::UnixSocket(path) => match bind.tls_config {
|
|
176
|
-
Some(tls_config) =>
|
|
177
|
-
|
|
178
|
-
Listener::UnixTls((
|
|
179
|
-
UnixListener::from_std(connect_unix_socket(&path)).unwrap(),
|
|
180
|
-
tls_acceptor,
|
|
181
|
-
))
|
|
182
|
-
}
|
|
183
|
-
None => Listener::Unix(UnixListener::from_std(connect_unix_socket(&path)).unwrap()),
|
|
289
|
+
Some(tls_config) => Listener::UnixTls((connect_unix_socket(&path)?, tls_config)),
|
|
290
|
+
None => Listener::Unix(connect_unix_socket(&path)?),
|
|
184
291
|
},
|
|
185
|
-
}
|
|
292
|
+
};
|
|
293
|
+
Ok(bound)
|
|
186
294
|
}
|
|
187
295
|
}
|
|
188
296
|
|
|
189
|
-
fn connect_tcp_socket(addr: IpAddr, port: u16) ->
|
|
297
|
+
fn connect_tcp_socket(addr: IpAddr, port: u16) -> Result<TcpListener> {
|
|
190
298
|
let domain = match addr {
|
|
191
299
|
IpAddr::V4(_) => Domain::IPV4,
|
|
192
300
|
IpAddr::V6(_) => Domain::IPV6,
|
|
193
301
|
};
|
|
194
|
-
let socket = Socket::new(domain, Type::STREAM, Some(Protocol::TCP))
|
|
302
|
+
let socket = Socket::new(domain, Type::STREAM, Some(Protocol::TCP))?;
|
|
195
303
|
let socket_address: SocketAddr = SocketAddr::new(addr, port);
|
|
196
|
-
socket.set_reuse_address(true).ok();
|
|
197
304
|
socket.set_reuse_port(true).ok();
|
|
305
|
+
socket.set_reuse_address(true).ok();
|
|
198
306
|
socket.set_nonblocking(true).ok();
|
|
199
307
|
socket.set_nodelay(true).ok();
|
|
200
|
-
socket.set_recv_buffer_size(
|
|
201
|
-
|
|
202
|
-
socket.
|
|
203
|
-
socket.
|
|
204
|
-
socket.into()
|
|
308
|
+
socket.set_recv_buffer_size(262_144).ok();
|
|
309
|
+
socket.bind(&socket_address.into())?;
|
|
310
|
+
socket.listen(1024)?;
|
|
311
|
+
Ok(socket.into())
|
|
205
312
|
}
|
|
206
313
|
|
|
207
|
-
fn connect_unix_socket(path: &PathBuf) ->
|
|
314
|
+
fn connect_unix_socket(path: &PathBuf) -> Result<UnixListener> {
|
|
208
315
|
let _ = std::fs::remove_file(path);
|
|
209
|
-
let socket = Socket::new(Domain::UNIX, Type::STREAM, None)
|
|
316
|
+
let socket = Socket::new(Domain::UNIX, Type::STREAM, None)?;
|
|
210
317
|
socket.set_nonblocking(true).ok();
|
|
211
|
-
|
|
318
|
+
|
|
319
|
+
let socket_address = socket2::SockAddr::unix(path)?;
|
|
212
320
|
|
|
213
321
|
info!("Binding to {:?}", path);
|
|
214
|
-
socket.bind(&socket_address)
|
|
215
|
-
socket.listen(1024)
|
|
322
|
+
socket.bind(&socket_address)?;
|
|
323
|
+
socket.listen(1024)?;
|
|
216
324
|
|
|
217
|
-
socket.into()
|
|
325
|
+
Ok(socket.into())
|
|
218
326
|
}
|
|
@@ -1,5 +1,11 @@
|
|
|
1
1
|
pub mod bind;
|
|
2
|
+
pub mod bind_protocol;
|
|
3
|
+
pub mod io_stream;
|
|
2
4
|
pub mod itsi_server;
|
|
5
|
+
pub mod lifecycle_event;
|
|
3
6
|
pub mod listener;
|
|
7
|
+
pub mod process_worker;
|
|
8
|
+
pub mod serve_strategy;
|
|
9
|
+
pub mod signal;
|
|
10
|
+
pub mod thread_worker;
|
|
4
11
|
pub mod tls;
|
|
5
|
-
pub mod transfer_protocol;
|
|
@@ -0,0 +1,196 @@
|
|
|
1
|
+
use super::serve_strategy::{cluster_mode::ClusterMode, single_mode::SingleMode};
|
|
2
|
+
use itsi_error::{ItsiError, Result};
|
|
3
|
+
use itsi_rb_helpers::{call_with_gvl, call_without_gvl, create_ruby_thread, fork};
|
|
4
|
+
use itsi_tracing::error;
|
|
5
|
+
use nix::{
|
|
6
|
+
errno::Errno,
|
|
7
|
+
sys::{
|
|
8
|
+
signal::{
|
|
9
|
+
kill,
|
|
10
|
+
Signal::{SIGKILL, SIGTERM},
|
|
11
|
+
},
|
|
12
|
+
wait::{waitpid, WaitPidFlag, WaitStatus},
|
|
13
|
+
},
|
|
14
|
+
unistd::{setpgid, Pid},
|
|
15
|
+
};
|
|
16
|
+
use parking_lot::Mutex;
|
|
17
|
+
use std::{
|
|
18
|
+
process::{self, exit},
|
|
19
|
+
sync::Arc,
|
|
20
|
+
time::{Duration, Instant},
|
|
21
|
+
};
|
|
22
|
+
use sysinfo::System;
|
|
23
|
+
|
|
24
|
+
use tokio::{sync::watch, time::sleep};
|
|
25
|
+
use tracing::{info, instrument, warn};
|
|
26
|
+
|
|
27
|
+
#[derive(Clone, Debug)]
|
|
28
|
+
pub struct ProcessWorker {
|
|
29
|
+
pub worker_id: usize,
|
|
30
|
+
pub child_pid: Arc<Mutex<Option<Pid>>>,
|
|
31
|
+
pub started_at: Instant,
|
|
32
|
+
}
|
|
33
|
+
|
|
34
|
+
impl Default for ProcessWorker {
|
|
35
|
+
fn default() -> Self {
|
|
36
|
+
Self {
|
|
37
|
+
worker_id: 0,
|
|
38
|
+
child_pid: Arc::new(Mutex::new(None)),
|
|
39
|
+
started_at: Instant::now(),
|
|
40
|
+
}
|
|
41
|
+
}
|
|
42
|
+
}
|
|
43
|
+
|
|
44
|
+
impl ProcessWorker {
|
|
45
|
+
#[instrument(skip(self, cluster_template), fields(self.worker_id = %self.worker_id))]
|
|
46
|
+
pub(crate) fn boot(&self, cluster_template: Arc<ClusterMode>) -> Result<()> {
|
|
47
|
+
let child_pid = *self.child_pid.lock();
|
|
48
|
+
if let Some(pid) = child_pid {
|
|
49
|
+
if self.is_alive() {
|
|
50
|
+
if let Err(e) = kill(pid, SIGTERM) {
|
|
51
|
+
info!("Failed to send SIGTERM to process {}: {}", pid, e);
|
|
52
|
+
}
|
|
53
|
+
}
|
|
54
|
+
*self.child_pid.lock() = None;
|
|
55
|
+
}
|
|
56
|
+
|
|
57
|
+
match call_with_gvl(|_ruby| fork(cluster_template.server.after_fork.lock().clone())) {
|
|
58
|
+
Some(pid) => {
|
|
59
|
+
*self.child_pid.lock() = Some(Pid::from_raw(pid));
|
|
60
|
+
}
|
|
61
|
+
None => {
|
|
62
|
+
if let Err(e) = setpgid(
|
|
63
|
+
Pid::from_raw(process::id() as i32),
|
|
64
|
+
Pid::from_raw(process::id() as i32),
|
|
65
|
+
) {
|
|
66
|
+
error!("Failed to set process group ID: {}", e);
|
|
67
|
+
}
|
|
68
|
+
match SingleMode::new(
|
|
69
|
+
cluster_template.server.clone(),
|
|
70
|
+
cluster_template.listeners.clone(),
|
|
71
|
+
cluster_template.lifecycle_channel.clone(),
|
|
72
|
+
) {
|
|
73
|
+
Ok(single_mode) => {
|
|
74
|
+
Arc::new(single_mode).run().ok();
|
|
75
|
+
}
|
|
76
|
+
Err(e) => {
|
|
77
|
+
error!("Failed to boot into worker mode: {}", e);
|
|
78
|
+
}
|
|
79
|
+
}
|
|
80
|
+
exit(0)
|
|
81
|
+
}
|
|
82
|
+
}
|
|
83
|
+
Ok(())
|
|
84
|
+
}
|
|
85
|
+
|
|
86
|
+
pub(crate) fn memory_usage(&self) -> Option<u64> {
|
|
87
|
+
if let Some(pid) = *self.child_pid.lock() {
|
|
88
|
+
let s = System::new_all();
|
|
89
|
+
if let Some(process) = s.process(sysinfo::Pid::from(pid.as_raw() as usize)) {
|
|
90
|
+
return Some(process.memory());
|
|
91
|
+
}
|
|
92
|
+
}
|
|
93
|
+
None
|
|
94
|
+
}
|
|
95
|
+
|
|
96
|
+
pub(crate) async fn reboot(&self, cluster_template: Arc<ClusterMode>) -> Result<bool> {
|
|
97
|
+
self.graceful_shutdown(cluster_template.clone()).await;
|
|
98
|
+
let self_clone = self.clone();
|
|
99
|
+
let (booted_sender, mut booted_receiver) = watch::channel(false);
|
|
100
|
+
create_ruby_thread(move || {
|
|
101
|
+
call_without_gvl(move || {
|
|
102
|
+
if self_clone.boot(cluster_template).is_ok() {
|
|
103
|
+
booted_sender.send(true).ok()
|
|
104
|
+
} else {
|
|
105
|
+
booted_sender.send(false).ok()
|
|
106
|
+
};
|
|
107
|
+
})
|
|
108
|
+
});
|
|
109
|
+
|
|
110
|
+
booted_receiver
|
|
111
|
+
.changed()
|
|
112
|
+
.await
|
|
113
|
+
.map_err(|_| ItsiError::InternalServerError("Failed to boot worker".to_owned()))?;
|
|
114
|
+
|
|
115
|
+
let guard = booted_receiver.borrow();
|
|
116
|
+
let result = guard.to_owned();
|
|
117
|
+
// Not very robust, we should check to see if the worker is actually listening before considering this successful.
|
|
118
|
+
sleep(Duration::from_secs(1)).await;
|
|
119
|
+
Ok(result)
|
|
120
|
+
}
|
|
121
|
+
|
|
122
|
+
pub(crate) async fn graceful_shutdown(&self, cluster_template: Arc<ClusterMode>) {
|
|
123
|
+
let self_clone = self.clone();
|
|
124
|
+
self_clone.request_shutdown();
|
|
125
|
+
let force_kill_time =
|
|
126
|
+
Instant::now() + Duration::from_secs_f64(cluster_template.server.shutdown_timeout);
|
|
127
|
+
while self_clone.is_alive() && force_kill_time > Instant::now() {
|
|
128
|
+
tokio::time::sleep(Duration::from_millis(100)).await;
|
|
129
|
+
}
|
|
130
|
+
if self_clone.is_alive() {
|
|
131
|
+
self_clone.force_kill();
|
|
132
|
+
}
|
|
133
|
+
}
|
|
134
|
+
|
|
135
|
+
pub(crate) fn boot_if_dead(&self, cluster_template: Arc<ClusterMode>) -> bool {
|
|
136
|
+
if !self.is_alive() {
|
|
137
|
+
if self.just_started() {
|
|
138
|
+
error!(
|
|
139
|
+
"Worker in crash loop {:?}. Refusing to restart",
|
|
140
|
+
self.child_pid.lock()
|
|
141
|
+
);
|
|
142
|
+
return false;
|
|
143
|
+
} else {
|
|
144
|
+
let self_clone = self.clone();
|
|
145
|
+
create_ruby_thread(move || {
|
|
146
|
+
call_without_gvl(move || {
|
|
147
|
+
self_clone.boot(cluster_template).ok();
|
|
148
|
+
})
|
|
149
|
+
});
|
|
150
|
+
}
|
|
151
|
+
}
|
|
152
|
+
true
|
|
153
|
+
}
|
|
154
|
+
|
|
155
|
+
pub(crate) fn request_shutdown(&self) {
|
|
156
|
+
let child_pid = *self.child_pid.lock();
|
|
157
|
+
if let Some(pid) = child_pid {
|
|
158
|
+
if let Err(e) = kill(pid, SIGTERM) {
|
|
159
|
+
error!("Failed to send SIGTERM to process {}: {}", pid, e);
|
|
160
|
+
}
|
|
161
|
+
}
|
|
162
|
+
}
|
|
163
|
+
|
|
164
|
+
pub(crate) fn force_kill(&self) {
|
|
165
|
+
let child_pid = *self.child_pid.lock();
|
|
166
|
+
if let Some(pid) = child_pid {
|
|
167
|
+
if let Err(e) = kill(pid, SIGKILL) {
|
|
168
|
+
error!("Failed to force kill process {}: {}", pid, e);
|
|
169
|
+
}
|
|
170
|
+
}
|
|
171
|
+
}
|
|
172
|
+
|
|
173
|
+
pub(crate) fn just_started(&self) -> bool {
|
|
174
|
+
let now = Instant::now();
|
|
175
|
+
now.duration_since(self.started_at).as_millis() < 2000
|
|
176
|
+
}
|
|
177
|
+
|
|
178
|
+
pub(crate) fn is_alive(&self) -> bool {
|
|
179
|
+
let child_pid = *self.child_pid.lock();
|
|
180
|
+
if let Some(pid) = child_pid {
|
|
181
|
+
match waitpid(pid, Some(WaitPidFlag::WNOHANG)) {
|
|
182
|
+
Ok(WaitStatus::Exited(_, _)) | Ok(WaitStatus::Signaled(_, _, _)) => {
|
|
183
|
+
return false;
|
|
184
|
+
}
|
|
185
|
+
Ok(WaitStatus::StillAlive) | Ok(_) => {}
|
|
186
|
+
Err(_) => return false,
|
|
187
|
+
}
|
|
188
|
+
match kill(pid, None) {
|
|
189
|
+
Ok(_) => true,
|
|
190
|
+
Err(errno) => !matches!(errno, Errno::ESRCH),
|
|
191
|
+
}
|
|
192
|
+
} else {
|
|
193
|
+
false
|
|
194
|
+
}
|
|
195
|
+
}
|
|
196
|
+
}
|