cluster: forbid disabling internal topics/partitions

redpanda-data · Nov 28, 2023 · b1449fe · b1449fe
1 parent b441e63
commit b1449fe
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 0 deletions.
diff --git a/src/v/cluster/errc.h b/src/v/cluster/errc.h
@@ -76,6 +76,7 @@ enum class errc : int16_t {
     trackable_keys_limit_exceeded,
     topic_disabled,
     partition_disabled,
+    invalid_partition_operation,
 };
 struct errc_category final : public std::error_category {
     const char* name() const noexcept final { return "cluster::errc"; }
@@ -220,6 +221,8 @@ struct errc_category final : public std::error_category {
             return "Topic disabled by user";
         case errc::partition_disabled:
             return "Partition disabled by user";
+        case errc::invalid_partition_operation:
+            return "Invalid partition operation";
         }
         return "cluster::errc::unknown";
     }

diff --git a/src/v/cluster/topics_frontend.cc b/src/v/cluster/topics_frontend.cc
@@ -1037,6 +1037,10 @@ ss::future<std::error_code> topics_frontend::set_topic_partitions_disabled(
         co_return errc::feature_disabled;
     }
 
+    if (!model::is_user_topic(ns_tp)) {
+        co_return errc::invalid_partition_operation;
+    }
+
     auto r = co_await stm_linearizable_barrier(timeout);
     if (!r) {
         co_return r.error();

diff --git a/src/v/kafka/server/errors.h b/src/v/kafka/server/errors.h
@@ -94,6 +94,7 @@ constexpr error_code map_topic_error_code(cluster::errc code) {
     case cluster::errc::transform_invalid_update:
     case cluster::errc::transform_invalid_source:
     case cluster::errc::trackable_keys_limit_exceeded:
+    case cluster::errc::invalid_partition_operation:
         break;
     }
     return error_code::unknown_server_error;

diff --git a/src/v/redpanda/admin/server.cc b/src/v/redpanda/admin/server.cc
@@ -1169,6 +1169,7 @@ ss::future<> admin_server::throw_on_error(
         case cluster::errc::transform_invalid_environment:
         case cluster::errc::source_topic_not_exists:
         case cluster::errc::source_topic_still_in_use:
+        case cluster::errc::invalid_partition_operation:
             throw ss::httpd::bad_request_exception(
               fmt::format("{}", ec.message()));
         default:

diff --git a/tests/rptest/tests/recovery_mode_test.py b/tests/rptest/tests/recovery_mode_test.py
@@ -11,6 +11,7 @@
 import dataclasses
 
 from ducktape.utils.util import wait_until
+from requests.exceptions import HTTPError
 
 from rptest.tests.redpanda_test import RedpandaTest
 from rptest.services.redpanda import RESTART_LOG_ALLOW_LIST
@@ -240,6 +241,13 @@ def test_apis(self):
         rpk = RpkTool(self.redpanda)
         admin = Admin(self.redpanda)
 
+        try:
+            admin.set_partitions_disabled(ns="redpanda", topic="controller")
+        except HTTPError as e:
+            assert e.response.status_code == 400
+        else:
+            assert False, "disabling internal topics should fail"
+
         topics = ["mytopic1", "mytopic2", "mytopic3", "mytopic4"]
         for topic in topics:
             rpk.create_topic(topic, partitions=3, replicas=3)