Skip to content

KAFKA-7534: Error in flush calling close may prevent underlying store from closing #5833

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
mjsax merged 2 commits into from
Oct 26, 2018
Merged

KAFKA-7534: Error in flush calling close may prevent underlying store from closing #5833

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
02ab0e4
KAFKA-7534: Error in flush calling close may prevent underlying store…
bbejeck Oct 24, 2018
810a428
KAFKA-7534: use nested try to ensure cache closed as well.
bbejeck Oct 24, 2018
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
12 changes: 9 additions & 3 deletions streams/src/main/java/org/apache/kafka/streams/state/internals/CachingKeyValueStore.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,9 +129,15 @@ public void flush() {

@Override
public void close() {
flush();
underlying.close();
cache.close(cacheName);
try {
flush();
} finally {
try {
underlying.close();
} finally {
cache.close(cacheName);
}
}
}

@Override
Expand Down
20 changes: 19 additions & 1 deletion streams/src/test/java/org/apache/kafka/streams/state/internals/CachingKeyValueStoreTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@
import org.apache.kafka.streams.state.StoreBuilder;
import org.apache.kafka.streams.state.Stores;
import org.apache.kafka.test.InternalMockProcessorContext;
import org.easymock.EasyMock;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
Expand Down Expand Up @@ -103,6 +104,22 @@ protected <K, V> KeyValueStore<K, V> createKeyValueStore(final ProcessorContext
return store;
}

@Test
public void shouldCloseAfterErrorWithFlush() {
try {
cache = EasyMock.niceMock(ThreadCache.class);
context = new InternalMockProcessorContext(null, null, null, (RecordCollector) null, cache);
context.setRecordContext(new ProcessorRecordContext(10, 0, 0, topic, null));
store.init(context, null);
cache.flush("0_0-store");
EasyMock.expectLastCall().andThrow(new NullPointerException("Simulating an error on flush"));
EasyMock.replay(cache);
store.close();
} catch (final NullPointerException npe) {
assertFalse(underlyingStore.isOpen());
}
}

@Test
public void shouldPutGetToFromCache() {
store.put(bytesKey("key"), bytesValue("value"));
Expand Down Expand Up @@ -274,7 +291,8 @@ public void shouldThrowNullPointerExceptionOnPutAllWithNullKey() {
try {
store.putAll(entries);
fail("Should have thrown NullPointerException while putAll null key");
} catch (final NullPointerException e) { }
} catch (final NullPointerException e) {
}
}

@Test
Expand Down