Skip to content

Commit

Permalink
This is an automated cherry-pick of tikv#16546
Browse files Browse the repository at this point in the history
ref tikv#16549

Signed-off-by: ti-chi-bot <ti-community-prow-bot@tidb.io>
  • Loading branch information
v01dstar authored and ti-chi-bot committed Feb 28, 2024
1 parent 6353a0b commit 34528ee
Show file tree
Hide file tree
Showing 5 changed files with 65 additions and 0 deletions.
12 changes: 12 additions & 0 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 4 additions & 0 deletions components/engine_panic/src/db_options.rs
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,10 @@ impl DbOptions for PanicDbOptions {
fn set_titandb_options(&mut self, opts: &Self::TitanDbOptions) {
panic!()
}

fn set_track_and_verify_wals_in_manifest(&mut self, v: bool) {
panic!()
}
}

pub struct PanicTitanDbOptions;
Expand Down
4 changes: 4 additions & 0 deletions components/engine_rocks/src/db_options.rs
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,10 @@ impl DbOptions for RocksDbOptions {
fn set_titandb_options(&mut self, opts: &Self::TitanDbOptions) {
self.0.set_titandb_options(opts.as_raw())
}

fn set_track_and_verify_wals_in_manifest(&mut self, v: bool) {
self.0.set_track_and_verify_wals_in_manifest(v)
}
}

pub struct RocksTitanDbOptions(RawTitanDBOptions);
Expand Down
1 change: 1 addition & 0 deletions components/engine_traits/src/db_options.rs
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ pub trait DbOptions {
fn get_rate_limiter_auto_tuned(&self) -> Option<bool>;
fn set_rate_limiter_auto_tuned(&mut self, rate_limiter_auto_tuned: bool) -> Result<()>;
fn set_titandb_options(&mut self, opts: &Self::TitanDbOptions);
fn set_track_and_verify_wals_in_manifest(&mut self, v: bool);
}

/// Titan-specefic options
Expand Down
44 changes: 44 additions & 0 deletions src/config.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1093,6 +1093,25 @@ pub struct DbConfig {
pub enable_multi_batch_write: bool,
#[online_config(skip)]
pub enable_unordered_write: bool,
<<<<<<< HEAD:src/config.rs
=======
#[online_config(skip)]
pub allow_concurrent_memtable_write: Option<bool>,
pub write_buffer_limit: Option<ReadableSize>,
#[online_config(skip)]
#[doc(hidden)]
#[serde(skip_serializing)]
pub write_buffer_stall_ratio: f32,
#[doc(hidden)]
#[serde(skip_serializing)]
pub write_buffer_flush_oldest_first: bool,
#[online_config(skip)]
pub track_and_verify_wals_in_manifest: bool,
// Dangerous option only for programming use.
#[online_config(skip)]
#[serde(skip)]
pub paranoid_checks: Option<bool>,
>>>>>>> 9fa462a3c4 (rocksdb: Expose track-and-verify-wals-in-manifest config (#16546)):src/config/mod.rs
#[online_config(submodule)]
pub defaultcf: DefaultCfConfig,
#[online_config(submodule)]
Expand Down Expand Up @@ -1144,6 +1163,15 @@ impl Default for DbConfig {
enable_pipelined_write: false,
enable_multi_batch_write: true, // deprecated
enable_unordered_write: false,
<<<<<<< HEAD:src/config.rs
=======
allow_concurrent_memtable_write: None,
write_buffer_limit: None,
write_buffer_stall_ratio: 0.0,
write_buffer_flush_oldest_first: true,
track_and_verify_wals_in_manifest: true,
paranoid_checks: None,
>>>>>>> 9fa462a3c4 (rocksdb: Expose track-and-verify-wals-in-manifest config (#16546)):src/config/mod.rs
defaultcf: DefaultCfConfig::default(),
writecf: WriteCfConfig::default(),
lockcf: LockCfConfig::default(),
Expand Down Expand Up @@ -1210,6 +1238,22 @@ impl DbConfig {
if self.titan.enabled {
opts.set_titandb_options(&self.titan.build_opts());
}
<<<<<<< HEAD:src/config.rs
=======
opts.set_env(shared.env.clone());
opts.set_statistics(&shared.statistics);
if let Some(r) = &shared.rate_limiter {
opts.set_rate_limiter(r);
}
if let Some(r) = &shared.write_buffer_manager {
opts.set_write_buffer_manager(r);
}
if for_engine == EngineType::RaftKv2 {
// Historical stats are not used.
opts.set_stats_persist_period_sec(0);
}
opts.set_track_and_verify_wals_in_manifest(self.track_and_verify_wals_in_manifest);
>>>>>>> 9fa462a3c4 (rocksdb: Expose track-and-verify-wals-in-manifest config (#16546)):src/config/mod.rs
opts
}

Expand Down

0 comments on commit 34528ee

Please sign in to comment.