Skip to content

Commit ffff639

Browse files
[fix][sec] Revert "[fix][sec] Add a check for the input time value (apache#22023)" (apache#22243)
1 parent d15e87d commit ffff639

File tree

22 files changed

+2
-43
lines changed

22 files changed

+2
-43
lines changed

managed-ledger/src/main/java/org/apache/bookkeeper/mledger/ManagedLedgerConfig.java

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,6 @@ public int getMinimumRolloverTimeMs() {
170170
* the time unit
171171
*/
172172
public void setMinimumRolloverTime(int minimumRolloverTime, TimeUnit unit) {
173-
checkArgument(minimumRolloverTime >= 0);
174173
this.minimumRolloverTimeMs = (int) unit.toMillis(minimumRolloverTime);
175174
checkArgument(maximumRolloverTimeMs >= minimumRolloverTimeMs,
176175
"Minimum rollover time needs to be less than maximum rollover time");
@@ -196,7 +195,6 @@ public long getMaximumRolloverTimeMs() {
196195
* the time unit
197196
*/
198197
public void setMaximumRolloverTime(int maximumRolloverTime, TimeUnit unit) {
199-
checkArgument(maximumRolloverTime >= 0);
200198
this.maximumRolloverTimeMs = unit.toMillis(maximumRolloverTime);
201199
checkArgument(maximumRolloverTimeMs >= minimumRolloverTimeMs,
202200
"Maximum rollover time needs to be greater than minimum rollover time");
@@ -413,8 +411,7 @@ public ManagedLedgerConfig setThrottleMarkDelete(double throttleMarkDelete) {
413411
* time unit for retention time
414412
*/
415413
public ManagedLedgerConfig setRetentionTime(int retentionTime, TimeUnit unit) {
416-
checkArgument(retentionTime >= -1, "The retention time should be -1, 0 or value > 0");
417-
this.retentionTimeMs = retentionTime != -1 ? unit.toMillis(retentionTime) : -1;
414+
this.retentionTimeMs = unit.toMillis(retentionTime);
418415
return this;
419416
}
420417

managed-ledger/src/main/java/org/apache/bookkeeper/mledger/impl/ManagedLedgerFactoryMBeanImpl.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
*/
1919
package org.apache.bookkeeper.mledger.impl;
2020

21-
import static com.google.common.base.Preconditions.checkArgument;
2221
import java.util.concurrent.TimeUnit;
2322
import java.util.concurrent.atomic.LongAdder;
2423
import org.apache.bookkeeper.mledger.ManagedLedgerFactoryMXBean;
@@ -42,7 +41,6 @@ public ManagedLedgerFactoryMBeanImpl(ManagedLedgerFactoryImpl factory) throws Ex
4241
}
4342

4443
public void refreshStats(long period, TimeUnit unit) {
45-
checkArgument(period >= 0);
4644
double seconds = unit.toMillis(period) / 1000.0;
4745

4846
if (seconds <= 0.0) {

managed-ledger/src/main/java/org/apache/bookkeeper/mledger/impl/ManagedLedgerMBeanImpl.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
*/
1919
package org.apache.bookkeeper.mledger.impl;
2020

21-
import static com.google.common.base.Preconditions.checkArgument;
2221
import java.util.concurrent.TimeUnit;
2322
import java.util.concurrent.atomic.LongAdder;
2423
import org.apache.bookkeeper.mledger.ManagedCursor;
@@ -65,7 +64,6 @@ public ManagedLedgerMBeanImpl(ManagedLedgerImpl managedLedger) {
6564
}
6665

6766
public void refreshStats(long period, TimeUnit unit) {
68-
checkArgument(period >= 0);
6967
double seconds = unit.toMillis(period) / 1000.0;
7068
if (seconds <= 0.0) {
7169
// skip refreshing stats

pulsar-broker/src/main/java/org/apache/pulsar/broker/stats/DimensionStats.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
*/
1919
package org.apache.pulsar.broker.stats;
2020

21-
import static com.google.common.base.Preconditions.checkArgument;
2221
import static io.prometheus.client.CollectorRegistry.defaultRegistry;
2322
import io.prometheus.client.Collector;
2423
import io.prometheus.client.Summary;
@@ -71,7 +70,6 @@ public DimensionStats(String name, long updateDurationInSec) {
7170
}
7271

7372
public void recordDimensionTimeValue(long latency, TimeUnit unit) {
74-
checkArgument(latency >= 0);
7573
summary.observe(unit.toMillis(latency));
7674
}
7775

pulsar-broker/src/main/java/org/apache/pulsar/broker/stats/prometheus/metrics/LongAdderCounter.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
*/
1919
package org.apache.pulsar.broker.stats.prometheus.metrics;
2020

21-
import static com.google.common.base.Preconditions.checkArgument;
2221
import java.util.concurrent.TimeUnit;
2322
import java.util.concurrent.atomic.LongAdder;
2423
import org.apache.bookkeeper.stats.Counter;
@@ -58,7 +57,6 @@ public void addCount(long delta) {
5857

5958
@Override
6059
public void addLatency(long eventLatency, TimeUnit unit) {
61-
checkArgument(eventLatency >= 0);
6260
long valueMillis = unit.toMillis(eventLatency);
6361
counter.add(valueMillis);
6462
}

pulsar-broker/src/test/java/org/apache/pulsar/compaction/CompactionRetentionTest.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -257,9 +257,7 @@ private void checkTopicRetentionPolicy(String topicName, RetentionPolicies reten
257257
ManagedLedgerConfig config = pulsar.getBrokerService()
258258
.getManagedLedgerConfig(TopicName.get(topicName)).get();
259259
Assert.assertEquals(config.getRetentionSizeInMB(), retentionPolicies.getRetentionSizeInMB());
260-
Assert.assertEquals(config.getRetentionTimeMillis(), retentionPolicies.getRetentionTimeInMinutes() < 0
261-
? retentionPolicies.getRetentionTimeInMinutes()
262-
: retentionPolicies.getRetentionTimeInMinutes() * 60000L);
260+
Assert.assertEquals(config.getRetentionTimeMillis(),retentionPolicies.getRetentionTimeInMinutes() * 60000L);
263261
}
264262

265263
private void testCompactionCursorRetention(String topic) throws Exception {

pulsar-client-1x-base/pulsar-client-1x/src/main/java/org/apache/pulsar/client/api/ClientConfiguration.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -368,7 +368,6 @@ public ClientConfiguration setServiceUrl(String serviceUrl) {
368368
* @param unit the time unit in which the duration is defined
369369
*/
370370
public void setConnectionTimeout(int duration, TimeUnit unit) {
371-
checkArgument(duration >= 0);
372371
confData.setConnectionTimeoutMs((int) unit.toMillis(duration));
373372
}
374373

pulsar-client-1x-base/pulsar-client-1x/src/main/java/org/apache/pulsar/client/api/ConsumerConfiguration.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,6 @@ public long getAckTimeoutMillis() {
6969
* @return {@link ConsumerConfiguration}
7070
*/
7171
public ConsumerConfiguration setAckTimeout(long ackTimeout, TimeUnit timeUnit) {
72-
checkArgument(ackTimeout >= 0);
7372
long ackTimeoutMillis = timeUnit.toMillis(ackTimeout);
7473
checkArgument(ackTimeoutMillis >= minAckTimeoutMillis,
7574
"Ack timeout should be should be greater than " + minAckTimeoutMillis + " ms");

pulsar-client-admin/src/main/java/org/apache/pulsar/client/admin/internal/PulsarAdminBuilderImpl.java

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
*/
1919
package org.apache.pulsar.client.admin.internal;
2020

21-
import static com.google.common.base.Preconditions.checkArgument;
2221
import java.util.Map;
2322
import java.util.Set;
2423
import java.util.concurrent.TimeUnit;
@@ -201,21 +200,18 @@ public PulsarAdminBuilder tlsProtocols(Set<String> tlsProtocols) {
201200

202201
@Override
203202
public PulsarAdminBuilder connectionTimeout(int connectionTimeout, TimeUnit connectionTimeoutUnit) {
204-
checkArgument(connectionTimeout >= 0);
205203
this.conf.setConnectionTimeoutMs((int) connectionTimeoutUnit.toMillis(connectionTimeout));
206204
return this;
207205
}
208206

209207
@Override
210208
public PulsarAdminBuilder readTimeout(int readTimeout, TimeUnit readTimeoutUnit) {
211-
checkArgument(readTimeout >= 0);
212209
this.conf.setReadTimeoutMs((int) readTimeoutUnit.toMillis(readTimeout));
213210
return this;
214211
}
215212

216213
@Override
217214
public PulsarAdminBuilder requestTimeout(int requestTimeout, TimeUnit requestTimeoutUnit) {
218-
checkArgument(requestTimeout >= 0);
219215
this.conf.setRequestTimeoutMs((int) requestTimeoutUnit.toMillis(requestTimeout));
220216
return this;
221217
}

pulsar-client-admin/src/main/java/org/apache/pulsar/client/admin/internal/TransactionsImpl.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -168,7 +168,6 @@ public TransactionPendingAckStats getPendingAckStats(String topic, String subNam
168168
@Override
169169
public CompletableFuture<Map<String, TransactionMetadata>> getSlowTransactionsByCoordinatorIdAsync(
170170
Integer coordinatorId, long timeout, TimeUnit timeUnit) {
171-
checkArgument(timeout >= 0);
172171
WebTarget path = adminV3Transactions.path("slowTransactions");
173172
path = path.path(timeUnit.toMillis(timeout) + "");
174173
if (coordinatorId != null) {

0 commit comments

Comments
 (0)