This is an automated email from the ASF dual-hosted git repository.
dlmarion pushed a commit to branch elasticity
in repository https://gitbox.apache.org/repos/asf/accumulo.git
commit bf9a6a59fe34b135ba163c9e9ee4411d0f6c3c12
Merge: 158bbaddf7 8b0262d5b3
Author: Dave Marion <dlmar...@apache.org>
AuthorDate: Mon Mar 18 12:03:26 2024 +0000
Merge branch 'main' into elasticity
.../main/java/org/apache/accumulo/minicluster/MiniAccumuloConfig.java | 3 +++
.../main/java/org/apache/accumulo/minicluster/MiniAccumuloRunner.java | 1 +
2 files changed, 4 insertions(+)
diff --cc
minicluster/src/main/java/org/apache/accumulo/minicluster/MiniAccumuloConfig.java
index 6446dfd44c,4ee34fcf30..d43008be97
---
a/minicluster/src/main/java/org/apache/accumulo/minicluster/MiniAccumuloConfig.java
+++
b/minicluster/src/main/java/org/apache/accumulo/minicluster/MiniAccumuloConfig.java
@@@ -56,9 -56,9 +56,10 @@@ public class MiniAccumuloConfig
*
* @param numTservers the number of tablet servers that mini accumulo
cluster should start
*/
+ // ELASTICITY_TODO: Deprecate in 3.0.0 and remove in elasticity on the merge
+ @Deprecated(since = "3.1.0")
public MiniAccumuloConfig setNumTservers(int numTservers) {
- impl.setNumTservers(numTservers);
+ // impl.setNumTservers(numTservers);
return this;
}
@@@ -68,9 -68,9 +69,10 @@@
* @param numScanServers the number of scan servers that mini accumulo
cluster should start
* @since 2.1.0
*/
+ // ELASTICITY_TODO: Deprecate in 3.0.0 and remove in elasticity on the merge
+ @Deprecated(since = "3.1.0")
public MiniAccumuloConfig setNumScanServers(int numScanServers) {
- impl.setNumScanServers(numScanServers);
+ // impl.setNumScanServers(numScanServers);
return this;
}
@@@ -226,10 -226,9 +228,11 @@@
/**
* @return the number of tservers configured for this cluster
*/
+ // ELASTICITY_TODO: Deprecate in 3.0.0 and remove in elasticity on the merge
+ @Deprecated(since = "3.1.0")
public int getNumTservers() {
- return impl.getNumTservers();
+ return
impl.getClusterServerConfiguration().getTabletServerConfiguration().values().stream()
+ .reduce(0, Integer::sum);
}
/**
