Apache
/
hbase
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

HBASE-3654 Weird blocking between getOnlineRegion and createRegionLoad; Added more to Subbu and Ted extras 

git-svn-id: https://svn.apache.org/repos/asf/hbase/trunk@1085553 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Michael Stack 2011-03-25 20:38:11 +00:00
parent 83143be819
commit be4fbee16b
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java
View File

@ -918,7 +918,7 @@ public class HRegionServer implements HRegionInterface, HBaseRPCErrorHandler,
public HServerLoad.RegionLoad createRegionLoad(final String encodedRegionName) { public HServerLoad.RegionLoad createRegionLoad(final String encodedRegionName) {
HRegion r = null; HRegion r = null;
r = this.onlineRegions.get(encodedRegionName); r = this.onlineRegions.get(encodedRegionName);
return createRegionLoad(r); return r != null ? createRegionLoad(r) : null;
} }
/* /*
@ -2362,7 +2362,7 @@ public class HRegionServer implements HRegionInterface, HBaseRPCErrorHandler,
@Override @Override
@QosPriority(priority=HIGH_QOS) @QosPriority(priority=HIGH_QOS)
public List<HRegionInfo> getOnlineRegions() { public List<HRegionInfo> getOnlineRegions() {
List<HRegionInfo> list = new ArrayList<HRegionInfo>(); List<HRegionInfo> list = new ArrayList<HRegionInfo>(onlineRegions.size());
for (Map.Entry<String,HRegion> e: this.onlineRegions.entrySet()) { for (Map.Entry<String,HRegion> e: this.onlineRegions.entrySet()) {
list.add(e.getValue().getRegionInfo()); list.add(e.getValue().getRegionInfo());
} }

2
src/main/resources/hbase-webapps/regionserver/regionserver.jsp
View File

@ -56,7 +56,7 @@
%> %>
<tr><td><%= r.getRegionNameAsString() %></td> <tr><td><%= r.getRegionNameAsString() %></td>
<td><%= Bytes.toStringBinary(r.getStartKey()) %></td><td><%= Bytes.toStringBinary(r.getEndKey()) %></td> <td><%= Bytes.toStringBinary(r.getStartKey()) %></td><td><%= Bytes.toStringBinary(r.getEndKey()) %></td>
<td><%= load.toString() %></td> <td><%= load == null? "null": load.toString() %></td>
</tr> </tr>
<% } %> <% } %>
</table> </table>