mirror of
https://github.com/rustfs/rustfs.git
synced 2026-08-07 22:03:14 +00:00
c5df1f92c2
* improve code for notify * improve code for logger and fix typo (#272) * Add GNU to build.yml (#275) * fix unzip error * fix url change error fix url change error * Simplify user experience and integrate console and endpoint Simplify user experience and integrate console and endpoint * Add gnu to build.yml * upgrade version * feat: add `cargo clippy --fix --allow-dirty` to pre-commit command (#282) Resolves #277 - Add --fix flag to automatically fix clippy warnings - Add --allow-dirty flag to run on dirty Git trees - Improves code quality in pre-commit workflow * fix: the issue where preview fails when the path length exceeds 255 characters (#280) * fix * fix: improve Windows build support and CI/CD workflow (#283) - Fix Windows zip command issue by using PowerShell Compress-Archive - Add Windows support for OSS upload with ossutil - Replace Chinese comments with English in build.yml - Fix bash syntax error in package_zip function - Improve code formatting and consistency - Update various configuration files for better cross-platform support Resolves Windows build failures in GitHub Actions. * fix: update link in README.md leading to a 404 error (#285) * add rustfs.spec for rustfs (#103) add support on loongarch64 * improve cargo.lock * build(deps): bump the dependencies group with 5 updates (#289) Bumps the dependencies group with 5 updates: | Package | From | To | | --- | --- | --- | | [hyper-util](https://github.com/hyperium/hyper-util) | `0.1.15` | `0.1.16` | | [rand](https://github.com/rust-random/rand) | `0.9.1` | `0.9.2` | | [serde_json](https://github.com/serde-rs/json) | `1.0.140` | `1.0.141` | | [strum](https://github.com/Peternator7/strum) | `0.27.1` | `0.27.2` | | [sysinfo](https://github.com/GuillaumeGomez/sysinfo) | `0.36.0` | `0.36.1` | Updates `hyper-util` from 0.1.15 to 0.1.16 - [Release notes](https://github.com/hyperium/hyper-util/releases) - [Changelog](https://github.com/hyperium/hyper-util/blob/master/CHANGELOG.md) - [Commits](https://github.com/hyperium/hyper-util/compare/v0.1.15...v0.1.16) Updates `rand` from 0.9.1 to 0.9.2 - [Release notes](https://github.com/rust-random/rand/releases) - [Changelog](https://github.com/rust-random/rand/blob/master/CHANGELOG.md) - [Commits](https://github.com/rust-random/rand/compare/rand_core-0.9.1...rand_core-0.9.2) Updates `serde_json` from 1.0.140 to 1.0.141 - [Release notes](https://github.com/serde-rs/json/releases) - [Commits](https://github.com/serde-rs/json/compare/v1.0.140...v1.0.141) Updates `strum` from 0.27.1 to 0.27.2 - [Release notes](https://github.com/Peternator7/strum/releases) - [Changelog](https://github.com/Peternator7/strum/blob/master/CHANGELOG.md) - [Commits](https://github.com/Peternator7/strum/compare/v0.27.1...v0.27.2) Updates `sysinfo` from 0.36.0 to 0.36.1 - [Changelog](https://github.com/GuillaumeGomez/sysinfo/blob/master/CHANGELOG.md) - [Commits](https://github.com/GuillaumeGomez/sysinfo/compare/v0.36.0...v0.36.1) --- updated-dependencies: - dependency-name: hyper-util dependency-version: 0.1.16 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: dependencies - dependency-name: rand dependency-version: 0.9.2 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: dependencies - dependency-name: serde_json dependency-version: 1.0.141 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: dependencies - dependency-name: strum dependency-version: 0.27.2 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: dependencies - dependency-name: sysinfo dependency-version: 0.36.1 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: dependencies ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * improve code for logger * improve * upgrade * refactor: 优化构建工作流,统一 latest 文件处理和简化制品上传 (#293) * Refactor: DatabaseManagerSystem as global Signed-off-by: junxiang Mu <1948535941@qq.com> * fix: fmt Signed-off-by: junxiang Mu <1948535941@qq.com> * Test: add e2e_test for s3select Signed-off-by: junxiang Mu <1948535941@qq.com> * Test: add test script for e2e Signed-off-by: junxiang Mu <1948535941@qq.com> * improve code for registry and intergation * improve code for registry `create_targets_from_config` * fix * Feature up/ilm (#305) * fix * fix * fix * fix delete-marker expiration. add api_restore. * fix * time retry object upload * lock file * make fmt * fix * restore object * fix * fix * serde-rs-xml -> quick-xml * fix * checksum * fix * fix * fix * fix * fix * fix * fix * transfer lang to english * upgrade clap version from 4.5.41 to 4.5.42 * refactor: replace `lazy_static` with `LazyLock` * add router * fix: modify comment * improve code * fix typos * fix * fix: modify name and fmt * improve code for registry * fix test --------- Signed-off-by: dependabot[bot] <support@github.com> Signed-off-by: junxiang Mu <1948535941@qq.com> Co-authored-by: loverustfs <155562731+loverustfs@users.noreply.github.com> Co-authored-by: 安正超 <anzhengchao@gmail.com> Co-authored-by: shiro.lee <69624924+shiroleeee@users.noreply.github.com> Co-authored-by: Marco Orlandin <mipnamic@mipnamic.net> Co-authored-by: zhangwenlong <zhangwenlong@loongson.cn> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: junxiang Mu <1948535941@qq.com> Co-authored-by: likewu <likewu@126.com>
229 lines
6.4 KiB
Rust
229 lines
6.4 KiB
Rust
// Copyright 2024 RustFS Team
|
|
//
|
|
// Licensed under the Apache License, Version 2.0 (the "License");
|
|
// you may not use this file except in compliance with the License.
|
|
// You may obtain a copy of the License at
|
|
//
|
|
// http://www.apache.org/licenses/LICENSE-2.0
|
|
//
|
|
// Unless required by applicable law or agreed to in writing, software
|
|
// distributed under the License is distributed on an "AS IS" BASIS,
|
|
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
// See the License for the specific language governing permissions and
|
|
// limitations under the License.
|
|
|
|
pub mod com;
|
|
#[allow(dead_code)]
|
|
pub mod heal;
|
|
mod notify;
|
|
pub mod storageclass;
|
|
|
|
use crate::error::Result;
|
|
use crate::store::ECStore;
|
|
use com::{STORAGE_CLASS_SUB_SYS, lookup_configs, read_config_without_migrate};
|
|
use rustfs_config::DEFAULT_DELIMITER;
|
|
use rustfs_config::notify::{COMMENT_KEY, NOTIFY_MQTT_SUB_SYS, NOTIFY_WEBHOOK_SUB_SYS};
|
|
use serde::{Deserialize, Serialize};
|
|
use std::collections::HashMap;
|
|
use std::sync::LazyLock;
|
|
use std::sync::{Arc, OnceLock};
|
|
|
|
pub static GLOBAL_STORAGE_CLASS: LazyLock<OnceLock<storageclass::Config>> = LazyLock::new(OnceLock::new);
|
|
pub static DEFAULT_KVS: LazyLock<OnceLock<HashMap<String, KVS>>> = LazyLock::new(OnceLock::new);
|
|
pub static GLOBAL_SERVER_CONFIG: LazyLock<OnceLock<Config>> = LazyLock::new(OnceLock::new);
|
|
pub static GLOBAL_CONFIG_SYS: LazyLock<ConfigSys> = LazyLock::new(ConfigSys::new);
|
|
|
|
pub const ENV_ACCESS_KEY: &str = "RUSTFS_ACCESS_KEY";
|
|
pub const ENV_SECRET_KEY: &str = "RUSTFS_SECRET_KEY";
|
|
pub const ENV_ROOT_USER: &str = "RUSTFS_ROOT_USER";
|
|
pub const ENV_ROOT_PASSWORD: &str = "RUSTFS_ROOT_PASSWORD";
|
|
|
|
pub static RUSTFS_CONFIG_PREFIX: &str = "config";
|
|
|
|
pub struct ConfigSys {}
|
|
|
|
impl Default for ConfigSys {
|
|
fn default() -> Self {
|
|
Self::new()
|
|
}
|
|
}
|
|
|
|
impl ConfigSys {
|
|
pub fn new() -> Self {
|
|
Self {}
|
|
}
|
|
pub async fn init(&self, api: Arc<ECStore>) -> Result<()> {
|
|
let mut cfg = read_config_without_migrate(api.clone().clone()).await?;
|
|
|
|
lookup_configs(&mut cfg, api).await;
|
|
|
|
let _ = GLOBAL_SERVER_CONFIG.set(cfg);
|
|
|
|
Ok(())
|
|
}
|
|
}
|
|
|
|
#[derive(Debug, Deserialize, Serialize, Clone)]
|
|
pub struct KV {
|
|
pub key: String,
|
|
pub value: String,
|
|
pub hidden_if_empty: bool,
|
|
}
|
|
|
|
#[derive(Debug, Deserialize, Serialize, Clone)]
|
|
pub struct KVS(pub Vec<KV>);
|
|
|
|
impl Default for KVS {
|
|
fn default() -> Self {
|
|
Self::new()
|
|
}
|
|
}
|
|
|
|
impl KVS {
|
|
pub fn new() -> Self {
|
|
KVS(Vec::new())
|
|
}
|
|
pub fn get(&self, key: &str) -> String {
|
|
if let Some(v) = self.lookup(key) { v } else { "".to_owned() }
|
|
}
|
|
pub fn lookup(&self, key: &str) -> Option<String> {
|
|
for kv in self.0.iter() {
|
|
if kv.key.as_str() == key {
|
|
return Some(kv.value.clone());
|
|
}
|
|
}
|
|
|
|
None
|
|
}
|
|
|
|
///Check if KVS is empty.
|
|
pub fn is_empty(&self) -> bool {
|
|
self.0.is_empty()
|
|
}
|
|
|
|
/// Returns a list of all keys for the current KVS.
|
|
/// If the "comment" key does not exist, it will be added.
|
|
pub fn keys(&self) -> Vec<String> {
|
|
let mut found_comment = false;
|
|
let mut keys: Vec<String> = self
|
|
.0
|
|
.iter()
|
|
.map(|kv| {
|
|
if kv.key == COMMENT_KEY {
|
|
found_comment = true;
|
|
}
|
|
kv.key.clone()
|
|
})
|
|
.collect();
|
|
|
|
if !found_comment {
|
|
keys.push(COMMENT_KEY.to_owned());
|
|
}
|
|
|
|
keys
|
|
}
|
|
|
|
/// Insert or update a pair of key/values in KVS
|
|
pub fn insert(&mut self, key: String, value: String) {
|
|
for kv in self.0.iter_mut() {
|
|
if kv.key == key {
|
|
kv.value = value.clone();
|
|
return;
|
|
}
|
|
}
|
|
self.0.push(KV {
|
|
key,
|
|
value,
|
|
hidden_if_empty: false,
|
|
});
|
|
}
|
|
|
|
/// Merge all entries from another KVS to the current instance
|
|
pub fn extend(&mut self, other: KVS) {
|
|
for KV { key, value, .. } in other.0.into_iter() {
|
|
self.insert(key, value);
|
|
}
|
|
}
|
|
}
|
|
|
|
#[derive(Debug, Clone)]
|
|
pub struct Config(pub HashMap<String, HashMap<String, KVS>>);
|
|
|
|
impl Default for Config {
|
|
fn default() -> Self {
|
|
Self::new()
|
|
}
|
|
}
|
|
|
|
impl Config {
|
|
pub fn new() -> Self {
|
|
let mut cfg = Config(HashMap::new());
|
|
cfg.set_defaults();
|
|
|
|
cfg
|
|
}
|
|
|
|
pub fn get_value(&self, sub_sys: &str, key: &str) -> Option<KVS> {
|
|
if let Some(m) = self.0.get(sub_sys) {
|
|
m.get(key).cloned()
|
|
} else {
|
|
None
|
|
}
|
|
}
|
|
|
|
pub fn set_defaults(&mut self) {
|
|
if let Some(defaults) = DEFAULT_KVS.get() {
|
|
for (k, v) in defaults.iter() {
|
|
if !self.0.contains_key(k) {
|
|
let mut default = HashMap::new();
|
|
default.insert(DEFAULT_DELIMITER.to_owned(), v.clone());
|
|
self.0.insert(k.clone(), default);
|
|
} else if !self.0[k].contains_key(DEFAULT_DELIMITER) {
|
|
if let Some(m) = self.0.get_mut(k) {
|
|
m.insert(DEFAULT_DELIMITER.to_owned(), v.clone());
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
pub fn unmarshal(data: &[u8]) -> Result<Config> {
|
|
let m: HashMap<String, HashMap<String, KVS>> = serde_json::from_slice(data)?;
|
|
let mut cfg = Config(m);
|
|
cfg.set_defaults();
|
|
Ok(cfg)
|
|
}
|
|
|
|
pub fn marshal(&self) -> Result<Vec<u8>> {
|
|
let data = serde_json::to_vec(&self.0)?;
|
|
Ok(data)
|
|
}
|
|
|
|
pub fn merge(&self) -> Config {
|
|
// TODO: merge default
|
|
self.clone()
|
|
}
|
|
}
|
|
|
|
pub fn register_default_kvs(kvs: HashMap<String, KVS>) {
|
|
let mut p = HashMap::new();
|
|
for (k, v) in kvs {
|
|
p.insert(k, v);
|
|
}
|
|
|
|
let _ = DEFAULT_KVS.set(p);
|
|
}
|
|
|
|
pub fn init() {
|
|
let mut kvs = HashMap::new();
|
|
// Load storageclass default configuration
|
|
kvs.insert(STORAGE_CLASS_SUB_SYS.to_owned(), storageclass::DEFAULT_KVS.clone());
|
|
// New: Loading default configurations for notify_webhook and notify_mqtt
|
|
// Referring subsystem names through constants to improve the readability and maintainability of the code
|
|
kvs.insert(NOTIFY_WEBHOOK_SUB_SYS.to_owned(), notify::DEFAULT_WEBHOOK_KVS.clone());
|
|
kvs.insert(NOTIFY_MQTT_SUB_SYS.to_owned(), notify::DEFAULT_MQTT_KVS.clone());
|
|
|
|
// Register all default configurations
|
|
register_default_kvs(kvs)
|
|
}
|