Skip to content

MINOR: Support long maxMessages in Trogdor consume/produce bench workers #5957

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
cmccabe merged 1 commit into from
Nov 28, 2018
Merged

MINOR: Support long maxMessages in Trogdor consume/produce bench workers #5957

Show file tree
Hide file tree
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
6 changes: 3 additions & 3 deletions tools/src/main/java/org/apache/kafka/trogdor/workload/ConsumeBenchSpec.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ public class ConsumeBenchSpec extends TaskSpec {
private final String consumerNode;
private final String bootstrapServers;
private final int targetMessagesPerSec;
private final int maxMessages;
private final long maxMessages;
private final Map<String, String> consumerConf;
private final Map<String, String> adminClientConf;
private final Map<String, String> commonClientConf;
Expand All @@ -105,7 +105,7 @@ public ConsumeBenchSpec(@JsonProperty("startMs") long startMs,
@JsonProperty("consumerNode") String consumerNode,
@JsonProperty("bootstrapServers") String bootstrapServers,
@JsonProperty("targetMessagesPerSec") int targetMessagesPerSec,
@JsonProperty("maxMessages") int maxMessages,
@JsonProperty("maxMessages") long maxMessages,
@JsonProperty("consumerGroup") String consumerGroup,
@JsonProperty("consumerConf") Map<String, String> consumerConf,
@JsonProperty("commonClientConf") Map<String, String> commonClientConf,
Expand Down Expand Up @@ -146,7 +146,7 @@ public int targetMessagesPerSec() {
}

@JsonProperty
public int maxMessages() {
public long maxMessages() {
return maxMessages;
}

Expand Down
2 changes: 1 addition & 1 deletion tools/src/main/java/org/apache/kafka/trogdor/workload/ConsumeBenchWorker.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -233,7 +233,7 @@ public Void call() throws Exception {
long bytesConsumed = 0;
long startTimeMs = Time.SYSTEM.milliseconds();
long startBatchMs = startTimeMs;
int maxMessages = spec.maxMessages();
long maxMessages = spec.maxMessages();
try {
while (messagesConsumed < maxMessages) {
ConsumerRecords<byte[], byte[]> records = consumer.poll();
Expand Down
6 changes: 3 additions & 3 deletions tools/src/main/java/org/apache/kafka/trogdor/workload/ProduceBenchSpec.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ public class ProduceBenchSpec extends TaskSpec {
private final String producerNode;
private final String bootstrapServers;
private final int targetMessagesPerSec;
private final int maxMessages;
private final long maxMessages;
private final PayloadGenerator keyGenerator;
private final PayloadGenerator valueGenerator;
private final Optional<TransactionGenerator> transactionGenerator;
Expand All @@ -80,7 +80,7 @@ public ProduceBenchSpec(@JsonProperty("startMs") long startMs,
@JsonProperty("producerNode") String producerNode,
@JsonProperty("bootstrapServers") String bootstrapServers,
@JsonProperty("targetMessagesPerSec") int targetMessagesPerSec,
@JsonProperty("maxMessages") int maxMessages,
@JsonProperty("maxMessages") long maxMessages,
@JsonProperty("keyGenerator") PayloadGenerator keyGenerator,
@JsonProperty("valueGenerator") PayloadGenerator valueGenerator,
@JsonProperty("transactionGenerator") Optional<TransactionGenerator> txGenerator,
Expand Down Expand Up @@ -124,7 +124,7 @@ public int targetMessagesPerSec() {
}

@JsonProperty
public int maxMessages() {
public long maxMessages() {
return maxMessages;
}

Expand Down
2 changes: 1 addition & 1 deletion tools/src/main/java/org/apache/kafka/trogdor/workload/ProduceBenchWorker.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -225,7 +225,7 @@ public Void call() throws Exception {
if (enableTransactions)
producer.initTransactions();

int sentMessages = 0;
long sentMessages = 0;
while (sentMessages < spec.maxMessages()) {
if (enableTransactions) {
boolean tookAction = takeTransactionAction();
Expand Down