Skip to content

Commit

Permalink
Merge #1504
Browse files Browse the repository at this point in the history
1504: fix(nvmf): reverting default CRDT to zero r=dsavitskiy a=dsavitskiy

It turned out that the default non-zero CRDT causes issues with some tests. It seems to be better solution to revert it to zero, and configure the desired value in production install scripts rather having non-zero default.

Co-authored-by: Dmitry Savitskiy <[email protected]>
  • Loading branch information
mayastor-bors and dsavitskiy committed Aug 25, 2023
2 parents 80a4b40 + 91e293a commit fca74e0
Showing 1 changed file with 3 additions and 7 deletions.
10 changes: 3 additions & 7 deletions io-engine/src/core/env.rs
Original file line number Diff line number Diff line change
Expand Up @@ -165,11 +165,7 @@ pub struct MayastorCliArgs {
/// NVMF target interface (ip, mac, name or subnet).
pub nvmf_tgt_interface: Option<String>,
/// NVMF target Command Retry Delay.
#[structopt(
long = "tgt-crdt",
env = "NVMF_TGT_CRDT",
default_value = "30"
)]
#[structopt(long = "tgt-crdt", env = "NVMF_TGT_CRDT", default_value = "0")]
pub nvmf_tgt_crdt: u16,
/// api Version
#[structopt(
Expand Down Expand Up @@ -237,7 +233,7 @@ impl Default for MayastorCliArgs {
nvme_ctl_io_ctx_pool_size: 65535,
registration_endpoint: None,
nvmf_tgt_interface: None,
nvmf_tgt_crdt: 30,
nvmf_tgt_crdt: 0,
api_versions: vec![ApiVersion::V0, ApiVersion::V1],
diagnose_stack: None,
reactor_freeze_detection: false,
Expand Down Expand Up @@ -381,7 +377,7 @@ impl Default for MayastorEnvironment {
bdev_io_ctx_pool_size: 65535,
nvme_ctl_io_ctx_pool_size: 65535,
nvmf_tgt_interface: None,
nvmf_tgt_crdt: 30,
nvmf_tgt_crdt: 0,
api_versions: vec![ApiVersion::V0, ApiVersion::V1],
}
}
Expand Down

0 comments on commit fca74e0

Please sign in to comment.