Skip to content

Fix ClusterBasedProcessorLifecycleListener test to exit without waiting for timeout #1159

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.

Sign up for GitHub

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

Merged
cameronlee314 merged 2 commits into from
Oct 1, 2019
Merged

Fix ClusterBasedProcessorLifecycleListener test to exit without waiting for timeout #1159

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9b3a9e6
Fix test to exit without waiting for timeout
Sep 17, 2019
a711261
addressing comments
Sep 17, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 10 additions & 4 deletions ...re/src/test/java/org/apache/samza/runtime/TestClusterBasedProcessorLifecycleListener.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ public void setup() {
mockShutdownHookCallback = mock(Runnable.class);
processorLifecycleListener = mock(ProcessorLifecycleListener.class);
clusterBasedProcessorLifecycleListener =
spy(new ClusterBasedProcessorLifecycleListener(new MapConfig(ImmutableMap.of(TaskConfig.TASK_SHUTDOWN_MS, "1")),
spy(new ClusterBasedProcessorLifecycleListener(new MapConfig(ImmutableMap.of(TaskConfig.TASK_SHUTDOWN_MS, "30000")),
processorLifecycleListener, mockShutdownHookCallback));
doNothing().when(clusterBasedProcessorLifecycleListener).addJVMShutdownHook(any(Thread.class));
doNothing().when(clusterBasedProcessorLifecycleListener).removeJVMShutdownHook(any(Thread.class));
Expand Down Expand Up @@ -77,12 +77,18 @@ public void testLifecycleListenerAfterFailure() {

@Test
public void testShutdownHookInvokesShutdownHookCallback() {
doNothing().when(mockShutdownHookCallback).run();
doAnswer(invocation -> {
// Simulate call to container.shutdown()
clusterBasedProcessorLifecycleListener.afterStop();
return null;
}).when(mockShutdownHookCallback).run();

// setup shutdown hook
// call beforeStart to setup shutdownHook
Comment thread
abhishekshivanna marked this conversation as resolved.
clusterBasedProcessorLifecycleListener.beforeStart();

// Simulating shutdown hook invocation by JVM
// Simulating shutdown hook invocation by JVM.
// The shutdownHookThread should return immediately and shutdown
// cleanly if mockShutdownHookCallback.run() is invoked.
clusterBasedProcessorLifecycleListener.getShutdownHookThread().run();
Mockito.verify(mockShutdownHookCallback).run();
}
Expand Down