Repository: hbase Updated Branches: refs/heads/master 98bb5c05e -> 08a9522fc
HBASE-18673 Some more unwanted reference to unshaded PB classes Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/08a9522f Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/08a9522f Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/08a9522f Branch: refs/heads/master Commit: 08a9522fc1610231c34d4d865777618eb06d9e19 Parents: 98bb5c0 Author: Michael Stack <[email protected]> Authored: Thu Aug 24 16:31:31 2017 -0700 Committer: Michael Stack <[email protected]> Committed: Thu Aug 24 20:59:23 2017 -0700 ---------------------------------------------------------------------- .../apache/hadoop/hbase/regionserver/wal/ProtobufLogReader.java | 4 ++-- .../src/main/java/org/apache/hadoop/hbase/util/HBaseFsck.java | 5 ++--- 2 files changed, 4 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hbase/blob/08a9522f/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/wal/ProtobufLogReader.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/wal/ProtobufLogReader.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/wal/ProtobufLogReader.java index f445059..593a761 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/wal/ProtobufLogReader.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/wal/ProtobufLogReader.java @@ -44,8 +44,8 @@ import org.apache.hadoop.hbase.shaded.protobuf.generated.WALProtos.WALTrailer; import org.apache.hadoop.hbase.util.Bytes; import org.apache.hadoop.hbase.wal.WAL.Entry; -import com.google.protobuf.CodedInputStream; -import com.google.protobuf.InvalidProtocolBufferException; +import org.apache.hadoop.hbase.shaded.com.google.protobuf.CodedInputStream; +import org.apache.hadoop.hbase.shaded.com.google.protobuf.InvalidProtocolBufferException; /** * A Protobuf based WAL has the following structure: http://git-wip-us.apache.org/repos/asf/hbase/blob/08a9522f/hbase-server/src/main/java/org/apache/hadoop/hbase/util/HBaseFsck.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/util/HBaseFsck.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/util/HBaseFsck.java index 199ed7d..bc663e1 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/util/HBaseFsck.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/util/HBaseFsck.java @@ -28,7 +28,6 @@ import org.apache.hadoop.hbase.shaded.com.google.common.collect.Lists; import org.apache.hadoop.hbase.shaded.com.google.common.collect.Multimap; import org.apache.hadoop.hbase.shaded.com.google.common.collect.Ordering; import org.apache.hadoop.hbase.shaded.com.google.common.collect.TreeMultimap; -import com.google.protobuf.ServiceException; import java.io.Closeable; import java.io.FileNotFoundException; @@ -745,7 +744,7 @@ public class HBaseFsck extends Configured implements Closeable { * @return 0 on success, non-zero on failure */ public int onlineHbck() - throws IOException, KeeperException, InterruptedException, ServiceException { + throws IOException, KeeperException, InterruptedException { // print hbase server version errors.print("Version: " + status.getHBaseVersion()); @@ -4841,7 +4840,7 @@ public class HBaseFsck extends Configured implements Closeable { public HBaseFsck exec(ExecutorService exec, String[] args) throws KeeperException, IOException, - ServiceException, InterruptedException { + InterruptedException { long sleepBeforeRerun = DEFAULT_SLEEP_BEFORE_RERUN; boolean checkCorruptHFiles = false;
