-
Notifications
You must be signed in to change notification settings - Fork 94
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
MINIFICPP-2525 Handle errors when enabling controllers
- Loading branch information
Showing
13 changed files
with
480 additions
and
146 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
127 changes: 127 additions & 0 deletions
127
libminifi/src/core/controller/StandardControllerServiceProvider.cpp
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,127 @@ | ||
| /** | ||
| * | ||
| * Licensed to the Apache Software Foundation (ASF) under one or more | ||
| * contributor license agreements. See the NOTICE file distributed with | ||
| * this work for additional information regarding copyright ownership. | ||
| * The ASF licenses this file to You under the Apache License, Version 2.0 | ||
| * (the "License"); you may not use this file except in compliance with | ||
| * the License. You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
| #include "core/controller/StandardControllerServiceProvider.h" | ||
|
|
||
| #include "core/controller/StandardControllerServiceNode.h" | ||
|
|
||
| using namespace std::literals::chrono_literals; | ||
|
|
||
| namespace org::apache::nifi::minifi::core::controller { | ||
|
|
||
| std::shared_ptr<ControllerServiceNode> StandardControllerServiceProvider::createControllerService(const std::string& type, const std::string&, const std::string& id, bool) { | ||
| std::shared_ptr<ControllerService> new_controller_service = extension_loader_.instantiate<ControllerService>(type, id); | ||
|
|
||
| if (!new_controller_service) { | ||
| return nullptr; | ||
| } | ||
|
|
||
| std::shared_ptr<ControllerServiceNode> new_service_node = std::make_shared<StandardControllerServiceNode>(new_controller_service, | ||
| sharedFromThis<ControllerServiceProvider>(), id, | ||
| configuration_); | ||
|
|
||
| controller_map_->put(id, new_service_node); | ||
| return new_service_node; | ||
| } | ||
|
|
||
| void StandardControllerServiceProvider::enableAllControllerServices() { | ||
| gsl_Expects(!enable_retry_thread_running_); | ||
| { | ||
| std::lock_guard<std::mutex> lock(enable_retry_mutex_); | ||
| logger_->log_info("Enabling {} controller services", controller_map_->getAllControllerServices().size()); | ||
| for (const auto& service : controller_map_->getAllControllerServices()) { | ||
| logger_->log_info("Enabling {}", service->getName()); | ||
| if (!service->canEnable()) { | ||
| logger_->log_warn("Service {} cannot be enabled", service->getName()); | ||
| continue; | ||
| } | ||
| if (!service->enable()) { | ||
| logger_->log_warn("Could not enable {}", service->getName()); | ||
| controller_services_to_enable_.insert(service); | ||
| } | ||
| } | ||
| } | ||
| startEnableRetryThread(); | ||
| } | ||
|
|
||
| void StandardControllerServiceProvider::disableAllControllerServices() { | ||
| stopEnableRetryThread(); | ||
| logger_->log_info("Disabling {} controller services", controller_map_->getAllControllerServices().size()); | ||
| for (const auto& service : controller_map_->getAllControllerServices()) { | ||
| logger_->log_info("Disabling {}", service->getName()); | ||
| if (!service->disable()) { | ||
| logger_->log_warn("Could not disable {}", service->getName()); | ||
| } | ||
| } | ||
| } | ||
|
|
||
| void StandardControllerServiceProvider::clearControllerServices() { | ||
| stopEnableRetryThread(); | ||
| controller_map_->clear(); | ||
| } | ||
|
|
||
| void StandardControllerServiceProvider::stopEnableRetryThread() { | ||
| enable_retry_thread_running_ = false; | ||
| enable_retry_condition_.notify_all(); | ||
| if (controller_service_enable_retry_thread_.joinable()) { | ||
| controller_service_enable_retry_thread_.join(); | ||
| } | ||
| } | ||
|
|
||
| void StandardControllerServiceProvider::startEnableRetryThread() { | ||
| enable_retry_thread_running_ = true; | ||
| controller_service_enable_retry_thread_ = std::thread([this]() { | ||
| if (controller_services_to_enable_.empty()) { | ||
| return; | ||
| } | ||
| std::unique_lock<std::mutex> lock(enable_retry_mutex_); | ||
| enable_retry_condition_.wait_for(lock, admin_yield_duration_, [this]() { | ||
| return !enable_retry_thread_running_; | ||
| }); | ||
| while (enable_retry_thread_running_) { | ||
| for (auto it = controller_services_to_enable_.begin(); it != controller_services_to_enable_.end();) { | ||
| if ((*it)->enable()) { | ||
| it = controller_services_to_enable_.erase(it); | ||
| } else { | ||
| ++it; | ||
| } | ||
| } | ||
| if (controller_services_to_enable_.empty()) { | ||
| break; | ||
| } | ||
| enable_retry_condition_.wait_for(lock, admin_yield_duration_, [this]() { | ||
| return !enable_retry_thread_running_; | ||
| }); | ||
| } | ||
| controller_services_to_enable_.clear(); | ||
| }); | ||
| } | ||
|
|
||
| std::chrono::milliseconds StandardControllerServiceProvider::readAdministrativeYieldDuration() const { | ||
| std::chrono::milliseconds admin_yield_duration = 30s; | ||
| std::string yield_value_str; | ||
|
|
||
| if (configuration_->get(Configure::nifi_administrative_yield_duration, yield_value_str)) { | ||
| std::optional<core::TimePeriodValue> value = core::TimePeriodValue::fromString(yield_value_str); | ||
| if (value) { | ||
| admin_yield_duration = value->getMilliseconds(); | ||
| } | ||
| } | ||
| return admin_yield_duration; | ||
| } | ||
|
|
||
| } // namespace org::apache::nifi::minifi::core::controller |
Oops, something went wrong.