1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
use async_trait::async_trait;
use merino_settings::providers::TimeoutConfig;
use merino_suggest_traits::{
convert_config, reconfigure_or_remake, CacheInputs, CacheStatus, MakeFreshType, SetupError,
SuggestError, SuggestionProvider, SuggestionRequest, SuggestionResponse,
};
use std::time::Duration;
pub struct TimeoutProvider {
max_time: Duration,
inner: Box<dyn SuggestionProvider>,
}
impl TimeoutProvider {
#[must_use]
pub fn new_boxed(config: TimeoutConfig, inner: Box<dyn SuggestionProvider>) -> Box<Self> {
Box::new(Self {
max_time: config.max_time,
inner,
})
}
}
#[async_trait]
impl SuggestionProvider for TimeoutProvider {
fn name(&self) -> String {
format!("timeout({})", self.inner.name())
}
fn cache_inputs(&self, req: &SuggestionRequest, cache_inputs: &mut dyn CacheInputs) {
self.inner.cache_inputs(req, cache_inputs);
}
async fn suggest(&self, query: SuggestionRequest) -> Result<SuggestionResponse, SuggestError> {
let inner_fut = self.inner.suggest(query);
let timeout = tokio::time::timeout(self.max_time, inner_fut).await;
timeout.unwrap_or_else(|_timeout_elapsed| {
Ok(SuggestionResponse {
cache_status: CacheStatus::Error,
cache_ttl: None,
suggestions: vec![],
})
})
}
async fn reconfigure(
&mut self,
new_config: serde_json::Value,
make_fresh: &MakeFreshType,
) -> Result<(), SetupError> {
let new_config: TimeoutConfig = convert_config(new_config)?;
reconfigure_or_remake(&mut self.inner, *new_config.inner, make_fresh).await?;
self.max_time = new_config.max_time;
Ok(())
}
}
#[cfg(test)]
mod tests {
use super::TimeoutProvider;
use async_trait::async_trait;
use fake::{Fake, Faker};
use merino_settings::providers::{SuggestionProviderConfig, TimeoutConfig};
use merino_suggest_traits::{
CacheStatus, MakeFreshType, SetupError, SuggestError, Suggestion, SuggestionProvider,
SuggestionRequest, SuggestionResponse,
};
use std::time::Duration;
struct DelayProvider(Duration);
#[async_trait]
impl SuggestionProvider for DelayProvider {
fn name(&self) -> String {
format!("DelayProvider({}ms)", self.0.as_millis())
}
async fn suggest(
&self,
_query: SuggestionRequest,
) -> Result<SuggestionResponse, SuggestError> {
tokio::time::sleep(self.0).await;
Ok(SuggestionResponse {
cache_status: CacheStatus::NoCache,
cache_ttl: None,
suggestions: vec![Suggestion {
provider: self.name(),
..Faker.fake()
}],
})
}
async fn reconfigure(
&mut self,
_new_config: serde_json::Value,
_make_fresh: &MakeFreshType,
) -> Result<(), SetupError> {
Ok(())
}
}
#[tokio::test]
async fn test_provider_too_slow() {
let timeout_provider = TimeoutProvider {
max_time: Duration::from_millis(10),
inner: Box::new(DelayProvider(Duration::from_millis(1000))),
};
let res = timeout_provider
.suggest(Faker.fake())
.await
.expect("failed to get suggestion");
assert_eq!(res.suggestions, vec![]);
}
#[tokio::test]
async fn test_provider_fast_enough() {
let timeout_provider = TimeoutProvider {
max_time: Duration::from_millis(1000),
inner: Box::new(DelayProvider(Duration::from_millis(10))),
};
let res = timeout_provider
.suggest(Faker.fake())
.await
.expect("failed to get suggestion");
assert_eq!(res.suggestions.len(), 1);
assert_eq!(res.suggestions[0].provider, "DelayProvider(10ms)");
}
#[tokio::test]
async fn test_reconfigure() {
let mut timeout_provider = TimeoutProvider {
max_time: Duration::from_millis(1000),
inner: Box::new(DelayProvider(Duration::from_millis(10))),
};
let make_fresh: MakeFreshType = Box::new(move |_fresh_config: SuggestionProviderConfig| {
unreachable!();
});
let value = serde_json::to_value(TimeoutConfig::default()).expect("failed to serialize");
timeout_provider
.reconfigure(value, &make_fresh)
.await
.expect("failed to reconfigure");
assert_eq!(timeout_provider.max_time, TimeoutConfig::default().max_time);
}
}