search health
This commit is contained in:
Submodule client-gui2 updated: bee662d149...f4710c25be
@@ -104,12 +104,12 @@ message BackupOperationResponse {
|
|||||||
}
|
}
|
||||||
|
|
||||||
message BackupInfoResponse {
|
message BackupInfoResponse {
|
||||||
|
reserved 6, 22, 23, 24;
|
||||||
bool success = 1;
|
bool success = 1;
|
||||||
string output = 2;
|
string output = 2;
|
||||||
string server_version = 3;
|
string server_version = 3;
|
||||||
string database_name = 4;
|
string database_name = 4;
|
||||||
bool database_healthy = 5;
|
bool database_healthy = 5;
|
||||||
bool search_healthy = 6;
|
|
||||||
bool ecb_healthy = 7;
|
bool ecb_healthy = 7;
|
||||||
string ecb_status = 8;
|
string ecb_status = 8;
|
||||||
string dump_directory = 9;
|
string dump_directory = 9;
|
||||||
|
|||||||
@@ -2,11 +2,36 @@
|
|||||||
syntax = "proto3";
|
syntax = "proto3";
|
||||||
package komp_ac.search;
|
package komp_ac.search;
|
||||||
|
|
||||||
|
import "common.proto";
|
||||||
|
|
||||||
service Searcher {
|
service Searcher {
|
||||||
rpc Search(SearchRequest) returns (SearchResponse);
|
rpc Search(SearchRequest) returns (SearchResponse);
|
||||||
rpc Count(SearchRequest) returns (SearchCountResponse);
|
rpc Count(SearchRequest) returns (SearchCountResponse);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
service SearchHealth {
|
||||||
|
rpc GetHealth(komp_ac.common.Empty) returns (SearchHealthResponse);
|
||||||
|
}
|
||||||
|
|
||||||
|
message SearchIndexError {
|
||||||
|
int64 job_id = 1;
|
||||||
|
string profile_name = 2;
|
||||||
|
string table_name = 3;
|
||||||
|
int64 row_id = 4;
|
||||||
|
string operation = 5;
|
||||||
|
int32 attempts = 6;
|
||||||
|
string last_error = 7;
|
||||||
|
}
|
||||||
|
|
||||||
|
message SearchHealthResponse {
|
||||||
|
bool enabled = 1;
|
||||||
|
bool ready = 2;
|
||||||
|
bool healthy = 3;
|
||||||
|
uint64 pending_jobs = 4;
|
||||||
|
uint64 retrying_jobs = 5;
|
||||||
|
repeated SearchIndexError errors = 6;
|
||||||
|
}
|
||||||
|
|
||||||
message SearchCountResponse {
|
message SearchCountResponse {
|
||||||
uint64 count = 1;
|
uint64 count = 1;
|
||||||
}
|
}
|
||||||
|
|||||||
Binary file not shown.
@@ -111,8 +111,6 @@ pub struct BackupInfoResponse {
|
|||||||
pub database_name: ::prost::alloc::string::String,
|
pub database_name: ::prost::alloc::string::String,
|
||||||
#[prost(bool, tag = "5")]
|
#[prost(bool, tag = "5")]
|
||||||
pub database_healthy: bool,
|
pub database_healthy: bool,
|
||||||
#[prost(bool, tag = "6")]
|
|
||||||
pub search_healthy: bool,
|
|
||||||
#[prost(bool, tag = "7")]
|
#[prost(bool, tag = "7")]
|
||||||
pub ecb_healthy: bool,
|
pub ecb_healthy: bool,
|
||||||
#[prost(string, tag = "8")]
|
#[prost(string, tag = "8")]
|
||||||
|
|||||||
@@ -1,5 +1,39 @@
|
|||||||
// This file is @generated by prost-build.
|
// This file is @generated by prost-build.
|
||||||
#[derive(serde::Serialize, serde::Deserialize)]
|
#[derive(serde::Serialize, serde::Deserialize)]
|
||||||
|
#[derive(Clone, PartialEq, Eq, Hash, ::prost::Message)]
|
||||||
|
pub struct SearchIndexError {
|
||||||
|
#[prost(int64, tag = "1")]
|
||||||
|
pub job_id: i64,
|
||||||
|
#[prost(string, tag = "2")]
|
||||||
|
pub profile_name: ::prost::alloc::string::String,
|
||||||
|
#[prost(string, tag = "3")]
|
||||||
|
pub table_name: ::prost::alloc::string::String,
|
||||||
|
#[prost(int64, tag = "4")]
|
||||||
|
pub row_id: i64,
|
||||||
|
#[prost(string, tag = "5")]
|
||||||
|
pub operation: ::prost::alloc::string::String,
|
||||||
|
#[prost(int32, tag = "6")]
|
||||||
|
pub attempts: i32,
|
||||||
|
#[prost(string, tag = "7")]
|
||||||
|
pub last_error: ::prost::alloc::string::String,
|
||||||
|
}
|
||||||
|
#[derive(serde::Serialize, serde::Deserialize)]
|
||||||
|
#[derive(Clone, PartialEq, ::prost::Message)]
|
||||||
|
pub struct SearchHealthResponse {
|
||||||
|
#[prost(bool, tag = "1")]
|
||||||
|
pub enabled: bool,
|
||||||
|
#[prost(bool, tag = "2")]
|
||||||
|
pub ready: bool,
|
||||||
|
#[prost(bool, tag = "3")]
|
||||||
|
pub healthy: bool,
|
||||||
|
#[prost(uint64, tag = "4")]
|
||||||
|
pub pending_jobs: u64,
|
||||||
|
#[prost(uint64, tag = "5")]
|
||||||
|
pub retrying_jobs: u64,
|
||||||
|
#[prost(message, repeated, tag = "6")]
|
||||||
|
pub errors: ::prost::alloc::vec::Vec<SearchIndexError>,
|
||||||
|
}
|
||||||
|
#[derive(serde::Serialize, serde::Deserialize)]
|
||||||
#[derive(Clone, Copy, PartialEq, Eq, Hash, ::prost::Message)]
|
#[derive(Clone, Copy, PartialEq, Eq, Hash, ::prost::Message)]
|
||||||
pub struct SearchCountResponse {
|
pub struct SearchCountResponse {
|
||||||
#[prost(uint64, tag = "1")]
|
#[prost(uint64, tag = "1")]
|
||||||
@@ -538,3 +572,302 @@ pub mod searcher_server {
|
|||||||
const NAME: &'static str = SERVICE_NAME;
|
const NAME: &'static str = SERVICE_NAME;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
/// Generated client implementations.
|
||||||
|
pub mod search_health_client {
|
||||||
|
#![allow(
|
||||||
|
unused_variables,
|
||||||
|
dead_code,
|
||||||
|
missing_docs,
|
||||||
|
clippy::wildcard_imports,
|
||||||
|
clippy::let_unit_value,
|
||||||
|
)]
|
||||||
|
use tonic::codegen::*;
|
||||||
|
use tonic::codegen::http::Uri;
|
||||||
|
#[derive(Debug, Clone)]
|
||||||
|
pub struct SearchHealthClient<T> {
|
||||||
|
inner: tonic::client::Grpc<T>,
|
||||||
|
}
|
||||||
|
impl SearchHealthClient<tonic::transport::Channel> {
|
||||||
|
/// Attempt to create a new client by connecting to a given endpoint.
|
||||||
|
pub async fn connect<D>(dst: D) -> Result<Self, tonic::transport::Error>
|
||||||
|
where
|
||||||
|
D: TryInto<tonic::transport::Endpoint>,
|
||||||
|
D::Error: Into<StdError>,
|
||||||
|
{
|
||||||
|
let conn = tonic::transport::Endpoint::new(dst)?.connect().await?;
|
||||||
|
Ok(Self::new(conn))
|
||||||
|
}
|
||||||
|
}
|
||||||
|
impl<T> SearchHealthClient<T>
|
||||||
|
where
|
||||||
|
T: tonic::client::GrpcService<tonic::body::Body>,
|
||||||
|
T::Error: Into<StdError>,
|
||||||
|
T::ResponseBody: Body<Data = Bytes> + std::marker::Send + 'static,
|
||||||
|
<T::ResponseBody as Body>::Error: Into<StdError> + std::marker::Send,
|
||||||
|
{
|
||||||
|
pub fn new(inner: T) -> Self {
|
||||||
|
let inner = tonic::client::Grpc::new(inner);
|
||||||
|
Self { inner }
|
||||||
|
}
|
||||||
|
pub fn with_origin(inner: T, origin: Uri) -> Self {
|
||||||
|
let inner = tonic::client::Grpc::with_origin(inner, origin);
|
||||||
|
Self { inner }
|
||||||
|
}
|
||||||
|
pub fn with_interceptor<F>(
|
||||||
|
inner: T,
|
||||||
|
interceptor: F,
|
||||||
|
) -> SearchHealthClient<InterceptedService<T, F>>
|
||||||
|
where
|
||||||
|
F: tonic::service::Interceptor,
|
||||||
|
T::ResponseBody: Default,
|
||||||
|
T: tonic::codegen::Service<
|
||||||
|
http::Request<tonic::body::Body>,
|
||||||
|
Response = http::Response<
|
||||||
|
<T as tonic::client::GrpcService<tonic::body::Body>>::ResponseBody,
|
||||||
|
>,
|
||||||
|
>,
|
||||||
|
<T as tonic::codegen::Service<
|
||||||
|
http::Request<tonic::body::Body>,
|
||||||
|
>>::Error: Into<StdError> + std::marker::Send + std::marker::Sync,
|
||||||
|
{
|
||||||
|
SearchHealthClient::new(InterceptedService::new(inner, interceptor))
|
||||||
|
}
|
||||||
|
/// Compress requests with the given encoding.
|
||||||
|
///
|
||||||
|
/// This requires the server to support it otherwise it might respond with an
|
||||||
|
/// error.
|
||||||
|
#[must_use]
|
||||||
|
pub fn send_compressed(mut self, encoding: CompressionEncoding) -> Self {
|
||||||
|
self.inner = self.inner.send_compressed(encoding);
|
||||||
|
self
|
||||||
|
}
|
||||||
|
/// Enable decompressing responses.
|
||||||
|
#[must_use]
|
||||||
|
pub fn accept_compressed(mut self, encoding: CompressionEncoding) -> Self {
|
||||||
|
self.inner = self.inner.accept_compressed(encoding);
|
||||||
|
self
|
||||||
|
}
|
||||||
|
/// Limits the maximum size of a decoded message.
|
||||||
|
///
|
||||||
|
/// Default: `4MB`
|
||||||
|
#[must_use]
|
||||||
|
pub fn max_decoding_message_size(mut self, limit: usize) -> Self {
|
||||||
|
self.inner = self.inner.max_decoding_message_size(limit);
|
||||||
|
self
|
||||||
|
}
|
||||||
|
/// Limits the maximum size of an encoded message.
|
||||||
|
///
|
||||||
|
/// Default: `usize::MAX`
|
||||||
|
#[must_use]
|
||||||
|
pub fn max_encoding_message_size(mut self, limit: usize) -> Self {
|
||||||
|
self.inner = self.inner.max_encoding_message_size(limit);
|
||||||
|
self
|
||||||
|
}
|
||||||
|
pub async fn get_health(
|
||||||
|
&mut self,
|
||||||
|
request: impl tonic::IntoRequest<super::super::common::Empty>,
|
||||||
|
) -> std::result::Result<
|
||||||
|
tonic::Response<super::SearchHealthResponse>,
|
||||||
|
tonic::Status,
|
||||||
|
> {
|
||||||
|
self.inner
|
||||||
|
.ready()
|
||||||
|
.await
|
||||||
|
.map_err(|e| {
|
||||||
|
tonic::Status::unknown(
|
||||||
|
format!("Service was not ready: {}", e.into()),
|
||||||
|
)
|
||||||
|
})?;
|
||||||
|
let codec = tonic_prost::ProstCodec::default();
|
||||||
|
let path = http::uri::PathAndQuery::from_static(
|
||||||
|
"/komp_ac.search.SearchHealth/GetHealth",
|
||||||
|
);
|
||||||
|
let mut req = request.into_request();
|
||||||
|
req.extensions_mut()
|
||||||
|
.insert(GrpcMethod::new("komp_ac.search.SearchHealth", "GetHealth"));
|
||||||
|
self.inner.unary(req, path, codec).await
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
/// Generated server implementations.
|
||||||
|
pub mod search_health_server {
|
||||||
|
#![allow(
|
||||||
|
unused_variables,
|
||||||
|
dead_code,
|
||||||
|
missing_docs,
|
||||||
|
clippy::wildcard_imports,
|
||||||
|
clippy::let_unit_value,
|
||||||
|
)]
|
||||||
|
use tonic::codegen::*;
|
||||||
|
/// Generated trait containing gRPC methods that should be implemented for use with SearchHealthServer.
|
||||||
|
#[async_trait]
|
||||||
|
pub trait SearchHealth: std::marker::Send + std::marker::Sync + 'static {
|
||||||
|
async fn get_health(
|
||||||
|
&self,
|
||||||
|
request: tonic::Request<super::super::common::Empty>,
|
||||||
|
) -> std::result::Result<
|
||||||
|
tonic::Response<super::SearchHealthResponse>,
|
||||||
|
tonic::Status,
|
||||||
|
>;
|
||||||
|
}
|
||||||
|
#[derive(Debug)]
|
||||||
|
pub struct SearchHealthServer<T> {
|
||||||
|
inner: Arc<T>,
|
||||||
|
accept_compression_encodings: EnabledCompressionEncodings,
|
||||||
|
send_compression_encodings: EnabledCompressionEncodings,
|
||||||
|
max_decoding_message_size: Option<usize>,
|
||||||
|
max_encoding_message_size: Option<usize>,
|
||||||
|
}
|
||||||
|
impl<T> SearchHealthServer<T> {
|
||||||
|
pub fn new(inner: T) -> Self {
|
||||||
|
Self::from_arc(Arc::new(inner))
|
||||||
|
}
|
||||||
|
pub fn from_arc(inner: Arc<T>) -> Self {
|
||||||
|
Self {
|
||||||
|
inner,
|
||||||
|
accept_compression_encodings: Default::default(),
|
||||||
|
send_compression_encodings: Default::default(),
|
||||||
|
max_decoding_message_size: None,
|
||||||
|
max_encoding_message_size: None,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
pub fn with_interceptor<F>(
|
||||||
|
inner: T,
|
||||||
|
interceptor: F,
|
||||||
|
) -> InterceptedService<Self, F>
|
||||||
|
where
|
||||||
|
F: tonic::service::Interceptor,
|
||||||
|
{
|
||||||
|
InterceptedService::new(Self::new(inner), interceptor)
|
||||||
|
}
|
||||||
|
/// Enable decompressing requests with the given encoding.
|
||||||
|
#[must_use]
|
||||||
|
pub fn accept_compressed(mut self, encoding: CompressionEncoding) -> Self {
|
||||||
|
self.accept_compression_encodings.enable(encoding);
|
||||||
|
self
|
||||||
|
}
|
||||||
|
/// Compress responses with the given encoding, if the client supports it.
|
||||||
|
#[must_use]
|
||||||
|
pub fn send_compressed(mut self, encoding: CompressionEncoding) -> Self {
|
||||||
|
self.send_compression_encodings.enable(encoding);
|
||||||
|
self
|
||||||
|
}
|
||||||
|
/// Limits the maximum size of a decoded message.
|
||||||
|
///
|
||||||
|
/// Default: `4MB`
|
||||||
|
#[must_use]
|
||||||
|
pub fn max_decoding_message_size(mut self, limit: usize) -> Self {
|
||||||
|
self.max_decoding_message_size = Some(limit);
|
||||||
|
self
|
||||||
|
}
|
||||||
|
/// Limits the maximum size of an encoded message.
|
||||||
|
///
|
||||||
|
/// Default: `usize::MAX`
|
||||||
|
#[must_use]
|
||||||
|
pub fn max_encoding_message_size(mut self, limit: usize) -> Self {
|
||||||
|
self.max_encoding_message_size = Some(limit);
|
||||||
|
self
|
||||||
|
}
|
||||||
|
}
|
||||||
|
impl<T, B> tonic::codegen::Service<http::Request<B>> for SearchHealthServer<T>
|
||||||
|
where
|
||||||
|
T: SearchHealth,
|
||||||
|
B: Body + std::marker::Send + 'static,
|
||||||
|
B::Error: Into<StdError> + std::marker::Send + 'static,
|
||||||
|
{
|
||||||
|
type Response = http::Response<tonic::body::Body>;
|
||||||
|
type Error = std::convert::Infallible;
|
||||||
|
type Future = BoxFuture<Self::Response, Self::Error>;
|
||||||
|
fn poll_ready(
|
||||||
|
&mut self,
|
||||||
|
_cx: &mut Context<'_>,
|
||||||
|
) -> Poll<std::result::Result<(), Self::Error>> {
|
||||||
|
Poll::Ready(Ok(()))
|
||||||
|
}
|
||||||
|
fn call(&mut self, req: http::Request<B>) -> Self::Future {
|
||||||
|
match req.uri().path() {
|
||||||
|
"/komp_ac.search.SearchHealth/GetHealth" => {
|
||||||
|
#[allow(non_camel_case_types)]
|
||||||
|
struct GetHealthSvc<T: SearchHealth>(pub Arc<T>);
|
||||||
|
impl<
|
||||||
|
T: SearchHealth,
|
||||||
|
> tonic::server::UnaryService<super::super::common::Empty>
|
||||||
|
for GetHealthSvc<T> {
|
||||||
|
type Response = super::SearchHealthResponse;
|
||||||
|
type Future = BoxFuture<
|
||||||
|
tonic::Response<Self::Response>,
|
||||||
|
tonic::Status,
|
||||||
|
>;
|
||||||
|
fn call(
|
||||||
|
&mut self,
|
||||||
|
request: tonic::Request<super::super::common::Empty>,
|
||||||
|
) -> Self::Future {
|
||||||
|
let inner = Arc::clone(&self.0);
|
||||||
|
let fut = async move {
|
||||||
|
<T as SearchHealth>::get_health(&inner, request).await
|
||||||
|
};
|
||||||
|
Box::pin(fut)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
let accept_compression_encodings = self.accept_compression_encodings;
|
||||||
|
let send_compression_encodings = self.send_compression_encodings;
|
||||||
|
let max_decoding_message_size = self.max_decoding_message_size;
|
||||||
|
let max_encoding_message_size = self.max_encoding_message_size;
|
||||||
|
let inner = self.inner.clone();
|
||||||
|
let fut = async move {
|
||||||
|
let method = GetHealthSvc(inner);
|
||||||
|
let codec = tonic_prost::ProstCodec::default();
|
||||||
|
let mut grpc = tonic::server::Grpc::new(codec)
|
||||||
|
.apply_compression_config(
|
||||||
|
accept_compression_encodings,
|
||||||
|
send_compression_encodings,
|
||||||
|
)
|
||||||
|
.apply_max_message_size_config(
|
||||||
|
max_decoding_message_size,
|
||||||
|
max_encoding_message_size,
|
||||||
|
);
|
||||||
|
let res = grpc.unary(method, req).await;
|
||||||
|
Ok(res)
|
||||||
|
};
|
||||||
|
Box::pin(fut)
|
||||||
|
}
|
||||||
|
_ => {
|
||||||
|
Box::pin(async move {
|
||||||
|
let mut response = http::Response::new(
|
||||||
|
tonic::body::Body::default(),
|
||||||
|
);
|
||||||
|
let headers = response.headers_mut();
|
||||||
|
headers
|
||||||
|
.insert(
|
||||||
|
tonic::Status::GRPC_STATUS,
|
||||||
|
(tonic::Code::Unimplemented as i32).into(),
|
||||||
|
);
|
||||||
|
headers
|
||||||
|
.insert(
|
||||||
|
http::header::CONTENT_TYPE,
|
||||||
|
tonic::metadata::GRPC_CONTENT_TYPE,
|
||||||
|
);
|
||||||
|
Ok(response)
|
||||||
|
})
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
impl<T> Clone for SearchHealthServer<T> {
|
||||||
|
fn clone(&self) -> Self {
|
||||||
|
let inner = self.inner.clone();
|
||||||
|
Self {
|
||||||
|
inner,
|
||||||
|
accept_compression_encodings: self.accept_compression_encodings,
|
||||||
|
send_compression_encodings: self.send_compression_encodings,
|
||||||
|
max_decoding_message_size: self.max_decoding_message_size,
|
||||||
|
max_encoding_message_size: self.max_encoding_message_size,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
/// Generated gRPC service name
|
||||||
|
pub const SERVICE_NAME: &str = "komp_ac.search.SearchHealth";
|
||||||
|
impl<T> tonic::server::NamedService for SearchHealthServer<T> {
|
||||||
|
const NAME: &'static str = SERVICE_NAME;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|||||||
@@ -12,13 +12,20 @@ binary are downloaded by `flatpak-builder` as checksum-pinned sources.
|
|||||||
|
|
||||||
## Build
|
## Build
|
||||||
|
|
||||||
Install `flatpak` and `flatpak-builder` through the host package manager, then
|
Install `flatpak`, `flatpak-builder`, and `appstreamcli` through the host package
|
||||||
run from the repository root:
|
manager, then run from the repository root:
|
||||||
|
|
||||||
```sh
|
```sh
|
||||||
packaging/flatpak/build.sh
|
packaging/flatpak/build.sh
|
||||||
```
|
```
|
||||||
|
|
||||||
|
On NixOS, all three tools can be provided without changing the system
|
||||||
|
configuration:
|
||||||
|
|
||||||
|
```sh
|
||||||
|
nix shell nixpkgs#flatpak nixpkgs#flatpak-builder nixpkgs#appstream
|
||||||
|
```
|
||||||
|
|
||||||
The script configures the per-user Flathub remote when necessary, installs the
|
The script configures the per-user Flathub remote when necessary, installs the
|
||||||
GNOME SDK and SDK extensions through `flatpak-builder`, retains its reusable
|
GNOME SDK and SDK extensions through `flatpak-builder`, retains its reusable
|
||||||
cache below `${XDG_CACHE_HOME:-$HOME/.cache}/komp-ac-flatpak-builder`, and
|
cache below `${XDG_CACHE_HOME:-$HOME/.cache}/komp-ac-flatpak-builder`, and
|
||||||
|
|||||||
@@ -20,7 +20,7 @@ if [[ "$(uname -m)" != x86_64 ]]; then
|
|||||||
echo "The Flatpak production build currently supports x86_64 only" >&2
|
echo "The Flatpak production build currently supports x86_64 only" >&2
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
for command in flatpak flatpak-builder; do
|
for command in flatpak flatpak-builder appstreamcli; do
|
||||||
if ! command -v "$command" >/dev/null 2>&1; then
|
if ! command -v "$command" >/dev/null 2>&1; then
|
||||||
echo "$command is required to build the Flatpak" >&2
|
echo "$command is required to build the Flatpak" >&2
|
||||||
exit 1
|
exit 1
|
||||||
|
|||||||
2
server
2
server
Submodule server updated: 652c3f685b...c0d3d85384
Reference in New Issue
Block a user