Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/v/cluster_link/service.cc
Original file line number Diff line number Diff line change
Expand Up @@ -1308,7 +1308,7 @@ ss::future<> service::maybe_start_manager() {
*_schema_registry_dest, source_sr_prober::make_default()),
&_controller->get_feature_table(),
30s, // Temporary until we have a proper configuration for this
config::shard_local_cfg().default_topic_replication.bind(),
config::shard_local_cfg().default_topic_replications.bind(),
_scheduling_group);
co_await _manager->register_task_factory<source_topic_syncer_factory>();
co_await _manager->register_task_factory<group_mirroring_task_factory>();
Expand Down
11 changes: 8 additions & 3 deletions src/v/config/base_property.cc
Original file line number Diff line number Diff line change
Expand Up @@ -46,11 +46,16 @@ base_property::base_property(
base_property::metadata meta)
: _meta(intern_metadata(name, desc, std::move(meta)))
, _conf(&conf) {
conf._properties.emplace(_meta->name, this);
auto inserted = conf._properties.emplace(_meta->name, this).second;
vassert(
inserted,
"Two properties tried to register the same name {}",
_meta->name);
for (const auto& alias : _meta->aliases) {
auto [_, inserted] = conf._aliases.emplace(alias, this);
auto alias_inserted = conf._aliases.emplace(alias, this).second;

vassert(inserted, "Two properties tried to register the same alias");
vassert(
alias_inserted, "Two properties tried to register the same alias");
}
}

Expand Down
4 changes: 2 additions & 2 deletions src/v/config/configuration.cc
Original file line number Diff line number Diff line change
Expand Up @@ -1175,7 +1175,7 @@ configuration::configuration()
"Number of partitions in the internal group membership topic.",
{.needs_restart = needs_restart::no, .visibility = visibility::tunable},
16)
, default_topic_replication(
, default_topic_replications(
*this,
"default_topic_replications",
"Default replication factor for new topics.",
Expand Down Expand Up @@ -3543,7 +3543,7 @@ configuration::configuration()
5min)
, leader_balancer_node_mute_timeout(
*this,
"leader_balancer_mute_timeout",
"leader_balancer_node_mute_timeout",
"Leadership rebalancing node mute timeout.",
{.needs_restart = needs_restart::no, .visibility = visibility::tunable},
20s)
Expand Down
2 changes: 1 addition & 1 deletion src/v/config/configuration.h
Original file line number Diff line number Diff line change
Expand Up @@ -258,7 +258,7 @@ struct configuration final : public config_store {
// same as retention.size in kafka - TODO: size not implemented
property<std::optional<size_t>> retention_bytes;
property<int32_t> group_topic_partitions;
bounded_property<int16_t> default_topic_replication;
bounded_property<int16_t> default_topic_replications;
bounded_property<int16_t> minimum_topic_replication;
property<int32_t> transaction_coordinator_partitions;
property<model::cleanup_policy_bitflags>
Expand Down
2 changes: 1 addition & 1 deletion src/v/config/tests/bounded_property_test.cc
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ struct test_config : public config::config_store {
{.min = 5ms})
, minmax_bounded_opt_ms(
*this,
"bounded_opt_ms",
"minmax_bounded_opt_ms",
"An optional duration",
{},
std::nullopt,
Expand Down
2 changes: 1 addition & 1 deletion src/v/config/tests/enterprise_property_test.cc
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ struct test_config : public config_store {
, enterprise_enum(
*this,
std::vector<tls_version>{tls_version::v1_3},
"enterprise_str_enum",
"enterprise_enum",
"An enterprise-only enum property",
meta{.needs_restart = needs_restart::no},
tls_version::v1_1,
Expand Down
2 changes: 1 addition & 1 deletion src/v/features/tests/enterprise_features_test.cc
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ struct test_config : public config_store {
, enterprise_enum(
*this,
std::vector<tls_version>{tls_version::v1_3},
"enterprise_str_enum",
"enterprise_enum",
"An enterprise-only enum property",
meta{.needs_restart = needs_restart::no},
tls_version::v1_1,
Expand Down
4 changes: 2 additions & 2 deletions src/v/kafka/server/handlers/configs/config_response_utils.cc
Original file line number Diff line number Diff line change
Expand Up @@ -1315,11 +1315,11 @@ config_response_container_t make_broker_configs(
config_keys,
result,
"default.replication.factor",
config::shard_local_cfg().default_topic_replication,
config::shard_local_cfg().default_topic_replications,
include_synonyms,
maybe_make_documentation(
include_documentation,
config::shard_local_cfg().default_topic_replication.desc()),
config::shard_local_cfg().default_topic_replications.desc()),
&describe_as_string<int16_t>);

add_broker_config_if_requested(
Expand Down
2 changes: 1 addition & 1 deletion src/v/kafka/server/handlers/create_topics.cc
Original file line number Diff line number Diff line change
Expand Up @@ -309,7 +309,7 @@ ss::future<response_ptr> create_topics_handler::handle(
}
if (r.replication_factor == -1) {
r.replication_factor
= config::shard_local_cfg().default_topic_replication();
= config::shard_local_cfg().default_topic_replications();
}
}

Expand Down
2 changes: 1 addition & 1 deletion src/v/kafka/server/handlers/metadata.cc
Original file line number Diff line number Diff line change
Expand Up @@ -245,7 +245,7 @@ autocreate_topic_configuration(request_context& ctx, model::topic topic) {
model::kafka_namespace,
std::move(topic),
config::shard_local_cfg().default_topic_partitions(),
config::shard_local_cfg().default_topic_replication()};
config::shard_local_cfg().default_topic_replications()};
// Need to respect the default_redpanda_storage_mode when autocreating a
// topic.
cfg.properties.storage_mode
Expand Down
2 changes: 1 addition & 1 deletion src/v/pandaproxy/schema_registry/configuration.cc
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ configuration::configuration()
*this,
"schema_registry_replication_factor",
"Replication factor for internal `_schemas` topic. If unset, defaults "
"to `default_topic_replication`.",
"to `default_topic_replications`.",
{},
std::nullopt)
, api_doc_dir(
Expand Down