You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by li...@apache.org on 2014/04/26 20:18:35 UTC

svn commit: r1590273 - /hbase/branches/0.89-fb/src/main/java/org/apache/hadoop/hbase/regionserver/ThriftHRegionServer.java

Author: liyin
Date: Sat Apr 26 18:18:35 2014
New Revision: 1590273

URL: http://svn.apache.org/r1590273
Log:
[master] Fix recursion in ThriftHRegionServer

Author: elliott

Summary: ThriftHRegionServer had an infinte recursion.

Test Plan:
mvn clean test -Dtest=TestThriftServer
mvn clean test -Dtest=TestHFileHistogramE2E

Reviewers: adela, liyintang

Reviewed By: adela

CC: hbase-eng@, manukranthk

Differential Revision: https://phabricator.fb.com/D1297678

Task ID: 4223253

Modified:
    hbase/branches/0.89-fb/src/main/java/org/apache/hadoop/hbase/regionserver/ThriftHRegionServer.java

Modified: hbase/branches/0.89-fb/src/main/java/org/apache/hadoop/hbase/regionserver/ThriftHRegionServer.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.89-fb/src/main/java/org/apache/hadoop/hbase/regionserver/ThriftHRegionServer.java?rev=1590273&r1=1590272&r2=1590273&view=diff
==============================================================================
--- hbase/branches/0.89-fb/src/main/java/org/apache/hadoop/hbase/regionserver/ThriftHRegionServer.java (original)
+++ hbase/branches/0.89-fb/src/main/java/org/apache/hadoop/hbase/regionserver/ThriftHRegionServer.java Sat Apr 26 18:18:35 2014
@@ -644,7 +644,11 @@ public class ThriftHRegionServer impleme
   @Override
   public List<List<Bucket>> getHistograms(List<byte[]> regionNames)
     throws ThriftHBaseException {
-    return this.getHistograms(regionNames);
+    try {
+      return server.getHistograms(regionNames);
+    } catch (IOException e) {
+      throw new ThriftHBaseException(e);
+    }
   }
 
   @Override