Skip to content

MINOR: Port changes from trunk for test stability to 2.3 branch #7424

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 1 commit into from
Oct 14, 2019
Merged

MINOR: Port changes from trunk for test stability to 2.3 branch #7424

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
273 changes: 150 additions & 123 deletions streams/src/test/java/org/apache/kafka/streams/integration/StoreUpgradeIntegrationTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -329,56 +329,65 @@ private <K, V> void processKeyValueAndVerifyPlainCount(final K key,
IntegerSerializer.class),
CLUSTER.time);

TestUtils.waitForCondition(() -> {
try {
final ReadOnlyKeyValueStore<K, V> store =
kafkaStreams.store(STORE_NAME, QueryableStoreTypes.keyValueStore());
try (final KeyValueIterator<K, V> all = store.all()) {
final List<KeyValue<K, V>> storeContent = new LinkedList<>();
while (all.hasNext()) {
storeContent.add(all.next());
TestUtils.waitForCondition(
() -> {
try {
final ReadOnlyKeyValueStore<K, V> store =
kafkaStreams.store(STORE_NAME, QueryableStoreTypes.keyValueStore());
try (final KeyValueIterator<K, V> all = store.all()) {
final List<KeyValue<K, V>> storeContent = new LinkedList<>();
while (all.hasNext()) {
storeContent.add(all.next());
}
return storeContent.equals(expectedStoreContent);
}
return storeContent.equals(expectedStoreContent);
} catch (final Exception swallow) {
swallow.printStackTrace();
System.err.println(swallow.getMessage());
return false;
}
} catch (final Exception swallow) {
swallow.printStackTrace();
System.err.println(swallow.getMessage());
return false;
}
}, "Could not get expected result in time.");
},
60_000L,
"Could not get expected result in time.");
}

private <K> void verifyCountWithTimestamp(final K key,
final long value,
final long timestamp) throws Exception {
TestUtils.waitForCondition(() -> {
try {
final ReadOnlyKeyValueStore<K, ValueAndTimestamp<Long>> store =
kafkaStreams.store(STORE_NAME, QueryableStoreTypes.timestampedKeyValueStore());
final ValueAndTimestamp<Long> count = store.get(key);
return count.value() == value && count.timestamp() == timestamp;
} catch (final Exception swallow) {
swallow.printStackTrace();
System.err.println(swallow.getMessage());
return false;
}
}, "Could not get expected result in time.");
TestUtils.waitForCondition(
() -> {
try {
final ReadOnlyKeyValueStore<K, ValueAndTimestamp<Long>> store =
kafkaStreams.store(STORE_NAME, QueryableStoreTypes.timestampedKeyValueStore());
final ValueAndTimestamp<Long> count = store.get(key);
return count.value() == value && count.timestamp() == timestamp;
} catch (final Exception swallow) {
swallow.printStackTrace();
System.err.println(swallow.getMessage());
return false;
}
},
60_000L,
"Could not get expected result in time.");
}

private <K> void verifyCountWithSurrogateTimestamp(final K key,
final long value) throws Exception {
TestUtils.waitForCondition(() -> {
try {
final ReadOnlyKeyValueStore<K, ValueAndTimestamp<Long>> store =
kafkaStreams.store(STORE_NAME, QueryableStoreTypes.timestampedKeyValueStore());
final ValueAndTimestamp<Long> count = store.get(key);
return count.value() == value && count.timestamp() == -1L;
} catch (final Exception swallow) {
swallow.printStackTrace();
System.err.println(swallow.getMessage());
return false;
}
}, "Could not get expected result in time.");
TestUtils.waitForCondition(
() -> {
try {
final ReadOnlyKeyValueStore<K, ValueAndTimestamp<Long>> store =
kafkaStreams.store(STORE_NAME, QueryableStoreTypes.timestampedKeyValueStore());
final ValueAndTimestamp<Long> count = store.get(key);
return count.value() == value && count.timestamp() == -1L;
} catch (final Exception swallow) {
swallow.printStackTrace();
System.err.println(swallow.getMessage());
return false;
}
},
60_000L,
"Could not get expected result in time.");
}

private <K, V> void processKeyValueAndVerifyCount(final K key,
Expand All @@ -394,23 +403,26 @@ private <K, V> void processKeyValueAndVerifyCount(final K key,
IntegerSerializer.class),
timestamp);

TestUtils.waitForCondition(() -> {
try {
final ReadOnlyKeyValueStore<K, ValueAndTimestamp<V>> store =
kafkaStreams.store(STORE_NAME, QueryableStoreTypes.timestampedKeyValueStore());
try (final KeyValueIterator<K, ValueAndTimestamp<V>> all = store.all()) {
final List<KeyValue<K, ValueAndTimestamp<V>>> storeContent = new LinkedList<>();
while (all.hasNext()) {
storeContent.add(all.next());
TestUtils.waitForCondition(
() -> {
try {
final ReadOnlyKeyValueStore<K, ValueAndTimestamp<V>> store =
kafkaStreams.store(STORE_NAME, QueryableStoreTypes.timestampedKeyValueStore());
try (final KeyValueIterator<K, ValueAndTimestamp<V>> all = store.all()) {
final List<KeyValue<K, ValueAndTimestamp<V>>> storeContent = new LinkedList<>();
while (all.hasNext()) {
storeContent.add(all.next());
}
return storeContent.equals(expectedStoreContent);
}
return storeContent.equals(expectedStoreContent);
} catch (final Exception swallow) {
swallow.printStackTrace();
System.err.println(swallow.getMessage());
return false;
}
} catch (final Exception swallow) {
swallow.printStackTrace();
System.err.println(swallow.getMessage());
return false;
}
}, "Could not get expected result in time.");
},
60_000L,
"Could not get expected result in time.");
}

private <K, V> void processKeyValueAndVerifyCountWithTimestamp(final K key,
Expand All @@ -426,23 +438,26 @@ private <K, V> void processKeyValueAndVerifyCountWithTimestamp(final K key,
IntegerSerializer.class),
timestamp);

TestUtils.waitForCondition(() -> {
try {
final ReadOnlyKeyValueStore<K, ValueAndTimestamp<V>> store =
kafkaStreams.store(STORE_NAME, QueryableStoreTypes.timestampedKeyValueStore());
try (final KeyValueIterator<K, ValueAndTimestamp<V>> all = store.all()) {
final List<KeyValue<K, ValueAndTimestamp<V>>> storeContent = new LinkedList<>();
while (all.hasNext()) {
storeContent.add(all.next());
TestUtils.waitForCondition(
() -> {
try {
final ReadOnlyKeyValueStore<K, ValueAndTimestamp<V>> store =
kafkaStreams.store(STORE_NAME, QueryableStoreTypes.timestampedKeyValueStore());
try (final KeyValueIterator<K, ValueAndTimestamp<V>> all = store.all()) {
final List<KeyValue<K, ValueAndTimestamp<V>>> storeContent = new LinkedList<>();
while (all.hasNext()) {
storeContent.add(all.next());
}
return storeContent.equals(expectedStoreContent);
}
return storeContent.equals(expectedStoreContent);
} catch (final Exception swallow) {
swallow.printStackTrace();
System.err.println(swallow.getMessage());
return false;
}
} catch (final Exception swallow) {
swallow.printStackTrace();
System.err.println(swallow.getMessage());
return false;
}
}, "Could not get expected result in time.");
},
60_000L,
"Could not get expected result in time.");
}

@Test
Expand Down Expand Up @@ -789,56 +804,65 @@ private <K, V> void processWindowedKeyValueAndVerifyPlainCount(final K key,
IntegerSerializer.class),
CLUSTER.time);

TestUtils.waitForCondition(() -> {
try {
final ReadOnlyWindowStore<K, V> store =
kafkaStreams.store(STORE_NAME, QueryableStoreTypes.windowStore());
try (final KeyValueIterator<Windowed<K>, V> all = store.all()) {
final List<KeyValue<Windowed<K>, V>> storeContent = new LinkedList<>();
while (all.hasNext()) {
storeContent.add(all.next());
TestUtils.waitForCondition(
() -> {
try {
final ReadOnlyWindowStore<K, V> store =
kafkaStreams.store(STORE_NAME, QueryableStoreTypes.windowStore());
try (final KeyValueIterator<Windowed<K>, V> all = store.all()) {
final List<KeyValue<Windowed<K>, V>> storeContent = new LinkedList<>();
while (all.hasNext()) {
storeContent.add(all.next());
}
return storeContent.equals(expectedStoreContent);
}
return storeContent.equals(expectedStoreContent);
} catch (final Exception swallow) {
swallow.printStackTrace();
System.err.println(swallow.getMessage());
return false;
}
} catch (final Exception swallow) {
swallow.printStackTrace();
System.err.println(swallow.getMessage());
return false;
}
}, "Could not get expected result in time.");
},
60_000L,
"Could not get expected result in time.");
}

private <K> void verifyWindowedCountWithSurrogateTimestamp(final Windowed<K> key,
final long value) throws Exception {
TestUtils.waitForCondition(() -> {
try {
final ReadOnlyWindowStore<K, ValueAndTimestamp<Long>> store =
kafkaStreams.store(STORE_NAME, QueryableStoreTypes.timestampedWindowStore());
final ValueAndTimestamp<Long> count = store.fetch(key.key(), key.window().start());
return count.value() == value && count.timestamp() == -1L;
} catch (final Exception swallow) {
swallow.printStackTrace();
System.err.println(swallow.getMessage());
return false;
}
}, "Could not get expected result in time.");
TestUtils.waitForCondition(
() -> {
try {
final ReadOnlyWindowStore<K, ValueAndTimestamp<Long>> store =
kafkaStreams.store(STORE_NAME, QueryableStoreTypes.timestampedWindowStore());
final ValueAndTimestamp<Long> count = store.fetch(key.key(), key.window().start());
return count.value() == value && count.timestamp() == -1L;
} catch (final Exception swallow) {
swallow.printStackTrace();
System.err.println(swallow.getMessage());
return false;
}
},
60_000L,
"Could not get expected result in time.");
}

private <K> void verifyWindowedCountWithTimestamp(final Windowed<K> key,
final long value,
final long timestamp) throws Exception {
TestUtils.waitForCondition(() -> {
try {
final ReadOnlyWindowStore<K, ValueAndTimestamp<Long>> store =
kafkaStreams.store(STORE_NAME, QueryableStoreTypes.timestampedWindowStore());
final ValueAndTimestamp<Long> count = store.fetch(key.key(), key.window().start());
return count.value() == value && count.timestamp() == timestamp;
} catch (final Exception swallow) {
swallow.printStackTrace();
System.err.println(swallow.getMessage());
return false;
}
}, "Could not get expected result in time.");
TestUtils.waitForCondition(
() -> {
try {
final ReadOnlyWindowStore<K, ValueAndTimestamp<Long>> store =
kafkaStreams.store(STORE_NAME, QueryableStoreTypes.timestampedWindowStore());
final ValueAndTimestamp<Long> count = store.fetch(key.key(), key.window().start());
return count.value() == value && count.timestamp() == timestamp;
} catch (final Exception swallow) {
swallow.printStackTrace();
System.err.println(swallow.getMessage());
return false;
}
},
60_000L,
"Could not get expected result in time.");
}

private <K, V> void processKeyValueAndVerifyWindowedCountWithTimestamp(final K key,
Expand All @@ -854,23 +878,26 @@ private <K, V> void processKeyValueAndVerifyWindowedCountWithTimestamp(final K k
IntegerSerializer.class),
timestamp);

TestUtils.waitForCondition(() -> {
try {
final ReadOnlyWindowStore<K, ValueAndTimestamp<V>> store =
kafkaStreams.store(STORE_NAME, QueryableStoreTypes.timestampedWindowStore());
try (final KeyValueIterator<Windowed<K>, ValueAndTimestamp<V>> all = store.all()) {
final List<KeyValue<Windowed<K>, ValueAndTimestamp<V>>> storeContent = new LinkedList<>();
while (all.hasNext()) {
storeContent.add(all.next());
TestUtils.waitForCondition(
() -> {
try {
final ReadOnlyWindowStore<K, ValueAndTimestamp<V>> store =
kafkaStreams.store(STORE_NAME, QueryableStoreTypes.timestampedWindowStore());
try (final KeyValueIterator<Windowed<K>, ValueAndTimestamp<V>> all = store.all()) {
final List<KeyValue<Windowed<K>, ValueAndTimestamp<V>>> storeContent = new LinkedList<>();
while (all.hasNext()) {
storeContent.add(all.next());
}
return storeContent.equals(expectedStoreContent);
}
return storeContent.equals(expectedStoreContent);
} catch (final Exception swallow) {
swallow.printStackTrace();
System.err.println(swallow.getMessage());
return false;
}
} catch (final Exception swallow) {
swallow.printStackTrace();
System.err.println(swallow.getMessage());
return false;
}
}, "Could not get expected result in time.");
},
60_000L,
"Could not get expected result in time.");
}

private static class KeyValueProcessor implements Processor<Integer, Integer> {
Expand Down