18
18
19
19
use std:: thread;
20
20
21
- use crate :: alerts:: ALERTS ;
22
- use crate :: correlation:: CORRELATIONS ;
23
21
use crate :: handlers:: airplane;
24
22
use crate :: handlers:: http:: cluster:: { self , init_cluster_metrics_schedular} ;
25
23
use crate :: handlers:: http:: middleware:: { DisAllowRootUser , RouteExt } ;
@@ -28,22 +26,20 @@ use crate::handlers::http::{logstream, MAX_EVENT_PAYLOAD_SIZE};
28
26
use crate :: handlers:: http:: { rbac, role} ;
29
27
use crate :: hottier:: HotTierManager ;
30
28
use crate :: rbac:: role:: Action ;
31
- use crate :: users:: dashboards:: DASHBOARDS ;
32
- use crate :: users:: filters:: FILTERS ;
33
29
use crate :: { analytics, migration, storage, sync} ;
34
30
use actix_web:: web:: { resource, ServiceConfig } ;
35
31
use actix_web:: { web, Scope } ;
36
32
use actix_web_prometheus:: PrometheusMetrics ;
37
33
use async_trait:: async_trait;
38
34
use bytes:: Bytes ;
39
35
use tokio:: sync:: oneshot;
40
- use tracing:: { error , info} ;
36
+ use tracing:: info;
41
37
42
38
use crate :: parseable:: PARSEABLE ;
43
39
use crate :: Server ;
44
40
45
41
use super :: query:: { querier_ingest, querier_logstream, querier_rbac, querier_role} ;
46
- use super :: { OpenIdClient , ParseableServer } ;
42
+ use super :: { load_on_init , OpenIdClient , ParseableServer } ;
47
43
48
44
pub struct QueryServer ;
49
45
@@ -90,7 +86,6 @@ impl ParseableServer for QueryServer {
90
86
) ) ;
91
87
}
92
88
93
- migration:: run_file_migration ( & PARSEABLE ) . await ?;
94
89
let parseable_json = PARSEABLE . validate_storage ( ) . await ?;
95
90
migration:: run_metadata_migration ( & PARSEABLE , & parseable_json) . await ?;
96
91
@@ -109,22 +104,8 @@ impl ParseableServer for QueryServer {
109
104
110
105
//create internal stream at server start
111
106
PARSEABLE . create_internal_stream_if_not_exists ( ) . await ?;
112
-
113
- if let Err ( e) = CORRELATIONS . load ( ) . await {
114
- error ! ( "{e}" ) ;
115
- }
116
- if let Err ( err) = FILTERS . load ( ) . await {
117
- error ! ( "{err}" )
118
- } ;
119
-
120
- if let Err ( err) = DASHBOARDS . load ( ) . await {
121
- error ! ( "{err}" )
122
- } ;
123
-
124
- if let Err ( err) = ALERTS . load ( ) . await {
125
- error ! ( "{err}" )
126
- } ;
127
-
107
+ // load on init
108
+ load_on_init ( ) . await ?;
128
109
// track all parquet files already in the data directory
129
110
storage:: retention:: load_retention_from_global ( ) ;
130
111
@@ -150,11 +131,11 @@ impl ParseableServer for QueryServer {
150
131
151
132
let result = self
152
133
. start ( shutdown_rx, prometheus. clone ( ) , PARSEABLE . options . openid ( ) )
153
- . await ;
134
+ . await ? ;
154
135
// Cancel sync jobs
155
136
cancel_tx. send ( ( ) ) . expect ( "Cancellation should not fail" ) ;
156
137
157
- result
138
+ Ok ( result)
158
139
}
159
140
}
160
141
0 commit comments