diff --git a/.gitignore b/.gitignore index ab155bff..0f558000 100644 --- a/.gitignore +++ b/.gitignore @@ -15,7 +15,7 @@ /runtime /output /test/output - +/bld # Ignore hidden files .* *.swp diff --git a/src/braft/node.cpp b/src/braft/node.cpp index 11d00394..02f56a27 100644 --- a/src/braft/node.cpp +++ b/src/braft/node.cpp @@ -613,7 +613,7 @@ int NodeImpl::init(const NodeOptions& options) { rg_options.election_timeout_ms = _options.election_timeout_ms; rg_options.log_manager = _log_manager; rg_options.ballot_box = _ballot_box; - rg_options.raft_enable_witness_to_leader = _options.raft_enable_witness_to_leader; + rg_options.send_data_to_witness = _options.send_data_to_witness; rg_options.node = this; rg_options.snapshot_throttle = _options.snapshot_throttle ? _options.snapshot_throttle->get() diff --git a/src/braft/raft.h b/src/braft/raft.h index dbbf2a30..08d8a89b 100644 --- a/src/braft/raft.h +++ b/src/braft/raft.h @@ -604,7 +604,7 @@ struct NodeOptions { // Default: false bool witness = false; // Construct a default instance - bool raft_enable_witness_to_leader = true; + bool send_data_to_witness = true; NodeOptions(); int get_catchup_timeout_ms(); diff --git a/src/braft/replicator.cpp b/src/braft/replicator.cpp index 7a57d5b0..d59ecee0 100644 --- a/src/braft/replicator.cpp +++ b/src/braft/replicator.cpp @@ -636,7 +636,7 @@ int Replicator::_prepare_entry(int offset, EntryMeta* em, butil::IOBuf *data) { CHECK(entry->type != ENTRY_TYPE_CONFIGURATION) << "log_index=" << log_index; } // 优先使用group级别的配置 - if (is_witness() && !_options.raft_enable_witness_to_leader) { + if (is_witness() && !_options.send_data_to_witness) { entry->Release(); return 0; } @@ -1392,7 +1392,7 @@ int ReplicatorGroup::init(const NodeId& node_id, const ReplicatorGroupOptions& o _election_timeout_ms = options.election_timeout_ms; _common_options.log_manager = options.log_manager; _common_options.ballot_box = options.ballot_box; - _common_options.raft_enable_witness_to_leader = options.raft_enable_witness_to_leader; + _common_options.send_data_to_witness = options.send_data_to_witness; _common_options.node = options.node; _common_options.term = 0; _common_options.group_id = node_id.group_id; diff --git a/src/braft/replicator.h b/src/braft/replicator.h index cf109e7b..3e239f3c 100644 --- a/src/braft/replicator.h +++ b/src/braft/replicator.h @@ -47,7 +47,7 @@ struct ReplicatorOptions { ReplicatorOptions(); int* dynamic_heartbeat_timeout_ms; int* election_timeout_ms; - bool raft_enable_witness_to_leader; + bool send_data_to_witness; GroupId group_id; PeerId server_id; PeerId peer_id; @@ -268,7 +268,7 @@ struct ReplicatorGroupOptions { ReplicatorGroupOptions(); int heartbeat_timeout_ms; int election_timeout_ms; - bool raft_enable_witness_to_leader; + bool send_data_to_witness = true; LogManager* log_manager; BallotBox* ballot_box; NodeImpl* node;