This is an automated email from the ASF dual-hosted git repository.
dlmarion pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/accumulo.git
The following commit(s) were added to refs/heads/main by this push:
new ebc1aacb20 Removed majc and splits from the monitor UI code (#4985)
ebc1aacb20 is described below
commit ebc1aacb208f526828c158e51c0cb4ee1d9c6575
Author: Dave Marion <dlmar...@apache.org>
AuthorDate: Wed Oct 30 14:04:54 2024 -0400
Removed majc and splits from the monitor UI code (#4985)
---
.../core/tabletserver/thrift/TabletStats.java | 124 ++-------------------
core/src/main/thrift/tabletserver.thrift | 3 +-
.../core/spi/balancer/SimpleLoadBalancerTest.java | 3 +-
.../rest/tservers/CurrentTabletResults.java | 9 +-
.../tservers/TabletServerDetailInformation.java | 5 +-
.../rest/tservers/TabletServerResource.java | 34 ++----
.../apache/accumulo/monitor/resources/js/server.js | 21 ----
.../apache/accumulo/monitor/resources/js/table.js | 19 ----
.../accumulo/monitor/resources/js/tservers.js | 17 ---
.../apache/accumulo/monitor/templates/server.ftl | 7 --
.../apache/accumulo/monitor/templates/table.ftl | 1 -
.../apache/accumulo/monitor/templates/tables.ftl | 10 --
.../apache/accumulo/monitor/templates/tservers.ftl | 1 -
.../apache/accumulo/tserver/TabletStatsKeeper.java | 2 +-
.../accumulo/test/ChaoticLoadBalancerTest.java | 2 +-
15 files changed, 22 insertions(+), 236 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 a1b5b2c2ac..35ee46a30f 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
@@ -30,7 +30,6 @@ public class TabletStats implements
org.apache.thrift.TBase<TabletStats, TabletS
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 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);
private static final org.apache.thrift.protocol.TField
INGEST_RATE_FIELD_DESC = new org.apache.thrift.protocol.TField("ingestRate",
org.apache.thrift.protocol.TType.DOUBLE, (short)6);
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);
@@ -40,7 +39,6 @@ public class TabletStats implements
org.apache.thrift.TBase<TabletStats, TabletS
public @org.apache.thrift.annotation.Nullable
org.apache.accumulo.core.dataImpl.thrift.TKeyExtent extent; // required
public @org.apache.thrift.annotation.Nullable ActionStats minors; // required
- public @org.apache.thrift.annotation.Nullable ActionStats splits; // required
public long numEntries; // required
public double ingestRate; // required
public double queryRate; // required
@@ -49,7 +47,6 @@ public class TabletStats implements
org.apache.thrift.TBase<TabletStats, TabletS
public enum _Fields implements org.apache.thrift.TFieldIdEnum {
EXTENT((short)1, "extent"),
MINORS((short)3, "minors"),
- SPLITS((short)4, "splits"),
NUM_ENTRIES((short)5, "numEntries"),
INGEST_RATE((short)6, "ingestRate"),
QUERY_RATE((short)7, "queryRate");
@@ -72,8 +69,6 @@ public class TabletStats implements
org.apache.thrift.TBase<TabletStats, TabletS
return EXTENT;
case 3: // MINORS
return MINORS;
- case 4: // SPLITS
- return SPLITS;
case 5: // NUM_ENTRIES
return NUM_ENTRIES;
case 6: // INGEST_RATE
@@ -134,8 +129,6 @@ public class TabletStats implements
org.apache.thrift.TBase<TabletStats, TabletS
new
org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT,
org.apache.accumulo.core.dataImpl.thrift.TKeyExtent.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,
- new
org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT,
ActionStats.class)));
tmpMap.put(_Fields.NUM_ENTRIES, new
org.apache.thrift.meta_data.FieldMetaData("numEntries",
org.apache.thrift.TFieldRequirementType.DEFAULT,
new
org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I64)));
tmpMap.put(_Fields.INGEST_RATE, new
org.apache.thrift.meta_data.FieldMetaData("ingestRate",
org.apache.thrift.TFieldRequirementType.DEFAULT,
@@ -152,7 +145,6 @@ public class TabletStats implements
org.apache.thrift.TBase<TabletStats, TabletS
public TabletStats(
org.apache.accumulo.core.dataImpl.thrift.TKeyExtent extent,
ActionStats minors,
- ActionStats splits,
long numEntries,
double ingestRate,
double queryRate)
@@ -160,7 +152,6 @@ public class TabletStats implements
org.apache.thrift.TBase<TabletStats, TabletS
this();
this.extent = extent;
this.minors = minors;
- this.splits = splits;
this.numEntries = numEntries;
setNumEntriesIsSet(true);
this.ingestRate = ingestRate;
@@ -180,9 +171,6 @@ public class TabletStats implements
org.apache.thrift.TBase<TabletStats, TabletS
if (other.isSetMinors()) {
this.minors = new ActionStats(other.minors);
}
- if (other.isSetSplits()) {
- this.splits = new ActionStats(other.splits);
- }
this.numEntries = other.numEntries;
this.ingestRate = other.ingestRate;
this.queryRate = other.queryRate;
@@ -197,7 +185,6 @@ public class TabletStats implements
org.apache.thrift.TBase<TabletStats, TabletS
public void clear() {
this.extent = null;
this.minors = null;
- this.splits = null;
setNumEntriesIsSet(false);
this.numEntries = 0;
setIngestRateIsSet(false);
@@ -256,31 +243,6 @@ public class TabletStats implements
org.apache.thrift.TBase<TabletStats, TabletS
}
}
- @org.apache.thrift.annotation.Nullable
- public ActionStats getSplits() {
- return this.splits;
- }
-
- public TabletStats setSplits(@org.apache.thrift.annotation.Nullable
ActionStats splits) {
- this.splits = splits;
- return this;
- }
-
- public void unsetSplits() {
- this.splits = null;
- }
-
- /** Returns true if field splits is set (has been assigned a value) and
false otherwise */
- public boolean isSetSplits() {
- return this.splits != null;
- }
-
- public void setSplitsIsSet(boolean value) {
- if (!value) {
- this.splits = null;
- }
- }
-
public long getNumEntries() {
return this.numEntries;
}
@@ -369,14 +331,6 @@ public class TabletStats implements
org.apache.thrift.TBase<TabletStats, TabletS
}
break;
- case SPLITS:
- if (value == null) {
- unsetSplits();
- } else {
- setSplits((ActionStats)value);
- }
- break;
-
case NUM_ENTRIES:
if (value == null) {
unsetNumEntries();
@@ -414,9 +368,6 @@ public class TabletStats implements
org.apache.thrift.TBase<TabletStats, TabletS
case MINORS:
return getMinors();
- case SPLITS:
- return getSplits();
-
case NUM_ENTRIES:
return getNumEntries();
@@ -442,8 +393,6 @@ public class TabletStats implements
org.apache.thrift.TBase<TabletStats, TabletS
return isSetExtent();
case MINORS:
return isSetMinors();
- case SPLITS:
- return isSetSplits();
case NUM_ENTRIES:
return isSetNumEntries();
case INGEST_RATE:
@@ -485,15 +434,6 @@ public class TabletStats implements
org.apache.thrift.TBase<TabletStats, TabletS
return false;
}
- boolean this_present_splits = true && this.isSetSplits();
- boolean that_present_splits = true && that.isSetSplits();
- if (this_present_splits || that_present_splits) {
- if (!(this_present_splits && that_present_splits))
- return false;
- if (!this.splits.equals(that.splits))
- return false;
- }
-
boolean this_present_numEntries = true;
boolean that_present_numEntries = true;
if (this_present_numEntries || that_present_numEntries) {
@@ -536,10 +476,6 @@ public class TabletStats implements
org.apache.thrift.TBase<TabletStats, TabletS
if (isSetMinors())
hashCode = hashCode * 8191 + minors.hashCode();
- hashCode = hashCode * 8191 + ((isSetSplits()) ? 131071 : 524287);
- if (isSetSplits())
- hashCode = hashCode * 8191 + splits.hashCode();
-
hashCode = hashCode * 8191 +
org.apache.thrift.TBaseHelper.hashCode(numEntries);
hashCode = hashCode * 8191 +
org.apache.thrift.TBaseHelper.hashCode(ingestRate);
@@ -577,16 +513,6 @@ public class TabletStats implements
org.apache.thrift.TBase<TabletStats, TabletS
return lastComparison;
}
}
- lastComparison = java.lang.Boolean.compare(isSetSplits(),
other.isSetSplits());
- if (lastComparison != 0) {
- return lastComparison;
- }
- if (isSetSplits()) {
- lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.splits,
other.splits);
- if (lastComparison != 0) {
- return lastComparison;
- }
- }
lastComparison = java.lang.Boolean.compare(isSetNumEntries(),
other.isSetNumEntries());
if (lastComparison != 0) {
return lastComparison;
@@ -657,14 +583,6 @@ public class TabletStats implements
org.apache.thrift.TBase<TabletStats, TabletS
}
first = false;
if (!first) sb.append(", ");
- sb.append("splits:");
- if (this.splits == null) {
- sb.append("null");
- } else {
- sb.append(this.splits);
- }
- first = false;
- if (!first) sb.append(", ");
sb.append("numEntries:");
sb.append(this.numEntries);
first = false;
@@ -689,9 +607,6 @@ public class TabletStats implements
org.apache.thrift.TBase<TabletStats, TabletS
if (minors != null) {
minors.validate();
}
- if (splits != null) {
- splits.validate();
- }
}
private void writeObject(java.io.ObjectOutputStream out) throws
java.io.IOException {
@@ -750,15 +665,6 @@ public class TabletStats implements
org.apache.thrift.TBase<TabletStats, TabletS
org.apache.thrift.protocol.TProtocolUtil.skip(iprot,
schemeField.type);
}
break;
- case 4: // SPLITS
- if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
- struct.splits = new ActionStats();
- struct.splits.read(iprot);
- struct.setSplitsIsSet(true);
- } else {
- org.apache.thrift.protocol.TProtocolUtil.skip(iprot,
schemeField.type);
- }
- break;
case 5: // NUM_ENTRIES
if (schemeField.type == org.apache.thrift.protocol.TType.I64) {
struct.numEntries = iprot.readI64();
@@ -809,11 +715,6 @@ public class TabletStats implements
org.apache.thrift.TBase<TabletStats, TabletS
struct.minors.write(oprot);
oprot.writeFieldEnd();
}
- if (struct.splits != null) {
- oprot.writeFieldBegin(SPLITS_FIELD_DESC);
- struct.splits.write(oprot);
- oprot.writeFieldEnd();
- }
oprot.writeFieldBegin(NUM_ENTRIES_FIELD_DESC);
oprot.writeI64(struct.numEntries);
oprot.writeFieldEnd();
@@ -848,28 +749,22 @@ public class TabletStats implements
org.apache.thrift.TBase<TabletStats, TabletS
if (struct.isSetMinors()) {
optionals.set(1);
}
- if (struct.isSetSplits()) {
- optionals.set(2);
- }
if (struct.isSetNumEntries()) {
- optionals.set(3);
+ optionals.set(2);
}
if (struct.isSetIngestRate()) {
- optionals.set(4);
+ optionals.set(3);
}
if (struct.isSetQueryRate()) {
- optionals.set(5);
+ optionals.set(4);
}
- oprot.writeBitSet(optionals, 6);
+ oprot.writeBitSet(optionals, 5);
if (struct.isSetExtent()) {
struct.extent.write(oprot);
}
if (struct.isSetMinors()) {
struct.minors.write(oprot);
}
- if (struct.isSetSplits()) {
- struct.splits.write(oprot);
- }
if (struct.isSetNumEntries()) {
oprot.writeI64(struct.numEntries);
}
@@ -884,7 +779,7 @@ 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(6);
+ java.util.BitSet incoming = iprot.readBitSet(5);
if (incoming.get(0)) {
struct.extent = new
org.apache.accumulo.core.dataImpl.thrift.TKeyExtent();
struct.extent.read(iprot);
@@ -896,19 +791,14 @@ public class TabletStats implements
org.apache.thrift.TBase<TabletStats, TabletS
struct.setMinorsIsSet(true);
}
if (incoming.get(2)) {
- struct.splits = new ActionStats();
- struct.splits.read(iprot);
- struct.setSplitsIsSet(true);
- }
- if (incoming.get(3)) {
struct.numEntries = iprot.readI64();
struct.setNumEntriesIsSet(true);
}
- if (incoming.get(4)) {
+ if (incoming.get(3)) {
struct.ingestRate = iprot.readDouble();
struct.setIngestRateIsSet(true);
}
- if (incoming.get(5)) {
+ if (incoming.get(4)) {
struct.queryRate = iprot.readDouble();
struct.setQueryRateIsSet(true);
}
diff --git a/core/src/main/thrift/tabletserver.thrift
b/core/src/main/thrift/tabletserver.thrift
index e10bc182a4..bcf85d32be 100644
--- a/core/src/main/thrift/tabletserver.thrift
+++ b/core/src/main/thrift/tabletserver.thrift
@@ -48,7 +48,8 @@ struct TabletStats {
// do not reuse field 2, it was dropped
//2:ActionStats majors
3:ActionStats minors
- 4:ActionStats splits
+ // do not reuse field 4, it was dropped
+ //4:ActionStats splits
5:i64 numEntries
6:double ingestRate
7:double queryRate
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 a069d7ddd8..82fa17297d 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
@@ -87,8 +87,7 @@ public class SimpleLoadBalancerTest {
for (TabletId tabletId : servers.get(tserver).tablets) {
if (tabletId.getTable().equals(tableId)) {
KeyExtent extent = new KeyExtent(tableId, tabletId.getEndRow(),
tabletId.getPrevEndRow());
- TabletStats stats =
- new TabletStats(new TabletStats(extent.toThrift(), null, null,
0L, 0., 0.));
+ TabletStats stats = new TabletStats(new
TabletStats(extent.toThrift(), null, 0L, 0., 0.));
result.add(new TabletStatisticsImpl(stats));
}
}
diff --git
a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/tservers/CurrentTabletResults.java
b/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/tservers/CurrentTabletResults.java
index dad559be7f..67430a7e4c 100644
---
a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/tservers/CurrentTabletResults.java
+++
b/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/tservers/CurrentTabletResults.java
@@ -28,8 +28,6 @@ public class CurrentTabletResults {
// Variable names become JSON keys
public Double currentMinorAvg;
public Double currentMinorStdDev;
- public Double currentMajorAvg;
- public Double currentMajorStdDev;
public CurrentTabletResults() {}
@@ -38,14 +36,9 @@ public class CurrentTabletResults {
*
* @param currentMinorAvg minor compaction average
* @param currentMinorStdDev minor compaction standard deviation
- * @param currentMajorAvg major compaction average
- * @param currentMajorStdDev major compaction standard deviation
*/
- public CurrentTabletResults(Double currentMinorAvg, Double
currentMinorStdDev,
- Double currentMajorAvg, Double currentMajorStdDev) {
+ public CurrentTabletResults(Double currentMinorAvg, Double
currentMinorStdDev) {
this.currentMinorAvg = currentMinorAvg;
this.currentMinorStdDev = currentMinorStdDev;
- this.currentMajorAvg = currentMajorAvg;
- this.currentMajorStdDev = currentMajorStdDev;
}
}
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 406eb90ca3..11fca7a4eb 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 splits;
public long entries;
public TabletServerDetailInformation() {}
@@ -39,12 +38,10 @@ public class TabletServerDetailInformation {
* @param hostedTablets Number of hosted tablets
* @param entries Number of entries
* @param minors Number of minor compactions
- * @param splits Number of splits
*/
- public TabletServerDetailInformation(int hostedTablets, long entries, int
minors, int splits) {
+ public TabletServerDetailInformation(int hostedTablets, long entries, int
minors) {
this.hostedTablets = hostedTablets;
this.entries = entries;
this.minors = minors;
- 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 c0b5939c01..b21407049c 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
@@ -166,18 +166,13 @@ public class TabletServerResource {
return null;
}
- double splitStdDev = 0;
double minorStdDev = 0;
double minorQueueStdDev = 0;
- double majorStdDev = 0;
- double majorQueueStdDev = 0;
double currentMinorAvg = 0;
- double currentMajorAvg = 0;
double currentMinorStdDev = 0;
- double currentMajorStdDev = 0;
- total = new TabletStats(null, new ActionStats(), new ActionStats(), 0, 0,
0);
+ total = new TabletStats(null, new ActionStats(), 0, 0, 0);
HostAndPort address = HostAndPort.fromString(tserverAddress);
- historical = new TabletStats(null, new ActionStats(), new ActionStats(),
0, 0, 0);
+ historical = new TabletStats(null, new ActionStats(), 0, 0, 0);
List<TabletStats> tsStats = new ArrayList<>();
try {
@@ -209,16 +204,12 @@ public class TabletServerResource {
minorStdDev = stddev(total.minors.elapsed, total.minors.num,
total.minors.sumDev);
minorQueueStdDev = stddev(total.minors.queueTime, total.minors.num,
total.minors.queueSumDev);
- splitStdDev =
- stddev(historical.splits.elapsed, historical.splits.num,
historical.splits.sumDev);
TabletServerDetailInformation details = doDetails(tsStats.size());
- List<AllTimeTabletResults> allTime =
- doAllTimeResults(majorQueueStdDev, minorQueueStdDev, splitStdDev,
majorStdDev, minorStdDev);
+ List<AllTimeTabletResults> allTime = doAllTimeResults(minorQueueStdDev,
minorStdDev);
- CurrentTabletResults currentRes = doCurrentTabletResults(currentMinorAvg,
currentMinorStdDev,
- currentMajorAvg, currentMajorStdDev);
+ CurrentTabletResults currentRes = doCurrentTabletResults(currentMinorAvg,
currentMinorStdDev);
return new TabletServerSummary(details, allTime, currentRes, currentOps);
}
@@ -255,12 +246,10 @@ public class TabletServerResource {
private TabletServerDetailInformation doDetails(int numTablets) {
- return new TabletServerDetailInformation(numTablets, total.numEntries,
total.minors.status,
- historical.splits.status);
+ return new TabletServerDetailInformation(numTablets, total.numEntries,
total.minors.status);
}
- private List<AllTimeTabletResults> doAllTimeResults(double majorQueueStdDev,
- double minorQueueStdDev, double splitStdDev, double majorStdDev, double
minorStdDev) {
+ private List<AllTimeTabletResults> doAllTimeResults(double minorQueueStdDev,
double minorStdDev) {
List<AllTimeTabletResults> allTime = new ArrayList<>();
@@ -271,20 +260,13 @@ public class TabletServerResource {
minorQueueStdDev, total.minors.num != 0 ? (total.minors.elapsed /
total.minors.num) : null,
minorStdDev, total.minors.elapsed));
- // Split Operation
- allTime.add(
- new AllTimeTabletResults("Split", historical.splits.num,
historical.splits.fail, null, null,
- historical.splits.num != 0 ? (historical.splits.elapsed /
historical.splits.num) : null,
- splitStdDev, historical.splits.elapsed));
-
return allTime;
}
private CurrentTabletResults doCurrentTabletResults(double currentMinorAvg,
- double currentMinorStdDev, double currentMajorAvg, double
currentMajorStdDev) {
+ double currentMinorStdDev) {
- return new CurrentTabletResults(currentMinorAvg, currentMinorStdDev,
currentMajorAvg,
- currentMajorStdDev);
+ return new CurrentTabletResults(currentMinorAvg, currentMinorStdDev);
}
private List<CurrentOperations> doCurrentOperations(List<TabletStats>
tsStats) throws Exception {
diff --git
a/server/monitor/src/main/resources/org/apache/accumulo/monitor/resources/js/server.js
b/server/monitor/src/main/resources/org/apache/accumulo/monitor/resources/js/server.js
index 5119bd50f7..f7867558cd 100644
---
a/server/monitor/src/main/resources/org/apache/accumulo/monitor/resources/js/server.js
+++
b/server/monitor/src/main/resources/org/apache/accumulo/monitor/resources/js/server.js
@@ -84,12 +84,6 @@ function initServerTables(serv) {
},
{
"data": "minors"
- },
- {
- "data": "majors"
- },
- {
- "data": "splits"
}
]
});
@@ -211,12 +205,6 @@ function initServerTables(serv) {
},
{
"data": "currentMinorStdDev"
- },
- {
- "data": "currentMajorAvg"
- },
- {
- "data": "currentMajorStdDev"
}
]
});
@@ -285,15 +273,6 @@ function initServerTables(serv) {
},
{
"data": "minorAvgES"
- },
- {
- "data": "majorAvg"
- },
- {
- "data": "majorStdDev"
- },
- {
- "data": "majorAvgES"
}
]
});
diff --git
a/server/monitor/src/main/resources/org/apache/accumulo/monitor/resources/js/table.js
b/server/monitor/src/main/resources/org/apache/accumulo/monitor/resources/js/table.js
index 569138a53c..fc39d67919 100644
---
a/server/monitor/src/main/resources/org/apache/accumulo/monitor/resources/js/table.js
+++
b/server/monitor/src/main/resources/org/apache/accumulo/monitor/resources/js/table.js
@@ -97,12 +97,6 @@ function initTableServerTable(tableID) {
"type": "numeric",
"orderData": [15, 16]
},
- // major compaction column will be sorted by number of running, then by
number of queued
- {
- "targets": [9],
- "type": "numeric",
- "orderData": [17, 18]
- }
],
"columns": [{
"data": "hostname",
@@ -142,11 +136,6 @@ function initTableServerTable(tableID) {
return getQueuedAndRunning(row.compactions.minor);
}
},
- {
- "data": function (row) {
- return getQueuedAndRunning(row.compactions.major);
- }
- },
{
"data": "indexCacheHitRate"
},
@@ -171,14 +160,6 @@ function initTableServerTable(tableID) {
{
"data": "minorQueued",
"visible": false
- },
- {
- "data": "majorRunning",
- "visible": false
- },
- {
- "data": "majorQueued",
- "visible": false
}
]
});
diff --git
a/server/monitor/src/main/resources/org/apache/accumulo/monitor/resources/js/tservers.js
b/server/monitor/src/main/resources/org/apache/accumulo/monitor/resources/js/tservers.js
index a06fa66090..d1d3ed1375 100644
---
a/server/monitor/src/main/resources/org/apache/accumulo/monitor/resources/js/tservers.js
+++
b/server/monitor/src/main/resources/org/apache/accumulo/monitor/resources/js/tservers.js
@@ -183,12 +183,6 @@ $(document).ready(function () {
"type": "numeric",
"orderData": [16, 17]
},
- // major compaction column will be sorted by number of running, then by
number of queued
- {
- "targets": [10],
- "type": "numeric",
- "orderData": [18, 19]
- }
],
"columns": [{
"data": "hostname",
@@ -227,9 +221,6 @@ $(document).ready(function () {
{
"data": "minorCombo"
},
- {
- "data": "majorCombo"
- },
{
"data": "indexCacheHitRate"
},
@@ -254,14 +245,6 @@ $(document).ready(function () {
{
"data": "minorQueued",
"visible": false
- },
- {
- "data": "majorRunning",
- "visible": false
- },
- {
- "data": "majorQueued",
- "visible": false
}
],
"rowCallback": function (row, data, index) {
diff --git
a/server/monitor/src/main/resources/org/apache/accumulo/monitor/templates/server.ftl
b/server/monitor/src/main/resources/org/apache/accumulo/monitor/templates/server.ftl
index f35a69bfe9..d316bd75e1 100644
---
a/server/monitor/src/main/resources/org/apache/accumulo/monitor/templates/server.ftl
+++
b/server/monitor/src/main/resources/org/apache/accumulo/monitor/templates/server.ftl
@@ -38,8 +38,6 @@
<th class="big-num">Hosted Tablets </th>
<th class="big-num">Entries </th>
<th class="big-num">Minor Compacting </th>
- <th class="big-num">Major Compacting </th>
- <th class="big-num">Splitting </th>
</tr>
</thead>
<tbody></tbody>
@@ -76,8 +74,6 @@
<tr>
<th class="duration">Minor Average </th>
<th class="duration">Minor Std Dev </th>
- <th class="duration">Major Avg </th>
- <th class="duration">Major Std Dev </th>
</tr>
</thead>
<tbody></tbody>
@@ -99,9 +95,6 @@
<th class="duration">Minor Avg </th>
<th class="duration">Minor Std Dev </th>
<th class="big-num">Minor Avg e/s </th>
- <th class="duration">Major Avg </th>
- <th class="duration">Major Std Dev </th>
- <th class="big-num">Major Avg e/s </th>
</tr>
</thead>
<tbody></tbody>
diff --git
a/server/monitor/src/main/resources/org/apache/accumulo/monitor/templates/table.ftl
b/server/monitor/src/main/resources/org/apache/accumulo/monitor/templates/table.ftl
index 3887473a7e..5508136028 100644
---
a/server/monitor/src/main/resources/org/apache/accumulo/monitor/templates/table.ftl
+++
b/server/monitor/src/main/resources/org/apache/accumulo/monitor/templates/table.ftl
@@ -46,7 +46,6 @@
<th class="duration" title="The amount of time live ingest
operations (mutations, batch writes) have been waiting for the tserver to free
up memory.">Hold Time </th>
<th title="Information about the scans threads. Shows how many
threads are running and, in parentheses, how much work is queued for the
threads.">Scans </th>
<th title="The action of flushing memory to disk. Multiple
tablets can be compacted simultaneously, but sometimes they must wait for
resources to be available. The number of tablets waiting for compaction is in
parentheses.">Minor Compactions </th>
- <th title="The action of gathering up many small files and
rewriting them as one larger file. The number of queued major compactions is in
parentheses.">Major Compactions </th>
<th class="percent" title="The recent index cache hit
rate.">Index Cache<br />Hit Rate </th>
<th class="percent" title="The recent data cache hit
rate.">Data Cache<br />Hit Rate </th>
<th class="big-num" title="The Unix one minute load average.
The average number of processes in the run queue over a one minute
interval.">OS Load </th>
diff --git
a/server/monitor/src/main/resources/org/apache/accumulo/monitor/templates/tables.ftl
b/server/monitor/src/main/resources/org/apache/accumulo/monitor/templates/tables.ftl
index da1351aacc..fd0e0c876a 100644
---
a/server/monitor/src/main/resources/org/apache/accumulo/monitor/templates/tables.ftl
+++
b/server/monitor/src/main/resources/org/apache/accumulo/monitor/templates/tables.ftl
@@ -66,12 +66,6 @@
"type": "numeric",
"orderData": [15, 16]
},
- // major compaction column will be sorted by number of running,
then by number of queued
- {
- "targets": [12],
- "type": "numeric",
- "orderData": [17, 18]
- }
],
"columns": [
{
@@ -95,13 +89,10 @@
{ "data": "holdTime", "orderSequence": ["desc", "asc"] },
{ "data": "scansCombo", "orderSequence": ["desc", "asc"] },
{ "data": "minorCombo", "orderSequence": ["desc", "asc"] },
- { "data": "majorCombo", "orderSequence": ["desc", "asc"] },
{ "data": "runningScans", "orderSequence": ["desc", "asc"],
"visible": false },
{ "data": "queuedScans", "orderSequence": ["desc", "asc"],
"visible": false},
{ "data": "runningMinorCompactions", "orderSequence": ["desc",
"asc"], "visible": false },
{ "data": "queuedMinorCompactions", "orderSequence": ["desc",
"asc"], "visible": false },
- { "data": "runningMajorCompactions", "orderSequence": ["desc",
"asc"], "visible": false },
- { "data": "queuedMajorCompactions", "orderSequence": ["desc",
"asc"], "visible": false }
]
});
});
@@ -139,7 +130,6 @@
<th title="The amount of time live ingest operations (mutations,
batch writes) have been waiting for the tserver to free up memory."
class="duration">Hold Time</th>
<th title="Running scans. The number queued waiting are in
parentheses.">Scans</th>
<th title="Minor Compactions. The number of tablets waiting for
compaction are in parentheses.">MinC</th>
- <th title="Major Compactions. The number of tablets waiting for
compaction are in parentheses.">MajC</th>
</tr>
</thead>
<tbody></tbody>
diff --git
a/server/monitor/src/main/resources/org/apache/accumulo/monitor/templates/tservers.ftl
b/server/monitor/src/main/resources/org/apache/accumulo/monitor/templates/tservers.ftl
index edb950315f..290fc0ce78 100644
---
a/server/monitor/src/main/resources/org/apache/accumulo/monitor/templates/tservers.ftl
+++
b/server/monitor/src/main/resources/org/apache/accumulo/monitor/templates/tservers.ftl
@@ -42,7 +42,6 @@
<th title="The amount of time live ingest operations (mutations,
batch writes) have been waiting for the tserver to free up memory."
class="duration">Hold Time </th>
<th title="Information about the scans threads. Shows how many
threads are running and how much work is queued for the threads.">Running<br
/>Scans </th>
<th title="The action of flushing memory to disk. Multiple
tablets can be compacted simultaneously, but sometimes they must wait for
resources to be available. The number of tablets waiting for compaction are in
parentheses.">Minor<br />Compactions </th>
- <th title="The action of gathering up many small files and
rewriting them as one larger file. The number of tablets waiting for compaction
are in parentheses.">Major<br />Compactions </th>
<th title="The recent index cache hit rate."
class="percent">Index Cache<br />Hit Rate </th>
<th title="The recent data cache hit rate." class="percent">Data
Cache<br />Hit Rate </th>
<th title="The Unix one minute load average. The average number
of processes in the run queue over a one minute
interval."class="big-num">OS Load </th>
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 6e9a6a34fd..43abdd6756 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, minor, null, 0, 0, 0);
+ return new TabletStats(null, minor, 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 81a389d451..38a3be8b30 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,
0L, 0., 0.);
+ TabletStats tstats = new TabletStats(extent.toThrift(), null, 0L,
0., 0.);
result.add(new TabletStatisticsImpl(tstats));
}
}
