You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by st...@apache.org on 2012/05/05 06:22:54 UTC
svn commit: r1334314 [1/4] - in /hbase/trunk: conf/
security/src/main/java/org/apache/hadoop/hbase/security/
src/main/jamon/org/apache/hadoop/hbase/tmpl/regionserver/
src/main/java/org/apache/hadoop/hbase/
src/main/java/org/apache/hadoop/hbase/client/ ...
Author: stack
Date: Sat May 5 04:22:52 2012
New Revision: 1334314
URL: http://svn.apache.org/viewvc?rev=1334314&view=rev
Log:
HBASE-5889 Remove HRegionInterface
Removed:
hbase/trunk/src/main/java/org/apache/hadoop/hbase/ipc/HRegionInterface.java
hbase/trunk/src/main/java/org/apache/hadoop/hbase/regionserver/RegionServer.java
Modified:
hbase/trunk/conf/hbase-policy.xml
hbase/trunk/security/src/main/java/org/apache/hadoop/hbase/security/HBasePolicyProvider.java
hbase/trunk/src/main/jamon/org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmpl.jamon
hbase/trunk/src/main/java/org/apache/hadoop/hbase/HConstants.java
hbase/trunk/src/main/java/org/apache/hadoop/hbase/client/HBaseAdmin.java
hbase/trunk/src/main/java/org/apache/hadoop/hbase/ipc/HBaseRpcMetrics.java
hbase/trunk/src/main/java/org/apache/hadoop/hbase/mapreduce/TableOutputFormat.java
hbase/trunk/src/main/java/org/apache/hadoop/hbase/master/CatalogJanitor.java
hbase/trunk/src/main/java/org/apache/hadoop/hbase/master/ServerManager.java
hbase/trunk/src/main/java/org/apache/hadoop/hbase/protobuf/ProtobufUtil.java
hbase/trunk/src/main/java/org/apache/hadoop/hbase/protobuf/RequestConverter.java
hbase/trunk/src/main/java/org/apache/hadoop/hbase/protobuf/ResponseConverter.java
hbase/trunk/src/main/java/org/apache/hadoop/hbase/protobuf/generated/AdminProtos.java
hbase/trunk/src/main/java/org/apache/hadoop/hbase/protobuf/generated/ClientProtos.java
hbase/trunk/src/main/java/org/apache/hadoop/hbase/protobuf/generated/HBaseProtos.java
hbase/trunk/src/main/java/org/apache/hadoop/hbase/protobuf/generated/RPCProtos.java
hbase/trunk/src/main/java/org/apache/hadoop/hbase/protobuf/generated/ZooKeeperProtos.java
hbase/trunk/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java
hbase/trunk/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionThriftServer.java
hbase/trunk/src/main/protobuf/Admin.proto
hbase/trunk/src/main/protobuf/RPC.proto
hbase/trunk/src/main/resources/hbase-default.xml
hbase/trunk/src/test/java/org/apache/hadoop/hbase/TestDrainingServer.java
hbase/trunk/src/test/java/org/apache/hadoop/hbase/TestGlobalMemStoreSize.java
hbase/trunk/src/test/java/org/apache/hadoop/hbase/TestRegionRebalancing.java
hbase/trunk/src/test/java/org/apache/hadoop/hbase/catalog/TestCatalogTracker.java
hbase/trunk/src/test/java/org/apache/hadoop/hbase/client/HConnectionTestingUtility.java
hbase/trunk/src/test/java/org/apache/hadoop/hbase/client/TestAdmin.java
hbase/trunk/src/test/java/org/apache/hadoop/hbase/client/TestMultiParallel.java
hbase/trunk/src/test/java/org/apache/hadoop/hbase/coprocessor/TestMasterObserver.java
hbase/trunk/src/test/java/org/apache/hadoop/hbase/coprocessor/TestRegionObserverInterface.java
hbase/trunk/src/test/java/org/apache/hadoop/hbase/mapreduce/TestLoadIncrementalHFilesSplitRecovery.java
hbase/trunk/src/test/java/org/apache/hadoop/hbase/master/TestDistributedLogSplitting.java
hbase/trunk/src/test/java/org/apache/hadoop/hbase/master/TestMasterFailover.java
hbase/trunk/src/test/java/org/apache/hadoop/hbase/master/TestMasterRestartAfterDisablingTable.java
hbase/trunk/src/test/java/org/apache/hadoop/hbase/master/TestRollingRestart.java
hbase/trunk/src/test/java/org/apache/hadoop/hbase/master/TestZKBasedOpenCloseRegion.java
hbase/trunk/src/test/java/org/apache/hadoop/hbase/regionserver/TestEndToEndSplitTransaction.java
hbase/trunk/src/test/java/org/apache/hadoop/hbase/regionserver/TestRSStatusServlet.java
hbase/trunk/src/test/java/org/apache/hadoop/hbase/regionserver/TestRegionServerMetrics.java
hbase/trunk/src/test/java/org/apache/hadoop/hbase/regionserver/TestSplitTransactionOnCluster.java
hbase/trunk/src/test/java/org/apache/hadoop/hbase/util/TestHBaseFsck.java
Modified: hbase/trunk/conf/hbase-policy.xml
URL: http://svn.apache.org/viewvc/hbase/trunk/conf/hbase-policy.xml?rev=1334314&r1=1334313&r2=1334314&view=diff
==============================================================================
--- hbase/trunk/conf/hbase-policy.xml (original)
+++ hbase/trunk/conf/hbase-policy.xml Sat May 5 04:22:52 2012
@@ -24,7 +24,7 @@
<property>
<name>security.client.protocol.acl</name>
<value>*</value>
- <description>ACL for HRegionInterface protocol implementations (ie.
+ <description>ACL for ClientProtocol and AdminProtocol implementations (ie.
clients talking to HRegionServers)
The ACL is a comma-separated list of user and group names. The user and
group list is separated by a blank. For e.g. "alice,bob users,wheel".
Modified: hbase/trunk/security/src/main/java/org/apache/hadoop/hbase/security/HBasePolicyProvider.java
URL: http://svn.apache.org/viewvc/hbase/trunk/security/src/main/java/org/apache/hadoop/hbase/security/HBasePolicyProvider.java?rev=1334314&r1=1334313&r2=1334314&view=diff
==============================================================================
--- hbase/trunk/security/src/main/java/org/apache/hadoop/hbase/security/HBasePolicyProvider.java (original)
+++ hbase/trunk/security/src/main/java/org/apache/hadoop/hbase/security/HBasePolicyProvider.java Sat May 5 04:22:52 2012
@@ -18,8 +18,9 @@
package org.apache.hadoop.hbase.security;
import org.apache.hadoop.conf.Configuration;
+import org.apache.hadoop.hbase.client.AdminProtocol;
+import org.apache.hadoop.hbase.client.ClientProtocol;
import org.apache.hadoop.hbase.ipc.HMasterInterface;
-import org.apache.hadoop.hbase.ipc.HRegionInterface;
import org.apache.hadoop.hbase.ipc.RegionServerStatusProtocol;
import org.apache.hadoop.security.authorize.PolicyProvider;
import org.apache.hadoop.security.authorize.Service;
@@ -31,7 +32,8 @@ import org.apache.hadoop.security.author
*/
public class HBasePolicyProvider extends PolicyProvider {
protected static Service[] services = {
- new Service("security.client.protocol.acl", HRegionInterface.class),
+ new Service("security.client.protocol.acl", ClientProtocol.class),
+ new Service("security.client.protocol.acl", AdminProtocol.class),
new Service("security.admin.protocol.acl", HMasterInterface.class),
new Service("security.masterregion.protocol.acl", RegionServerStatusProtocol.class)
};
Modified: hbase/trunk/src/main/jamon/org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmpl.jamon
URL: http://svn.apache.org/viewvc/hbase/trunk/src/main/jamon/org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmpl.jamon?rev=1334314&r1=1334313&r2=1334314&view=diff
==============================================================================
--- hbase/trunk/src/main/jamon/org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmpl.jamon (original)
+++ hbase/trunk/src/main/jamon/org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmpl.jamon Sat May 5 04:22:52 2012
@@ -24,31 +24,25 @@ String format = "html";
</%args>
<%import>
java.util.*;
-java.io.IOException;
-org.apache.hadoop.io.Text;
org.apache.hadoop.hbase.regionserver.HRegionServer;
-org.apache.hadoop.hbase.regionserver.HRegion;
org.apache.hadoop.hbase.regionserver.metrics.RegionServerMetrics;
org.apache.hadoop.hbase.util.Bytes;
-org.apache.hadoop.hbase.HConstants;
-org.apache.hadoop.hbase.HServerInfo;
-org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ServerLoad;
-org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionLoad;
org.apache.hadoop.hbase.HRegionInfo;
org.apache.hadoop.hbase.ServerName;
org.apache.hadoop.hbase.HBaseConfiguration;
+org.apache.hadoop.hbase.protobuf.ProtobufUtil;
+org.apache.hadoop.hbase.protobuf.generated.AdminProtos.ServerInfo;
+org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionLoad;
</%import>
<%if format.equals("json") %>
<& ../common/TaskMonitorTmpl; filter = filter; format = "json" &>
<%java return; %>
</%if>
<%java>
- HServerInfo serverInfo = null;
- ServerName serverName = null;
- serverInfo = regionServer.getHServerInfo();
- serverName = regionServer.getServerName();
RegionServerMetrics metrics = regionServer.getMetrics();
- List<HRegionInfo> onlineRegions = regionServer.getOnlineRegions();
+ ServerInfo serverInfo = ProtobufUtil.getServerInfo(regionServer);
+ ServerName serverName = ProtobufUtil.toServerName(serverInfo.getServerName());
+ List<HRegionInfo> onlineRegions = ProtobufUtil.getOnlineRegions(regionServer);
int masterInfoPort = regionServer.getConfiguration().getInt("hbase.master.info.port", 60010);
</%java>
<?xml version="1.0" encoding="UTF-8" ?>
@@ -59,7 +53,7 @@ org.apache.hadoop.hbase.HBaseConfigurati
-->
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="Content-Type" content="text/html;charset=UTF-8"/>
-<title>HBase Region Server: <% serverName %>:<% serverInfo.getServerAddress().getPort() %></title>
+<title>HBase Region Server: <% serverName %></title>
<link rel="stylesheet" type="text/css" href="/static/hbase.css" />
</head>
Modified: hbase/trunk/src/main/java/org/apache/hadoop/hbase/HConstants.java
URL: http://svn.apache.org/viewvc/hbase/trunk/src/main/java/org/apache/hadoop/hbase/HConstants.java?rev=1334314&r1=1334313&r2=1334314&view=diff
==============================================================================
--- hbase/trunk/src/main/java/org/apache/hadoop/hbase/HConstants.java (original)
+++ hbase/trunk/src/main/java/org/apache/hadoop/hbase/HConstants.java Sat May 5 04:22:52 2012
@@ -27,7 +27,6 @@ import java.util.regex.Pattern;
import org.apache.hadoop.classification.InterfaceAudience;
import org.apache.hadoop.classification.InterfaceStability;
-import org.apache.hadoop.hbase.ipc.HRegionInterface;
import org.apache.hadoop.hbase.util.Bytes;
/**
@@ -184,15 +183,9 @@ public final class HConstants {
public static final String REGIONSERVER_INFO_PORT_AUTO =
REGIONSERVER_INFO_PORT + ".auto";
- /** Parameter name for what region server interface to use. */
- public static final String REGION_SERVER_CLASS = "hbase.regionserver.class";
-
/** Parameter name for what region server implementation to use. */
public static final String REGION_SERVER_IMPL= "hbase.regionserver.impl";
- /** Default region server interface class name. */
- public static final String DEFAULT_REGION_SERVER_CLASS = HRegionInterface.class.getName();
-
/** Parameter name for what master implementation to use. */
public static final String MASTER_IMPL= "hbase.master.impl";
Modified: hbase/trunk/src/main/java/org/apache/hadoop/hbase/client/HBaseAdmin.java
URL: http://svn.apache.org/viewvc/hbase/trunk/src/main/java/org/apache/hadoop/hbase/client/HBaseAdmin.java?rev=1334314&r1=1334313&r2=1334314&view=diff
==============================================================================
--- hbase/trunk/src/main/java/org/apache/hadoop/hbase/client/HBaseAdmin.java (original)
+++ hbase/trunk/src/main/java/org/apache/hadoop/hbase/client/HBaseAdmin.java Sat May 5 04:22:52 2012
@@ -66,7 +66,6 @@ import org.apache.hadoop.hbase.protobuf.
import org.apache.hadoop.hbase.protobuf.generated.AdminProtos.FlushRegionRequest;
import org.apache.hadoop.hbase.protobuf.generated.AdminProtos.RollWALWriterRequest;
import org.apache.hadoop.hbase.protobuf.generated.AdminProtos.RollWALWriterResponse;
-import org.apache.hadoop.hbase.protobuf.generated.AdminProtos.SplitRegionRequest;
import org.apache.hadoop.hbase.protobuf.generated.AdminProtos.StopServerRequest;
import org.apache.hadoop.hbase.protobuf.generated.ClientProtos.ScanRequest;
import org.apache.hadoop.hbase.protobuf.generated.ClientProtos.ScanResponse;
@@ -1507,13 +1506,7 @@ public class HBaseAdmin implements Abort
byte[] splitPoint) throws IOException {
AdminProtocol admin =
this.connection.getAdmin(sn.getHostname(), sn.getPort());
- SplitRegionRequest request =
- RequestConverter.buildSplitRegionRequest(hri.getRegionName(), splitPoint);
- try {
- admin.splitRegion(null, request);
- } catch (ServiceException se) {
- throw ProtobufUtil.getRemoteException(se);
- }
+ ProtobufUtil.split(admin, hri, splitPoint);
}
/**
Modified: hbase/trunk/src/main/java/org/apache/hadoop/hbase/ipc/HBaseRpcMetrics.java
URL: http://svn.apache.org/viewvc/hbase/trunk/src/main/java/org/apache/hadoop/hbase/ipc/HBaseRpcMetrics.java?rev=1334314&r1=1334313&r2=1334314&view=diff
==============================================================================
--- hbase/trunk/src/main/java/org/apache/hadoop/hbase/ipc/HBaseRpcMetrics.java (original)
+++ hbase/trunk/src/main/java/org/apache/hadoop/hbase/ipc/HBaseRpcMetrics.java Sat May 5 04:22:52 2012
@@ -23,6 +23,8 @@ package org.apache.hadoop.hbase.ipc;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.hadoop.classification.InterfaceAudience;
+import org.apache.hadoop.hbase.client.AdminProtocol;
+import org.apache.hadoop.hbase.client.ClientProtocol;
import org.apache.hadoop.hbase.ipc.VersionedProtocol;
import org.apache.hadoop.metrics.MetricsContext;
import org.apache.hadoop.metrics.MetricsRecord;
@@ -66,7 +68,8 @@ public class HBaseRpcMetrics implements
initMethods(HMasterInterface.class);
initMethods(RegionServerStatusProtocol.class);
- initMethods(HRegionInterface.class);
+ initMethods(ClientProtocol.class);
+ initMethods(AdminProtocol.class);
rpcStatistics = new HBaseRPCStatistics(this.registry, hostName, port);
}
Modified: hbase/trunk/src/main/java/org/apache/hadoop/hbase/mapreduce/TableOutputFormat.java
URL: http://svn.apache.org/viewvc/hbase/trunk/src/main/java/org/apache/hadoop/hbase/mapreduce/TableOutputFormat.java?rev=1334314&r1=1334313&r2=1334314&view=diff
==============================================================================
--- hbase/trunk/src/main/java/org/apache/hadoop/hbase/mapreduce/TableOutputFormat.java (original)
+++ hbase/trunk/src/main/java/org/apache/hadoop/hbase/mapreduce/TableOutputFormat.java Sat May 5 04:22:52 2012
@@ -196,7 +196,6 @@ implements Configurable {
ZKUtil.applyClusterKeyToConf(this.conf, address);
}
if (serverClass != null) {
- this.conf.set(HConstants.REGION_SERVER_CLASS, serverClass);
this.conf.set(HConstants.REGION_SERVER_IMPL, serverImpl);
}
if (zkClientPort != 0) {
Modified: hbase/trunk/src/main/java/org/apache/hadoop/hbase/master/CatalogJanitor.java
URL: http://svn.apache.org/viewvc/hbase/trunk/src/main/java/org/apache/hadoop/hbase/master/CatalogJanitor.java?rev=1334314&r1=1334313&r2=1334314&view=diff
==============================================================================
--- hbase/trunk/src/main/java/org/apache/hadoop/hbase/master/CatalogJanitor.java (original)
+++ hbase/trunk/src/main/java/org/apache/hadoop/hbase/master/CatalogJanitor.java Sat May 5 04:22:52 2012
@@ -194,7 +194,6 @@ class CatalogJanitor extends Chore {
/**
* If daughters no longer hold reference to the parents, delete the parent.
- * @param server HRegionInterface of meta server to talk to
* @param parent HRegionInfo of split offlined parent
* @param rowContent Content of <code>parent</code> row in
* <code>metaRegionName</code>
Modified: hbase/trunk/src/main/java/org/apache/hadoop/hbase/master/ServerManager.java
URL: http://svn.apache.org/viewvc/hbase/trunk/src/main/java/org/apache/hadoop/hbase/master/ServerManager.java?rev=1334314&r1=1334313&r2=1334314&view=diff
==============================================================================
--- hbase/trunk/src/main/java/org/apache/hadoop/hbase/master/ServerManager.java (original)
+++ hbase/trunk/src/main/java/org/apache/hadoop/hbase/master/ServerManager.java Sat May 5 04:22:52 2012
@@ -38,8 +38,11 @@ import org.apache.hadoop.conf.Configurat
import org.apache.hadoop.hbase.ClockOutOfSyncException;
import org.apache.hadoop.hbase.HRegionInfo;
import org.apache.hadoop.hbase.HServerAddress;
-import org.apache.hadoop.hbase.HConstants;
import org.apache.hadoop.hbase.protobuf.ProtobufUtil;
+import org.apache.hadoop.hbase.protobuf.RequestConverter;
+import org.apache.hadoop.hbase.protobuf.ResponseConverter;
+import org.apache.hadoop.hbase.protobuf.generated.AdminProtos.OpenRegionRequest;
+import org.apache.hadoop.hbase.protobuf.generated.AdminProtos.OpenRegionResponse;
import org.apache.hadoop.hbase.ServerLoad;
import org.apache.hadoop.hbase.PleaseHoldException;
import org.apache.hadoop.hbase.Server;
@@ -55,6 +58,8 @@ import org.apache.hadoop.hbase.master.ha
import org.apache.hadoop.hbase.monitoring.MonitoredTask;
import org.apache.hadoop.hbase.regionserver.RegionOpeningState;
+import com.google.protobuf.ServiceException;
+
/**
* The ServerManager class manages info about region servers.
* <p>
@@ -484,7 +489,14 @@ public class ServerManager {
" failed because no RPC connection found to this server");
return RegionOpeningState.FAILED_OPENING;
}
- return ProtobufUtil.openRegion(admin, region, versionOfOfflineNode);
+ OpenRegionRequest request =
+ RequestConverter.buildOpenRegionRequest(region, versionOfOfflineNode);
+ try {
+ OpenRegionResponse response = admin.openRegion(null, request);
+ return ResponseConverter.getRegionOpeningState(response);
+ } catch (ServiceException se) {
+ throw ProtobufUtil.getRemoteException(se);
+ }
}
/**
Modified: hbase/trunk/src/main/java/org/apache/hadoop/hbase/protobuf/ProtobufUtil.java
URL: http://svn.apache.org/viewvc/hbase/trunk/src/main/java/org/apache/hadoop/hbase/protobuf/ProtobufUtil.java?rev=1334314&r1=1334313&r2=1334314&view=diff
==============================================================================
--- hbase/trunk/src/main/java/org/apache/hadoop/hbase/protobuf/ProtobufUtil.java (original)
+++ hbase/trunk/src/main/java/org/apache/hadoop/hbase/protobuf/ProtobufUtil.java Sat May 5 04:22:52 2012
@@ -77,8 +77,9 @@ import org.apache.hadoop.hbase.protobuf.
import org.apache.hadoop.hbase.protobuf.generated.AdminProtos.GetStoreFileRequest;
import org.apache.hadoop.hbase.protobuf.generated.AdminProtos.GetStoreFileResponse;
import org.apache.hadoop.hbase.protobuf.generated.AdminProtos.OpenRegionRequest;
-import org.apache.hadoop.hbase.protobuf.generated.AdminProtos.OpenRegionResponse;
import org.apache.hadoop.hbase.protobuf.generated.AdminProtos.ReplicateWALEntryRequest;
+import org.apache.hadoop.hbase.protobuf.generated.AdminProtos.ServerInfo;
+import org.apache.hadoop.hbase.protobuf.generated.AdminProtos.SplitRegionRequest;
import org.apache.hadoop.hbase.protobuf.generated.AdminProtos.UUID;
import org.apache.hadoop.hbase.protobuf.generated.AdminProtos.WALEntry;
import org.apache.hadoop.hbase.protobuf.generated.AdminProtos.WALEntry.WALEdit.FamilyScope;
@@ -102,7 +103,6 @@ import org.apache.hadoop.hbase.protobuf.
import org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.NameStringPair;
import org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionInfo;
import org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionLoad;
-import org.apache.hadoop.hbase.regionserver.RegionOpeningState;
import org.apache.hadoop.hbase.regionserver.wal.HLog;
import org.apache.hadoop.hbase.regionserver.wal.HLogKey;
import org.apache.hadoop.hbase.regionserver.wal.WALEdit;
@@ -1287,19 +1287,16 @@ public final class ProtobufUtil {
*
* @param admin
* @param region
- * @param versionOfOfflineNode
- * @return the region opening state
* @throws IOException
*/
- public static RegionOpeningState openRegion(final AdminProtocol admin,
- final HRegionInfo region, final int versionOfOfflineNode) throws IOException {
+ public static void openRegion(final AdminProtocol admin,
+ final HRegionInfo region) throws IOException {
OpenRegionRequest request =
- RequestConverter.buildOpenRegionRequest(region, versionOfOfflineNode);
+ RequestConverter.buildOpenRegionRequest(region, -1);
try {
- OpenRegionResponse response = admin.openRegion(null, request);
- return ResponseConverter.getRegionOpeningState(response);
+ admin.openRegion(null, request);
} catch (ServiceException se) {
- throw getRemoteException(se);
+ throw ProtobufUtil.getRemoteException(se);
}
}
@@ -1337,8 +1334,10 @@ public final class ProtobufUtil {
GetOnlineRegionResponse response =
admin.getOnlineRegion(null, request);
regions = new ArrayList<HRegionInfo>();
- for (RegionInfo regionInfo: response.getRegionInfoList()) {
- regions.add(toRegionInfo(regionInfo));
+ if (response != null) { // it can be null only mockup testing region sever
+ for (RegionInfo regionInfo: response.getRegionInfoList()) {
+ regions.add(toRegionInfo(regionInfo));
+ }
}
return regions;
} catch (ServiceException se) {
@@ -1353,12 +1352,12 @@ public final class ProtobufUtil {
* @return the server name
* @throws IOException
*/
- public static ServerName getServerInfo(
+ public static ServerInfo getServerInfo(
final AdminProtocol admin) throws IOException {
GetServerInfoRequest request = RequestConverter.buildGetServerInfoRequest();
try {
GetServerInfoResponse response = admin.getServerInfo(null, request);
- return toServerName(response.getServerName());
+ return response.getServerInfo();
} catch (ServiceException se) {
throw getRemoteException(se);
}
@@ -1404,6 +1403,27 @@ public final class ProtobufUtil {
}
}
+ /**
+ * A helper to split a region using admin protocol.
+ *
+ * @param admin
+ * @param hri
+ * @param splitPoint
+ * @throws IOException
+ */
+ public static void split(final AdminProtocol admin,
+ final HRegionInfo hri, byte[] splitPoint) throws IOException {
+ SplitRegionRequest request =
+ RequestConverter.buildSplitRegionRequest(hri.getRegionName(), splitPoint);
+ try {
+ admin.splitRegion(null, request);
+ } catch (ServiceException se) {
+ throw ProtobufUtil.getRemoteException(se);
+ }
+ }
+
+// End helpers for Admin
+
/*
* Get the total (read + write) requests from a RegionLoad pb
* @param rl - RegionLoad pb
@@ -1416,6 +1436,4 @@ public final class ProtobufUtil {
return rl.getReadRequestsCount() + rl.getWriteRequestsCount();
}
-
-// End helpers for Admin
}
Modified: hbase/trunk/src/main/java/org/apache/hadoop/hbase/protobuf/RequestConverter.java
URL: http://svn.apache.org/viewvc/hbase/trunk/src/main/java/org/apache/hadoop/hbase/protobuf/RequestConverter.java?rev=1334314&r1=1334313&r2=1334314&view=diff
==============================================================================
--- hbase/trunk/src/main/java/org/apache/hadoop/hbase/protobuf/RequestConverter.java (original)
+++ hbase/trunk/src/main/java/org/apache/hadoop/hbase/protobuf/RequestConverter.java Sat May 5 04:22:52 2012
@@ -83,7 +83,6 @@ import org.apache.hadoop.hbase.util.Byte
import org.apache.hadoop.hbase.util.Pair;
import com.google.protobuf.ByteString;
-import com.google.protobuf.Message;
/**
* Helper utility to build protocol buffer requests,
Modified: hbase/trunk/src/main/java/org/apache/hadoop/hbase/protobuf/ResponseConverter.java
URL: http://svn.apache.org/viewvc/hbase/trunk/src/main/java/org/apache/hadoop/hbase/protobuf/ResponseConverter.java?rev=1334314&r1=1334313&r2=1334314&view=diff
==============================================================================
--- hbase/trunk/src/main/java/org/apache/hadoop/hbase/protobuf/ResponseConverter.java (original)
+++ hbase/trunk/src/main/java/org/apache/hadoop/hbase/protobuf/ResponseConverter.java Sat May 5 04:22:52 2012
@@ -23,11 +23,14 @@ import java.util.List;
import org.apache.hadoop.classification.InterfaceAudience;
import org.apache.hadoop.hbase.HRegionInfo;
+import org.apache.hadoop.hbase.ServerName;
import org.apache.hadoop.hbase.client.Result;
import org.apache.hadoop.hbase.protobuf.generated.AdminProtos.CloseRegionResponse;
import org.apache.hadoop.hbase.protobuf.generated.AdminProtos.GetOnlineRegionResponse;
+import org.apache.hadoop.hbase.protobuf.generated.AdminProtos.GetServerInfoResponse;
import org.apache.hadoop.hbase.protobuf.generated.AdminProtos.OpenRegionResponse;
import org.apache.hadoop.hbase.protobuf.generated.AdminProtos.RollWALWriterResponse;
+import org.apache.hadoop.hbase.protobuf.generated.AdminProtos.ServerInfo;
import org.apache.hadoop.hbase.protobuf.generated.ClientProtos;
import org.apache.hadoop.hbase.protobuf.generated.ClientProtos.ActionResult;
import org.apache.hadoop.hbase.protobuf.generated.ClientProtos.ScanResponse;
@@ -170,5 +173,39 @@ public final class ResponseConverter {
return proto.getClosed();
}
+ /**
+ * A utility to build a GetServerInfoResponse.
+ *
+ * @param serverName
+ * @param webuiPort
+ * @return the response
+ */
+ public static GetServerInfoResponse buildGetServerInfoResponse(
+ final ServerName serverName, final int webuiPort) {
+ GetServerInfoResponse.Builder builder = GetServerInfoResponse.newBuilder();
+ ServerInfo.Builder serverInfoBuilder = ServerInfo.newBuilder();
+ serverInfoBuilder.setServerName(ProtobufUtil.toServerName(serverName));
+ if (webuiPort >= 0) {
+ serverInfoBuilder.setWebuiPort(webuiPort);
+ }
+ builder.setServerInfo(serverInfoBuilder.build());
+ return builder.build();
+ }
+
+ /**
+ * A utility to build a GetOnlineRegionResponse.
+ *
+ * @param regions
+ * @return the response
+ */
+ public static GetOnlineRegionResponse buildGetOnlineRegionResponse(
+ final List<HRegionInfo> regions) {
+ GetOnlineRegionResponse.Builder builder = GetOnlineRegionResponse.newBuilder();
+ for (HRegionInfo region: regions) {
+ builder.addRegionInfo(ProtobufUtil.toRegionInfo(region));
+ }
+ return builder.build();
+ }
+
// End utilities for Admin
}
Modified: hbase/trunk/src/main/java/org/apache/hadoop/hbase/protobuf/generated/AdminProtos.java
URL: http://svn.apache.org/viewvc/hbase/trunk/src/main/java/org/apache/hadoop/hbase/protobuf/generated/AdminProtos.java?rev=1334314&r1=1334313&r2=1334314&view=diff
==============================================================================
--- hbase/trunk/src/main/java/org/apache/hadoop/hbase/protobuf/generated/AdminProtos.java (original)
+++ hbase/trunk/src/main/java/org/apache/hadoop/hbase/protobuf/generated/AdminProtos.java Sat May 5 04:22:52 2012
@@ -102,13 +102,15 @@ public final class AdminProtos {
return size;
}
+ private static final long serialVersionUID = 0L;
@java.lang.Override
- protected Object writeReplace() throws java.io.ObjectStreamException {
+ protected java.lang.Object writeReplace()
+ throws java.io.ObjectStreamException {
return super.writeReplace();
}
@java.lang.Override
- public boolean equals(final Object obj) {
+ public boolean equals(final java.lang.Object obj) {
if (obj == this) {
return true;
}
@@ -573,13 +575,15 @@ public final class AdminProtos {
return size;
}
+ private static final long serialVersionUID = 0L;
@java.lang.Override
- protected Object writeReplace() throws java.io.ObjectStreamException {
+ protected java.lang.Object writeReplace()
+ throws java.io.ObjectStreamException {
return super.writeReplace();
}
@java.lang.Override
- public boolean equals(final Object obj) {
+ public boolean equals(final java.lang.Object obj) {
if (obj == this) {
return true;
}
@@ -1076,13 +1080,15 @@ public final class AdminProtos {
return size;
}
+ private static final long serialVersionUID = 0L;
@java.lang.Override
- protected Object writeReplace() throws java.io.ObjectStreamException {
+ protected java.lang.Object writeReplace()
+ throws java.io.ObjectStreamException {
return super.writeReplace();
}
@java.lang.Override
- public boolean equals(final Object obj) {
+ public boolean equals(final java.lang.Object obj) {
if (obj == this) {
return true;
}
@@ -1623,13 +1629,15 @@ public final class AdminProtos {
return size;
}
+ private static final long serialVersionUID = 0L;
@java.lang.Override
- protected Object writeReplace() throws java.io.ObjectStreamException {
+ protected java.lang.Object writeReplace()
+ throws java.io.ObjectStreamException {
return super.writeReplace();
}
@java.lang.Override
- public boolean equals(final Object obj) {
+ public boolean equals(final java.lang.Object obj) {
if (obj == this) {
return true;
}
@@ -2008,13 +2016,15 @@ public final class AdminProtos {
return size;
}
+ private static final long serialVersionUID = 0L;
@java.lang.Override
- protected Object writeReplace() throws java.io.ObjectStreamException {
+ protected java.lang.Object writeReplace()
+ throws java.io.ObjectStreamException {
return super.writeReplace();
}
@java.lang.Override
- public boolean equals(final Object obj) {
+ public boolean equals(final java.lang.Object obj) {
if (obj == this) {
return true;
}
@@ -2351,13 +2361,15 @@ public final class AdminProtos {
return size;
}
+ private static final long serialVersionUID = 0L;
@java.lang.Override
- protected Object writeReplace() throws java.io.ObjectStreamException {
+ protected java.lang.Object writeReplace()
+ throws java.io.ObjectStreamException {
return super.writeReplace();
}
@java.lang.Override
- public boolean equals(final Object obj) {
+ public boolean equals(final java.lang.Object obj) {
if (obj == this) {
return true;
}
@@ -2965,13 +2977,15 @@ public final class AdminProtos {
return size;
}
+ private static final long serialVersionUID = 0L;
@java.lang.Override
- protected Object writeReplace() throws java.io.ObjectStreamException {
+ protected java.lang.Object writeReplace()
+ throws java.io.ObjectStreamException {
return super.writeReplace();
}
@java.lang.Override
- public boolean equals(final Object obj) {
+ public boolean equals(final java.lang.Object obj) {
if (obj == this) {
return true;
}
@@ -3660,13 +3674,15 @@ public final class AdminProtos {
return size;
}
+ private static final long serialVersionUID = 0L;
@java.lang.Override
- protected Object writeReplace() throws java.io.ObjectStreamException {
+ protected java.lang.Object writeReplace()
+ throws java.io.ObjectStreamException {
return super.writeReplace();
}
@java.lang.Override
- public boolean equals(final Object obj) {
+ public boolean equals(final java.lang.Object obj) {
if (obj == this) {
return true;
}
@@ -4138,13 +4154,15 @@ public final class AdminProtos {
return size;
}
+ private static final long serialVersionUID = 0L;
@java.lang.Override
- protected Object writeReplace() throws java.io.ObjectStreamException {
+ protected java.lang.Object writeReplace()
+ throws java.io.ObjectStreamException {
return super.writeReplace();
}
@java.lang.Override
- public boolean equals(final Object obj) {
+ public boolean equals(final java.lang.Object obj) {
if (obj == this) {
return true;
}
@@ -4689,13 +4707,15 @@ public final class AdminProtos {
return size;
}
+ private static final long serialVersionUID = 0L;
@java.lang.Override
- protected Object writeReplace() throws java.io.ObjectStreamException {
+ protected java.lang.Object writeReplace()
+ throws java.io.ObjectStreamException {
return super.writeReplace();
}
@java.lang.Override
- public boolean equals(final Object obj) {
+ public boolean equals(final java.lang.Object obj) {
if (obj == this) {
return true;
}
@@ -5096,13 +5116,15 @@ public final class AdminProtos {
return size;
}
+ private static final long serialVersionUID = 0L;
@java.lang.Override
- protected Object writeReplace() throws java.io.ObjectStreamException {
+ protected java.lang.Object writeReplace()
+ throws java.io.ObjectStreamException {
return super.writeReplace();
}
@java.lang.Override
- public boolean equals(final Object obj) {
+ public boolean equals(final java.lang.Object obj) {
if (obj == this) {
return true;
}
@@ -5625,13 +5647,15 @@ public final class AdminProtos {
return size;
}
+ private static final long serialVersionUID = 0L;
@java.lang.Override
- protected Object writeReplace() throws java.io.ObjectStreamException {
+ protected java.lang.Object writeReplace()
+ throws java.io.ObjectStreamException {
return super.writeReplace();
}
@java.lang.Override
- public boolean equals(final Object obj) {
+ public boolean equals(final java.lang.Object obj) {
if (obj == this) {
return true;
}
@@ -6076,13 +6100,15 @@ public final class AdminProtos {
return size;
}
+ private static final long serialVersionUID = 0L;
@java.lang.Override
- protected Object writeReplace() throws java.io.ObjectStreamException {
+ protected java.lang.Object writeReplace()
+ throws java.io.ObjectStreamException {
return super.writeReplace();
}
@java.lang.Override
- public boolean equals(final Object obj) {
+ public boolean equals(final java.lang.Object obj) {
if (obj == this) {
return true;
}
@@ -6559,13 +6585,15 @@ public final class AdminProtos {
return size;
}
+ private static final long serialVersionUID = 0L;
@java.lang.Override
- protected Object writeReplace() throws java.io.ObjectStreamException {
+ protected java.lang.Object writeReplace()
+ throws java.io.ObjectStreamException {
return super.writeReplace();
}
@java.lang.Override
- public boolean equals(final Object obj) {
+ public boolean equals(final java.lang.Object obj) {
if (obj == this) {
return true;
}
@@ -6914,13 +6942,15 @@ public final class AdminProtos {
return size;
}
+ private static final long serialVersionUID = 0L;
@java.lang.Override
- protected Object writeReplace() throws java.io.ObjectStreamException {
+ protected java.lang.Object writeReplace()
+ throws java.io.ObjectStreamException {
return super.writeReplace();
}
@java.lang.Override
- public boolean equals(final Object obj) {
+ public boolean equals(final java.lang.Object obj) {
if (obj == this) {
return true;
}
@@ -7394,13 +7424,15 @@ public final class AdminProtos {
return size;
}
+ private static final long serialVersionUID = 0L;
@java.lang.Override
- protected Object writeReplace() throws java.io.ObjectStreamException {
+ protected java.lang.Object writeReplace()
+ throws java.io.ObjectStreamException {
return super.writeReplace();
}
@java.lang.Override
- public boolean equals(final Object obj) {
+ public boolean equals(final java.lang.Object obj) {
if (obj == this) {
return true;
}
@@ -7745,13 +7777,15 @@ public final class AdminProtos {
return size;
}
+ private static final long serialVersionUID = 0L;
@java.lang.Override
- protected Object writeReplace() throws java.io.ObjectStreamException {
+ protected java.lang.Object writeReplace()
+ throws java.io.ObjectStreamException {
return super.writeReplace();
}
@java.lang.Override
- public boolean equals(final Object obj) {
+ public boolean equals(final java.lang.Object obj) {
if (obj == this) {
return true;
}
@@ -8321,13 +8355,15 @@ public final class AdminProtos {
return size;
}
+ private static final long serialVersionUID = 0L;
@java.lang.Override
- protected Object writeReplace() throws java.io.ObjectStreamException {
+ protected java.lang.Object writeReplace()
+ throws java.io.ObjectStreamException {
return super.writeReplace();
}
@java.lang.Override
- public boolean equals(final Object obj) {
+ public boolean equals(final java.lang.Object obj) {
if (obj == this) {
return true;
}
@@ -9121,13 +9157,15 @@ public final class AdminProtos {
return size;
}
+ private static final long serialVersionUID = 0L;
@java.lang.Override
- protected Object writeReplace() throws java.io.ObjectStreamException {
+ protected java.lang.Object writeReplace()
+ throws java.io.ObjectStreamException {
return super.writeReplace();
}
@java.lang.Override
- public boolean equals(final Object obj) {
+ public boolean equals(final java.lang.Object obj) {
if (obj == this) {
return true;
}
@@ -9562,13 +9600,15 @@ public final class AdminProtos {
return size;
}
+ private static final long serialVersionUID = 0L;
@java.lang.Override
- protected Object writeReplace() throws java.io.ObjectStreamException {
+ protected java.lang.Object writeReplace()
+ throws java.io.ObjectStreamException {
return super.writeReplace();
}
@java.lang.Override
- public boolean equals(final Object obj) {
+ public boolean equals(final java.lang.Object obj) {
if (obj == this) {
return true;
}
@@ -10215,13 +10255,15 @@ public final class AdminProtos {
return size;
}
+ private static final long serialVersionUID = 0L;
@java.lang.Override
- protected Object writeReplace() throws java.io.ObjectStreamException {
+ protected java.lang.Object writeReplace()
+ throws java.io.ObjectStreamException {
return super.writeReplace();
}
@java.lang.Override
- public boolean equals(final Object obj) {
+ public boolean equals(final java.lang.Object obj) {
if (obj == this) {
return true;
}
@@ -10830,13 +10872,15 @@ public final class AdminProtos {
return size;
}
+ private static final long serialVersionUID = 0L;
@java.lang.Override
- protected Object writeReplace() throws java.io.ObjectStreamException {
+ protected java.lang.Object writeReplace()
+ throws java.io.ObjectStreamException {
return super.writeReplace();
}
@java.lang.Override
- public boolean equals(final Object obj) {
+ public boolean equals(final java.lang.Object obj) {
if (obj == this) {
return true;
}
@@ -11376,13 +11420,15 @@ public final class AdminProtos {
return size;
}
+ private static final long serialVersionUID = 0L;
@java.lang.Override
- protected Object writeReplace() throws java.io.ObjectStreamException {
+ protected java.lang.Object writeReplace()
+ throws java.io.ObjectStreamException {
return super.writeReplace();
}
@java.lang.Override
- public boolean equals(final Object obj) {
+ public boolean equals(final java.lang.Object obj) {
if (obj == this) {
return true;
}
@@ -11674,13 +11720,15 @@ public final class AdminProtos {
return size;
}
+ private static final long serialVersionUID = 0L;
@java.lang.Override
- protected Object writeReplace() throws java.io.ObjectStreamException {
+ protected java.lang.Object writeReplace()
+ throws java.io.ObjectStreamException {
return super.writeReplace();
}
@java.lang.Override
- public boolean equals(final Object obj) {
+ public boolean equals(final java.lang.Object obj) {
if (obj == this) {
return true;
}
@@ -12004,13 +12052,15 @@ public final class AdminProtos {
return size;
}
+ private static final long serialVersionUID = 0L;
@java.lang.Override
- protected Object writeReplace() throws java.io.ObjectStreamException {
+ protected java.lang.Object writeReplace()
+ throws java.io.ObjectStreamException {
return super.writeReplace();
}
@java.lang.Override
- public boolean equals(final Object obj) {
+ public boolean equals(final java.lang.Object obj) {
if (obj == this) {
return true;
}
@@ -12362,12 +12412,12 @@ public final class AdminProtos {
private int bitField0_;
// required string reason = 1;
public static final int REASON_FIELD_NUMBER = 1;
- private Object reason_;
+ private java.lang.Object reason_;
public boolean hasReason() {
return ((bitField0_ & 0x00000001) == 0x00000001);
}
public String getReason() {
- Object ref = reason_;
+ java.lang.Object ref = reason_;
if (ref instanceof String) {
return (String) ref;
} else {
@@ -12381,7 +12431,7 @@ public final class AdminProtos {
}
}
private com.google.protobuf.ByteString getReasonBytes() {
- Object ref = reason_;
+ java.lang.Object ref = reason_;
if (ref instanceof String) {
com.google.protobuf.ByteString b =
com.google.protobuf.ByteString.copyFromUtf8((String) ref);
@@ -12432,13 +12482,15 @@ public final class AdminProtos {
return size;
}
+ private static final long serialVersionUID = 0L;
@java.lang.Override
- protected Object writeReplace() throws java.io.ObjectStreamException {
+ protected java.lang.Object writeReplace()
+ throws java.io.ObjectStreamException {
return super.writeReplace();
}
@java.lang.Override
- public boolean equals(final Object obj) {
+ public boolean equals(final java.lang.Object obj) {
if (obj == this) {
return true;
}
@@ -12692,12 +12744,12 @@ public final class AdminProtos {
private int bitField0_;
// required string reason = 1;
- private Object reason_ = "";
+ private java.lang.Object reason_ = "";
public boolean hasReason() {
return ((bitField0_ & 0x00000001) == 0x00000001);
}
public String getReason() {
- Object ref = reason_;
+ java.lang.Object ref = reason_;
if (!(ref instanceof String)) {
String s = ((com.google.protobuf.ByteString) ref).toStringUtf8();
reason_ = s;
@@ -12797,13 +12849,15 @@ public final class AdminProtos {
return size;
}
+ private static final long serialVersionUID = 0L;
@java.lang.Override
- protected Object writeReplace() throws java.io.ObjectStreamException {
+ protected java.lang.Object writeReplace()
+ throws java.io.ObjectStreamException {
return super.writeReplace();
}
@java.lang.Override
- public boolean equals(final Object obj) {
+ public boolean equals(final java.lang.Object obj) {
if (obj == this) {
return true;
}
@@ -13095,13 +13149,15 @@ public final class AdminProtos {
return size;
}
+ private static final long serialVersionUID = 0L;
@java.lang.Override
- protected Object writeReplace() throws java.io.ObjectStreamException {
+ protected java.lang.Object writeReplace()
+ throws java.io.ObjectStreamException {
return super.writeReplace();
}
@java.lang.Override
- public boolean equals(final Object obj) {
+ public boolean equals(final java.lang.Object obj) {
if (obj == this) {
return true;
}
@@ -13334,40 +13390,44 @@ public final class AdminProtos {
// @@protoc_insertion_point(class_scope:GetServerInfoRequest)
}
- public interface GetServerInfoResponseOrBuilder
+ public interface ServerInfoOrBuilder
extends com.google.protobuf.MessageOrBuilder {
// required .ServerName serverName = 1;
boolean hasServerName();
org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ServerName getServerName();
org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ServerNameOrBuilder getServerNameOrBuilder();
+
+ // optional uint32 webuiPort = 2;
+ boolean hasWebuiPort();
+ int getWebuiPort();
}
- public static final class GetServerInfoResponse extends
+ public static final class ServerInfo extends
com.google.protobuf.GeneratedMessage
- implements GetServerInfoResponseOrBuilder {
- // Use GetServerInfoResponse.newBuilder() to construct.
- private GetServerInfoResponse(Builder builder) {
+ implements ServerInfoOrBuilder {
+ // Use ServerInfo.newBuilder() to construct.
+ private ServerInfo(Builder builder) {
super(builder);
}
- private GetServerInfoResponse(boolean noInit) {}
+ private ServerInfo(boolean noInit) {}
- private static final GetServerInfoResponse defaultInstance;
- public static GetServerInfoResponse getDefaultInstance() {
+ private static final ServerInfo defaultInstance;
+ public static ServerInfo getDefaultInstance() {
return defaultInstance;
}
- public GetServerInfoResponse getDefaultInstanceForType() {
+ public ServerInfo getDefaultInstanceForType() {
return defaultInstance;
}
public static final com.google.protobuf.Descriptors.Descriptor
getDescriptor() {
- return org.apache.hadoop.hbase.protobuf.generated.AdminProtos.internal_static_GetServerInfoResponse_descriptor;
+ return org.apache.hadoop.hbase.protobuf.generated.AdminProtos.internal_static_ServerInfo_descriptor;
}
protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
internalGetFieldAccessorTable() {
- return org.apache.hadoop.hbase.protobuf.generated.AdminProtos.internal_static_GetServerInfoResponse_fieldAccessorTable;
+ return org.apache.hadoop.hbase.protobuf.generated.AdminProtos.internal_static_ServerInfo_fieldAccessorTable;
}
private int bitField0_;
@@ -13384,8 +13444,19 @@ public final class AdminProtos {
return serverName_;
}
+ // optional uint32 webuiPort = 2;
+ public static final int WEBUIPORT_FIELD_NUMBER = 2;
+ private int webuiPort_;
+ public boolean hasWebuiPort() {
+ return ((bitField0_ & 0x00000002) == 0x00000002);
+ }
+ public int getWebuiPort() {
+ return webuiPort_;
+ }
+
private void initFields() {
serverName_ = org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ServerName.getDefaultInstance();
+ webuiPort_ = 0;
}
private byte memoizedIsInitialized = -1;
public final boolean isInitialized() {
@@ -13410,6 +13481,9 @@ public final class AdminProtos {
if (((bitField0_ & 0x00000001) == 0x00000001)) {
output.writeMessage(1, serverName_);
}
+ if (((bitField0_ & 0x00000002) == 0x00000002)) {
+ output.writeUInt32(2, webuiPort_);
+ }
getUnknownFields().writeTo(output);
}
@@ -13423,25 +13497,31 @@ public final class AdminProtos {
size += com.google.protobuf.CodedOutputStream
.computeMessageSize(1, serverName_);
}
+ if (((bitField0_ & 0x00000002) == 0x00000002)) {
+ size += com.google.protobuf.CodedOutputStream
+ .computeUInt32Size(2, webuiPort_);
+ }
size += getUnknownFields().getSerializedSize();
memoizedSerializedSize = size;
return size;
}
+ private static final long serialVersionUID = 0L;
@java.lang.Override
- protected Object writeReplace() throws java.io.ObjectStreamException {
+ protected java.lang.Object writeReplace()
+ throws java.io.ObjectStreamException {
return super.writeReplace();
}
@java.lang.Override
- public boolean equals(final Object obj) {
+ public boolean equals(final java.lang.Object obj) {
if (obj == this) {
return true;
}
- if (!(obj instanceof org.apache.hadoop.hbase.protobuf.generated.AdminProtos.GetServerInfoResponse)) {
+ if (!(obj instanceof org.apache.hadoop.hbase.protobuf.generated.AdminProtos.ServerInfo)) {
return super.equals(obj);
}
- org.apache.hadoop.hbase.protobuf.generated.AdminProtos.GetServerInfoResponse other = (org.apache.hadoop.hbase.protobuf.generated.AdminProtos.GetServerInfoResponse) obj;
+ org.apache.hadoop.hbase.protobuf.generated.AdminProtos.ServerInfo other = (org.apache.hadoop.hbase.protobuf.generated.AdminProtos.ServerInfo) obj;
boolean result = true;
result = result && (hasServerName() == other.hasServerName());
@@ -13449,6 +13529,11 @@ public final class AdminProtos {
result = result && getServerName()
.equals(other.getServerName());
}
+ result = result && (hasWebuiPort() == other.hasWebuiPort());
+ if (hasWebuiPort()) {
+ result = result && (getWebuiPort()
+ == other.getWebuiPort());
+ }
result = result &&
getUnknownFields().equals(other.getUnknownFields());
return result;
@@ -13462,45 +13547,49 @@ public final class AdminProtos {
hash = (37 * hash) + SERVERNAME_FIELD_NUMBER;
hash = (53 * hash) + getServerName().hashCode();
}
+ if (hasWebuiPort()) {
+ hash = (37 * hash) + WEBUIPORT_FIELD_NUMBER;
+ hash = (53 * hash) + getWebuiPort();
+ }
hash = (29 * hash) + getUnknownFields().hashCode();
return hash;
}
- public static org.apache.hadoop.hbase.protobuf.generated.AdminProtos.GetServerInfoResponse parseFrom(
+ public static org.apache.hadoop.hbase.protobuf.generated.AdminProtos.ServerInfo parseFrom(
com.google.protobuf.ByteString data)
throws com.google.protobuf.InvalidProtocolBufferException {
return newBuilder().mergeFrom(data).buildParsed();
}
- public static org.apache.hadoop.hbase.protobuf.generated.AdminProtos.GetServerInfoResponse parseFrom(
+ public static org.apache.hadoop.hbase.protobuf.generated.AdminProtos.ServerInfo parseFrom(
com.google.protobuf.ByteString data,
com.google.protobuf.ExtensionRegistryLite extensionRegistry)
throws com.google.protobuf.InvalidProtocolBufferException {
return newBuilder().mergeFrom(data, extensionRegistry)
.buildParsed();
}
- public static org.apache.hadoop.hbase.protobuf.generated.AdminProtos.GetServerInfoResponse parseFrom(byte[] data)
+ public static org.apache.hadoop.hbase.protobuf.generated.AdminProtos.ServerInfo parseFrom(byte[] data)
throws com.google.protobuf.InvalidProtocolBufferException {
return newBuilder().mergeFrom(data).buildParsed();
}
- public static org.apache.hadoop.hbase.protobuf.generated.AdminProtos.GetServerInfoResponse parseFrom(
+ public static org.apache.hadoop.hbase.protobuf.generated.AdminProtos.ServerInfo parseFrom(
byte[] data,
com.google.protobuf.ExtensionRegistryLite extensionRegistry)
throws com.google.protobuf.InvalidProtocolBufferException {
return newBuilder().mergeFrom(data, extensionRegistry)
.buildParsed();
}
- public static org.apache.hadoop.hbase.protobuf.generated.AdminProtos.GetServerInfoResponse parseFrom(java.io.InputStream input)
+ public static org.apache.hadoop.hbase.protobuf.generated.AdminProtos.ServerInfo parseFrom(java.io.InputStream input)
throws java.io.IOException {
return newBuilder().mergeFrom(input).buildParsed();
}
- public static org.apache.hadoop.hbase.protobuf.generated.AdminProtos.GetServerInfoResponse parseFrom(
+ public static org.apache.hadoop.hbase.protobuf.generated.AdminProtos.ServerInfo parseFrom(
java.io.InputStream input,
com.google.protobuf.ExtensionRegistryLite extensionRegistry)
throws java.io.IOException {
return newBuilder().mergeFrom(input, extensionRegistry)
.buildParsed();
}
- public static org.apache.hadoop.hbase.protobuf.generated.AdminProtos.GetServerInfoResponse parseDelimitedFrom(java.io.InputStream input)
+ public static org.apache.hadoop.hbase.protobuf.generated.AdminProtos.ServerInfo parseDelimitedFrom(java.io.InputStream input)
throws java.io.IOException {
Builder builder = newBuilder();
if (builder.mergeDelimitedFrom(input)) {
@@ -13509,7 +13598,7 @@ public final class AdminProtos {
return null;
}
}
- public static org.apache.hadoop.hbase.protobuf.generated.AdminProtos.GetServerInfoResponse parseDelimitedFrom(
+ public static org.apache.hadoop.hbase.protobuf.generated.AdminProtos.ServerInfo parseDelimitedFrom(
java.io.InputStream input,
com.google.protobuf.ExtensionRegistryLite extensionRegistry)
throws java.io.IOException {
@@ -13520,12 +13609,12 @@ public final class AdminProtos {
return null;
}
}
- public static org.apache.hadoop.hbase.protobuf.generated.AdminProtos.GetServerInfoResponse parseFrom(
+ public static org.apache.hadoop.hbase.protobuf.generated.AdminProtos.ServerInfo parseFrom(
com.google.protobuf.CodedInputStream input)
throws java.io.IOException {
return newBuilder().mergeFrom(input).buildParsed();
}
- public static org.apache.hadoop.hbase.protobuf.generated.AdminProtos.GetServerInfoResponse parseFrom(
+ public static org.apache.hadoop.hbase.protobuf.generated.AdminProtos.ServerInfo parseFrom(
com.google.protobuf.CodedInputStream input,
com.google.protobuf.ExtensionRegistryLite extensionRegistry)
throws java.io.IOException {
@@ -13535,7 +13624,7 @@ public final class AdminProtos {
public static Builder newBuilder() { return Builder.create(); }
public Builder newBuilderForType() { return newBuilder(); }
- public static Builder newBuilder(org.apache.hadoop.hbase.protobuf.generated.AdminProtos.GetServerInfoResponse prototype) {
+ public static Builder newBuilder(org.apache.hadoop.hbase.protobuf.generated.AdminProtos.ServerInfo prototype) {
return newBuilder().mergeFrom(prototype);
}
public Builder toBuilder() { return newBuilder(this); }
@@ -13548,18 +13637,18 @@ public final class AdminProtos {
}
public static final class Builder extends
com.google.protobuf.GeneratedMessage.Builder<Builder>
- implements org.apache.hadoop.hbase.protobuf.generated.AdminProtos.GetServerInfoResponseOrBuilder {
+ implements org.apache.hadoop.hbase.protobuf.generated.AdminProtos.ServerInfoOrBuilder {
public static final com.google.protobuf.Descriptors.Descriptor
getDescriptor() {
- return org.apache.hadoop.hbase.protobuf.generated.AdminProtos.internal_static_GetServerInfoResponse_descriptor;
+ return org.apache.hadoop.hbase.protobuf.generated.AdminProtos.internal_static_ServerInfo_descriptor;
}
protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
internalGetFieldAccessorTable() {
- return org.apache.hadoop.hbase.protobuf.generated.AdminProtos.internal_static_GetServerInfoResponse_fieldAccessorTable;
+ return org.apache.hadoop.hbase.protobuf.generated.AdminProtos.internal_static_ServerInfo_fieldAccessorTable;
}
- // Construct using org.apache.hadoop.hbase.protobuf.generated.AdminProtos.GetServerInfoResponse.newBuilder()
+ // Construct using org.apache.hadoop.hbase.protobuf.generated.AdminProtos.ServerInfo.newBuilder()
private Builder() {
maybeForceBuilderInitialization();
}
@@ -13585,6 +13674,8 @@ public final class AdminProtos {
serverNameBuilder_.clear();
}
bitField0_ = (bitField0_ & ~0x00000001);
+ webuiPort_ = 0;
+ bitField0_ = (bitField0_ & ~0x00000002);
return this;
}
@@ -13594,24 +13685,24 @@ public final class AdminProtos {
public com.google.protobuf.Descriptors.Descriptor
getDescriptorForType() {
- return org.apache.hadoop.hbase.protobuf.generated.AdminProtos.GetServerInfoResponse.getDescriptor();
+ return org.apache.hadoop.hbase.protobuf.generated.AdminProtos.ServerInfo.getDescriptor();
}
- public org.apache.hadoop.hbase.protobuf.generated.AdminProtos.GetServerInfoResponse getDefaultInstanceForType() {
- return org.apache.hadoop.hbase.protobuf.generated.AdminProtos.GetServerInfoResponse.getDefaultInstance();
+ public org.apache.hadoop.hbase.protobuf.generated.AdminProtos.ServerInfo getDefaultInstanceForType() {
+ return org.apache.hadoop.hbase.protobuf.generated.AdminProtos.ServerInfo.getDefaultInstance();
}
- public org.apache.hadoop.hbase.protobuf.generated.AdminProtos.GetServerInfoResponse build() {
- org.apache.hadoop.hbase.protobuf.generated.AdminProtos.GetServerInfoResponse result = buildPartial();
+ public org.apache.hadoop.hbase.protobuf.generated.AdminProtos.ServerInfo build() {
+ org.apache.hadoop.hbase.protobuf.generated.AdminProtos.ServerInfo result = buildPartial();
if (!result.isInitialized()) {
throw newUninitializedMessageException(result);
}
return result;
}
- private org.apache.hadoop.hbase.protobuf.generated.AdminProtos.GetServerInfoResponse buildParsed()
+ private org.apache.hadoop.hbase.protobuf.generated.AdminProtos.ServerInfo buildParsed()
throws com.google.protobuf.InvalidProtocolBufferException {
- org.apache.hadoop.hbase.protobuf.generated.AdminProtos.GetServerInfoResponse result = buildPartial();
+ org.apache.hadoop.hbase.protobuf.generated.AdminProtos.ServerInfo result = buildPartial();
if (!result.isInitialized()) {
throw newUninitializedMessageException(
result).asInvalidProtocolBufferException();
@@ -13619,8 +13710,8 @@ public final class AdminProtos {
return result;
}
- public org.apache.hadoop.hbase.protobuf.generated.AdminProtos.GetServerInfoResponse buildPartial() {
- org.apache.hadoop.hbase.protobuf.generated.AdminProtos.GetServerInfoResponse result = new org.apache.hadoop.hbase.protobuf.generated.AdminProtos.GetServerInfoResponse(this);
+ public org.apache.hadoop.hbase.protobuf.generated.AdminProtos.ServerInfo buildPartial() {
+ org.apache.hadoop.hbase.protobuf.generated.AdminProtos.ServerInfo result = new org.apache.hadoop.hbase.protobuf.generated.AdminProtos.ServerInfo(this);
int from_bitField0_ = bitField0_;
int to_bitField0_ = 0;
if (((from_bitField0_ & 0x00000001) == 0x00000001)) {
@@ -13631,25 +13722,32 @@ public final class AdminProtos {
} else {
result.serverName_ = serverNameBuilder_.build();
}
+ if (((from_bitField0_ & 0x00000002) == 0x00000002)) {
+ to_bitField0_ |= 0x00000002;
+ }
+ result.webuiPort_ = webuiPort_;
result.bitField0_ = to_bitField0_;
onBuilt();
return result;
}
public Builder mergeFrom(com.google.protobuf.Message other) {
- if (other instanceof org.apache.hadoop.hbase.protobuf.generated.AdminProtos.GetServerInfoResponse) {
- return mergeFrom((org.apache.hadoop.hbase.protobuf.generated.AdminProtos.GetServerInfoResponse)other);
+ if (other instanceof org.apache.hadoop.hbase.protobuf.generated.AdminProtos.ServerInfo) {
+ return mergeFrom((org.apache.hadoop.hbase.protobuf.generated.AdminProtos.ServerInfo)other);
} else {
super.mergeFrom(other);
return this;
}
}
- public Builder mergeFrom(org.apache.hadoop.hbase.protobuf.generated.AdminProtos.GetServerInfoResponse other) {
- if (other == org.apache.hadoop.hbase.protobuf.generated.AdminProtos.GetServerInfoResponse.getDefaultInstance()) return this;
+ public Builder mergeFrom(org.apache.hadoop.hbase.protobuf.generated.AdminProtos.ServerInfo other) {
+ if (other == org.apache.hadoop.hbase.protobuf.generated.AdminProtos.ServerInfo.getDefaultInstance()) return this;
if (other.hasServerName()) {
mergeServerName(other.getServerName());
}
+ if (other.hasWebuiPort()) {
+ setWebuiPort(other.getWebuiPort());
+ }
this.mergeUnknownFields(other.getUnknownFields());
return this;
}
@@ -13698,6 +13796,11 @@ public final class AdminProtos {
setServerName(subBuilder.buildPartial());
break;
}
+ case 16: {
+ bitField0_ |= 0x00000002;
+ webuiPort_ = input.readUInt32();
+ break;
+ }
}
}
}
@@ -13794,6 +13897,500 @@ public final class AdminProtos {
return serverNameBuilder_;
}
+ // optional uint32 webuiPort = 2;
+ private int webuiPort_ ;
+ public boolean hasWebuiPort() {
+ return ((bitField0_ & 0x00000002) == 0x00000002);
+ }
+ public int getWebuiPort() {
+ return webuiPort_;
+ }
+ public Builder setWebuiPort(int value) {
+ bitField0_ |= 0x00000002;
+ webuiPort_ = value;
+ onChanged();
+ return this;
+ }
+ public Builder clearWebuiPort() {
+ bitField0_ = (bitField0_ & ~0x00000002);
+ webuiPort_ = 0;
+ onChanged();
+ return this;
+ }
+
+ // @@protoc_insertion_point(builder_scope:ServerInfo)
+ }
+
+ static {
+ defaultInstance = new ServerInfo(true);
+ defaultInstance.initFields();
+ }
+
+ // @@protoc_insertion_point(class_scope:ServerInfo)
+ }
+
+ public interface GetServerInfoResponseOrBuilder
+ extends com.google.protobuf.MessageOrBuilder {
+
+ // required .ServerInfo serverInfo = 1;
+ boolean hasServerInfo();
+ org.apache.hadoop.hbase.protobuf.generated.AdminProtos.ServerInfo getServerInfo();
+ org.apache.hadoop.hbase.protobuf.generated.AdminProtos.ServerInfoOrBuilder getServerInfoOrBuilder();
+ }
+ public static final class GetServerInfoResponse extends
+ com.google.protobuf.GeneratedMessage
+ implements GetServerInfoResponseOrBuilder {
+ // Use GetServerInfoResponse.newBuilder() to construct.
+ private GetServerInfoResponse(Builder builder) {
+ super(builder);
+ }
+ private GetServerInfoResponse(boolean noInit) {}
+
+ private static final GetServerInfoResponse defaultInstance;
+ public static GetServerInfoResponse getDefaultInstance() {
+ return defaultInstance;
+ }
+
+ public GetServerInfoResponse getDefaultInstanceForType() {
+ return defaultInstance;
+ }
+
+ public static final com.google.protobuf.Descriptors.Descriptor
+ getDescriptor() {
+ return org.apache.hadoop.hbase.protobuf.generated.AdminProtos.internal_static_GetServerInfoResponse_descriptor;
+ }
+
+ protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
+ internalGetFieldAccessorTable() {
+ return org.apache.hadoop.hbase.protobuf.generated.AdminProtos.internal_static_GetServerInfoResponse_fieldAccessorTable;
+ }
+
+ private int bitField0_;
+ // required .ServerInfo serverInfo = 1;
+ public static final int SERVERINFO_FIELD_NUMBER = 1;
+ private org.apache.hadoop.hbase.protobuf.generated.AdminProtos.ServerInfo serverInfo_;
+ public boolean hasServerInfo() {
+ return ((bitField0_ & 0x00000001) == 0x00000001);
+ }
+ public org.apache.hadoop.hbase.protobuf.generated.AdminProtos.ServerInfo getServerInfo() {
+ return serverInfo_;
+ }
+ public org.apache.hadoop.hbase.protobuf.generated.AdminProtos.ServerInfoOrBuilder getServerInfoOrBuilder() {
+ return serverInfo_;
+ }
+
+ private void initFields() {
+ serverInfo_ = org.apache.hadoop.hbase.protobuf.generated.AdminProtos.ServerInfo.getDefaultInstance();
+ }
+ private byte memoizedIsInitialized = -1;
+ public final boolean isInitialized() {
+ byte isInitialized = memoizedIsInitialized;
+ if (isInitialized != -1) return isInitialized == 1;
+
+ if (!hasServerInfo()) {
+ memoizedIsInitialized = 0;
+ return false;
+ }
+ if (!getServerInfo().isInitialized()) {
+ memoizedIsInitialized = 0;
+ return false;
+ }
+ memoizedIsInitialized = 1;
+ return true;
+ }
+
+ public void writeTo(com.google.protobuf.CodedOutputStream output)
+ throws java.io.IOException {
+ getSerializedSize();
+ if (((bitField0_ & 0x00000001) == 0x00000001)) {
+ output.writeMessage(1, serverInfo_);
+ }
+ getUnknownFields().writeTo(output);
+ }
+
+ private int memoizedSerializedSize = -1;
+ public int getSerializedSize() {
+ int size = memoizedSerializedSize;
+ if (size != -1) return size;
+
+ size = 0;
+ if (((bitField0_ & 0x00000001) == 0x00000001)) {
+ size += com.google.protobuf.CodedOutputStream
+ .computeMessageSize(1, serverInfo_);
+ }
+ size += getUnknownFields().getSerializedSize();
+ memoizedSerializedSize = size;
+ return size;
+ }
+
+ private static final long serialVersionUID = 0L;
+ @java.lang.Override
+ protected java.lang.Object writeReplace()
+ throws java.io.ObjectStreamException {
+ return super.writeReplace();
+ }
+
+ @java.lang.Override
+ public boolean equals(final java.lang.Object obj) {
+ if (obj == this) {
+ return true;
+ }
+ if (!(obj instanceof org.apache.hadoop.hbase.protobuf.generated.AdminProtos.GetServerInfoResponse)) {
+ return super.equals(obj);
+ }
+ org.apache.hadoop.hbase.protobuf.generated.AdminProtos.GetServerInfoResponse other = (org.apache.hadoop.hbase.protobuf.generated.AdminProtos.GetServerInfoResponse) obj;
+
+ boolean result = true;
+ result = result && (hasServerInfo() == other.hasServerInfo());
+ if (hasServerInfo()) {
+ result = result && getServerInfo()
+ .equals(other.getServerInfo());
+ }
+ result = result &&
+ getUnknownFields().equals(other.getUnknownFields());
+ return result;
+ }
+
+ @java.lang.Override
+ public int hashCode() {
+ int hash = 41;
+ hash = (19 * hash) + getDescriptorForType().hashCode();
+ if (hasServerInfo()) {
+ hash = (37 * hash) + SERVERINFO_FIELD_NUMBER;
+ hash = (53 * hash) + getServerInfo().hashCode();
+ }
+ hash = (29 * hash) + getUnknownFields().hashCode();
+ return hash;
+ }
+
+ public static org.apache.hadoop.hbase.protobuf.generated.AdminProtos.GetServerInfoResponse parseFrom(
+ com.google.protobuf.ByteString data)
+ throws com.google.protobuf.InvalidProtocolBufferException {
+ return newBuilder().mergeFrom(data).buildParsed();
+ }
+ public static org.apache.hadoop.hbase.protobuf.generated.AdminProtos.GetServerInfoResponse parseFrom(
+ com.google.protobuf.ByteString data,
+ com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+ throws com.google.protobuf.InvalidProtocolBufferException {
+ return newBuilder().mergeFrom(data, extensionRegistry)
+ .buildParsed();
+ }
+ public static org.apache.hadoop.hbase.protobuf.generated.AdminProtos.GetServerInfoResponse parseFrom(byte[] data)
+ throws com.google.protobuf.InvalidProtocolBufferException {
+ return newBuilder().mergeFrom(data).buildParsed();
+ }
+ public static org.apache.hadoop.hbase.protobuf.generated.AdminProtos.GetServerInfoResponse parseFrom(
+ byte[] data,
+ com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+ throws com.google.protobuf.InvalidProtocolBufferException {
+ return newBuilder().mergeFrom(data, extensionRegistry)
+ .buildParsed();
+ }
+ public static org.apache.hadoop.hbase.protobuf.generated.AdminProtos.GetServerInfoResponse parseFrom(java.io.InputStream input)
+ throws java.io.IOException {
+ return newBuilder().mergeFrom(input).buildParsed();
+ }
+ public static org.apache.hadoop.hbase.protobuf.generated.AdminProtos.GetServerInfoResponse parseFrom(
+ java.io.InputStream input,
+ com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+ throws java.io.IOException {
+ return newBuilder().mergeFrom(input, extensionRegistry)
+ .buildParsed();
+ }
+ public static org.apache.hadoop.hbase.protobuf.generated.AdminProtos.GetServerInfoResponse parseDelimitedFrom(java.io.InputStream input)
+ throws java.io.IOException {
+ Builder builder = newBuilder();
+ if (builder.mergeDelimitedFrom(input)) {
+ return builder.buildParsed();
+ } else {
+ return null;
+ }
+ }
+ public static org.apache.hadoop.hbase.protobuf.generated.AdminProtos.GetServerInfoResponse parseDelimitedFrom(
+ java.io.InputStream input,
+ com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+ throws java.io.IOException {
+ Builder builder = newBuilder();
+ if (builder.mergeDelimitedFrom(input, extensionRegistry)) {
+ return builder.buildParsed();
+ } else {
+ return null;
+ }
+ }
+ public static org.apache.hadoop.hbase.protobuf.generated.AdminProtos.GetServerInfoResponse parseFrom(
+ com.google.protobuf.CodedInputStream input)
+ throws java.io.IOException {
+ return newBuilder().mergeFrom(input).buildParsed();
+ }
+ public static org.apache.hadoop.hbase.protobuf.generated.AdminProtos.GetServerInfoResponse parseFrom(
+ com.google.protobuf.CodedInputStream input,
+ com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+ throws java.io.IOException {
+ return newBuilder().mergeFrom(input, extensionRegistry)
+ .buildParsed();
+ }
+
+ public static Builder newBuilder() { return Builder.create(); }
+ public Builder newBuilderForType() { return newBuilder(); }
+ public static Builder newBuilder(org.apache.hadoop.hbase.protobuf.generated.AdminProtos.GetServerInfoResponse prototype) {
+ return newBuilder().mergeFrom(prototype);
+ }
+ public Builder toBuilder() { return newBuilder(this); }
+
+ @java.lang.Override
+ protected Builder newBuilderForType(
+ com.google.protobuf.GeneratedMessage.BuilderParent parent) {
+ Builder builder = new Builder(parent);
+ return builder;
+ }
+ public static final class Builder extends
+ com.google.protobuf.GeneratedMessage.Builder<Builder>
+ implements org.apache.hadoop.hbase.protobuf.generated.AdminProtos.GetServerInfoResponseOrBuilder {
+ public static final com.google.protobuf.Descriptors.Descriptor
+ getDescriptor() {
+ return org.apache.hadoop.hbase.protobuf.generated.AdminProtos.internal_static_GetServerInfoResponse_descriptor;
+ }
+
+ protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
+ internalGetFieldAccessorTable() {
+ return org.apache.hadoop.hbase.protobuf.generated.AdminProtos.internal_static_GetServerInfoResponse_fieldAccessorTable;
+ }
+
+ // Construct using org.apache.hadoop.hbase.protobuf.generated.AdminProtos.GetServerInfoResponse.newBuilder()
+ private Builder() {
+ maybeForceBuilderInitialization();
+ }
+
+ private Builder(BuilderParent parent) {
+ super(parent);
+ maybeForceBuilderInitialization();
+ }
+ private void maybeForceBuilderInitialization() {
+ if (com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders) {
+ getServerInfoFieldBuilder();
+ }
+ }
+ private static Builder create() {
+ return new Builder();
+ }
+
+ public Builder clear() {
+ super.clear();
+ if (serverInfoBuilder_ == null) {
+ serverInfo_ = org.apache.hadoop.hbase.protobuf.generated.AdminProtos.ServerInfo.getDefaultInstance();
+ } else {
+ serverInfoBuilder_.clear();
+ }
+ bitField0_ = (bitField0_ & ~0x00000001);
+ return this;
+ }
+
+ public Builder clone() {
+ return create().mergeFrom(buildPartial());
+ }
+
+ public com.google.protobuf.Descriptors.Descriptor
+ getDescriptorForType() {
+ return org.apache.hadoop.hbase.protobuf.generated.AdminProtos.GetServerInfoResponse.getDescriptor();
+ }
+
+ public org.apache.hadoop.hbase.protobuf.generated.AdminProtos.GetServerInfoResponse getDefaultInstanceForType() {
+ return org.apache.hadoop.hbase.protobuf.generated.AdminProtos.GetServerInfoResponse.getDefaultInstance();
+ }
+
+ public org.apache.hadoop.hbase.protobuf.generated.AdminProtos.GetServerInfoResponse build() {
+ org.apache.hadoop.hbase.protobuf.generated.AdminProtos.GetServerInfoResponse result = buildPartial();
+ if (!result.isInitialized()) {
+ throw newUninitializedMessageException(result);
+ }
+ return result;
+ }
+
+ private org.apache.hadoop.hbase.protobuf.generated.AdminProtos.GetServerInfoResponse buildParsed()
+ throws com.google.protobuf.InvalidProtocolBufferException {
+ org.apache.hadoop.hbase.protobuf.generated.AdminProtos.GetServerInfoResponse result = buildPartial();
+ if (!result.isInitialized()) {
+ throw newUninitializedMessageException(
+ result).asInvalidProtocolBufferException();
+ }
+ return result;
+ }
+
+ public org.apache.hadoop.hbase.protobuf.generated.AdminProtos.GetServerInfoResponse buildPartial() {
+ org.apache.hadoop.hbase.protobuf.generated.AdminProtos.GetServerInfoResponse result = new org.apache.hadoop.hbase.protobuf.generated.AdminProtos.GetServerInfoResponse(this);
+ int from_bitField0_ = bitField0_;
+ int to_bitField0_ = 0;
+ if (((from_bitField0_ & 0x00000001) == 0x00000001)) {
+ to_bitField0_ |= 0x00000001;
+ }
+ if (serverInfoBuilder_ == null) {
+ result.serverInfo_ = serverInfo_;
+ } else {
+ result.serverInfo_ = serverInfoBuilder_.build();
+ }
+ result.bitField0_ = to_bitField0_;
+ onBuilt();
+ return result;
+ }
+
+ public Builder mergeFrom(com.google.protobuf.Message other) {
+ if (other instanceof org.apache.hadoop.hbase.protobuf.generated.AdminProtos.GetServerInfoResponse) {
+ return mergeFrom((org.apache.hadoop.hbase.protobuf.generated.AdminProtos.GetServerInfoResponse)other);
+ } else {
+ super.mergeFrom(other);
+ return this;
+ }
+ }
+
+ public Builder mergeFrom(org.apache.hadoop.hbase.protobuf.generated.AdminProtos.GetServerInfoResponse other) {
+ if (other == org.apache.hadoop.hbase.protobuf.generated.AdminProtos.GetServerInfoResponse.getDefaultInstance()) return this;
+ if (other.hasServerInfo()) {
+ mergeServerInfo(other.getServerInfo());
+ }
+ this.mergeUnknownFields(other.getUnknownFields());
+ return this;
+ }
+
+ public final boolean isInitialized() {
+ if (!hasServerInfo()) {
+
+ return false;
+ }
+ if (!getServerInfo().isInitialized()) {
+
+ return false;
+ }
+ return true;
+ }
+
+ public Builder mergeFrom(
+ com.google.protobuf.CodedInputStream input,
+ com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+ throws java.io.IOException {
+ com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+ com.google.protobuf.UnknownFieldSet.newBuilder(
+ this.getUnknownFields());
+ while (true) {
+ int tag = input.readTag();
+ switch (tag) {
+ case 0:
+ this.setUnknownFields(unknownFields.build());
+ onChanged();
+ return this;
+ default: {
+ if (!parseUnknownField(input, unknownFields,
+ extensionRegistry, tag)) {
+ this.setUnknownFields(unknownFields.build());
+ onChanged();
+ return this;
+ }
+ break;
+ }
+ case 10: {
+ org.apache.hadoop.hbase.protobuf.generated.AdminProtos.ServerInfo.Builder subBuilder = org.apache.hadoop.hbase.protobuf.generated.AdminProtos.ServerInfo.newBuilder();
+ if (hasServerInfo()) {
+ subBuilder.mergeFrom(getServerInfo());
+ }
+ input.readMessage(subBuilder, extensionRegistry);
+ setServerInfo(subBuilder.buildPartial());
+ break;
+ }
+ }
+ }
+ }
+
+ private int bitField0_;
+
+ // required .ServerInfo serverInfo = 1;
+ private org.apache.hadoop.hbase.protobuf.generated.AdminProtos.ServerInfo serverInfo_ = org.apache.hadoop.hbase.protobuf.generated.AdminProtos.ServerInfo.getDefaultInstance();
+ private com.google.protobuf.SingleFieldBuilder<
+ org.apache.hadoop.hbase.protobuf.generated.AdminProtos.ServerInfo, org.apache.hadoop.hbase.protobuf.generated.AdminProtos.ServerInfo.Builder, org.apache.hadoop.hbase.protobuf.generated.AdminProtos.ServerInfoOrBuilder> serverInfoBuilder_;
+ public boolean hasServerInfo() {
+ return ((bitField0_ & 0x00000001) == 0x00000001);
+ }
+ public org.apache.hadoop.hbase.protobuf.generated.AdminProtos.ServerInfo getServerInfo() {
+ if (serverInfoBuilder_ == null) {
+ return serverInfo_;
+ } else {
+ return serverInfoBuilder_.getMessage();
+ }
+ }
+ public Builder setServerInfo(org.apache.hadoop.hbase.protobuf.generated.AdminProtos.ServerInfo value) {
+ if (serverInfoBuilder_ == null) {
+ if (value == null) {
+ throw new NullPointerException();
+ }
+ serverInfo_ = value;
+ onChanged();
+ } else {
+ serverInfoBuilder_.setMessage(value);
+ }
+ bitField0_ |= 0x00000001;
+ return this;
+ }
+ public Builder setServerInfo(
+ org.apache.hadoop.hbase.protobuf.generated.AdminProtos.ServerInfo.Builder builderForValue) {
+ if (serverInfoBuilder_ == null) {
+ serverInfo_ = builderForValue.build();
+ onChanged();
+ } else {
+ serverInfoBuilder_.setMessage(builderForValue.build());
+ }
+ bitField0_ |= 0x00000001;
+ return this;
+ }
+ public Builder mergeServerInfo(org.apache.hadoop.hbase.protobuf.generated.AdminProtos.ServerInfo value) {
+ if (serverInfoBuilder_ == null) {
+ if (((bitField0_ & 0x00000001) == 0x00000001) &&
+ serverInfo_ != org.apache.hadoop.hbase.protobuf.generated.AdminProtos.ServerInfo.getDefaultInstance()) {
+ serverInfo_ =
+ org.apache.hadoop.hbase.protobuf.generated.AdminProtos.ServerInfo.newBuilder(serverInfo_).mergeFrom(value).buildPartial();
+ } else {
+ serverInfo_ = value;
+ }
+ onChanged();
+ } else {
+ serverInfoBuilder_.mergeFrom(value);
+ }
+ bitField0_ |= 0x00000001;
+ return this;
+ }
+ public Builder clearServerInfo() {
+ if (serverInfoBuilder_ == null) {
+ serverInfo_ = org.apache.hadoop.hbase.protobuf.generated.AdminProtos.ServerInfo.getDefaultInstance();
+ onChanged();
+ } else {
+ serverInfoBuilder_.clear();
+ }
+ bitField0_ = (bitField0_ & ~0x00000001);
+ return this;
+ }
+ public org.apache.hadoop.hbase.protobuf.generated.AdminProtos.ServerInfo.Builder getServerInfoBuilder() {
+ bitField0_ |= 0x00000001;
+ onChanged();
+ return getServerInfoFieldBuilder().getBuilder();
+ }
+ public org.apache.hadoop.hbase.protobuf.generated.AdminProtos.ServerInfoOrBuilder getServerInfoOrBuilder() {
+ if (serverInfoBuilder_ != null) {
+ return serverInfoBuilder_.getMessageOrBuilder();
+ } else {
+ return serverInfo_;
+ }
+ }
+ private com.google.protobuf.SingleFieldBuilder<
+ org.apache.hadoop.hbase.protobuf.generated.AdminProtos.ServerInfo, org.apache.hadoop.hbase.protobuf.generated.AdminProtos.ServerInfo.Builder, org.apache.hadoop.hbase.protobuf.generated.AdminProtos.ServerInfoOrBuilder>
+ getServerInfoFieldBuilder() {
+ if (serverInfoBuilder_ == null) {
+ serverInfoBuilder_ = new com.google.protobuf.SingleFieldBuilder<
+ org.apache.hadoop.hbase.protobuf.generated.AdminProtos.ServerInfo, org.apache.hadoop.hbase.protobuf.generated.AdminProtos.ServerInfo.Builder, org.apache.hadoop.hbase.protobuf.generated.AdminProtos.ServerInfoOrBuilder>(
+ serverInfo_,
+ getParentForChildren(),
+ isClean());
+ serverInfo_ = null;
+ }
+ return serverInfoBuilder_;
+ }
+
// @@protoc_insertion_point(builder_scope:GetServerInfoResponse)
}
@@ -14882,6 +15479,11 @@ public final class AdminProtos {
com.google.protobuf.GeneratedMessage.FieldAccessorTable
internal_static_GetServerInfoRequest_fieldAccessorTable;
private static com.google.protobuf.Descriptors.Descriptor
+ internal_static_ServerInfo_descriptor;
+ private static
+ com.google.protobuf.GeneratedMessage.FieldAccessorTable
+ internal_static_ServerInfo_fieldAccessorTable;
+ private static com.google.protobuf.Descriptors.Descriptor
internal_static_GetServerInfoResponse_descriptor;
private static
com.google.protobuf.GeneratedMessage.FieldAccessorTable
@@ -14940,29 +15542,31 @@ public final class AdminProtos {
"\n\025RollWALWriterResponse\022\025\n\rregionToFlush" +
"\030\001 \003(\014\"#\n\021StopServerRequest\022\016\n\006reason\030\001 " +
"\002(\t\"\024\n\022StopServerResponse\"\026\n\024GetServerIn" +
- "foRequest\"8\n\025GetServerInfoResponse\022\037\n\nse" +
- "rverName\030\001 \002(\0132\013.ServerName2\371\005\n\014AdminSer" +
- "vice\022>\n\rgetRegionInfo\022\025.GetRegionInfoReq" +
- "uest\032\026.GetRegionInfoResponse\022;\n\014getStore" +
- "File\022\024.GetStoreFileRequest\032\025.GetStoreFil",
- "eResponse\022D\n\017getOnlineRegion\022\027.GetOnline" +
- "RegionRequest\032\030.GetOnlineRegionResponse\022" +
- "5\n\nopenRegion\022\022.OpenRegionRequest\032\023.Open" +
- "RegionResponse\0228\n\013closeRegion\022\023.CloseReg" +
- "ionRequest\032\024.CloseRegionResponse\0228\n\013flus" +
- "hRegion\022\023.FlushRegionRequest\032\024.FlushRegi" +
- "onResponse\0228\n\013splitRegion\022\023.SplitRegionR" +
- "equest\032\024.SplitRegionResponse\022>\n\rcompactR" +
- "egion\022\025.CompactRegionRequest\032\026.CompactRe" +
- "gionResponse\022J\n\021replicateWALEntry\022\031.Repl",
- "icateWALEntryRequest\032\032.ReplicateWALEntry" +
- "Response\022>\n\rrollWALWriter\022\025.RollWALWrite" +
- "rRequest\032\026.RollWALWriterResponse\022>\n\rgetS" +
- "erverInfo\022\025.GetServerInfoRequest\032\026.GetSe" +
- "rverInfoResponse\0225\n\nstopServer\022\022.StopSer" +
- "verRequest\032\023.StopServerResponseBA\n*org.a" +
- "pache.hadoop.hbase.protobuf.generatedB\013A" +
- "dminProtosH\001\210\001\001\240\001\001"
+ "foRequest\"@\n\nServerInfo\022\037\n\nserverName\030\001 " +
+ "\002(\0132\013.ServerName\022\021\n\twebuiPort\030\002 \001(\r\"8\n\025G" +
+ "etServerInfoResponse\022\037\n\nserverInfo\030\001 \002(\013" +
+ "2\013.ServerInfo2\371\005\n\014AdminService\022>\n\rgetReg" +
+ "ionInfo\022\025.GetRegionInfoRequest\032\026.GetRegi",
+ "onInfoResponse\022;\n\014getStoreFile\022\024.GetStor" +
+ "eFileRequest\032\025.GetStoreFileResponse\022D\n\017g" +
+ "etOnlineRegion\022\027.GetOnlineRegionRequest\032" +
+ "\030.GetOnlineRegionResponse\0225\n\nopenRegion\022" +
+ "\022.OpenRegionRequest\032\023.OpenRegionResponse" +
+ "\0228\n\013closeRegion\022\023.CloseRegionRequest\032\024.C" +
+ "loseRegionResponse\0228\n\013flushRegion\022\023.Flus" +
+ "hRegionRequest\032\024.FlushRegionResponse\0228\n\013" +
+ "splitRegion\022\023.SplitRegionRequest\032\024.Split" +
+ "RegionResponse\022>\n\rcompactRegion\022\025.Compac",
+ "tRegionRequest\032\026.CompactRegionResponse\022J" +
+ "\n\021replicateWALEntry\022\031.ReplicateWALEntryR" +
+ "equest\032\032.ReplicateWALEntryResponse\022>\n\rro" +
+ "llWALWriter\022\025.RollWALWriterRequest\032\026.Rol" +
+ "lWALWriterResponse\022>\n\rgetServerInfo\022\025.Ge" +
+ "tServerInfoRequest\032\026.GetServerInfoRespon" +
+ "se\0225\n\nstopServer\022\022.StopServerRequest\032\023.S" +
+ "topServerResponseBA\n*org.apache.hadoop.h" +
+ "base.protobuf.generatedB\013AdminProtosH\001\210\001" +
+ "\001\240\001\001"
};
com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner =
new com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner() {
@@ -15193,12 +15797,20 @@ public final class AdminProtos {
new java.lang.String[] { },
org.apache.hadoop.hbase.protobuf.generated.AdminProtos.GetServerInfoRequest.class,
org.apache.hadoop.hbase.protobuf.generated.AdminProtos.GetServerInfoRequest.Builder.class);
- internal_static_GetServerInfoResponse_descriptor =
+ internal_static_ServerInfo_descriptor =
getDescriptor().getMessageTypes().get(25);
+ internal_static_ServerInfo_fieldAccessorTable = new
+ com.google.protobuf.GeneratedMessage.FieldAccessorTable(
+ internal_static_ServerInfo_descriptor,
+ new java.lang.String[] { "ServerName", "WebuiPort", },
+ org.apache.hadoop.hbase.protobuf.generated.AdminProtos.ServerInfo.class,
+ org.apache.hadoop.hbase.protobuf.generated.AdminProtos.ServerInfo.Builder.class);
+ internal_static_GetServerInfoResponse_descriptor =
+ getDescriptor().getMessageTypes().get(26);
internal_static_GetServerInfoResponse_fieldAccessorTable = new
com.google.protobuf.GeneratedMessage.FieldAccessorTable(
internal_static_GetServerInfoResponse_descriptor,
- new java.lang.String[] { "ServerName", },
+ new java.lang.String[] { "ServerInfo", },
org.apache.hadoop.hbase.protobuf.generated.AdminProtos.GetServerInfoResponse.class,
org.apache.hadoop.hbase.protobuf.generated.AdminProtos.GetServerInfoResponse.Builder.class);
return null;