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
The following commit(s) were added to refs/heads/elasticity by this push:
new 2a2b44670e Resolved todo in tabletserver.thrift, removed majors from
TabletStats (#4366)
2a2b44670e is described below
commit 2a2b44670e732ad1e50c9c10ccad52d258190e28
Author: Dave Marion <dlmar...@apache.org>
AuthorDate: Tue Mar 19 10:26:35 2024 -0400
Resolved todo in tabletserver.thrift, removed majors from TabletStats
(#4366)
---
.../core/tabletserver/thrift/TabletStats.java | 132 ++-------------------
core/src/main/thrift/tabletserver.thrift | 4 +-
.../core/spi/balancer/SimpleLoadBalancerTest.java | 2 +-
.../monitor/rest/tservers/CurrentOperations.java | 12 +-
.../tservers/TabletServerDetailInformation.java | 6 +-
.../rest/tservers/TabletServerResource.java | 29 +----
.../apache/accumulo/tserver/TabletStatsKeeper.java | 2 +-
.../accumulo/test/ChaoticLoadBalancerTest.java | 2 +-
8 files changed, 22 insertions(+), 167 deletions(-)
diff --git
a/core/src/main/thrift-gen-java/org/apache/accumulo/core/tabletserver/thrift/TabletStats.java
b/core/src/main/thrift-gen-java/org/apache/accumulo/core/tabletserver/thrift/TabletStats.java
index b975e7b22e..a1b5b2c2ac 100644
---
a/core/src/main/thrift-gen-java/org/apache/accumulo/core/tabletserver/thrift/TabletStats.java
+++
b/core/src/main/thrift-gen-java/org/apache/accumulo/core/tabletserver/thrift/TabletStats.java
@@ -29,7 +29,6 @@ public class TabletStats implements
org.apache.thrift.TBase<TabletStats, TabletS
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new
org.apache.thrift.protocol.TStruct("TabletStats");
private static final org.apache.thrift.protocol.TField EXTENT_FIELD_DESC =
new org.apache.thrift.protocol.TField("extent",
org.apache.thrift.protocol.TType.STRUCT, (short)1);
- private static final org.apache.thrift.protocol.TField MAJORS_FIELD_DESC =
new org.apache.thrift.protocol.TField("majors",
org.apache.thrift.protocol.TType.STRUCT, (short)2);
private static final org.apache.thrift.protocol.TField MINORS_FIELD_DESC =
new org.apache.thrift.protocol.TField("minors",
org.apache.thrift.protocol.TType.STRUCT, (short)3);
private static final org.apache.thrift.protocol.TField SPLITS_FIELD_DESC =
new org.apache.thrift.protocol.TField("splits",
org.apache.thrift.protocol.TType.STRUCT, (short)4);
private static final org.apache.thrift.protocol.TField
NUM_ENTRIES_FIELD_DESC = new org.apache.thrift.protocol.TField("numEntries",
org.apache.thrift.protocol.TType.I64, (short)5);
@@ -40,7 +39,6 @@ public class TabletStats implements
org.apache.thrift.TBase<TabletStats, TabletS
private static final org.apache.thrift.scheme.SchemeFactory
TUPLE_SCHEME_FACTORY = new TabletStatsTupleSchemeFactory();
public @org.apache.thrift.annotation.Nullable
org.apache.accumulo.core.dataImpl.thrift.TKeyExtent extent; // required
- public @org.apache.thrift.annotation.Nullable ActionStats majors; // required
public @org.apache.thrift.annotation.Nullable ActionStats minors; // required
public @org.apache.thrift.annotation.Nullable ActionStats splits; // required
public long numEntries; // required
@@ -50,7 +48,6 @@ public class TabletStats implements
org.apache.thrift.TBase<TabletStats, TabletS
/** The set of fields this struct contains, along with convenience methods
for finding and manipulating them. */
public enum _Fields implements org.apache.thrift.TFieldIdEnum {
EXTENT((short)1, "extent"),
- MAJORS((short)2, "majors"),
MINORS((short)3, "minors"),
SPLITS((short)4, "splits"),
NUM_ENTRIES((short)5, "numEntries"),
@@ -73,8 +70,6 @@ public class TabletStats implements
org.apache.thrift.TBase<TabletStats, TabletS
switch(fieldId) {
case 1: // EXTENT
return EXTENT;
- case 2: // MAJORS
- return MAJORS;
case 3: // MINORS
return MINORS;
case 4: // SPLITS
@@ -137,8 +132,6 @@ public class TabletStats implements
org.apache.thrift.TBase<TabletStats, TabletS
java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap =
new java.util.EnumMap<_Fields,
org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
tmpMap.put(_Fields.EXTENT, new
org.apache.thrift.meta_data.FieldMetaData("extent",
org.apache.thrift.TFieldRequirementType.DEFAULT,
new
org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT,
org.apache.accumulo.core.dataImpl.thrift.TKeyExtent.class)));
- tmpMap.put(_Fields.MAJORS, new
org.apache.thrift.meta_data.FieldMetaData("majors",
org.apache.thrift.TFieldRequirementType.DEFAULT,
- new
org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT,
ActionStats.class)));
tmpMap.put(_Fields.MINORS, new
org.apache.thrift.meta_data.FieldMetaData("minors",
org.apache.thrift.TFieldRequirementType.DEFAULT,
new
org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT,
ActionStats.class)));
tmpMap.put(_Fields.SPLITS, new
org.apache.thrift.meta_data.FieldMetaData("splits",
org.apache.thrift.TFieldRequirementType.DEFAULT,
@@ -158,7 +151,6 @@ public class TabletStats implements
org.apache.thrift.TBase<TabletStats, TabletS
public TabletStats(
org.apache.accumulo.core.dataImpl.thrift.TKeyExtent extent,
- ActionStats majors,
ActionStats minors,
ActionStats splits,
long numEntries,
@@ -167,7 +159,6 @@ public class TabletStats implements
org.apache.thrift.TBase<TabletStats, TabletS
{
this();
this.extent = extent;
- this.majors = majors;
this.minors = minors;
this.splits = splits;
this.numEntries = numEntries;
@@ -186,9 +177,6 @@ public class TabletStats implements
org.apache.thrift.TBase<TabletStats, TabletS
if (other.isSetExtent()) {
this.extent = new
org.apache.accumulo.core.dataImpl.thrift.TKeyExtent(other.extent);
}
- if (other.isSetMajors()) {
- this.majors = new ActionStats(other.majors);
- }
if (other.isSetMinors()) {
this.minors = new ActionStats(other.minors);
}
@@ -208,7 +196,6 @@ public class TabletStats implements
org.apache.thrift.TBase<TabletStats, TabletS
@Override
public void clear() {
this.extent = null;
- this.majors = null;
this.minors = null;
this.splits = null;
setNumEntriesIsSet(false);
@@ -244,31 +231,6 @@ public class TabletStats implements
org.apache.thrift.TBase<TabletStats, TabletS
}
}
- @org.apache.thrift.annotation.Nullable
- public ActionStats getMajors() {
- return this.majors;
- }
-
- public TabletStats setMajors(@org.apache.thrift.annotation.Nullable
ActionStats majors) {
- this.majors = majors;
- return this;
- }
-
- public void unsetMajors() {
- this.majors = null;
- }
-
- /** Returns true if field majors is set (has been assigned a value) and
false otherwise */
- public boolean isSetMajors() {
- return this.majors != null;
- }
-
- public void setMajorsIsSet(boolean value) {
- if (!value) {
- this.majors = null;
- }
- }
-
@org.apache.thrift.annotation.Nullable
public ActionStats getMinors() {
return this.minors;
@@ -399,14 +361,6 @@ public class TabletStats implements
org.apache.thrift.TBase<TabletStats, TabletS
}
break;
- case MAJORS:
- if (value == null) {
- unsetMajors();
- } else {
- setMajors((ActionStats)value);
- }
- break;
-
case MINORS:
if (value == null) {
unsetMinors();
@@ -457,9 +411,6 @@ public class TabletStats implements
org.apache.thrift.TBase<TabletStats, TabletS
case EXTENT:
return getExtent();
- case MAJORS:
- return getMajors();
-
case MINORS:
return getMinors();
@@ -489,8 +440,6 @@ public class TabletStats implements
org.apache.thrift.TBase<TabletStats, TabletS
switch (field) {
case EXTENT:
return isSetExtent();
- case MAJORS:
- return isSetMajors();
case MINORS:
return isSetMinors();
case SPLITS:
@@ -527,15 +476,6 @@ public class TabletStats implements
org.apache.thrift.TBase<TabletStats, TabletS
return false;
}
- boolean this_present_majors = true && this.isSetMajors();
- boolean that_present_majors = true && that.isSetMajors();
- if (this_present_majors || that_present_majors) {
- if (!(this_present_majors && that_present_majors))
- return false;
- if (!this.majors.equals(that.majors))
- return false;
- }
-
boolean this_present_minors = true && this.isSetMinors();
boolean that_present_minors = true && that.isSetMinors();
if (this_present_minors || that_present_minors) {
@@ -592,10 +532,6 @@ public class TabletStats implements
org.apache.thrift.TBase<TabletStats, TabletS
if (isSetExtent())
hashCode = hashCode * 8191 + extent.hashCode();
- hashCode = hashCode * 8191 + ((isSetMajors()) ? 131071 : 524287);
- if (isSetMajors())
- hashCode = hashCode * 8191 + majors.hashCode();
-
hashCode = hashCode * 8191 + ((isSetMinors()) ? 131071 : 524287);
if (isSetMinors())
hashCode = hashCode * 8191 + minors.hashCode();
@@ -631,16 +567,6 @@ public class TabletStats implements
org.apache.thrift.TBase<TabletStats, TabletS
return lastComparison;
}
}
- lastComparison = java.lang.Boolean.compare(isSetMajors(),
other.isSetMajors());
- if (lastComparison != 0) {
- return lastComparison;
- }
- if (isSetMajors()) {
- lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.majors,
other.majors);
- if (lastComparison != 0) {
- return lastComparison;
- }
- }
lastComparison = java.lang.Boolean.compare(isSetMinors(),
other.isSetMinors());
if (lastComparison != 0) {
return lastComparison;
@@ -723,14 +649,6 @@ public class TabletStats implements
org.apache.thrift.TBase<TabletStats, TabletS
}
first = false;
if (!first) sb.append(", ");
- sb.append("majors:");
- if (this.majors == null) {
- sb.append("null");
- } else {
- sb.append(this.majors);
- }
- first = false;
- if (!first) sb.append(", ");
sb.append("minors:");
if (this.minors == null) {
sb.append("null");
@@ -768,9 +686,6 @@ public class TabletStats implements
org.apache.thrift.TBase<TabletStats, TabletS
if (extent != null) {
extent.validate();
}
- if (majors != null) {
- majors.validate();
- }
if (minors != null) {
minors.validate();
}
@@ -826,15 +741,6 @@ public class TabletStats implements
org.apache.thrift.TBase<TabletStats, TabletS
org.apache.thrift.protocol.TProtocolUtil.skip(iprot,
schemeField.type);
}
break;
- case 2: // MAJORS
- if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
- struct.majors = new ActionStats();
- struct.majors.read(iprot);
- struct.setMajorsIsSet(true);
- } else {
- org.apache.thrift.protocol.TProtocolUtil.skip(iprot,
schemeField.type);
- }
- break;
case 3: // MINORS
if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
struct.minors = new ActionStats();
@@ -898,11 +804,6 @@ public class TabletStats implements
org.apache.thrift.TBase<TabletStats, TabletS
struct.extent.write(oprot);
oprot.writeFieldEnd();
}
- if (struct.majors != null) {
- oprot.writeFieldBegin(MAJORS_FIELD_DESC);
- struct.majors.write(oprot);
- oprot.writeFieldEnd();
- }
if (struct.minors != null) {
oprot.writeFieldBegin(MINORS_FIELD_DESC);
struct.minors.write(oprot);
@@ -944,31 +845,25 @@ public class TabletStats implements
org.apache.thrift.TBase<TabletStats, TabletS
if (struct.isSetExtent()) {
optionals.set(0);
}
- if (struct.isSetMajors()) {
- optionals.set(1);
- }
if (struct.isSetMinors()) {
- optionals.set(2);
+ optionals.set(1);
}
if (struct.isSetSplits()) {
- optionals.set(3);
+ optionals.set(2);
}
if (struct.isSetNumEntries()) {
- optionals.set(4);
+ optionals.set(3);
}
if (struct.isSetIngestRate()) {
- optionals.set(5);
+ optionals.set(4);
}
if (struct.isSetQueryRate()) {
- optionals.set(6);
+ optionals.set(5);
}
- oprot.writeBitSet(optionals, 7);
+ oprot.writeBitSet(optionals, 6);
if (struct.isSetExtent()) {
struct.extent.write(oprot);
}
- if (struct.isSetMajors()) {
- struct.majors.write(oprot);
- }
if (struct.isSetMinors()) {
struct.minors.write(oprot);
}
@@ -989,36 +884,31 @@ public class TabletStats implements
org.apache.thrift.TBase<TabletStats, TabletS
@Override
public void read(org.apache.thrift.protocol.TProtocol prot, TabletStats
struct) throws org.apache.thrift.TException {
org.apache.thrift.protocol.TTupleProtocol iprot =
(org.apache.thrift.protocol.TTupleProtocol) prot;
- java.util.BitSet incoming = iprot.readBitSet(7);
+ java.util.BitSet incoming = iprot.readBitSet(6);
if (incoming.get(0)) {
struct.extent = new
org.apache.accumulo.core.dataImpl.thrift.TKeyExtent();
struct.extent.read(iprot);
struct.setExtentIsSet(true);
}
if (incoming.get(1)) {
- struct.majors = new ActionStats();
- struct.majors.read(iprot);
- struct.setMajorsIsSet(true);
- }
- if (incoming.get(2)) {
struct.minors = new ActionStats();
struct.minors.read(iprot);
struct.setMinorsIsSet(true);
}
- if (incoming.get(3)) {
+ if (incoming.get(2)) {
struct.splits = new ActionStats();
struct.splits.read(iprot);
struct.setSplitsIsSet(true);
}
- if (incoming.get(4)) {
+ if (incoming.get(3)) {
struct.numEntries = iprot.readI64();
struct.setNumEntriesIsSet(true);
}
- if (incoming.get(5)) {
+ if (incoming.get(4)) {
struct.ingestRate = iprot.readDouble();
struct.setIngestRateIsSet(true);
}
- if (incoming.get(6)) {
+ if (incoming.get(5)) {
struct.queryRate = iprot.readDouble();
struct.setQueryRateIsSet(true);
}
diff --git a/core/src/main/thrift/tabletserver.thrift
b/core/src/main/thrift/tabletserver.thrift
index 231e8f5809..7db5f5c9ed 100644
--- a/core/src/main/thrift/tabletserver.thrift
+++ b/core/src/main/thrift/tabletserver.thrift
@@ -45,8 +45,8 @@ struct ActionStats {
struct TabletStats {
1:data.TKeyExtent extent
- // ELASTICITY_TODO comment out following field and stop reading it, its not
being populated anymore
- 2:ActionStats majors
+ // do not reuse field 2, it was dropped
+ //2:ActionStats majors
3:ActionStats minors
4:ActionStats splits
5:i64 numEntries
diff --git
a/core/src/test/java/org/apache/accumulo/core/spi/balancer/SimpleLoadBalancerTest.java
b/core/src/test/java/org/apache/accumulo/core/spi/balancer/SimpleLoadBalancerTest.java
index 3d411cb98c..a069d7ddd8 100644
---
a/core/src/test/java/org/apache/accumulo/core/spi/balancer/SimpleLoadBalancerTest.java
+++
b/core/src/test/java/org/apache/accumulo/core/spi/balancer/SimpleLoadBalancerTest.java
@@ -88,7 +88,7 @@ public class SimpleLoadBalancerTest {
if (tabletId.getTable().equals(tableId)) {
KeyExtent extent = new KeyExtent(tableId, tabletId.getEndRow(),
tabletId.getPrevEndRow());
TabletStats stats =
- new TabletStats(new TabletStats(extent.toThrift(), null, null,
null, 0L, 0., 0.));
+ new TabletStats(new TabletStats(extent.toThrift(), null, null,
0L, 0., 0.));
result.add(new TabletStatisticsImpl(stats));
}
}
diff --git
a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/tservers/CurrentOperations.java
b/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/tservers/CurrentOperations.java
index dc151cf1b5..25a9c0a0be 100644
---
a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/tservers/CurrentOperations.java
+++
b/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/tservers/CurrentOperations.java
@@ -42,10 +42,7 @@ public class CurrentOperations {
public double query;
public Double minorStdDev;
public Double minorAvgES;
- public Double majorStdDev;
- public Double majorAvgES;
public Double minorAvg;
- public Double majorAvg;
public CurrentOperations() {}
@@ -61,13 +58,9 @@ public class CurrentOperations {
* @param minorAvg Minor compaction average
* @param minorStdDev Minor compaction standard deviation
* @param minorAvgES Minor compaction average ES
- * @param majorAvg Major compaction average
- * @param majorStdDev Major compaction standard deviation
- * @param majorAvgES Major compaction average ES
*/
public CurrentOperations(String name, TableId tableId, String tablet, long
entries, double ingest,
- double query, Double minorAvg, Double minorStdDev, Double minorAvgES,
Double majorAvg,
- Double majorStdDev, Double majorAvgES) {
+ double query, Double minorAvg, Double minorStdDev, Double minorAvgES) {
this.name = name;
this.tableID = tableId;
this.tablet = tablet;
@@ -76,9 +69,6 @@ public class CurrentOperations {
this.query = query;
this.minorStdDev = minorStdDev;
this.minorAvgES = minorAvgES;
- this.majorStdDev = majorStdDev;
- this.majorAvgES = majorAvgES;
this.minorAvg = minorAvg;
- this.majorAvg = majorAvg;
}
}
diff --git
a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/tservers/TabletServerDetailInformation.java
b/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/tservers/TabletServerDetailInformation.java
index 47add6ecd1..406eb90ca3 100644
---
a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/tservers/TabletServerDetailInformation.java
+++
b/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/tservers/TabletServerDetailInformation.java
@@ -28,7 +28,6 @@ public class TabletServerDetailInformation {
// Variable names become JSON keys
public int hostedTablets;
public int minors;
- public int majors;
public int splits;
public long entries;
@@ -40,15 +39,12 @@ public class TabletServerDetailInformation {
* @param hostedTablets Number of hosted tablets
* @param entries Number of entries
* @param minors Number of minor compactions
- * @param majors Number of major compactions
* @param splits Number of splits
*/
- public TabletServerDetailInformation(int hostedTablets, long entries, int
minors, int majors,
- int splits) {
+ public TabletServerDetailInformation(int hostedTablets, long entries, int
minors, int splits) {
this.hostedTablets = hostedTablets;
this.entries = entries;
this.minors = minors;
- this.majors = majors;
this.splits = splits;
}
}
diff --git
a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/tservers/TabletServerResource.java
b/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/tservers/TabletServerResource.java
index e1ad40246a..c0b5939c01 100644
---
a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/tservers/TabletServerResource.java
+++
b/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/tservers/TabletServerResource.java
@@ -175,10 +175,9 @@ public class TabletServerResource {
double currentMajorAvg = 0;
double currentMinorStdDev = 0;
double currentMajorStdDev = 0;
- total = new TabletStats(null, new ActionStats(), new ActionStats(), new
ActionStats(), 0, 0, 0);
+ total = new TabletStats(null, new ActionStats(), new ActionStats(), 0, 0,
0);
HostAndPort address = HostAndPort.fromString(tserverAddress);
- historical =
- new TabletStats(null, new ActionStats(), new ActionStats(), new
ActionStats(), 0, 0, 0);
+ historical = new TabletStats(null, new ActionStats(), new ActionStats(),
0, 0, 0);
List<TabletStats> tsStats = new ArrayList<>();
try {
@@ -205,21 +204,11 @@ public class TabletServerResource {
if (total.minors.elapsed != 0 && total.minors.num != 0) {
currentMinorStdDev = stddev(total.minors.elapsed, total.minors.num,
total.minors.sumDev);
}
- if (total.majors.num != 0) {
- currentMajorAvg = total.majors.elapsed / total.majors.num;
- }
- if (total.majors.elapsed != 0 && total.majors.num != 0
- && total.majors.elapsed > total.majors.num) {
- currentMajorStdDev = stddev(total.majors.elapsed, total.majors.num,
total.majors.sumDev);
- }
ActionStatsUpdator.update(total.minors, historical.minors);
- ActionStatsUpdator.update(total.majors, historical.majors);
minorStdDev = stddev(total.minors.elapsed, total.minors.num,
total.minors.sumDev);
minorQueueStdDev = stddev(total.minors.queueTime, total.minors.num,
total.minors.queueSumDev);
- majorStdDev = stddev(total.majors.elapsed, total.majors.num,
total.majors.sumDev);
- majorQueueStdDev = stddev(total.majors.queueTime, total.majors.num,
total.majors.queueSumDev);
splitStdDev =
stddev(historical.splits.elapsed, historical.splits.num,
historical.splits.sumDev);
@@ -267,7 +256,7 @@ public class TabletServerResource {
private TabletServerDetailInformation doDetails(int numTablets) {
return new TabletServerDetailInformation(numTablets, total.numEntries,
total.minors.status,
- total.majors.status, historical.splits.status);
+ historical.splits.status);
}
private List<AllTimeTabletResults> doAllTimeResults(double majorQueueStdDev,
@@ -282,12 +271,6 @@ public class TabletServerResource {
minorQueueStdDev, total.minors.num != 0 ? (total.minors.elapsed /
total.minors.num) : null,
minorStdDev, total.minors.elapsed));
- // Major Compaction Operation
- allTime.add(new AllTimeTabletResults("Major Compaction",
total.majors.num,
- total.majors.fail,
- total.majors.num != 0 ? (total.majors.queueTime / total.majors.num) :
null,
- majorQueueStdDev, total.majors.num != 0 ? (total.majors.elapsed /
total.majors.num) : null,
- majorStdDev, total.majors.elapsed));
// Split Operation
allTime.add(
new AllTimeTabletResults("Split", historical.splits.num,
historical.splits.fail, null, null,
@@ -315,7 +298,6 @@ public class TabletServerResource {
}
total.numEntries += info.numEntries;
ActionStatsUpdator.update(total.minors, info.minors);
- ActionStatsUpdator.update(total.majors, info.majors);
KeyExtent extent = KeyExtent.fromThrift(info.extent);
TableId tableId = extent.tableId();
@@ -327,10 +309,7 @@ public class TabletServerResource {
new CurrentOperations(tableName, tableId, displayExtent,
info.numEntries, info.ingestRate,
info.queryRate, info.minors.num != 0 ? info.minors.elapsed /
info.minors.num : null,
stddev(info.minors.elapsed, info.minors.num, info.minors.sumDev),
- info.minors.elapsed != 0 ? info.minors.count /
info.minors.elapsed : null,
- info.majors.num != 0 ? info.majors.elapsed / info.majors.num :
null,
- stddev(info.majors.elapsed, info.majors.num, info.majors.sumDev),
- info.majors.elapsed != 0 ? info.majors.count /
info.majors.elapsed : null));
+ info.minors.elapsed != 0 ? info.minors.count /
info.minors.elapsed : null));
}
return currentOperations;
diff --git
a/server/tserver/src/main/java/org/apache/accumulo/tserver/TabletStatsKeeper.java
b/server/tserver/src/main/java/org/apache/accumulo/tserver/TabletStatsKeeper.java
index fb2838b425..9ff77916c0 100644
---
a/server/tserver/src/main/java/org/apache/accumulo/tserver/TabletStatsKeeper.java
+++
b/server/tserver/src/main/java/org/apache/accumulo/tserver/TabletStatsKeeper.java
@@ -74,6 +74,6 @@ public class TabletStatsKeeper {
}
public TabletStats getTabletStats() {
- return new TabletStats(null, null, minor, null, 0, 0, 0);
+ return new TabletStats(null, minor, null, 0, 0, 0);
}
}
diff --git
a/test/src/test/java/org/apache/accumulo/test/ChaoticLoadBalancerTest.java
b/test/src/test/java/org/apache/accumulo/test/ChaoticLoadBalancerTest.java
index 0543af8996..81a389d451 100644
--- a/test/src/test/java/org/apache/accumulo/test/ChaoticLoadBalancerTest.java
+++ b/test/src/test/java/org/apache/accumulo/test/ChaoticLoadBalancerTest.java
@@ -85,7 +85,7 @@ public class ChaoticLoadBalancerTest {
if (tabletId.getTable().equals(table)) {
KeyExtent extent =
new KeyExtent(tabletId.getTable(), tabletId.getEndRow(),
tabletId.getPrevEndRow());
- TabletStats tstats = new TabletStats(extent.toThrift(), null, null,
null, 0L, 0., 0.);
+ TabletStats tstats = new TabletStats(extent.toThrift(), null, null,
0L, 0., 0.);
result.add(new TabletStatisticsImpl(tstats));
}
}
