You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by ji...@apache.org on 2008/08/30 03:32:09 UTC
svn commit: r690437 - in /hadoop/hbase/trunk: CHANGES.txt
src/java/org/apache/hadoop/hbase/client/HConnectionManager.java
src/java/org/apache/hadoop/hbase/ipc/HRegionInterface.java
src/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java
Author: jimk
Date: Fri Aug 29 18:32:09 2008
New Revision: 690437
URL: http://svn.apache.org/viewvc?rev=690437&view=rev
Log:
HBASE-854 hbase-841 broke build on hudson? - makes sure that proxies are closed. (Andrew Purtell via Jim Kellerman)
Modified:
hadoop/hbase/trunk/CHANGES.txt
hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/client/HConnectionManager.java
hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/ipc/HRegionInterface.java
hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java
Modified: hadoop/hbase/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/hbase/trunk/CHANGES.txt?rev=690437&r1=690436&r2=690437&view=diff
==============================================================================
--- hadoop/hbase/trunk/CHANGES.txt (original)
+++ hadoop/hbase/trunk/CHANGES.txt Fri Aug 29 18:32:09 2008
@@ -47,6 +47,8 @@
one time (Billy Pearson via Stack)
HBASE-836 Update thrift examples to work with changed IDL (HBASE-697)
(Toby White via Stack)
+ HBASE-854 hbase-841 broke build on hudson? - makes sure that proxies are
+ closed. (Andrew Purtell via Jim Kellerman)
IMPROVEMENTS
HBASE-801 When a table haven't disable, shell could response in a "user
Modified: hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/client/HConnectionManager.java
URL: http://svn.apache.org/viewvc/hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/client/HConnectionManager.java?rev=690437&r1=690436&r2=690437&view=diff
==============================================================================
--- hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/client/HConnectionManager.java (original)
+++ hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/client/HConnectionManager.java Fri Aug 29 18:32:09 2008
@@ -98,7 +98,10 @@
*/
public static void deleteConnectionInfo(HBaseConfiguration conf) {
synchronized (HBASE_INSTANCES) {
- HBASE_INSTANCES.remove(conf.get(HBASE_DIR));
+ TableServers t = HBASE_INSTANCES.remove(conf.get(HBASE_DIR));
+ if (t != null) {
+ t.close();
+ }
}
}
@@ -107,6 +110,9 @@
*/
public static void deleteConnectionInfo() {
synchronized (HBASE_INSTANCES) {
+ for (TableServers t: HBASE_INSTANCES.values()) {
+ t.close();
+ }
HBASE_INSTANCES.clear();
}
}
@@ -887,5 +893,19 @@
}
return null;
}
+
+ void close() {
+ if (master != null) {
+ HbaseRPC.stopProxy(master);
+ master = null;
+ masterChecked = false;
+ }
+ synchronized (servers) {
+ for (HRegionInterface i: servers.values()) {
+ HbaseRPC.stopProxy(i);
+ }
+ }
+ }
}
+
}
Modified: hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/ipc/HRegionInterface.java
URL: http://svn.apache.org/viewvc/hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/ipc/HRegionInterface.java?rev=690437&r1=690436&r2=690437&view=diff
==============================================================================
--- hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/ipc/HRegionInterface.java (original)
+++ hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/ipc/HRegionInterface.java Fri Aug 29 18:32:09 2008
@@ -36,9 +36,9 @@
public interface HRegionInterface extends VersionedProtocol {
/**
* Protocol version.
- * Upped to 3 when we went from Text to byte arrays for row and column names.
+ * Upped to 4 when we removed overloaded methods from the protocol.
*/
- public static final long versionID = 3L;
+ public static final long versionID = 4L;
/**
* Get metainfo about an HRegion
Modified: hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java
URL: http://svn.apache.org/viewvc/hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java?rev=690437&r1=690436&r2=690437&view=diff
==============================================================================
--- hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java (original)
+++ hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java Fri Aug 29 18:32:09 2008
@@ -484,6 +484,10 @@
LOG.info("stopping server at: " +
serverInfo.getServerAddress().toString());
}
+ if (this.hbaseMaster != null) {
+ HbaseRPC.stopProxy(this.hbaseMaster);
+ this.hbaseMaster = null;
+ }
join();
LOG.info(Thread.currentThread().getName() + " exiting");
}