Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[v24.3.x] [CORE-8533] relax topic configs #24588

Merged
merged 3 commits into from
Dec 17, 2024
Merged

[v24.3.x] [CORE-8533] relax topic configs #24588

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
01b5207
config: Added is_restricted() method to enterprise property
michael-redpanda Dec 13, 2024
4c17d45
kafka: Relaxed topic property enforcement when license invalid
michael-redpanda Dec 13, 2024
561190f
dt: Test to verify relaxed tiered storage topic configs
michael-redpanda Dec 13, 2024
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
62 changes: 41 additions & 21 deletions src/v/cluster/topics_frontend.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,18 +74,30 @@ std::vector<std::string_view>
get_enterprise_features(const cluster::topic_configuration& cfg) {
std::vector<std::string_view> features;
const auto si_disabled = model::shadow_indexing_mode::disabled;
if (cfg.properties.shadow_indexing.value_or(si_disabled) != si_disabled) {
features.emplace_back("tiered storage");
}
if (cfg.is_recovery_enabled()) {
features.emplace_back("topic recovery");
}
if (cfg.is_read_replica()) {
features.emplace_back("remote read replicas");
// Only enforce tiered storage topic config sanctions when cloud storage is
// enabled for the cluster
if (config::shard_local_cfg().cloud_storage_enabled.is_restricted()) {
if (
cfg.properties.shadow_indexing.value_or(si_disabled) != si_disabled) {
features.emplace_back("tiered storage");
}
if (cfg.is_recovery_enabled()) {
features.emplace_back("topic recovery");
}
if (cfg.is_read_replica()) {
features.emplace_back("remote read replicas");
}
}
if (cfg.is_schema_id_validation_enabled()) {
features.emplace_back("schema ID validation");

// Only enforce schema ID validation topic configs if Schema ID validation
// is enabled for the cluster
if (config::shard_local_cfg().enable_schema_id_validation.is_restricted()) {
if (cfg.is_schema_id_validation_enabled()) {
features.emplace_back("schema ID validation");
}
}

// We are always enforcing leadership preference restrictions
if (const auto& leaders_pref = cfg.properties.leaders_preference;
leaders_pref.has_value()
&& config::shard_local_cfg()
Expand All @@ -111,11 +123,15 @@ std::vector<std::string_view> get_enterprise_features(

std::vector<std::string_view> features;
const auto si_disabled = model::shadow_indexing_mode::disabled;
if (
(properties.shadow_indexing.value_or(si_disabled)
< updated_properties.shadow_indexing.value_or(si_disabled))
|| (properties.remote_delete < updated_properties.remote_delete)) {
features.emplace_back("tiered storage");
// Only enforce tiered storage topic config sanctions when cloud storage is
// enabled for the cluster
if (config::shard_local_cfg().cloud_storage_enabled.is_restricted()) {
if (
(properties.shadow_indexing.value_or(si_disabled)
< updated_properties.shadow_indexing.value_or(si_disabled))
|| (properties.remote_delete < updated_properties.remote_delete)) {
features.emplace_back("tiered storage");
}
}

static constexpr auto key_schema_id_validation_enabled =
Expand Down Expand Up @@ -163,12 +179,16 @@ std::vector<std::string_view> get_enterprise_features(
up.record_value_subject_name_strategy_compat));
};

if (
((key_schema_id_validation_enabled(properties)
< key_schema_id_validation_enabled(updated_properties))
|| (value_schema_id_validation_enabled(properties) < value_schema_id_validation_enabled(updated_properties)))
|| (schema_id_validation_enabled(updated_properties) && sns_modified())) {
features.emplace_back("schema id validation");
// Only enforce schema ID validation topic configs if Schema ID validation
// is enabled for the cluster
if (config::shard_local_cfg().enable_schema_id_validation.is_restricted()) {
if (
((key_schema_id_validation_enabled(properties)
< key_schema_id_validation_enabled(updated_properties))
|| (value_schema_id_validation_enabled(properties) < value_schema_id_validation_enabled(updated_properties)))
|| (schema_id_validation_enabled(updated_properties) && sns_modified())) {
features.emplace_back("schema id validation");
}
}

if (const auto& updated_pref = updated_properties.leaders_preference;
Expand Down
5 changes: 5 additions & 0 deletions src/v/config/property.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1091,6 +1091,11 @@ class enterprise : public P {
return std::nullopt;
}

/**
* @brief Checks current value of property to see if it is restricted
*/
bool is_restricted() const { return do_check_restricted(this->value()); }

private:
bool do_check_restricted(const T& setting) const final {
// depending on how the restriction was defined, construct an applicable
Expand Down
30 changes: 30 additions & 0 deletions src/v/config/tests/enterprise_property_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,4 +109,34 @@ TEST(EnterprisePropertyTest, TestTypeName) {
EXPECT_EQ(cfg.enterprise_enum.type_name(), "string");
}

TEST(EnterprisePropertyTest, TestIsRestricted) {
test_config cfg;
cfg.enterprise_bool.set_value(false);
EXPECT_FALSE(cfg.enterprise_bool.is_restricted());
cfg.enterprise_bool.set_value(true);
EXPECT_TRUE(cfg.enterprise_bool.is_restricted());

cfg.enterprise_str_enum.set_value("foo");
EXPECT_FALSE(cfg.enterprise_str_enum.is_restricted());
cfg.enterprise_str_enum.set_value("bar");
EXPECT_TRUE(cfg.enterprise_str_enum.is_restricted());

cfg.enterprise_str_vec.set_value(
std::vector<ss::sstring>{"foo", "bar", "baz"});
EXPECT_FALSE(cfg.enterprise_str_vec.is_restricted());
cfg.enterprise_str_vec.set_value(
std::vector<ss::sstring>{"foo", "bar", "baz", "GSSAPI"});
EXPECT_TRUE(cfg.enterprise_str_vec.is_restricted());

cfg.enterprise_opt_int.set_value(10);
EXPECT_FALSE(cfg.enterprise_opt_int.is_restricted());
cfg.enterprise_opt_int.set_value(10000);
EXPECT_TRUE(cfg.enterprise_opt_int.is_restricted());

cfg.enterprise_enum.set_value(tls_version::v1_0);
EXPECT_FALSE(cfg.enterprise_enum.is_restricted());
cfg.enterprise_enum.set_value(tls_version::v1_3);
EXPECT_TRUE(cfg.enterprise_enum.is_restricted());
}

} // namespace config
Loading
Loading