Skip to content

Commit cce78e4

Browse files
csviricsviri
committed
wip
Signed-off-by: Attila Mészáros <a_meszaros@apple.com>
1 parent 6bb19e2 commit cce78e4

File tree

5 files changed

+27
-51
lines changed

5 files changed

+27
-51
lines changed

‎operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/event/source/controller/ControllerEventSource.java‎

Lines changed: 6 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -85,25 +85,20 @@ public synchronized void start() {
8585

8686
@Override
8787
protected synchronized void handleEvent(
88-
ResourceAction action,
89-
T resource,
90-
T oldResource,
91-
Boolean deletedFinalStateUnknown,
92-
boolean filterEvent) {
88+
ResourceAction action, T resource, T oldResource, Boolean deletedFinalStateUnknown) {
9389
try {
9490
if (log.isDebugEnabled()) {
9591
log.debug(
96-
"Event received for resource: {} version: {} uuid: {} action: {} filter event: {}",
92+
"Event received for resource: {} version: {} uuid: {} action: {}",
9793
ResourceID.fromResource(resource),
9894
getVersion(resource),
9995
resource.getMetadata().getUid(),
100-
action,
101-
filterEvent);
96+
action);
10297
log.trace("Event Old resource: {},\n new resource: {}", oldResource, resource);
10398
}
10499
MDCUtils.addResourceInfo(resource);
105100
controller.getEventSourceManager().broadcastOnResourceEvent(action, resource, oldResource);
106-
if (isAcceptedByFilters(action, resource, oldResource) && !filterEvent) {
101+
if (isAcceptedByFilters(action, resource, oldResource)) {
107102
if (deletedFinalStateUnknown != null) {
108103
getEventHandler()
109104
.handleEvent(
@@ -153,12 +148,7 @@ private void handleOnAddOrUpdate(
153148
var handling =
154149
temporaryResourceCache.onAddOrUpdateEvent(action, newCustomResource, oldCustomResource);
155150
if (handling != EventHandling.NEW) {
156-
handleEvent(
157-
ResourceAction.UPDATED,
158-
newCustomResource,
159-
oldCustomResource,
160-
null,
161-
handling != EventHandling.NEW);
151+
handleEvent(ResourceAction.UPDATED, newCustomResource, oldCustomResource, null);
162152
}
163153
}
164154

@@ -167,7 +157,7 @@ public synchronized void onDelete(T resource, boolean deletedFinalStateUnknown)
167157
temporaryResourceCache.onDeleteEvent(resource, deletedFinalStateUnknown);
168158
// delete event is quite special here, that requires special care, since we clean up caches on
169159
// delete event.
170-
handleEvent(ResourceAction.DELETED, resource, null, deletedFinalStateUnknown, false);
160+
handleEvent(ResourceAction.DELETED, resource, null, deletedFinalStateUnknown);
171161
}
172162

173163
@Override

‎operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/event/source/informer/InformerEventSource.java‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -140,11 +140,7 @@ public synchronized void onDelete(R resource, boolean b) {
140140

141141
@Override
142142
protected void handleEvent(
143-
ResourceAction action,
144-
R resource,
145-
R oldResource,
146-
Boolean deletedFinalStateUnknown,
147-
boolean filterEvent) {
143+
ResourceAction action, R resource, R oldResource, Boolean deletedFinalStateUnknown) {
148144
propagateEvent(resource);
149145
}
150146

‎operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/event/source/informer/ManagedInformerEventSource.java‎

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -132,19 +132,14 @@ public R eventFilteringUpdateAndCacheResource(R resourceToUpdate, UnaryOperator<
132132
prevVersionOfResource,
133133
(r instanceof ResourceDeleteEvent)
134134
? ((ResourceDeleteEvent) r).isDeletedFinalStateUnknown()
135-
: null,
136-
false);
135+
: null);
137136
},
138137
() -> log.debug("No new event present after the filtering update; id: {}", id));
139138
}
140139
}
141140

142141
protected abstract void handleEvent(
143-
ResourceAction action,
144-
R resource,
145-
R oldResource,
146-
Boolean deletedFinalStateUnknown,
147-
boolean filterEvent);
142+
ResourceAction action, R resource, R oldResource, Boolean deletedFinalStateUnknown);
148143

149144
@SuppressWarnings("unchecked")
150145
@Override

‎operator-framework-core/src/test/java/io/javaoperatorsdk/operator/processing/event/source/controller/ControllerEventSourceTest.java‎

Lines changed: 16 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
import java.util.concurrent.CountDownLatch;
2121

2222
import org.junit.jupiter.api.BeforeEach;
23-
import org.junit.jupiter.api.Disabled;
2423
import org.junit.jupiter.api.Test;
2524

2625
import io.fabric8.kubernetes.client.KubernetesClientException;
@@ -76,35 +75,35 @@ void skipsEventHandlingIfGenerationNotIncreased() {
7675
TestCustomResource oldCustomResource = TestUtils.testCustomResource();
7776
oldCustomResource.getMetadata().setFinalizers(List.of(FINALIZER));
7877

79-
source.handleEvent(ResourceAction.UPDATED, customResource, oldCustomResource, null, false);
78+
source.handleEvent(ResourceAction.UPDATED, customResource, oldCustomResource, null);
8079
verify(eventHandler, times(1)).handleEvent(any());
8180

82-
source.handleEvent(ResourceAction.UPDATED, customResource, customResource, null, false);
81+
source.handleEvent(ResourceAction.UPDATED, customResource, customResource, null);
8382
verify(eventHandler, times(1)).handleEvent(any());
8483
}
8584

8685
@Test
8786
void dontSkipEventHandlingIfMarkedForDeletion() {
8887
TestCustomResource customResource1 = TestUtils.testCustomResource();
8988

90-
source.handleEvent(ResourceAction.UPDATED, customResource1, customResource1, null, false);
89+
source.handleEvent(ResourceAction.UPDATED, customResource1, customResource1, null);
9190
verify(eventHandler, times(1)).handleEvent(any());
9291

9392
// mark for deletion
9493
customResource1.getMetadata().setDeletionTimestamp(LocalDateTime.now().toString());
95-
source.handleEvent(ResourceAction.UPDATED, customResource1, customResource1, null, false);
94+
source.handleEvent(ResourceAction.UPDATED, customResource1, customResource1, null);
9695
verify(eventHandler, times(2)).handleEvent(any());
9796
}
9897

9998
@Test
10099
void normalExecutionIfGenerationChanges() {
101100
TestCustomResource customResource1 = TestUtils.testCustomResource();
102101

103-
source.handleEvent(ResourceAction.UPDATED, customResource1, customResource1, null, false);
102+
source.handleEvent(ResourceAction.UPDATED, customResource1, customResource1, null);
104103
verify(eventHandler, times(1)).handleEvent(any());
105104

106105
customResource1.getMetadata().setGeneration(2L);
107-
source.handleEvent(ResourceAction.UPDATED, customResource1, customResource1, null, false);
106+
source.handleEvent(ResourceAction.UPDATED, customResource1, customResource1, null);
108107
verify(eventHandler, times(2)).handleEvent(any());
109108
}
110109

@@ -115,18 +114,18 @@ void handlesAllEventIfNotGenerationAware() {
115114

116115
TestCustomResource customResource1 = TestUtils.testCustomResource();
117116

118-
source.handleEvent(ResourceAction.UPDATED, customResource1, customResource1, null, false);
117+
source.handleEvent(ResourceAction.UPDATED, customResource1, customResource1, null);
119118
verify(eventHandler, times(1)).handleEvent(any());
120119

121-
source.handleEvent(ResourceAction.UPDATED, customResource1, customResource1, null, false);
120+
source.handleEvent(ResourceAction.UPDATED, customResource1, customResource1, null);
122121
verify(eventHandler, times(2)).handleEvent(any());
123122
}
124123

125124
@Test
126125
void eventWithNoGenerationProcessedIfNoFinalizer() {
127126
TestCustomResource customResource1 = TestUtils.testCustomResource();
128127

129-
source.handleEvent(ResourceAction.UPDATED, customResource1, customResource1, null, false);
128+
source.handleEvent(ResourceAction.UPDATED, customResource1, customResource1, null);
130129

131130
verify(eventHandler, times(1)).handleEvent(any());
132131
}
@@ -135,7 +134,7 @@ void eventWithNoGenerationProcessedIfNoFinalizer() {
135134
void callsBroadcastsOnResourceEvents() {
136135
TestCustomResource customResource1 = TestUtils.testCustomResource();
137136

138-
source.handleEvent(ResourceAction.UPDATED, customResource1, customResource1, null, false);
137+
source.handleEvent(ResourceAction.UPDATED, customResource1, customResource1, null);
139138

140139
verify(testController.getEventSourceManager(), times(1))
141140
.broadcastOnResourceEvent(
@@ -151,8 +150,8 @@ void filtersOutEventsOnAddAndUpdate() {
151150
source = new ControllerEventSource<>(new TestController(onAddFilter, onUpdatePredicate, null));
152151
setUpSource(source, true, controllerConfig);
153152

154-
source.handleEvent(ResourceAction.ADDED, cr, null, null, false);
155-
source.handleEvent(ResourceAction.UPDATED, cr, cr, null, false);
153+
source.handleEvent(ResourceAction.ADDED, cr, null, null);
154+
source.handleEvent(ResourceAction.UPDATED, cr, cr, null);
156155

157156
verify(eventHandler, never()).handleEvent(any());
158157
}
@@ -164,9 +163,9 @@ void genericFilterFiltersOutAddUpdateAndDeleteEvents() {
164163
source = new ControllerEventSource<>(new TestController(null, null, res -> false));
165164
setUpSource(source, true, controllerConfig);
166165

167-
source.handleEvent(ResourceAction.ADDED, cr, null, null, false);
168-
source.handleEvent(ResourceAction.UPDATED, cr, cr, null, false);
169-
source.handleEvent(ResourceAction.DELETED, cr, cr, true, false);
166+
source.handleEvent(ResourceAction.ADDED, cr, null, null);
167+
source.handleEvent(ResourceAction.UPDATED, cr, cr, null);
168+
source.handleEvent(ResourceAction.DELETED, cr, cr, true);
170169

171170
verify(eventHandler, never()).handleEvent(any());
172171
}
@@ -196,7 +195,6 @@ void eventFilteringNewEventDuringUpdate() {
196195
await().untilAsserted(() -> expectHandleEvent(3, 2));
197196
}
198197

199-
@Disabled("todo")
200198
@Test
201199
void eventFilteringMoreNewEventsDuringUpdate() {
202200
source = spy(new ControllerEventSource<>(new TestController(null, null, null)));
@@ -248,8 +246,7 @@ private void expectHandleEvent(int newResourceVersion, int oldResourceVersion) {
248246
.isEqualTo("" + oldResourceVersion);
249247
return true;
250248
}),
251-
isNull(),
252-
eq(false));
249+
isNull());
253250
});
254251
}
255252

‎operator-framework-core/src/test/java/io/javaoperatorsdk/operator/processing/event/source/informer/InformerEventSourceTest.java‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,6 @@
5050
import static org.awaitility.Awaitility.await;
5151
import static org.junit.jupiter.api.Assertions.assertThrows;
5252
import static org.mockito.ArgumentMatchers.any;
53-
import static org.mockito.ArgumentMatchers.anyBoolean;
5453
import static org.mockito.ArgumentMatchers.argThat;
5554
import static org.mockito.ArgumentMatchers.eq;
5655
import static org.mockito.ArgumentMatchers.isNull;
@@ -257,7 +256,7 @@ void doesNotPropagateEventIfReceivedBeforeUpdate() throws InterruptedException {
257256
latch.countDown();
258257

259258
Thread.sleep(100);
260-
verify(informerEventSource, never()).handleEvent(any(), any(), any(), any(), anyBoolean());
259+
verify(informerEventSource, never()).handleEvent(any(), any(), any(), any());
261260
}
262261

263262
private void expectHandleEvent(int newResourceVersion, int oldResourceVersion) {
@@ -279,8 +278,7 @@ private void expectHandleEvent(int newResourceVersion, int oldResourceVersion) {
279278
.isEqualTo("" + oldResourceVersion);
280279
return true;
281280
}),
282-
isNull(),
283-
eq(false));
281+
isNull());
284282
});
285283
}
286284

0 commit comments

Comments
 (0)