This is an automated email from the ASF dual-hosted git repository.
shoothzj pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/bookkeeper.git
The following commit(s) were added to refs/heads/master by this push:
new f33d40dd35 chore: remove dead config
ensemblePlacementPolicyOrderSlowBookies (#4415)
f33d40dd35 is described below
commit f33d40dd35e473f1682d2d9fb61a994cbbe9ecdd
Author: ZhangJian He <[email protected]>
AuthorDate: Wed Jun 5 09:54:19 2024 +0800
chore: remove dead config ensemblePlacementPolicyOrderSlowBookies (#4415)
Fix #3514
### Motivation
This configuration may have initially intended to add a switch in
`slowBookies`, but it was overlooked. I reset the history to when the code was
merged into the master branch; it is still only referenced in the test files.
Furthermore, even if the test call is removed, the test cases still pass.
Therefore, I think it is reasonable to remove it.
Signed-off-by: ZhangJian He <[email protected]>
---
.../bookkeeper/conf/ClientConfiguration.java | 23 ----------------------
.../client/TestSpeculativeBatchRead.java | 2 --
.../bookkeeper/client/TestSpeculativeRead.java | 2 --
3 files changed, 27 deletions(-)
diff --git
a/bookkeeper-server/src/main/java/org/apache/bookkeeper/conf/ClientConfiguration.java
b/bookkeeper-server/src/main/java/org/apache/bookkeeper/conf/ClientConfiguration.java
index cb942d99b2..34aadd8ef7 100644
---
a/bookkeeper-server/src/main/java/org/apache/bookkeeper/conf/ClientConfiguration.java
+++
b/bookkeeper-server/src/main/java/org/apache/bookkeeper/conf/ClientConfiguration.java
@@ -159,8 +159,6 @@ public class ClientConfiguration extends
AbstractConfiguration<ClientConfigurati
public static final String ENSEMBLE_PLACEMENT_POLICY =
"ensemblePlacementPolicy";
protected static final String NETWORK_TOPOLOGY_STABILIZE_PERIOD_SECONDS =
"networkTopologyStabilizePeriodSeconds";
protected static final String READ_REORDER_THRESHOLD_PENDING_REQUESTS =
"readReorderThresholdPendingRequests";
- protected static final String ENSEMBLE_PLACEMENT_POLICY_ORDER_SLOW_BOOKIES
=
- "ensemblePlacementPolicyOrderSlowBookies";
protected static final String BOOKIE_ADDRESS_RESOLVER_ENABLED =
"bookieAddressResolverEnabled";
// Use hostname to resolve local placement info
public static final String
USE_HOSTNAME_RESOLVE_LOCAL_NODE_PLACEMENT_POLICY =
@@ -1290,27 +1288,6 @@ public class ClientConfiguration extends
AbstractConfiguration<ClientConfigurati
return this;
}
- /**
- * Whether to order slow bookies in placement policy.
- *
- * @return flag of whether to order slow bookies in placement policy or
not.
- */
- public boolean getEnsemblePlacementPolicySlowBookies() {
- return getBoolean(ENSEMBLE_PLACEMENT_POLICY_ORDER_SLOW_BOOKIES, false);
- }
-
- /**
- * Enable/Disable ordering slow bookies in placement policy.
- *
- * @param enabled
- * flag to enable/disable ordering slow bookies in placement
policy.
- * @return client configuration.
- */
- public ClientConfiguration setEnsemblePlacementPolicySlowBookies(boolean
enabled) {
- setProperty(ENSEMBLE_PLACEMENT_POLICY_ORDER_SLOW_BOOKIES, enabled);
- return this;
- }
-
/**
* Whether to enable BookieAddressResolver.
*
diff --git
a/bookkeeper-server/src/test/java/org/apache/bookkeeper/client/TestSpeculativeBatchRead.java
b/bookkeeper-server/src/test/java/org/apache/bookkeeper/client/TestSpeculativeBatchRead.java
index 3bf5e2d5e4..21b65c5d8f 100644
---
a/bookkeeper-server/src/test/java/org/apache/bookkeeper/client/TestSpeculativeBatchRead.java
+++
b/bookkeeper-server/src/test/java/org/apache/bookkeeper/client/TestSpeculativeBatchRead.java
@@ -79,7 +79,6 @@ public class TestSpeculativeBatchRead extends
BookKeeperClusterTestCase {
.setReadTimeout(30000)
.setUseV2WireProtocol(true)
.setReorderReadSequenceEnabled(true)
- .setEnsemblePlacementPolicySlowBookies(true)
.setMetadataServiceUri(zkUtil.getMetadataServiceUri());
return new BookKeeperTestClient(conf, new TestStatsProvider());
}
@@ -389,7 +388,6 @@ public class TestSpeculativeBatchRead extends
BookKeeperClusterTestCase {
.setSpeculativeReadTimeout(1000)
.setEnsemblePlacementPolicy(LocalBookieEnsemblePlacementPolicy.class)
.setReorderReadSequenceEnabled(true)
- .setEnsemblePlacementPolicySlowBookies(true)
.setMetadataServiceUri(zkUtil.getMetadataServiceUri());
BookKeeper bkspec = new BookKeeperTestClient(conf, new
TestStatsProvider());
LedgerHandle l = bkspec.createLedger(1, 1, digestType, passwd);
diff --git
a/bookkeeper-server/src/test/java/org/apache/bookkeeper/client/TestSpeculativeRead.java
b/bookkeeper-server/src/test/java/org/apache/bookkeeper/client/TestSpeculativeRead.java
index a1b29ece13..9db20a6f86 100644
---
a/bookkeeper-server/src/test/java/org/apache/bookkeeper/client/TestSpeculativeRead.java
+++
b/bookkeeper-server/src/test/java/org/apache/bookkeeper/client/TestSpeculativeRead.java
@@ -78,7 +78,6 @@ public class TestSpeculativeRead extends
BookKeeperClusterTestCase {
.setSpeculativeReadTimeout(specTimeout)
.setReadTimeout(30000)
.setReorderReadSequenceEnabled(true)
- .setEnsemblePlacementPolicySlowBookies(true)
.setMetadataServiceUri(zkUtil.getMetadataServiceUri());
return new BookKeeperTestClient(conf, new TestStatsProvider());
}
@@ -391,7 +390,6 @@ public class TestSpeculativeRead extends
BookKeeperClusterTestCase {
.setSpeculativeReadTimeout(1000)
.setEnsemblePlacementPolicy(LocalBookieEnsemblePlacementPolicy.class)
.setReorderReadSequenceEnabled(true)
- .setEnsemblePlacementPolicySlowBookies(true)
.setMetadataServiceUri(zkUtil.getMetadataServiceUri());
try (BookKeeper bkc = new BookKeeperTestClient(conf, new
TestStatsProvider())) {
LedgerHandle l = bkc.createLedger(1, 1, digestType, passwd);
