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 2013/07/13 17:19:03 UTC

svn commit: r1502798 - /hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/thrift2/ThriftHBaseServiceHandler.java

Author: larsgeorge
Date: Sat Jul 13 15:19:03 2013
New Revision: 1502798

URL: http://svn.apache.org/r1502798
Log:
HBASE-8938 Thrift2 does not close scanner instance (Hamed Madani)

Modified:
    hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/thrift2/ThriftHBaseServiceHandler.java

Modified: hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/thrift2/ThriftHBaseServiceHandler.java
URL: http://svn.apache.org/viewvc/hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/thrift2/ThriftHBaseServiceHandler.java?rev=1502798&r1=1502797&r2=1502798&view=diff
==============================================================================
--- hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/thrift2/ThriftHBaseServiceHandler.java (original)
+++ hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/thrift2/ThriftHBaseServiceHandler.java Sat Jul 13 15:19:03 2013
@@ -336,11 +336,17 @@ public class ThriftHBaseServiceHandler i
 
   @Override
   public void closeScanner(int scannerId) throws TIOError, TIllegalArgument, TException {
-    if (removeScanner(scannerId) == null) {
+    LOG.debug("scannerClose: id=" + scannerId);
+    ResultScanner scanner = getScanner(scannerId);
+    if (scanner == null) {
+      String message = "scanner ID is invalid";
+      LOG.warn(message);
       TIllegalArgument ex = new TIllegalArgument();
       ex.setMessage("Invalid scanner Id");
       throw ex;
     }
+    scanner.close();
+    removeScanner(scannerId);
   }
 
 }