This is an automated email from the ASF dual-hosted git repository.
kturner 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 8352b35ad9 removes unused split report code (#3667)
8352b35ad9 is described below
commit 8352b35ad90078881982d111b3f7defe451af270
Author: Keith Turner <[email protected]>
AuthorDate: Mon Jul 31 16:44:32 2023 -0400
removes unused split report code (#3667)
---
.../core/manager/thrift/ManagerClientService.java | 842 ---------------------
core/src/main/thrift/manager.thrift | 8 -
.../manager/ManagerClientServiceHandler.java | 24 -
3 files changed, 874 deletions(-)
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 66dea79f39..15f5bd8ef6 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
@@ -61,8 +61,6 @@ public class ManagerClientService {
public void
waitForBalance(org.apache.accumulo.core.clientImpl.thrift.TInfo tinfo) throws
org.apache.accumulo.core.clientImpl.thrift.ThriftNotActiveServiceException,
org.apache.thrift.TException;
- public void
reportSplitExtent(org.apache.accumulo.core.clientImpl.thrift.TInfo tinfo,
org.apache.accumulo.core.securityImpl.thrift.TCredentials credentials,
java.lang.String serverName, TabletSplit split) throws
org.apache.thrift.TException;
-
public void
reportTabletStatus(org.apache.accumulo.core.clientImpl.thrift.TInfo tinfo,
org.apache.accumulo.core.securityImpl.thrift.TCredentials credentials,
java.lang.String serverName, TabletLoadState status,
org.apache.accumulo.core.dataImpl.thrift.TKeyExtent tablet) throws
org.apache.thrift.TException;
public java.util.List<java.lang.String>
getActiveTservers(org.apache.accumulo.core.clientImpl.thrift.TInfo tinfo,
org.apache.accumulo.core.securityImpl.thrift.TCredentials credentials) throws
org.apache.accumulo.core.clientImpl.thrift.ThriftSecurityException,
org.apache.accumulo.core.clientImpl.thrift.ThriftNotActiveServiceException,
org.apache.thrift.TException;
@@ -107,8 +105,6 @@ public class ManagerClientService {
public void
waitForBalance(org.apache.accumulo.core.clientImpl.thrift.TInfo tinfo,
org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler) throws
org.apache.thrift.TException;
- public void
reportSplitExtent(org.apache.accumulo.core.clientImpl.thrift.TInfo tinfo,
org.apache.accumulo.core.securityImpl.thrift.TCredentials credentials,
java.lang.String serverName, TabletSplit split,
org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler) throws
org.apache.thrift.TException;
-
public void
reportTabletStatus(org.apache.accumulo.core.clientImpl.thrift.TInfo tinfo,
org.apache.accumulo.core.securityImpl.thrift.TCredentials credentials,
java.lang.String serverName, TabletLoadState status,
org.apache.accumulo.core.dataImpl.thrift.TKeyExtent tablet,
org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler) throws
org.apache.thrift.TException;
public void
getActiveTservers(org.apache.accumulo.core.clientImpl.thrift.TInfo tinfo,
org.apache.accumulo.core.securityImpl.thrift.TCredentials credentials,
org.apache.thrift.async.AsyncMethodCallback<java.util.List<java.lang.String>>
resultHandler) throws org.apache.thrift.TException;
@@ -667,22 +663,6 @@ public class ManagerClientService {
return;
}
- @Override
- public void
reportSplitExtent(org.apache.accumulo.core.clientImpl.thrift.TInfo tinfo,
org.apache.accumulo.core.securityImpl.thrift.TCredentials credentials,
java.lang.String serverName, TabletSplit split) throws
org.apache.thrift.TException
- {
- send_reportSplitExtent(tinfo, credentials, serverName, split);
- }
-
- public void
send_reportSplitExtent(org.apache.accumulo.core.clientImpl.thrift.TInfo tinfo,
org.apache.accumulo.core.securityImpl.thrift.TCredentials credentials,
java.lang.String serverName, TabletSplit split) throws
org.apache.thrift.TException
- {
- reportSplitExtent_args args = new reportSplitExtent_args();
- args.setTinfo(tinfo);
- args.setCredentials(credentials);
- args.setServerName(serverName);
- args.setSplit(split);
- sendBaseOneway("reportSplitExtent", args);
- }
-
@Override
public void
reportTabletStatus(org.apache.accumulo.core.clientImpl.thrift.TInfo tinfo,
org.apache.accumulo.core.securityImpl.thrift.TCredentials credentials,
java.lang.String serverName, TabletLoadState status,
org.apache.accumulo.core.dataImpl.thrift.TKeyExtent tablet) throws
org.apache.thrift.TException
{
@@ -1515,50 +1495,6 @@ public class ManagerClientService {
}
}
- @Override
- public void
reportSplitExtent(org.apache.accumulo.core.clientImpl.thrift.TInfo tinfo,
org.apache.accumulo.core.securityImpl.thrift.TCredentials credentials,
java.lang.String serverName, TabletSplit split,
org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler) throws
org.apache.thrift.TException {
- checkReady();
- reportSplitExtent_call method_call = new reportSplitExtent_call(tinfo,
credentials, serverName, split, resultHandler, this, ___protocolFactory,
___transport);
- this.___currentMethod = method_call;
- ___manager.call(method_call);
- }
-
- public static class reportSplitExtent_call extends
org.apache.thrift.async.TAsyncMethodCall<Void> {
- private org.apache.accumulo.core.clientImpl.thrift.TInfo tinfo;
- private org.apache.accumulo.core.securityImpl.thrift.TCredentials
credentials;
- private java.lang.String serverName;
- private TabletSplit split;
- public
reportSplitExtent_call(org.apache.accumulo.core.clientImpl.thrift.TInfo tinfo,
org.apache.accumulo.core.securityImpl.thrift.TCredentials credentials,
java.lang.String serverName, TabletSplit split,
org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler,
org.apache.thrift.async.TAsyncClient client,
org.apache.thrift.protocol.TProtocolFactory protocolFactory,
org.apache.thrift.transport.TNonblockingTransport transport) throws
org.apache.thrift.TException {
- super(client, protocolFactory, transport, resultHandler, true);
- this.tinfo = tinfo;
- this.credentials = credentials;
- this.serverName = serverName;
- this.split = split;
- }
-
- @Override
- public void write_args(org.apache.thrift.protocol.TProtocol prot) throws
org.apache.thrift.TException {
- prot.writeMessageBegin(new
org.apache.thrift.protocol.TMessage("reportSplitExtent",
org.apache.thrift.protocol.TMessageType.ONEWAY, 0));
- reportSplitExtent_args args = new reportSplitExtent_args();
- args.setTinfo(tinfo);
- args.setCredentials(credentials);
- args.setServerName(serverName);
- args.setSplit(split);
- args.write(prot);
- prot.writeMessageEnd();
- }
-
- @Override
- public Void getResult() throws org.apache.thrift.TException {
- if (getState() !=
org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
- throw new java.lang.IllegalStateException("Method call not
finished!");
- }
- org.apache.thrift.transport.TMemoryInputTransport memoryTransport =
new org.apache.thrift.transport.TMemoryInputTransport(getFrameBuffer().array());
- org.apache.thrift.protocol.TProtocol prot =
client.getProtocolFactory().getProtocol(memoryTransport);
- return null;
- }
- }
-
@Override
public void
reportTabletStatus(org.apache.accumulo.core.clientImpl.thrift.TInfo tinfo,
org.apache.accumulo.core.securityImpl.thrift.TCredentials credentials,
java.lang.String serverName, TabletLoadState status,
org.apache.accumulo.core.dataImpl.thrift.TKeyExtent tablet,
org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler) throws
org.apache.thrift.TException {
checkReady();
@@ -1759,7 +1695,6 @@ public class ManagerClientService {
processMap.put("removeSystemProperty", new removeSystemProperty());
processMap.put("getManagerStats", new getManagerStats());
processMap.put("waitForBalance", new waitForBalance());
- processMap.put("reportSplitExtent", new reportSplitExtent());
processMap.put("reportTabletStatus", new reportTabletStatus());
processMap.put("getActiveTservers", new getActiveTservers());
processMap.put("getDelegationToken", new getDelegationToken());
@@ -2342,33 +2277,6 @@ public class ManagerClientService {
}
}
- public static class reportSplitExtent<I extends Iface> extends
org.apache.thrift.ProcessFunction<I, reportSplitExtent_args> {
- public reportSplitExtent() {
- super("reportSplitExtent");
- }
-
- @Override
- public reportSplitExtent_args getEmptyArgsInstance() {
- return new reportSplitExtent_args();
- }
-
- @Override
- protected boolean isOneway() {
- return true;
- }
-
- @Override
- protected boolean rethrowUnhandledExceptions() {
- return false;
- }
-
- @Override
- public org.apache.thrift.TBase getResult(I iface, reportSplitExtent_args
args) throws org.apache.thrift.TException {
- iface.reportSplitExtent(args.tinfo, args.credentials, args.serverName,
args.split);
- return null;
- }
- }
-
public static class reportTabletStatus<I extends Iface> extends
org.apache.thrift.ProcessFunction<I, reportTabletStatus_args> {
public reportTabletStatus() {
super("reportTabletStatus");
@@ -2527,7 +2435,6 @@ public class ManagerClientService {
processMap.put("removeSystemProperty", new removeSystemProperty());
processMap.put("getManagerStats", new getManagerStats());
processMap.put("waitForBalance", new waitForBalance());
- processMap.put("reportSplitExtent", new reportSplitExtent());
processMap.put("reportTabletStatus", new reportTabletStatus());
processMap.put("getActiveTservers", new getActiveTservers());
processMap.put("getDelegationToken", new getDelegationToken());
@@ -3782,46 +3689,6 @@ public class ManagerClientService {
}
}
- public static class reportSplitExtent<I extends AsyncIface> extends
org.apache.thrift.AsyncProcessFunction<I, reportSplitExtent_args, Void> {
- public reportSplitExtent() {
- super("reportSplitExtent");
- }
-
- @Override
- public reportSplitExtent_args getEmptyArgsInstance() {
- return new reportSplitExtent_args();
- }
-
- @Override
- public org.apache.thrift.async.AsyncMethodCallback<Void>
getResultHandler(final
org.apache.thrift.server.AbstractNonblockingServer.AsyncFrameBuffer fb, final
int seqid) {
- final org.apache.thrift.AsyncProcessFunction fcall = this;
- return new org.apache.thrift.async.AsyncMethodCallback<Void>() {
- @Override
- public void onComplete(Void o) {
- }
- @Override
- public void onError(java.lang.Exception e) {
- if (e instanceof org.apache.thrift.transport.TTransportException) {
- _LOGGER.error("TTransportException inside handler", e);
- fb.close();
- } else {
- _LOGGER.error("Exception inside oneway handler", e);
- }
- }
- };
- }
-
- @Override
- protected boolean isOneway() {
- return true;
- }
-
- @Override
- public void start(I iface, reportSplitExtent_args args,
org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler) throws
org.apache.thrift.TException {
- iface.reportSplitExtent(args.tinfo, args.credentials, args.serverName,
args.split,resultHandler);
- }
- }
-
public static class reportTabletStatus<I extends AsyncIface> extends
org.apache.thrift.AsyncProcessFunction<I, reportTabletStatus_args, Void> {
public reportTabletStatus() {
super("reportTabletStatus");
@@ -24464,715 +24331,6 @@ public class ManagerClientService {
}
}
- @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
- public static class reportSplitExtent_args implements
org.apache.thrift.TBase<reportSplitExtent_args,
reportSplitExtent_args._Fields>, java.io.Serializable, Cloneable,
Comparable<reportSplitExtent_args> {
- private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new
org.apache.thrift.protocol.TStruct("reportSplitExtent_args");
-
- private static final org.apache.thrift.protocol.TField TINFO_FIELD_DESC =
new org.apache.thrift.protocol.TField("tinfo",
org.apache.thrift.protocol.TType.STRUCT, (short)1);
- private static final org.apache.thrift.protocol.TField
CREDENTIALS_FIELD_DESC = new org.apache.thrift.protocol.TField("credentials",
org.apache.thrift.protocol.TType.STRUCT, (short)2);
- private static final org.apache.thrift.protocol.TField
SERVER_NAME_FIELD_DESC = new org.apache.thrift.protocol.TField("serverName",
org.apache.thrift.protocol.TType.STRING, (short)3);
- private static final org.apache.thrift.protocol.TField SPLIT_FIELD_DESC =
new org.apache.thrift.protocol.TField("split",
org.apache.thrift.protocol.TType.STRUCT, (short)4);
-
- private static final org.apache.thrift.scheme.SchemeFactory
STANDARD_SCHEME_FACTORY = new reportSplitExtent_argsStandardSchemeFactory();
- private static final org.apache.thrift.scheme.SchemeFactory
TUPLE_SCHEME_FACTORY = new reportSplitExtent_argsTupleSchemeFactory();
-
- public @org.apache.thrift.annotation.Nullable
org.apache.accumulo.core.clientImpl.thrift.TInfo tinfo; // required
- public @org.apache.thrift.annotation.Nullable
org.apache.accumulo.core.securityImpl.thrift.TCredentials credentials; //
required
- public @org.apache.thrift.annotation.Nullable java.lang.String serverName;
// required
- public @org.apache.thrift.annotation.Nullable TabletSplit split; //
required
-
- /** The set of fields this struct contains, along with convenience methods
for finding and manipulating them. */
- public enum _Fields implements org.apache.thrift.TFieldIdEnum {
- TINFO((short)1, "tinfo"),
- CREDENTIALS((short)2, "credentials"),
- SERVER_NAME((short)3, "serverName"),
- SPLIT((short)4, "split");
-
- private static final java.util.Map<java.lang.String, _Fields> byName =
new java.util.HashMap<java.lang.String, _Fields>();
-
- static {
- for (_Fields field : java.util.EnumSet.allOf(_Fields.class)) {
- byName.put(field.getFieldName(), field);
- }
- }
-
- /**
- * Find the _Fields constant that matches fieldId, or null if its not
found.
- */
- @org.apache.thrift.annotation.Nullable
- public static _Fields findByThriftId(int fieldId) {
- switch(fieldId) {
- case 1: // TINFO
- return TINFO;
- case 2: // CREDENTIALS
- return CREDENTIALS;
- case 3: // SERVER_NAME
- return SERVER_NAME;
- case 4: // SPLIT
- return SPLIT;
- default:
- return null;
- }
- }
-
- /**
- * Find the _Fields constant that matches fieldId, throwing an exception
- * if it is not found.
- */
- public static _Fields findByThriftIdOrThrow(int fieldId) {
- _Fields fields = findByThriftId(fieldId);
- if (fields == null) throw new
java.lang.IllegalArgumentException("Field " + fieldId + " doesn't exist!");
- return fields;
- }
-
- /**
- * Find the _Fields constant that matches name, or null if its not found.
- */
- @org.apache.thrift.annotation.Nullable
- public static _Fields findByName(java.lang.String name) {
- return byName.get(name);
- }
-
- private final short _thriftId;
- private final java.lang.String _fieldName;
-
- _Fields(short thriftId, java.lang.String fieldName) {
- _thriftId = thriftId;
- _fieldName = fieldName;
- }
-
- @Override
- public short getThriftFieldId() {
- return _thriftId;
- }
-
- @Override
- public java.lang.String getFieldName() {
- return _fieldName;
- }
- }
-
- // isset id assignments
- public static final java.util.Map<_Fields,
org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
- static {
- java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap
= new java.util.EnumMap<_Fields,
org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
- tmpMap.put(_Fields.TINFO, new
org.apache.thrift.meta_data.FieldMetaData("tinfo",
org.apache.thrift.TFieldRequirementType.DEFAULT,
- new
org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT,
org.apache.accumulo.core.clientImpl.thrift.TInfo.class)));
- tmpMap.put(_Fields.CREDENTIALS, new
org.apache.thrift.meta_data.FieldMetaData("credentials",
org.apache.thrift.TFieldRequirementType.DEFAULT,
- new
org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT,
org.apache.accumulo.core.securityImpl.thrift.TCredentials.class)));
- tmpMap.put(_Fields.SERVER_NAME, new
org.apache.thrift.meta_data.FieldMetaData("serverName",
org.apache.thrift.TFieldRequirementType.DEFAULT,
- new
org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
- tmpMap.put(_Fields.SPLIT, new
org.apache.thrift.meta_data.FieldMetaData("split",
org.apache.thrift.TFieldRequirementType.DEFAULT,
- new
org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT,
TabletSplit.class)));
- metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
-
org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(reportSplitExtent_args.class,
metaDataMap);
- }
-
- public reportSplitExtent_args() {
- }
-
- public reportSplitExtent_args(
- org.apache.accumulo.core.clientImpl.thrift.TInfo tinfo,
- org.apache.accumulo.core.securityImpl.thrift.TCredentials credentials,
- java.lang.String serverName,
- TabletSplit split)
- {
- this();
- this.tinfo = tinfo;
- this.credentials = credentials;
- this.serverName = serverName;
- this.split = split;
- }
-
- /**
- * Performs a deep copy on <i>other</i>.
- */
- public reportSplitExtent_args(reportSplitExtent_args other) {
- if (other.isSetTinfo()) {
- this.tinfo = new
org.apache.accumulo.core.clientImpl.thrift.TInfo(other.tinfo);
- }
- if (other.isSetCredentials()) {
- this.credentials = new
org.apache.accumulo.core.securityImpl.thrift.TCredentials(other.credentials);
- }
- if (other.isSetServerName()) {
- this.serverName = other.serverName;
- }
- if (other.isSetSplit()) {
- this.split = new TabletSplit(other.split);
- }
- }
-
- @Override
- public reportSplitExtent_args deepCopy() {
- return new reportSplitExtent_args(this);
- }
-
- @Override
- public void clear() {
- this.tinfo = null;
- this.credentials = null;
- this.serverName = null;
- this.split = null;
- }
-
- @org.apache.thrift.annotation.Nullable
- public org.apache.accumulo.core.clientImpl.thrift.TInfo getTinfo() {
- return this.tinfo;
- }
-
- public reportSplitExtent_args
setTinfo(@org.apache.thrift.annotation.Nullable
org.apache.accumulo.core.clientImpl.thrift.TInfo tinfo) {
- this.tinfo = tinfo;
- return this;
- }
-
- public void unsetTinfo() {
- this.tinfo = null;
- }
-
- /** Returns true if field tinfo is set (has been assigned a value) and
false otherwise */
- public boolean isSetTinfo() {
- return this.tinfo != null;
- }
-
- public void setTinfoIsSet(boolean value) {
- if (!value) {
- this.tinfo = null;
- }
- }
-
- @org.apache.thrift.annotation.Nullable
- public org.apache.accumulo.core.securityImpl.thrift.TCredentials
getCredentials() {
- return this.credentials;
- }
-
- public reportSplitExtent_args
setCredentials(@org.apache.thrift.annotation.Nullable
org.apache.accumulo.core.securityImpl.thrift.TCredentials credentials) {
- this.credentials = credentials;
- return this;
- }
-
- public void unsetCredentials() {
- this.credentials = null;
- }
-
- /** Returns true if field credentials is set (has been assigned a value)
and false otherwise */
- public boolean isSetCredentials() {
- return this.credentials != null;
- }
-
- public void setCredentialsIsSet(boolean value) {
- if (!value) {
- this.credentials = null;
- }
- }
-
- @org.apache.thrift.annotation.Nullable
- public java.lang.String getServerName() {
- return this.serverName;
- }
-
- public reportSplitExtent_args
setServerName(@org.apache.thrift.annotation.Nullable java.lang.String
serverName) {
- this.serverName = serverName;
- return this;
- }
-
- public void unsetServerName() {
- this.serverName = null;
- }
-
- /** Returns true if field serverName is set (has been assigned a value)
and false otherwise */
- public boolean isSetServerName() {
- return this.serverName != null;
- }
-
- public void setServerNameIsSet(boolean value) {
- if (!value) {
- this.serverName = null;
- }
- }
-
- @org.apache.thrift.annotation.Nullable
- public TabletSplit getSplit() {
- return this.split;
- }
-
- public reportSplitExtent_args
setSplit(@org.apache.thrift.annotation.Nullable TabletSplit split) {
- this.split = split;
- return this;
- }
-
- public void unsetSplit() {
- this.split = null;
- }
-
- /** Returns true if field split is set (has been assigned a value) and
false otherwise */
- public boolean isSetSplit() {
- return this.split != null;
- }
-
- public void setSplitIsSet(boolean value) {
- if (!value) {
- this.split = null;
- }
- }
-
- @Override
- public void setFieldValue(_Fields field,
@org.apache.thrift.annotation.Nullable java.lang.Object value) {
- switch (field) {
- case TINFO:
- if (value == null) {
- unsetTinfo();
- } else {
- setTinfo((org.apache.accumulo.core.clientImpl.thrift.TInfo)value);
- }
- break;
-
- case CREDENTIALS:
- if (value == null) {
- unsetCredentials();
- } else {
-
setCredentials((org.apache.accumulo.core.securityImpl.thrift.TCredentials)value);
- }
- break;
-
- case SERVER_NAME:
- if (value == null) {
- unsetServerName();
- } else {
- setServerName((java.lang.String)value);
- }
- break;
-
- case SPLIT:
- if (value == null) {
- unsetSplit();
- } else {
- setSplit((TabletSplit)value);
- }
- break;
-
- }
- }
-
- @org.apache.thrift.annotation.Nullable
- @Override
- public java.lang.Object getFieldValue(_Fields field) {
- switch (field) {
- case TINFO:
- return getTinfo();
-
- case CREDENTIALS:
- return getCredentials();
-
- case SERVER_NAME:
- return getServerName();
-
- case SPLIT:
- return getSplit();
-
- }
- throw new java.lang.IllegalStateException();
- }
-
- /** Returns true if field corresponding to fieldID is set (has been
assigned a value) and false otherwise */
- @Override
- public boolean isSet(_Fields field) {
- if (field == null) {
- throw new java.lang.IllegalArgumentException();
- }
-
- switch (field) {
- case TINFO:
- return isSetTinfo();
- case CREDENTIALS:
- return isSetCredentials();
- case SERVER_NAME:
- return isSetServerName();
- case SPLIT:
- return isSetSplit();
- }
- throw new java.lang.IllegalStateException();
- }
-
- @Override
- public boolean equals(java.lang.Object that) {
- if (that instanceof reportSplitExtent_args)
- return this.equals((reportSplitExtent_args)that);
- return false;
- }
-
- public boolean equals(reportSplitExtent_args that) {
- if (that == null)
- return false;
- if (this == that)
- return true;
-
- boolean this_present_tinfo = true && this.isSetTinfo();
- boolean that_present_tinfo = true && that.isSetTinfo();
- if (this_present_tinfo || that_present_tinfo) {
- if (!(this_present_tinfo && that_present_tinfo))
- return false;
- if (!this.tinfo.equals(that.tinfo))
- return false;
- }
-
- boolean this_present_credentials = true && this.isSetCredentials();
- boolean that_present_credentials = true && that.isSetCredentials();
- if (this_present_credentials || that_present_credentials) {
- if (!(this_present_credentials && that_present_credentials))
- return false;
- if (!this.credentials.equals(that.credentials))
- return false;
- }
-
- boolean this_present_serverName = true && this.isSetServerName();
- boolean that_present_serverName = true && that.isSetServerName();
- if (this_present_serverName || that_present_serverName) {
- if (!(this_present_serverName && that_present_serverName))
- return false;
- if (!this.serverName.equals(that.serverName))
- return false;
- }
-
- boolean this_present_split = true && this.isSetSplit();
- boolean that_present_split = true && that.isSetSplit();
- if (this_present_split || that_present_split) {
- if (!(this_present_split && that_present_split))
- return false;
- if (!this.split.equals(that.split))
- return false;
- }
-
- return true;
- }
-
- @Override
- public int hashCode() {
- int hashCode = 1;
-
- hashCode = hashCode * 8191 + ((isSetTinfo()) ? 131071 : 524287);
- if (isSetTinfo())
- hashCode = hashCode * 8191 + tinfo.hashCode();
-
- hashCode = hashCode * 8191 + ((isSetCredentials()) ? 131071 : 524287);
- if (isSetCredentials())
- hashCode = hashCode * 8191 + credentials.hashCode();
-
- hashCode = hashCode * 8191 + ((isSetServerName()) ? 131071 : 524287);
- if (isSetServerName())
- hashCode = hashCode * 8191 + serverName.hashCode();
-
- hashCode = hashCode * 8191 + ((isSetSplit()) ? 131071 : 524287);
- if (isSetSplit())
- hashCode = hashCode * 8191 + split.hashCode();
-
- return hashCode;
- }
-
- @Override
- public int compareTo(reportSplitExtent_args other) {
- if (!getClass().equals(other.getClass())) {
- return getClass().getName().compareTo(other.getClass().getName());
- }
-
- int lastComparison = 0;
-
- lastComparison = java.lang.Boolean.compare(isSetTinfo(),
other.isSetTinfo());
- if (lastComparison != 0) {
- return lastComparison;
- }
- if (isSetTinfo()) {
- lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.tinfo,
other.tinfo);
- if (lastComparison != 0) {
- return lastComparison;
- }
- }
- lastComparison = java.lang.Boolean.compare(isSetCredentials(),
other.isSetCredentials());
- if (lastComparison != 0) {
- return lastComparison;
- }
- if (isSetCredentials()) {
- lastComparison =
org.apache.thrift.TBaseHelper.compareTo(this.credentials, other.credentials);
- if (lastComparison != 0) {
- return lastComparison;
- }
- }
- lastComparison = java.lang.Boolean.compare(isSetServerName(),
other.isSetServerName());
- if (lastComparison != 0) {
- return lastComparison;
- }
- if (isSetServerName()) {
- lastComparison =
org.apache.thrift.TBaseHelper.compareTo(this.serverName, other.serverName);
- if (lastComparison != 0) {
- return lastComparison;
- }
- }
- lastComparison = java.lang.Boolean.compare(isSetSplit(),
other.isSetSplit());
- if (lastComparison != 0) {
- return lastComparison;
- }
- if (isSetSplit()) {
- lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.split,
other.split);
- if (lastComparison != 0) {
- return lastComparison;
- }
- }
- return 0;
- }
-
- @org.apache.thrift.annotation.Nullable
- @Override
- public _Fields fieldForId(int fieldId) {
- return _Fields.findByThriftId(fieldId);
- }
-
- @Override
- public void read(org.apache.thrift.protocol.TProtocol iprot) throws
org.apache.thrift.TException {
- scheme(iprot).read(iprot, this);
- }
-
- @Override
- public void write(org.apache.thrift.protocol.TProtocol oprot) throws
org.apache.thrift.TException {
- scheme(oprot).write(oprot, this);
- }
-
- @Override
- public java.lang.String toString() {
- java.lang.StringBuilder sb = new
java.lang.StringBuilder("reportSplitExtent_args(");
- boolean first = true;
-
- sb.append("tinfo:");
- if (this.tinfo == null) {
- sb.append("null");
- } else {
- sb.append(this.tinfo);
- }
- first = false;
- if (!first) sb.append(", ");
- sb.append("credentials:");
- if (this.credentials == null) {
- sb.append("null");
- } else {
- sb.append(this.credentials);
- }
- first = false;
- if (!first) sb.append(", ");
- sb.append("serverName:");
- if (this.serverName == null) {
- sb.append("null");
- } else {
- sb.append(this.serverName);
- }
- first = false;
- if (!first) sb.append(", ");
- sb.append("split:");
- if (this.split == null) {
- sb.append("null");
- } else {
- sb.append(this.split);
- }
- first = false;
- sb.append(")");
- return sb.toString();
- }
-
- public void validate() throws org.apache.thrift.TException {
- // check for required fields
- // check for sub-struct validity
- if (tinfo != null) {
- tinfo.validate();
- }
- if (credentials != null) {
- credentials.validate();
- }
- if (split != null) {
- split.validate();
- }
- }
-
- private void writeObject(java.io.ObjectOutputStream out) throws
java.io.IOException {
- try {
- write(new org.apache.thrift.protocol.TCompactProtocol(new
org.apache.thrift.transport.TIOStreamTransport(out)));
- } catch (org.apache.thrift.TException te) {
- throw new java.io.IOException(te);
- }
- }
-
- private void readObject(java.io.ObjectInputStream in) throws
java.io.IOException, java.lang.ClassNotFoundException {
- try {
- read(new org.apache.thrift.protocol.TCompactProtocol(new
org.apache.thrift.transport.TIOStreamTransport(in)));
- } catch (org.apache.thrift.TException te) {
- throw new java.io.IOException(te);
- }
- }
-
- private static class reportSplitExtent_argsStandardSchemeFactory
implements org.apache.thrift.scheme.SchemeFactory {
- @Override
- public reportSplitExtent_argsStandardScheme getScheme() {
- return new reportSplitExtent_argsStandardScheme();
- }
- }
-
- private static class reportSplitExtent_argsStandardScheme extends
org.apache.thrift.scheme.StandardScheme<reportSplitExtent_args> {
-
- @Override
- public void read(org.apache.thrift.protocol.TProtocol iprot,
reportSplitExtent_args struct) throws org.apache.thrift.TException {
- org.apache.thrift.protocol.TField schemeField;
- iprot.readStructBegin();
- while (true)
- {
- schemeField = iprot.readFieldBegin();
- if (schemeField.type == org.apache.thrift.protocol.TType.STOP) {
- break;
- }
- switch (schemeField.id) {
- case 1: // TINFO
- if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT)
{
- struct.tinfo = new
org.apache.accumulo.core.clientImpl.thrift.TInfo();
- struct.tinfo.read(iprot);
- struct.setTinfoIsSet(true);
- } else {
- org.apache.thrift.protocol.TProtocolUtil.skip(iprot,
schemeField.type);
- }
- break;
- case 2: // CREDENTIALS
- if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT)
{
- struct.credentials = new
org.apache.accumulo.core.securityImpl.thrift.TCredentials();
- struct.credentials.read(iprot);
- struct.setCredentialsIsSet(true);
- } else {
- org.apache.thrift.protocol.TProtocolUtil.skip(iprot,
schemeField.type);
- }
- break;
- case 3: // SERVER_NAME
- if (schemeField.type == org.apache.thrift.protocol.TType.STRING)
{
- struct.serverName = iprot.readString();
- struct.setServerNameIsSet(true);
- } else {
- org.apache.thrift.protocol.TProtocolUtil.skip(iprot,
schemeField.type);
- }
- break;
- case 4: // SPLIT
- if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT)
{
- struct.split = new TabletSplit();
- struct.split.read(iprot);
- struct.setSplitIsSet(true);
- } else {
- org.apache.thrift.protocol.TProtocolUtil.skip(iprot,
schemeField.type);
- }
- break;
- default:
- org.apache.thrift.protocol.TProtocolUtil.skip(iprot,
schemeField.type);
- }
- iprot.readFieldEnd();
- }
- iprot.readStructEnd();
-
- // check for required fields of primitive type, which can't be checked
in the validate method
- struct.validate();
- }
-
- @Override
- public void write(org.apache.thrift.protocol.TProtocol oprot,
reportSplitExtent_args struct) throws org.apache.thrift.TException {
- struct.validate();
-
- oprot.writeStructBegin(STRUCT_DESC);
- if (struct.tinfo != null) {
- oprot.writeFieldBegin(TINFO_FIELD_DESC);
- struct.tinfo.write(oprot);
- oprot.writeFieldEnd();
- }
- if (struct.credentials != null) {
- oprot.writeFieldBegin(CREDENTIALS_FIELD_DESC);
- struct.credentials.write(oprot);
- oprot.writeFieldEnd();
- }
- if (struct.serverName != null) {
- oprot.writeFieldBegin(SERVER_NAME_FIELD_DESC);
- oprot.writeString(struct.serverName);
- oprot.writeFieldEnd();
- }
- if (struct.split != null) {
- oprot.writeFieldBegin(SPLIT_FIELD_DESC);
- struct.split.write(oprot);
- oprot.writeFieldEnd();
- }
- oprot.writeFieldStop();
- oprot.writeStructEnd();
- }
-
- }
-
- private static class reportSplitExtent_argsTupleSchemeFactory implements
org.apache.thrift.scheme.SchemeFactory {
- @Override
- public reportSplitExtent_argsTupleScheme getScheme() {
- return new reportSplitExtent_argsTupleScheme();
- }
- }
-
- private static class reportSplitExtent_argsTupleScheme extends
org.apache.thrift.scheme.TupleScheme<reportSplitExtent_args> {
-
- @Override
- public void write(org.apache.thrift.protocol.TProtocol prot,
reportSplitExtent_args struct) throws org.apache.thrift.TException {
- org.apache.thrift.protocol.TTupleProtocol oprot =
(org.apache.thrift.protocol.TTupleProtocol) prot;
- java.util.BitSet optionals = new java.util.BitSet();
- if (struct.isSetTinfo()) {
- optionals.set(0);
- }
- if (struct.isSetCredentials()) {
- optionals.set(1);
- }
- if (struct.isSetServerName()) {
- optionals.set(2);
- }
- if (struct.isSetSplit()) {
- optionals.set(3);
- }
- oprot.writeBitSet(optionals, 4);
- if (struct.isSetTinfo()) {
- struct.tinfo.write(oprot);
- }
- if (struct.isSetCredentials()) {
- struct.credentials.write(oprot);
- }
- if (struct.isSetServerName()) {
- oprot.writeString(struct.serverName);
- }
- if (struct.isSetSplit()) {
- struct.split.write(oprot);
- }
- }
-
- @Override
- public void read(org.apache.thrift.protocol.TProtocol prot,
reportSplitExtent_args struct) throws org.apache.thrift.TException {
- org.apache.thrift.protocol.TTupleProtocol iprot =
(org.apache.thrift.protocol.TTupleProtocol) prot;
- java.util.BitSet incoming = iprot.readBitSet(4);
- if (incoming.get(0)) {
- struct.tinfo = new
org.apache.accumulo.core.clientImpl.thrift.TInfo();
- struct.tinfo.read(iprot);
- struct.setTinfoIsSet(true);
- }
- if (incoming.get(1)) {
- struct.credentials = new
org.apache.accumulo.core.securityImpl.thrift.TCredentials();
- struct.credentials.read(iprot);
- struct.setCredentialsIsSet(true);
- }
- if (incoming.get(2)) {
- struct.serverName = iprot.readString();
- struct.setServerNameIsSet(true);
- }
- if (incoming.get(3)) {
- struct.split = new TabletSplit();
- struct.split.read(iprot);
- struct.setSplitIsSet(true);
- }
- }
- }
-
- private static <S extends org.apache.thrift.scheme.IScheme> S
scheme(org.apache.thrift.protocol.TProtocol proto) {
- return
(org.apache.thrift.scheme.StandardScheme.class.equals(proto.getScheme()) ?
STANDARD_SCHEME_FACTORY : TUPLE_SCHEME_FACTORY).getScheme();
- }
- }
-
@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
public static class reportTabletStatus_args implements
org.apache.thrift.TBase<reportTabletStatus_args,
reportTabletStatus_args._Fields>, java.io.Serializable, Cloneable,
Comparable<reportTabletStatus_args> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new
org.apache.thrift.protocol.TStruct("reportTabletStatus_args");
diff --git a/core/src/main/thrift/manager.thrift
b/core/src/main/thrift/manager.thrift
index 82d1fe20ab..8a436871b8 100644
--- a/core/src/main/thrift/manager.thrift
+++ b/core/src/main/thrift/manager.thrift
@@ -401,14 +401,6 @@ service ManagerClientService {
1:client.ThriftNotActiveServiceException tnase
)
- // tablet server reporting
- oneway void reportSplitExtent(
- 1:client.TInfo tinfo
- 2:security.TCredentials credentials
- 3:string serverName
- 4:TabletSplit split
- )
-
oneway void reportTabletStatus(
1:client.TInfo tinfo
2:security.TCredentials credentials
diff --git
a/server/manager/src/main/java/org/apache/accumulo/manager/ManagerClientServiceHandler.java
b/server/manager/src/main/java/org/apache/accumulo/manager/ManagerClientServiceHandler.java
index 77b058092f..c0b27b6f03 100644
---
a/server/manager/src/main/java/org/apache/accumulo/manager/ManagerClientServiceHandler.java
+++
b/server/manager/src/main/java/org/apache/accumulo/manager/ManagerClientServiceHandler.java
@@ -66,7 +66,6 @@ import
org.apache.accumulo.core.manager.thrift.ManagerGoalState;
import org.apache.accumulo.core.manager.thrift.ManagerMonitorInfo;
import org.apache.accumulo.core.manager.thrift.ManagerState;
import org.apache.accumulo.core.manager.thrift.TabletLoadState;
-import org.apache.accumulo.core.manager.thrift.TabletSplit;
import org.apache.accumulo.core.manager.thrift.ThriftPropertyException;
import org.apache.accumulo.core.metadata.MetadataTable;
import org.apache.accumulo.core.metadata.RootTable;
@@ -348,29 +347,6 @@ public class ManagerClientServiceHandler implements
ManagerClientService.Iface {
log.debug("FATE op shutting down " + tabletServer + " finished");
}
- @Override
- public void reportSplitExtent(TInfo info, TCredentials credentials, String
serverName,
- TabletSplit split) throws ThriftSecurityException {
- if (!manager.security.canPerformSystemActions(credentials)) {
- throw new ThriftSecurityException(credentials.getPrincipal(),
- SecurityErrorCode.PERMISSION_DENIED);
- }
-
- KeyExtent oldTablet = KeyExtent.fromThrift(split.oldTablet);
- if (manager.migrations.remove(oldTablet) != null) {
- Manager.log.info("Canceled migration of {}", split.oldTablet);
- }
- for (TServerInstance instance : manager.tserverSet.getCurrentServers()) {
- if (serverName.equals(instance.getHostPort())) {
- manager.nextEvent.event("%s reported split %s, %s", serverName,
- KeyExtent.fromThrift(split.newTablets.get(0)),
- KeyExtent.fromThrift(split.newTablets.get(1)));
- return;
- }
- }
- Manager.log.warn("Got a split from a server we don't recognize: {}",
serverName);
- }
-
@Override
public void reportTabletStatus(TInfo info, TCredentials credentials, String
serverName,
TabletLoadState status, TKeyExtent ttablet) throws
ThriftSecurityException {
