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

Fix up bad resolve of trunk conflict from HBASE-3835 

git-svn-id: https://svn.apache.org/repos/asf/hbase/trunk@1099206 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Todd Lipcon 2011-05-03 19:11:25 +00:00
parent 214f63b6c8
commit 17694cf3bc
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/jamon/org/apache/hbase/tmpl/master/MasterStatusTmpl.jamon
View File

@ -183,9 +183,8 @@ org.apache.hadoop.hbase.HTableDescriptor;
for (ServerName serverName: serverNames) {
// TODO: this is incorrect since this conf might differ from RS to RS
// or be set to 0 to get ephemeral ports
int infoPort = conf.getInt("hbase.regionserver.info.port", 60030);
int infoPort = master.getConfiguration().getInt("hbase.regionserver.info.port", 60030);
String hostname = serverName.getHostname() + ":" + infoPort;
String hostname = serverName.getHostname() + ":60030";
String url = "http://" + hostname + "/";
HServerLoad hsl = master.getServerManager().getLoad(serverName);
String loadStr = hsl == null? "-": hsl.toString();