Skip to content
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.

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

Added pause and resume to Java client Consumer #2961

Merged
merged 6 commits into from
Nov 10, 2018
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -294,4 +294,14 @@ public interface Consumer<T> extends Closeable {
* @return consumer name.
*/
String getConsumerName();

/**
* Stop requesting new messages from the broker until {@link #resume()} is called.
*/
void pause();
davidtinker marked this conversation as resolved.
Show resolved Hide resolved

/**
* Resume requesting messages from the broker.
*/
void resume();
}
Original file line number Diff line number Diff line change
Expand Up @@ -144,6 +144,8 @@ public class ConsumerImpl<T> extends ConsumerBase<T> implements ConnectionHandle

private Producer<T> deadLetterProducer;

protected volatile boolean paused;

enum SubscriptionMode {
// Make the subscription to be backed by a durable cursor that will retain messages and persist the current
// position
Expand Down Expand Up @@ -1073,7 +1075,7 @@ void increaseAvailablePermits(ClientCnx currentCnx) {
private void increaseAvailablePermits(ClientCnx currentCnx, int delta) {
int available = AVAILABLE_PERMITS_UPDATER.addAndGet(this, delta);

while (available >= receiverQueueRefillThreshold) {
while (available >= receiverQueueRefillThreshold && !paused) {
if (AVAILABLE_PERMITS_UPDATER.compareAndSet(this, available, 0)) {
sendFlowPermitsToBroker(currentCnx, available);
break;
Expand All @@ -1083,6 +1085,19 @@ private void increaseAvailablePermits(ClientCnx currentCnx, int delta) {
}
}

@Override
public void pause() {
paused = true;
}

@Override
public void resume() {
if (paused) {
paused = false;
increaseAvailablePermits(cnx(), 0);
}
}

private ByteBuf decryptPayloadIfNeeded(MessageIdData messageId, MessageMetadata msgMetadata, ByteBuf payload,
ClientCnx currentCnx) {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -853,5 +853,15 @@ public List<ConsumerImpl<T>> getConsumers() {
return consumers.values().stream().collect(Collectors.toList());
}

@Override
public void pause() {
for (Map.Entry<String, ConsumerImpl<T>> e : consumers.entrySet()) e.getValue().pause();
davidtinker marked this conversation as resolved.
Show resolved Hide resolved
}

@Override
public void resume() {
for (Map.Entry<String, ConsumerImpl<T>> e : consumers.entrySet()) e.getValue().resume();
davidtinker marked this conversation as resolved.
Show resolved Hide resolved
}

private static final Logger log = LoggerFactory.getLogger(MultiTopicsConsumerImpl.class);
}
Original file line number Diff line number Diff line change
Expand Up @@ -504,6 +504,16 @@ public boolean isConnected() {
public String getConsumerName() {
return "test-consumer-0";
}

@Override
public void pause() {

davidtinker marked this conversation as resolved.
Show resolved Hide resolved
}

@Override
public void resume() {

}
}

private static List<Message> createMessages(int startIndex, int numMessages) {
Expand Down