svn commit: r1354098 - in /hbase/trunk/hbase-server/src: main/java/org/apache/hadoop/hbase/ClusterStatus.java main/java/org/apache/hadoop/hbase/ServerLoad.java test/java/org/apache/hadoop/hbase/master/TestMasterNoCluster.java

[te...@apache.org]

Author: tedyu
Date: Tue Jun 26 16:31:36 2012
New Revision: 1354098

URL: http://svn.apache.org/viewvc?rev=1354098&view=rev
Log:
HBASE-5967 OpenDataException because HBaseProtos.ServerLoad cannot be converted to an open data type (Gregory)


Modified:
    hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/ClusterStatus.java
    hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/ServerLoad.java
    hbase/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestMasterNoCluster.java

Modified: hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/ClusterStatus.java
URL: http://svn.apache.org/viewvc/hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/ClusterStatus.java?rev=1354098&r1=1354097&r2=1354098&view=diff
==============================================================================
--- hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/ClusterStatus.java (original)
+++ hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/ClusterStatus.java Tue Jun 26 16:31:36 2012
@@ -294,7 +294,7 @@ public class ClusterStatus extends Versi
     for (Map.Entry<ServerName, ServerLoad> entry : liveServers.entrySet()) {
       LiveServerInfo.Builder lsi =
         LiveServerInfo.newBuilder().setServer(ProtobufUtil.toServerName(entry.getKey()));
-      lsi.setServerLoad(entry.getValue().getServerLoadPB());
+      lsi.setServerLoad(entry.getValue().obtainServerLoadPB());
       builder.addLiveServers(lsi.build());
     }
     for (ServerName deadServer : getDeadServerNames()) {

Modified: hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/ServerLoad.java
URL: http://svn.apache.org/viewvc/hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/ServerLoad.java?rev=1354098&r1=1354097&r2=1354098&view=diff
==============================================================================
--- hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/ServerLoad.java (original)
+++ hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/ServerLoad.java Tue Jun 26 16:31:36 2012
@@ -75,8 +75,10 @@ public class ServerLoad {
     
   }
 
+  // NOTE: Function name cannot start with "get" because then an OpenDataException is thrown because
+  // HBaseProtos.ServerLoad cannot be converted to an open data type(see HBASE-5967).
   /* @return the underlying ServerLoad protobuf object */
-  public HBaseProtos.ServerLoad getServerLoadPB() {
+  public HBaseProtos.ServerLoad obtainServerLoadPB() {
     return serverLoad;
   }
 
@@ -208,7 +210,7 @@ public class ServerLoad {
    * @return string array of loaded RegionServer-level coprocessors
    */
   public String[] getRegionServerCoprocessors() {
-    List<Coprocessor> list = getServerLoadPB().getCoprocessorsList();
+    List<Coprocessor> list = obtainServerLoadPB().getCoprocessorsList();
     String [] ret = new String[list.size()];
     int i = 0;
     for (Coprocessor elem : list) {
@@ -227,11 +229,11 @@ public class ServerLoad {
     // Need a set to remove duplicates, but since generated Coprocessor class
     // is not Comparable, make it a Set<String> instead of Set<Coprocessor>
     TreeSet<String> coprocessSet = new TreeSet<String>();
-    for (Coprocessor coprocessor : getServerLoadPB().getCoprocessorsList()) {
+    for (Coprocessor coprocessor : obtainServerLoadPB().getCoprocessorsList()) {
       coprocessSet.add(coprocessor.getName());
     }
 
-    for (HBaseProtos.RegionLoad rl : getServerLoadPB().getRegionLoadsList()) {
+    for (HBaseProtos.RegionLoad rl : obtainServerLoadPB().getRegionLoadsList()) {
       for (Coprocessor coprocessor : rl.getCoprocessorsList()) {
         coprocessSet.add(coprocessor.getName());
       }

Modified: hbase/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestMasterNoCluster.java
URL: http://svn.apache.org/viewvc/hbase/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestMasterNoCluster.java?rev=1354098&r1=1354097&r2=1354098&view=diff
==============================================================================
--- hbase/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestMasterNoCluster.java (original)
+++ hbase/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestMasterNoCluster.java Tue Jun 26 16:31:36 2012
@@ -219,7 +219,7 @@ public class TestMasterNoCluster {
         RegionServerReportRequest.Builder request = RegionServerReportRequest.newBuilder();;
         ServerName sn = ServerName.parseVersionedServerName(sns[i].getVersionedBytes());
         request.setServer(ProtobufUtil.toServerName(sn));
-        request.setLoad(ServerLoad.EMPTY_SERVERLOAD.getServerLoadPB());
+        request.setLoad(ServerLoad.EMPTY_SERVERLOAD.obtainServerLoadPB());
         master.regionServerReport(null, request.build());
       }
       // Master should now come up.