You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by la...@apache.org on 2012/07/07 04:14:42 UTC

svn commit: r1358490 - in /hbase/branches/0.92: CHANGES.txt src/main/java/org/apache/hadoop/hbase/ipc/HBaseClient.java

Author: larsh
Date: Sat Jul  7 02:14:42 2012
New Revision: 1358490

URL: http://svn.apache.org/viewvc?rev=1358490&view=rev
Log:
HBASE-6313 Client hangs because the client is not notified (binlijin)

Modified:
    hbase/branches/0.92/CHANGES.txt
    hbase/branches/0.92/src/main/java/org/apache/hadoop/hbase/ipc/HBaseClient.java

Modified: hbase/branches/0.92/CHANGES.txt
URL: http://svn.apache.org/viewvc/hbase/branches/0.92/CHANGES.txt?rev=1358490&r1=1358489&r2=1358490&view=diff
==============================================================================
--- hbase/branches/0.92/CHANGES.txt (original)
+++ hbase/branches/0.92/CHANGES.txt Sat Jul  7 02:14:42 2012
@@ -87,6 +87,7 @@ Release 0.92.2 - Unreleased
    HBASE-6265  Calling getTimestamp() on a KV in cp.prePut() causes KV not to be flushed
    HBASE-6281  Assignment need not be called for disabling table regions
                during clean cluster start up (Rajesh Babu)
+   HBASE-6313  Client hangs because the client is not notified (binlijin)
 
   IMPROVEMENTS
    HBASE-5592  Make it easier to get a table from shell (Ben West)

Modified: hbase/branches/0.92/src/main/java/org/apache/hadoop/hbase/ipc/HBaseClient.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.92/src/main/java/org/apache/hadoop/hbase/ipc/HBaseClient.java?rev=1358490&r1=1358489&r2=1358490&view=diff
==============================================================================
--- hbase/branches/0.92/src/main/java/org/apache/hadoop/hbase/ipc/HBaseClient.java (original)
+++ hbase/branches/0.92/src/main/java/org/apache/hadoop/hbase/ipc/HBaseClient.java Sat Jul  7 02:14:42 2012
@@ -68,8 +68,8 @@ import org.apache.hadoop.util.Reflection
  */
 public class HBaseClient {
 
-  private static final Log LOG =
-    LogFactory.getLog("org.apache.hadoop.ipc.HBaseClient");
+  private static final Log LOG = LogFactory
+      .getLog("org.apache.hadoop.ipc.HBaseClient");
   protected final PoolMap<ConnectionId, Connection> connections;
 
   protected final Class<? extends Writable> valueClass;   // class of call values
@@ -572,7 +572,7 @@ public class HBaseClient {
 
         if (LOG.isDebugEnabled())
           LOG.debug(getName() + " got value #" + id);
-        Call call = calls.remove(id);
+        Call call = calls.get(id);
 
         // Read the flag byte
         byte flag = in.readByte();
@@ -597,6 +597,7 @@ public class HBaseClient {
             call.setValue(value);
           }
         }
+        calls.remove(id);
       } catch (IOException e) {
         if (e instanceof SocketTimeoutException && remoteId.rpcTimeout > 0) {
           // Clean up open calls but don't treat this as a fatal condition,