From 686af3d9cab596ec4c27b0824f702f3aa61e6f27 Mon Sep 17 00:00:00 2001 From: Yabin Meng Date: Wed, 13 Oct 2021 10:10:48 -0500 Subject: [PATCH 1/5] Convert message error runtime exception to counter metrics --- .../driver/pulsar/PulsarActivity.java | 12 ++ .../pulsar/ops/PulsarConsumerMapper.java | 30 ++- .../driver/pulsar/ops/PulsarConsumerOp.java | 177 ++++++++++-------- .../pulsar/ops/PulsarConumerEmptyOp.java | 21 +++ .../pulsar/ops/PulsarProducerEmptyOp.java | 20 ++ .../pulsar/ops/PulsarProducerMapper.java | 97 ++++++---- .../driver/pulsar/ops/PulsarProducerOp.java | 10 +- .../driver/pulsar/ops/ReadyPulsarOp.java | 4 - 8 files changed, 231 insertions(+), 140 deletions(-) create mode 100644 driver-pulsar/src/main/java/io/nosqlbench/driver/pulsar/ops/PulsarConumerEmptyOp.java create mode 100644 driver-pulsar/src/main/java/io/nosqlbench/driver/pulsar/ops/PulsarProducerEmptyOp.java diff --git a/driver-pulsar/src/main/java/io/nosqlbench/driver/pulsar/PulsarActivity.java b/driver-pulsar/src/main/java/io/nosqlbench/driver/pulsar/PulsarActivity.java index 6d24f312a..e3aa48163 100644 --- a/driver-pulsar/src/main/java/io/nosqlbench/driver/pulsar/PulsarActivity.java +++ b/driver-pulsar/src/main/java/io/nosqlbench/driver/pulsar/PulsarActivity.java @@ -38,6 +38,12 @@ public class PulsarActivity extends SimpleActivity implements ActivityDefObserve // Metrics for NB Pulsar driver milestone: https://github.com/nosqlbench/nosqlbench/milestone/11 // - end-to-end latency private Histogram e2eMsgProcLatencyHistogram; + // - message out of sequence error counter + private Counter msgErrOutOfSeqCounter; + // - message loss counter + private Counter msgErrLossCounter; + // - message duplicate (when dedup is enabled) error counter + private Counter msgErrDuplicateCounter; private PulsarSpaceCache pulsarCache; @@ -76,6 +82,9 @@ public class PulsarActivity extends SimpleActivity implements ActivityDefObserve commitTransactionTimer = ActivityMetrics.timer(activityDef, "commit_transaction"); e2eMsgProcLatencyHistogram = ActivityMetrics.histogram(activityDef, "e2e_msg_latency"); + msgErrOutOfSeqCounter = ActivityMetrics.counter(activityDef, "err_msg_oos"); + msgErrLossCounter = ActivityMetrics.counter(activityDef, "err_msg_loss"); + msgErrDuplicateCounter = ActivityMetrics.counter(activityDef, "err_msg_dup"); String pulsarClntConfFile = activityDef.getParams().getOptionalString("config").orElse("config.properties"); @@ -231,4 +240,7 @@ public class PulsarActivity extends SimpleActivity implements ActivityDefObserve public Timer getCommitTransactionTimer() { return commitTransactionTimer; } public Histogram getE2eMsgProcLatencyHistogram() { return e2eMsgProcLatencyHistogram; } + public Counter getMsgErrOutOfSeqCounter() { return msgErrOutOfSeqCounter; } + public Counter getMsgErrLossCounter() { return msgErrLossCounter; } + public Counter getMsgErrDuplicateCounter() { return msgErrDuplicateCounter; } } diff --git a/driver-pulsar/src/main/java/io/nosqlbench/driver/pulsar/ops/PulsarConsumerMapper.java b/driver-pulsar/src/main/java/io/nosqlbench/driver/pulsar/ops/PulsarConsumerMapper.java index cae3afd42..25af5d8ac 100644 --- a/driver-pulsar/src/main/java/io/nosqlbench/driver/pulsar/ops/PulsarConsumerMapper.java +++ b/driver-pulsar/src/main/java/io/nosqlbench/driver/pulsar/ops/PulsarConsumerMapper.java @@ -1,15 +1,11 @@ package io.nosqlbench.driver.pulsar.ops; -import com.codahale.metrics.Counter; -import com.codahale.metrics.Histogram; -import com.codahale.metrics.Timer; import io.nosqlbench.driver.pulsar.PulsarActivity; import io.nosqlbench.driver.pulsar.PulsarSpace; import io.nosqlbench.engine.api.templating.CommandTemplate; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.apache.pulsar.client.api.Consumer; -import org.apache.pulsar.client.api.Schema; import org.apache.pulsar.client.api.transaction.Transaction; import java.util.function.LongFunction; @@ -34,6 +30,14 @@ public class PulsarConsumerMapper extends PulsarTransactOpMapper { private final LongFunction subscriptionTypeFunc; private final boolean e2eMsProc; + // Used for message loss checking + private long prevMsgSeqId = -1; + + // Used for early quiting when there are message loss + // Otherwise, sync API may unblock unnecessarily + private long totalMsgLossCnt = 0; + private long maxMsgSeqToExpect = -1; + public PulsarConsumerMapper(CommandTemplate cmdTpl, PulsarSpace clientSpace, PulsarActivity pulsarActivity, @@ -52,17 +56,33 @@ public class PulsarConsumerMapper extends PulsarTransactOpMapper { this.e2eMsProc = e2eMsgProc; } + public long getPrevMsgSeqId() { return prevMsgSeqId; } + public void setPrevMsgSeqId(long prevMsgSeqId) { this.prevMsgSeqId = prevMsgSeqId; } + + public long getTotalMsgLossCnt() { return totalMsgLossCnt; } + public void setTotalMsgLossCnt(long totalMsgLossCnt) { this.totalMsgLossCnt = totalMsgLossCnt; } + + public long getMaxMsgSeqToExpect() { return maxMsgSeqToExpect; } + public void setMaxMsgSeqToExpect(long maxMsgSeqToExpect) { this.maxMsgSeqToExpect = maxMsgSeqToExpect; } + @Override public PulsarOp apply(long value) { + boolean seqTracking = seqTrackingFunc.apply(value); + if ( seqTracking && (maxMsgSeqToExpect != -1) ) { + if ( (value + totalMsgLossCnt) > maxMsgSeqToExpect) { + return new PulsarConumerEmptyOp(pulsarActivity); + } + } + Consumer consumer = consumerFunc.apply(value); boolean asyncApi = asyncApiFunc.apply(value); boolean useTransaction = useTransactionFunc.apply(value); - boolean seqTracking = seqTrackingFunc.apply(value); Supplier transactionSupplier = transactionSupplierFunc.apply(value); boolean topicMsgDedup = topicMsgDedupFunc.apply(value); String subscriptionType = subscriptionTypeFunc.apply(value); return new PulsarConsumerOp( + this, pulsarActivity, asyncApi, useTransaction, diff --git a/driver-pulsar/src/main/java/io/nosqlbench/driver/pulsar/ops/PulsarConsumerOp.java b/driver-pulsar/src/main/java/io/nosqlbench/driver/pulsar/ops/PulsarConsumerOp.java index 24f61acac..7dfc3dd95 100644 --- a/driver-pulsar/src/main/java/io/nosqlbench/driver/pulsar/ops/PulsarConsumerOp.java +++ b/driver-pulsar/src/main/java/io/nosqlbench/driver/pulsar/ops/PulsarConsumerOp.java @@ -22,6 +22,7 @@ public class PulsarConsumerOp implements PulsarOp { private final static Logger logger = LogManager.getLogger(PulsarConsumerOp.class); + private final PulsarConsumerMapper consumerMapper; private final PulsarActivity pulsarActivity; private final boolean asyncPulsarOp; @@ -37,17 +38,25 @@ public class PulsarConsumerOp implements PulsarOp { private final boolean e2eMsgProc; private final long curCycleNum; - private long curMsgSeqId; - private long prevMsgSeqId; - private final Counter bytesCounter; private final Histogram messageSizeHistogram; private final Timer transactionCommitTimer; // keep track of end-to-end message latency private final Histogram e2eMsgProcLatencyHistogram; + // message out-of-sequence error counter + private final Counter msgErrOutOfSeqCounter; + // message out-of-sequence error counter + private final Counter msgErrDuplicateCounter; + // message loss error counter + private final Counter msgErrLossCounter; + + // Used for message error tracking + private final boolean ignoreMsgLossCheck; + private final boolean ignoreMsgDupCheck; public PulsarConsumerOp( + PulsarConsumerMapper consumerMapper, PulsarActivity pulsarActivity, boolean asyncPulsarOp, boolean useTransaction, @@ -61,6 +70,7 @@ public class PulsarConsumerOp implements PulsarOp { long curCycleNum, boolean e2eMsgProc) { + this.consumerMapper = consumerMapper; this.pulsarActivity = pulsarActivity; this.asyncPulsarOp = asyncPulsarOp; @@ -76,14 +86,80 @@ public class PulsarConsumerOp implements PulsarOp { this.curCycleNum = curCycleNum; this.e2eMsgProc = e2eMsgProc; - this.curMsgSeqId = 0; - this.prevMsgSeqId = (curCycleNum - 1); - this.bytesCounter = pulsarActivity.getBytesCounter(); this.messageSizeHistogram = pulsarActivity.getMessageSizeHistogram(); this.transactionCommitTimer = pulsarActivity.getCommitTransactionTimer(); this.e2eMsgProcLatencyHistogram = pulsarActivity.getE2eMsgProcLatencyHistogram(); + this.msgErrOutOfSeqCounter = pulsarActivity.getMsgErrOutOfSeqCounter(); + this.msgErrLossCounter = pulsarActivity.getMsgErrLossCounter(); + this.msgErrDuplicateCounter = pulsarActivity.getMsgErrDuplicateCounter(); + + // When message deduplication configuration is not enable, ignore message + // duplication check + this.ignoreMsgDupCheck = !this.topicMsgDedup; + + // Limitations of the message sequence based check: + // - For message out of sequence and message duplicate check, it works for + // all subscription types, including "Shared" and "Key_Shared" + // - For message loss, it doesn't work for "Shared" and "Key_Shared" + // subscription types + this.ignoreMsgLossCheck = + StringUtils.equalsAnyIgnoreCase(this.subscriptionType, + PulsarActivityUtil.SUBSCRIPTION_TYPE.Shared.label, + PulsarActivityUtil.SUBSCRIPTION_TYPE.Key_Shared.label); + } + + private void checkAndUpdateMessageErrorCounter(Message message) { + long maxMsgSeqToExpect = consumerMapper.getMaxMsgSeqToExpect(); + if (maxMsgSeqToExpect == -1) { + String msgSeqTgtMaxStr = message.getProperty(PulsarActivityUtil.MSG_SEQUENCE_TGTMAX); + if (!StringUtils.isBlank(msgSeqTgtMaxStr)) { + consumerMapper.setMaxMsgSeqToExpect(Long.valueOf(msgSeqTgtMaxStr)); + } + } + + String msgSeqIdStr = message.getProperty(PulsarActivityUtil.MSG_SEQUENCE_ID); + + if ( !StringUtils.isBlank(msgSeqIdStr) ) { + long prevMsgSeqId = consumerMapper.getPrevMsgSeqId(); + long curMsgSeqId = Long.parseLong(msgSeqIdStr); + + // Skip out-of-sequence check on the first received message + // - This is because out-of-sequence check requires at least 2 + // received messages for comparison + if ( (prevMsgSeqId != -1) && (curMsgSeqId < prevMsgSeqId) ) { + msgErrOutOfSeqCounter.inc(); + } + + // Similarly, when message duplicate check is needed, we also + // skip the first received message. + if ( !ignoreMsgDupCheck && (prevMsgSeqId != -1) && (curMsgSeqId == prevMsgSeqId) ) { + msgErrDuplicateCounter.inc(); + } + + // Note that message loss could be happened anywhere, E.g. + // - published messages: 0,1,2,3,4,5 + // - message loss scenario: + // * scenario 1: first set of messages are lost - received 2,3,4 + // * scenario 2: messages in the middle are lost - received 0,1,3,4 + // * scenario 3: last set of messages are lost - received 0,1,2 + if ( !ignoreMsgLossCheck ) { + // This check covers message loss scenarios 1 and 2 + if ( (curMsgSeqId - prevMsgSeqId) > 1 ){ + // there could be multiple published messages lost between + // 2 received messages + long msgLostCnt = (curMsgSeqId - prevMsgSeqId) - 1; + msgErrLossCounter.inc(msgLostCnt); + consumerMapper.setTotalMsgLossCnt(consumerMapper.getTotalMsgLossCnt() + msgLostCnt); + } + + // TODO: how can we detect message loss scenario 3? + } + + prevMsgSeqId = curMsgSeqId; + consumerMapper.setPrevMsgSeqId(prevMsgSeqId); + } } @Override @@ -143,47 +219,17 @@ public class PulsarConsumerOp implements PulsarOp { e2eMsgProcLatencyHistogram.update(e2eMsgLatency); } - // keep track of message ordering and message loss - String msgSeqIdStr = message.getProperties().get(PulsarActivityUtil.MSG_SEQUENCE_ID); - if ( (seqTracking) && !StringUtils.isBlank(msgSeqIdStr) ) { - curMsgSeqId = Long.parseLong(msgSeqIdStr); - - if ( prevMsgSeqId > -1) { - // normal case: message sequence id is monotonically increasing by 1 - if ((curMsgSeqId - prevMsgSeqId) != 1) { - // abnormal case: out of ordering - // - for any subscription type, this check should always hold - if (curMsgSeqId < prevMsgSeqId) { - throw new PulsarMsgOutOfOrderException( - false, curCycleNum, curMsgSeqId, prevMsgSeqId); - } - // - this sequence based message loss and message duplicate check can't be used for - // "Shared" subscription (ignore this check) - // - TODO: for Key_Shared subscription type, this logic needs to be improved on - // per-key basis - else { - if ( !StringUtils.equalsAnyIgnoreCase(subscriptionType, - PulsarActivityUtil.SUBSCRIPTION_TYPE.Shared.label, - PulsarActivityUtil.SUBSCRIPTION_TYPE.Key_Shared.label)) { - // abnormal case: message loss - if ((curMsgSeqId - prevMsgSeqId) > 1) { - throw new PulsarMsgLossException( - false, curCycleNum, curMsgSeqId, prevMsgSeqId); - } else if (topicMsgDedup && (curMsgSeqId == prevMsgSeqId)) { - throw new PulsarMsgDuplicateException( - false, curCycleNum, curMsgSeqId, prevMsgSeqId); - } - } - } - } - } - } + // keep track of message errors and update error counters + if (seqTracking) checkAndUpdateMessageErrorCounter(message); int messageSize = message.getData().length; bytesCounter.inc(messageSize); messageSizeHistogram.update(messageSize); - if (useTransaction) { + if (!useTransaction) { + consumer.acknowledge(message.getMessageId()); + } + else { consumer.acknowledgeAsync(message.getMessageId(), transaction).get(); // little problem: here we are counting the "commit" time @@ -194,14 +240,12 @@ public class PulsarConsumerOp implements PulsarOp { transaction.commit().get(); } } - else { - consumer.acknowledge(message.getMessageId()); - } } catch (Exception e) { logger.error( "Sync message receiving failed - timeout value: {} seconds ", timeoutSeconds); + e.printStackTrace(); throw new PulsarDriverUnexpectedException("" + "Sync message receiving failed - timeout value: " + timeoutSeconds + " seconds "); } @@ -254,47 +298,14 @@ public class PulsarConsumerOp implements PulsarOp { e2eMsgProcLatencyHistogram.update(e2eMsgLatency); } - // keep track of message ordering, message loss, and message duplication - String msgSeqIdStr = message.getProperties().get(PulsarActivityUtil.MSG_SEQUENCE_ID); - if ( (seqTracking) && !StringUtils.isBlank(msgSeqIdStr) ) { - curMsgSeqId = Long.parseLong(msgSeqIdStr); + // keep track of message errors and update error counters + if (seqTracking) checkAndUpdateMessageErrorCounter(message); - if (prevMsgSeqId > -1) { - // normal case: message sequence id is monotonically increasing by 1 - if ((curMsgSeqId - prevMsgSeqId) != 1) { - // abnormal case: out of ordering - // - for any subscription type, this check should always hold - if (curMsgSeqId < prevMsgSeqId) { - throw new PulsarMsgOutOfOrderException( - false, curCycleNum, curMsgSeqId, prevMsgSeqId); - } - // - this sequence based message loss and message duplicate check can't be used for - // "Shared" subscription (ignore this check) - // - TODO: for Key_Shared subscription type, this logic needs to be improved on - // per-key basis - else { - if ( !StringUtils.equalsAnyIgnoreCase(subscriptionType, - PulsarActivityUtil.SUBSCRIPTION_TYPE.Shared.label, - PulsarActivityUtil.SUBSCRIPTION_TYPE.Key_Shared.label)) { - // abnormal case: message loss - if ((curMsgSeqId - prevMsgSeqId) > 1) { - throw new PulsarMsgLossException( - false, curCycleNum, curMsgSeqId, prevMsgSeqId); - } else if (topicMsgDedup && (curMsgSeqId == prevMsgSeqId)) { - throw new PulsarMsgDuplicateException( - false, curCycleNum, curMsgSeqId, prevMsgSeqId); - } - } - } - } - } - } - - if (useTransaction) { - consumer.acknowledgeAsync(message.getMessageId(), transaction); + if (!useTransaction) { + consumer.acknowledgeAsync(message); } else { - consumer.acknowledgeAsync(message); + consumer.acknowledgeAsync(message.getMessageId(), transaction); } timeTracker.run(); diff --git a/driver-pulsar/src/main/java/io/nosqlbench/driver/pulsar/ops/PulsarConumerEmptyOp.java b/driver-pulsar/src/main/java/io/nosqlbench/driver/pulsar/ops/PulsarConumerEmptyOp.java new file mode 100644 index 000000000..255a81351 --- /dev/null +++ b/driver-pulsar/src/main/java/io/nosqlbench/driver/pulsar/ops/PulsarConumerEmptyOp.java @@ -0,0 +1,21 @@ +package io.nosqlbench.driver.pulsar.ops; + +import com.codahale.metrics.Counter; +import io.nosqlbench.driver.pulsar.PulsarActivity; + +public class PulsarConumerEmptyOp implements PulsarOp { + + private final PulsarActivity pulsarActivity; + + // message loss error counter + private final Counter msgErrLossCounter; + + public PulsarConumerEmptyOp(PulsarActivity pulsarActivity) { + this.pulsarActivity = pulsarActivity; + this.msgErrLossCounter = pulsarActivity.getMsgErrDuplicateCounter(); + } + + @Override + public void run(Runnable timeTracker) { + } +} diff --git a/driver-pulsar/src/main/java/io/nosqlbench/driver/pulsar/ops/PulsarProducerEmptyOp.java b/driver-pulsar/src/main/java/io/nosqlbench/driver/pulsar/ops/PulsarProducerEmptyOp.java new file mode 100644 index 000000000..f94af3982 --- /dev/null +++ b/driver-pulsar/src/main/java/io/nosqlbench/driver/pulsar/ops/PulsarProducerEmptyOp.java @@ -0,0 +1,20 @@ +package io.nosqlbench.driver.pulsar.ops; + +import io.nosqlbench.driver.pulsar.PulsarActivity; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; + +public class PulsarProducerEmptyOp implements PulsarOp { + + private final static Logger logger = LogManager.getLogger(PulsarProducerEmptyOp.class); + + private final PulsarActivity pulsarActivity; + + public PulsarProducerEmptyOp(PulsarActivity pulsarActivity) { + this.pulsarActivity = pulsarActivity; + } + + @Override + public void run(Runnable timeTracker) { + } +} diff --git a/driver-pulsar/src/main/java/io/nosqlbench/driver/pulsar/ops/PulsarProducerMapper.java b/driver-pulsar/src/main/java/io/nosqlbench/driver/pulsar/ops/PulsarProducerMapper.java index 9bdf63881..594f40406 100644 --- a/driver-pulsar/src/main/java/io/nosqlbench/driver/pulsar/ops/PulsarProducerMapper.java +++ b/driver-pulsar/src/main/java/io/nosqlbench/driver/pulsar/ops/PulsarProducerMapper.java @@ -36,6 +36,8 @@ public class PulsarProducerMapper extends PulsarTransactOpMapper { private final LongFunction propFunc; private final LongFunction payloadFunc; + private final long totalCycleCount; + public PulsarProducerMapper(CommandTemplate cmdTpl, PulsarSpace clientSpace, PulsarActivity pulsarActivity, @@ -55,6 +57,8 @@ public class PulsarProducerMapper extends PulsarTransactOpMapper { this.keyFunc = keyFunc; this.propFunc = propFunc; this.payloadFunc = payloadFunc; + + this.totalCycleCount = pulsarActivity.getActivityDef().getCycleCount(); } @Override @@ -66,19 +70,23 @@ public class PulsarProducerMapper extends PulsarTransactOpMapper { Producer producer = producerFunc.apply(value); - // Simulate error 10% of the time + boolean lastMsg = (value == (totalCycleCount-1)); + + // Simulate error 10% of the time, but always ignore + // the last message float rndVal = RandomUtils.nextFloat(0, 1.0f); - boolean simulationError = (rndVal >= 0) && (rndVal < 0.1f); - String seqErrSimuType = seqErrSimuTypeFunc.apply(value); + boolean simulationError = (!lastMsg) && ((rndVal >= 0) && (rndVal < 0.2f)); + + String seqErrSimuTypesStr = seqErrSimuTypeFunc.apply(value); boolean simulateMsgOutofOrder = simulationError && - !StringUtils.isBlank(seqErrSimuType) && - StringUtils.equalsIgnoreCase(seqErrSimuType, PulsarActivityUtil.SEQ_ERROR_SIMU_TYPE.OutOfOrder.label); + !StringUtils.isBlank(seqErrSimuTypesStr) && + StringUtils.containsIgnoreCase(seqErrSimuTypesStr, PulsarActivityUtil.SEQ_ERROR_SIMU_TYPE.OutOfOrder.label); boolean simulateMsgLoss = simulationError && - !StringUtils.isBlank(seqErrSimuType) && - StringUtils.equalsIgnoreCase(seqErrSimuType, PulsarActivityUtil.SEQ_ERROR_SIMU_TYPE.MsgLoss.label); + !StringUtils.isBlank(seqErrSimuTypesStr) && + StringUtils.containsIgnoreCase(seqErrSimuTypesStr, PulsarActivityUtil.SEQ_ERROR_SIMU_TYPE.MsgLoss.label); boolean simulateMsgDup = simulationError && - !StringUtils.isBlank(seqErrSimuType) && - StringUtils.equalsIgnoreCase(seqErrSimuType, PulsarActivityUtil.SEQ_ERROR_SIMU_TYPE.MsgDup.label); + !StringUtils.isBlank(seqErrSimuTypesStr) && + StringUtils.containsIgnoreCase(seqErrSimuTypesStr, PulsarActivityUtil.SEQ_ERROR_SIMU_TYPE.MsgDup.label); String msgKey = keyFunc.apply(value); String msgPayload = payloadFunc.apply(value); @@ -99,36 +107,47 @@ public class PulsarProducerMapper extends PulsarTransactOpMapper { } } - // Set message sequence tracking property - if (seqTracking) { - // normal case - if (!simulateMsgOutofOrder && !simulateMsgDup) { - msgProperties.put(PulsarActivityUtil.MSG_SEQUENCE_ID, String.valueOf(value)); - } - // simulate message out of order - else if ( simulateMsgOutofOrder ) { - int rndmOffset = 2; - msgProperties.put(PulsarActivityUtil.MSG_SEQUENCE_ID, - String.valueOf((value > rndmOffset) ? (value-rndmOffset) : value)); - } - // simulate message duplication - else { - msgProperties.put(PulsarActivityUtil.MSG_SEQUENCE_ID, String.valueOf(value-1)); - } - // message loss simulation is not done by message property - // we simply skip sending message in the current NB cycle - } + // Error simulation sequence: + // - message loss > message out of order > message duplication + if (!simulateMsgLoss) { + // Set message sequence tracking property + if (seqTracking) { + msgProperties.put(PulsarActivityUtil.MSG_SEQUENCE_TGTMAX, + String.valueOf(pulsarActivity.getActivityDef().getCycleCount()-1)); - return new PulsarProducerOp( - pulsarActivity, - asyncApi, - useTransaction, - transactionSupplier, - producer, - clientSpace.getPulsarSchema(), - msgKey, - msgProperties, - msgPayload, - simulateMsgLoss); + // normal case + if (!simulateMsgOutofOrder && !simulateMsgDup) { + msgProperties.put(PulsarActivityUtil.MSG_SEQUENCE_ID, String.valueOf(value)); + } + else { + // simulate message out of order + if (simulateMsgOutofOrder) { + int rndmOffset = 2; + msgProperties.put(PulsarActivityUtil.MSG_SEQUENCE_ID, + String.valueOf((value > rndmOffset) ? (value - rndmOffset) : value)); + } + // simulate message duplication + else if (simulateMsgDup) { + msgProperties.put(PulsarActivityUtil.MSG_SEQUENCE_ID, String.valueOf(value - 1)); + } + } + } + + return new PulsarProducerOp( + pulsarActivity, + asyncApi, + useTransaction, + transactionSupplier, + producer, + clientSpace.getPulsarSchema(), + msgKey, + msgProperties, + msgPayload); + } + else { + // Simulate message loss, but don't simulate the scenario where + // only the last set of message are lost + return new PulsarProducerEmptyOp(pulsarActivity); + } } } diff --git a/driver-pulsar/src/main/java/io/nosqlbench/driver/pulsar/ops/PulsarProducerOp.java b/driver-pulsar/src/main/java/io/nosqlbench/driver/pulsar/ops/PulsarProducerOp.java index 51c1336b2..796621df9 100644 --- a/driver-pulsar/src/main/java/io/nosqlbench/driver/pulsar/ops/PulsarProducerOp.java +++ b/driver-pulsar/src/main/java/io/nosqlbench/driver/pulsar/ops/PulsarProducerOp.java @@ -38,7 +38,6 @@ public class PulsarProducerOp implements PulsarOp { private final String msgKey; private final Map msgProperties; private final String msgPayload; - private final boolean simulateMsgLoss; private final Counter bytesCounter; private final Histogram messageSizeHistogram; @@ -52,8 +51,7 @@ public class PulsarProducerOp implements PulsarOp { Schema schema, String key, Map msgProperties, - String payload, - boolean simulateMsgLoss) { + String payload) { this.pulsarActivity = pulsarActivity; this.asyncPulsarOp = asyncPulsarOp; @@ -65,7 +63,6 @@ public class PulsarProducerOp implements PulsarOp { this.msgKey = key; this.msgProperties = msgProperties; this.msgPayload = payload; - this.simulateMsgLoss = simulateMsgLoss; this.bytesCounter = pulsarActivity.getBytesCounter(); this.messageSizeHistogram = pulsarActivity.getMessageSizeHistogram(); @@ -74,11 +71,6 @@ public class PulsarProducerOp implements PulsarOp { @Override public void run(Runnable timeTracker) { - // Skip this cycle (without sending messages) if we're doing message loss simulation - if (simulateMsgLoss) { - return; - } - if ( StringUtils.isBlank(msgPayload)) { throw new PulsarDriverParamException("Message payload (\"msg-value\") can't be empty!"); } diff --git a/driver-pulsar/src/main/java/io/nosqlbench/driver/pulsar/ops/ReadyPulsarOp.java b/driver-pulsar/src/main/java/io/nosqlbench/driver/pulsar/ops/ReadyPulsarOp.java index 8a49170a4..892d35f50 100644 --- a/driver-pulsar/src/main/java/io/nosqlbench/driver/pulsar/ops/ReadyPulsarOp.java +++ b/driver-pulsar/src/main/java/io/nosqlbench/driver/pulsar/ops/ReadyPulsarOp.java @@ -11,10 +11,6 @@ import org.apache.commons.lang3.BooleanUtils; import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import org.apache.pulsar.client.admin.Namespaces; -import org.apache.pulsar.client.admin.PulsarAdmin; -import org.apache.pulsar.client.admin.PulsarAdminException; -import org.apache.pulsar.client.admin.Topics; import org.apache.pulsar.client.api.Producer; import org.apache.pulsar.client.api.Consumer; import org.apache.pulsar.client.api.Reader; From ac2fdf2a2e674525c1ea67e9b75c785ae5088786 Mon Sep 17 00:00:00 2001 From: Yabin Meng Date: Wed, 13 Oct 2021 10:11:20 -0500 Subject: [PATCH 2/5] Convert message error runtime exception to counter metrics --- .../resources/activities/pulsar_client_sanity_seqloss.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/driver-pulsar/src/main/resources/activities/pulsar_client_sanity_seqloss.yaml b/driver-pulsar/src/main/resources/activities/pulsar_client_sanity_seqloss.yaml index 49a139f05..61f3258b4 100644 --- a/driver-pulsar/src/main/resources/activities/pulsar_client_sanity_seqloss.yaml +++ b/driver-pulsar/src/main/resources/activities/pulsar_client_sanity_seqloss.yaml @@ -5,7 +5,7 @@ bindings: # document level parameters that apply to all Pulsar client types: params: - topic_uri: "persistent://public/default/sanity_seqloss2" + topic_uri: "persistent://tnt0/ns0/sanity_seqloss12" # Only applicable to producer and consumer # - used for message ordering and message loss check async_api: "true" @@ -23,6 +23,7 @@ blocks: #seqerr_simu: "out_of_order" #seqerr_simu: "msg_loss" #seqerr_simu: "msg_dup" + seqerr_simu: "out_of_order, msg_loss" msg_key: msg_property: msg_value: "{myvalue}" From ed4ba2725e3ae9e51c5e1afd14908ea869570110 Mon Sep 17 00:00:00 2001 From: Yabin Meng Date: Wed, 13 Oct 2021 11:27:54 -0500 Subject: [PATCH 3/5] Convert message error runtime exception to counter metrics --- .../driver/pulsar/ops/PulsarConsumerOp.java | 14 +++++++++----- .../driver/pulsar/ops/PulsarProducerOp.java | 12 ++++++++---- .../activities/pulsar_client_sanity_seqloss.yaml | 4 ++-- 3 files changed, 19 insertions(+), 11 deletions(-) diff --git a/driver-pulsar/src/main/java/io/nosqlbench/driver/pulsar/ops/PulsarConsumerOp.java b/driver-pulsar/src/main/java/io/nosqlbench/driver/pulsar/ops/PulsarConsumerOp.java index 7dfc3dd95..7b2e5057d 100644 --- a/driver-pulsar/src/main/java/io/nosqlbench/driver/pulsar/ops/PulsarConsumerOp.java +++ b/driver-pulsar/src/main/java/io/nosqlbench/driver/pulsar/ops/PulsarConsumerOp.java @@ -200,13 +200,15 @@ public class PulsarConsumerOp implements PulsarOp { org.apache.avro.generic.GenericRecord avroGenericRecord = AvroUtil.GetGenericRecord_ApacheAvro(avroSchema, message.getData()); - logger.debug("Sync message received: msg-key={}; msg-properties={}; msg-payload={}", + logger.debug("({}) Sync message received: msg-key={}; msg-properties={}; msg-payload={}", + consumer.getConsumerName(), message.getKey(), message.getProperties(), avroGenericRecord.toString()); } else { - logger.debug("Sync message received: msg-key={}; msg-properties={}; msg-payload={}", + logger.debug("({}) Sync message received: msg-key={}; msg-properties={}; msg-payload={}", + consumer.getConsumerName(), message.getKey(), message.getProperties(), new String(message.getData())); @@ -280,13 +282,15 @@ public class PulsarConsumerOp implements PulsarOp { org.apache.avro.generic.GenericRecord avroGenericRecord = AvroUtil.GetGenericRecord_ApacheAvro(avroSchema, message.getData()); - logger.debug("Async message received: msg-key={}; msg-properties={}; msg-payload={})", + logger.debug("({}) Async message received: msg-key={}; msg-properties={}; msg-payload={})", + consumer.getConsumerName(), message.getKey(), message.getProperties(), avroGenericRecord.toString()); } else { - logger.debug("Async message received: msg-key={}; msg-properties={}; msg-payload={})", + logger.debug("({}) Async message received: msg-key={}; msg-properties={}; msg-payload={})", + consumer.getConsumerName(), message.getKey(), message.getProperties(), new String(message.getData())); @@ -315,7 +319,7 @@ public class PulsarConsumerOp implements PulsarOp { }); } catch (Exception e) { - throw new PulsarDriverUnexpectedException("Async message receiving failed"); + throw new PulsarDriverUnexpectedException(e); } } } diff --git a/driver-pulsar/src/main/java/io/nosqlbench/driver/pulsar/ops/PulsarProducerOp.java b/driver-pulsar/src/main/java/io/nosqlbench/driver/pulsar/ops/PulsarProducerOp.java index 796621df9..9875d2586 100644 --- a/driver-pulsar/src/main/java/io/nosqlbench/driver/pulsar/ops/PulsarProducerOp.java +++ b/driver-pulsar/src/main/java/io/nosqlbench/driver/pulsar/ops/PulsarProducerOp.java @@ -138,13 +138,15 @@ public class PulsarProducerOp implements PulsarOp { org.apache.avro.generic.GenericRecord avroGenericRecord = AvroUtil.GetGenericRecord_ApacheAvro(avroSchema, msgPayload); - logger.debug("Sync message sent: msg-key={}; msg-properties={}; msg-payload={})", + logger.debug("({}) Sync message sent: msg-key={}; msg-properties={}; msg-payload={})", + producer.getProducerName(), msgKey, msgProperties, avroGenericRecord.toString()); } else { - logger.debug("Sync message sent: msg-key={}; msg-properties={}; msg-payload={}", + logger.debug("({}) Sync message sent; msg-key={}; msg-properties={}; msg-payload={}", + producer.getProducerName(), msgKey, msgProperties, msgPayload); @@ -191,13 +193,15 @@ public class PulsarProducerOp implements PulsarOp { org.apache.avro.generic.GenericRecord avroGenericRecord = AvroUtil.GetGenericRecord_ApacheAvro(avroSchema, msgPayload); - logger.debug("Aysnc message sent: msg-key={}; msg-properties={}; msg-payload={})", + logger.debug("({}) Aysnc message sent: msg-key={}; msg-properties={}; msg-payload={})", + producer.getProducerName(), msgKey, msgProperties, avroGenericRecord.toString()); } else { - logger.debug("Aysnc message sent: msg-key={}; msg-properties={}; msg-payload={}", + logger.debug("({}) Aysnc message sent: msg-key={}; msg-properties={}; msg-payload={}", + producer.getProducerName(), msgKey, msgProperties, msgPayload); diff --git a/driver-pulsar/src/main/resources/activities/pulsar_client_sanity_seqloss.yaml b/driver-pulsar/src/main/resources/activities/pulsar_client_sanity_seqloss.yaml index 61f3258b4..024bccd0b 100644 --- a/driver-pulsar/src/main/resources/activities/pulsar_client_sanity_seqloss.yaml +++ b/driver-pulsar/src/main/resources/activities/pulsar_client_sanity_seqloss.yaml @@ -23,7 +23,7 @@ blocks: #seqerr_simu: "out_of_order" #seqerr_simu: "msg_loss" #seqerr_simu: "msg_dup" - seqerr_simu: "out_of_order, msg_loss" + #seqerr_simu: "out_of_order, msg_loss" msg_key: msg_property: msg_value: "{myvalue}" @@ -36,5 +36,5 @@ blocks: - name: s1 optype: msg-consume subscription_name: "mysub" - subscription_type: + subscription_type: "Shared" consumer_name: From bfd7e2513bd2b37f696d9d0f9f82534fdee84546 Mon Sep 17 00:00:00 2001 From: nb-droid Date: Wed, 13 Oct 2021 18:03:35 +0000 Subject: [PATCH 4/5] [maven-release-plugin] prepare release nosqlbench-4.15.59 --- docsys/pom.xml | 6 ++--- driver-cockroachdb/pom.xml | 4 ++-- driver-cql-shaded/pom.xml | 6 ++--- driver-cqld3-shaded/pom.xml | 6 ++--- driver-cqlverify/pom.xml | 6 ++--- driver-diag/pom.xml | 6 ++--- driver-dsegraph-shaded/pom.xml | 6 ++--- driver-http/pom.xml | 6 ++--- driver-jdbc/pom.xml | 4 ++-- driver-jms/pom.xml | 6 ++--- driver-jmx/pom.xml | 6 ++--- driver-kafka/pom.xml | 6 ++--- driver-mongodb/pom.xml | 6 ++--- driver-pulsar/pom.xml | 6 ++--- driver-stdout/pom.xml | 6 ++--- driver-tcp/pom.xml | 8 +++---- driver-web/pom.xml | 6 ++--- drivers-api/pom.xml | 6 ++--- engine-api/pom.xml | 10 ++++---- engine-cli/pom.xml | 6 ++--- engine-clients/pom.xml | 4 ++-- engine-core/pom.xml | 8 +++---- engine-docker/pom.xml | 4 ++-- engine-docs/pom.xml | 4 ++-- engine-extensions/pom.xml | 4 ++-- engine-rest/pom.xml | 4 ++-- mvn-defaults/pom.xml | 4 ++-- nb-annotations/pom.xml | 2 +- nb-api/pom.xml | 4 ++-- nb/pom.xml | 44 +++++++++++++++++----------------- pom.xml | 4 ++-- virtdata-api/pom.xml | 6 ++--- virtdata-lang/pom.xml | 2 +- virtdata-lib-basics/pom.xml | 4 ++-- virtdata-lib-curves4/pom.xml | 6 ++--- virtdata-lib-random/pom.xml | 6 ++--- virtdata-lib-realer/pom.xml | 4 ++-- virtdata-realdata/pom.xml | 4 ++-- virtdata-userlibs/pom.xml | 16 ++++++------- 39 files changed, 128 insertions(+), 128 deletions(-) diff --git a/docsys/pom.xml b/docsys/pom.xml index 5bbf82c96..a1f2462f2 100644 --- a/docsys/pom.xml +++ b/docsys/pom.xml @@ -12,7 +12,7 @@ mvn-defaults io.nosqlbench - 4.15.59-SNAPSHOT + 4.15.59 ../mvn-defaults @@ -21,7 +21,7 @@ io.nosqlbench nb-api - 4.15.59-SNAPSHOT + 4.15.59 @@ -117,7 +117,7 @@ io.nosqlbench virtdata-api - 4.15.59-SNAPSHOT + 4.15.59 diff --git a/driver-cockroachdb/pom.xml b/driver-cockroachdb/pom.xml index 30827184e..e6842d440 100644 --- a/driver-cockroachdb/pom.xml +++ b/driver-cockroachdb/pom.xml @@ -5,7 +5,7 @@ io.nosqlbench mvn-defaults - 4.15.59-SNAPSHOT + 4.15.59 ../mvn-defaults @@ -21,7 +21,7 @@ io.nosqlbench driver-jdbc - 4.15.59-SNAPSHOT + 4.15.59 org.postgresql diff --git a/driver-cql-shaded/pom.xml b/driver-cql-shaded/pom.xml index 577d12f63..8f5f7d4f4 100644 --- a/driver-cql-shaded/pom.xml +++ b/driver-cql-shaded/pom.xml @@ -4,7 +4,7 @@ io.nosqlbench mvn-defaults - 4.15.59-SNAPSHOT + 4.15.59 ../mvn-defaults @@ -23,13 +23,13 @@ io.nosqlbench engine-api - 4.15.59-SNAPSHOT + 4.15.59 io.nosqlbench drivers-api - 4.15.59-SNAPSHOT + 4.15.59 diff --git a/driver-cqld3-shaded/pom.xml b/driver-cqld3-shaded/pom.xml index 80422c34e..ab111dda5 100644 --- a/driver-cqld3-shaded/pom.xml +++ b/driver-cqld3-shaded/pom.xml @@ -4,7 +4,7 @@ io.nosqlbench mvn-defaults - 4.15.59-SNAPSHOT + 4.15.59 ../mvn-defaults @@ -24,13 +24,13 @@ io.nosqlbench engine-api - 4.15.59-SNAPSHOT + 4.15.59 io.nosqlbench drivers-api - 4.15.59-SNAPSHOT + 4.15.59 diff --git a/driver-cqlverify/pom.xml b/driver-cqlverify/pom.xml index d290edf4b..567cabdb6 100644 --- a/driver-cqlverify/pom.xml +++ b/driver-cqlverify/pom.xml @@ -4,7 +4,7 @@ io.nosqlbench mvn-defaults - 4.15.59-SNAPSHOT + 4.15.59 ../mvn-defaults @@ -24,13 +24,13 @@ io.nosqlbench driver-cql-shaded - 4.15.59-SNAPSHOT + 4.15.59 io.nosqlbench drivers-api - 4.15.59-SNAPSHOT + 4.15.59 diff --git a/driver-diag/pom.xml b/driver-diag/pom.xml index bc5ccaede..9202fa266 100644 --- a/driver-diag/pom.xml +++ b/driver-diag/pom.xml @@ -5,7 +5,7 @@ mvn-defaults io.nosqlbench - 4.15.59-SNAPSHOT + 4.15.59 ../mvn-defaults @@ -20,13 +20,13 @@ io.nosqlbench engine-api - 4.15.59-SNAPSHOT + 4.15.59 io.nosqlbench drivers-api - 4.15.59-SNAPSHOT + 4.15.59 diff --git a/driver-dsegraph-shaded/pom.xml b/driver-dsegraph-shaded/pom.xml index 99eaea9a9..cf45a8c6d 100644 --- a/driver-dsegraph-shaded/pom.xml +++ b/driver-dsegraph-shaded/pom.xml @@ -4,7 +4,7 @@ io.nosqlbench mvn-defaults - 4.15.59-SNAPSHOT + 4.15.59 ../mvn-defaults @@ -23,13 +23,13 @@ io.nosqlbench engine-api - 4.15.59-SNAPSHOT + 4.15.59 io.nosqlbench drivers-api - 4.15.59-SNAPSHOT + 4.15.59 diff --git a/driver-http/pom.xml b/driver-http/pom.xml index 746c767f5..a07868630 100644 --- a/driver-http/pom.xml +++ b/driver-http/pom.xml @@ -4,7 +4,7 @@ mvn-defaults io.nosqlbench - 4.15.59-SNAPSHOT + 4.15.59 ../mvn-defaults @@ -22,13 +22,13 @@ io.nosqlbench engine-api - 4.15.59-SNAPSHOT + 4.15.59 io.nosqlbench drivers-api - 4.15.59-SNAPSHOT + 4.15.59 diff --git a/driver-jdbc/pom.xml b/driver-jdbc/pom.xml index d67a2d6cd..b69a9258d 100644 --- a/driver-jdbc/pom.xml +++ b/driver-jdbc/pom.xml @@ -3,7 +3,7 @@ nosqlbench io.nosqlbench - 4.15.59-SNAPSHOT + 4.15.59 4.0.0 @@ -18,7 +18,7 @@ io.nosqlbench engine-api - 4.15.59-SNAPSHOT + 4.15.59 compile diff --git a/driver-jms/pom.xml b/driver-jms/pom.xml index 2343ddf1d..f1e362704 100644 --- a/driver-jms/pom.xml +++ b/driver-jms/pom.xml @@ -4,7 +4,7 @@ mvn-defaults io.nosqlbench - 4.15.59-SNAPSHOT + 4.15.59 ../mvn-defaults @@ -40,13 +40,13 @@ io.nosqlbench engine-api - 4.15.59-SNAPSHOT + 4.15.59 io.nosqlbench driver-stdout - 4.15.59-SNAPSHOT + 4.15.59 diff --git a/driver-jmx/pom.xml b/driver-jmx/pom.xml index f43599931..7f1e4a565 100644 --- a/driver-jmx/pom.xml +++ b/driver-jmx/pom.xml @@ -5,7 +5,7 @@ mvn-defaults io.nosqlbench - 4.15.59-SNAPSHOT + 4.15.59 ../mvn-defaults @@ -22,13 +22,13 @@ io.nosqlbench drivers-api - 4.15.59-SNAPSHOT + 4.15.59 io.nosqlbench engine-api - 4.15.59-SNAPSHOT + 4.15.59 diff --git a/driver-kafka/pom.xml b/driver-kafka/pom.xml index a22ec6b61..b9452e6c2 100644 --- a/driver-kafka/pom.xml +++ b/driver-kafka/pom.xml @@ -4,7 +4,7 @@ mvn-defaults io.nosqlbench - 4.15.59-SNAPSHOT + 4.15.59 ../mvn-defaults @@ -44,13 +44,13 @@ io.nosqlbench engine-api - 4.15.59-SNAPSHOT + 4.15.59 io.nosqlbench driver-stdout - 4.15.59-SNAPSHOT + 4.15.59 diff --git a/driver-mongodb/pom.xml b/driver-mongodb/pom.xml index 8309eadfc..d470a744e 100644 --- a/driver-mongodb/pom.xml +++ b/driver-mongodb/pom.xml @@ -7,7 +7,7 @@ mvn-defaults io.nosqlbench - 4.15.59-SNAPSHOT + 4.15.59 ../mvn-defaults @@ -21,13 +21,13 @@ io.nosqlbench engine-api - 4.15.59-SNAPSHOT + 4.15.59 io.nosqlbench drivers-api - 4.15.59-SNAPSHOT + 4.15.59 diff --git a/driver-pulsar/pom.xml b/driver-pulsar/pom.xml index e3931fedb..7ce979bb1 100644 --- a/driver-pulsar/pom.xml +++ b/driver-pulsar/pom.xml @@ -4,7 +4,7 @@ mvn-defaults io.nosqlbench - 4.15.59-SNAPSHOT + 4.15.59 ../mvn-defaults @@ -40,13 +40,13 @@ io.nosqlbench engine-api - 4.15.59-SNAPSHOT + 4.15.59 io.nosqlbench driver-stdout - 4.15.59-SNAPSHOT + 4.15.59 diff --git a/driver-stdout/pom.xml b/driver-stdout/pom.xml index 8eeea19f8..a2cd89c7e 100644 --- a/driver-stdout/pom.xml +++ b/driver-stdout/pom.xml @@ -7,7 +7,7 @@ mvn-defaults io.nosqlbench - 4.15.59-SNAPSHOT + 4.15.59 ../mvn-defaults @@ -22,13 +22,13 @@ io.nosqlbench engine-api - 4.15.59-SNAPSHOT + 4.15.59 io.nosqlbench drivers-api - 4.15.59-SNAPSHOT + 4.15.59 diff --git a/driver-tcp/pom.xml b/driver-tcp/pom.xml index 5513eae3a..2a004cc3a 100644 --- a/driver-tcp/pom.xml +++ b/driver-tcp/pom.xml @@ -7,7 +7,7 @@ mvn-defaults io.nosqlbench - 4.15.59-SNAPSHOT + 4.15.59 ../mvn-defaults @@ -24,19 +24,19 @@ io.nosqlbench engine-api - 4.15.59-SNAPSHOT + 4.15.59 io.nosqlbench drivers-api - 4.15.59-SNAPSHOT + 4.15.59 io.nosqlbench driver-stdout - 4.15.59-SNAPSHOT + 4.15.59 diff --git a/driver-web/pom.xml b/driver-web/pom.xml index 5d482c0d1..f2189191c 100644 --- a/driver-web/pom.xml +++ b/driver-web/pom.xml @@ -7,7 +7,7 @@ mvn-defaults io.nosqlbench - 4.15.59-SNAPSHOT + 4.15.59 ../mvn-defaults @@ -22,13 +22,13 @@ io.nosqlbench engine-api - 4.15.59-SNAPSHOT + 4.15.59 io.nosqlbench drivers-api - 4.15.59-SNAPSHOT + 4.15.59 diff --git a/drivers-api/pom.xml b/drivers-api/pom.xml index ac49014ef..bd6a68dab 100644 --- a/drivers-api/pom.xml +++ b/drivers-api/pom.xml @@ -5,7 +5,7 @@ mvn-defaults io.nosqlbench - 4.15.59-SNAPSHOT + 4.15.59 ../mvn-defaults @@ -23,13 +23,13 @@ io.nosqlbench nb-api - 4.15.59-SNAPSHOT + 4.15.59 io.nosqlbench virtdata-userlibs - 4.15.59-SNAPSHOT + 4.15.59 diff --git a/engine-api/pom.xml b/engine-api/pom.xml index 00a6c05df..4ee95379a 100644 --- a/engine-api/pom.xml +++ b/engine-api/pom.xml @@ -5,7 +5,7 @@ mvn-defaults io.nosqlbench - 4.15.59-SNAPSHOT + 4.15.59 ../mvn-defaults @@ -23,25 +23,25 @@ io.nosqlbench nb-api - 4.15.59-SNAPSHOT + 4.15.59 io.nosqlbench drivers-api - 4.15.59-SNAPSHOT + 4.15.59 io.nosqlbench nb-annotations - 4.15.59-SNAPSHOT + 4.15.59 io.nosqlbench virtdata-userlibs - 4.15.59-SNAPSHOT + 4.15.59 diff --git a/engine-cli/pom.xml b/engine-cli/pom.xml index c646ed2ce..4d0d07f02 100644 --- a/engine-cli/pom.xml +++ b/engine-cli/pom.xml @@ -4,7 +4,7 @@ mvn-defaults io.nosqlbench - 4.15.59-SNAPSHOT + 4.15.59 ../mvn-defaults @@ -23,13 +23,13 @@ io.nosqlbench engine-core - 4.15.59-SNAPSHOT + 4.15.59 io.nosqlbench engine-docker - 4.15.59-SNAPSHOT + 4.15.59 diff --git a/engine-clients/pom.xml b/engine-clients/pom.xml index 8d193f0fb..223299cde 100644 --- a/engine-clients/pom.xml +++ b/engine-clients/pom.xml @@ -5,7 +5,7 @@ mvn-defaults io.nosqlbench - 4.15.59-SNAPSHOT + 4.15.59 ../mvn-defaults @@ -21,7 +21,7 @@ io.nosqlbench engine-api - 4.15.59-SNAPSHOT + 4.15.59 diff --git a/engine-core/pom.xml b/engine-core/pom.xml index 8c3ae6c5c..06d8f376d 100644 --- a/engine-core/pom.xml +++ b/engine-core/pom.xml @@ -5,7 +5,7 @@ mvn-defaults io.nosqlbench - 4.15.59-SNAPSHOT + 4.15.59 ../mvn-defaults @@ -28,13 +28,13 @@ io.nosqlbench engine-api - 4.15.59-SNAPSHOT + 4.15.59 io.nosqlbench drivers-api - 4.15.59-SNAPSHOT + 4.15.59 @@ -85,7 +85,7 @@ io.nosqlbench engine-clients - 4.15.59-SNAPSHOT + 4.15.59 compile diff --git a/engine-docker/pom.xml b/engine-docker/pom.xml index 2b902ea22..e93120762 100644 --- a/engine-docker/pom.xml +++ b/engine-docker/pom.xml @@ -4,7 +4,7 @@ mvn-defaults io.nosqlbench - 4.15.59-SNAPSHOT + 4.15.59 ../mvn-defaults @@ -56,7 +56,7 @@ io.nosqlbench engine-api - 4.15.59-SNAPSHOT + 4.15.59 diff --git a/engine-docs/pom.xml b/engine-docs/pom.xml index 7ea4eaa99..f9151d278 100644 --- a/engine-docs/pom.xml +++ b/engine-docs/pom.xml @@ -4,7 +4,7 @@ mvn-defaults io.nosqlbench - 4.15.59-SNAPSHOT + 4.15.59 ../mvn-defaults @@ -28,7 +28,7 @@ io.nosqlbench docsys - 4.15.59-SNAPSHOT + 4.15.59 diff --git a/engine-extensions/pom.xml b/engine-extensions/pom.xml index 6cef47c07..83efc0caa 100644 --- a/engine-extensions/pom.xml +++ b/engine-extensions/pom.xml @@ -4,7 +4,7 @@ mvn-defaults io.nosqlbench - 4.15.59-SNAPSHOT + 4.15.59 ../mvn-defaults @@ -22,7 +22,7 @@ io.nosqlbench engine-api - 4.15.59-SNAPSHOT + 4.15.59 diff --git a/engine-rest/pom.xml b/engine-rest/pom.xml index 83ea9879b..8319b5a9d 100644 --- a/engine-rest/pom.xml +++ b/engine-rest/pom.xml @@ -4,7 +4,7 @@ mvn-defaults io.nosqlbench - 4.15.59-SNAPSHOT + 4.15.59 ../mvn-defaults @@ -35,7 +35,7 @@ io.nosqlbench engine-cli - 4.15.59-SNAPSHOT + 4.15.59 diff --git a/mvn-defaults/pom.xml b/mvn-defaults/pom.xml index 4ed368891..5be07c4ee 100644 --- a/mvn-defaults/pom.xml +++ b/mvn-defaults/pom.xml @@ -3,7 +3,7 @@ io.nosqlbench mvn-defaults - 4.15.59-SNAPSHOT + 4.15.59 pom @@ -78,7 +78,7 @@ scm:git:https://github.com/nosqlbench/nosqlbench.git - HEAD + nosqlbench-4.15.59 diff --git a/nb-annotations/pom.xml b/nb-annotations/pom.xml index 4bb5feb2c..cd71ec94c 100644 --- a/nb-annotations/pom.xml +++ b/nb-annotations/pom.xml @@ -5,7 +5,7 @@ mvn-defaults io.nosqlbench - 4.15.59-SNAPSHOT + 4.15.59 ../mvn-defaults diff --git a/nb-api/pom.xml b/nb-api/pom.xml index 7b616aa0a..8ae3138b7 100644 --- a/nb-api/pom.xml +++ b/nb-api/pom.xml @@ -5,7 +5,7 @@ mvn-defaults io.nosqlbench - 4.15.59-SNAPSHOT + 4.15.59 ../mvn-defaults @@ -31,7 +31,7 @@ io.nosqlbench nb-annotations - 4.15.59-SNAPSHOT + 4.15.59 diff --git a/nb/pom.xml b/nb/pom.xml index 75fb5f7e0..c2b1f88ba 100644 --- a/nb/pom.xml +++ b/nb/pom.xml @@ -5,7 +5,7 @@ mvn-defaults io.nosqlbench - 4.15.59-SNAPSHOT + 4.15.59 ../mvn-defaults @@ -24,121 +24,121 @@ io.nosqlbench engine-rest - 4.15.59-SNAPSHOT + 4.15.59 io.nosqlbench engine-cli - 4.15.59-SNAPSHOT + 4.15.59 io.nosqlbench engine-docs - 4.15.59-SNAPSHOT + 4.15.59 io.nosqlbench engine-core - 4.15.59-SNAPSHOT + 4.15.59 io.nosqlbench engine-extensions - 4.15.59-SNAPSHOT + 4.15.59 io.nosqlbench driver-web - 4.15.59-SNAPSHOT + 4.15.59 io.nosqlbench driver-kafka - 4.15.59-SNAPSHOT + 4.15.59 io.nosqlbench driver-stdout - 4.15.59-SNAPSHOT + 4.15.59 io.nosqlbench driver-diag - 4.15.59-SNAPSHOT + 4.15.59 io.nosqlbench driver-tcp - 4.15.59-SNAPSHOT + 4.15.59 io.nosqlbench driver-http - 4.15.59-SNAPSHOT + 4.15.59 io.nosqlbench driver-jmx - 4.15.59-SNAPSHOT + 4.15.59 io.nosqlbench driver-dsegraph-shaded - 4.15.59-SNAPSHOT + 4.15.59 io.nosqlbench driver-cql-shaded - 4.15.59-SNAPSHOT + 4.15.59 io.nosqlbench driver-cqld3-shaded - 4.15.59-SNAPSHOT + 4.15.59 io.nosqlbench driver-cqlverify - 4.15.59-SNAPSHOT + 4.15.59 io.nosqlbench driver-mongodb - 4.15.59-SNAPSHOT + 4.15.59 io.nosqlbench driver-pulsar - 4.15.59-SNAPSHOT + 4.15.59 io.nosqlbench driver-cockroachdb - 4.15.59-SNAPSHOT + 4.15.59 io.nosqlbench driver-jms - 4.15.59-SNAPSHOT + 4.15.59 @@ -238,7 +238,7 @@ io.nosqlbench driver-mongodb - 4.15.59-SNAPSHOT + 4.15.59 diff --git a/pom.xml b/pom.xml index c8dfe8a3d..95703acc0 100644 --- a/pom.xml +++ b/pom.xml @@ -7,7 +7,7 @@ mvn-defaults io.nosqlbench - 4.15.59-SNAPSHOT + 4.15.59 mvn-defaults @@ -146,7 +146,7 @@ scm:git:https://github.com/nosqlbench/nosqlbench.git scm:git:git@github.com:nosqlbench/nosqlbench.git - HEAD + nosqlbench-4.15.59 diff --git a/virtdata-api/pom.xml b/virtdata-api/pom.xml index 50c52b3f5..d95c4a968 100644 --- a/virtdata-api/pom.xml +++ b/virtdata-api/pom.xml @@ -7,7 +7,7 @@ io.nosqlbench mvn-defaults - 4.15.59-SNAPSHOT + 4.15.59 ../mvn-defaults @@ -23,14 +23,14 @@ io.nosqlbench - 4.15.59-SNAPSHOT + 4.15.59 nb-api io.nosqlbench virtdata-lang - 4.15.59-SNAPSHOT + 4.15.59 diff --git a/virtdata-lang/pom.xml b/virtdata-lang/pom.xml index 7396763f3..8c8a3d625 100644 --- a/virtdata-lang/pom.xml +++ b/virtdata-lang/pom.xml @@ -7,7 +7,7 @@ mvn-defaults io.nosqlbench - 4.15.59-SNAPSHOT + 4.15.59 ../mvn-defaults diff --git a/virtdata-lib-basics/pom.xml b/virtdata-lib-basics/pom.xml index 9e913c092..4f8a63e4d 100644 --- a/virtdata-lib-basics/pom.xml +++ b/virtdata-lib-basics/pom.xml @@ -7,7 +7,7 @@ mvn-defaults io.nosqlbench - 4.15.59-SNAPSHOT + 4.15.59 ../mvn-defaults @@ -20,7 +20,7 @@ io.nosqlbench virtdata-api - 4.15.59-SNAPSHOT + 4.15.59 diff --git a/virtdata-lib-curves4/pom.xml b/virtdata-lib-curves4/pom.xml index 79b88a92f..a3205d78b 100644 --- a/virtdata-lib-curves4/pom.xml +++ b/virtdata-lib-curves4/pom.xml @@ -4,7 +4,7 @@ mvn-defaults io.nosqlbench - 4.15.59-SNAPSHOT + 4.15.59 ../mvn-defaults @@ -22,13 +22,13 @@ io.nosqlbench virtdata-api - 4.15.59-SNAPSHOT + 4.15.59 io.nosqlbench virtdata-lib-basics - 4.15.59-SNAPSHOT + 4.15.59 diff --git a/virtdata-lib-random/pom.xml b/virtdata-lib-random/pom.xml index a17190477..d9e43c268 100644 --- a/virtdata-lib-random/pom.xml +++ b/virtdata-lib-random/pom.xml @@ -7,7 +7,7 @@ mvn-defaults io.nosqlbench - 4.15.59-SNAPSHOT + 4.15.59 ../mvn-defaults @@ -20,13 +20,13 @@ io.nosqlbench virtdata-api - 4.15.59-SNAPSHOT + 4.15.59 io.nosqlbench virtdata-lib-basics - 4.15.59-SNAPSHOT + 4.15.59 diff --git a/virtdata-lib-realer/pom.xml b/virtdata-lib-realer/pom.xml index 5132b32b1..724990b66 100644 --- a/virtdata-lib-realer/pom.xml +++ b/virtdata-lib-realer/pom.xml @@ -4,7 +4,7 @@ mvn-defaults io.nosqlbench - 4.15.59-SNAPSHOT + 4.15.59 ../mvn-defaults @@ -20,7 +20,7 @@ io.nosqlbench virtdata-lib-basics - 4.15.59-SNAPSHOT + 4.15.59 diff --git a/virtdata-realdata/pom.xml b/virtdata-realdata/pom.xml index afb3fd3cf..025de1ee8 100644 --- a/virtdata-realdata/pom.xml +++ b/virtdata-realdata/pom.xml @@ -7,7 +7,7 @@ mvn-defaults io.nosqlbench - 4.15.59-SNAPSHOT + 4.15.59 ../mvn-defaults @@ -18,7 +18,7 @@ io.nosqlbench virtdata-api - 4.15.59-SNAPSHOT + 4.15.59 diff --git a/virtdata-userlibs/pom.xml b/virtdata-userlibs/pom.xml index 93e487afd..9af948740 100644 --- a/virtdata-userlibs/pom.xml +++ b/virtdata-userlibs/pom.xml @@ -4,7 +4,7 @@ mvn-defaults io.nosqlbench - 4.15.59-SNAPSHOT + 4.15.59 ../mvn-defaults @@ -18,36 +18,36 @@ io.nosqlbench virtdata-realdata - 4.15.59-SNAPSHOT + 4.15.59 io.nosqlbench virtdata-lib-realer - 4.15.59-SNAPSHOT + 4.15.59 io.nosqlbench virtdata-api - 4.15.59-SNAPSHOT + 4.15.59 io.nosqlbench virtdata-lib-random - 4.15.59-SNAPSHOT + 4.15.59 io.nosqlbench - 4.15.59-SNAPSHOT + 4.15.59 virtdata-lib-basics io.nosqlbench - 4.15.59-SNAPSHOT + 4.15.59 virtdata-lib-curves4 @@ -55,7 +55,7 @@ io.nosqlbench docsys - 4.15.59-SNAPSHOT + 4.15.59 From 1d34c256f8a839d3a64c75f0bb9a23c9cfdae477 Mon Sep 17 00:00:00 2001 From: nb-droid Date: Wed, 13 Oct 2021 18:03:38 +0000 Subject: [PATCH 5/5] [maven-release-plugin] prepare for next development iteration --- docsys/pom.xml | 6 ++--- driver-cockroachdb/pom.xml | 4 ++-- driver-cql-shaded/pom.xml | 6 ++--- driver-cqld3-shaded/pom.xml | 6 ++--- driver-cqlverify/pom.xml | 6 ++--- driver-diag/pom.xml | 6 ++--- driver-dsegraph-shaded/pom.xml | 6 ++--- driver-http/pom.xml | 6 ++--- driver-jdbc/pom.xml | 4 ++-- driver-jms/pom.xml | 6 ++--- driver-jmx/pom.xml | 6 ++--- driver-kafka/pom.xml | 6 ++--- driver-mongodb/pom.xml | 6 ++--- driver-pulsar/pom.xml | 6 ++--- driver-stdout/pom.xml | 6 ++--- driver-tcp/pom.xml | 8 +++---- driver-web/pom.xml | 6 ++--- drivers-api/pom.xml | 6 ++--- engine-api/pom.xml | 10 ++++---- engine-cli/pom.xml | 6 ++--- engine-clients/pom.xml | 4 ++-- engine-core/pom.xml | 8 +++---- engine-docker/pom.xml | 4 ++-- engine-docs/pom.xml | 4 ++-- engine-extensions/pom.xml | 4 ++-- engine-rest/pom.xml | 4 ++-- mvn-defaults/pom.xml | 4 ++-- nb-annotations/pom.xml | 2 +- nb-api/pom.xml | 4 ++-- nb/pom.xml | 44 +++++++++++++++++----------------- pom.xml | 4 ++-- virtdata-api/pom.xml | 6 ++--- virtdata-lang/pom.xml | 2 +- virtdata-lib-basics/pom.xml | 4 ++-- virtdata-lib-curves4/pom.xml | 6 ++--- virtdata-lib-random/pom.xml | 6 ++--- virtdata-lib-realer/pom.xml | 4 ++-- virtdata-realdata/pom.xml | 4 ++-- virtdata-userlibs/pom.xml | 16 ++++++------- 39 files changed, 128 insertions(+), 128 deletions(-) diff --git a/docsys/pom.xml b/docsys/pom.xml index a1f2462f2..19738c485 100644 --- a/docsys/pom.xml +++ b/docsys/pom.xml @@ -12,7 +12,7 @@ mvn-defaults io.nosqlbench - 4.15.59 + 4.15.60-SNAPSHOT ../mvn-defaults @@ -21,7 +21,7 @@ io.nosqlbench nb-api - 4.15.59 + 4.15.60-SNAPSHOT @@ -117,7 +117,7 @@ io.nosqlbench virtdata-api - 4.15.59 + 4.15.60-SNAPSHOT diff --git a/driver-cockroachdb/pom.xml b/driver-cockroachdb/pom.xml index e6842d440..d2d8edc37 100644 --- a/driver-cockroachdb/pom.xml +++ b/driver-cockroachdb/pom.xml @@ -5,7 +5,7 @@ io.nosqlbench mvn-defaults - 4.15.59 + 4.15.60-SNAPSHOT ../mvn-defaults @@ -21,7 +21,7 @@ io.nosqlbench driver-jdbc - 4.15.59 + 4.15.60-SNAPSHOT org.postgresql diff --git a/driver-cql-shaded/pom.xml b/driver-cql-shaded/pom.xml index 8f5f7d4f4..fc7b00a27 100644 --- a/driver-cql-shaded/pom.xml +++ b/driver-cql-shaded/pom.xml @@ -4,7 +4,7 @@ io.nosqlbench mvn-defaults - 4.15.59 + 4.15.60-SNAPSHOT ../mvn-defaults @@ -23,13 +23,13 @@ io.nosqlbench engine-api - 4.15.59 + 4.15.60-SNAPSHOT io.nosqlbench drivers-api - 4.15.59 + 4.15.60-SNAPSHOT diff --git a/driver-cqld3-shaded/pom.xml b/driver-cqld3-shaded/pom.xml index ab111dda5..7220ffe44 100644 --- a/driver-cqld3-shaded/pom.xml +++ b/driver-cqld3-shaded/pom.xml @@ -4,7 +4,7 @@ io.nosqlbench mvn-defaults - 4.15.59 + 4.15.60-SNAPSHOT ../mvn-defaults @@ -24,13 +24,13 @@ io.nosqlbench engine-api - 4.15.59 + 4.15.60-SNAPSHOT io.nosqlbench drivers-api - 4.15.59 + 4.15.60-SNAPSHOT diff --git a/driver-cqlverify/pom.xml b/driver-cqlverify/pom.xml index 567cabdb6..7a2d0bbda 100644 --- a/driver-cqlverify/pom.xml +++ b/driver-cqlverify/pom.xml @@ -4,7 +4,7 @@ io.nosqlbench mvn-defaults - 4.15.59 + 4.15.60-SNAPSHOT ../mvn-defaults @@ -24,13 +24,13 @@ io.nosqlbench driver-cql-shaded - 4.15.59 + 4.15.60-SNAPSHOT io.nosqlbench drivers-api - 4.15.59 + 4.15.60-SNAPSHOT diff --git a/driver-diag/pom.xml b/driver-diag/pom.xml index 9202fa266..c7dedfca6 100644 --- a/driver-diag/pom.xml +++ b/driver-diag/pom.xml @@ -5,7 +5,7 @@ mvn-defaults io.nosqlbench - 4.15.59 + 4.15.60-SNAPSHOT ../mvn-defaults @@ -20,13 +20,13 @@ io.nosqlbench engine-api - 4.15.59 + 4.15.60-SNAPSHOT io.nosqlbench drivers-api - 4.15.59 + 4.15.60-SNAPSHOT diff --git a/driver-dsegraph-shaded/pom.xml b/driver-dsegraph-shaded/pom.xml index cf45a8c6d..06d107e46 100644 --- a/driver-dsegraph-shaded/pom.xml +++ b/driver-dsegraph-shaded/pom.xml @@ -4,7 +4,7 @@ io.nosqlbench mvn-defaults - 4.15.59 + 4.15.60-SNAPSHOT ../mvn-defaults @@ -23,13 +23,13 @@ io.nosqlbench engine-api - 4.15.59 + 4.15.60-SNAPSHOT io.nosqlbench drivers-api - 4.15.59 + 4.15.60-SNAPSHOT diff --git a/driver-http/pom.xml b/driver-http/pom.xml index a07868630..8186b6176 100644 --- a/driver-http/pom.xml +++ b/driver-http/pom.xml @@ -4,7 +4,7 @@ mvn-defaults io.nosqlbench - 4.15.59 + 4.15.60-SNAPSHOT ../mvn-defaults @@ -22,13 +22,13 @@ io.nosqlbench engine-api - 4.15.59 + 4.15.60-SNAPSHOT io.nosqlbench drivers-api - 4.15.59 + 4.15.60-SNAPSHOT diff --git a/driver-jdbc/pom.xml b/driver-jdbc/pom.xml index b69a9258d..8da79ab60 100644 --- a/driver-jdbc/pom.xml +++ b/driver-jdbc/pom.xml @@ -3,7 +3,7 @@ nosqlbench io.nosqlbench - 4.15.59 + 4.15.60-SNAPSHOT 4.0.0 @@ -18,7 +18,7 @@ io.nosqlbench engine-api - 4.15.59 + 4.15.60-SNAPSHOT compile diff --git a/driver-jms/pom.xml b/driver-jms/pom.xml index f1e362704..d3467baca 100644 --- a/driver-jms/pom.xml +++ b/driver-jms/pom.xml @@ -4,7 +4,7 @@ mvn-defaults io.nosqlbench - 4.15.59 + 4.15.60-SNAPSHOT ../mvn-defaults @@ -40,13 +40,13 @@ io.nosqlbench engine-api - 4.15.59 + 4.15.60-SNAPSHOT io.nosqlbench driver-stdout - 4.15.59 + 4.15.60-SNAPSHOT diff --git a/driver-jmx/pom.xml b/driver-jmx/pom.xml index 7f1e4a565..5bf27a584 100644 --- a/driver-jmx/pom.xml +++ b/driver-jmx/pom.xml @@ -5,7 +5,7 @@ mvn-defaults io.nosqlbench - 4.15.59 + 4.15.60-SNAPSHOT ../mvn-defaults @@ -22,13 +22,13 @@ io.nosqlbench drivers-api - 4.15.59 + 4.15.60-SNAPSHOT io.nosqlbench engine-api - 4.15.59 + 4.15.60-SNAPSHOT diff --git a/driver-kafka/pom.xml b/driver-kafka/pom.xml index b9452e6c2..e4d37db12 100644 --- a/driver-kafka/pom.xml +++ b/driver-kafka/pom.xml @@ -4,7 +4,7 @@ mvn-defaults io.nosqlbench - 4.15.59 + 4.15.60-SNAPSHOT ../mvn-defaults @@ -44,13 +44,13 @@ io.nosqlbench engine-api - 4.15.59 + 4.15.60-SNAPSHOT io.nosqlbench driver-stdout - 4.15.59 + 4.15.60-SNAPSHOT diff --git a/driver-mongodb/pom.xml b/driver-mongodb/pom.xml index d470a744e..937659623 100644 --- a/driver-mongodb/pom.xml +++ b/driver-mongodb/pom.xml @@ -7,7 +7,7 @@ mvn-defaults io.nosqlbench - 4.15.59 + 4.15.60-SNAPSHOT ../mvn-defaults @@ -21,13 +21,13 @@ io.nosqlbench engine-api - 4.15.59 + 4.15.60-SNAPSHOT io.nosqlbench drivers-api - 4.15.59 + 4.15.60-SNAPSHOT diff --git a/driver-pulsar/pom.xml b/driver-pulsar/pom.xml index 7ce979bb1..d587fa9be 100644 --- a/driver-pulsar/pom.xml +++ b/driver-pulsar/pom.xml @@ -4,7 +4,7 @@ mvn-defaults io.nosqlbench - 4.15.59 + 4.15.60-SNAPSHOT ../mvn-defaults @@ -40,13 +40,13 @@ io.nosqlbench engine-api - 4.15.59 + 4.15.60-SNAPSHOT io.nosqlbench driver-stdout - 4.15.59 + 4.15.60-SNAPSHOT diff --git a/driver-stdout/pom.xml b/driver-stdout/pom.xml index a2cd89c7e..f932153b4 100644 --- a/driver-stdout/pom.xml +++ b/driver-stdout/pom.xml @@ -7,7 +7,7 @@ mvn-defaults io.nosqlbench - 4.15.59 + 4.15.60-SNAPSHOT ../mvn-defaults @@ -22,13 +22,13 @@ io.nosqlbench engine-api - 4.15.59 + 4.15.60-SNAPSHOT io.nosqlbench drivers-api - 4.15.59 + 4.15.60-SNAPSHOT diff --git a/driver-tcp/pom.xml b/driver-tcp/pom.xml index 2a004cc3a..a87a90741 100644 --- a/driver-tcp/pom.xml +++ b/driver-tcp/pom.xml @@ -7,7 +7,7 @@ mvn-defaults io.nosqlbench - 4.15.59 + 4.15.60-SNAPSHOT ../mvn-defaults @@ -24,19 +24,19 @@ io.nosqlbench engine-api - 4.15.59 + 4.15.60-SNAPSHOT io.nosqlbench drivers-api - 4.15.59 + 4.15.60-SNAPSHOT io.nosqlbench driver-stdout - 4.15.59 + 4.15.60-SNAPSHOT diff --git a/driver-web/pom.xml b/driver-web/pom.xml index f2189191c..26fbf9abe 100644 --- a/driver-web/pom.xml +++ b/driver-web/pom.xml @@ -7,7 +7,7 @@ mvn-defaults io.nosqlbench - 4.15.59 + 4.15.60-SNAPSHOT ../mvn-defaults @@ -22,13 +22,13 @@ io.nosqlbench engine-api - 4.15.59 + 4.15.60-SNAPSHOT io.nosqlbench drivers-api - 4.15.59 + 4.15.60-SNAPSHOT diff --git a/drivers-api/pom.xml b/drivers-api/pom.xml index bd6a68dab..17864da6c 100644 --- a/drivers-api/pom.xml +++ b/drivers-api/pom.xml @@ -5,7 +5,7 @@ mvn-defaults io.nosqlbench - 4.15.59 + 4.15.60-SNAPSHOT ../mvn-defaults @@ -23,13 +23,13 @@ io.nosqlbench nb-api - 4.15.59 + 4.15.60-SNAPSHOT io.nosqlbench virtdata-userlibs - 4.15.59 + 4.15.60-SNAPSHOT diff --git a/engine-api/pom.xml b/engine-api/pom.xml index 4ee95379a..e79deb92f 100644 --- a/engine-api/pom.xml +++ b/engine-api/pom.xml @@ -5,7 +5,7 @@ mvn-defaults io.nosqlbench - 4.15.59 + 4.15.60-SNAPSHOT ../mvn-defaults @@ -23,25 +23,25 @@ io.nosqlbench nb-api - 4.15.59 + 4.15.60-SNAPSHOT io.nosqlbench drivers-api - 4.15.59 + 4.15.60-SNAPSHOT io.nosqlbench nb-annotations - 4.15.59 + 4.15.60-SNAPSHOT io.nosqlbench virtdata-userlibs - 4.15.59 + 4.15.60-SNAPSHOT diff --git a/engine-cli/pom.xml b/engine-cli/pom.xml index 4d0d07f02..2a7ffbb27 100644 --- a/engine-cli/pom.xml +++ b/engine-cli/pom.xml @@ -4,7 +4,7 @@ mvn-defaults io.nosqlbench - 4.15.59 + 4.15.60-SNAPSHOT ../mvn-defaults @@ -23,13 +23,13 @@ io.nosqlbench engine-core - 4.15.59 + 4.15.60-SNAPSHOT io.nosqlbench engine-docker - 4.15.59 + 4.15.60-SNAPSHOT diff --git a/engine-clients/pom.xml b/engine-clients/pom.xml index 223299cde..cb7e99c73 100644 --- a/engine-clients/pom.xml +++ b/engine-clients/pom.xml @@ -5,7 +5,7 @@ mvn-defaults io.nosqlbench - 4.15.59 + 4.15.60-SNAPSHOT ../mvn-defaults @@ -21,7 +21,7 @@ io.nosqlbench engine-api - 4.15.59 + 4.15.60-SNAPSHOT diff --git a/engine-core/pom.xml b/engine-core/pom.xml index 06d8f376d..190014743 100644 --- a/engine-core/pom.xml +++ b/engine-core/pom.xml @@ -5,7 +5,7 @@ mvn-defaults io.nosqlbench - 4.15.59 + 4.15.60-SNAPSHOT ../mvn-defaults @@ -28,13 +28,13 @@ io.nosqlbench engine-api - 4.15.59 + 4.15.60-SNAPSHOT io.nosqlbench drivers-api - 4.15.59 + 4.15.60-SNAPSHOT @@ -85,7 +85,7 @@ io.nosqlbench engine-clients - 4.15.59 + 4.15.60-SNAPSHOT compile diff --git a/engine-docker/pom.xml b/engine-docker/pom.xml index e93120762..bff600f4f 100644 --- a/engine-docker/pom.xml +++ b/engine-docker/pom.xml @@ -4,7 +4,7 @@ mvn-defaults io.nosqlbench - 4.15.59 + 4.15.60-SNAPSHOT ../mvn-defaults @@ -56,7 +56,7 @@ io.nosqlbench engine-api - 4.15.59 + 4.15.60-SNAPSHOT diff --git a/engine-docs/pom.xml b/engine-docs/pom.xml index f9151d278..cc2c63f46 100644 --- a/engine-docs/pom.xml +++ b/engine-docs/pom.xml @@ -4,7 +4,7 @@ mvn-defaults io.nosqlbench - 4.15.59 + 4.15.60-SNAPSHOT ../mvn-defaults @@ -28,7 +28,7 @@ io.nosqlbench docsys - 4.15.59 + 4.15.60-SNAPSHOT diff --git a/engine-extensions/pom.xml b/engine-extensions/pom.xml index 83efc0caa..2a1ef4405 100644 --- a/engine-extensions/pom.xml +++ b/engine-extensions/pom.xml @@ -4,7 +4,7 @@ mvn-defaults io.nosqlbench - 4.15.59 + 4.15.60-SNAPSHOT ../mvn-defaults @@ -22,7 +22,7 @@ io.nosqlbench engine-api - 4.15.59 + 4.15.60-SNAPSHOT diff --git a/engine-rest/pom.xml b/engine-rest/pom.xml index 8319b5a9d..cbcd487a3 100644 --- a/engine-rest/pom.xml +++ b/engine-rest/pom.xml @@ -4,7 +4,7 @@ mvn-defaults io.nosqlbench - 4.15.59 + 4.15.60-SNAPSHOT ../mvn-defaults @@ -35,7 +35,7 @@ io.nosqlbench engine-cli - 4.15.59 + 4.15.60-SNAPSHOT diff --git a/mvn-defaults/pom.xml b/mvn-defaults/pom.xml index 5be07c4ee..a589844d7 100644 --- a/mvn-defaults/pom.xml +++ b/mvn-defaults/pom.xml @@ -3,7 +3,7 @@ io.nosqlbench mvn-defaults - 4.15.59 + 4.15.60-SNAPSHOT pom @@ -78,7 +78,7 @@ scm:git:https://github.com/nosqlbench/nosqlbench.git - nosqlbench-4.15.59 + HEAD diff --git a/nb-annotations/pom.xml b/nb-annotations/pom.xml index cd71ec94c..06b17b45f 100644 --- a/nb-annotations/pom.xml +++ b/nb-annotations/pom.xml @@ -5,7 +5,7 @@ mvn-defaults io.nosqlbench - 4.15.59 + 4.15.60-SNAPSHOT ../mvn-defaults diff --git a/nb-api/pom.xml b/nb-api/pom.xml index 8ae3138b7..7da4a0cd0 100644 --- a/nb-api/pom.xml +++ b/nb-api/pom.xml @@ -5,7 +5,7 @@ mvn-defaults io.nosqlbench - 4.15.59 + 4.15.60-SNAPSHOT ../mvn-defaults @@ -31,7 +31,7 @@ io.nosqlbench nb-annotations - 4.15.59 + 4.15.60-SNAPSHOT diff --git a/nb/pom.xml b/nb/pom.xml index c2b1f88ba..b10a4ebc0 100644 --- a/nb/pom.xml +++ b/nb/pom.xml @@ -5,7 +5,7 @@ mvn-defaults io.nosqlbench - 4.15.59 + 4.15.60-SNAPSHOT ../mvn-defaults @@ -24,121 +24,121 @@ io.nosqlbench engine-rest - 4.15.59 + 4.15.60-SNAPSHOT io.nosqlbench engine-cli - 4.15.59 + 4.15.60-SNAPSHOT io.nosqlbench engine-docs - 4.15.59 + 4.15.60-SNAPSHOT io.nosqlbench engine-core - 4.15.59 + 4.15.60-SNAPSHOT io.nosqlbench engine-extensions - 4.15.59 + 4.15.60-SNAPSHOT io.nosqlbench driver-web - 4.15.59 + 4.15.60-SNAPSHOT io.nosqlbench driver-kafka - 4.15.59 + 4.15.60-SNAPSHOT io.nosqlbench driver-stdout - 4.15.59 + 4.15.60-SNAPSHOT io.nosqlbench driver-diag - 4.15.59 + 4.15.60-SNAPSHOT io.nosqlbench driver-tcp - 4.15.59 + 4.15.60-SNAPSHOT io.nosqlbench driver-http - 4.15.59 + 4.15.60-SNAPSHOT io.nosqlbench driver-jmx - 4.15.59 + 4.15.60-SNAPSHOT io.nosqlbench driver-dsegraph-shaded - 4.15.59 + 4.15.60-SNAPSHOT io.nosqlbench driver-cql-shaded - 4.15.59 + 4.15.60-SNAPSHOT io.nosqlbench driver-cqld3-shaded - 4.15.59 + 4.15.60-SNAPSHOT io.nosqlbench driver-cqlverify - 4.15.59 + 4.15.60-SNAPSHOT io.nosqlbench driver-mongodb - 4.15.59 + 4.15.60-SNAPSHOT io.nosqlbench driver-pulsar - 4.15.59 + 4.15.60-SNAPSHOT io.nosqlbench driver-cockroachdb - 4.15.59 + 4.15.60-SNAPSHOT io.nosqlbench driver-jms - 4.15.59 + 4.15.60-SNAPSHOT @@ -238,7 +238,7 @@ io.nosqlbench driver-mongodb - 4.15.59 + 4.15.60-SNAPSHOT diff --git a/pom.xml b/pom.xml index 95703acc0..9f1ecbdc5 100644 --- a/pom.xml +++ b/pom.xml @@ -7,7 +7,7 @@ mvn-defaults io.nosqlbench - 4.15.59 + 4.15.60-SNAPSHOT mvn-defaults @@ -146,7 +146,7 @@ scm:git:https://github.com/nosqlbench/nosqlbench.git scm:git:git@github.com:nosqlbench/nosqlbench.git - nosqlbench-4.15.59 + HEAD diff --git a/virtdata-api/pom.xml b/virtdata-api/pom.xml index d95c4a968..d33bb76a3 100644 --- a/virtdata-api/pom.xml +++ b/virtdata-api/pom.xml @@ -7,7 +7,7 @@ io.nosqlbench mvn-defaults - 4.15.59 + 4.15.60-SNAPSHOT ../mvn-defaults @@ -23,14 +23,14 @@ io.nosqlbench - 4.15.59 + 4.15.60-SNAPSHOT nb-api io.nosqlbench virtdata-lang - 4.15.59 + 4.15.60-SNAPSHOT diff --git a/virtdata-lang/pom.xml b/virtdata-lang/pom.xml index 8c8a3d625..55d28cb4f 100644 --- a/virtdata-lang/pom.xml +++ b/virtdata-lang/pom.xml @@ -7,7 +7,7 @@ mvn-defaults io.nosqlbench - 4.15.59 + 4.15.60-SNAPSHOT ../mvn-defaults diff --git a/virtdata-lib-basics/pom.xml b/virtdata-lib-basics/pom.xml index 4f8a63e4d..3b5b8b317 100644 --- a/virtdata-lib-basics/pom.xml +++ b/virtdata-lib-basics/pom.xml @@ -7,7 +7,7 @@ mvn-defaults io.nosqlbench - 4.15.59 + 4.15.60-SNAPSHOT ../mvn-defaults @@ -20,7 +20,7 @@ io.nosqlbench virtdata-api - 4.15.59 + 4.15.60-SNAPSHOT diff --git a/virtdata-lib-curves4/pom.xml b/virtdata-lib-curves4/pom.xml index a3205d78b..06f60c5a6 100644 --- a/virtdata-lib-curves4/pom.xml +++ b/virtdata-lib-curves4/pom.xml @@ -4,7 +4,7 @@ mvn-defaults io.nosqlbench - 4.15.59 + 4.15.60-SNAPSHOT ../mvn-defaults @@ -22,13 +22,13 @@ io.nosqlbench virtdata-api - 4.15.59 + 4.15.60-SNAPSHOT io.nosqlbench virtdata-lib-basics - 4.15.59 + 4.15.60-SNAPSHOT diff --git a/virtdata-lib-random/pom.xml b/virtdata-lib-random/pom.xml index d9e43c268..8f3d11a6e 100644 --- a/virtdata-lib-random/pom.xml +++ b/virtdata-lib-random/pom.xml @@ -7,7 +7,7 @@ mvn-defaults io.nosqlbench - 4.15.59 + 4.15.60-SNAPSHOT ../mvn-defaults @@ -20,13 +20,13 @@ io.nosqlbench virtdata-api - 4.15.59 + 4.15.60-SNAPSHOT io.nosqlbench virtdata-lib-basics - 4.15.59 + 4.15.60-SNAPSHOT diff --git a/virtdata-lib-realer/pom.xml b/virtdata-lib-realer/pom.xml index 724990b66..b8e88d6ef 100644 --- a/virtdata-lib-realer/pom.xml +++ b/virtdata-lib-realer/pom.xml @@ -4,7 +4,7 @@ mvn-defaults io.nosqlbench - 4.15.59 + 4.15.60-SNAPSHOT ../mvn-defaults @@ -20,7 +20,7 @@ io.nosqlbench virtdata-lib-basics - 4.15.59 + 4.15.60-SNAPSHOT diff --git a/virtdata-realdata/pom.xml b/virtdata-realdata/pom.xml index 025de1ee8..91133480a 100644 --- a/virtdata-realdata/pom.xml +++ b/virtdata-realdata/pom.xml @@ -7,7 +7,7 @@ mvn-defaults io.nosqlbench - 4.15.59 + 4.15.60-SNAPSHOT ../mvn-defaults @@ -18,7 +18,7 @@ io.nosqlbench virtdata-api - 4.15.59 + 4.15.60-SNAPSHOT diff --git a/virtdata-userlibs/pom.xml b/virtdata-userlibs/pom.xml index 9af948740..9aff919ae 100644 --- a/virtdata-userlibs/pom.xml +++ b/virtdata-userlibs/pom.xml @@ -4,7 +4,7 @@ mvn-defaults io.nosqlbench - 4.15.59 + 4.15.60-SNAPSHOT ../mvn-defaults @@ -18,36 +18,36 @@ io.nosqlbench virtdata-realdata - 4.15.59 + 4.15.60-SNAPSHOT io.nosqlbench virtdata-lib-realer - 4.15.59 + 4.15.60-SNAPSHOT io.nosqlbench virtdata-api - 4.15.59 + 4.15.60-SNAPSHOT io.nosqlbench virtdata-lib-random - 4.15.59 + 4.15.60-SNAPSHOT io.nosqlbench - 4.15.59 + 4.15.60-SNAPSHOT virtdata-lib-basics io.nosqlbench - 4.15.59 + 4.15.60-SNAPSHOT virtdata-lib-curves4 @@ -55,7 +55,7 @@ io.nosqlbench docsys - 4.15.59 + 4.15.60-SNAPSHOT