svn commit: r1091856 - in /hbase/branches/0.90: CHANGES.txt src/main/resources/hbase-webapps/master/master.jsp src/main/resources/hbase-webapps/master/table.jsp src/main/resources/hbase-webapps/master/zk.jsp

[jd...@apache.org]

Author: jdcryans
Date: Wed Apr 13 17:29:17 2011
New Revision: 1091856

URL: http://svn.apache.org/viewvc?rev=1091856&view=rev
Log:
HBASE-3771  All jsp pages don't clean their HBA

Modified:
    hbase/branches/0.90/CHANGES.txt
    hbase/branches/0.90/src/main/resources/hbase-webapps/master/master.jsp
    hbase/branches/0.90/src/main/resources/hbase-webapps/master/table.jsp
    hbase/branches/0.90/src/main/resources/hbase-webapps/master/zk.jsp

Modified: hbase/branches/0.90/CHANGES.txt
URL: http://svn.apache.org/viewvc/hbase/branches/0.90/CHANGES.txt?rev=1091856&r1=1091855&r2=1091856&view=diff
==============================================================================
--- hbase/branches/0.90/CHANGES.txt (original)
+++ hbase/branches/0.90/CHANGES.txt Wed Apr 13 17:29:17 2011
@@ -17,6 +17,7 @@ Release 0.90.3 - Unreleased
    HBASE-3755  Catch zk's ConnectionLossException and augment error
                message with more help
    HBASE-3722  A lot of data is lost when name node crashed (gaojinchao)
+   HBASE-3771  All jsp pages don't clean their HBA
 
   IMPROVEMENT
    HBASE-3717  deprecate HTable isTableEnabled() methods in favor of HBaseAdmin

Modified: hbase/branches/0.90/src/main/resources/hbase-webapps/master/master.jsp
URL: http://svn.apache.org/viewvc/hbase/branches/0.90/src/main/resources/hbase-webapps/master/master.jsp?rev=1091856&r1=1091855&r2=1091856&view=diff
==============================================================================
--- hbase/branches/0.90/src/main/resources/hbase-webapps/master/master.jsp (original)
+++ hbase/branches/0.90/src/main/resources/hbase-webapps/master/master.jsp Wed Apr 13 17:29:17 2011
@@ -8,6 +8,7 @@
   import="org.apache.hadoop.hbase.master.HMaster"
   import="org.apache.hadoop.hbase.HConstants"
   import="org.apache.hadoop.hbase.client.HBaseAdmin"
+  import="org.apache.hadoop.hbase.client.HConnectionManager"
   import="org.apache.hadoop.hbase.HServerInfo"
   import="org.apache.hadoop.hbase.HServerAddress"
   import="org.apache.hadoop.hbase.HTableDescriptor" %><%
@@ -107,7 +108,10 @@
 <%} %>
 
 <h2>User Tables</h2>
-<% HTableDescriptor[] tables = new HBaseAdmin(conf).listTables(); 
+<%
+   HBaseAdmin hba = new HBaseAdmin(conf);
+   HTableDescriptor[] tables = hba.listTables();
+   HConnectionManager.deleteConnection(hba.getConfiguration(), false);
    if(tables != null && tables.length > 0) { %>
 <table>
 <tr>

Modified: hbase/branches/0.90/src/main/resources/hbase-webapps/master/table.jsp
URL: http://svn.apache.org/viewvc/hbase/branches/0.90/src/main/resources/hbase-webapps/master/table.jsp?rev=1091856&r1=1091855&r2=1091856&view=diff
==============================================================================
--- hbase/branches/0.90/src/main/resources/hbase-webapps/master/table.jsp (original)
+++ hbase/branches/0.90/src/main/resources/hbase-webapps/master/table.jsp Wed Apr 13 17:29:17 2011
@@ -4,6 +4,7 @@
   import="org.apache.hadoop.conf.Configuration"
   import="org.apache.hadoop.hbase.client.HTable"
   import="org.apache.hadoop.hbase.client.HBaseAdmin"
+  import="org.apache.hadoop.hbase.client.HConnectionManager"
   import="org.apache.hadoop.hbase.HRegionInfo"
   import="org.apache.hadoop.hbase.HServerAddress"
   import="org.apache.hadoop.hbase.HServerInfo"
@@ -178,6 +179,8 @@
   ex.printStackTrace(System.err);
 }
 } // end else
+
+HConnectionManager.deleteConnection(hbadmin.getConfiguration(), false);
 %>
 
 <p><hr><p>

Modified: hbase/branches/0.90/src/main/resources/hbase-webapps/master/zk.jsp
URL: http://svn.apache.org/viewvc/hbase/branches/0.90/src/main/resources/hbase-webapps/master/zk.jsp?rev=1091856&r1=1091855&r2=1091856&view=diff
==============================================================================
--- hbase/branches/0.90/src/main/resources/hbase-webapps/master/zk.jsp (original)
+++ hbase/branches/0.90/src/main/resources/hbase-webapps/master/zk.jsp Wed Apr 13 17:29:17 2011
@@ -3,6 +3,7 @@
   import="org.apache.hadoop.conf.Configuration"
   import="org.apache.hadoop.hbase.client.HBaseAdmin"
   import="org.apache.hadoop.hbase.client.HConnection"
+  import="org.apache.hadoop.hbase.client.HConnectionManager"
   import="org.apache.hadoop.hbase.HRegionInfo"
   import="org.apache.hadoop.hbase.zookeeper.ZKUtil"
   import="org.apache.hadoop.hbase.zookeeper.ZooKeeperWatcher"
@@ -31,6 +32,7 @@
 <hr id="head_rule" />
 <pre>
 <%= ZKUtil.dump(watcher) %>
+<% HConnectionManager.deleteConnection(hbadmin.getConfiguration(), false); %>
 </pre>
 
 </body>