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 69bb1f2c31 Remove TabletServerStatus.bulkImports (#3919)
69bb1f2c31 is described below
commit 69bb1f2c31dd67f9a128ad21e7350d251c16f8ff
Author: Dave Marion <dlmar...@apache.org>
AuthorDate: Thu Nov 2 16:33:06 2023 -0400
Remove TabletServerStatus.bulkImports (#3919)
---
.../accumulo/core/manager/thrift/FateService.java | 76 +++----
.../core/manager/thrift/ManagerClientService.java | 68 +++---
.../core/manager/thrift/ManagerMonitorInfo.java | 232 ++++++++++-----------
.../core/manager/thrift/TabletServerStatus.java | 222 +++-----------------
core/src/main/thrift/manager.thrift | 1 -
.../monitor/rest/bulkImports/BulkImport.java | 9 -
.../rest/bulkImports/BulkImportResource.java | 22 --
.../accumulo/monitor/resources/js/bulkImport.js | 37 +---
.../accumulo/monitor/templates/bulkImport.ftl | 15 --
.../rest/tservers/TabletServerInformationTest.java | 2 -
.../shell/commands/BulkImportListIterator.java | 13 +-
.../accumulo/shell/commands/ListBulkCommand.java | 15 +-
.../shell/commands/ListBulkCommandTest.java | 26 +--
13 files changed, 226 insertions(+), 512 deletions(-)
diff --git
a/core/src/main/thrift-gen-java/org/apache/accumulo/core/manager/thrift/FateService.java
b/core/src/main/thrift-gen-java/org/apache/accumulo/core/manager/thrift/FateService.java
index 89becfd2d4..cc16dd4a31 100644
---
a/core/src/main/thrift-gen-java/org/apache/accumulo/core/manager/thrift/FateService.java
+++
b/core/src/main/thrift-gen-java/org/apache/accumulo/core/manager/thrift/FateService.java
@@ -3040,13 +3040,13 @@ public class FateService {
case 5: // ARGUMENTS
if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
{
- org.apache.thrift.protocol.TList _list86 =
iprot.readListBegin();
- struct.arguments = new
java.util.ArrayList<java.nio.ByteBuffer>(_list86.size);
- @org.apache.thrift.annotation.Nullable java.nio.ByteBuffer
_elem87;
- for (int _i88 = 0; _i88 < _list86.size; ++_i88)
+ org.apache.thrift.protocol.TList _list78 =
iprot.readListBegin();
+ struct.arguments = new
java.util.ArrayList<java.nio.ByteBuffer>(_list78.size);
+ @org.apache.thrift.annotation.Nullable java.nio.ByteBuffer
_elem79;
+ for (int _i80 = 0; _i80 < _list78.size; ++_i80)
{
- _elem87 = iprot.readBinary();
- struct.arguments.add(_elem87);
+ _elem79 = iprot.readBinary();
+ struct.arguments.add(_elem79);
}
iprot.readListEnd();
}
@@ -3058,15 +3058,15 @@ public class FateService {
case 6: // OPTIONS
if (schemeField.type == org.apache.thrift.protocol.TType.MAP) {
{
- org.apache.thrift.protocol.TMap _map89 =
iprot.readMapBegin();
- struct.options = new
java.util.HashMap<java.lang.String,java.lang.String>(2*_map89.size);
- @org.apache.thrift.annotation.Nullable java.lang.String
_key90;
- @org.apache.thrift.annotation.Nullable java.lang.String
_val91;
- for (int _i92 = 0; _i92 < _map89.size; ++_i92)
+ org.apache.thrift.protocol.TMap _map81 =
iprot.readMapBegin();
+ struct.options = new
java.util.HashMap<java.lang.String,java.lang.String>(2*_map81.size);
+ @org.apache.thrift.annotation.Nullable java.lang.String
_key82;
+ @org.apache.thrift.annotation.Nullable java.lang.String
_val83;
+ for (int _i84 = 0; _i84 < _map81.size; ++_i84)
{
- _key90 = iprot.readString();
- _val91 = iprot.readString();
- struct.options.put(_key90, _val91);
+ _key82 = iprot.readString();
+ _val83 = iprot.readString();
+ struct.options.put(_key82, _val83);
}
iprot.readMapEnd();
}
@@ -3121,9 +3121,9 @@ public class FateService {
oprot.writeFieldBegin(ARGUMENTS_FIELD_DESC);
{
oprot.writeListBegin(new
org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING,
struct.arguments.size()));
- for (java.nio.ByteBuffer _iter93 : struct.arguments)
+ for (java.nio.ByteBuffer _iter85 : struct.arguments)
{
- oprot.writeBinary(_iter93);
+ oprot.writeBinary(_iter85);
}
oprot.writeListEnd();
}
@@ -3133,10 +3133,10 @@ public class FateService {
oprot.writeFieldBegin(OPTIONS_FIELD_DESC);
{
oprot.writeMapBegin(new
org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING,
org.apache.thrift.protocol.TType.STRING, struct.options.size()));
- for (java.util.Map.Entry<java.lang.String, java.lang.String>
_iter94 : struct.options.entrySet())
+ for (java.util.Map.Entry<java.lang.String, java.lang.String>
_iter86 : struct.options.entrySet())
{
- oprot.writeString(_iter94.getKey());
- oprot.writeString(_iter94.getValue());
+ oprot.writeString(_iter86.getKey());
+ oprot.writeString(_iter86.getValue());
}
oprot.writeMapEnd();
}
@@ -3201,19 +3201,19 @@ public class FateService {
if (struct.isSetArguments()) {
{
oprot.writeI32(struct.arguments.size());
- for (java.nio.ByteBuffer _iter95 : struct.arguments)
+ for (java.nio.ByteBuffer _iter87 : struct.arguments)
{
- oprot.writeBinary(_iter95);
+ oprot.writeBinary(_iter87);
}
}
}
if (struct.isSetOptions()) {
{
oprot.writeI32(struct.options.size());
- for (java.util.Map.Entry<java.lang.String, java.lang.String>
_iter96 : struct.options.entrySet())
+ for (java.util.Map.Entry<java.lang.String, java.lang.String>
_iter88 : struct.options.entrySet())
{
- oprot.writeString(_iter96.getKey());
- oprot.writeString(_iter96.getValue());
+ oprot.writeString(_iter88.getKey());
+ oprot.writeString(_iter88.getValue());
}
}
}
@@ -3246,28 +3246,28 @@ public class FateService {
}
if (incoming.get(4)) {
{
- org.apache.thrift.protocol.TList _list97 =
iprot.readListBegin(org.apache.thrift.protocol.TType.STRING);
- struct.arguments = new
java.util.ArrayList<java.nio.ByteBuffer>(_list97.size);
- @org.apache.thrift.annotation.Nullable java.nio.ByteBuffer _elem98;
- for (int _i99 = 0; _i99 < _list97.size; ++_i99)
+ org.apache.thrift.protocol.TList _list89 =
iprot.readListBegin(org.apache.thrift.protocol.TType.STRING);
+ struct.arguments = new
java.util.ArrayList<java.nio.ByteBuffer>(_list89.size);
+ @org.apache.thrift.annotation.Nullable java.nio.ByteBuffer _elem90;
+ for (int _i91 = 0; _i91 < _list89.size; ++_i91)
{
- _elem98 = iprot.readBinary();
- struct.arguments.add(_elem98);
+ _elem90 = iprot.readBinary();
+ struct.arguments.add(_elem90);
}
}
struct.setArgumentsIsSet(true);
}
if (incoming.get(5)) {
{
- org.apache.thrift.protocol.TMap _map100 =
iprot.readMapBegin(org.apache.thrift.protocol.TType.STRING,
org.apache.thrift.protocol.TType.STRING);
- struct.options = new
java.util.HashMap<java.lang.String,java.lang.String>(2*_map100.size);
- @org.apache.thrift.annotation.Nullable java.lang.String _key101;
- @org.apache.thrift.annotation.Nullable java.lang.String _val102;
- for (int _i103 = 0; _i103 < _map100.size; ++_i103)
+ org.apache.thrift.protocol.TMap _map92 =
iprot.readMapBegin(org.apache.thrift.protocol.TType.STRING,
org.apache.thrift.protocol.TType.STRING);
+ struct.options = new
java.util.HashMap<java.lang.String,java.lang.String>(2*_map92.size);
+ @org.apache.thrift.annotation.Nullable java.lang.String _key93;
+ @org.apache.thrift.annotation.Nullable java.lang.String _val94;
+ for (int _i95 = 0; _i95 < _map92.size; ++_i95)
{
- _key101 = iprot.readString();
- _val102 = iprot.readString();
- struct.options.put(_key101, _val102);
+ _key93 = iprot.readString();
+ _val94 = iprot.readString();
+ struct.options.put(_key93, _val94);
}
}
struct.setOptionsIsSet(true);
diff --git
a/core/src/main/thrift-gen-java/org/apache/accumulo/core/manager/thrift/ManagerClientService.java
b/core/src/main/thrift-gen-java/org/apache/accumulo/core/manager/thrift/ManagerClientService.java
index 15f5bd8ef6..621d35dff5 100644
---
a/core/src/main/thrift-gen-java/org/apache/accumulo/core/manager/thrift/ManagerClientService.java
+++
b/core/src/main/thrift-gen-java/org/apache/accumulo/core/manager/thrift/ManagerClientService.java
@@ -26145,13 +26145,13 @@ public class ManagerClientService {
case 0: // SUCCESS
if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
{
- org.apache.thrift.protocol.TList _list104 =
iprot.readListBegin();
- struct.success = new
java.util.ArrayList<java.lang.String>(_list104.size);
- @org.apache.thrift.annotation.Nullable java.lang.String
_elem105;
- for (int _i106 = 0; _i106 < _list104.size; ++_i106)
+ org.apache.thrift.protocol.TList _list96 =
iprot.readListBegin();
+ struct.success = new
java.util.ArrayList<java.lang.String>(_list96.size);
+ @org.apache.thrift.annotation.Nullable java.lang.String
_elem97;
+ for (int _i98 = 0; _i98 < _list96.size; ++_i98)
{
- _elem105 = iprot.readString();
- struct.success.add(_elem105);
+ _elem97 = iprot.readString();
+ struct.success.add(_elem97);
}
iprot.readListEnd();
}
@@ -26198,9 +26198,9 @@ public class ManagerClientService {
oprot.writeFieldBegin(SUCCESS_FIELD_DESC);
{
oprot.writeListBegin(new
org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING,
struct.success.size()));
- for (java.lang.String _iter107 : struct.success)
+ for (java.lang.String _iter99 : struct.success)
{
- oprot.writeString(_iter107);
+ oprot.writeString(_iter99);
}
oprot.writeListEnd();
}
@@ -26248,9 +26248,9 @@ public class ManagerClientService {
if (struct.isSetSuccess()) {
{
oprot.writeI32(struct.success.size());
- for (java.lang.String _iter108 : struct.success)
+ for (java.lang.String _iter100 : struct.success)
{
- oprot.writeString(_iter108);
+ oprot.writeString(_iter100);
}
}
}
@@ -26268,13 +26268,13 @@ public class ManagerClientService {
java.util.BitSet incoming = iprot.readBitSet(3);
if (incoming.get(0)) {
{
- org.apache.thrift.protocol.TList _list109 =
iprot.readListBegin(org.apache.thrift.protocol.TType.STRING);
- struct.success = new
java.util.ArrayList<java.lang.String>(_list109.size);
- @org.apache.thrift.annotation.Nullable java.lang.String _elem110;
- for (int _i111 = 0; _i111 < _list109.size; ++_i111)
+ org.apache.thrift.protocol.TList _list101 =
iprot.readListBegin(org.apache.thrift.protocol.TType.STRING);
+ struct.success = new
java.util.ArrayList<java.lang.String>(_list101.size);
+ @org.apache.thrift.annotation.Nullable java.lang.String _elem102;
+ for (int _i103 = 0; _i103 < _list101.size; ++_i103)
{
- _elem110 = iprot.readString();
- struct.success.add(_elem110);
+ _elem102 = iprot.readString();
+ struct.success.add(_elem102);
}
}
struct.setSuccessIsSet(true);
@@ -28106,14 +28106,14 @@ public class ManagerClientService {
case 4: // EXTENTS
if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
{
- org.apache.thrift.protocol.TList _list112 =
iprot.readListBegin();
- struct.extents = new
java.util.ArrayList<org.apache.accumulo.core.dataImpl.thrift.TKeyExtent>(_list112.size);
- @org.apache.thrift.annotation.Nullable
org.apache.accumulo.core.dataImpl.thrift.TKeyExtent _elem113;
- for (int _i114 = 0; _i114 < _list112.size; ++_i114)
+ org.apache.thrift.protocol.TList _list104 =
iprot.readListBegin();
+ struct.extents = new
java.util.ArrayList<org.apache.accumulo.core.dataImpl.thrift.TKeyExtent>(_list104.size);
+ @org.apache.thrift.annotation.Nullable
org.apache.accumulo.core.dataImpl.thrift.TKeyExtent _elem105;
+ for (int _i106 = 0; _i106 < _list104.size; ++_i106)
{
- _elem113 = new
org.apache.accumulo.core.dataImpl.thrift.TKeyExtent();
- _elem113.read(iprot);
- struct.extents.add(_elem113);
+ _elem105 = new
org.apache.accumulo.core.dataImpl.thrift.TKeyExtent();
+ _elem105.read(iprot);
+ struct.extents.add(_elem105);
}
iprot.readListEnd();
}
@@ -28157,9 +28157,9 @@ public class ManagerClientService {
oprot.writeFieldBegin(EXTENTS_FIELD_DESC);
{
oprot.writeListBegin(new
org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT,
struct.extents.size()));
- for (org.apache.accumulo.core.dataImpl.thrift.TKeyExtent _iter115
: struct.extents)
+ for (org.apache.accumulo.core.dataImpl.thrift.TKeyExtent _iter107
: struct.extents)
{
- _iter115.write(oprot);
+ _iter107.write(oprot);
}
oprot.writeListEnd();
}
@@ -28209,9 +28209,9 @@ public class ManagerClientService {
if (struct.isSetExtents()) {
{
oprot.writeI32(struct.extents.size());
- for (org.apache.accumulo.core.dataImpl.thrift.TKeyExtent _iter116
: struct.extents)
+ for (org.apache.accumulo.core.dataImpl.thrift.TKeyExtent _iter108
: struct.extents)
{
- _iter116.write(oprot);
+ _iter108.write(oprot);
}
}
}
@@ -28237,14 +28237,14 @@ public class ManagerClientService {
}
if (incoming.get(3)) {
{
- org.apache.thrift.protocol.TList _list117 =
iprot.readListBegin(org.apache.thrift.protocol.TType.STRUCT);
- struct.extents = new
java.util.ArrayList<org.apache.accumulo.core.dataImpl.thrift.TKeyExtent>(_list117.size);
- @org.apache.thrift.annotation.Nullable
org.apache.accumulo.core.dataImpl.thrift.TKeyExtent _elem118;
- for (int _i119 = 0; _i119 < _list117.size; ++_i119)
+ org.apache.thrift.protocol.TList _list109 =
iprot.readListBegin(org.apache.thrift.protocol.TType.STRUCT);
+ struct.extents = new
java.util.ArrayList<org.apache.accumulo.core.dataImpl.thrift.TKeyExtent>(_list109.size);
+ @org.apache.thrift.annotation.Nullable
org.apache.accumulo.core.dataImpl.thrift.TKeyExtent _elem110;
+ for (int _i111 = 0; _i111 < _list109.size; ++_i111)
{
- _elem118 = new
org.apache.accumulo.core.dataImpl.thrift.TKeyExtent();
- _elem118.read(iprot);
- struct.extents.add(_elem118);
+ _elem110 = new
org.apache.accumulo.core.dataImpl.thrift.TKeyExtent();
+ _elem110.read(iprot);
+ struct.extents.add(_elem110);
}
}
struct.setExtentsIsSet(true);
diff --git
a/core/src/main/thrift-gen-java/org/apache/accumulo/core/manager/thrift/ManagerMonitorInfo.java
b/core/src/main/thrift-gen-java/org/apache/accumulo/core/manager/thrift/ManagerMonitorInfo.java
index bd7eda3a8b..66a43f5c6b 100644
---
a/core/src/main/thrift-gen-java/org/apache/accumulo/core/manager/thrift/ManagerMonitorInfo.java
+++
b/core/src/main/thrift-gen-java/org/apache/accumulo/core/manager/thrift/ManagerMonitorInfo.java
@@ -1138,16 +1138,16 @@ public class ManagerMonitorInfo implements
org.apache.thrift.TBase<ManagerMonito
case 1: // TABLE_MAP
if (schemeField.type == org.apache.thrift.protocol.TType.MAP) {
{
- org.apache.thrift.protocol.TMap _map34 = iprot.readMapBegin();
- struct.tableMap = new
java.util.HashMap<java.lang.String,TableInfo>(2*_map34.size);
- @org.apache.thrift.annotation.Nullable java.lang.String _key35;
- @org.apache.thrift.annotation.Nullable TableInfo _val36;
- for (int _i37 = 0; _i37 < _map34.size; ++_i37)
+ org.apache.thrift.protocol.TMap _map26 = iprot.readMapBegin();
+ struct.tableMap = new
java.util.HashMap<java.lang.String,TableInfo>(2*_map26.size);
+ @org.apache.thrift.annotation.Nullable java.lang.String _key27;
+ @org.apache.thrift.annotation.Nullable TableInfo _val28;
+ for (int _i29 = 0; _i29 < _map26.size; ++_i29)
{
- _key35 = iprot.readString();
- _val36 = new TableInfo();
- _val36.read(iprot);
- struct.tableMap.put(_key35, _val36);
+ _key27 = iprot.readString();
+ _val28 = new TableInfo();
+ _val28.read(iprot);
+ struct.tableMap.put(_key27, _val28);
}
iprot.readMapEnd();
}
@@ -1159,14 +1159,14 @@ public class ManagerMonitorInfo implements
org.apache.thrift.TBase<ManagerMonito
case 2: // T_SERVER_INFO
if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
{
- org.apache.thrift.protocol.TList _list38 =
iprot.readListBegin();
- struct.tServerInfo = new
java.util.ArrayList<TabletServerStatus>(_list38.size);
- @org.apache.thrift.annotation.Nullable TabletServerStatus
_elem39;
- for (int _i40 = 0; _i40 < _list38.size; ++_i40)
+ org.apache.thrift.protocol.TList _list30 =
iprot.readListBegin();
+ struct.tServerInfo = new
java.util.ArrayList<TabletServerStatus>(_list30.size);
+ @org.apache.thrift.annotation.Nullable TabletServerStatus
_elem31;
+ for (int _i32 = 0; _i32 < _list30.size; ++_i32)
{
- _elem39 = new TabletServerStatus();
- _elem39.read(iprot);
- struct.tServerInfo.add(_elem39);
+ _elem31 = new TabletServerStatus();
+ _elem31.read(iprot);
+ struct.tServerInfo.add(_elem31);
}
iprot.readListEnd();
}
@@ -1178,15 +1178,15 @@ public class ManagerMonitorInfo implements
org.apache.thrift.TBase<ManagerMonito
case 3: // BAD_TSERVERS
if (schemeField.type == org.apache.thrift.protocol.TType.MAP) {
{
- org.apache.thrift.protocol.TMap _map41 = iprot.readMapBegin();
- struct.badTServers = new
java.util.HashMap<java.lang.String,java.lang.Byte>(2*_map41.size);
- @org.apache.thrift.annotation.Nullable java.lang.String _key42;
- byte _val43;
- for (int _i44 = 0; _i44 < _map41.size; ++_i44)
+ org.apache.thrift.protocol.TMap _map33 = iprot.readMapBegin();
+ struct.badTServers = new
java.util.HashMap<java.lang.String,java.lang.Byte>(2*_map33.size);
+ @org.apache.thrift.annotation.Nullable java.lang.String _key34;
+ byte _val35;
+ for (int _i36 = 0; _i36 < _map33.size; ++_i36)
{
- _key42 = iprot.readString();
- _val43 = iprot.readByte();
- struct.badTServers.put(_key42, _val43);
+ _key34 = iprot.readString();
+ _val35 = iprot.readByte();
+ struct.badTServers.put(_key34, _val35);
}
iprot.readMapEnd();
}
@@ -1222,13 +1222,13 @@ public class ManagerMonitorInfo implements
org.apache.thrift.TBase<ManagerMonito
case 7: // SERVERS_SHUTTING_DOWN
if (schemeField.type == org.apache.thrift.protocol.TType.SET) {
{
- org.apache.thrift.protocol.TSet _set45 = iprot.readSetBegin();
- struct.serversShuttingDown = new
java.util.HashSet<java.lang.String>(2*_set45.size);
- @org.apache.thrift.annotation.Nullable java.lang.String
_elem46;
- for (int _i47 = 0; _i47 < _set45.size; ++_i47)
+ org.apache.thrift.protocol.TSet _set37 = iprot.readSetBegin();
+ struct.serversShuttingDown = new
java.util.HashSet<java.lang.String>(2*_set37.size);
+ @org.apache.thrift.annotation.Nullable java.lang.String
_elem38;
+ for (int _i39 = 0; _i39 < _set37.size; ++_i39)
{
- _elem46 = iprot.readString();
- struct.serversShuttingDown.add(_elem46);
+ _elem38 = iprot.readString();
+ struct.serversShuttingDown.add(_elem38);
}
iprot.readSetEnd();
}
@@ -1240,14 +1240,14 @@ public class ManagerMonitorInfo implements
org.apache.thrift.TBase<ManagerMonito
case 8: // DEAD_TABLET_SERVERS
if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
{
- org.apache.thrift.protocol.TList _list48 =
iprot.readListBegin();
- struct.deadTabletServers = new
java.util.ArrayList<DeadServer>(_list48.size);
- @org.apache.thrift.annotation.Nullable DeadServer _elem49;
- for (int _i50 = 0; _i50 < _list48.size; ++_i50)
+ org.apache.thrift.protocol.TList _list40 =
iprot.readListBegin();
+ struct.deadTabletServers = new
java.util.ArrayList<DeadServer>(_list40.size);
+ @org.apache.thrift.annotation.Nullable DeadServer _elem41;
+ for (int _i42 = 0; _i42 < _list40.size; ++_i42)
{
- _elem49 = new DeadServer();
- _elem49.read(iprot);
- struct.deadTabletServers.add(_elem49);
+ _elem41 = new DeadServer();
+ _elem41.read(iprot);
+ struct.deadTabletServers.add(_elem41);
}
iprot.readListEnd();
}
@@ -1259,14 +1259,14 @@ public class ManagerMonitorInfo implements
org.apache.thrift.TBase<ManagerMonito
case 9: // BULK_IMPORTS
if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
{
- org.apache.thrift.protocol.TList _list51 =
iprot.readListBegin();
- struct.bulkImports = new
java.util.ArrayList<BulkImportStatus>(_list51.size);
- @org.apache.thrift.annotation.Nullable BulkImportStatus
_elem52;
- for (int _i53 = 0; _i53 < _list51.size; ++_i53)
+ org.apache.thrift.protocol.TList _list43 =
iprot.readListBegin();
+ struct.bulkImports = new
java.util.ArrayList<BulkImportStatus>(_list43.size);
+ @org.apache.thrift.annotation.Nullable BulkImportStatus
_elem44;
+ for (int _i45 = 0; _i45 < _list43.size; ++_i45)
{
- _elem52 = new BulkImportStatus();
- _elem52.read(iprot);
- struct.bulkImports.add(_elem52);
+ _elem44 = new BulkImportStatus();
+ _elem44.read(iprot);
+ struct.bulkImports.add(_elem44);
}
iprot.readListEnd();
}
@@ -1295,10 +1295,10 @@ public class ManagerMonitorInfo implements
org.apache.thrift.TBase<ManagerMonito
oprot.writeFieldBegin(TABLE_MAP_FIELD_DESC);
{
oprot.writeMapBegin(new
org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING,
org.apache.thrift.protocol.TType.STRUCT, struct.tableMap.size()));
- for (java.util.Map.Entry<java.lang.String, TableInfo> _iter54 :
struct.tableMap.entrySet())
+ for (java.util.Map.Entry<java.lang.String, TableInfo> _iter46 :
struct.tableMap.entrySet())
{
- oprot.writeString(_iter54.getKey());
- _iter54.getValue().write(oprot);
+ oprot.writeString(_iter46.getKey());
+ _iter46.getValue().write(oprot);
}
oprot.writeMapEnd();
}
@@ -1308,9 +1308,9 @@ public class ManagerMonitorInfo implements
org.apache.thrift.TBase<ManagerMonito
oprot.writeFieldBegin(T_SERVER_INFO_FIELD_DESC);
{
oprot.writeListBegin(new
org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT,
struct.tServerInfo.size()));
- for (TabletServerStatus _iter55 : struct.tServerInfo)
+ for (TabletServerStatus _iter47 : struct.tServerInfo)
{
- _iter55.write(oprot);
+ _iter47.write(oprot);
}
oprot.writeListEnd();
}
@@ -1320,10 +1320,10 @@ public class ManagerMonitorInfo implements
org.apache.thrift.TBase<ManagerMonito
oprot.writeFieldBegin(BAD_TSERVERS_FIELD_DESC);
{
oprot.writeMapBegin(new
org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING,
org.apache.thrift.protocol.TType.BYTE, struct.badTServers.size()));
- for (java.util.Map.Entry<java.lang.String, java.lang.Byte> _iter56 :
struct.badTServers.entrySet())
+ for (java.util.Map.Entry<java.lang.String, java.lang.Byte> _iter48 :
struct.badTServers.entrySet())
{
- oprot.writeString(_iter56.getKey());
- oprot.writeByte(_iter56.getValue());
+ oprot.writeString(_iter48.getKey());
+ oprot.writeByte(_iter48.getValue());
}
oprot.writeMapEnd();
}
@@ -1346,9 +1346,9 @@ public class ManagerMonitorInfo implements
org.apache.thrift.TBase<ManagerMonito
oprot.writeFieldBegin(SERVERS_SHUTTING_DOWN_FIELD_DESC);
{
oprot.writeSetBegin(new
org.apache.thrift.protocol.TSet(org.apache.thrift.protocol.TType.STRING,
struct.serversShuttingDown.size()));
- for (java.lang.String _iter57 : struct.serversShuttingDown)
+ for (java.lang.String _iter49 : struct.serversShuttingDown)
{
- oprot.writeString(_iter57);
+ oprot.writeString(_iter49);
}
oprot.writeSetEnd();
}
@@ -1358,9 +1358,9 @@ public class ManagerMonitorInfo implements
org.apache.thrift.TBase<ManagerMonito
oprot.writeFieldBegin(DEAD_TABLET_SERVERS_FIELD_DESC);
{
oprot.writeListBegin(new
org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT,
struct.deadTabletServers.size()));
- for (DeadServer _iter58 : struct.deadTabletServers)
+ for (DeadServer _iter50 : struct.deadTabletServers)
{
- _iter58.write(oprot);
+ _iter50.write(oprot);
}
oprot.writeListEnd();
}
@@ -1370,9 +1370,9 @@ public class ManagerMonitorInfo implements
org.apache.thrift.TBase<ManagerMonito
oprot.writeFieldBegin(BULK_IMPORTS_FIELD_DESC);
{
oprot.writeListBegin(new
org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT,
struct.bulkImports.size()));
- for (BulkImportStatus _iter59 : struct.bulkImports)
+ for (BulkImportStatus _iter51 : struct.bulkImports)
{
- _iter59.write(oprot);
+ _iter51.write(oprot);
}
oprot.writeListEnd();
}
@@ -1428,29 +1428,29 @@ public class ManagerMonitorInfo implements
org.apache.thrift.TBase<ManagerMonito
if (struct.isSetTableMap()) {
{
oprot.writeI32(struct.tableMap.size());
- for (java.util.Map.Entry<java.lang.String, TableInfo> _iter60 :
struct.tableMap.entrySet())
+ for (java.util.Map.Entry<java.lang.String, TableInfo> _iter52 :
struct.tableMap.entrySet())
{
- oprot.writeString(_iter60.getKey());
- _iter60.getValue().write(oprot);
+ oprot.writeString(_iter52.getKey());
+ _iter52.getValue().write(oprot);
}
}
}
if (struct.isSetTServerInfo()) {
{
oprot.writeI32(struct.tServerInfo.size());
- for (TabletServerStatus _iter61 : struct.tServerInfo)
+ for (TabletServerStatus _iter53 : struct.tServerInfo)
{
- _iter61.write(oprot);
+ _iter53.write(oprot);
}
}
}
if (struct.isSetBadTServers()) {
{
oprot.writeI32(struct.badTServers.size());
- for (java.util.Map.Entry<java.lang.String, java.lang.Byte> _iter62 :
struct.badTServers.entrySet())
+ for (java.util.Map.Entry<java.lang.String, java.lang.Byte> _iter54 :
struct.badTServers.entrySet())
{
- oprot.writeString(_iter62.getKey());
- oprot.writeByte(_iter62.getValue());
+ oprot.writeString(_iter54.getKey());
+ oprot.writeByte(_iter54.getValue());
}
}
}
@@ -1466,27 +1466,27 @@ public class ManagerMonitorInfo implements
org.apache.thrift.TBase<ManagerMonito
if (struct.isSetServersShuttingDown()) {
{
oprot.writeI32(struct.serversShuttingDown.size());
- for (java.lang.String _iter63 : struct.serversShuttingDown)
+ for (java.lang.String _iter55 : struct.serversShuttingDown)
{
- oprot.writeString(_iter63);
+ oprot.writeString(_iter55);
}
}
}
if (struct.isSetDeadTabletServers()) {
{
oprot.writeI32(struct.deadTabletServers.size());
- for (DeadServer _iter64 : struct.deadTabletServers)
+ for (DeadServer _iter56 : struct.deadTabletServers)
{
- _iter64.write(oprot);
+ _iter56.write(oprot);
}
}
}
if (struct.isSetBulkImports()) {
{
oprot.writeI32(struct.bulkImports.size());
- for (BulkImportStatus _iter65 : struct.bulkImports)
+ for (BulkImportStatus _iter57 : struct.bulkImports)
{
- _iter65.write(oprot);
+ _iter57.write(oprot);
}
}
}
@@ -1498,45 +1498,45 @@ public class ManagerMonitorInfo implements
org.apache.thrift.TBase<ManagerMonito
java.util.BitSet incoming = iprot.readBitSet(9);
if (incoming.get(0)) {
{
- org.apache.thrift.protocol.TMap _map66 =
iprot.readMapBegin(org.apache.thrift.protocol.TType.STRING,
org.apache.thrift.protocol.TType.STRUCT);
- struct.tableMap = new
java.util.HashMap<java.lang.String,TableInfo>(2*_map66.size);
- @org.apache.thrift.annotation.Nullable java.lang.String _key67;
- @org.apache.thrift.annotation.Nullable TableInfo _val68;
- for (int _i69 = 0; _i69 < _map66.size; ++_i69)
+ org.apache.thrift.protocol.TMap _map58 =
iprot.readMapBegin(org.apache.thrift.protocol.TType.STRING,
org.apache.thrift.protocol.TType.STRUCT);
+ struct.tableMap = new
java.util.HashMap<java.lang.String,TableInfo>(2*_map58.size);
+ @org.apache.thrift.annotation.Nullable java.lang.String _key59;
+ @org.apache.thrift.annotation.Nullable TableInfo _val60;
+ for (int _i61 = 0; _i61 < _map58.size; ++_i61)
{
- _key67 = iprot.readString();
- _val68 = new TableInfo();
- _val68.read(iprot);
- struct.tableMap.put(_key67, _val68);
+ _key59 = iprot.readString();
+ _val60 = new TableInfo();
+ _val60.read(iprot);
+ struct.tableMap.put(_key59, _val60);
}
}
struct.setTableMapIsSet(true);
}
if (incoming.get(1)) {
{
- org.apache.thrift.protocol.TList _list70 =
iprot.readListBegin(org.apache.thrift.protocol.TType.STRUCT);
- struct.tServerInfo = new
java.util.ArrayList<TabletServerStatus>(_list70.size);
- @org.apache.thrift.annotation.Nullable TabletServerStatus _elem71;
- for (int _i72 = 0; _i72 < _list70.size; ++_i72)
+ org.apache.thrift.protocol.TList _list62 =
iprot.readListBegin(org.apache.thrift.protocol.TType.STRUCT);
+ struct.tServerInfo = new
java.util.ArrayList<TabletServerStatus>(_list62.size);
+ @org.apache.thrift.annotation.Nullable TabletServerStatus _elem63;
+ for (int _i64 = 0; _i64 < _list62.size; ++_i64)
{
- _elem71 = new TabletServerStatus();
- _elem71.read(iprot);
- struct.tServerInfo.add(_elem71);
+ _elem63 = new TabletServerStatus();
+ _elem63.read(iprot);
+ struct.tServerInfo.add(_elem63);
}
}
struct.setTServerInfoIsSet(true);
}
if (incoming.get(2)) {
{
- org.apache.thrift.protocol.TMap _map73 =
iprot.readMapBegin(org.apache.thrift.protocol.TType.STRING,
org.apache.thrift.protocol.TType.BYTE);
- struct.badTServers = new
java.util.HashMap<java.lang.String,java.lang.Byte>(2*_map73.size);
- @org.apache.thrift.annotation.Nullable java.lang.String _key74;
- byte _val75;
- for (int _i76 = 0; _i76 < _map73.size; ++_i76)
+ org.apache.thrift.protocol.TMap _map65 =
iprot.readMapBegin(org.apache.thrift.protocol.TType.STRING,
org.apache.thrift.protocol.TType.BYTE);
+ struct.badTServers = new
java.util.HashMap<java.lang.String,java.lang.Byte>(2*_map65.size);
+ @org.apache.thrift.annotation.Nullable java.lang.String _key66;
+ byte _val67;
+ for (int _i68 = 0; _i68 < _map65.size; ++_i68)
{
- _key74 = iprot.readString();
- _val75 = iprot.readByte();
- struct.badTServers.put(_key74, _val75);
+ _key66 = iprot.readString();
+ _val67 = iprot.readByte();
+ struct.badTServers.put(_key66, _val67);
}
}
struct.setBadTServersIsSet(true);
@@ -1555,41 +1555,41 @@ public class ManagerMonitorInfo implements
org.apache.thrift.TBase<ManagerMonito
}
if (incoming.get(6)) {
{
- org.apache.thrift.protocol.TSet _set77 =
iprot.readSetBegin(org.apache.thrift.protocol.TType.STRING);
- struct.serversShuttingDown = new
java.util.HashSet<java.lang.String>(2*_set77.size);
- @org.apache.thrift.annotation.Nullable java.lang.String _elem78;
- for (int _i79 = 0; _i79 < _set77.size; ++_i79)
+ org.apache.thrift.protocol.TSet _set69 =
iprot.readSetBegin(org.apache.thrift.protocol.TType.STRING);
+ struct.serversShuttingDown = new
java.util.HashSet<java.lang.String>(2*_set69.size);
+ @org.apache.thrift.annotation.Nullable java.lang.String _elem70;
+ for (int _i71 = 0; _i71 < _set69.size; ++_i71)
{
- _elem78 = iprot.readString();
- struct.serversShuttingDown.add(_elem78);
+ _elem70 = iprot.readString();
+ struct.serversShuttingDown.add(_elem70);
}
}
struct.setServersShuttingDownIsSet(true);
}
if (incoming.get(7)) {
{
- org.apache.thrift.protocol.TList _list80 =
iprot.readListBegin(org.apache.thrift.protocol.TType.STRUCT);
- struct.deadTabletServers = new
java.util.ArrayList<DeadServer>(_list80.size);
- @org.apache.thrift.annotation.Nullable DeadServer _elem81;
- for (int _i82 = 0; _i82 < _list80.size; ++_i82)
+ org.apache.thrift.protocol.TList _list72 =
iprot.readListBegin(org.apache.thrift.protocol.TType.STRUCT);
+ struct.deadTabletServers = new
java.util.ArrayList<DeadServer>(_list72.size);
+ @org.apache.thrift.annotation.Nullable DeadServer _elem73;
+ for (int _i74 = 0; _i74 < _list72.size; ++_i74)
{
- _elem81 = new DeadServer();
- _elem81.read(iprot);
- struct.deadTabletServers.add(_elem81);
+ _elem73 = new DeadServer();
+ _elem73.read(iprot);
+ struct.deadTabletServers.add(_elem73);
}
}
struct.setDeadTabletServersIsSet(true);
}
if (incoming.get(8)) {
{
- org.apache.thrift.protocol.TList _list83 =
iprot.readListBegin(org.apache.thrift.protocol.TType.STRUCT);
- struct.bulkImports = new
java.util.ArrayList<BulkImportStatus>(_list83.size);
- @org.apache.thrift.annotation.Nullable BulkImportStatus _elem84;
- for (int _i85 = 0; _i85 < _list83.size; ++_i85)
+ org.apache.thrift.protocol.TList _list75 =
iprot.readListBegin(org.apache.thrift.protocol.TType.STRUCT);
+ struct.bulkImports = new
java.util.ArrayList<BulkImportStatus>(_list75.size);
+ @org.apache.thrift.annotation.Nullable BulkImportStatus _elem76;
+ for (int _i77 = 0; _i77 < _list75.size; ++_i77)
{
- _elem84 = new BulkImportStatus();
- _elem84.read(iprot);
- struct.bulkImports.add(_elem84);
+ _elem76 = new BulkImportStatus();
+ _elem76.read(iprot);
+ struct.bulkImports.add(_elem76);
}
}
struct.setBulkImportsIsSet(true);
diff --git
a/core/src/main/thrift-gen-java/org/apache/accumulo/core/manager/thrift/TabletServerStatus.java
b/core/src/main/thrift-gen-java/org/apache/accumulo/core/manager/thrift/TabletServerStatus.java
index 36bf8311c0..71f34e20e8 100644
---
a/core/src/main/thrift-gen-java/org/apache/accumulo/core/manager/thrift/TabletServerStatus.java
+++
b/core/src/main/thrift-gen-java/org/apache/accumulo/core/manager/thrift/TabletServerStatus.java
@@ -41,7 +41,6 @@ public class TabletServerStatus implements
org.apache.thrift.TBase<TabletServerS
private static final org.apache.thrift.protocol.TField LOG_SORTS_FIELD_DESC
= new org.apache.thrift.protocol.TField("logSorts",
org.apache.thrift.protocol.TType.LIST, (short)14);
private static final org.apache.thrift.protocol.TField FLUSHS_FIELD_DESC =
new org.apache.thrift.protocol.TField("flushs",
org.apache.thrift.protocol.TType.I64, (short)15);
private static final org.apache.thrift.protocol.TField SYNCS_FIELD_DESC =
new org.apache.thrift.protocol.TField("syncs",
org.apache.thrift.protocol.TType.I64, (short)16);
- private static final org.apache.thrift.protocol.TField
BULK_IMPORTS_FIELD_DESC = new org.apache.thrift.protocol.TField("bulkImports",
org.apache.thrift.protocol.TType.LIST, (short)17);
private static final org.apache.thrift.protocol.TField VERSION_FIELD_DESC =
new org.apache.thrift.protocol.TField("version",
org.apache.thrift.protocol.TType.STRING, (short)19);
private static final org.apache.thrift.protocol.TField
RESPONSE_TIME_FIELD_DESC = new
org.apache.thrift.protocol.TField("responseTime",
org.apache.thrift.protocol.TType.I64, (short)18);
@@ -61,7 +60,6 @@ public class TabletServerStatus implements
org.apache.thrift.TBase<TabletServerS
public @org.apache.thrift.annotation.Nullable java.util.List<RecoveryStatus>
logSorts; // required
public long flushs; // required
public long syncs; // required
- public @org.apache.thrift.annotation.Nullable
java.util.List<BulkImportStatus> bulkImports; // required
public @org.apache.thrift.annotation.Nullable java.lang.String version; //
required
public long responseTime; // required
@@ -80,7 +78,6 @@ public class TabletServerStatus implements
org.apache.thrift.TBase<TabletServerS
LOG_SORTS((short)14, "logSorts"),
FLUSHS((short)15, "flushs"),
SYNCS((short)16, "syncs"),
- BULK_IMPORTS((short)17, "bulkImports"),
VERSION((short)19, "version"),
RESPONSE_TIME((short)18, "responseTime");
@@ -124,8 +121,6 @@ public class TabletServerStatus implements
org.apache.thrift.TBase<TabletServerS
return FLUSHS;
case 16: // SYNCS
return SYNCS;
- case 17: // BULK_IMPORTS
- return BULK_IMPORTS;
case 19: // VERSION
return VERSION;
case 18: // RESPONSE_TIME
@@ -217,9 +212,6 @@ public class TabletServerStatus implements
org.apache.thrift.TBase<TabletServerS
new
org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I64)));
tmpMap.put(_Fields.SYNCS, new
org.apache.thrift.meta_data.FieldMetaData("syncs",
org.apache.thrift.TFieldRequirementType.DEFAULT,
new
org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I64)));
- tmpMap.put(_Fields.BULK_IMPORTS, new
org.apache.thrift.meta_data.FieldMetaData("bulkImports",
org.apache.thrift.TFieldRequirementType.DEFAULT,
- new
org.apache.thrift.meta_data.ListMetaData(org.apache.thrift.protocol.TType.LIST,
- new
org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT,
BulkImportStatus.class))));
tmpMap.put(_Fields.VERSION, new
org.apache.thrift.meta_data.FieldMetaData("version",
org.apache.thrift.TFieldRequirementType.DEFAULT,
new
org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
tmpMap.put(_Fields.RESPONSE_TIME, new
org.apache.thrift.meta_data.FieldMetaData("responseTime",
org.apache.thrift.TFieldRequirementType.DEFAULT,
@@ -245,7 +237,6 @@ public class TabletServerStatus implements
org.apache.thrift.TBase<TabletServerS
java.util.List<RecoveryStatus> logSorts,
long flushs,
long syncs,
- java.util.List<BulkImportStatus> bulkImports,
java.lang.String version,
long responseTime)
{
@@ -273,7 +264,6 @@ public class TabletServerStatus implements
org.apache.thrift.TBase<TabletServerS
setFlushsIsSet(true);
this.syncs = syncs;
setSyncsIsSet(true);
- this.bulkImports = bulkImports;
this.version = version;
this.responseTime = responseTime;
setResponseTimeIsSet(true);
@@ -319,13 +309,6 @@ public class TabletServerStatus implements
org.apache.thrift.TBase<TabletServerS
}
this.flushs = other.flushs;
this.syncs = other.syncs;
- if (other.isSetBulkImports()) {
- java.util.List<BulkImportStatus> __this__bulkImports = new
java.util.ArrayList<BulkImportStatus>(other.bulkImports.size());
- for (BulkImportStatus other_element : other.bulkImports) {
- __this__bulkImports.add(new BulkImportStatus(other_element));
- }
- this.bulkImports = __this__bulkImports;
- }
if (other.isSetVersion()) {
this.version = other.version;
}
@@ -362,7 +345,6 @@ public class TabletServerStatus implements
org.apache.thrift.TBase<TabletServerS
this.flushs = 0;
setSyncsIsSet(false);
this.syncs = 0;
- this.bulkImports = null;
this.version = null;
setResponseTimeIsSet(false);
this.responseTime = 0;
@@ -700,47 +682,6 @@ public class TabletServerStatus implements
org.apache.thrift.TBase<TabletServerS
__isset_bitfield =
org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __SYNCS_ISSET_ID,
value);
}
- public int getBulkImportsSize() {
- return (this.bulkImports == null) ? 0 : this.bulkImports.size();
- }
-
- @org.apache.thrift.annotation.Nullable
- public java.util.Iterator<BulkImportStatus> getBulkImportsIterator() {
- return (this.bulkImports == null) ? null : this.bulkImports.iterator();
- }
-
- public void addToBulkImports(BulkImportStatus elem) {
- if (this.bulkImports == null) {
- this.bulkImports = new java.util.ArrayList<BulkImportStatus>();
- }
- this.bulkImports.add(elem);
- }
-
- @org.apache.thrift.annotation.Nullable
- public java.util.List<BulkImportStatus> getBulkImports() {
- return this.bulkImports;
- }
-
- public TabletServerStatus
setBulkImports(@org.apache.thrift.annotation.Nullable
java.util.List<BulkImportStatus> bulkImports) {
- this.bulkImports = bulkImports;
- return this;
- }
-
- public void unsetBulkImports() {
- this.bulkImports = null;
- }
-
- /** Returns true if field bulkImports is set (has been assigned a value) and
false otherwise */
- public boolean isSetBulkImports() {
- return this.bulkImports != null;
- }
-
- public void setBulkImportsIsSet(boolean value) {
- if (!value) {
- this.bulkImports = null;
- }
- }
-
@org.apache.thrift.annotation.Nullable
public java.lang.String getVersion() {
return this.version;
@@ -896,14 +837,6 @@ public class TabletServerStatus implements
org.apache.thrift.TBase<TabletServerS
}
break;
- case BULK_IMPORTS:
- if (value == null) {
- unsetBulkImports();
- } else {
- setBulkImports((java.util.List<BulkImportStatus>)value);
- }
- break;
-
case VERSION:
if (value == null) {
unsetVersion();
@@ -966,9 +899,6 @@ public class TabletServerStatus implements
org.apache.thrift.TBase<TabletServerS
case SYNCS:
return getSyncs();
- case BULK_IMPORTS:
- return getBulkImports();
-
case VERSION:
return getVersion();
@@ -1013,8 +943,6 @@ public class TabletServerStatus implements
org.apache.thrift.TBase<TabletServerS
return isSetFlushs();
case SYNCS:
return isSetSyncs();
- case BULK_IMPORTS:
- return isSetBulkImports();
case VERSION:
return isSetVersion();
case RESPONSE_TIME:
@@ -1153,15 +1081,6 @@ public class TabletServerStatus implements
org.apache.thrift.TBase<TabletServerS
return false;
}
- boolean this_present_bulkImports = true && this.isSetBulkImports();
- boolean that_present_bulkImports = true && that.isSetBulkImports();
- if (this_present_bulkImports || that_present_bulkImports) {
- if (!(this_present_bulkImports && that_present_bulkImports))
- return false;
- if (!this.bulkImports.equals(that.bulkImports))
- return false;
- }
-
boolean this_present_version = true && this.isSetVersion();
boolean that_present_version = true && that.isSetVersion();
if (this_present_version || that_present_version) {
@@ -1219,10 +1138,6 @@ public class TabletServerStatus implements
org.apache.thrift.TBase<TabletServerS
hashCode = hashCode * 8191 + org.apache.thrift.TBaseHelper.hashCode(syncs);
- hashCode = hashCode * 8191 + ((isSetBulkImports()) ? 131071 : 524287);
- if (isSetBulkImports())
- hashCode = hashCode * 8191 + bulkImports.hashCode();
-
hashCode = hashCode * 8191 + ((isSetVersion()) ? 131071 : 524287);
if (isSetVersion())
hashCode = hashCode * 8191 + version.hashCode();
@@ -1370,16 +1285,6 @@ public class TabletServerStatus implements
org.apache.thrift.TBase<TabletServerS
return lastComparison;
}
}
- lastComparison = java.lang.Boolean.compare(isSetBulkImports(),
other.isSetBulkImports());
- if (lastComparison != 0) {
- return lastComparison;
- }
- if (isSetBulkImports()) {
- lastComparison =
org.apache.thrift.TBaseHelper.compareTo(this.bulkImports, other.bulkImports);
- if (lastComparison != 0) {
- return lastComparison;
- }
- }
lastComparison = java.lang.Boolean.compare(isSetVersion(),
other.isSetVersion());
if (lastComparison != 0) {
return lastComparison;
@@ -1488,14 +1393,6 @@ public class TabletServerStatus implements
org.apache.thrift.TBase<TabletServerS
sb.append(this.syncs);
first = false;
if (!first) sb.append(", ");
- sb.append("bulkImports:");
- if (this.bulkImports == null) {
- sb.append("null");
- } else {
- sb.append(this.bulkImports);
- }
- first = false;
- if (!first) sb.append(", ");
sb.append("version:");
if (this.version == null) {
sb.append("null");
@@ -1682,25 +1579,6 @@ public class TabletServerStatus implements
org.apache.thrift.TBase<TabletServerS
org.apache.thrift.protocol.TProtocolUtil.skip(iprot,
schemeField.type);
}
break;
- case 17: // BULK_IMPORTS
- if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
- {
- org.apache.thrift.protocol.TList _list15 =
iprot.readListBegin();
- struct.bulkImports = new
java.util.ArrayList<BulkImportStatus>(_list15.size);
- @org.apache.thrift.annotation.Nullable BulkImportStatus
_elem16;
- for (int _i17 = 0; _i17 < _list15.size; ++_i17)
- {
- _elem16 = new BulkImportStatus();
- _elem16.read(iprot);
- struct.bulkImports.add(_elem16);
- }
- iprot.readListEnd();
- }
- struct.setBulkImportsIsSet(true);
- } else {
- org.apache.thrift.protocol.TProtocolUtil.skip(iprot,
schemeField.type);
- }
- break;
case 19: // VERSION
if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
struct.version = iprot.readString();
@@ -1737,10 +1615,10 @@ public class TabletServerStatus implements
org.apache.thrift.TBase<TabletServerS
oprot.writeFieldBegin(TABLE_MAP_FIELD_DESC);
{
oprot.writeMapBegin(new
org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING,
org.apache.thrift.protocol.TType.STRUCT, struct.tableMap.size()));
- for (java.util.Map.Entry<java.lang.String, TableInfo> _iter18 :
struct.tableMap.entrySet())
+ for (java.util.Map.Entry<java.lang.String, TableInfo> _iter15 :
struct.tableMap.entrySet())
{
- oprot.writeString(_iter18.getKey());
- _iter18.getValue().write(oprot);
+ oprot.writeString(_iter15.getKey());
+ _iter15.getValue().write(oprot);
}
oprot.writeMapEnd();
}
@@ -1779,9 +1657,9 @@ public class TabletServerStatus implements
org.apache.thrift.TBase<TabletServerS
oprot.writeFieldBegin(LOG_SORTS_FIELD_DESC);
{
oprot.writeListBegin(new
org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT,
struct.logSorts.size()));
- for (RecoveryStatus _iter19 : struct.logSorts)
+ for (RecoveryStatus _iter16 : struct.logSorts)
{
- _iter19.write(oprot);
+ _iter16.write(oprot);
}
oprot.writeListEnd();
}
@@ -1793,18 +1671,6 @@ public class TabletServerStatus implements
org.apache.thrift.TBase<TabletServerS
oprot.writeFieldBegin(SYNCS_FIELD_DESC);
oprot.writeI64(struct.syncs);
oprot.writeFieldEnd();
- if (struct.bulkImports != null) {
- oprot.writeFieldBegin(BULK_IMPORTS_FIELD_DESC);
- {
- oprot.writeListBegin(new
org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT,
struct.bulkImports.size()));
- for (BulkImportStatus _iter20 : struct.bulkImports)
- {
- _iter20.write(oprot);
- }
- oprot.writeListEnd();
- }
- oprot.writeFieldEnd();
- }
oprot.writeFieldBegin(RESPONSE_TIME_FIELD_DESC);
oprot.writeI64(struct.responseTime);
oprot.writeFieldEnd();
@@ -1871,23 +1737,20 @@ public class TabletServerStatus implements
org.apache.thrift.TBase<TabletServerS
if (struct.isSetSyncs()) {
optionals.set(12);
}
- if (struct.isSetBulkImports()) {
- optionals.set(13);
- }
if (struct.isSetVersion()) {
- optionals.set(14);
+ optionals.set(13);
}
if (struct.isSetResponseTime()) {
- optionals.set(15);
+ optionals.set(14);
}
- oprot.writeBitSet(optionals, 16);
+ oprot.writeBitSet(optionals, 15);
if (struct.isSetTableMap()) {
{
oprot.writeI32(struct.tableMap.size());
- for (java.util.Map.Entry<java.lang.String, TableInfo> _iter21 :
struct.tableMap.entrySet())
+ for (java.util.Map.Entry<java.lang.String, TableInfo> _iter17 :
struct.tableMap.entrySet())
{
- oprot.writeString(_iter21.getKey());
- _iter21.getValue().write(oprot);
+ oprot.writeString(_iter17.getKey());
+ _iter17.getValue().write(oprot);
}
}
}
@@ -1921,9 +1784,9 @@ public class TabletServerStatus implements
org.apache.thrift.TBase<TabletServerS
if (struct.isSetLogSorts()) {
{
oprot.writeI32(struct.logSorts.size());
- for (RecoveryStatus _iter22 : struct.logSorts)
+ for (RecoveryStatus _iter18 : struct.logSorts)
{
- _iter22.write(oprot);
+ _iter18.write(oprot);
}
}
}
@@ -1933,15 +1796,6 @@ public class TabletServerStatus implements
org.apache.thrift.TBase<TabletServerS
if (struct.isSetSyncs()) {
oprot.writeI64(struct.syncs);
}
- if (struct.isSetBulkImports()) {
- {
- oprot.writeI32(struct.bulkImports.size());
- for (BulkImportStatus _iter23 : struct.bulkImports)
- {
- _iter23.write(oprot);
- }
- }
- }
if (struct.isSetVersion()) {
oprot.writeString(struct.version);
}
@@ -1953,19 +1807,19 @@ public class TabletServerStatus implements
org.apache.thrift.TBase<TabletServerS
@Override
public void read(org.apache.thrift.protocol.TProtocol prot,
TabletServerStatus struct) throws org.apache.thrift.TException {
org.apache.thrift.protocol.TTupleProtocol iprot =
(org.apache.thrift.protocol.TTupleProtocol) prot;
- java.util.BitSet incoming = iprot.readBitSet(16);
+ java.util.BitSet incoming = iprot.readBitSet(15);
if (incoming.get(0)) {
{
- org.apache.thrift.protocol.TMap _map24 =
iprot.readMapBegin(org.apache.thrift.protocol.TType.STRING,
org.apache.thrift.protocol.TType.STRUCT);
- struct.tableMap = new
java.util.HashMap<java.lang.String,TableInfo>(2*_map24.size);
- @org.apache.thrift.annotation.Nullable java.lang.String _key25;
- @org.apache.thrift.annotation.Nullable TableInfo _val26;
- for (int _i27 = 0; _i27 < _map24.size; ++_i27)
+ org.apache.thrift.protocol.TMap _map19 =
iprot.readMapBegin(org.apache.thrift.protocol.TType.STRING,
org.apache.thrift.protocol.TType.STRUCT);
+ struct.tableMap = new
java.util.HashMap<java.lang.String,TableInfo>(2*_map19.size);
+ @org.apache.thrift.annotation.Nullable java.lang.String _key20;
+ @org.apache.thrift.annotation.Nullable TableInfo _val21;
+ for (int _i22 = 0; _i22 < _map19.size; ++_i22)
{
- _key25 = iprot.readString();
- _val26 = new TableInfo();
- _val26.read(iprot);
- struct.tableMap.put(_key25, _val26);
+ _key20 = iprot.readString();
+ _val21 = new TableInfo();
+ _val21.read(iprot);
+ struct.tableMap.put(_key20, _val21);
}
}
struct.setTableMapIsSet(true);
@@ -2008,14 +1862,14 @@ public class TabletServerStatus implements
org.apache.thrift.TBase<TabletServerS
}
if (incoming.get(10)) {
{
- org.apache.thrift.protocol.TList _list28 =
iprot.readListBegin(org.apache.thrift.protocol.TType.STRUCT);
- struct.logSorts = new
java.util.ArrayList<RecoveryStatus>(_list28.size);
- @org.apache.thrift.annotation.Nullable RecoveryStatus _elem29;
- for (int _i30 = 0; _i30 < _list28.size; ++_i30)
+ org.apache.thrift.protocol.TList _list23 =
iprot.readListBegin(org.apache.thrift.protocol.TType.STRUCT);
+ struct.logSorts = new
java.util.ArrayList<RecoveryStatus>(_list23.size);
+ @org.apache.thrift.annotation.Nullable RecoveryStatus _elem24;
+ for (int _i25 = 0; _i25 < _list23.size; ++_i25)
{
- _elem29 = new RecoveryStatus();
- _elem29.read(iprot);
- struct.logSorts.add(_elem29);
+ _elem24 = new RecoveryStatus();
+ _elem24.read(iprot);
+ struct.logSorts.add(_elem24);
}
}
struct.setLogSortsIsSet(true);
@@ -2029,24 +1883,10 @@ public class TabletServerStatus implements
org.apache.thrift.TBase<TabletServerS
struct.setSyncsIsSet(true);
}
if (incoming.get(13)) {
- {
- org.apache.thrift.protocol.TList _list31 =
iprot.readListBegin(org.apache.thrift.protocol.TType.STRUCT);
- struct.bulkImports = new
java.util.ArrayList<BulkImportStatus>(_list31.size);
- @org.apache.thrift.annotation.Nullable BulkImportStatus _elem32;
- for (int _i33 = 0; _i33 < _list31.size; ++_i33)
- {
- _elem32 = new BulkImportStatus();
- _elem32.read(iprot);
- struct.bulkImports.add(_elem32);
- }
- }
- struct.setBulkImportsIsSet(true);
- }
- if (incoming.get(14)) {
struct.version = iprot.readString();
struct.setVersionIsSet(true);
}
- if (incoming.get(15)) {
+ if (incoming.get(14)) {
struct.responseTime = iprot.readI64();
struct.setResponseTimeIsSet(true);
}
diff --git a/core/src/main/thrift/manager.thrift
b/core/src/main/thrift/manager.thrift
index 70993697e4..dc9ddbb34a 100644
--- a/core/src/main/thrift/manager.thrift
+++ b/core/src/main/thrift/manager.thrift
@@ -148,7 +148,6 @@ struct TabletServerStatus {
14:list<RecoveryStatus> logSorts
15:i64 flushs
16:i64 syncs
- 17:list<BulkImportStatus> bulkImports
19:string version
18:i64 responseTime
}
diff --git
a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/bulkImports/BulkImport.java
b/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/bulkImports/BulkImport.java
index 9c582f30ed..8512e1b90f 100644
---
a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/bulkImports/BulkImport.java
+++
b/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/bulkImports/BulkImport.java
@@ -30,7 +30,6 @@ public class BulkImport {
// Variable names become JSON key
public List<BulkImportInformation> bulkImport = new ArrayList<>();
- public List<TabletServerBulkImportInformation> tabletServerBulkImport = new
ArrayList<>();
/**
* Adds a new bulk import to the array
@@ -41,12 +40,4 @@ public class BulkImport {
this.bulkImport.add(bulkImport);
}
- /**
- * Adds a new tserver bulk import to the array
- *
- * @param tabletServerBulkImport new tserver bulk import to add
- */
- public void addTabletServerBulkImport(TabletServerBulkImportInformation
tabletServerBulkImport) {
- this.tabletServerBulkImport.add(tabletServerBulkImport);
- }
}
diff --git
a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/bulkImports/BulkImportResource.java
b/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/bulkImports/BulkImportResource.java
index 40ae6f2782..2a5cdf9cc7 100644
---
a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/bulkImports/BulkImportResource.java
+++
b/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/bulkImports/BulkImportResource.java
@@ -18,8 +18,6 @@
*/
package org.apache.accumulo.monitor.rest.bulkImports;
-import java.util.List;
-
import jakarta.inject.Inject;
import jakarta.ws.rs.GET;
import jakarta.ws.rs.Path;
@@ -28,7 +26,6 @@ import jakarta.ws.rs.core.MediaType;
import org.apache.accumulo.core.manager.thrift.BulkImportStatus;
import org.apache.accumulo.core.manager.thrift.ManagerMonitorInfo;
-import org.apache.accumulo.core.manager.thrift.TabletServerStatus;
import org.apache.accumulo.monitor.Monitor;
/**
@@ -63,25 +60,6 @@ public class BulkImportResource {
.addBulkImport(new BulkImportInformation(bulk.filename,
bulk.startTime, bulk.state));
}
- // Generating TServer Bulk Import and adding it to the return object
- for (TabletServerStatus tserverInfo : mmi.getTServerInfo()) {
- int size = 0;
- long oldest = 0L;
-
- List<BulkImportStatus> stats = tserverInfo.bulkImports;
- if (stats != null) {
- size = stats.size();
- oldest = Long.MAX_VALUE;
- for (BulkImportStatus bulk : stats) {
- oldest = Math.min(oldest, bulk.startTime);
- }
- if (oldest == Long.MAX_VALUE) {
- oldest = 0L;
- }
- }
- bulkImport.addTabletServerBulkImport(
- new TabletServerBulkImportInformation(tserverInfo, size, oldest));
- }
return bulkImport;
}
}
diff --git
a/server/monitor/src/main/resources/org/apache/accumulo/monitor/resources/js/bulkImport.js
b/server/monitor/src/main/resources/org/apache/accumulo/monitor/resources/js/bulkImport.js
index dbc9350c35..1422bf8b2f 100644
---
a/server/monitor/src/main/resources/org/apache/accumulo/monitor/resources/js/bulkImport.js
+++
b/server/monitor/src/main/resources/org/apache/accumulo/monitor/resources/js/bulkImport.js
@@ -18,14 +18,13 @@
*/
"use strict";
-var bulkListTable, bulkPerServerTable;
+var bulkListTable;
/**
* Fetches new data and updates DataTables with it
*/
function refreshBulkImport() {
ajaxReloadTable(bulkListTable);
- ajaxReloadTable(bulkPerServerTable);
}
/**
@@ -73,40 +72,6 @@ $(document).ready(function () {
]
});
- // Generates the bulkPerServerTable DataTable
- bulkPerServerTable = $('#bulkPerServerTable').DataTable({
- "ajax": {
- "url": url,
- "dataSrc": "tabletServerBulkImport"
- },
- "stateSave": true,
- "columns": [{
- "data": "server",
- "type": "html",
- "render": function (data, type) {
- if (type === 'display') {
- data = `<a href="/tservers?s=${data}">${data}</a>`;
- }
- return data;
- }
- },
- {
- "data": "importSize"
- },
- {
- "data": "oldestAge",
- "render": function (data, type) {
- if (type === 'display' && Number(data) > 0) {
- data = new Date(Number(data));
- } else {
- data = "-";
- }
- return data;
- }
- }
- ]
- });
-
refreshBulkImport();
});
diff --git
a/server/monitor/src/main/resources/org/apache/accumulo/monitor/templates/bulkImport.ftl
b/server/monitor/src/main/resources/org/apache/accumulo/monitor/templates/bulkImport.ftl
index e991278f92..d172fc838a 100644
---
a/server/monitor/src/main/resources/org/apache/accumulo/monitor/templates/bulkImport.ftl
+++
b/server/monitor/src/main/resources/org/apache/accumulo/monitor/templates/bulkImport.ftl
@@ -38,18 +38,3 @@
</table>
</div>
</div>
- <br /><br />
- <div class="row">
- <div class="col-xs-12">
- <table id="bulkPerServerTable" class="table caption-top
table-bordered table-striped table-condensed">
- <caption><span class="table-caption">Per TabletServer</span><br
/></caption>
- <thead>
- <tr>
- <th>Server</th>
- <th title="Number of imports presently running">#</th>
- <th title="The age of the oldest import running on this
server.">Oldest Age</th>
- </tr>
- </thead>
- <tbody></tbody>
- </table>
- </div>
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 798809e240..c20c53214c 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
@@ -23,7 +23,6 @@ import static org.junit.jupiter.api.Assertions.assertTrue;
import java.util.Collections;
-import org.apache.accumulo.core.manager.thrift.BulkImportStatus;
import org.apache.accumulo.core.manager.thrift.Compacting;
import org.apache.accumulo.core.manager.thrift.RecoveryStatus;
import org.apache.accumulo.core.manager.thrift.TableInfo;
@@ -39,7 +38,6 @@ public class TabletServerInformationTest {
@Test
public void testFromThrift() {
TabletServerStatus ts = new TabletServerStatus();
- ts.setBulkImports(Collections.singletonList(new BulkImportStatus()));
ts.setDataCacheHits(11);
ts.setDataCacheRequest(22);
ts.setFlushs(33);
diff --git
a/shell/src/main/java/org/apache/accumulo/shell/commands/BulkImportListIterator.java
b/shell/src/main/java/org/apache/accumulo/shell/commands/BulkImportListIterator.java
index a1b443a842..2243292566 100644
---
a/shell/src/main/java/org/apache/accumulo/shell/commands/BulkImportListIterator.java
+++
b/shell/src/main/java/org/apache/accumulo/shell/commands/BulkImportListIterator.java
@@ -24,28 +24,17 @@ import java.util.List;
import org.apache.accumulo.core.manager.thrift.BulkImportStatus;
import org.apache.accumulo.core.manager.thrift.ManagerMonitorInfo;
-import org.apache.accumulo.core.manager.thrift.TabletServerStatus;
import org.apache.accumulo.core.util.DurationFormat;
public class BulkImportListIterator implements Iterator<String> {
private final Iterator<String> iter;
- public BulkImportListIterator(List<String> tservers, ManagerMonitorInfo
stats) {
+ public BulkImportListIterator(ManagerMonitorInfo stats) {
List<String> result = new ArrayList<>();
for (BulkImportStatus status : stats.getBulkImports()) {
result.add(format(status));
}
- if (!tservers.isEmpty()) {
- for (TabletServerStatus tserver : stats.getTServerInfo()) {
- if (tservers.contains(tserver.name)) {
- result.add(tserver.name + ":");
- for (BulkImportStatus status : tserver.bulkImports) {
- result.add(format(status));
- }
- }
- }
- }
iter = result.iterator();
}
diff --git
a/shell/src/main/java/org/apache/accumulo/shell/commands/ListBulkCommand.java
b/shell/src/main/java/org/apache/accumulo/shell/commands/ListBulkCommand.java
index 0822e4515e..2f6625bbe1 100644
---
a/shell/src/main/java/org/apache/accumulo/shell/commands/ListBulkCommand.java
+++
b/shell/src/main/java/org/apache/accumulo/shell/commands/ListBulkCommand.java
@@ -18,10 +18,6 @@
*/
package org.apache.accumulo.shell.commands;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-
import org.apache.accumulo.core.clientImpl.ClientContext;
import org.apache.accumulo.core.manager.thrift.ManagerMonitorInfo;
import org.apache.accumulo.core.rpc.clients.ThriftClientTypes;
@@ -45,8 +41,6 @@ public class ListBulkCommand extends Command {
public int execute(final String fullCommand, final CommandLine cl, final
Shell shellState)
throws Exception {
- List<String> tservers;
-
ClientContext context = shellState.getContext();
ManagerMonitorInfo stats = ThriftClientTypes.MANAGER.execute(context,
client -> client.getManagerStats(TraceUtil.traceInfo(),
context.rpcCreds()));
@@ -54,13 +48,12 @@ public class ListBulkCommand extends Command {
final boolean paginate = !cl.hasOption(disablePaginationOpt.getOpt());
if (cl.hasOption(tserverOption.getOpt())) {
- tservers = new ArrayList<>();
- tservers.add(cl.getOptionValue(tserverOption.getOpt()));
- } else {
- tservers = Collections.emptyList();
+ shellState.getWriter().print(tserverOption.getOpt()
+ + " option is deprecated and will be removed in a future
release.\n");
+ shellState.getWriter().flush();
}
- shellState.printLines(new BulkImportListIterator(tservers, stats),
paginate);
+ shellState.printLines(new BulkImportListIterator(stats), paginate);
return 0;
}
diff --git
a/shell/src/test/java/org/apache/accumulo/shell/commands/ListBulkCommandTest.java
b/shell/src/test/java/org/apache/accumulo/shell/commands/ListBulkCommandTest.java
index 6434937c50..86dee19ff6 100644
---
a/shell/src/test/java/org/apache/accumulo/shell/commands/ListBulkCommandTest.java
+++
b/shell/src/test/java/org/apache/accumulo/shell/commands/ListBulkCommandTest.java
@@ -22,7 +22,6 @@ import static org.easymock.EasyMock.createMock;
import static org.easymock.EasyMock.expect;
import static org.easymock.EasyMock.replay;
import static org.easymock.EasyMock.verify;
-import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertTrue;
import java.util.ArrayList;
@@ -32,11 +31,9 @@ import java.util.List;
import org.apache.accumulo.core.manager.thrift.BulkImportState;
import org.apache.accumulo.core.manager.thrift.BulkImportStatus;
import org.apache.accumulo.core.manager.thrift.ManagerMonitorInfo;
-import org.apache.accumulo.core.manager.thrift.TabletServerStatus;
import org.junit.jupiter.api.Test;
public class ListBulkCommandTest {
- private static final List<String> tservers = List.of("tserver1", "tserver2");
/**
* Test the iterator used by BulkCommand prints correctly
@@ -44,7 +41,6 @@ public class ListBulkCommandTest {
@Test
public void testBulkImportListIterator() {
ManagerMonitorInfo mmi = createMock(ManagerMonitorInfo.class);
- List<TabletServerStatus> statusList = new ArrayList<>();
List<BulkImportStatus> bulkImports = new ArrayList<>();
// tserver 1
@@ -52,47 +48,27 @@ public class ListBulkCommandTest {
bis1.filename = "file1";
bis1.startTime = System.currentTimeMillis();
bis1.state = BulkImportState.COPY_FILES;
- bulkImports.add(bis1);
- var ts1 = new TabletServerStatus();
- ts1.name = "tserver1";
- ts1.bulkImports = new ArrayList<>(bulkImports);
- bulkImports.clear();
// tserver 2
var bis2 = new BulkImportStatus();
bis2.filename = "file2";
bis2.startTime = System.currentTimeMillis();
bis2.state = BulkImportState.LOADING;
- bulkImports.add(bis2);
- var ts2 = new TabletServerStatus();
- ts2.name = "tserver2";
- ts2.bulkImports = new ArrayList<>(bulkImports);
- bulkImports.clear();
-
- statusList.add(ts1);
- statusList.add(ts2);
bulkImports.add(bis1);
bulkImports.add(bis2);
expect(mmi.getBulkImports()).andReturn(bulkImports).once();
- expect(mmi.getTServerInfo()).andReturn(statusList).once();
replay(mmi);
- var iter = new BulkImportListIterator(tservers, mmi);
+ var iter = new BulkImportListIterator(mmi);
List<String> printed = printLines(iter);
assertTrue(printed.get(0).stripLeading().startsWith("file1"));
assertTrue(printed.get(0).endsWith("COPY_FILES"));
assertTrue(printed.get(1).stripLeading().startsWith("file2"));
assertTrue(printed.get(1).endsWith("LOADING"));
- assertEquals(printed.get(2), "tserver1:");
- assertTrue(printed.get(3).stripLeading().startsWith("file1"));
- assertTrue(printed.get(3).endsWith("COPY_FILES"));
- assertEquals(printed.get(4), "tserver2:");
- assertTrue(printed.get(5).stripLeading().startsWith("file2"));
- assertTrue(printed.get(5).endsWith("LOADING"));
verify(mmi);
}
