upstream-archive/qdrant
1
0
Fork 0
mirror of https://github.com/qdrant/qdrant.git synced 2026-07-23 11:11:00 -05:00
Code Issues Packages Projects Releases Wiki Activity

allow to configure qdrant init file with env variable (#2316)

Browse Source 
* allow to configure qdrant init file with env variable

* Return path type from get_init_file_path

---------

Co-authored-by: timvisee <tim@visee.me>
This commit is contained in:
Andrey Vasnetsov
2023-07-24 16:37:36 +02:00
committed by generall
parent 52a8fb3a75
commit 4fd9b4dd1c
2 changed files with 15 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/startup.rs
View File

@@ -2,12 +2,19 @@
use std::backtrace::Backtrace;
use std::panic;
use std::path::PathBuf;
use log::LevelFilter;
use crate::common::error_reporting::ErrorReporter;
const INITIALIZED_FILE: &str = ".qdrant-initialized";
const DEFAULT_INITIALIZED_FILE: &str = ".qdrant-initialized";
fn get_init_file_path() -> PathBuf {
std::env::var("QDRANT_INIT_FILE_PATH")
.map(PathBuf::from)
.unwrap_or_else(|_| DEFAULT_INITIALIZED_FILE.into())
}
pub fn setup_logger(log_level: &str) {
let is_info = log_level.to_ascii_uppercase() == "INFO";
@@ -61,7 +68,7 @@ pub fn setup_panic_hook(reporting_enabled: bool, reporting_id: String) {
/// Creates a file that indicates that the server has been started.
/// This file is used to check if the server has been been successfully started before potential kill.
pub fn touch_started_file_indicator() {
if let Err(err) = std::fs::write(INITIALIZED_FILE, "") {
if let Err(err) = std::fs::write(get_init_file_path(), "") {
log::warn!("Failed to create init file indicator: {}", err);
}
}
@@ -69,8 +76,9 @@ pub fn touch_started_file_indicator() {
/// Removes a file that indicates that the server has been started.
/// Use before server initialization to avoid false positives.
pub fn remove_started_file_indicator() {
if std::path::Path::new(INITIALIZED_FILE).exists() {
if let Err(err) = std::fs::remove_file(INITIALIZED_FILE) {
let path = get_init_file_path();
if path.exists() {
if let Err(err) = std::fs::remove_file(path) {
log::warn!("Failed to remove init file indicator: {}", err);
}
}

6
tools/entrypoint.sh
View File

@@ -39,14 +39,14 @@ if [ $EXIT_CODE != 137 ]; then
exit $EXIT_CODE
fi
IS_INITIALIZED_FILE='.qdrant-initialized'
QDRANT_INIT_FILE_PATH=${QDRANT_INIT_FILE_PATH:-'.qdrant-initialized'}
RECOVERY_MESSAGE="Qdrant was killed during initialization. Most likely it's Out-of-Memory.
Please check memory consumption, increase memory limit or remove some collections and restart"
# Check that qdrant was initialized
# Qdrant creates IS_INITIALIZED_FILE file after initialization
# Qdrant creates QDRANT_INIT_FILE_PATH file after initialization
# So if it doesn't exist, qdrant was killed during initialization
if [ ! -f "$IS_INITIALIZED_FILE" ]; then
if [ ! -f "$QDRANT_INIT_FILE_PATH" ]; then
# Run qdrant in recovery mode.
# No collection operations are allowed in recovery mode except for removing collections
QDRANT__STORAGE__RECOVERY_MODE="$RECOVERY_MESSAGE" ./qdrant $@ &