ableegoldman commented on a change in pull request #11813:
URL: https://github.com/apache/kafka/pull/11813#discussion_r816306491
##########
File path:
streams/src/main/java/org/apache/kafka/streams/processor/internals/namedtopology/KafkaStreamsNamedTopologyWrapper.java
##########
@@ -230,53 +233,72 @@ public RemoveNamedTopologyResult
removeNamedTopology(final String topologyToRemo
topologyMetadata.unregisterTopology(removeTopologyFuture,
topologyToRemove);
- if (resetOffsets) {
+ if (!completedFutureForUnstartedApp(removeTopologyFuture, "removing
topology") && resetOffsets) {
log.info("Resetting offsets for the following partitions of {}
removed NamedTopology {}: {}",
removeTopologyFuture.isCompletedExceptionally() ?
"unsuccessfully" : "successfully",
topologyToRemove, partitionsToReset
);
- if (!partitionsToReset.isEmpty()) {
- removeTopologyFuture.whenComplete((v, throwable) -> {
- if (throwable != null) {
- removeTopologyFuture.completeExceptionally(throwable);
- }
- DeleteConsumerGroupOffsetsResult deleteOffsetsResult =
null;
- while (deleteOffsetsResult == null) {
- try {
- deleteOffsetsResult =
adminClient.deleteConsumerGroupOffsets(
-
applicationConfigs.getString(StreamsConfig.APPLICATION_ID_CONFIG),
partitionsToReset);
- deleteOffsetsResult.all().get();
- } catch (final InterruptedException ex) {
+ resetOffsets(removeTopologyFuture, partitionsToReset);
+ }
+ return new RemoveNamedTopologyResult(removeTopologyFuture);
+ }
+
+ /**
+ * @return true iff the application is still in CREATED and the future
was completed
+ */
+ private synchronized boolean completedFutureForUnstartedApp(final
KafkaFutureImpl<Void> updateTopologyFuture,
+ final String
operation) {
+ if (state == State.CREATED && !updateTopologyFuture.isDone()) {
+ updateTopologyFuture.complete(null);
+ log.info("Completed {} since application has not been started",
operation);
+ return true;
+ } else {
+ return false;
+ }
+ }
+
+ private RemoveNamedTopologyResult resetOffsets(final KafkaFutureImpl<Void>
removeTopologyFuture,
Review comment:
Yep -- just direct copy/paste
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: jira-unsubscr...@kafka.apache.org
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
