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

HADOOP-2675 Options not passed to rest/thrift 

git-svn-id: https://svn.apache.org/repos/asf/hadoop/core/trunk/src/contrib/hbase@616163 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Michael Stack 2008-01-29 04:46:34 +00:00
parent 73d71a09a8
commit 2f06f08d95
3 changed files with 27 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGES.txt
View File

@ -150,6 +150,7 @@ Trunk (unreleased changes)
server going down and results in millions of lines of output
HADOOP-2706 HBase Shell crash
HADOOP-2712 under load, regions won't split
HADOOP-2675 Options not passed to rest/thrift
IMPROVEMENTS
HADOOP-2401 Add convenience put method that takes writable

17
src/java/org/apache/hadoop/hbase/rest/Dispatcher.java
View File

@ -209,14 +209,7 @@ implements javax.servlet.Servlet {
} else if (cmd.equals("--help") || cmd.equals("-h")) {
printUsageAndExit();
} else if (cmd.equals("start")) {
org.mortbay.jetty.Server webServer = new org.mortbay.jetty.Server();
SocketListener listener = new SocketListener();
listener.setPort(port);
listener.setHost(bindAddress);
webServer.addListener(listener);
webServer.addWebApplication("/api", InfoServer.getWebAppDir("rest"));
webServer.start();
break;
continue;
} else if (cmd.equals("stop")) {
printUsageAndExit("To shutdown the REST server run " +
"bin/hbase-daemon.sh stop rest or send a kill signal to " +
@ -226,6 +219,14 @@ implements javax.servlet.Servlet {
// Print out usage if we get to here.
printUsageAndExit();
}
org.mortbay.jetty.Server webServer = new org.mortbay.jetty.Server();
SocketListener listener = new SocketListener();
listener.setPort(port);
listener.setHost(bindAddress);
webServer.addListener(listener);
webServer.addWebApplication("/api", InfoServer.getWebAppDir("rest"));
webServer.start();
}
/**

20
src/java/org/apache/hadoop/hbase/thrift/ThriftServer.java
View File

@ -615,6 +615,16 @@ public class ThriftServer {
} else if (cmd.equals("--help") || cmd.equals("-h")) {
printUsageAndExit();
} else if (cmd.equals("start")) {
continue;
} else if (cmd.equals("stop")) {
printUsageAndExit("To shutdown the thrift server run " +
"bin/hbase-daemon.sh stop thrift or send a kill signal to " +
"the thrift server pid");
}
// Print out usage if we get to here.
printUsageAndExit();
}
Log LOG = LogFactory.getLog("ThriftServer");
LOG.info("starting HBase Thrift server on port " +
Integer.toString(port));
@ -625,16 +635,6 @@ public class ThriftServer {
TServer server = new TThreadPoolServer(processor, serverTransport,
protFactory);
server.serve();
break;
} else if (cmd.equals("stop")) {
printUsageAndExit("To shutdown the thrift server run " +
"bin/hbase-daemon.sh stop thrift or send a kill signal to " +
"the thrift server pid");
}
// Print out usage if we get to here.
printUsageAndExit();
}
}
/**