Add Aggregate event handle #4625
Conversation
Signed-off-by: Krishna Kondaka <krishkdk@dev-dsk-krishkdk-2c-bd29c437.us-west-2.amazon.com>
Signed-off-by: Krishna Kondaka <krishkdk@dev-dsk-krishkdk-2c-bd29c437.us-west-2.amazon.com>
kkondaka
requested review from
chenqi0805,
engechas,
graytaylor0,
dinujoh,
asifsmohammed,
KarstenSchnitter,
dlvenable and
oeyh
as code owners
| @Override | ||
| public void acquireReference() { | ||
| synchronized (this) { | ||
| for (WeakReference<AcknowledgementSet> acknowledgementSetRef: acknowledgementSetRefList) {; |
There was a problem hiding this comment.
You have a dangling semi-colon. {;
| import java.time.Instant; | ||
| import java.io.Serializable; | ||
|
|
||
| public class AggregateEventHandle implements EventHandle, InternalEventHandle, Serializable { |
There was a problem hiding this comment.
Can you make a package-protected AbstractEventHandle that shares some of the logic? This will help clarify the differences between the two and also consolidate similar code.
| when(((DefaultEventHandle) eventHandle).getAcknowledgementSet()).thenReturn(mock(AcknowledgementSet.class)); | ||
| doNothing().when(eventHandle).release(true); | ||
| final AcknowledgementSet acknowledgementSet = mock(AcknowledgementSet.class); | ||
| lenient().doAnswer(a-> { |
There was a problem hiding this comment.
I think this can just be when(acknowledgementSet).release(eventHandle, true).thenReturn(null);
| when(((DefaultEventHandle) eventHandle).getAcknowledgementSet()).thenReturn(mock(AcknowledgementSet.class)); | ||
| doNothing().when(eventHandle).release(true); | ||
| final AcknowledgementSet acknowledgementSet = mock(AcknowledgementSet.class); | ||
| lenient().doAnswer(a-> { |
| import java.time.Instant; | ||
| import java.io.Serializable; | ||
|
|
||
| public class AggregateEventHandle implements EventHandle, InternalEventHandle, Serializable { |
There was a problem hiding this comment.
Should this class be made internal? Are we going to have processors use this?
There was a problem hiding this comment.
No. It will be used by AggregateProcessor.
| eventHandle.acquireReference(); | ||
| verify(acknowledgementSet1).acquire(eventHandle); | ||
| verify(acknowledgementSet2).acquire(eventHandle); | ||
| assertThat(acquireCount, equalTo(2)); |
There was a problem hiding this comment.
Why do you need this assertion? And also, why the acquireCount tracking?
I believe that lines 67-68 fully assert the same thing.
Signed-off-by: Krishna Kondaka <krishkdk@dev-dsk-krishkdk-2c-bd29c437.us-west-2.amazon.com>
| public void acquire(final EventHandle eventHandle) { | ||
| if (eventHandle == null) { | ||
| numNullHandles.incrementAndGet(); | ||
| return; | ||
| } | ||
|
|
||
| DefaultAcknowledgementSet acknowledgementSet = getAcknowledgementSet(eventHandle); | ||
| lock.lock(); | ||
| boolean exists = false; | ||
| try { | ||
| exists = acknowledgementSets.contains(acknowledgementSet); | ||
| } finally { | ||
| lock.unlock(); | ||
| } | ||
| // if acknowledgementSet doesn't exist then it means that the | ||
| // event still active even after the acknowledgement set is | ||
| // cleaned up. | ||
| if (exists) { | ||
| acknowledgementSet.acquire(eventHandle); | ||
| } else { | ||
| LOG.warn("Trying acquire an event in an AcknowledgementSet that does not exist"); | ||
| numInvalidAcquires.incrementAndGet(); |
There was a problem hiding this comment.
@graytaylor0 It was used but not needed after the new changes where the acquire is directly done on the event handle. When we first implemented this, event handle was not guaranteed to be there, so we have implemented it to go through DefaultAcknowledgementSetManager which in turn invokes AcknowledgementSetMonitor.acquire(). Now all that became unnecessary.
Signed-off-by: Krishna Kondaka <krishkdk@dev-dsk-krishkdk-2c-bd29c437.us-west-2.amazon.com>
Description
Add Aggregate event handle, for supporting e2e acks for aggregated events (in future)
Cleaned up a lot of API in AcknowledgementSetManager as part of this to simplify the code
Issues Resolved
Resolves #[Issue number to be closed when this PR is merged]
Check List
By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.
For more information on following Developer Certificate of Origin and signing off your commits, please check here.