-
Notifications
You must be signed in to change notification settings - Fork 95
MINIFICPP-2377 Support process group level controller services #1840
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.
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
Conversation
@@ -200,7 +212,13 @@ void ProcessGroup::startProcessing(TimerDrivenSchedulingAgent& timeScheduler, Ev | |||
|
|||
void ProcessGroup::stopProcessing(TimerDrivenSchedulingAgent& timeScheduler, EventDrivenSchedulingAgent& eventScheduler, | |||
CronDrivenSchedulingAgent& cronScheduler, const std::function<bool(const Processor*)>& filter) { | |||
std::lock_guard<std::recursive_mutex> lock(mutex_); |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This and similar changes in the startProcessingProcessors
and startProcessing
functions are to avoid deadlock. It appeared in ControllerServiceIntegrationTests
when stop()
is called while the getControllerService
is called in the processor's onTrigger
. The stop()
function waits for the processor's onTrigger
to finish, but it cannot finish the ProcessGroup's findProcessor
method because it is waiting for the same mutex which is held here.
We may need to find a better solution as this may cause some concurrency issues I'm not currently aware of. I'm open for suggestions.
cc6f234
to
2eaeafc
Compare
2eaeafc
to
7a9383a
Compare
7a9383a
to
852793c
Compare
852793c
to
19dca48
Compare
19dca48
to
c71a5d0
Compare
c71a5d0
to
35985ad
Compare
1830a11
to
83f222d
Compare
https://issues.apache.org/jira/browse/MINIFICPP-2377
Thank you for submitting a contribution to Apache NiFi - MiNiFi C++.
In order to streamline the review of the contribution we ask you
to ensure the following steps have been taken:
For all changes:
Is there a JIRA ticket associated with this PR? Is it referenced
in the commit message?
Does your PR title start with MINIFICPP-XXXX where XXXX is the JIRA number you are trying to resolve? Pay particular attention to the hyphen "-" character.
Has your PR been rebased against the latest commit within the target branch (typically main)?
Is your initial contribution a single, squashed commit?
For code changes:
For documentation related changes:
Note:
Please ensure that once the PR is submitted, you check GitHub Actions CI results for build issues and submit an update to your PR as soon as possible.