HADOOP-2011 Make hbase daemon scripts take args in same order as hadoop
daemon scripts git-svn-id: https://svn.apache.org/repos/asf/lucene/hadoop/trunk/src/contrib/hbase@583037 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Michael Stack
parent
79b3b1c6b2
commit
5233c28aaa
|
|
@ -70,6 +70,8 @@ Trunk (unreleased changes)
|
|||
HADOOP-1937 When the master times out a region server's lease, it is too
|
||||
aggressive in reclaiming the server's log.
|
||||
HADOOP-2004 webapp hql formatting bugs
|
||||
HADOOP_2011 Make hbase daemon scripts take args in same order as hadoop
|
||||
daemon scripts
|
||||
|
||||
IMPROVEMENTS
|
||||
HADOOP-1737 Make HColumnDescriptor data publically members settable
|
||||
|
|
|
|||
|
|
@ -34,7 +34,7 @@
|
|||
# Modelled after $HADOOP_HOME/bin/hadoop-daemon.sh
|
||||
|
||||
usage="Usage: hbase-daemon.sh [--config <hadoop-conf-dir>]\
|
||||
[--hbaseconfig <hbase-conf-dir>] <hbase-command> (start|stop)\
|
||||
[--hbaseconfig <hbase-conf-dir>] (start|stop) <hbase-command> \
|
||||
<args...>"
|
||||
|
||||
# if no args specified, show usage
|
||||
|
|
@ -49,10 +49,10 @@ bin=`cd "$bin"; pwd`
|
|||
. "$bin"/hbase-config.sh
|
||||
|
||||
# get arguments
|
||||
command=$1
|
||||
startStop=$1
|
||||
shift
|
||||
|
||||
startStop=$1
|
||||
command=$1
|
||||
shift
|
||||
|
||||
hbase_rotate_log ()
|
||||
|
|
|
|||
|
|
@ -26,7 +26,7 @@
|
|||
usage="Usage: hbase-daemons.sh [--hadoop <hadoop-home>]
|
||||
[--config <hadoop-confdir>] [--hbase <hbase-home>]\
|
||||
[--hbaseconfig <hbase-confdir>] [--hosts regionserversfile]\
|
||||
command [start|stop] args..."
|
||||
[start|stop] command args..."
|
||||
|
||||
# if no args specified, show usage
|
||||
if [ $# -le 1 ]; then
|
||||
|
|
|
|||
|
|
@ -39,7 +39,7 @@ then
|
|||
exit $errCode
|
||||
fi
|
||||
"$bin"/hbase-daemon.sh --config "${HADOOP_CONF_DIR}" \
|
||||
--hbaseconfig "${HBASE_CONF_DIR}" master start
|
||||
--hbaseconfig "${HBASE_CONF_DIR}" start master
|
||||
"$bin"/hbase-daemons.sh --config "${HADOOP_CONF_DIR}" \
|
||||
--hbaseconfig "${HBASE_CONF_DIR}" --hadoop "${HADOOP_HOME}" \
|
||||
--hosts "${HBASE_REGIONSERVERS}" regionserver start
|
||||
--hosts "${HBASE_REGIONSERVERS}" start regionserver
|
||||
|
|
|
|||
|
|
@ -30,4 +30,4 @@ bin=`cd "$bin"; pwd`
|
|||
. "$bin"/hbase-config.sh
|
||||
|
||||
"$bin"/hbase-daemon.sh --config "${HADOOP_CONF_DIR}" \
|
||||
--hbaseconfig "${HBASE_CONF_DIR}" master stop
|
||||
--hbaseconfig "${HBASE_CONF_DIR}" stop master
|
||||
|
|
|
|||
|
|
@ -47,12 +47,12 @@ public final class hql_jsp extends org.apache.jasper.runtime.HttpJspBase
|
|||
_jspx_out = out;
|
||||
|
||||
out.write("<?xml version=\"1.0\" encoding=\"UTF-8\" ?>\n<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Transitional//EN\" \n \"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd\"> \n<html xmlns=\"http://www.w3.org/1999/xhtml\">\n<head><meta http-equiv=\"Content-Type\" content=\"text/html;charset=UTF-8\"/>\n<title>HQL</title>\n<link rel=\"stylesheet\" type=\"text/css\" href=\"/static/hbase.css\" />\n</head>\n\n<body>\n<h1><a href=\"http://wiki.apache.org/lucene-hadoop/Hbase/HbaseShell\">HQL</a></h1>\n<p><a href=\"/master.jsp\">Home</a></p>\n");
|
||||
String query = request.getParameter("query");
|
||||
String query = request.getParameter("q");
|
||||
if (query == null) {
|
||||
query = "";
|
||||
}
|
||||
|
||||
out.write("\n<form action=\"/hql.jsp\" method=\"post\">\n <p>\n <label for=\"query\">Query: </label>\n <input type=\"text\" name=\"query\" id=\"query\" size=\"40\" value=\"");
|
||||
out.write("\n<form action=\"/hql.jsp\" method=\"get\">\n <p>\n <label for=\"query\">Query: </label>\n <input type=\"text\" name=\"q\" id=\"q\" size=\"40\" value=\"");
|
||||
out.print( query );
|
||||
out.write("\" />\n <input type=\"submit\" value=\"submit\" />\n </p>\n </form>\n <p>Enter 'help;' -- thats 'help' plus a semi-colon -- for a list of <em>HQL</em> commands.\n Data Definition, SHELL, INSERTS, DELETES, and UPDATE commands are disabled in this interface\n </p>\n \n ");
|
||||
|
||||
|
|
@ -78,7 +78,7 @@ public final class hql_jsp extends org.apache.jasper.runtime.HttpJspBase
|
|||
}
|
||||
}
|
||||
|
||||
out.write("\n</body>\n</html>");
|
||||
out.write("\n</body>\n</html>\n");
|
||||
} catch (Throwable t) {
|
||||
if (!(t instanceof SkipPageException)){
|
||||
out = _jspx_out;
|
||||
|
|
|
|||
|
|
@ -106,10 +106,6 @@ public class IndexOutputFormat extends
|
|||
throws IOException {
|
||||
// unwrap and index doc
|
||||
Document doc = value.get();
|
||||
if (LOG.isDebugEnabled()) {
|
||||
LOG.debug(" Indexing [" + doc + "]");
|
||||
}
|
||||
|
||||
writer.addDocument(doc);
|
||||
docCount++;
|
||||
progress.progress();
|
||||
|
|
@ -160,4 +156,4 @@ public class IndexOutputFormat extends
|
|||
}
|
||||
};
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -18,15 +18,15 @@
|
|||
<body>
|
||||
<h1><a href="http://wiki.apache.org/lucene-hadoop/Hbase/HbaseShell">HQL</a></h1>
|
||||
<p><a href="/master.jsp">Home</a></p>
|
||||
<% String query = request.getParameter("query");
|
||||
<% String query = request.getParameter("q");
|
||||
if (query == null) {
|
||||
query = "";
|
||||
}
|
||||
%>
|
||||
<form action="/hql.jsp" method="post">
|
||||
<form action="/hql.jsp" method="get">
|
||||
<p>
|
||||
<label for="query">Query: </label>
|
||||
<input type="text" name="query" id="query" size="40" value="<%= query %>" />
|
||||
<input type="text" name="q" id="q" size="40" value="<%= query %>" />
|
||||
<input type="submit" value="submit" />
|
||||
</p>
|
||||
</form>
|
||||
|
|
@ -54,4 +54,4 @@
|
|||
}
|
||||
%>
|
||||
</body>
|
||||
</html>
|
||||
</html>
|
||||
|
|
|
|||
Loading…
Reference in New Issue