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 818229b6ef Removed TableInfo.majors field (#3921)
818229b6ef is described below
commit 818229b6ef07a9e86d639ed9dbdd4a69ae1ca2d4
Author: Dave Marion <dlmar...@apache.org>
AuthorDate: Thu Nov 2 12:01:54 2023 -0400
Removed TableInfo.majors field (#3921)
Fixes #3609
---
.../accumulo/core/manager/thrift/TableInfo.java | 120 +--------------------
core/src/main/thrift/manager.thrift | 1 -
.../apache/accumulo/server/util/TableInfoUtil.java | 8 --
.../java/org/apache/accumulo/monitor/Monitor.java | 8 --
.../rest/statistics/StatisticsResource.java | 11 --
.../monitor/rest/tables/CompactionsTypes.java | 5 +-
.../monitor/rest/tables/TableInformation.java | 18 ----
.../rest/tservers/TabletServerInformation.java | 13 +--
.../rest/tservers/TabletServerInformationTest.java | 3 -
.../org/apache/accumulo/tserver/TabletServer.java | 1 -
.../org/apache/accumulo/test/GetManagerStats.java | 2 -
11 files changed, 7 insertions(+), 183 deletions(-)
diff --git
a/core/src/main/thrift-gen-java/org/apache/accumulo/core/manager/thrift/TableInfo.java
b/core/src/main/thrift-gen-java/org/apache/accumulo/core/manager/thrift/TableInfo.java
index 846adeee43..662ddbd468 100644
---
a/core/src/main/thrift-gen-java/org/apache/accumulo/core/manager/thrift/TableInfo.java
+++
b/core/src/main/thrift-gen-java/org/apache/accumulo/core/manager/thrift/TableInfo.java
@@ -37,7 +37,6 @@ public class TableInfo implements
org.apache.thrift.TBase<TableInfo, TableInfo._
private static final org.apache.thrift.protocol.TField QUERY_RATE_FIELD_DESC
= new org.apache.thrift.protocol.TField("queryRate",
org.apache.thrift.protocol.TType.DOUBLE, (short)7);
private static final org.apache.thrift.protocol.TField
QUERY_BYTE_RATE_FIELD_DESC = new
org.apache.thrift.protocol.TField("queryByteRate",
org.apache.thrift.protocol.TType.DOUBLE, (short)8);
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)9);
- 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)10);
private static final org.apache.thrift.protocol.TField SCANS_FIELD_DESC =
new org.apache.thrift.protocol.TField("scans",
org.apache.thrift.protocol.TType.STRUCT, (short)11);
private static final org.apache.thrift.protocol.TField SCAN_RATE_FIELD_DESC
= new org.apache.thrift.protocol.TField("scanRate",
org.apache.thrift.protocol.TType.DOUBLE, (short)12);
@@ -53,7 +52,6 @@ public class TableInfo implements
org.apache.thrift.TBase<TableInfo, TableInfo._
public double queryRate; // required
public double queryByteRate; // required
public @org.apache.thrift.annotation.Nullable Compacting minors; // required
- public @org.apache.thrift.annotation.Nullable Compacting majors; // required
public @org.apache.thrift.annotation.Nullable Compacting scans; // required
public double scanRate; // required
@@ -68,7 +66,6 @@ public class TableInfo implements
org.apache.thrift.TBase<TableInfo, TableInfo._
QUERY_RATE((short)7, "queryRate"),
QUERY_BYTE_RATE((short)8, "queryByteRate"),
MINORS((short)9, "minors"),
- MAJORS((short)10, "majors"),
SCANS((short)11, "scans"),
SCAN_RATE((short)12, "scanRate");
@@ -104,8 +101,6 @@ public class TableInfo implements
org.apache.thrift.TBase<TableInfo, TableInfo._
return QUERY_BYTE_RATE;
case 9: // MINORS
return MINORS;
- case 10: // MAJORS
- return MAJORS;
case 11: // SCANS
return SCANS;
case 12: // SCAN_RATE
@@ -184,8 +179,6 @@ public class TableInfo implements
org.apache.thrift.TBase<TableInfo, TableInfo._
new
org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.DOUBLE)));
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,
Compacting.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,
Compacting.class)));
tmpMap.put(_Fields.SCANS, new
org.apache.thrift.meta_data.FieldMetaData("scans",
org.apache.thrift.TFieldRequirementType.DEFAULT,
new
org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT,
Compacting.class)));
tmpMap.put(_Fields.SCAN_RATE, new
org.apache.thrift.meta_data.FieldMetaData("scanRate",
org.apache.thrift.TFieldRequirementType.DEFAULT,
@@ -207,7 +200,6 @@ public class TableInfo implements
org.apache.thrift.TBase<TableInfo, TableInfo._
double queryRate,
double queryByteRate,
Compacting minors,
- Compacting majors,
Compacting scans,
double scanRate)
{
@@ -229,7 +221,6 @@ public class TableInfo implements
org.apache.thrift.TBase<TableInfo, TableInfo._
this.queryByteRate = queryByteRate;
setQueryByteRateIsSet(true);
this.minors = minors;
- this.majors = majors;
this.scans = scans;
this.scanRate = scanRate;
setScanRateIsSet(true);
@@ -251,9 +242,6 @@ public class TableInfo implements
org.apache.thrift.TBase<TableInfo, TableInfo._
if (other.isSetMinors()) {
this.minors = new Compacting(other.minors);
}
- if (other.isSetMajors()) {
- this.majors = new Compacting(other.majors);
- }
if (other.isSetScans()) {
this.scans = new Compacting(other.scans);
}
@@ -284,7 +272,6 @@ public class TableInfo implements
org.apache.thrift.TBase<TableInfo, TableInfo._
setQueryByteRateIsSet(false);
this.queryByteRate = 0.0;
this.minors = null;
- this.majors = null;
this.scans = null;
setScanRateIsSet(false);
this.scanRate = 0.0;
@@ -499,31 +486,6 @@ public class TableInfo implements
org.apache.thrift.TBase<TableInfo, TableInfo._
}
}
- @org.apache.thrift.annotation.Nullable
- public Compacting getMajors() {
- return this.majors;
- }
-
- public TableInfo setMajors(@org.apache.thrift.annotation.Nullable Compacting
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 Compacting getScans() {
return this.scans;
@@ -647,14 +609,6 @@ public class TableInfo implements
org.apache.thrift.TBase<TableInfo, TableInfo._
}
break;
- case MAJORS:
- if (value == null) {
- unsetMajors();
- } else {
- setMajors((Compacting)value);
- }
- break;
-
case SCANS:
if (value == null) {
unsetScans();
@@ -705,9 +659,6 @@ public class TableInfo implements
org.apache.thrift.TBase<TableInfo, TableInfo._
case MINORS:
return getMinors();
- case MAJORS:
- return getMajors();
-
case SCANS:
return getScans();
@@ -744,8 +695,6 @@ public class TableInfo implements
org.apache.thrift.TBase<TableInfo, TableInfo._
return isSetQueryByteRate();
case MINORS:
return isSetMinors();
- case MAJORS:
- return isSetMajors();
case SCANS:
return isSetScans();
case SCAN_RATE:
@@ -848,15 +797,6 @@ public class TableInfo implements
org.apache.thrift.TBase<TableInfo, TableInfo._
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_scans = true && this.isSetScans();
boolean that_present_scans = true && that.isSetScans();
if (this_present_scans || that_present_scans) {
@@ -902,10 +842,6 @@ public class TableInfo implements
org.apache.thrift.TBase<TableInfo, TableInfo._
if (isSetMinors())
hashCode = hashCode * 8191 + minors.hashCode();
- hashCode = hashCode * 8191 + ((isSetMajors()) ? 131071 : 524287);
- if (isSetMajors())
- hashCode = hashCode * 8191 + majors.hashCode();
-
hashCode = hashCode * 8191 + ((isSetScans()) ? 131071 : 524287);
if (isSetScans())
hashCode = hashCode * 8191 + scans.hashCode();
@@ -1013,16 +949,6 @@ public class TableInfo implements
org.apache.thrift.TBase<TableInfo, TableInfo._
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(isSetScans(),
other.isSetScans());
if (lastComparison != 0) {
return lastComparison;
@@ -1107,14 +1033,6 @@ public class TableInfo implements
org.apache.thrift.TBase<TableInfo, TableInfo._
}
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("scans:");
if (this.scans == null) {
sb.append("null");
@@ -1136,9 +1054,6 @@ public class TableInfo implements
org.apache.thrift.TBase<TableInfo, TableInfo._
if (minors != null) {
minors.validate();
}
- if (majors != null) {
- majors.validate();
- }
if (scans != null) {
scans.validate();
}
@@ -1255,15 +1170,6 @@ public class TableInfo implements
org.apache.thrift.TBase<TableInfo, TableInfo._
org.apache.thrift.protocol.TProtocolUtil.skip(iprot,
schemeField.type);
}
break;
- case 10: // MAJORS
- if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
- struct.majors = new Compacting();
- struct.majors.read(iprot);
- struct.setMajorsIsSet(true);
- } else {
- org.apache.thrift.protocol.TProtocolUtil.skip(iprot,
schemeField.type);
- }
- break;
case 11: // SCANS
if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
struct.scans = new Compacting();
@@ -1326,11 +1232,6 @@ public class TableInfo implements
org.apache.thrift.TBase<TableInfo, TableInfo._
struct.minors.write(oprot);
oprot.writeFieldEnd();
}
- if (struct.majors != null) {
- oprot.writeFieldBegin(MAJORS_FIELD_DESC);
- struct.majors.write(oprot);
- oprot.writeFieldEnd();
- }
if (struct.scans != null) {
oprot.writeFieldBegin(SCANS_FIELD_DESC);
struct.scans.write(oprot);
@@ -1385,16 +1286,13 @@ public class TableInfo implements
org.apache.thrift.TBase<TableInfo, TableInfo._
if (struct.isSetMinors()) {
optionals.set(8);
}
- if (struct.isSetMajors()) {
- optionals.set(9);
- }
if (struct.isSetScans()) {
- optionals.set(10);
+ optionals.set(9);
}
if (struct.isSetScanRate()) {
- optionals.set(11);
+ optionals.set(10);
}
- oprot.writeBitSet(optionals, 12);
+ oprot.writeBitSet(optionals, 11);
if (struct.isSetRecs()) {
oprot.writeI64(struct.recs);
}
@@ -1422,9 +1320,6 @@ public class TableInfo implements
org.apache.thrift.TBase<TableInfo, TableInfo._
if (struct.isSetMinors()) {
struct.minors.write(oprot);
}
- if (struct.isSetMajors()) {
- struct.majors.write(oprot);
- }
if (struct.isSetScans()) {
struct.scans.write(oprot);
}
@@ -1436,7 +1331,7 @@ public class TableInfo implements
org.apache.thrift.TBase<TableInfo, TableInfo._
@Override
public void read(org.apache.thrift.protocol.TProtocol prot, TableInfo
struct) throws org.apache.thrift.TException {
org.apache.thrift.protocol.TTupleProtocol iprot =
(org.apache.thrift.protocol.TTupleProtocol) prot;
- java.util.BitSet incoming = iprot.readBitSet(12);
+ java.util.BitSet incoming = iprot.readBitSet(11);
if (incoming.get(0)) {
struct.recs = iprot.readI64();
struct.setRecsIsSet(true);
@@ -1475,16 +1370,11 @@ public class TableInfo implements
org.apache.thrift.TBase<TableInfo, TableInfo._
struct.setMinorsIsSet(true);
}
if (incoming.get(9)) {
- struct.majors = new Compacting();
- struct.majors.read(iprot);
- struct.setMajorsIsSet(true);
- }
- if (incoming.get(10)) {
struct.scans = new Compacting();
struct.scans.read(iprot);
struct.setScansIsSet(true);
}
- if (incoming.get(11)) {
+ if (incoming.get(10)) {
struct.scanRate = iprot.readDouble();
struct.setScanRateIsSet(true);
}
diff --git a/core/src/main/thrift/manager.thrift
b/core/src/main/thrift/manager.thrift
index 6287f78ae1..70993697e4 100644
--- a/core/src/main/thrift/manager.thrift
+++ b/core/src/main/thrift/manager.thrift
@@ -101,7 +101,6 @@ struct TableInfo {
7:double queryRate
8:double queryByteRate
9:Compacting minors
- 10:Compacting majors
11:Compacting scans
12:double scanRate
}
diff --git
a/server/base/src/main/java/org/apache/accumulo/server/util/TableInfoUtil.java
b/server/base/src/main/java/org/apache/accumulo/server/util/TableInfoUtil.java
index 888d5e2210..412debf9ec 100644
---
a/server/base/src/main/java/org/apache/accumulo/server/util/TableInfoUtil.java
+++
b/server/base/src/main/java/org/apache/accumulo/server/util/TableInfoUtil.java
@@ -32,9 +32,6 @@ public class TableInfoUtil {
if (total.minors == null) {
total.minors = new Compacting();
}
- if (total.majors == null) {
- total.majors = new Compacting();
- }
if (total.scans == null) {
total.scans = new Compacting();
}
@@ -42,10 +39,6 @@ public class TableInfoUtil {
total.minors.running += more.minors.running;
total.minors.queued += more.minors.queued;
}
- if (more.majors != null) {
- total.majors.running += more.majors.running;
- total.majors.queued += more.majors.queued;
- }
if (more.scans != null) {
total.scans.running += more.scans.running;
total.scans.queued += more.scans.queued;
@@ -63,7 +56,6 @@ public class TableInfoUtil {
public static TableInfo summarizeTableStats(TabletServerStatus status) {
TableInfo summary = new TableInfo();
- summary.majors = new Compacting();
summary.minors = new Compacting();
summary.scans = new Compacting();
for (TableInfo rates : status.tableMap.values()) {
diff --git
a/server/monitor/src/main/java/org/apache/accumulo/monitor/Monitor.java
b/server/monitor/src/main/java/org/apache/accumulo/monitor/Monitor.java
index cd99b55d86..9f8eb68473 100644
--- a/server/monitor/src/main/java/org/apache/accumulo/monitor/Monitor.java
+++ b/server/monitor/src/main/java/org/apache/accumulo/monitor/Monitor.java
@@ -155,7 +155,6 @@ public class Monitor extends AbstractServer implements
HighlyAvailableService {
private final List<Pair<Long,Double>> ingestRateOverTime = newMaxList();
private final List<Pair<Long,Double>> ingestByteRateOverTime = newMaxList();
private final List<Pair<Long,Integer>> minorCompactionsOverTime =
newMaxList();
- private final List<Pair<Long,Integer>> majorCompactionsOverTime =
newMaxList();
private final List<Pair<Long,Double>> lookupsOverTime = newMaxList();
private final List<Pair<Long,Long>> queryRateOverTime = newMaxList();
private final List<Pair<Long,Long>> scanRateOverTime = newMaxList();
@@ -294,7 +293,6 @@ public class Monitor extends AbstractServer implements
HighlyAvailableService {
}
}
if (mmi != null) {
- int majorCompactions = 0;
int minorCompactions = 0;
lookupRateTracker.startingUpdates();
@@ -313,7 +311,6 @@ public class Monitor extends AbstractServer implements
HighlyAvailableService {
totalEntries += summary.recs;
totalHoldTime += server.holdTime;
totalLookups += server.lookups;
- majorCompactions += summary.majors.running;
minorCompactions += summary.minors.running;
lookupRateTracker.updateTabletServer(server.name,
server.lastContact, server.lookups);
indexCacheHitTracker.updateTabletServer(server.name,
server.lastContact,
@@ -360,7 +357,6 @@ public class Monitor extends AbstractServer implements
HighlyAvailableService {
loadOverTime.add(new Pair<>(currentTime, totalLoad));
minorCompactionsOverTime.add(new Pair<>(currentTime,
minorCompactions));
- majorCompactionsOverTime.add(new Pair<>(currentTime,
majorCompactions));
lookupsOverTime.add(new Pair<>(currentTime,
lookupRateTracker.calculateRate()));
@@ -971,10 +967,6 @@ public class Monitor extends AbstractServer implements
HighlyAvailableService {
return new ArrayList<>(minorCompactionsOverTime);
}
- public List<Pair<Long,Integer>> getMajorCompactionsOverTime() {
- return new ArrayList<>(majorCompactionsOverTime);
- }
-
public List<Pair<Long,Double>> getLookupsOverTime() {
return new ArrayList<>(lookupsOverTime);
}
diff --git
a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/statistics/StatisticsResource.java
b/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/statistics/StatisticsResource.java
index 8e43e33567..13573379ec 100644
---
a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/statistics/StatisticsResource.java
+++
b/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/statistics/StatisticsResource.java
@@ -251,17 +251,6 @@ public class StatisticsResource {
return monitor.getMinorCompactionsOverTime();
}
- /**
- * Generates a list with the major compactions over time
- *
- * @return Major compactions over time
- */
- @GET
- @Path("time/majorCompactions")
- public List<Pair<Long,Integer>> getMajorCompactions() {
- return monitor.getMajorCompactionsOverTime();
- }
-
/**
* Generates a list with the lookups over time
*
diff --git
a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/tables/CompactionsTypes.java
b/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/tables/CompactionsTypes.java
index 68ecd3c6b4..a89a37d4ff 100644
---
a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/tables/CompactionsTypes.java
+++
b/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/tables/CompactionsTypes.java
@@ -27,7 +27,6 @@ public class CompactionsTypes {
// Variable names become JSON objects
public CompactionsList scans = new CompactionsList();
- public CompactionsList major = new CompactionsList();
public CompactionsList minor = new CompactionsList();
public CompactionsTypes() {}
@@ -36,12 +35,10 @@ public class CompactionsTypes {
* Create a new compaction list based on types
*
* @param scans Scan compaction list
- * @param major Major compaction list
* @param minor Minor compaction list
*/
- public CompactionsTypes(CompactionsList scans, CompactionsList major,
CompactionsList minor) {
+ public CompactionsTypes(CompactionsList scans, CompactionsList minor) {
this.scans = scans;
- this.major = major;
this.minor = minor;
}
}
diff --git
a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/tables/TableInformation.java
b/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/tables/TableInformation.java
index e268cdac93..115ec52614 100644
---
a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/tables/TableInformation.java
+++
b/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/tables/TableInformation.java
@@ -50,9 +50,6 @@ public class TableInformation {
public double query;
public double queryByteRate;
- public CompactionsList majorCompactions;
- // running compactions with queued in parenthesis
- public String majorCombo;
public CompactionsList minorCompactions;
// running compactions with queued in parenthesis
public String minorCombo;
@@ -60,8 +57,6 @@ public class TableInformation {
// running scans with queued in parenthesis
public String scansCombo;
- public int queuedMajorCompactions;
- public int runningMajorCompactions;
public int queuedMinorCompactions;
public int runningMinorCompactions;
public int queuedScans;
@@ -99,8 +94,6 @@ public class TableInformation {
this.entriesRead = 0;
this.entriesReturned = 0;
this.holdTime = 0.0;
- this.majorCompactions = new CompactionsList(0, 0);
- this.majorCombo = ZERO_COMBO;
this.minorCompactions = new CompactionsList(0, 0);
this.minorCombo = ZERO_COMBO;
this.scans = new CompactionsList(0, 0);
@@ -159,17 +152,6 @@ public class TableInformation {
this.minorCombo = ZERO_COMBO;
}
- if (info.majors != null) {
- this.queuedMajorCompactions = info.majors.queued;
- this.runningMajorCompactions = info.majors.running;
- this.majorCombo = info.majors.running + "(" + info.majors.queued + ")";
- } else {
- this.queuedMajorCompactions = 0;
- this.runningMajorCompactions = 0;
- this.majorCombo = ZERO_COMBO;
- }
-
- this.majorCompactions = new CompactionsList(runningMajorCompactions,
queuedMajorCompactions);
this.minorCompactions = new CompactionsList(runningMinorCompactions,
queuedMinorCompactions);
this.scans = new CompactionsList(runningScans, queuedScans);
diff --git
a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/tservers/TabletServerInformation.java
b/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/tservers/TabletServerInformation.java
index f31a154741..a5b7cc36f1 100644
---
a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/tservers/TabletServerInformation.java
+++
b/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/tservers/TabletServerInformation.java
@@ -68,16 +68,11 @@ public class TabletServerInformation {
public Integer scansQueued;
// combo string with running value and number queued in parenthesis
public String minorCombo;
- public String majorCombo;
public String scansCombo;
public Integer minorRunning;
public Integer minorQueued;
- public Integer majorRunning;
- public Integer majorQueued;
-
private CompactionsList scansCompacting; // if scans is removed, change
scansCompacting to scans
- private CompactionsList major;
private CompactionsList minor;
public long entries;
public long lookups;
@@ -136,13 +131,7 @@ public class TabletServerInformation {
this.minor = new CompactionsList(this.minorRunning, this.minorQueued);
- this.majorRunning = summary.majors != null ? summary.majors.running : 0;
- this.majorQueued = summary.majors != null ? summary.majors.queued : 0;
- this.majorCombo = majorRunning + "(" + majorQueued + ")";
-
- this.major = new CompactionsList(this.majorRunning, this.majorQueued);
-
- this.compactions = new CompactionsTypes(scansCompacting, major, minor);
+ this.compactions = new CompactionsTypes(scansCompacting, minor);
this.osload = thriftStatus.osLoad;
this.version = thriftStatus.version;
diff --git
a/server/monitor/src/test/java/org/apache/accumulo/monitor/rest/tservers/TabletServerInformationTest.java
b/server/monitor/src/test/java/org/apache/accumulo/monitor/rest/tservers/TabletServerInformationTest.java
index 66bc0be8ae..798809e240 100644
---
a/server/monitor/src/test/java/org/apache/accumulo/monitor/rest/tservers/TabletServerInformationTest.java
+++
b/server/monitor/src/test/java/org/apache/accumulo/monitor/rest/tservers/TabletServerInformationTest.java
@@ -65,7 +65,6 @@ public class TabletServerInformationTest {
tableInfo.queryByteRate = 5.67;
tableInfo.scans = new Compacting(301, 401);
tableInfo.recs = 502;
- tableInfo.majors = new Compacting(501, 601);
tableInfo.minors = new Compacting(701, 801);
ts.setTableMap(Collections.singletonMap("tableId0", tableInfo));
ts.setVersion("testVersion");
@@ -83,8 +82,6 @@ public class TabletServerInformationTest {
assertEquals(1.23, tsi.osload, 0.001);
assertEquals("testVersion", tsi.version);
CompactionsTypes compactions = tsi.compactions;
- assertEquals(501, compactions.major.running.intValue());
- assertEquals(601, compactions.major.queued.intValue());
assertEquals(701, compactions.minor.running.intValue());
assertEquals(801, compactions.minor.queued.intValue());
assertEquals(301, compactions.scans.running.intValue());
diff --git
a/server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServer.java
b/server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServer.java
index fba3c57e81..a3e0441c08 100644
--- a/server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServer.java
+++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServer.java
@@ -840,7 +840,6 @@ public class TabletServer extends AbstractServer implements
TabletHostingServer
if (table == null) {
table = new TableInfo();
table.minors = new Compacting();
- table.majors = new Compacting();
tables.put(tableId, table);
}
long recs = tablet.getNumEntries();
diff --git a/test/src/main/java/org/apache/accumulo/test/GetManagerStats.java
b/test/src/main/java/org/apache/accumulo/test/GetManagerStats.java
index 9101f3fee2..21ff2e03a9 100644
--- a/test/src/main/java/org/apache/accumulo/test/GetManagerStats.java
+++ b/test/src/main/java/org/apache/accumulo/test/GetManagerStats.java
@@ -107,8 +107,6 @@ public class GetManagerStats {
out(4, "Records in Memory: %d", info.recsInMemory);
out(4, "Ingest: %.2f", info.ingestRate);
out(4, "Queries: %.2f", info.queryRate);
- out(4, "Major Compacting: %d", info.majors == null ? 0 :
info.majors.running);
- out(4, "Queued for Major Compaction: %d", info.majors == null ? 0
: info.majors.queued);
out(4, "Minor Compacting: %d", info.minors == null ? 0 :
info.minors.running);
out(4, "Queued for Minor Compaction: %d", info.minors == null ? 0
: info.minors.queued);
}
