Skip to content

Commit f203ce7

Browse files
committed
fix
Signed-off-by: Attila Mészáros <[email protected]>
1 parent 53cbb2e commit f203ce7

File tree

2 files changed

+9
-5
lines changed

2 files changed

+9
-5
lines changed

operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/event/ReconciliationDispatcher.java

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ private PostExecutionControl<P> handleDispatch(ExecutionScope<P> executionScope)
8181
originalResource.getMetadata().getNamespace());
8282

8383
final var markedForDeletion = originalResource.isMarkedForDeletion();
84-
if (!configuration().isAllEventReconcileMode()
84+
if (!isAllEventMode()
8585
&& markedForDeletion
8686
&& shouldNotDispatchToCleanupWhenMarkedForDeletion(originalResource)) {
8787
log.debug(
@@ -100,7 +100,7 @@ && shouldNotDispatchToCleanupWhenMarkedForDeletion(originalResource)) {
100100
executionScope.isDeleteFinalStateUnknown());
101101

102102
// checking the cleaner for all-event-mode
103-
if (markedForDeletion && controller.isCleaner()) {
103+
if ((!isAllEventMode() && markedForDeletion) || (isAllEventMode() && controller.isCleaner())) {
104104
return handleCleanup(resourceForExecution, originalResource, context, executionScope);
105105
} else {
106106
return handleReconcile(executionScope, resourceForExecution, originalResource, context);
@@ -119,7 +119,7 @@ private PostExecutionControl<P> handleReconcile(
119119
P originalResource,
120120
Context<P> context)
121121
throws Exception {
122-
if (!configuration().isAllEventReconcileMode()
122+
if (!isAllEventMode()
123123
&& controller.useFinalizer()
124124
&& !originalResource.hasFinalizer(configuration().getFinalizerName())) {
125125
/*
@@ -289,7 +289,7 @@ private PostExecutionControl<P> handleCleanup(
289289
}
290290
DeleteControl deleteControl = controller.cleanup(resourceForExecution, context);
291291
final var useFinalizer = controller.useFinalizer();
292-
if (useFinalizer && !configuration().isAllEventReconcileMode()) {
292+
if (useFinalizer && !isAllEventMode()) {
293293
// note that we don't reschedule here even if instructed. Removing finalizer means that
294294
// cleanup is finished, nothing left to be done
295295
final var finalizerName = configuration().getFinalizerName();
@@ -531,4 +531,8 @@ private Resource<R> resource(R resource) {
531531
: resourceOperation.resource(resource);
532532
}
533533
}
534+
535+
private boolean isAllEventMode() {
536+
return configuration().isAllEventReconcileMode();
537+
}
534538
}

sample-operators/mysql-schema/src/main/resources/log4j2.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
</Console>
77
</Appenders>
88
<Loggers>
9-
<Root level="debug">
9+
<Root level="info">
1010
<AppenderRef ref="Console"/>
1111
</Root>
1212
</Loggers>

0 commit comments

Comments
 (0)