hbase git commit: Specify bash for local-regionservers.sh and local-master-backup.sh
Repository: hbase Updated Branches: refs/heads/branch-1 bee9fb8e7 - 58ab201be Specify bash for local-regionservers.sh and local-master-backup.sh Signed-off-by: Sean Busbey bus...@apache.org Conflicts: src/main/asciidoc/_chapters/configuration.adoc Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/58ab201b Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/58ab201b Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/58ab201b Branch: refs/heads/branch-1 Commit: 58ab201be341f02829286f036a7401d0806eb999 Parents: bee9fb8 Author: Gustavo Anatoly gustavoanat...@gmail.com Authored: Mon Mar 16 23:45:01 2015 -0300 Committer: Sean Busbey bus...@apache.org Committed: Tue Mar 17 10:27:03 2015 -0500 -- bin/local-master-backup.sh | 2 +- bin/local-regionservers.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/hbase/blob/58ab201b/bin/local-master-backup.sh -- diff --git a/bin/local-master-backup.sh b/bin/local-master-backup.sh index f368e4a..e1a80cd 100755 --- a/bin/local-master-backup.sh +++ b/bin/local-master-backup.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/usr/bin/env bash #/** # * Copyright 2007 The Apache Software Foundation # * http://git-wip-us.apache.org/repos/asf/hbase/blob/58ab201b/bin/local-regionservers.sh -- diff --git a/bin/local-regionservers.sh b/bin/local-regionservers.sh index 38d9ffc..f744ee1 100755 --- a/bin/local-regionservers.sh +++ b/bin/local-regionservers.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/usr/bin/env bash #/** # * Copyright 2007 The Apache Software Foundation # *
hbase git commit: Specify bash for local-regionservers.sh and local-master-backup.sh
Repository: hbase Updated Branches: refs/heads/0.98 8b7dbfb9c - 02a1f3a5b Specify bash for local-regionservers.sh and local-master-backup.sh Signed-off-by: Sean Busbey bus...@apache.org Conflicts: src/main/asciidoc/_chapters/configuration.adoc Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/02a1f3a5 Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/02a1f3a5 Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/02a1f3a5 Branch: refs/heads/0.98 Commit: 02a1f3a5ba46c4d8d72135607e5d20355d1061a2 Parents: 8b7dbfb Author: Gustavo Anatoly gustavoanat...@gmail.com Authored: Mon Mar 16 23:45:01 2015 -0300 Committer: Sean Busbey bus...@apache.org Committed: Tue Mar 17 10:28:09 2015 -0500 -- bin/local-master-backup.sh | 2 +- bin/local-regionservers.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/hbase/blob/02a1f3a5/bin/local-master-backup.sh -- diff --git a/bin/local-master-backup.sh b/bin/local-master-backup.sh index 2509a7a..05dc4ac 100755 --- a/bin/local-master-backup.sh +++ b/bin/local-master-backup.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/usr/bin/env bash #/** # * Copyright 2007 The Apache Software Foundation # * http://git-wip-us.apache.org/repos/asf/hbase/blob/02a1f3a5/bin/local-regionservers.sh -- diff --git a/bin/local-regionservers.sh b/bin/local-regionservers.sh index 2303dd5..6f1c79a 100755 --- a/bin/local-regionservers.sh +++ b/bin/local-regionservers.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/usr/bin/env bash #/** # * Copyright 2007 The Apache Software Foundation # *
hbase git commit: Specify bash for local-regionservers.sh and local-master-backup.sh
Repository: hbase Updated Branches: refs/heads/0.94 ec8cfe14f - 9e6b65226 Specify bash for local-regionservers.sh and local-master-backup.sh Signed-off-by: Sean Busbey bus...@apache.org Conflicts: src/main/asciidoc/_chapters/configuration.adoc Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/9e6b6522 Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/9e6b6522 Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/9e6b6522 Branch: refs/heads/0.94 Commit: 9e6b65226a59aa13d470b6d1e83eb7035ce9 Parents: ec8cfe1 Author: Gustavo Anatoly gustavoanat...@gmail.com Authored: Mon Mar 16 23:45:01 2015 -0300 Committer: Sean Busbey bus...@apache.org Committed: Tue Mar 17 10:28:45 2015 -0500 -- bin/local-master-backup.sh | 2 +- bin/local-regionservers.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/hbase/blob/9e6b6522/bin/local-master-backup.sh -- diff --git a/bin/local-master-backup.sh b/bin/local-master-backup.sh index 2c0a4c0..fc2efef 100755 --- a/bin/local-master-backup.sh +++ b/bin/local-master-backup.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/usr/bin/env bash #/** # * Copyright 2007 The Apache Software Foundation # * http://git-wip-us.apache.org/repos/asf/hbase/blob/9e6b6522/bin/local-regionservers.sh -- diff --git a/bin/local-regionservers.sh b/bin/local-regionservers.sh index a4d5a1d..31e90cc 100755 --- a/bin/local-regionservers.sh +++ b/bin/local-regionservers.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/usr/bin/env bash #/** # * Copyright 2007 The Apache Software Foundation # *
hbase git commit: Specify bash for local-regionservers.sh and local-master-backup.sh
Repository: hbase Updated Branches: refs/heads/branch-1.0 417f7a193 - 6b37ae3d7 Specify bash for local-regionservers.sh and local-master-backup.sh Signed-off-by: Sean Busbey bus...@apache.org Conflicts: src/main/asciidoc/_chapters/configuration.adoc Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/6b37ae3d Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/6b37ae3d Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/6b37ae3d Branch: refs/heads/branch-1.0 Commit: 6b37ae3d77e68458cae385b11163ac5108af7655 Parents: 417f7a19 Author: Gustavo Anatoly gustavoanat...@gmail.com Authored: Mon Mar 16 23:45:01 2015 -0300 Committer: Sean Busbey bus...@apache.org Committed: Tue Mar 17 10:27:34 2015 -0500 -- bin/local-master-backup.sh | 2 +- bin/local-regionservers.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/hbase/blob/6b37ae3d/bin/local-master-backup.sh -- diff --git a/bin/local-master-backup.sh b/bin/local-master-backup.sh index f368e4a..e1a80cd 100755 --- a/bin/local-master-backup.sh +++ b/bin/local-master-backup.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/usr/bin/env bash #/** # * Copyright 2007 The Apache Software Foundation # * http://git-wip-us.apache.org/repos/asf/hbase/blob/6b37ae3d/bin/local-regionservers.sh -- diff --git a/bin/local-regionservers.sh b/bin/local-regionservers.sh index 38d9ffc..f744ee1 100755 --- a/bin/local-regionservers.sh +++ b/bin/local-regionservers.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/usr/bin/env bash #/** # * Copyright 2007 The Apache Software Foundation # *
hbase git commit: HBASE-13230 [mob] reads hang when trying to read rows with large mobs (10MB)
Repository: hbase
Updated Branches:
refs/heads/hbase-11339 8c1edeb2b - aedd0ebe9
HBASE-13230 [mob] reads hang when trying to read rows with large mobs (10MB)
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/aedd0ebe
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/aedd0ebe
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/aedd0ebe
Branch: refs/heads/hbase-11339
Commit: aedd0ebe9b8d1968f7d91772b369829e00606087
Parents: 8c1edeb
Author: Jonathan M Hsieh jmhs...@apache.org
Authored: Fri Mar 13 10:37:52 2015 -0700
Committer: Jonathan M Hsieh jmhs...@apache.org
Committed: Fri Mar 13 10:45:46 2015 -0700
--
.../hbase/ipc/AsyncServerResponseHandler.java | 3 +-
.../apache/hadoop/hbase/ipc/RpcClientImpl.java | 3 +-
.../hadoop/hbase/protobuf/ProtobufUtil.java | 93 ++--
.../hbase/regionserver/TestMobStoreScanner.java | 29 --
4 files changed, 112 insertions(+), 16 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/hbase/blob/aedd0ebe/hbase-client/src/main/java/org/apache/hadoop/hbase/ipc/AsyncServerResponseHandler.java
--
diff --git
a/hbase-client/src/main/java/org/apache/hadoop/hbase/ipc/AsyncServerResponseHandler.java
b/hbase-client/src/main/java/org/apache/hadoop/hbase/ipc/AsyncServerResponseHandler.java
index d71bf5e..43028c6 100644
---
a/hbase-client/src/main/java/org/apache/hadoop/hbase/ipc/AsyncServerResponseHandler.java
+++
b/hbase-client/src/main/java/org/apache/hadoop/hbase/ipc/AsyncServerResponseHandler.java
@@ -26,6 +26,7 @@ import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.hadoop.hbase.CellScanner;
import org.apache.hadoop.hbase.classification.InterfaceAudience;
+import org.apache.hadoop.hbase.protobuf.ProtobufUtil;
import org.apache.hadoop.hbase.protobuf.generated.RPCProtos;
import org.apache.hadoop.ipc.RemoteException;
@@ -92,7 +93,7 @@ public class AsyncServerResponseHandler extends
ChannelInboundHandlerAdapter {
// Call may be null because it may have timedout and been cleaned up
on this side already
if (call.responseDefaultType != null) {
Message.Builder builder =
call.responseDefaultType.newBuilderForType();
- builder.mergeDelimitedFrom(in);
+ ProtobufUtil.mergeDelimitedFrom(builder, in);
value = builder.build();
}
CellScanner cellBlockScanner = null;
http://git-wip-us.apache.org/repos/asf/hbase/blob/aedd0ebe/hbase-client/src/main/java/org/apache/hadoop/hbase/ipc/RpcClientImpl.java
--
diff --git
a/hbase-client/src/main/java/org/apache/hadoop/hbase/ipc/RpcClientImpl.java
b/hbase-client/src/main/java/org/apache/hadoop/hbase/ipc/RpcClientImpl.java
index 9400a2c..dad5164 100644
--- a/hbase-client/src/main/java/org/apache/hadoop/hbase/ipc/RpcClientImpl.java
+++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/ipc/RpcClientImpl.java
@@ -31,6 +31,7 @@ import org.apache.hadoop.hbase.ServerName;
import org.apache.hadoop.hbase.classification.InterfaceAudience;
import org.apache.hadoop.hbase.codec.Codec;
import org.apache.hadoop.hbase.exceptions.ConnectionClosingException;
+import org.apache.hadoop.hbase.protobuf.ProtobufUtil;
import org.apache.hadoop.hbase.protobuf.generated.AuthenticationProtos;
import org.apache.hadoop.hbase.protobuf.generated.RPCProtos.CellBlockMeta;
import org.apache.hadoop.hbase.protobuf.generated.RPCProtos.ConnectionHeader;
@@ -950,7 +951,7 @@ public class RpcClientImpl extends AbstractRpcClient {
Message value = null;
if (call.responseDefaultType != null) {
Builder builder = call.responseDefaultType.newBuilderForType();
-builder.mergeDelimitedFrom(in);
+ProtobufUtil.mergeDelimitedFrom(builder, in);
value = builder.build();
}
CellScanner cellBlockScanner = null;
http://git-wip-us.apache.org/repos/asf/hbase/blob/aedd0ebe/hbase-client/src/main/java/org/apache/hadoop/hbase/protobuf/ProtobufUtil.java
--
diff --git
a/hbase-client/src/main/java/org/apache/hadoop/hbase/protobuf/ProtobufUtil.java
b/hbase-client/src/main/java/org/apache/hadoop/hbase/protobuf/ProtobufUtil.java
index caae1bb..7bb9de1 100644
---
a/hbase-client/src/main/java/org/apache/hadoop/hbase/protobuf/ProtobufUtil.java
+++
b/hbase-client/src/main/java/org/apache/hadoop/hbase/protobuf/ProtobufUtil.java
@@ -21,7 +21,9 @@ package org.apache.hadoop.hbase.protobuf;
import static
org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifier.RegionSpecifierType.REGION_NAME;
import
hbase git commit: HBASE-12908 Typos in MemstoreFlusher javadocs (Edvin Malinovskis)
Repository: hbase
Updated Branches:
refs/heads/master bf9e32d59 - 65ad19ddf
HBASE-12908 Typos in MemstoreFlusher javadocs (Edvin Malinovskis)
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/65ad19dd
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/65ad19dd
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/65ad19dd
Branch: refs/heads/master
Commit: 65ad19ddf7848dcc811b7968fb31fe6fc05885d8
Parents: bf9e32d
Author: Jonathan M Hsieh jmhs...@apache.org
Authored: Tue Mar 17 00:36:00 2015 -0700
Committer: Jonathan M Hsieh jmhs...@apache.org
Committed: Tue Mar 17 00:36:00 2015 -0700
--
.../org/apache/hadoop/hbase/regionserver/MemStoreFlusher.java| 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/hbase/blob/65ad19dd/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/MemStoreFlusher.java
--
diff --git
a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/MemStoreFlusher.java
b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/MemStoreFlusher.java
index 6e8bbf2..8bee002 100644
---
a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/MemStoreFlusher.java
+++
b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/MemStoreFlusher.java
@@ -431,7 +431,7 @@ class MemStoreFlusher implements FlushRequester {
* on delay queue to retry later.
* @param fqe
* @return true if the region was successfully flushed, false otherwise. If
- * false, there will be accompanying log messages explaining why the log was
+ * false, there will be accompanying log messages explaining why the region
was
* not flushed.
*/
private boolean flushRegion(final FlushRegionEntry fqe) {
@@ -482,7 +482,7 @@ class MemStoreFlusher implements FlushRequester {
* poll on the flush queue (which removed it).
* @param forceFlushAllStores whether we want to flush all store.
* @return true if the region was successfully flushed, false otherwise. If
- * false, there will be accompanying log messages explaining why the log was
+ * false, there will be accompanying log messages explaining why the region
was
* not flushed.
*/
private boolean flushRegion(final HRegion region, final boolean
emergencyFlush,
hbase git commit: HBASE-12908 Typos in MemstoreFlusher javadocs (Edvin Malinovskis)
Repository: hbase
Updated Branches:
refs/heads/branch-1.0 80c52869d - 212cba16f
HBASE-12908 Typos in MemstoreFlusher javadocs (Edvin Malinovskis)
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/212cba16
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/212cba16
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/212cba16
Branch: refs/heads/branch-1.0
Commit: 212cba16fb427c0e2a77ea2ecaa08e5f125a7d7f
Parents: 80c5286
Author: Jonathan M Hsieh jmhs...@apache.org
Authored: Tue Mar 17 00:36:00 2015 -0700
Committer: Jonathan M Hsieh jmhs...@apache.org
Committed: Tue Mar 17 00:37:50 2015 -0700
--
.../org/apache/hadoop/hbase/regionserver/MemStoreFlusher.java| 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/hbase/blob/212cba16/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/MemStoreFlusher.java
--
diff --git
a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/MemStoreFlusher.java
b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/MemStoreFlusher.java
index 51d7060..b6c0680 100644
---
a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/MemStoreFlusher.java
+++
b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/MemStoreFlusher.java
@@ -367,7 +367,7 @@ class MemStoreFlusher implements FlushRequester {
* on delay queue to retry later.
* @param fqe
* @return true if the region was successfully flushed, false otherwise. If
- * false, there will be accompanying log messages explaining why the log was
+ * false, there will be accompanying log messages explaining why the region
was
* not flushed.
*/
private boolean flushRegion(final FlushRegionEntry fqe) {
@@ -416,7 +416,7 @@ class MemStoreFlusher implements FlushRequester {
* poll on the flush queue (which removed it).
*
* @return true if the region was successfully flushed, false otherwise. If
- * false, there will be accompanying log messages explaining why the log was
+ * false, there will be accompanying log messages explaining why the region
was
* not flushed.
*/
private boolean flushRegion(final HRegion region, final boolean
emergencyFlush) {
hbase git commit: HBASE-12908 Typos in MemstoreFlusher javadocs (Edvin Malinovskis)
Repository: hbase
Updated Branches:
refs/heads/branch-1 04ac18917 - 489698d6c
HBASE-12908 Typos in MemstoreFlusher javadocs (Edvin Malinovskis)
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/489698d6
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/489698d6
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/489698d6
Branch: refs/heads/branch-1
Commit: 489698d6c02ae65270ad38aacc69fbe0030336b1
Parents: 04ac189
Author: Jonathan M Hsieh jmhs...@apache.org
Authored: Tue Mar 17 00:36:00 2015 -0700
Committer: Jonathan M Hsieh jmhs...@apache.org
Committed: Tue Mar 17 00:38:54 2015 -0700
--
.../org/apache/hadoop/hbase/regionserver/MemStoreFlusher.java| 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/hbase/blob/489698d6/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/MemStoreFlusher.java
--
diff --git
a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/MemStoreFlusher.java
b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/MemStoreFlusher.java
index fb90881..2216b5c 100644
---
a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/MemStoreFlusher.java
+++
b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/MemStoreFlusher.java
@@ -432,7 +432,7 @@ class MemStoreFlusher implements FlushRequester {
* on delay queue to retry later.
* @param fqe
* @return true if the region was successfully flushed, false otherwise. If
- * false, there will be accompanying log messages explaining why the log was
+ * false, there will be accompanying log messages explaining why the region
was
* not flushed.
*/
private boolean flushRegion(final FlushRegionEntry fqe) {
@@ -481,7 +481,7 @@ class MemStoreFlusher implements FlushRequester {
* poll on the flush queue (which removed it).
* @param forceFlushAllStores whether we want to flush all store.
* @return true if the region was successfully flushed, false otherwise. If
- * false, there will be accompanying log messages explaining why the log was
+ * false, there will be accompanying log messages explaining why the region
was
* not flushed.
*/
private boolean flushRegion(final HRegion region, final boolean
emergencyFlush,
hbase git commit: HBASE-12908 Typos in MemstoreFlusher javadocs (Edvin Malinovskis)
Repository: hbase
Updated Branches:
refs/heads/0.98 2a2884f6b - 8b7dbfb9c
HBASE-12908 Typos in MemstoreFlusher javadocs (Edvin Malinovskis)
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/8b7dbfb9
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/8b7dbfb9
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/8b7dbfb9
Branch: refs/heads/0.98
Commit: 8b7dbfb9cb599b2a8a8ed1df3045155fdf2111a9
Parents: 2a2884f
Author: Jonathan M Hsieh jmhs...@apache.org
Authored: Tue Mar 17 00:36:00 2015 -0700
Committer: Jonathan M Hsieh j...@cloudera.com
Committed: Tue Mar 17 00:39:48 2015 -0700
--
.../org/apache/hadoop/hbase/regionserver/MemStoreFlusher.java| 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/hbase/blob/8b7dbfb9/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/MemStoreFlusher.java
--
diff --git
a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/MemStoreFlusher.java
b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/MemStoreFlusher.java
index 4d175d0..f971677 100644
---
a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/MemStoreFlusher.java
+++
b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/MemStoreFlusher.java
@@ -395,7 +395,7 @@ class MemStoreFlusher implements FlushRequester {
* on delay queue to retry later.
* @param fqe
* @return true if the region was successfully flushed, false otherwise. If
- * false, there will be accompanying log messages explaining why the log was
+ * false, there will be accompanying log messages explaining why the region
was
* not flushed.
*/
private boolean flushRegion(final FlushRegionEntry fqe) {
@@ -444,7 +444,7 @@ class MemStoreFlusher implements FlushRequester {
* poll on the flush queue (which removed it).
*
* @return true if the region was successfully flushed, false otherwise. If
- * false, there will be accompanying log messages explaining why the log was
+ * false, there will be accompanying log messages explaining why the region
was
* not flushed.
*/
private boolean flushRegion(final HRegion region, final boolean
emergencyFlush) {
hbase git commit: HBASE-13233 add hbase-11339 branch to the patch testing script
Repository: hbase Updated Branches: refs/heads/master 65ad19ddf - e192f5ed3 HBASE-13233 add hbase-11339 branch to the patch testing script Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/e192f5ed Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/e192f5ed Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/e192f5ed Branch: refs/heads/master Commit: e192f5ed39911d180287730315db51f18f0e5018 Parents: 65ad19d Author: Jonathan M Hsieh jmhs...@apache.org Authored: Tue Mar 17 00:51:06 2015 -0700 Committer: Jonathan M Hsieh jmhs...@apache.org Committed: Tue Mar 17 00:51:06 2015 -0700 -- dev-support/test-patch.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/hbase/blob/e192f5ed/dev-support/test-patch.properties -- diff --git a/dev-support/test-patch.properties b/dev-support/test-patch.properties index 85c7630..9bf5842 100644 --- a/dev-support/test-patch.properties +++ b/dev-support/test-patch.properties @@ -27,7 +27,7 @@ MAX_LINE_LENGTH=100 # All supported branches for testing with precommit build # branch-1.x should apprear before branch-1 since the latter is a prefix -BRANCH_NAMES=0.94 0.98 branch-1.0 branch-1 master hbase-12439 +BRANCH_NAMES=0.94 0.98 branch-1.0 branch-1 master hbase-12439 hbase-11339 # All supported Hadoop versions that we want to test the compilation with HADOOP2_VERSIONS=2.4.1 2.5.2 2.6.0
hbase git commit: HBASE-13258 Promote TestHRegion to LargeTests
Repository: hbase
Updated Branches:
refs/heads/master e192f5ed3 - 2b08653a7
HBASE-13258 Promote TestHRegion to LargeTests
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/2b08653a
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/2b08653a
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/2b08653a
Branch: refs/heads/master
Commit: 2b08653a79a8ed0ae8501a110b79f9ea23e808d4
Parents: e192f5e
Author: zhangduo zhang...@wandoujia.com
Authored: Tue Mar 17 09:20:15 2015 +0800
Committer: zhangduo zhang...@wandoujia.com
Committed: Tue Mar 17 16:02:27 2015 +0800
--
.../java/org/apache/hadoop/hbase/regionserver/TestHRegion.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/hbase/blob/2b08653a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestHRegion.java
--
diff --git
a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestHRegion.java
b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestHRegion.java
index 785e669..cf77f42 100644
---
a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestHRegion.java
+++
b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestHRegion.java
@@ -140,7 +140,7 @@ import org.apache.hadoop.hbase.regionserver.wal.WALEdit;
import org.apache.hadoop.hbase.regionserver.wal.WALUtil;
import org.apache.hadoop.hbase.security.User;
import org.apache.hadoop.hbase.test.MetricsAssertHelper;
-import org.apache.hadoop.hbase.testclassification.MediumTests;
+import org.apache.hadoop.hbase.testclassification.LargeTests;
import org.apache.hadoop.hbase.testclassification.VerySlowRegionServerTests;
import org.apache.hadoop.hbase.util.Bytes;
import org.apache.hadoop.hbase.util.EnvironmentEdgeManager;
@@ -178,7 +178,7 @@ import com.google.protobuf.ByteString;
* A lot of the meta information for an HRegion now lives inside other HRegions
* or in the HBaseMaster, so only basic testing is possible.
*/
-@Category({VerySlowRegionServerTests.class, MediumTests.class})
+@Category({VerySlowRegionServerTests.class, LargeTests.class})
@SuppressWarnings(deprecation)
public class TestHRegion {
// Do not spin up clusters in here. If you need to spin up a cluster, do it
[1/4] hbase git commit: HBASE-13253 LoadIncrementalHFiles unify hfiles discovery
Repository: hbase
Updated Branches:
refs/heads/0.98 b428f10c3 - a4d76
refs/heads/branch-1 12f095f00 - e283a210e
refs/heads/branch-1.0 c641db025 - aea69c137
refs/heads/master 99ec36614 - f9a17edc2
HBASE-13253 LoadIncrementalHFiles unify hfiles discovery
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/f9a17edc
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/f9a17edc
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/f9a17edc
Branch: refs/heads/master
Commit: f9a17edc252a88c5a1a2c7764e3f9f65623e0ced
Parents: 99ec366
Author: Matteo Bertozzi matteo.berto...@cloudera.com
Authored: Tue Mar 17 19:38:39 2015 +
Committer: Matteo Bertozzi matteo.berto...@cloudera.com
Committed: Tue Mar 17 19:38:39 2015 +
--
.../hbase/mapreduce/LoadIncrementalHFiles.java | 196 ++-
.../mapreduce/TestLoadIncrementalHFiles.java| 39 ++--
2 files changed, 127 insertions(+), 108 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/hbase/blob/f9a17edc/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/LoadIncrementalHFiles.java
--
diff --git
a/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/LoadIncrementalHFiles.java
b/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/LoadIncrementalHFiles.java
index 0f9ade3..d96c9e4 100644
---
a/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/LoadIncrementalHFiles.java
+++
b/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/LoadIncrementalHFiles.java
@@ -32,7 +32,6 @@ import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.conf.Configured;
import org.apache.hadoop.fs.FileStatus;
import org.apache.hadoop.fs.FileSystem;
-import org.apache.hadoop.fs.FileUtil;
import org.apache.hadoop.fs.Path;
import org.apache.hadoop.fs.permission.FsPermission;
import org.apache.hadoop.hbase.HBaseConfiguration;
@@ -160,6 +159,75 @@ public class LoadIncrementalHFiles extends Configured
implements Tool {
+ \n);
}
+ private static interface BulkHFileVisitorTFamily {
+TFamily bulkFamily(final byte[] familyName)
+ throws IOException;
+void bulkHFile(final TFamily family, final FileStatus hfileStatus)
+ throws IOException;
+ }
+
+ /**
+ * Iterate over the bulkDir hfiles.
+ * Skip reference, HFileLink, files starting with _ and non-valid hfiles.
+ */
+ private static TFamily void visitBulkHFiles(final FileSystem fs, final
Path bulkDir,
+final BulkHFileVisitorTFamily visitor) throws IOException {
+if (!fs.exists(bulkDir)) {
+ throw new FileNotFoundException(Bulkload dir + bulkDir + not
found);
+}
+
+FileStatus[] familyDirStatuses = fs.listStatus(bulkDir);
+if (familyDirStatuses == null) {
+ throw new FileNotFoundException(No families found in + bulkDir);
+}
+
+for (FileStatus familyStat : familyDirStatuses) {
+ if (!familyStat.isDirectory()) {
+LOG.warn(Skipping non-directory + familyStat.getPath());
+continue;
+ }
+ Path familyDir = familyStat.getPath();
+ byte[] familyName = familyDir.getName().getBytes();
+ TFamily family = visitor.bulkFamily(familyName);
+
+ FileStatus[] hfileStatuses = fs.listStatus(familyDir);
+ for (FileStatus hfileStatus : hfileStatuses) {
+if (!fs.isFile(hfileStatus.getPath())) {
+ LOG.warn(Skipping non-file + hfileStatus);
+ continue;
+}
+
+Path hfile = hfileStatus.getPath();
+// Skip _, reference, HFileLink
+String fileName = hfile.getName();
+if (fileName.startsWith(_)) {
+ continue;
+}
+if (StoreFileInfo.isReference(fileName)) {
+ LOG.warn(Skipping reference + fileName);
+ continue;
+}
+if (HFileLink.isHFileLink(fileName)) {
+ LOG.warn(Skipping HFileLink + fileName);
+ continue;
+}
+
+// Validate HFile Format
+try {
+ if (!HFile.isHFileFormat(fs, hfile)) {
+LOG.warn(the file + hfile + doesn't seems to be an hfile.
skipping);
+continue;
+ }
+} catch (FileNotFoundException e) {
+ LOG.warn(the file + hfile + was removed);
+ continue;
+}
+
+visitor.bulkHFile(family, hfileStatus);
+ }
+}
+ }
+
/**
* Represents an HFile waiting to be loaded. An queue is used
* in this class in order to support the case where a region has
@@ -186,54 +254,25 @@ public class LoadIncrementalHFiles extends Configured
implements Tool {
* Walk the given directory for all HFiles, and return a Queue
* containing all such files.
*/
- private void discoverLoadQueue(DequeLoadQueueItem ret, Path
[2/4] hbase git commit: HBASE-13253 LoadIncrementalHFiles unify hfiles discovery
HBASE-13253 LoadIncrementalHFiles unify hfiles discovery
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/e283a210
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/e283a210
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/e283a210
Branch: refs/heads/branch-1
Commit: e283a210e63bab191161e05fcefca5ad058d85e3
Parents: 12f095f
Author: Matteo Bertozzi matteo.berto...@cloudera.com
Authored: Tue Mar 17 19:38:39 2015 +
Committer: Matteo Bertozzi matteo.berto...@cloudera.com
Committed: Tue Mar 17 19:39:18 2015 +
--
.../hbase/mapreduce/LoadIncrementalHFiles.java | 196 ++-
.../mapreduce/TestLoadIncrementalHFiles.java| 27 ++-
2 files changed, 121 insertions(+), 102 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/hbase/blob/e283a210/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/LoadIncrementalHFiles.java
--
diff --git
a/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/LoadIncrementalHFiles.java
b/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/LoadIncrementalHFiles.java
index 53efc42..61b00bb 100644
---
a/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/LoadIncrementalHFiles.java
+++
b/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/LoadIncrementalHFiles.java
@@ -32,7 +32,6 @@ import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.conf.Configured;
import org.apache.hadoop.fs.FileStatus;
import org.apache.hadoop.fs.FileSystem;
-import org.apache.hadoop.fs.FileUtil;
import org.apache.hadoop.fs.Path;
import org.apache.hadoop.fs.permission.FsPermission;
import org.apache.hadoop.hbase.HBaseConfiguration;
@@ -160,6 +159,75 @@ public class LoadIncrementalHFiles extends Configured
implements Tool {
+ \n);
}
+ private static interface BulkHFileVisitorTFamily {
+TFamily bulkFamily(final byte[] familyName)
+ throws IOException;
+void bulkHFile(final TFamily family, final FileStatus hfileStatus)
+ throws IOException;
+ }
+
+ /**
+ * Iterate over the bulkDir hfiles.
+ * Skip reference, HFileLink, files starting with _ and non-valid hfiles.
+ */
+ private static TFamily void visitBulkHFiles(final FileSystem fs, final
Path bulkDir,
+final BulkHFileVisitorTFamily visitor) throws IOException {
+if (!fs.exists(bulkDir)) {
+ throw new FileNotFoundException(Bulkload dir + bulkDir + not
found);
+}
+
+FileStatus[] familyDirStatuses = fs.listStatus(bulkDir);
+if (familyDirStatuses == null) {
+ throw new FileNotFoundException(No families found in + bulkDir);
+}
+
+for (FileStatus familyStat : familyDirStatuses) {
+ if (!familyStat.isDirectory()) {
+LOG.warn(Skipping non-directory + familyStat.getPath());
+continue;
+ }
+ Path familyDir = familyStat.getPath();
+ byte[] familyName = familyDir.getName().getBytes();
+ TFamily family = visitor.bulkFamily(familyName);
+
+ FileStatus[] hfileStatuses = fs.listStatus(familyDir);
+ for (FileStatus hfileStatus : hfileStatuses) {
+if (!fs.isFile(hfileStatus.getPath())) {
+ LOG.warn(Skipping non-file + hfileStatus);
+ continue;
+}
+
+Path hfile = hfileStatus.getPath();
+// Skip _, reference, HFileLink
+String fileName = hfile.getName();
+if (fileName.startsWith(_)) {
+ continue;
+}
+if (StoreFileInfo.isReference(fileName)) {
+ LOG.warn(Skipping reference + fileName);
+ continue;
+}
+if (HFileLink.isHFileLink(fileName)) {
+ LOG.warn(Skipping HFileLink + fileName);
+ continue;
+}
+
+// Validate HFile Format
+try {
+ if (!HFile.isHFileFormat(fs, hfile)) {
+LOG.warn(the file + hfile + doesn't seems to be an hfile.
skipping);
+continue;
+ }
+} catch (FileNotFoundException e) {
+ LOG.warn(the file + hfile + was removed);
+ continue;
+}
+
+visitor.bulkHFile(family, hfileStatus);
+ }
+}
+ }
+
/**
* Represents an HFile waiting to be loaded. An queue is used
* in this class in order to support the case where a region has
@@ -186,54 +254,25 @@ public class LoadIncrementalHFiles extends Configured
implements Tool {
* Walk the given directory for all HFiles, and return a Queue
* containing all such files.
*/
- private void discoverLoadQueue(DequeLoadQueueItem ret, Path hfofDir)
+ private void discoverLoadQueue(final DequeLoadQueueItem ret, final Path
hfofDir)
throws IOException {
fs = hfofDir.getFileSystem(getConf());
-
-if (!fs.exists(hfofDir)) {
- throw
[4/4] hbase git commit: HBASE-13253 LoadIncrementalHFiles unify hfiles discovery
HBASE-13253 LoadIncrementalHFiles unify hfiles discovery
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/a4d7
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/a4d7
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/a4d7
Branch: refs/heads/0.98
Commit: a4d761a8a4d8a7577410eea514f52caf0f30
Parents: b428f10
Author: Matteo Bertozzi matteo.berto...@cloudera.com
Authored: Tue Mar 17 19:38:39 2015 +
Committer: Matteo Bertozzi matteo.berto...@cloudera.com
Committed: Tue Mar 17 20:37:00 2015 +
--
.../hbase/mapreduce/LoadIncrementalHFiles.java | 202 ++-
.../mapreduce/TestLoadIncrementalHFiles.java| 25 ++-
2 files changed, 124 insertions(+), 103 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/hbase/blob/a4d7/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/LoadIncrementalHFiles.java
--
diff --git
a/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/LoadIncrementalHFiles.java
b/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/LoadIncrementalHFiles.java
index 7657571..e3bc9ce 100644
---
a/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/LoadIncrementalHFiles.java
+++
b/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/LoadIncrementalHFiles.java
@@ -53,7 +53,6 @@ import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.conf.Configured;
import org.apache.hadoop.fs.FileStatus;
import org.apache.hadoop.fs.FileSystem;
-import org.apache.hadoop.fs.FileUtil;
import org.apache.hadoop.fs.Path;
import org.apache.hadoop.fs.permission.FsPermission;
import org.apache.hadoop.hbase.HBaseConfiguration;
@@ -72,6 +71,7 @@ import org.apache.hadoop.hbase.client.RegionServerCallable;
import org.apache.hadoop.hbase.client.RpcRetryingCallerFactory;
import org.apache.hadoop.hbase.client.coprocessor.SecureBulkLoadClient;
import org.apache.hadoop.hbase.coprocessor.CoprocessorHost;
+import org.apache.hadoop.hbase.io.HFileLink;
import org.apache.hadoop.hbase.io.HalfStoreFileReader;
import org.apache.hadoop.hbase.io.Reference;
import org.apache.hadoop.hbase.io.compress.Compression.Algorithm;
@@ -84,6 +84,7 @@ import org.apache.hadoop.hbase.protobuf.ProtobufUtil;
import org.apache.hadoop.hbase.regionserver.BloomType;
import org.apache.hadoop.hbase.regionserver.HStore;
import org.apache.hadoop.hbase.regionserver.StoreFile;
+import org.apache.hadoop.hbase.regionserver.StoreFileInfo;
import org.apache.hadoop.hbase.security.UserProvider;
import org.apache.hadoop.hbase.security.token.FsDelegationToken;
import org.apache.hadoop.hbase.util.Bytes;
@@ -152,6 +153,75 @@ public class LoadIncrementalHFiles extends Configured
implements Tool {
+ \n);
}
+ private static interface BulkHFileVisitorTFamily {
+TFamily bulkFamily(final byte[] familyName)
+ throws IOException;
+void bulkHFile(final TFamily family, final FileStatus hfileStatus)
+ throws IOException;
+ }
+
+ /**
+ * Iterate over the bulkDir hfiles.
+ * Skip reference, HFileLink, files starting with _ and non-valid hfiles.
+ */
+ private static TFamily void visitBulkHFiles(final FileSystem fs, final
Path bulkDir,
+final BulkHFileVisitorTFamily visitor) throws IOException {
+if (!fs.exists(bulkDir)) {
+ throw new FileNotFoundException(Bulkload dir + bulkDir + not
found);
+}
+
+FileStatus[] familyDirStatuses = fs.listStatus(bulkDir);
+if (familyDirStatuses == null) {
+ throw new FileNotFoundException(No families found in + bulkDir);
+}
+
+for (FileStatus familyStat : familyDirStatuses) {
+ if (!familyStat.isDir()) {
+LOG.warn(Skipping non-directory + familyStat.getPath());
+continue;
+ }
+ Path familyDir = familyStat.getPath();
+ byte[] familyName = familyDir.getName().getBytes();
+ TFamily family = visitor.bulkFamily(familyName);
+
+ FileStatus[] hfileStatuses = fs.listStatus(familyDir);
+ for (FileStatus hfileStatus : hfileStatuses) {
+if (!fs.isFile(hfileStatus.getPath())) {
+ LOG.warn(Skipping non-file + hfileStatus);
+ continue;
+}
+
+Path hfile = hfileStatus.getPath();
+// Skip _, reference, HFileLink
+String fileName = hfile.getName();
+if (fileName.startsWith(_)) {
+ continue;
+}
+if (StoreFileInfo.isReference(fileName)) {
+ LOG.warn(Skipping reference + fileName);
+ continue;
+}
+if (HFileLink.isHFileLink(fileName)) {
+ LOG.warn(Skipping HFileLink + fileName);
+ continue;
+}
+
+// Validate HFile Format
+try {
+ if (!HFile.isHFileFormat(fs, hfile))
[1/2] hbase git commit: Revert Specify bash for local-regionservers.sh and local-master-backup.sh
Repository: hbase Updated Branches: refs/heads/0.98 02a1f3a5b - b428f10c3 Revert Specify bash for local-regionservers.sh and local-master-backup.sh This reverts commit 02a1f3a5ba46c4d8d72135607e5d20355d1061a2. Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/f72adea9 Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/f72adea9 Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/f72adea9 Branch: refs/heads/0.98 Commit: f72adea9551bf7c590b289ecde0cdcf809f4e7c1 Parents: 02a1f3a Author: Sean Busbey bus...@apache.org Authored: Tue Mar 17 12:51:58 2015 -0500 Committer: Sean Busbey bus...@apache.org Committed: Tue Mar 17 12:51:58 2015 -0500 -- bin/local-master-backup.sh | 2 +- bin/local-regionservers.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/hbase/blob/f72adea9/bin/local-master-backup.sh -- diff --git a/bin/local-master-backup.sh b/bin/local-master-backup.sh index 05dc4ac..2509a7a 100755 --- a/bin/local-master-backup.sh +++ b/bin/local-master-backup.sh @@ -1,4 +1,4 @@ -#!/usr/bin/env bash +#!/bin/sh #/** # * Copyright 2007 The Apache Software Foundation # * http://git-wip-us.apache.org/repos/asf/hbase/blob/f72adea9/bin/local-regionservers.sh -- diff --git a/bin/local-regionservers.sh b/bin/local-regionservers.sh index 6f1c79a..2303dd5 100755 --- a/bin/local-regionservers.sh +++ b/bin/local-regionservers.sh @@ -1,4 +1,4 @@ -#!/usr/bin/env bash +#!/bin/sh #/** # * Copyright 2007 The Apache Software Foundation # *
[2/2] hbase git commit: HBASE-13229 Specify bash for local-regionservers.sh and local-master-backup.sh
HBASE-13229 Specify bash for local-regionservers.sh and local-master-backup.sh Signed-off-by: Sean Busbey bus...@apache.org Conflicts: src/main/asciidoc/_chapters/configuration.adoc Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/36c8f075 Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/36c8f075 Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/36c8f075 Branch: refs/heads/0.94 Commit: 36c8f075f0b4c9e49f2fa3e2c7a80e0a921ac5a7 Parents: ff01deb Author: Gustavo Anatoly gustavoanat...@gmail.com Authored: Mon Mar 16 23:45:01 2015 -0300 Committer: Sean Busbey bus...@apache.org Committed: Tue Mar 17 12:52:43 2015 -0500 -- bin/local-master-backup.sh | 2 +- bin/local-regionservers.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/hbase/blob/36c8f075/bin/local-master-backup.sh -- diff --git a/bin/local-master-backup.sh b/bin/local-master-backup.sh index 2c0a4c0..fc2efef 100755 --- a/bin/local-master-backup.sh +++ b/bin/local-master-backup.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/usr/bin/env bash #/** # * Copyright 2007 The Apache Software Foundation # * http://git-wip-us.apache.org/repos/asf/hbase/blob/36c8f075/bin/local-regionservers.sh -- diff --git a/bin/local-regionservers.sh b/bin/local-regionservers.sh index a4d5a1d..31e90cc 100755 --- a/bin/local-regionservers.sh +++ b/bin/local-regionservers.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/usr/bin/env bash #/** # * Copyright 2007 The Apache Software Foundation # *
[1/2] hbase git commit: Revert Specify bash for local-regionservers.sh and local-master-backup.sh
Repository: hbase Updated Branches: refs/heads/master ca8876a9f - 99ec36614 Revert Specify bash for local-regionservers.sh and local-master-backup.sh This reverts commit ca8876a9f2534f2ab0b416aecb4ac476da9747f8. Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/d9d1b07c Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/d9d1b07c Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/d9d1b07c Branch: refs/heads/master Commit: d9d1b07cfc11227786b4970f32e91226c890fb16 Parents: ca8876a Author: Sean Busbey bus...@apache.org Authored: Tue Mar 17 11:57:08 2015 -0500 Committer: Sean Busbey bus...@apache.org Committed: Tue Mar 17 11:57:08 2015 -0500 -- bin/local-master-backup.sh | 2 +- bin/local-regionservers.sh | 2 +- src/main/asciidoc/_chapters/configuration.adoc | 3 --- 3 files changed, 2 insertions(+), 5 deletions(-) -- http://git-wip-us.apache.org/repos/asf/hbase/blob/d9d1b07c/bin/local-master-backup.sh -- diff --git a/bin/local-master-backup.sh b/bin/local-master-backup.sh index e1a80cd..f368e4a 100755 --- a/bin/local-master-backup.sh +++ b/bin/local-master-backup.sh @@ -1,4 +1,4 @@ -#!/usr/bin/env bash +#!/bin/sh #/** # * Copyright 2007 The Apache Software Foundation # * http://git-wip-us.apache.org/repos/asf/hbase/blob/d9d1b07c/bin/local-regionservers.sh -- diff --git a/bin/local-regionservers.sh b/bin/local-regionservers.sh index f744ee1..38d9ffc 100755 --- a/bin/local-regionservers.sh +++ b/bin/local-regionservers.sh @@ -1,4 +1,4 @@ -#!/usr/bin/env bash +#!/bin/sh #/** # * Copyright 2007 The Apache Software Foundation # * http://git-wip-us.apache.org/repos/asf/hbase/blob/d9d1b07c/src/main/asciidoc/_chapters/configuration.adoc -- diff --git a/src/main/asciidoc/_chapters/configuration.adoc b/src/main/asciidoc/_chapters/configuration.adoc index ed00a49..a5430eb 100644 --- a/src/main/asciidoc/_chapters/configuration.adoc +++ b/src/main/asciidoc/_chapters/configuration.adoc @@ -172,9 +172,6 @@ session required pam_limits.so -Linux Shell:: - All of the shell scripts that come with HBase rely on the link:http://www.gnu.org/software/bash[GNU Bash] shell. - Windows:: Prior to HBase 0.96, testing for running HBase on Microsoft Windows was limited. Running a on Windows nodes is not recommended for production systems.
[2/2] hbase git commit: HBASE-13229 Specify bash for local-regionservers.sh and local-master-backup.sh
HBASE-13229 Specify bash for local-regionservers.sh and local-master-backup.sh Signed-off-by: Sean Busbey bus...@apache.org Conflicts: src/main/asciidoc/_chapters/configuration.adoc Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/12f095f0 Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/12f095f0 Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/12f095f0 Branch: refs/heads/branch-1 Commit: 12f095f00fdd06fff998a9ddcc8af42be7aad825 Parents: 7ea18e2 Author: Gustavo Anatoly gustavoanat...@gmail.com Authored: Mon Mar 16 23:45:01 2015 -0300 Committer: Sean Busbey bus...@apache.org Committed: Tue Mar 17 12:49:55 2015 -0500 -- bin/local-master-backup.sh | 2 +- bin/local-regionservers.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/hbase/blob/12f095f0/bin/local-master-backup.sh -- diff --git a/bin/local-master-backup.sh b/bin/local-master-backup.sh index f368e4a..e1a80cd 100755 --- a/bin/local-master-backup.sh +++ b/bin/local-master-backup.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/usr/bin/env bash #/** # * Copyright 2007 The Apache Software Foundation # * http://git-wip-us.apache.org/repos/asf/hbase/blob/12f095f0/bin/local-regionservers.sh -- diff --git a/bin/local-regionservers.sh b/bin/local-regionservers.sh index 38d9ffc..f744ee1 100755 --- a/bin/local-regionservers.sh +++ b/bin/local-regionservers.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/usr/bin/env bash #/** # * Copyright 2007 The Apache Software Foundation # *
[2/2] hbase git commit: HBASE-13229 Specify bash for local-regionservers.sh and local-master-backup.sh
HBASE-13229 Specify bash for local-regionservers.sh and local-master-backup.sh Signed-off-by: Sean Busbey bus...@apache.org Conflicts: src/main/asciidoc/_chapters/configuration.adoc Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/c641db02 Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/c641db02 Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/c641db02 Branch: refs/heads/branch-1.0 Commit: c641db025986c17b9ce05f9a1548627595a17f3c Parents: 4098224 Author: Gustavo Anatoly gustavoanat...@gmail.com Authored: Mon Mar 16 23:45:01 2015 -0300 Committer: Sean Busbey bus...@apache.org Committed: Tue Mar 17 12:50:48 2015 -0500 -- bin/local-master-backup.sh | 2 +- bin/local-regionservers.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/hbase/blob/c641db02/bin/local-master-backup.sh -- diff --git a/bin/local-master-backup.sh b/bin/local-master-backup.sh index f368e4a..e1a80cd 100755 --- a/bin/local-master-backup.sh +++ b/bin/local-master-backup.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/usr/bin/env bash #/** # * Copyright 2007 The Apache Software Foundation # * http://git-wip-us.apache.org/repos/asf/hbase/blob/c641db02/bin/local-regionservers.sh -- diff --git a/bin/local-regionservers.sh b/bin/local-regionservers.sh index 38d9ffc..f744ee1 100755 --- a/bin/local-regionservers.sh +++ b/bin/local-regionservers.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/usr/bin/env bash #/** # * Copyright 2007 The Apache Software Foundation # *
[1/2] hbase git commit: Revert Specify bash for local-regionservers.sh and local-master-backup.sh
Repository: hbase Updated Branches: refs/heads/branch-1.0 6b37ae3d7 - c641db025 Revert Specify bash for local-regionservers.sh and local-master-backup.sh This reverts commit 6b37ae3d77e68458cae385b11163ac5108af7655. Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/4098224c Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/4098224c Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/4098224c Branch: refs/heads/branch-1.0 Commit: 4098224c8f227cdf9ec0db5f96585ea3c64ef91a Parents: 6b37ae3 Author: Sean Busbey bus...@apache.org Authored: Tue Mar 17 12:50:47 2015 -0500 Committer: Sean Busbey bus...@apache.org Committed: Tue Mar 17 12:50:47 2015 -0500 -- bin/local-master-backup.sh | 2 +- bin/local-regionservers.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/hbase/blob/4098224c/bin/local-master-backup.sh -- diff --git a/bin/local-master-backup.sh b/bin/local-master-backup.sh index e1a80cd..f368e4a 100755 --- a/bin/local-master-backup.sh +++ b/bin/local-master-backup.sh @@ -1,4 +1,4 @@ -#!/usr/bin/env bash +#!/bin/sh #/** # * Copyright 2007 The Apache Software Foundation # * http://git-wip-us.apache.org/repos/asf/hbase/blob/4098224c/bin/local-regionservers.sh -- diff --git a/bin/local-regionservers.sh b/bin/local-regionservers.sh index f744ee1..38d9ffc 100755 --- a/bin/local-regionservers.sh +++ b/bin/local-regionservers.sh @@ -1,4 +1,4 @@ -#!/usr/bin/env bash +#!/bin/sh #/** # * Copyright 2007 The Apache Software Foundation # *
[2/2] hbase git commit: HBASE-13229 Specify bash for local-regionservers.sh and local-master-backup.sh
HBASE-13229 Specify bash for local-regionservers.sh and local-master-backup.sh Signed-off-by: Sean Busbey bus...@apache.org Conflicts: src/main/asciidoc/_chapters/configuration.adoc Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/b428f10c Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/b428f10c Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/b428f10c Branch: refs/heads/0.98 Commit: b428f10c392cadb011e19d0db495571d5d88f2b0 Parents: f72adea Author: Gustavo Anatoly gustavoanat...@gmail.com Authored: Mon Mar 16 23:45:01 2015 -0300 Committer: Sean Busbey bus...@apache.org Committed: Tue Mar 17 12:51:59 2015 -0500 -- bin/local-master-backup.sh | 2 +- bin/local-regionservers.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/hbase/blob/b428f10c/bin/local-master-backup.sh -- diff --git a/bin/local-master-backup.sh b/bin/local-master-backup.sh index 2509a7a..05dc4ac 100755 --- a/bin/local-master-backup.sh +++ b/bin/local-master-backup.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/usr/bin/env bash #/** # * Copyright 2007 The Apache Software Foundation # * http://git-wip-us.apache.org/repos/asf/hbase/blob/b428f10c/bin/local-regionservers.sh -- diff --git a/bin/local-regionservers.sh b/bin/local-regionservers.sh index 2303dd5..6f1c79a 100755 --- a/bin/local-regionservers.sh +++ b/bin/local-regionservers.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/usr/bin/env bash #/** # * Copyright 2007 The Apache Software Foundation # *
[1/2] hbase git commit: Revert Specify bash for local-regionservers.sh and local-master-backup.sh
Repository: hbase Updated Branches: refs/heads/branch-1 58ab201be - 12f095f00 Revert Specify bash for local-regionservers.sh and local-master-backup.sh This reverts commit 58ab201be341f02829286f036a7401d0806eb999. Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/7ea18e20 Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/7ea18e20 Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/7ea18e20 Branch: refs/heads/branch-1 Commit: 7ea18e20680e86c200cbebc885ff91cfc1f72fac Parents: 58ab201 Author: Sean Busbey bus...@apache.org Authored: Tue Mar 17 12:49:36 2015 -0500 Committer: Sean Busbey bus...@apache.org Committed: Tue Mar 17 12:49:36 2015 -0500 -- bin/local-master-backup.sh | 2 +- bin/local-regionservers.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/hbase/blob/7ea18e20/bin/local-master-backup.sh -- diff --git a/bin/local-master-backup.sh b/bin/local-master-backup.sh index e1a80cd..f368e4a 100755 --- a/bin/local-master-backup.sh +++ b/bin/local-master-backup.sh @@ -1,4 +1,4 @@ -#!/usr/bin/env bash +#!/bin/sh #/** # * Copyright 2007 The Apache Software Foundation # * http://git-wip-us.apache.org/repos/asf/hbase/blob/7ea18e20/bin/local-regionservers.sh -- diff --git a/bin/local-regionservers.sh b/bin/local-regionservers.sh index f744ee1..38d9ffc 100755 --- a/bin/local-regionservers.sh +++ b/bin/local-regionservers.sh @@ -1,4 +1,4 @@ -#!/usr/bin/env bash +#!/bin/sh #/** # * Copyright 2007 The Apache Software Foundation # *
[2/2] hbase git commit: HBASE-13229 Specify bash for local-regionservers.sh and local-master-backup.sh
HBASE-13229 Specify bash for local-regionservers.sh and local-master-backup.sh Signed-off-by: Sean Busbey bus...@apache.org Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/99ec3661 Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/99ec3661 Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/99ec3661 Branch: refs/heads/master Commit: 99ec36614703fb191fa4093b86efdddf6aaa89ae Parents: d9d1b07 Author: Gustavo Anatoly gustavoanat...@gmail.com Authored: Mon Mar 16 23:45:01 2015 -0300 Committer: Sean Busbey bus...@apache.org Committed: Tue Mar 17 11:57:41 2015 -0500 -- bin/local-master-backup.sh | 2 +- bin/local-regionservers.sh | 2 +- src/main/asciidoc/_chapters/configuration.adoc | 3 +++ 3 files changed, 5 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/hbase/blob/99ec3661/bin/local-master-backup.sh -- diff --git a/bin/local-master-backup.sh b/bin/local-master-backup.sh index f368e4a..e1a80cd 100755 --- a/bin/local-master-backup.sh +++ b/bin/local-master-backup.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/usr/bin/env bash #/** # * Copyright 2007 The Apache Software Foundation # * http://git-wip-us.apache.org/repos/asf/hbase/blob/99ec3661/bin/local-regionservers.sh -- diff --git a/bin/local-regionservers.sh b/bin/local-regionservers.sh index 38d9ffc..f744ee1 100755 --- a/bin/local-regionservers.sh +++ b/bin/local-regionservers.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/usr/bin/env bash #/** # * Copyright 2007 The Apache Software Foundation # * http://git-wip-us.apache.org/repos/asf/hbase/blob/99ec3661/src/main/asciidoc/_chapters/configuration.adoc -- diff --git a/src/main/asciidoc/_chapters/configuration.adoc b/src/main/asciidoc/_chapters/configuration.adoc index a5430eb..ed00a49 100644 --- a/src/main/asciidoc/_chapters/configuration.adoc +++ b/src/main/asciidoc/_chapters/configuration.adoc @@ -172,6 +172,9 @@ session required pam_limits.so +Linux Shell:: + All of the shell scripts that come with HBase rely on the link:http://www.gnu.org/software/bash[GNU Bash] shell. + Windows:: Prior to HBase 0.96, testing for running HBase on Microsoft Windows was limited. Running a on Windows nodes is not recommended for production systems.
[3/4] hbase git commit: HBASE-13253 LoadIncrementalHFiles unify hfiles discovery
HBASE-13253 LoadIncrementalHFiles unify hfiles discovery
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/aea69c13
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/aea69c13
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/aea69c13
Branch: refs/heads/branch-1.0
Commit: aea69c137d965ac9095a9a8d02e8dde107ecbfb8
Parents: c641db0
Author: Matteo Bertozzi matteo.berto...@cloudera.com
Authored: Tue Mar 17 19:38:39 2015 +
Committer: Matteo Bertozzi matteo.berto...@cloudera.com
Committed: Tue Mar 17 19:40:53 2015 +
--
.../hbase/mapreduce/LoadIncrementalHFiles.java | 196 ++-
.../mapreduce/TestLoadIncrementalHFiles.java| 25 ++-
2 files changed, 120 insertions(+), 101 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/hbase/blob/aea69c13/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/LoadIncrementalHFiles.java
--
diff --git
a/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/LoadIncrementalHFiles.java
b/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/LoadIncrementalHFiles.java
index b78017d..05ac012 100644
---
a/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/LoadIncrementalHFiles.java
+++
b/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/LoadIncrementalHFiles.java
@@ -55,7 +55,6 @@ import org.apache.hadoop.conf.Configured;
import org.apache.hadoop.fs.permission.FsPermission;
import org.apache.hadoop.fs.FileStatus;
import org.apache.hadoop.fs.FileSystem;
-import org.apache.hadoop.fs.FileUtil;
import org.apache.hadoop.fs.Path;
import org.apache.hadoop.hbase.HBaseConfiguration;
import org.apache.hadoop.hbase.HColumnDescriptor;
@@ -160,6 +159,75 @@ public class LoadIncrementalHFiles extends Configured
implements Tool {
+ \n);
}
+ private static interface BulkHFileVisitorTFamily {
+TFamily bulkFamily(final byte[] familyName)
+ throws IOException;
+void bulkHFile(final TFamily family, final FileStatus hfileStatus)
+ throws IOException;
+ }
+
+ /**
+ * Iterate over the bulkDir hfiles.
+ * Skip reference, HFileLink, files starting with _ and non-valid hfiles.
+ */
+ private static TFamily void visitBulkHFiles(final FileSystem fs, final
Path bulkDir,
+final BulkHFileVisitorTFamily visitor) throws IOException {
+if (!fs.exists(bulkDir)) {
+ throw new FileNotFoundException(Bulkload dir + bulkDir + not
found);
+}
+
+FileStatus[] familyDirStatuses = fs.listStatus(bulkDir);
+if (familyDirStatuses == null) {
+ throw new FileNotFoundException(No families found in + bulkDir);
+}
+
+for (FileStatus familyStat : familyDirStatuses) {
+ if (!familyStat.isDirectory()) {
+LOG.warn(Skipping non-directory + familyStat.getPath());
+continue;
+ }
+ Path familyDir = familyStat.getPath();
+ byte[] familyName = familyDir.getName().getBytes();
+ TFamily family = visitor.bulkFamily(familyName);
+
+ FileStatus[] hfileStatuses = fs.listStatus(familyDir);
+ for (FileStatus hfileStatus : hfileStatuses) {
+if (!fs.isFile(hfileStatus.getPath())) {
+ LOG.warn(Skipping non-file + hfileStatus);
+ continue;
+}
+
+Path hfile = hfileStatus.getPath();
+// Skip _, reference, HFileLink
+String fileName = hfile.getName();
+if (fileName.startsWith(_)) {
+ continue;
+}
+if (StoreFileInfo.isReference(fileName)) {
+ LOG.warn(Skipping reference + fileName);
+ continue;
+}
+if (HFileLink.isHFileLink(fileName)) {
+ LOG.warn(Skipping HFileLink + fileName);
+ continue;
+}
+
+// Validate HFile Format
+try {
+ if (!HFile.isHFileFormat(fs, hfile)) {
+LOG.warn(the file + hfile + doesn't seems to be an hfile.
skipping);
+continue;
+ }
+} catch (FileNotFoundException e) {
+ LOG.warn(the file + hfile + was removed);
+ continue;
+}
+
+visitor.bulkHFile(family, hfileStatus);
+ }
+}
+ }
+
/**
* Represents an HFile waiting to be loaded. An queue is used
* in this class in order to support the case where a region has
@@ -186,54 +254,25 @@ public class LoadIncrementalHFiles extends Configured
implements Tool {
* Walk the given directory for all HFiles, and return a Queue
* containing all such files.
*/
- private void discoverLoadQueue(DequeLoadQueueItem ret, Path hfofDir)
+ private void discoverLoadQueue(final DequeLoadQueueItem ret, final Path
hfofDir)
throws IOException {
fs = hfofDir.getFileSystem(getConf());
-
-if (!fs.exists(hfofDir)) {
-
hbase git commit: HBASE-13256 HBaseConfiguration#checkDefaultsVersion(Configuration) has spelling error (Josh Elser)
Repository: hbase
Updated Branches:
refs/heads/master 7b7b0bf9d - 75b627c8e
HBASE-13256 HBaseConfiguration#checkDefaultsVersion(Configuration) has spelling
error (Josh Elser)
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/75b627c8
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/75b627c8
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/75b627c8
Branch: refs/heads/master
Commit: 75b627c8ecf17dcb09c96ba9580239f7c8b6c555
Parents: 7b7b0bf
Author: tedyu yuzhih...@gmail.com
Authored: Tue Mar 17 07:24:01 2015 -0700
Committer: tedyu yuzhih...@gmail.com
Committed: Tue Mar 17 07:24:01 2015 -0700
--
.../src/main/java/org/apache/hadoop/hbase/HBaseConfiguration.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/hbase/blob/75b627c8/hbase-common/src/main/java/org/apache/hadoop/hbase/HBaseConfiguration.java
--
diff --git
a/hbase-common/src/main/java/org/apache/hadoop/hbase/HBaseConfiguration.java
b/hbase-common/src/main/java/org/apache/hadoop/hbase/HBaseConfiguration.java
index 3446581..1be66a1 100644
--- a/hbase-common/src/main/java/org/apache/hadoop/hbase/HBaseConfiguration.java
+++ b/hbase-common/src/main/java/org/apache/hadoop/hbase/HBaseConfiguration.java
@@ -71,7 +71,7 @@ public class HBaseConfiguration extends Configuration {
String thisVersion = VersionInfo.getVersion();
if (!thisVersion.equals(defaultsVersion)) {
throw new RuntimeException(
-hbase-default.xml file seems to be for and old version of HBase ( +
+hbase-default.xml file seems to be for an older version of HBase ( +
defaultsVersion + ), this version is + thisVersion);
}
}
hbase git commit: HBASE-13176 Flakey TestZooKeeper test.
Repository: hbase
Updated Branches:
refs/heads/master 7a08ad9df - ed026c2e6
HBASE-13176 Flakey TestZooKeeper test.
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/ed026c2e
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/ed026c2e
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/ed026c2e
Branch: refs/heads/master
Commit: ed026c2e6f518963ee7fb9c7b26266e888c71c2d
Parents: 7a08ad9
Author: Andrey Stepachev oct...@gmail.com
Authored: Tue Mar 17 14:51:39 2015 +
Committer: Andrey Stepachev oct...@gmail.com
Committed: Tue Mar 17 14:51:39 2015 +
--
.../org/apache/hadoop/hbase/TestZooKeeper.java | 50 +++-
1 file changed, 38 insertions(+), 12 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/hbase/blob/ed026c2e/hbase-server/src/test/java/org/apache/hadoop/hbase/TestZooKeeper.java
--
diff --git
a/hbase-server/src/test/java/org/apache/hadoop/hbase/TestZooKeeper.java
b/hbase-server/src/test/java/org/apache/hadoop/hbase/TestZooKeeper.java
index 4439d4c..c9d984f 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/TestZooKeeper.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/TestZooKeeper.java
@@ -38,13 +38,13 @@ import org.apache.hadoop.hbase.client.Admin;
import org.apache.hadoop.hbase.client.Connection;
import org.apache.hadoop.hbase.client.ConnectionFactory;
import org.apache.hadoop.hbase.client.Get;
-import org.apache.hadoop.hbase.client.HBaseAdmin;
import org.apache.hadoop.hbase.client.HConnectionManager;
import org.apache.hadoop.hbase.client.Put;
import org.apache.hadoop.hbase.client.Result;
import org.apache.hadoop.hbase.client.ResultScanner;
import org.apache.hadoop.hbase.client.Scan;
import org.apache.hadoop.hbase.client.Table;
+import org.apache.hadoop.hbase.coordination.ZkSplitLogWorkerCoordination;
import org.apache.hadoop.hbase.master.HMaster;
import org.apache.hadoop.hbase.master.LoadBalancer;
import org.apache.hadoop.hbase.master.balancer.SimpleLoadBalancer;
@@ -238,7 +238,7 @@ public class TestZooKeeper {
MiniHBaseCluster cluster = TEST_UTIL.getHBaseCluster();
HMaster m = cluster.getMaster();
m.abort(Test recovery from zk session expired,
- new KeeperException.SessionExpiredException());
+new KeeperException.SessionExpiredException());
assertTrue(m.isStopped()); // Master doesn't recover any more
testSanity(testMasterZKSessionRecoveryFailure);
}
@@ -529,14 +529,12 @@ public class TestZooKeeper {
cluster.startRegionServer();
cluster.waitForActiveAndReadyMaster(1);
HMaster m = cluster.getMaster();
-ZooKeeperWatcher zkw = m.getZooKeeper();
-int expectedNumOfListeners = zkw.getNumberOfListeners();
+final ZooKeeperWatcher zkw = m.getZooKeeper();
// now the cluster is up. So assign some regions.
-Admin admin = TEST_UTIL.getHBaseAdmin();
-try {
+try (Admin admin = TEST_UTIL.getHBaseAdmin()) {
byte[][] SPLIT_KEYS = new byte[][] { Bytes.toBytes(a),
Bytes.toBytes(b),
-Bytes.toBytes(c), Bytes.toBytes(d), Bytes.toBytes(e),
Bytes.toBytes(f),
-Bytes.toBytes(g), Bytes.toBytes(h), Bytes.toBytes(i),
Bytes.toBytes(j) };
+ Bytes.toBytes(c), Bytes.toBytes(d), Bytes.toBytes(e),
Bytes.toBytes(f),
+ Bytes.toBytes(g), Bytes.toBytes(h), Bytes.toBytes(i),
Bytes.toBytes(j) };
String tableName =
testRegionAssignmentAfterMasterRecoveryDueToZKExpiry;
HTableDescriptor htd = new
HTableDescriptor(TableName.valueOf(tableName));
htd.addFamily(new HColumnDescriptor(HConstants.CATALOG_FAMILY));
@@ -544,8 +542,9 @@ public class TestZooKeeper {
TEST_UTIL.waitUntilNoRegionsInTransition(6);
m.getZooKeeper().close();
MockLoadBalancer.retainAssignCalled = false;
+ final int expectedNumOfListeners = countPermanentListeners(zkw);
m.abort(Test recovery from zk session expired,
-new KeeperException.SessionExpiredException());
+ new KeeperException.SessionExpiredException());
assertTrue(m.isStopped()); // Master doesn't recover any more
// The recovered master should not call retainAssignment, as it is not a
// clean startup.
@@ -553,10 +552,37 @@ public class TestZooKeeper {
// number of listeners should be same as the value before master aborted
// wait for new master is initialized
cluster.waitForActiveAndReadyMaster(12);
- assertEquals(expectedNumOfListeners, zkw.getNumberOfListeners());
-} finally {
- admin.close();
+ final HMaster newMaster = cluster.getMasterThread().getMaster();
+ assertEquals(expectedNumOfListeners,
countPermanentListeners(newMaster.getZooKeeper()));
+}
+ }
+
+ /**
+ * Count
hbase git commit: HBASE-13176 Flakey TestZooKeeper test.
Repository: hbase
Updated Branches:
refs/heads/branch-1 d0af30ea3 - bee9fb8e7
HBASE-13176 Flakey TestZooKeeper test.
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/bee9fb8e
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/bee9fb8e
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/bee9fb8e
Branch: refs/heads/branch-1
Commit: bee9fb8e7e3a0c3dcdc631908a09fbd4bc11efb0
Parents: d0af30e
Author: Andrey Stepachev oct...@gmail.com
Authored: Tue Mar 17 15:00:10 2015 +
Committer: Andrey Stepachev oct...@gmail.com
Committed: Tue Mar 17 15:00:10 2015 +
--
.../org/apache/hadoop/hbase/TestZooKeeper.java | 58 ++--
1 file changed, 42 insertions(+), 16 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/hbase/blob/bee9fb8e/hbase-server/src/test/java/org/apache/hadoop/hbase/TestZooKeeper.java
--
diff --git
a/hbase-server/src/test/java/org/apache/hadoop/hbase/TestZooKeeper.java
b/hbase-server/src/test/java/org/apache/hadoop/hbase/TestZooKeeper.java
index 3065812..6e233f7 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/TestZooKeeper.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/TestZooKeeper.java
@@ -36,7 +36,6 @@ import org.apache.commons.logging.LogFactory;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.hbase.client.Admin;
import org.apache.hadoop.hbase.client.Get;
-import org.apache.hadoop.hbase.client.HBaseAdmin;
import org.apache.hadoop.hbase.client.HConnection;
import org.apache.hadoop.hbase.client.HConnectionManager;
import org.apache.hadoop.hbase.client.HTable;
@@ -45,6 +44,7 @@ import org.apache.hadoop.hbase.client.Result;
import org.apache.hadoop.hbase.client.ResultScanner;
import org.apache.hadoop.hbase.client.Scan;
import org.apache.hadoop.hbase.client.Table;
+import org.apache.hadoop.hbase.coordination.ZkSplitLogWorkerCoordination;
import org.apache.hadoop.hbase.master.HMaster;
import org.apache.hadoop.hbase.master.LoadBalancer;
import org.apache.hadoop.hbase.master.balancer.SimpleLoadBalancer;
@@ -238,7 +238,7 @@ public class TestZooKeeper {
MiniHBaseCluster cluster = TEST_UTIL.getHBaseCluster();
HMaster m = cluster.getMaster();
m.abort(Test recovery from zk session expired,
- new KeeperException.SessionExpiredException());
+new KeeperException.SessionExpiredException());
assertTrue(m.isStopped()); // Master doesn't recover any more
testSanity(testMasterZKSessionRecoveryFailure);
}
@@ -253,7 +253,7 @@ public class TestZooKeeper {
HColumnDescriptor family = new HColumnDescriptor(fam);
desc.addFamily(family);
LOG.info(Creating table + tableName);
-Admin admin = new HBaseAdmin(TEST_UTIL.getConfiguration());
+Admin admin = TEST_UTIL.getHBaseAdmin();
try {
admin.createTable(desc);
} finally {
@@ -529,24 +529,22 @@ public class TestZooKeeper {
cluster.startRegionServer();
cluster.waitForActiveAndReadyMaster(1);
HMaster m = cluster.getMaster();
-ZooKeeperWatcher zkw = m.getZooKeeper();
-int expectedNumOfListeners = zkw.getNumberOfListeners();
+final ZooKeeperWatcher zkw = m.getZooKeeper();
// now the cluster is up. So assign some regions.
-Admin admin = new HBaseAdmin(TEST_UTIL.getConfiguration());
-try {
+try (Admin admin = TEST_UTIL.getHBaseAdmin()) {
byte[][] SPLIT_KEYS = new byte[][] { Bytes.toBytes(a),
Bytes.toBytes(b),
-Bytes.toBytes(c), Bytes.toBytes(d), Bytes.toBytes(e),
Bytes.toBytes(f),
-Bytes.toBytes(g), Bytes.toBytes(h), Bytes.toBytes(i),
Bytes.toBytes(j) };
+ Bytes.toBytes(c), Bytes.toBytes(d), Bytes.toBytes(e),
Bytes.toBytes(f),
+ Bytes.toBytes(g), Bytes.toBytes(h), Bytes.toBytes(i),
Bytes.toBytes(j) };
String tableName =
testRegionAssignmentAfterMasterRecoveryDueToZKExpiry;
HTableDescriptor htd = new
HTableDescriptor(TableName.valueOf(tableName));
htd.addFamily(new HColumnDescriptor(HConstants.CATALOG_FAMILY));
admin.createTable(htd, SPLIT_KEYS);
- ZooKeeperWatcher zooKeeperWatcher =
HBaseTestingUtility.getZooKeeperWatcher(TEST_UTIL);
- ZKAssign.blockUntilNoRIT(zooKeeperWatcher);
+ TEST_UTIL.waitUntilNoRegionsInTransition(6);
m.getZooKeeper().close();
MockLoadBalancer.retainAssignCalled = false;
+ final int expectedNumOfListeners = countPermanentListeners(zkw);
m.abort(Test recovery from zk session expired,
-new KeeperException.SessionExpiredException());
+ new KeeperException.SessionExpiredException());
assertTrue(m.isStopped()); // Master doesn't recover any more
// The recovered master should not call retainAssignment, as it is not a
hbase git commit: HBASE-13176 Flakey TestZooKeeper test.
Repository: hbase
Updated Branches:
refs/heads/branch-1.0 212cba16f - 417f7a193
HBASE-13176 Flakey TestZooKeeper test.
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/417f7a19
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/417f7a19
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/417f7a19
Branch: refs/heads/branch-1.0
Commit: 417f7a1930478e61f5d6f9bd49312f6ea787dcfb
Parents: 212cba1
Author: Andrey Stepachev oct...@gmail.com
Authored: Tue Mar 17 15:00:10 2015 +
Committer: Andrey Stepachev oct...@gmail.com
Committed: Tue Mar 17 15:01:43 2015 +
--
.../org/apache/hadoop/hbase/TestZooKeeper.java | 58 ++--
1 file changed, 42 insertions(+), 16 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/hbase/blob/417f7a19/hbase-server/src/test/java/org/apache/hadoop/hbase/TestZooKeeper.java
--
diff --git
a/hbase-server/src/test/java/org/apache/hadoop/hbase/TestZooKeeper.java
b/hbase-server/src/test/java/org/apache/hadoop/hbase/TestZooKeeper.java
index cdee735..190967d 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/TestZooKeeper.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/TestZooKeeper.java
@@ -36,7 +36,6 @@ import org.apache.commons.logging.LogFactory;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.hbase.client.Admin;
import org.apache.hadoop.hbase.client.Get;
-import org.apache.hadoop.hbase.client.HBaseAdmin;
import org.apache.hadoop.hbase.client.HConnection;
import org.apache.hadoop.hbase.client.HConnectionManager;
import org.apache.hadoop.hbase.client.HTable;
@@ -45,6 +44,7 @@ import org.apache.hadoop.hbase.client.Result;
import org.apache.hadoop.hbase.client.ResultScanner;
import org.apache.hadoop.hbase.client.Scan;
import org.apache.hadoop.hbase.client.Table;
+import org.apache.hadoop.hbase.coordination.ZkSplitLogWorkerCoordination;
import org.apache.hadoop.hbase.master.HMaster;
import org.apache.hadoop.hbase.master.LoadBalancer;
import org.apache.hadoop.hbase.master.balancer.SimpleLoadBalancer;
@@ -238,7 +238,7 @@ public class TestZooKeeper {
MiniHBaseCluster cluster = TEST_UTIL.getHBaseCluster();
HMaster m = cluster.getMaster();
m.abort(Test recovery from zk session expired,
- new KeeperException.SessionExpiredException());
+new KeeperException.SessionExpiredException());
assertTrue(m.isStopped()); // Master doesn't recover any more
testSanity(testMasterZKSessionRecoveryFailure);
}
@@ -253,7 +253,7 @@ public class TestZooKeeper {
HColumnDescriptor family = new HColumnDescriptor(fam);
desc.addFamily(family);
LOG.info(Creating table + tableName);
-Admin admin = new HBaseAdmin(TEST_UTIL.getConfiguration());
+Admin admin = TEST_UTIL.getHBaseAdmin();
try {
admin.createTable(desc);
} finally {
@@ -491,24 +491,22 @@ public class TestZooKeeper {
cluster.startRegionServer();
cluster.waitForActiveAndReadyMaster(1);
HMaster m = cluster.getMaster();
-ZooKeeperWatcher zkw = m.getZooKeeper();
-int expectedNumOfListeners = zkw.getNumberOfListeners();
+final ZooKeeperWatcher zkw = m.getZooKeeper();
// now the cluster is up. So assign some regions.
-Admin admin = new HBaseAdmin(TEST_UTIL.getConfiguration());
-try {
+try (Admin admin = TEST_UTIL.getHBaseAdmin()) {
byte[][] SPLIT_KEYS = new byte[][] { Bytes.toBytes(a),
Bytes.toBytes(b),
-Bytes.toBytes(c), Bytes.toBytes(d), Bytes.toBytes(e),
Bytes.toBytes(f),
-Bytes.toBytes(g), Bytes.toBytes(h), Bytes.toBytes(i),
Bytes.toBytes(j) };
+ Bytes.toBytes(c), Bytes.toBytes(d), Bytes.toBytes(e),
Bytes.toBytes(f),
+ Bytes.toBytes(g), Bytes.toBytes(h), Bytes.toBytes(i),
Bytes.toBytes(j) };
String tableName =
testRegionAssignmentAfterMasterRecoveryDueToZKExpiry;
HTableDescriptor htd = new
HTableDescriptor(TableName.valueOf(tableName));
htd.addFamily(new HColumnDescriptor(HConstants.CATALOG_FAMILY));
admin.createTable(htd, SPLIT_KEYS);
- ZooKeeperWatcher zooKeeperWatcher =
HBaseTestingUtility.getZooKeeperWatcher(TEST_UTIL);
- ZKAssign.blockUntilNoRIT(zooKeeperWatcher);
+ TEST_UTIL.waitUntilNoRegionsInTransition(6);
m.getZooKeeper().close();
MockLoadBalancer.retainAssignCalled = false;
+ final int expectedNumOfListeners = countPermanentListeners(zkw);
m.abort(Test recovery from zk session expired,
-new KeeperException.SessionExpiredException());
+ new KeeperException.SessionExpiredException());
assertTrue(m.isStopped()); // Master doesn't recover any more
// The recovered master should not call retainAssignment, as it is
hbase git commit: HBASE-13256 HBaseConfiguration#checkDefaultsVersion(Configuration) has spelling error (Josh Elser)
Repository: hbase
Updated Branches:
refs/heads/branch-1 489698d6c - e1f972170
HBASE-13256 HBaseConfiguration#checkDefaultsVersion(Configuration) has spelling
error (Josh Elser)
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/e1f97217
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/e1f97217
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/e1f97217
Branch: refs/heads/branch-1
Commit: e1f972170d59977b7477812951a67a411fecd406
Parents: 489698d
Author: tedyu yuzhih...@gmail.com
Authored: Tue Mar 17 07:24:38 2015 -0700
Committer: tedyu yuzhih...@gmail.com
Committed: Tue Mar 17 07:24:38 2015 -0700
--
.../src/main/java/org/apache/hadoop/hbase/HBaseConfiguration.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/hbase/blob/e1f97217/hbase-common/src/main/java/org/apache/hadoop/hbase/HBaseConfiguration.java
--
diff --git
a/hbase-common/src/main/java/org/apache/hadoop/hbase/HBaseConfiguration.java
b/hbase-common/src/main/java/org/apache/hadoop/hbase/HBaseConfiguration.java
index 1323240..41bacf4 100644
--- a/hbase-common/src/main/java/org/apache/hadoop/hbase/HBaseConfiguration.java
+++ b/hbase-common/src/main/java/org/apache/hadoop/hbase/HBaseConfiguration.java
@@ -69,7 +69,7 @@ public class HBaseConfiguration extends Configuration {
String thisVersion = VersionInfo.getVersion();
if (!thisVersion.equals(defaultsVersion)) {
throw new RuntimeException(
-hbase-default.xml file seems to be for and old version of HBase ( +
+hbase-default.xml file seems to be for an older version of HBase ( +
defaultsVersion + ), this version is + thisVersion);
}
}
hbase git commit: HBASE-13093 Local mode HBase instance doesn't shut down.
Repository: hbase
Updated Branches:
refs/heads/master 75b627c8e - 7a08ad9df
HBASE-13093 Local mode HBase instance doesn't shut down.
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/7a08ad9d
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/7a08ad9d
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/7a08ad9d
Branch: refs/heads/master
Commit: 7a08ad9df8602bc99848489cd3d734b426aded48
Parents: 75b627c
Author: Andrey Stepachev oct...@gmail.com
Authored: Tue Mar 17 14:46:30 2015 +
Committer: Andrey Stepachev oct...@gmail.com
Committed: Tue Mar 17 14:46:30 2015 +
--
.../org/apache/hadoop/hbase/ipc/AsyncRpcChannel.java | 8
.../java/org/apache/hadoop/hbase/ipc/AsyncRpcClient.java | 11 +--
2 files changed, 13 insertions(+), 6 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/hbase/blob/7a08ad9d/hbase-client/src/main/java/org/apache/hadoop/hbase/ipc/AsyncRpcChannel.java
--
diff --git
a/hbase-client/src/main/java/org/apache/hadoop/hbase/ipc/AsyncRpcChannel.java
b/hbase-client/src/main/java/org/apache/hadoop/hbase/ipc/AsyncRpcChannel.java
index 8414290..3fb547b 100644
---
a/hbase-client/src/main/java/org/apache/hadoop/hbase/ipc/AsyncRpcChannel.java
+++
b/hbase-client/src/main/java/org/apache/hadoop/hbase/ipc/AsyncRpcChannel.java
@@ -262,7 +262,7 @@ public class AsyncRpcChannel {
handleSaslConnectionFailure(retryCount, cause, realTicket);
// Try to reconnect
- AsyncRpcClient.WHEEL_TIMER.newTimeout(new TimerTask() {
+ client.newTimeout(new TimerTask() {
@Override
public void run(Timeout timeout) throws Exception {
connect(bootstrap);
@@ -289,7 +289,7 @@ public class AsyncRpcChannel {
*/
private void retryOrClose(final Bootstrap bootstrap, int connectCounter,
Throwable e) {
if (connectCounter client.maxRetries) {
- AsyncRpcClient.WHEEL_TIMER.newTimeout(new TimerTask() {
+ client.newTimeout(new TimerTask() {
@Override public void run(Timeout timeout) throws Exception {
connect(bootstrap);
}
@@ -339,7 +339,7 @@ public class AsyncRpcChannel {
// Add timeout for cleanup if none is present
if (cleanupTimer == null call.getRpcTimeout() 0) {
cleanupTimer =
-AsyncRpcClient.WHEEL_TIMER.newTimeout(timeoutTask,
call.getRpcTimeout(),
+client.newTimeout(timeoutTask, call.getRpcTimeout(),
TimeUnit.MILLISECONDS);
}
if (!connected) {
@@ -601,7 +601,7 @@ public class AsyncRpcChannel {
}
if (nextCleanupTaskDelay 0) {
cleanupTimer =
-AsyncRpcClient.WHEEL_TIMER.newTimeout(timeoutTask,
nextCleanupTaskDelay,
+client.newTimeout(timeoutTask, nextCleanupTaskDelay,
TimeUnit.MILLISECONDS);
} else {
cleanupTimer = null;
http://git-wip-us.apache.org/repos/asf/hbase/blob/7a08ad9d/hbase-client/src/main/java/org/apache/hadoop/hbase/ipc/AsyncRpcClient.java
--
diff --git
a/hbase-client/src/main/java/org/apache/hadoop/hbase/ipc/AsyncRpcClient.java
b/hbase-client/src/main/java/org/apache/hadoop/hbase/ipc/AsyncRpcClient.java
index 3bf9aad..e55a7eb 100644
--- a/hbase-client/src/main/java/org/apache/hadoop/hbase/ipc/AsyncRpcClient.java
+++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/ipc/AsyncRpcClient.java
@@ -28,6 +28,8 @@ import io.netty.channel.nio.NioEventLoopGroup;
import io.netty.channel.socket.SocketChannel;
import io.netty.channel.socket.nio.NioSocketChannel;
import io.netty.util.HashedWheelTimer;
+import io.netty.util.Timeout;
+import io.netty.util.TimerTask;
import io.netty.util.concurrent.Future;
import io.netty.util.concurrent.GenericFutureListener;
import io.netty.util.concurrent.Promise;
@@ -70,8 +72,9 @@ public class AsyncRpcClient extends AbstractRpcClient {
public static final String USE_NATIVE_TRANSPORT =
hbase.rpc.client.nativetransport;
public static final String USE_GLOBAL_EVENT_LOOP_GROUP =
hbase.rpc.client.globaleventloopgroup;
- public static final HashedWheelTimer WHEEL_TIMER =
- new HashedWheelTimer(100, TimeUnit.MILLISECONDS);
+ private static final HashedWheelTimer WHEEL_TIMER =
+ new
HashedWheelTimer(Threads.newDaemonThreadFactory(AsyncRpcChannel-timer),
+ 100, TimeUnit.MILLISECONDS);
private static final ChannelInitializerSocketChannel
DEFAULT_CHANNEL_INITIALIZER =
new ChannelInitializerSocketChannel() {
@@ -458,4 +461,8 @@ public class AsyncRpcClient extends AbstractRpcClient {
this.rpcClient.callMethod(md, pcrc, param, returnType, this.ticket,
hbase git commit: HBASE-13093 Local mode HBase instance doesn't shut down.
Repository: hbase
Updated Branches:
refs/heads/branch-1 e1f972170 - d0af30ea3
HBASE-13093 Local mode HBase instance doesn't shut down.
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/d0af30ea
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/d0af30ea
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/d0af30ea
Branch: refs/heads/branch-1
Commit: d0af30ea3cc33c970c323917d6d522b4536071da
Parents: e1f9721
Author: Andrey Stepachev oct...@gmail.com
Authored: Tue Mar 17 14:47:11 2015 +
Committer: Andrey Stepachev oct...@gmail.com
Committed: Tue Mar 17 14:47:11 2015 +
--
.../org/apache/hadoop/hbase/ipc/AsyncRpcChannel.java | 8
.../java/org/apache/hadoop/hbase/ipc/AsyncRpcClient.java | 11 +--
2 files changed, 13 insertions(+), 6 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/hbase/blob/d0af30ea/hbase-client/src/main/java/org/apache/hadoop/hbase/ipc/AsyncRpcChannel.java
--
diff --git
a/hbase-client/src/main/java/org/apache/hadoop/hbase/ipc/AsyncRpcChannel.java
b/hbase-client/src/main/java/org/apache/hadoop/hbase/ipc/AsyncRpcChannel.java
index 8414290..3fb547b 100644
---
a/hbase-client/src/main/java/org/apache/hadoop/hbase/ipc/AsyncRpcChannel.java
+++
b/hbase-client/src/main/java/org/apache/hadoop/hbase/ipc/AsyncRpcChannel.java
@@ -262,7 +262,7 @@ public class AsyncRpcChannel {
handleSaslConnectionFailure(retryCount, cause, realTicket);
// Try to reconnect
- AsyncRpcClient.WHEEL_TIMER.newTimeout(new TimerTask() {
+ client.newTimeout(new TimerTask() {
@Override
public void run(Timeout timeout) throws Exception {
connect(bootstrap);
@@ -289,7 +289,7 @@ public class AsyncRpcChannel {
*/
private void retryOrClose(final Bootstrap bootstrap, int connectCounter,
Throwable e) {
if (connectCounter client.maxRetries) {
- AsyncRpcClient.WHEEL_TIMER.newTimeout(new TimerTask() {
+ client.newTimeout(new TimerTask() {
@Override public void run(Timeout timeout) throws Exception {
connect(bootstrap);
}
@@ -339,7 +339,7 @@ public class AsyncRpcChannel {
// Add timeout for cleanup if none is present
if (cleanupTimer == null call.getRpcTimeout() 0) {
cleanupTimer =
-AsyncRpcClient.WHEEL_TIMER.newTimeout(timeoutTask,
call.getRpcTimeout(),
+client.newTimeout(timeoutTask, call.getRpcTimeout(),
TimeUnit.MILLISECONDS);
}
if (!connected) {
@@ -601,7 +601,7 @@ public class AsyncRpcChannel {
}
if (nextCleanupTaskDelay 0) {
cleanupTimer =
-AsyncRpcClient.WHEEL_TIMER.newTimeout(timeoutTask,
nextCleanupTaskDelay,
+client.newTimeout(timeoutTask, nextCleanupTaskDelay,
TimeUnit.MILLISECONDS);
} else {
cleanupTimer = null;
http://git-wip-us.apache.org/repos/asf/hbase/blob/d0af30ea/hbase-client/src/main/java/org/apache/hadoop/hbase/ipc/AsyncRpcClient.java
--
diff --git
a/hbase-client/src/main/java/org/apache/hadoop/hbase/ipc/AsyncRpcClient.java
b/hbase-client/src/main/java/org/apache/hadoop/hbase/ipc/AsyncRpcClient.java
index 3bf9aad..e55a7eb 100644
--- a/hbase-client/src/main/java/org/apache/hadoop/hbase/ipc/AsyncRpcClient.java
+++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/ipc/AsyncRpcClient.java
@@ -28,6 +28,8 @@ import io.netty.channel.nio.NioEventLoopGroup;
import io.netty.channel.socket.SocketChannel;
import io.netty.channel.socket.nio.NioSocketChannel;
import io.netty.util.HashedWheelTimer;
+import io.netty.util.Timeout;
+import io.netty.util.TimerTask;
import io.netty.util.concurrent.Future;
import io.netty.util.concurrent.GenericFutureListener;
import io.netty.util.concurrent.Promise;
@@ -70,8 +72,9 @@ public class AsyncRpcClient extends AbstractRpcClient {
public static final String USE_NATIVE_TRANSPORT =
hbase.rpc.client.nativetransport;
public static final String USE_GLOBAL_EVENT_LOOP_GROUP =
hbase.rpc.client.globaleventloopgroup;
- public static final HashedWheelTimer WHEEL_TIMER =
- new HashedWheelTimer(100, TimeUnit.MILLISECONDS);
+ private static final HashedWheelTimer WHEEL_TIMER =
+ new
HashedWheelTimer(Threads.newDaemonThreadFactory(AsyncRpcChannel-timer),
+ 100, TimeUnit.MILLISECONDS);
private static final ChannelInitializerSocketChannel
DEFAULT_CHANNEL_INITIALIZER =
new ChannelInitializerSocketChannel() {
@@ -458,4 +461,8 @@ public class AsyncRpcClient extends AbstractRpcClient {
this.rpcClient.callMethod(md, pcrc, param, returnType,
hbase git commit: Specify bash for local-regionservers.sh and local-master-backup.sh
Repository: hbase Updated Branches: refs/heads/master ed026c2e6 - ca8876a9f Specify bash for local-regionservers.sh and local-master-backup.sh Signed-off-by: Sean Busbey bus...@apache.org Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/ca8876a9 Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/ca8876a9 Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/ca8876a9 Branch: refs/heads/master Commit: ca8876a9f2534f2ab0b416aecb4ac476da9747f8 Parents: ed026c2 Author: Gustavo Anatoly gustavoanat...@gmail.com Authored: Mon Mar 16 23:45:01 2015 -0300 Committer: Sean Busbey bus...@apache.org Committed: Tue Mar 17 09:57:07 2015 -0500 -- bin/local-master-backup.sh | 2 +- bin/local-regionservers.sh | 2 +- src/main/asciidoc/_chapters/configuration.adoc | 3 +++ 3 files changed, 5 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/hbase/blob/ca8876a9/bin/local-master-backup.sh -- diff --git a/bin/local-master-backup.sh b/bin/local-master-backup.sh index f368e4a..e1a80cd 100755 --- a/bin/local-master-backup.sh +++ b/bin/local-master-backup.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/usr/bin/env bash #/** # * Copyright 2007 The Apache Software Foundation # * http://git-wip-us.apache.org/repos/asf/hbase/blob/ca8876a9/bin/local-regionservers.sh -- diff --git a/bin/local-regionservers.sh b/bin/local-regionservers.sh index 38d9ffc..f744ee1 100755 --- a/bin/local-regionservers.sh +++ b/bin/local-regionservers.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/usr/bin/env bash #/** # * Copyright 2007 The Apache Software Foundation # * http://git-wip-us.apache.org/repos/asf/hbase/blob/ca8876a9/src/main/asciidoc/_chapters/configuration.adoc -- diff --git a/src/main/asciidoc/_chapters/configuration.adoc b/src/main/asciidoc/_chapters/configuration.adoc index a5430eb..ed00a49 100644 --- a/src/main/asciidoc/_chapters/configuration.adoc +++ b/src/main/asciidoc/_chapters/configuration.adoc @@ -172,6 +172,9 @@ session required pam_limits.so +Linux Shell:: + All of the shell scripts that come with HBase rely on the link:http://www.gnu.org/software/bash[GNU Bash] shell. + Windows:: Prior to HBase 0.96, testing for running HBase on Microsoft Windows was limited. Running a on Windows nodes is not recommended for production systems.
