Apache
/
hbase
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

HBASE-8179. Fixes a problem to do with the json response for the cluster status 

git-svn-id: https://svn.apache.org/repos/asf/hbase/trunk@1464797 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Devaraj Das 2013-04-05 00:36:02 +00:00
parent 4855d12aa9
commit 6debbada44
1 changed files with 18 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
hbase-server/src/main/java/org/apache/hadoop/hbase/rest/RESTServer.java
View File

@ -39,6 +39,8 @@ import org.apache.hadoop.net.DNS;
import java.util.List; import java.util.List;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Map;
import java.util.Map.Entry;
import org.mortbay.jetty.Connector; import org.mortbay.jetty.Connector;
import org.mortbay.jetty.Server; import org.mortbay.jetty.Server;
@ -47,6 +49,7 @@ import org.mortbay.jetty.servlet.Context;
import org.mortbay.jetty.servlet.ServletHolder; import org.mortbay.jetty.servlet.ServletHolder;
import org.mortbay.thread.QueuedThreadPool; import org.mortbay.thread.QueuedThreadPool;
import com.sun.jersey.api.json.JSONConfiguration;
import com.sun.jersey.spi.container.servlet.ServletContainer; import com.sun.jersey.spi.container.servlet.ServletContainer;
/** /**
@ -148,6 +151,20 @@ public class RESTServer implements Constants {
ResourceConfig.class.getCanonicalName()); ResourceConfig.class.getCanonicalName());
sh.setInitParameter("com.sun.jersey.config.property.packages", sh.setInitParameter("com.sun.jersey.config.property.packages",
"jetty"); "jetty");
// The servlet holder below is instantiated to only handle the case
// of the /status/cluster returning arrays of nodes (live/dead). Without
// this servlet holder, the problem is that the node arrays in the response
// are collapsed to single nodes. We want to be able to treat the
// node lists as POJO in the response to /status/cluster servlet call,
// but not change the behavior for any of the other servlets
// Hence we don't use the servlet holder for all servlets / paths
ServletHolder shPojoMap = new ServletHolder(ServletContainer.class);
@SuppressWarnings("unchecked")
Map<String, String> shInitMap = sh.getInitParameters();
for (Entry<String, String> e : shInitMap.entrySet()) {
shPojoMap.setInitParameter(e.getKey(), e.getValue());
}
shPojoMap.setInitParameter(JSONConfiguration.FEATURE_POJO_MAPPING, "true");
// set up Jetty and run the embedded server // set up Jetty and run the embedded server
@ -175,6 +192,7 @@ public class RESTServer implements Constants {
server.setStopAtShutdown(true); server.setStopAtShutdown(true);
// set up context // set up context
Context context = new Context(server, "/", Context.SESSIONS); Context context = new Context(server, "/", Context.SESSIONS);
context.addServlet(shPojoMap, "/status/cluster");
context.addServlet(sh, "/*"); context.addServlet(sh, "/*");
context.addFilter(GzipFilter.class, "/*", 0); context.addFilter(GzipFilter.class, "/*", 0);