From 17f19b0f46317c2483e4565140da22500d59bc13 Mon Sep 17 00:00:00 2001 From: John Spray Date: Mon, 25 Apr 2022 20:30:30 +0100 Subject: [PATCH 1/3] test: remove unused RedpandaService._enable_rp Redpanda is always enabled. --- tests/rptest/services/redpanda.py | 3 --- tests/rptest/services/templates/redpanda.yaml | 2 -- 2 files changed, 5 deletions(-) diff --git a/tests/rptest/services/redpanda.py b/tests/rptest/services/redpanda.py index 0fcd8047ddfa..ac6b78eba4d5 100644 --- a/tests/rptest/services/redpanda.py +++ b/tests/rptest/services/redpanda.py @@ -483,7 +483,6 @@ def __init__(self, context, num_brokers, *, - enable_rp=True, extra_rp_conf=None, extra_node_conf=None, enable_pp=False, @@ -499,7 +498,6 @@ def __init__(self, skip_if_no_redpanda_log: bool = False): super(RedpandaService, self).__init__(context, num_nodes=num_brokers) self._context = context - self._enable_rp = enable_rp self._extra_rp_conf = extra_rp_conf or dict() self._enable_pp = enable_pp self._enable_sr = enable_sr @@ -1509,7 +1507,6 @@ def write_node_conf_file(self, node, override_cfg_params=None): node_ip=node_ip, kafka_alternate_port=self.KAFKA_ALTERNATE_PORT, admin_alternate_port=self.ADMIN_ALTERNATE_PORT, - enable_rp=self._enable_rp, enable_pp=self._enable_pp, enable_sr=self._enable_sr, superuser=self._superuser, diff --git a/tests/rptest/services/templates/redpanda.yaml b/tests/rptest/services/templates/redpanda.yaml index c68605ae3f71..9c1155da6910 100644 --- a/tests/rptest/services/templates/redpanda.yaml +++ b/tests/rptest/services/templates/redpanda.yaml @@ -9,7 +9,6 @@ organization: "vectorized" -{% if enable_rp %} redpanda: developer_mode: true data_directory: "{{data_dir}}" @@ -47,7 +46,6 @@ redpanda: port: 33145 node_id: 1 {% endif %} -{% endif %} {% if enable_pp %} pandaproxy: From b8c3bec0188cc2c38635f17c1a907dcc3c781a0d Mon Sep 17 00:00:00 2001 From: John Spray Date: Tue, 31 May 2022 22:02:59 +0100 Subject: [PATCH 2/3] redpanda: remove standalone schema registry/pandaproxy mode Whitespace update in subsequent commit, because all the indentation jumps around & otherwise it's not obvious what I'm doing here. --- src/v/redpanda/application.cc | 12 +----------- src/v/redpanda/application.h | 1 - 2 files changed, 1 insertion(+), 12 deletions(-) diff --git a/src/v/redpanda/application.cc b/src/v/redpanda/application.cc index 25933768a013..e320cd2c7190 100644 --- a/src/v/redpanda/application.cc +++ b/src/v/redpanda/application.cc @@ -438,8 +438,6 @@ void application::hydrate_config(const po::variables_map& cfg) { } }; - _redpanda_enabled = config["redpanda"].IsDefined(); - if (_redpanda_enabled) { ss::smp::invoke_on_all([&config, cfg_path] { config::node().load(cfg_path, config); }).get0(); @@ -467,7 +465,7 @@ void application::hydrate_config(const po::variables_map& cfg) { vlog(_log.info, "Node configuration properties:"); vlog(_log.info, "(use `rpk config set ` to change)"); config_printer("redpanda", config::node()); - } + if (config["pandaproxy"]) { _proxy_config.emplace(config["pandaproxy"]); if (config["pandaproxy_client"]) { @@ -499,11 +497,9 @@ void application::check_environment() { syschecks::systemd_message("checking environment (CPU, Mem)").get(); syschecks::cpu(); syschecks::memory(config::node().developer_mode()); - if (_redpanda_enabled) { storage::directories::initialize( config::node().data_directory().as_sstring()) .get(); - } } static admin_server_cfg @@ -659,9 +655,7 @@ make_upload_controller_config(ss::scheduling_group sg) { // add additional services in here void application::wire_up_services() { - if (_redpanda_enabled) { wire_up_redpanda_services(); - } if (_proxy_config) { construct_service( _proxy_client, @@ -1225,9 +1219,7 @@ application::set_proxy_client_config(ss::sstring name, std::any val) { } void application::start(::stop_signal& app_signal) { - if (_redpanda_enabled) { start_redpanda(app_signal); - } if (_proxy_config) { _proxy.invoke_on_all(&pandaproxy::rest::proxy::start).get(); @@ -1245,9 +1237,7 @@ void application::start(::stop_signal& app_signal) { _schema_reg_config->schema_registry_api()); } - if (_redpanda_enabled) { start_kafka(app_signal); - } _admin.invoke_on_all([](admin_server& admin) { admin.set_ready(); }).get(); diff --git a/src/v/redpanda/application.h b/src/v/redpanda/application.h index 01a9bb602140..c9352be4afd2 100644 --- a/src/v/redpanda/application.h +++ b/src/v/redpanda/application.h @@ -153,7 +153,6 @@ class application { void setup_public_metrics(); void setup_internal_metrics(); std::unique_ptr _app; - bool _redpanda_enabled{true}; cluster::config_manager::preload_result _config_preload; std::optional _proxy_config; std::optional _proxy_client_config; From 6ef1f8479e9c4542d811c7420a4ab398278613e3 Mon Sep 17 00:00:00 2001 From: John Spray Date: Tue, 31 May 2022 22:04:18 +0100 Subject: [PATCH 3/3] redpanda: run clang-format on application.cc --- src/v/redpanda/application.cc | 60 +++++++++++++++++------------------ 1 file changed, 30 insertions(+), 30 deletions(-) diff --git a/src/v/redpanda/application.cc b/src/v/redpanda/application.cc index e320cd2c7190..e8ffcc71f28e 100644 --- a/src/v/redpanda/application.cc +++ b/src/v/redpanda/application.cc @@ -438,33 +438,33 @@ void application::hydrate_config(const po::variables_map& cfg) { } }; - ss::smp::invoke_on_all([&config, cfg_path] { - config::node().load(cfg_path, config); - }).get0(); - - auto node_config_errors = config::node().load(config); - for (const auto& i : node_config_errors) { - vlog( - _log.warn, - "Node property '{}' validation error: {}", - i.first, - i.second); - } - if (node_config_errors.size() > 0) { - throw std::invalid_argument("Validation errors in node config"); - } + ss::smp::invoke_on_all([&config, cfg_path] { + config::node().load(cfg_path, config); + }).get0(); - // This includes loading from local bootstrap file or legacy - // config file on first-start or upgrade cases. - _config_preload = cluster::config_manager::preload(config).get0(); + auto node_config_errors = config::node().load(config); + for (const auto& i : node_config_errors) { + vlog( + _log.warn, + "Node property '{}' validation error: {}", + i.first, + i.second); + } + if (node_config_errors.size() > 0) { + throw std::invalid_argument("Validation errors in node config"); + } + + // This includes loading from local bootstrap file or legacy + // config file on first-start or upgrade cases. + _config_preload = cluster::config_manager::preload(config).get0(); - vlog(_log.info, "Cluster configuration properties:"); - vlog(_log.info, "(use `rpk cluster config edit` to change)"); - config_printer("redpanda", config::shard_local_cfg()); + vlog(_log.info, "Cluster configuration properties:"); + vlog(_log.info, "(use `rpk cluster config edit` to change)"); + config_printer("redpanda", config::shard_local_cfg()); - vlog(_log.info, "Node configuration properties:"); - vlog(_log.info, "(use `rpk config set ` to change)"); - config_printer("redpanda", config::node()); + vlog(_log.info, "Node configuration properties:"); + vlog(_log.info, "(use `rpk config set ` to change)"); + config_printer("redpanda", config::node()); if (config["pandaproxy"]) { _proxy_config.emplace(config["pandaproxy"]); @@ -497,9 +497,9 @@ void application::check_environment() { syschecks::systemd_message("checking environment (CPU, Mem)").get(); syschecks::cpu(); syschecks::memory(config::node().developer_mode()); - storage::directories::initialize( - config::node().data_directory().as_sstring()) - .get(); + storage::directories::initialize( + config::node().data_directory().as_sstring()) + .get(); } static admin_server_cfg @@ -655,7 +655,7 @@ make_upload_controller_config(ss::scheduling_group sg) { // add additional services in here void application::wire_up_services() { - wire_up_redpanda_services(); + wire_up_redpanda_services(); if (_proxy_config) { construct_service( _proxy_client, @@ -1219,7 +1219,7 @@ application::set_proxy_client_config(ss::sstring name, std::any val) { } void application::start(::stop_signal& app_signal) { - start_redpanda(app_signal); + start_redpanda(app_signal); if (_proxy_config) { _proxy.invoke_on_all(&pandaproxy::rest::proxy::start).get(); @@ -1237,7 +1237,7 @@ void application::start(::stop_signal& app_signal) { _schema_reg_config->schema_registry_api()); } - start_kafka(app_signal); + start_kafka(app_signal); _admin.invoke_on_all([](admin_server& admin) { admin.set_ready(); }).get();