You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by bu...@apache.org on 2017/04/28 16:53:30 UTC
[1/3] hbase git commit: HBASE-17817 add table name to output (if
available) when removing coprocessors
Repository: hbase
Updated Branches:
refs/heads/branch-1 3765e7bed -> fa4f63894
HBASE-17817 add table name to output (if available) when removing coprocessors
Amending-Author: Sean Busbey <bu...@apache.org>
Signed-off-by: Sean Busbey <bu...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/0f5932b0
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/0f5932b0
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/0f5932b0
Branch: refs/heads/branch-1
Commit: 0f5932b059a86c92c1d61e6a1dcd2c2fe9994b7a
Parents: 3765e7b
Author: Steen Manniche <st...@manniche.net>
Authored: Tue Apr 11 17:48:50 2017 +0200
Committer: Sean Busbey <bu...@apache.org>
Committed: Fri Apr 28 11:39:54 2017 -0500
----------------------------------------------------------------------
.../apache/hadoop/hbase/coprocessor/CoprocessorHost.java | 11 +++++++++--
1 file changed, 9 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hbase/blob/0f5932b0/hbase-server/src/main/java/org/apache/hadoop/hbase/coprocessor/CoprocessorHost.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/coprocessor/CoprocessorHost.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/coprocessor/CoprocessorHost.java
index 91b9057..f2b201b 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/coprocessor/CoprocessorHost.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/coprocessor/CoprocessorHost.java
@@ -580,8 +580,15 @@ public abstract class CoprocessorHost<E extends CoprocessorEnvironment> {
// server is configured to abort.
abortServer(env, e);
} else {
- LOG.error("Removing coprocessor '" + env.toString() + "' from " +
- "environment because it threw: " + e,e);
+ // If available, pull a table name out of the environment
+ if(env instanceof RegionCoprocessorEnvironment) {
+ String tableName = ((RegionCoprocessorEnvironment)env).getRegionInfo().getTable().getNameAsString();
+ LOG.error("Removing coprocessor '" + env.toString() + "' from table '"+ tableName + "'", e);
+ } else {
+ LOG.error("Removing coprocessor '" + env.toString() + "' from " +
+ "environment",e);
+ }
+
coprocessors.remove(env);
try {
shutdown(env);
[3/3] hbase git commit: HBASE-17962 Improve documentation on Rest
interface
Posted by bu...@apache.org.
HBASE-17962 Improve documentation on Rest interface
(Excluded update to the ref guide, since it'll be copied from master branch prior to 1.4 release.)
Signed-off-by: Sean Busbey <bu...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/fa4f6389
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/fa4f6389
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/fa4f6389
Branch: refs/heads/branch-1
Commit: fa4f6389426c55abf8a1f0d1791deacdc181748c
Parents: 9a71bac
Author: Niels Basjes <nb...@bol.com>
Authored: Wed Apr 26 11:21:39 2017 +0200
Committer: Sean Busbey <bu...@apache.org>
Committed: Fri Apr 28 11:43:55 2017 -0500
----------------------------------------------------------------------
.../main/java/org/apache/hadoop/hbase/rest/RowResource.java | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hbase/blob/fa4f6389/hbase-rest/src/main/java/org/apache/hadoop/hbase/rest/RowResource.java
----------------------------------------------------------------------
diff --git a/hbase-rest/src/main/java/org/apache/hadoop/hbase/rest/RowResource.java b/hbase-rest/src/main/java/org/apache/hadoop/hbase/rest/RowResource.java
index 4d50c54..d93fd39 100644
--- a/hbase-rest/src/main/java/org/apache/hadoop/hbase/rest/RowResource.java
+++ b/hbase-rest/src/main/java/org/apache/hadoop/hbase/rest/RowResource.java
@@ -139,7 +139,13 @@ public class RowResource extends ResourceBase {
if (!rowspec.hasColumns() || rowspec.getColumns().length > 1) {
servlet.getMetrics().incrementFailedGetRequests(1);
return Response.status(Response.Status.BAD_REQUEST).type(MIMETYPE_TEXT)
- .entity("Bad request: Either 0 or more than 1 columns specified." + CRLF).build();
+ .entity("Bad request: Default 'GET' method only works if there is exactly 1 column " +
+ "in the row. Using the 'Accept' header with one of these formats lets you " +
+ "retrieve the entire row if it has multiple columns: " +
+ // Same as the @Produces list for the get method.
+ MIMETYPE_XML + ", " + MIMETYPE_JSON + ", " +
+ MIMETYPE_PROTOBUF + ", " + MIMETYPE_PROTOBUF_IETF +
+ CRLF).build();
}
MultivaluedMap<String, String> params = uriInfo.getQueryParameters();
try {
[2/3] hbase git commit: HBASE-17835 Spelling mistakes in the Java
source
Posted by bu...@apache.org.
HBASE-17835 Spelling mistakes in the Java source
Signed-off-by: Sean Busbey <bu...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/9a71bacd
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/9a71bacd
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/9a71bacd
Branch: refs/heads/branch-1
Commit: 9a71bacdf013ba6a9406c58aa43193f029df2d66
Parents: 0f5932b
Author: QilinCao <ca...@zte.com.cn>
Authored: Thu Apr 27 09:42:12 2017 +0800
Committer: Sean Busbey <bu...@apache.org>
Committed: Fri Apr 28 11:40:47 2017 -0500
----------------------------------------------------------------------
.../src/main/java/org/apache/hadoop/hbase/client/Admin.java | 2 +-
.../org/apache/hadoop/hbase/procedure/ZKProcedureMemberRpcs.java | 2 +-
.../org/apache/hadoop/hbase/master/TestClockSkewDetection.java | 4 ++--
.../org/apache/hadoop/hbase/wal/WALPerformanceEvaluation.java | 2 +-
4 files changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hbase/blob/9a71bacd/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Admin.java
----------------------------------------------------------------------
diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Admin.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Admin.java
index 5810b2b..82df3f4 100644
--- a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Admin.java
+++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Admin.java
@@ -1190,7 +1190,7 @@ public interface Admin extends Abortable, Closeable {
* <li>running - returns <tt>false</tt></li> <li>finished - returns <tt>true</tt></li>
* <li>finished with error - throws the exception that caused the snapshot to fail</li> </ol> The
* cluster only knows about the most recent snapshot. Therefore, if another snapshot has been
- * run/started since the snapshot your are checking, you will recieve an {@link
+ * run/started since the snapshot you are checking, you will receive an {@link
* org.apache.hadoop.hbase.snapshot.UnknownSnapshotException}.
*
* @param snapshot description of the snapshot to check
http://git-wip-us.apache.org/repos/asf/hbase/blob/9a71bacd/hbase-server/src/main/java/org/apache/hadoop/hbase/procedure/ZKProcedureMemberRpcs.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/procedure/ZKProcedureMemberRpcs.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/procedure/ZKProcedureMemberRpcs.java
index e21c880..17a6e5c 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/procedure/ZKProcedureMemberRpcs.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/procedure/ZKProcedureMemberRpcs.java
@@ -127,7 +127,7 @@ public class ZKProcedureMemberRpcs implements ProcedureMemberRpcs {
* @param path full znode path that cause the notification
*/
private void receivedReachedGlobalBarrier(String path) {
- LOG.debug("Recieved reached global barrier:" + path);
+ LOG.debug("Received reached global barrier:" + path);
String procName = ZKUtil.getNodeName(path);
this.member.receivedReachedGlobalBarrier(procName);
}
http://git-wip-us.apache.org/repos/asf/hbase/blob/9a71bacd/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestClockSkewDetection.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestClockSkewDetection.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestClockSkewDetection.java
index 00f3dc2..856b84c 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestClockSkewDetection.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestClockSkewDetection.java
@@ -129,7 +129,7 @@ public class TestClockSkewDetection {
fail("HMaster should have thrown a ClockOutOfSyncException but didn't.");
} catch(ClockOutOfSyncException e) {
//we want an exception
- LOG.info("Recieved expected exception: "+e);
+ LOG.info("Received expected exception: "+e);
}
try {
@@ -145,7 +145,7 @@ public class TestClockSkewDetection {
fail("HMaster should have thrown a ClockOutOfSyncException but didn't.");
} catch (ClockOutOfSyncException e) {
// we want an exception
- LOG.info("Recieved expected exception: " + e);
+ LOG.info("Received expected exception: " + e);
}
// make sure values above warning threshold but below max threshold don't kill
http://git-wip-us.apache.org/repos/asf/hbase/blob/9a71bacd/hbase-server/src/test/java/org/apache/hadoop/hbase/wal/WALPerformanceEvaluation.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/wal/WALPerformanceEvaluation.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/wal/WALPerformanceEvaluation.java
index 5a3dd87..d4c59d4 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/wal/WALPerformanceEvaluation.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/wal/WALPerformanceEvaluation.java
@@ -148,7 +148,7 @@ public final class WALPerformanceEvaluation extends Configured implements Tool {
loopSampler = Sampler.ALWAYS;
if (numIterations > 1000) {
LOG.warn("Full tracing of all iterations will produce a lot of data. Be sure your"
- + " SpanReciever can keep up.");
+ + " SpanReceiver can keep up.");
}
} else {
getConf().setDouble("hbase.sampler.fraction", traceFreq);