You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by te...@apache.org on 2012/12/12 05:39:07 UTC
svn commit: r1420521 -
/hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java
Author: tedyu
Date: Wed Dec 12 04:39:06 2012
New Revision: 1420521
URL: http://svn.apache.org/viewvc?rev=1420521&view=rev
Log:
HBASE-5258 Move coprocessors set out of RegionLoad - Addendum (Sergey)
Modified:
hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java
Modified: hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java
URL: http://svn.apache.org/viewvc/hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java?rev=1420521&r1=1420520&r2=1420521&view=diff
==============================================================================
--- hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java (original)
+++ hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java Wed Dec 12 04:39:06 2012
@@ -43,6 +43,7 @@ import java.util.Random;
import java.util.Set;
import java.util.SortedMap;
import java.util.TreeMap;
+import java.util.TreeSet;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentMap;
import java.util.concurrent.ConcurrentSkipListMap;
@@ -2253,10 +2254,13 @@ public class HRegionServer implements C
// used by org/apache/hbase/tmpl/regionserver/RSStatusTmpl.jamon (HBASE-4070).
public String[] getCoprocessors() {
- // passing fake times to buildServerLoad is okay, because we only care about the coprocessor part.
- HBaseProtos.ServerLoad sl = buildServerLoad(0, 0);
- return sl == null? null:
- new ServerLoad(sl).getRegionServerCoprocessors();
+ TreeSet<String> coprocessors = new TreeSet<String>(
+ this.hlog.getCoprocessorHost().getCoprocessors());
+ Collection<HRegion> regions = getOnlineRegionsLocalContext();
+ for (HRegion region: regions) {
+ coprocessors.addAll(region.getCoprocessorHost().getCoprocessors());
+ }
+ return coprocessors.toArray(new String[0]);
}
/**