hbase git commit: HBASE-17850 Backup system repair utility (Vladimir Rodionov)
Repository: hbase Updated Branches: refs/heads/master f1a999032 -> 28d619b22 HBASE-17850 Backup system repair utility (Vladimir Rodionov) Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/28d619b2 Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/28d619b2 Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/28d619b2 Branch: refs/heads/master Commit: 28d619b22bec1b93259a96bfaba3ec1aecb026a2 Parents: f1a9990 Author: tedyuAuthored: Mon May 22 16:25:59 2017 -0700 Committer: tedyu Committed: Mon May 22 16:25:59 2017 -0700 -- .../hadoop/hbase/backup/BackupDriver.java | 2 + .../apache/hadoop/hbase/backup/BackupInfo.java | 2 +- .../hbase/backup/BackupRestoreConstants.java| 2 +- .../hbase/backup/impl/BackupAdminImpl.java | 4 +- .../hbase/backup/impl/BackupCommands.java | 70 +++ .../impl/IncrementalTableBackupClient.java | 5 +- .../hbase/backup/impl/TableBackupClient.java| 24 ++- .../hadoop/hbase/backup/TestBackupBase.java | 184 +++ .../hadoop/hbase/backup/TestBackupRepair.java | 91 + .../backup/TestFullBackupWithFailures.java | 141 +- .../TestIncrementalBackupWithFailures.java | 161 11 files changed, 544 insertions(+), 142 deletions(-) -- http://git-wip-us.apache.org/repos/asf/hbase/blob/28d619b2/hbase-server/src/main/java/org/apache/hadoop/hbase/backup/BackupDriver.java -- diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/backup/BackupDriver.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/backup/BackupDriver.java index cc5cc95..e2cdb2f 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/backup/BackupDriver.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/backup/BackupDriver.java @@ -109,6 +109,8 @@ public class BackupDriver extends AbstractHBaseTool { type = BackupCommand.PROGRESS; } else if (BackupCommand.SET.name().equalsIgnoreCase(cmd)) { type = BackupCommand.SET; +} else if (BackupCommand.REPAIR.name().equalsIgnoreCase(cmd)) { + type = BackupCommand.REPAIR; } else { System.out.println("Unsupported command for backup: " + cmd); printToolUsage(); http://git-wip-us.apache.org/repos/asf/hbase/blob/28d619b2/hbase-server/src/main/java/org/apache/hadoop/hbase/backup/BackupInfo.java -- diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/backup/BackupInfo.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/backup/BackupInfo.java index c7d2848..f6a1fe4 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/backup/BackupInfo.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/backup/BackupInfo.java @@ -96,7 +96,7 @@ public class BackupInfo implements Comparable { /** * Backup phase */ - private BackupPhase phase; + private BackupPhase phase = BackupPhase.REQUEST; /** * Backup failure message http://git-wip-us.apache.org/repos/asf/hbase/blob/28d619b2/hbase-server/src/main/java/org/apache/hadoop/hbase/backup/BackupRestoreConstants.java -- diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/backup/BackupRestoreConstants.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/backup/BackupRestoreConstants.java index 80f022f..48e70a1 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/backup/BackupRestoreConstants.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/backup/BackupRestoreConstants.java @@ -117,7 +117,7 @@ public interface BackupRestoreConstants { public static enum BackupCommand { CREATE, CANCEL, DELETE, DESCRIBE, HISTORY, STATUS, CONVERT, MERGE, STOP, SHOW, HELP, PROGRESS, -SET, SET_ADD, SET_REMOVE, SET_DELETE, SET_DESCRIBE, SET_LIST +SET, SET_ADD, SET_REMOVE, SET_DELETE, SET_DESCRIBE, SET_LIST, REPAIR } } http://git-wip-us.apache.org/repos/asf/hbase/blob/28d619b2/hbase-server/src/main/java/org/apache/hadoop/hbase/backup/impl/BackupAdminImpl.java -- diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/backup/impl/BackupAdminImpl.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/backup/impl/BackupAdminImpl.java index 3a54e20..30cabfd 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/backup/impl/BackupAdminImpl.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/backup/impl/BackupAdminImpl.java @@ -93,9 +93,7 @@ public class BackupAdminImpl implements BackupAdmin { @Override
[hbase] Git Push Summary
Repository: hbase Updated Branches: refs/heads/HBASE-16961 [deleted] fae5f7e66
[21/49] hbase git commit: HBASE-16998 Implement Master-side analysis of region space reports
HBASE-16998 Implement Master-side analysis of region space reports Adds a new Chore to the Master that analyzes the reports that are sent by RegionServers. The Master must then, for all tables with quotas, determine the tables that are violating quotas and move those tables into violation. Similarly, tables no longer violating the quota can be moved out of violation. The Chore is the "stateful" bit, managing which tables are and are not in violation. Everything else is just performing computation and informing the Chore on the updated state. Added InterfaceAudience annotations and clean up the QuotaObserverChore constructor. Cleaned up some javadoc and QuotaObserverChore. Reuse the QuotaViolationStore impl objects. Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/533470f8 Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/533470f8 Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/533470f8 Branch: refs/heads/master Commit: 533470f8c879174d023140a80d2b6d548685733e Parents: 7fb0ac2 Author: Josh ElserAuthored: Tue Nov 8 18:55:12 2016 -0500 Committer: Josh Elser Committed: Mon May 22 13:41:35 2017 -0400 -- .../hadoop/hbase/quotas/QuotaRetriever.java | 27 +- .../org/apache/hadoop/hbase/master/HMaster.java | 20 + .../hadoop/hbase/quotas/MasterQuotaManager.java | 1 + .../quotas/NamespaceQuotaViolationStore.java| 127 .../hadoop/hbase/quotas/QuotaObserverChore.java | 618 +++ .../hbase/quotas/QuotaViolationStore.java | 89 +++ .../quotas/SpaceQuotaViolationNotifier.java | 44 ++ .../SpaceQuotaViolationNotifierForTest.java | 50 ++ .../hbase/quotas/TableQuotaViolationStore.java | 127 .../TestNamespaceQuotaViolationStore.java | 156 + .../hbase/quotas/TestQuotaObserverChore.java| 106 .../TestQuotaObserverChoreWithMiniCluster.java | 596 ++ .../hadoop/hbase/quotas/TestQuotaTableUtil.java | 4 - .../quotas/TestTableQuotaViolationStore.java| 151 + .../hbase/quotas/TestTablesWithQuotas.java | 198 ++ 15 files changed, 2305 insertions(+), 9 deletions(-) -- http://git-wip-us.apache.org/repos/asf/hbase/blob/533470f8/hbase-client/src/main/java/org/apache/hadoop/hbase/quotas/QuotaRetriever.java -- diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/quotas/QuotaRetriever.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/quotas/QuotaRetriever.java index 0f7baa5..4482693 100644 --- a/hbase-client/src/main/java/org/apache/hadoop/hbase/quotas/QuotaRetriever.java +++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/quotas/QuotaRetriever.java @@ -22,6 +22,7 @@ import java.io.Closeable; import java.io.IOException; import java.util.Iterator; import java.util.LinkedList; +import java.util.Objects; import java.util.Queue; import org.apache.commons.logging.Log; @@ -54,11 +55,23 @@ public class QuotaRetriever implements Closeable, Iterable { private Connection connection; private Table table; - private QuotaRetriever() { + /** + * Should QutoaRetriever manage the state of the connection, or leave it be. + */ + private boolean isManagedConnection = false; + + QuotaRetriever() { } void init(final Configuration conf, final Scan scan) throws IOException { -this.connection = ConnectionFactory.createConnection(conf); +// Set this before creating the connection and passing it down to make sure +// it's cleaned up if we fail to construct the Scanner. +this.isManagedConnection = true; +init(ConnectionFactory.createConnection(conf), scan); + } + + void init(final Connection conn, final Scan scan) throws IOException { +this.connection = Objects.requireNonNull(conn); this.table = this.connection.getTable(QuotaTableUtil.QUOTA_TABLE_NAME); try { scanner = table.getScanner(scan); @@ -77,10 +90,14 @@ public class QuotaRetriever implements Closeable, Iterable { this.table.close(); this.table = null; } -if (this.connection != null) { - this.connection.close(); - this.connection = null; +// Null out the connection on close() even if we didn't explicitly close it +// to maintain typical semantics. +if (isManagedConnection) { + if (this.connection != null) { +this.connection.close(); + } } +this.connection = null; } public QuotaSettings next() throws IOException { http://git-wip-us.apache.org/repos/asf/hbase/blob/533470f8/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java -- diff --git
[47/49] hbase git commit: HBASE-17955 Various reviewboard improvements to space quota work
http://git-wip-us.apache.org/repos/asf/hbase/blob/d671a1db/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/protobuf/generated/RegionServerStatusProtos.java -- diff --git a/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/protobuf/generated/RegionServerStatusProtos.java b/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/protobuf/generated/RegionServerStatusProtos.java index c70b736..b886f5c 100644 --- a/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/protobuf/generated/RegionServerStatusProtos.java +++ b/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/protobuf/generated/RegionServerStatusProtos.java @@ -10173,42 +10173,42 @@ public final class RegionServerStatusProtos { * A region identifier * * - * optional .hbase.pb.RegionInfo region = 1; + * optional .hbase.pb.RegionInfo region_info = 1; */ -boolean hasRegion(); +boolean hasRegionInfo(); /** * * A region identifier * * - * optional .hbase.pb.RegionInfo region = 1; + * optional .hbase.pb.RegionInfo region_info = 1; */ -org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos.RegionInfo getRegion(); +org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos.RegionInfo getRegionInfo(); /** * * A region identifier * * - * optional .hbase.pb.RegionInfo region = 1; + * optional .hbase.pb.RegionInfo region_info = 1; */ - org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos.RegionInfoOrBuilder getRegionOrBuilder(); + org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos.RegionInfoOrBuilder getRegionInfoOrBuilder(); /** * * The size in bytes of the region * * - * optional uint64 size = 2; + * optional uint64 region_size = 2; */ -boolean hasSize(); +boolean hasRegionSize(); /** * * The size in bytes of the region * * - * optional uint64 size = 2; + * optional uint64 region_size = 2; */ -long getSize(); +long getRegionSize(); } /** * Protobuf type {@code hbase.pb.RegionSpaceUse} @@ -10222,7 +10222,7 @@ public final class RegionServerStatusProtos { super(builder); } private RegionSpaceUse() { - size_ = 0L; + regionSize_ = 0L; } @java.lang.Override @@ -10256,19 +10256,19 @@ public final class RegionServerStatusProtos { case 10: { org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos.RegionInfo.Builder subBuilder = null; if (((bitField0_ & 0x0001) == 0x0001)) { -subBuilder = region_.toBuilder(); +subBuilder = regionInfo_.toBuilder(); } - region_ = input.readMessage(org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos.RegionInfo.PARSER, extensionRegistry); + regionInfo_ = input.readMessage(org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos.RegionInfo.PARSER, extensionRegistry); if (subBuilder != null) { -subBuilder.mergeFrom(region_); -region_ = subBuilder.buildPartial(); +subBuilder.mergeFrom(regionInfo_); +regionInfo_ = subBuilder.buildPartial(); } bitField0_ |= 0x0001; break; } case 16: { bitField0_ |= 0x0002; - size_ = input.readUInt64(); + regionSize_ = input.readUInt64(); break; } } @@ -10296,16 +10296,16 @@ public final class RegionServerStatusProtos { } private int bitField0_; -public static final int REGION_FIELD_NUMBER = 1; -private org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos.RegionInfo region_; +public static final int REGION_INFO_FIELD_NUMBER = 1; +private org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos.RegionInfo regionInfo_; /** * * A region identifier * * - * optional .hbase.pb.RegionInfo region = 1; + * optional .hbase.pb.RegionInfo region_info = 1; */ -public boolean hasRegion() { +public boolean hasRegionInfo() { return ((bitField0_ & 0x0001) == 0x0001); } /** @@ -10313,32 +10313,32 @@ public final class RegionServerStatusProtos { * A region identifier * * - * optional .hbase.pb.RegionInfo region = 1; + * optional .hbase.pb.RegionInfo region_info = 1; */ -public org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos.RegionInfo getRegion() { - return region_ == null ? org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos.RegionInfo.getDefaultInstance() : region_; +
[27/49] hbase git commit: HBASE-17001 Enforce quota violation policies in the RegionServer
http://git-wip-us.apache.org/repos/asf/hbase/blob/34ba143f/hbase-protocol/src/main/java/org/apache/hadoop/hbase/protobuf/generated/QuotaProtos.java -- diff --git a/hbase-protocol/src/main/java/org/apache/hadoop/hbase/protobuf/generated/QuotaProtos.java b/hbase-protocol/src/main/java/org/apache/hadoop/hbase/protobuf/generated/QuotaProtos.java index cc40536..d466e59 100644 --- a/hbase-protocol/src/main/java/org/apache/hadoop/hbase/protobuf/generated/QuotaProtos.java +++ b/hbase-protocol/src/main/java/org/apache/hadoop/hbase/protobuf/generated/QuotaProtos.java @@ -5778,6 +5778,1284 @@ public final class QuotaProtos { // @@protoc_insertion_point(class_scope:hbase.pb.SpaceLimitRequest) } + public interface SpaceQuotaStatusOrBuilder + extends com.google.protobuf.MessageOrBuilder { + +// optional .hbase.pb.SpaceViolationPolicy policy = 1; +/** + * optional .hbase.pb.SpaceViolationPolicy policy = 1; + */ +boolean hasPolicy(); +/** + * optional .hbase.pb.SpaceViolationPolicy policy = 1; + */ + org.apache.hadoop.hbase.protobuf.generated.QuotaProtos.SpaceViolationPolicy getPolicy(); + +// optional bool in_violation = 2; +/** + * optional bool in_violation = 2; + */ +boolean hasInViolation(); +/** + * optional bool in_violation = 2; + */ +boolean getInViolation(); + } + /** + * Protobuf type {@code hbase.pb.SpaceQuotaStatus} + * + * + * Represents the state of a quota on a table. Either the quota is not in violation + * or it is in violatino there is a violation policy which should be in effect. + * + */ + public static final class SpaceQuotaStatus extends + com.google.protobuf.GeneratedMessage + implements SpaceQuotaStatusOrBuilder { +// Use SpaceQuotaStatus.newBuilder() to construct. +private SpaceQuotaStatus(com.google.protobuf.GeneratedMessage.Builder builder) { + super(builder); + this.unknownFields = builder.getUnknownFields(); +} +private SpaceQuotaStatus(boolean noInit) { this.unknownFields = com.google.protobuf.UnknownFieldSet.getDefaultInstance(); } + +private static final SpaceQuotaStatus defaultInstance; +public static SpaceQuotaStatus getDefaultInstance() { + return defaultInstance; +} + +public SpaceQuotaStatus getDefaultInstanceForType() { + return defaultInstance; +} + +private final com.google.protobuf.UnknownFieldSet unknownFields; +@java.lang.Override +public final com.google.protobuf.UnknownFieldSet +getUnknownFields() { + return this.unknownFields; +} +private SpaceQuotaStatus( +com.google.protobuf.CodedInputStream input, +com.google.protobuf.ExtensionRegistryLite extensionRegistry) +throws com.google.protobuf.InvalidProtocolBufferException { + initFields(); + int mutable_bitField0_ = 0; + com.google.protobuf.UnknownFieldSet.Builder unknownFields = + com.google.protobuf.UnknownFieldSet.newBuilder(); + try { +boolean done = false; +while (!done) { + int tag = input.readTag(); + switch (tag) { +case 0: + done = true; + break; +default: { + if (!parseUnknownField(input, unknownFields, + extensionRegistry, tag)) { +done = true; + } + break; +} +case 8: { + int rawValue = input.readEnum(); + org.apache.hadoop.hbase.protobuf.generated.QuotaProtos.SpaceViolationPolicy value = org.apache.hadoop.hbase.protobuf.generated.QuotaProtos.SpaceViolationPolicy.valueOf(rawValue); + if (value == null) { +unknownFields.mergeVarintField(1, rawValue); + } else { +bitField0_ |= 0x0001; +policy_ = value; + } + break; +} +case 16: { + bitField0_ |= 0x0002; + inViolation_ = input.readBool(); + break; +} + } +} + } catch (com.google.protobuf.InvalidProtocolBufferException e) { +throw e.setUnfinishedMessage(this); + } catch (java.io.IOException e) { +throw new com.google.protobuf.InvalidProtocolBufferException( +e.getMessage()).setUnfinishedMessage(this); + } finally { +this.unknownFields = unknownFields.build(); +makeExtensionsImmutable(); + } +} +public static final com.google.protobuf.Descriptors.Descriptor +getDescriptor() { + return org.apache.hadoop.hbase.protobuf.generated.QuotaProtos.internal_static_hbase_pb_SpaceQuotaStatus_descriptor; +} + +protected com.google.protobuf.GeneratedMessage.FieldAccessorTable +internalGetFieldAccessorTable() { + return
[37/49] hbase git commit: HBASE-16999 Implement master and regionserver synchronization of quota state
HBASE-16999 Implement master and regionserver synchronization of quota state * Implement the RegionServer reading violation from the quota table * Implement the Master reporting violations to the quota table * RegionServers need to track its enforced policies Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/98b4181f Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/98b4181f Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/98b4181f Branch: refs/heads/master Commit: 98b4181f43a22c678ef66b6f568f6f19209720b5 Parents: 533470f Author: Josh ElserAuthored: Fri Nov 18 15:38:19 2016 -0500 Committer: Josh Elser Committed: Mon May 22 13:41:35 2017 -0400 -- .../hadoop/hbase/quotas/QuotaTableUtil.java | 92 - .../org/apache/hadoop/hbase/master/HMaster.java | 35 +++- .../hadoop/hbase/quotas/QuotaObserverChore.java | 5 +- .../hbase/quotas/RegionServerQuotaManager.java | 200 --- .../quotas/RegionServerRpcQuotaManager.java | 200 +++ .../quotas/RegionServerSpaceQuotaManager.java | 169 .../quotas/SpaceQuotaViolationNotifier.java | 16 +- .../SpaceQuotaViolationNotifierFactory.java | 62 ++ .../SpaceQuotaViolationNotifierForTest.java | 4 + ...SpaceQuotaViolationPolicyRefresherChore.java | 154 ++ .../TableSpaceQuotaViolationNotifier.java | 55 + .../hbase/regionserver/HRegionServer.java | 21 +- .../hbase/regionserver/RSRpcServices.java | 7 +- .../regionserver/RegionServerServices.java | 12 +- .../hadoop/hbase/MockRegionServerServices.java | 10 +- .../hadoop/hbase/master/MockRegionServer.java | 10 +- .../TestQuotaObserverChoreWithMiniCluster.java | 2 + .../hadoop/hbase/quotas/TestQuotaTableUtil.java | 47 + .../hadoop/hbase/quotas/TestQuotaThrottle.java | 4 +- .../TestRegionServerSpaceQuotaManager.java | 127 ...SpaceQuotaViolationPolicyRefresherChore.java | 131 .../TestTableSpaceQuotaViolationNotifier.java | 144 + 22 files changed, 1281 insertions(+), 226 deletions(-) -- http://git-wip-us.apache.org/repos/asf/hbase/blob/98b4181f/hbase-client/src/main/java/org/apache/hadoop/hbase/quotas/QuotaTableUtil.java -- diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/quotas/QuotaTableUtil.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/quotas/QuotaTableUtil.java index 8ef4f08..b5eac48 100644 --- a/hbase-client/src/main/java/org/apache/hadoop/hbase/quotas/QuotaTableUtil.java +++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/quotas/QuotaTableUtil.java @@ -24,16 +24,20 @@ import java.io.IOException; import java.util.Collection; import java.util.List; import java.util.Map; +import java.util.Objects; import java.util.regex.Pattern; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.apache.hadoop.hbase.Cell; import org.apache.hadoop.hbase.NamespaceDescriptor; import org.apache.hadoop.hbase.TableName; import org.apache.hadoop.hbase.classification.InterfaceAudience; import org.apache.hadoop.hbase.classification.InterfaceStability; import org.apache.hadoop.hbase.client.Connection; +import org.apache.hadoop.hbase.client.Delete; import org.apache.hadoop.hbase.client.Get; +import org.apache.hadoop.hbase.client.Put; import org.apache.hadoop.hbase.client.Result; import org.apache.hadoop.hbase.client.Scan; import org.apache.hadoop.hbase.client.Table; @@ -44,7 +48,12 @@ import org.apache.hadoop.hbase.filter.QualifierFilter; import org.apache.hadoop.hbase.filter.RegexStringComparator; import org.apache.hadoop.hbase.filter.RowFilter; import org.apache.hadoop.hbase.protobuf.ProtobufMagic; +import org.apache.hadoop.hbase.shaded.com.google.protobuf.ByteString; +import org.apache.hadoop.hbase.shaded.com.google.protobuf.InvalidProtocolBufferException; +import org.apache.hadoop.hbase.shaded.com.google.protobuf.UnsafeByteOperations; +import org.apache.hadoop.hbase.shaded.protobuf.ProtobufUtil; import org.apache.hadoop.hbase.shaded.protobuf.generated.QuotaProtos.Quotas; +import org.apache.hadoop.hbase.shaded.protobuf.generated.QuotaProtos.SpaceQuota; import org.apache.hadoop.hbase.util.Bytes; import org.apache.hadoop.hbase.util.Strings; @@ -53,9 +62,8 @@ import org.apache.hadoop.hbase.util.Strings; * * ROW-KEY FAM/QUALDATA * n.namespace q:s global-quotas - * n.namespace u:dusize in bytes * t.table q:s global-quotas - * t.table u:dusize in bytes + * t.table u:vspace violation policy * u.user q:s global-quotas *
[49/49] hbase git commit: HBASE-17955 Various reviewboard improvements to space quota work
HBASE-17955 Various reviewboard improvements to space quota work Most notable change is to cache SpaceViolationPolicyEnforcement objects in the write path. When a table has no quota or there is not SpaceQuotaSnapshot for that table (yet), we want to avoid creating lots of SpaceViolationPolicyEnforcement instances, caching one instance instead. This will help reduce GC pressure. Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/d671a1db Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/d671a1db Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/d671a1db Branch: refs/heads/master Commit: d671a1dbc698160c4da6c8d9ca368832698c690f Parents: 98ace3d Author: Josh ElserAuthored: Tue Apr 18 16:43:40 2017 -0400 Committer: Josh Elser Committed: Mon May 22 13:41:36 2017 -0400 -- .../hbase/quotas/QuotaSettingsFactory.java | 10 +- .../hadoop/hbase/quotas/QuotaTableUtil.java | 7 +- .../hadoop/hbase/quotas/SpaceLimitSettings.java | 26 +- .../hadoop/hbase/quotas/SpaceQuotaSnapshot.java | 34 +- .../hbase/quotas/SpaceViolationPolicy.java | 5 +- .../hbase/master/MetricsMasterQuotaSource.java | 13 +- .../MetricsRegionServerQuotaSource.java | 10 +- .../MetricsMasterQuotaSourceFactoryImpl.java| 2 +- .../master/MetricsMasterQuotaSourceImpl.java| 10 +- .../shaded/protobuf/generated/QuotaProtos.java | 637 ++- .../generated/RegionServerStatusProtos.java | 340 +- .../src/main/protobuf/Quota.proto | 8 +- .../src/main/protobuf/RegionServerStatus.proto | 4 +- .../hbase/protobuf/generated/QuotaProtos.java | 463 +++--- hbase-protocol/src/main/protobuf/Quota.proto| 8 +- .../org/apache/hadoop/hbase/master/HMaster.java | 4 +- .../hadoop/hbase/master/MasterRpcServices.java | 9 +- .../hadoop/hbase/master/MetricsMaster.java | 13 +- .../hbase/master/MetricsMasterWrapperImpl.java | 4 +- .../hbase/quotas/ActivePolicyEnforcement.java | 54 +- .../quotas/FileSystemUtilizationChore.java | 4 +- .../hadoop/hbase/quotas/MasterQuotaManager.java | 8 +- .../hbase/quotas/MasterSpaceQuotaObserver.java | 4 +- .../quotas/NamespaceQuotaSnapshotStore.java | 2 +- .../hadoop/hbase/quotas/QuotaObserverChore.java | 62 +- .../quotas/RegionServerSpaceQuotaManager.java | 16 +- .../hbase/quotas/SpaceLimitingException.java| 6 +- .../hbase/quotas/SpaceQuotaRefresherChore.java | 2 +- .../SpaceViolationPolicyEnforcementFactory.java | 20 +- .../hbase/quotas/TableQuotaSnapshotStore.java | 2 +- .../AbstractViolationPolicyEnforcement.java | 45 +- ...LoadVerifyingViolationPolicyEnforcement.java | 50 -- .../DefaultViolationPolicyEnforcement.java | 90 +++ .../DisableTableViolationPolicyEnforcement.java | 2 +- ...ssingSnapshotViolationPolicyEnforcement.java | 63 ++ .../NoInsertsViolationPolicyEnforcement.java| 2 +- .../NoWritesViolationPolicyEnforcement.java | 2 +- .../hbase/regionserver/CompactSplitThread.java | 2 +- .../hbase/regionserver/HRegionServer.java | 4 +- .../hbase/regionserver/RSRpcServices.java | 9 +- .../resources/hbase-webapps/master/table.jsp| 8 +- .../hbase/quotas/SpaceQuotaHelperForTests.java | 66 +- .../quotas/TestActivePolicyEnforcement.java | 62 +- .../quotas/TestMasterSpaceQuotaObserver.java| 28 +- .../TestQuotaObserverChoreRegionReports.java| 6 +- .../TestQuotaObserverChoreWithMiniCluster.java | 31 +- .../hbase/quotas/TestQuotaStatusRPCs.java | 15 +- .../TestRegionServerSpaceQuotaManager.java | 4 +- .../hadoop/hbase/quotas/TestSpaceQuotas.java| 30 +- .../TestTableSpaceQuotaViolationNotifier.java | 8 +- ...kLoadCheckingViolationPolicyEnforcement.java | 2 +- .../TestRegionServerRegionSpaceUseReport.java | 4 +- 52 files changed, 1280 insertions(+), 1040 deletions(-) -- http://git-wip-us.apache.org/repos/asf/hbase/blob/d671a1db/hbase-client/src/main/java/org/apache/hadoop/hbase/quotas/QuotaSettingsFactory.java -- diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/quotas/QuotaSettingsFactory.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/quotas/QuotaSettingsFactory.java index 184277d..a99235f 100644 --- a/hbase-client/src/main/java/org/apache/hadoop/hbase/quotas/QuotaSettingsFactory.java +++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/quotas/QuotaSettingsFactory.java @@ -127,11 +127,11 @@ public class QuotaSettingsFactory { } static QuotaSettings fromSpace(TableName table, String namespace, SpaceQuota protoQuota) { -if ((null == table && null == namespace) || (null != table && null
[34/49] hbase git commit: HBASE-17002 JMX metrics and some UI additions for space quotas
http://git-wip-us.apache.org/repos/asf/hbase/blob/13af7f8a/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/protobuf/generated/QuotaProtos.java -- diff --git a/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/protobuf/generated/QuotaProtos.java b/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/protobuf/generated/QuotaProtos.java index d56def5..4577bcf 100644 --- a/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/protobuf/generated/QuotaProtos.java +++ b/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/protobuf/generated/QuotaProtos.java @@ -13024,6 +13024,3031 @@ public final class QuotaProtos { } + public interface GetQuotaStatesRequestOrBuilder extends + // @@protoc_insertion_point(interface_extends:hbase.pb.GetQuotaStatesRequest) + org.apache.hadoop.hbase.shaded.com.google.protobuf.MessageOrBuilder { + } + /** + * Protobuf type {@code hbase.pb.GetQuotaStatesRequest} + */ + public static final class GetQuotaStatesRequest extends + org.apache.hadoop.hbase.shaded.com.google.protobuf.GeneratedMessageV3 implements + // @@protoc_insertion_point(message_implements:hbase.pb.GetQuotaStatesRequest) + GetQuotaStatesRequestOrBuilder { +// Use GetQuotaStatesRequest.newBuilder() to construct. +private GetQuotaStatesRequest(org.apache.hadoop.hbase.shaded.com.google.protobuf.GeneratedMessageV3.Builder builder) { + super(builder); +} +private GetQuotaStatesRequest() { +} + +@java.lang.Override +public final org.apache.hadoop.hbase.shaded.com.google.protobuf.UnknownFieldSet +getUnknownFields() { + return this.unknownFields; +} +private GetQuotaStatesRequest( +org.apache.hadoop.hbase.shaded.com.google.protobuf.CodedInputStream input, + org.apache.hadoop.hbase.shaded.com.google.protobuf.ExtensionRegistryLite extensionRegistry) +throws org.apache.hadoop.hbase.shaded.com.google.protobuf.InvalidProtocolBufferException { + this(); + org.apache.hadoop.hbase.shaded.com.google.protobuf.UnknownFieldSet.Builder unknownFields = + org.apache.hadoop.hbase.shaded.com.google.protobuf.UnknownFieldSet.newBuilder(); + try { +boolean done = false; +while (!done) { + int tag = input.readTag(); + switch (tag) { +case 0: + done = true; + break; +default: { + if (!parseUnknownField(input, unknownFields, + extensionRegistry, tag)) { +done = true; + } + break; +} + } +} + } catch (org.apache.hadoop.hbase.shaded.com.google.protobuf.InvalidProtocolBufferException e) { +throw e.setUnfinishedMessage(this); + } catch (java.io.IOException e) { +throw new org.apache.hadoop.hbase.shaded.com.google.protobuf.InvalidProtocolBufferException( +e).setUnfinishedMessage(this); + } finally { +this.unknownFields = unknownFields.build(); +makeExtensionsImmutable(); + } +} +public static final org.apache.hadoop.hbase.shaded.com.google.protobuf.Descriptors.Descriptor +getDescriptor() { + return org.apache.hadoop.hbase.shaded.protobuf.generated.QuotaProtos.internal_static_hbase_pb_GetQuotaStatesRequest_descriptor; +} + +protected org.apache.hadoop.hbase.shaded.com.google.protobuf.GeneratedMessageV3.FieldAccessorTable +internalGetFieldAccessorTable() { + return org.apache.hadoop.hbase.shaded.protobuf.generated.QuotaProtos.internal_static_hbase_pb_GetQuotaStatesRequest_fieldAccessorTable + .ensureFieldAccessorsInitialized( + org.apache.hadoop.hbase.shaded.protobuf.generated.QuotaProtos.GetQuotaStatesRequest.class, org.apache.hadoop.hbase.shaded.protobuf.generated.QuotaProtos.GetQuotaStatesRequest.Builder.class); +} + +private byte memoizedIsInitialized = -1; +public final boolean isInitialized() { + byte isInitialized = memoizedIsInitialized; + if (isInitialized == 1) return true; + if (isInitialized == 0) return false; + + memoizedIsInitialized = 1; + return true; +} + +public void writeTo(org.apache.hadoop.hbase.shaded.com.google.protobuf.CodedOutputStream output) +throws java.io.IOException { + unknownFields.writeTo(output); +} + +public int getSerializedSize() { + int size = memoizedSize; + if (size != -1) return size; + + size = 0; + size += unknownFields.getSerializedSize(); + memoizedSize = size; + return size; +} + +private static final long serialVersionUID = 0L; +@java.lang.Override +public boolean equals(final java.lang.Object obj) { + if (obj == this) { + return true; +
[40/49] hbase git commit: HBASE-17981 Consolidate the space quota shell commands
http://git-wip-us.apache.org/repos/asf/hbase/blob/ed618da9/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/protobuf/generated/QuotaProtos.java -- diff --git a/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/protobuf/generated/QuotaProtos.java b/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/protobuf/generated/QuotaProtos.java index e8a57e9..2435564 100644 --- a/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/protobuf/generated/QuotaProtos.java +++ b/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/protobuf/generated/QuotaProtos.java @@ -2210,7 +2210,7 @@ public final class QuotaProtos { * optional .hbase.pb.TimedQuota req_num = 1; */ private org.apache.hadoop.hbase.shaded.com.google.protobuf.SingleFieldBuilderV3< - org.apache.hadoop.hbase.shaded.protobuf.generated.QuotaProtos.TimedQuota, org.apache.hadoop.hbase.shaded.protobuf.generated.QuotaProtos.TimedQuota.Builder, org.apache.hadoop.hbase.shaded.protobuf.generated.QuotaProtos.TimedQuotaOrBuilder> + org.apache.hadoop.hbase.shaded.protobuf.generated.QuotaProtos.TimedQuota, org.apache.hadoop.hbase.shaded.protobuf.generated.QuotaProtos.TimedQuota.Builder, org.apache.hadoop.hbase.shaded.protobuf.generated.QuotaProtos.TimedQuotaOrBuilder> getReqNumFieldBuilder() { if (reqNumBuilder_ == null) { reqNumBuilder_ = new org.apache.hadoop.hbase.shaded.com.google.protobuf.SingleFieldBuilderV3< @@ -2328,7 +2328,7 @@ public final class QuotaProtos { * optional .hbase.pb.TimedQuota req_size = 2; */ private org.apache.hadoop.hbase.shaded.com.google.protobuf.SingleFieldBuilderV3< - org.apache.hadoop.hbase.shaded.protobuf.generated.QuotaProtos.TimedQuota, org.apache.hadoop.hbase.shaded.protobuf.generated.QuotaProtos.TimedQuota.Builder, org.apache.hadoop.hbase.shaded.protobuf.generated.QuotaProtos.TimedQuotaOrBuilder> + org.apache.hadoop.hbase.shaded.protobuf.generated.QuotaProtos.TimedQuota, org.apache.hadoop.hbase.shaded.protobuf.generated.QuotaProtos.TimedQuota.Builder, org.apache.hadoop.hbase.shaded.protobuf.generated.QuotaProtos.TimedQuotaOrBuilder> getReqSizeFieldBuilder() { if (reqSizeBuilder_ == null) { reqSizeBuilder_ = new org.apache.hadoop.hbase.shaded.com.google.protobuf.SingleFieldBuilderV3< @@ -2446,7 +2446,7 @@ public final class QuotaProtos { * optional .hbase.pb.TimedQuota write_num = 3; */ private org.apache.hadoop.hbase.shaded.com.google.protobuf.SingleFieldBuilderV3< - org.apache.hadoop.hbase.shaded.protobuf.generated.QuotaProtos.TimedQuota, org.apache.hadoop.hbase.shaded.protobuf.generated.QuotaProtos.TimedQuota.Builder, org.apache.hadoop.hbase.shaded.protobuf.generated.QuotaProtos.TimedQuotaOrBuilder> + org.apache.hadoop.hbase.shaded.protobuf.generated.QuotaProtos.TimedQuota, org.apache.hadoop.hbase.shaded.protobuf.generated.QuotaProtos.TimedQuota.Builder, org.apache.hadoop.hbase.shaded.protobuf.generated.QuotaProtos.TimedQuotaOrBuilder> getWriteNumFieldBuilder() { if (writeNumBuilder_ == null) { writeNumBuilder_ = new org.apache.hadoop.hbase.shaded.com.google.protobuf.SingleFieldBuilderV3< @@ -2564,7 +2564,7 @@ public final class QuotaProtos { * optional .hbase.pb.TimedQuota write_size = 4; */ private org.apache.hadoop.hbase.shaded.com.google.protobuf.SingleFieldBuilderV3< - org.apache.hadoop.hbase.shaded.protobuf.generated.QuotaProtos.TimedQuota, org.apache.hadoop.hbase.shaded.protobuf.generated.QuotaProtos.TimedQuota.Builder, org.apache.hadoop.hbase.shaded.protobuf.generated.QuotaProtos.TimedQuotaOrBuilder> + org.apache.hadoop.hbase.shaded.protobuf.generated.QuotaProtos.TimedQuota, org.apache.hadoop.hbase.shaded.protobuf.generated.QuotaProtos.TimedQuota.Builder, org.apache.hadoop.hbase.shaded.protobuf.generated.QuotaProtos.TimedQuotaOrBuilder> getWriteSizeFieldBuilder() { if (writeSizeBuilder_ == null) { writeSizeBuilder_ = new org.apache.hadoop.hbase.shaded.com.google.protobuf.SingleFieldBuilderV3< @@ -2682,7 +2682,7 @@ public final class QuotaProtos { * optional .hbase.pb.TimedQuota read_num = 5; */ private org.apache.hadoop.hbase.shaded.com.google.protobuf.SingleFieldBuilderV3< - org.apache.hadoop.hbase.shaded.protobuf.generated.QuotaProtos.TimedQuota, org.apache.hadoop.hbase.shaded.protobuf.generated.QuotaProtos.TimedQuota.Builder, org.apache.hadoop.hbase.shaded.protobuf.generated.QuotaProtos.TimedQuotaOrBuilder> + org.apache.hadoop.hbase.shaded.protobuf.generated.QuotaProtos.TimedQuota, org.apache.hadoop.hbase.shaded.protobuf.generated.QuotaProtos.TimedQuota.Builder,
[44/49] hbase git commit: HBASE-17977 Enable the MasterSpaceQuotaObserver by default
HBASE-17977 Enable the MasterSpaceQuotaObserver by default It should be the normal case that HBase automatically deletes quotas for deleted tables. Switch the Observer to be on by default and add an option to instead prevent it from being added. Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/f1a99903 Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/f1a99903 Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/f1a99903 Branch: refs/heads/master Commit: f1a9990328a65c49cdd10af069f67ff5ba5147f9 Parents: b971b44 Author: Josh ElserAuthored: Tue May 2 14:58:10 2017 -0400 Committer: Josh Elser Committed: Mon May 22 13:41:36 2017 -0400 -- .../org/apache/hadoop/hbase/master/HMaster.java | 28 +++ .../hbase/quotas/MasterSpaceQuotaObserver.java | 3 + .../quotas/TestMasterSpaceQuotaObserver.java| 15 +++- .../TestMasterSpaceQuotaObserverWithMocks.java | 84 src/main/asciidoc/_chapters/ops_mgt.adoc| 11 ++- 5 files changed, 134 insertions(+), 7 deletions(-) -- http://git-wip-us.apache.org/repos/asf/hbase/blob/f1a99903/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java -- diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java index 89f085e..cd96552 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java @@ -134,6 +134,7 @@ import org.apache.hadoop.hbase.procedure2.ProcedureEvent; import org.apache.hadoop.hbase.procedure2.ProcedureExecutor; import org.apache.hadoop.hbase.procedure2.store.wal.WALProcedureStore; import org.apache.hadoop.hbase.quotas.MasterQuotaManager; +import org.apache.hadoop.hbase.quotas.MasterSpaceQuotaObserver; import org.apache.hadoop.hbase.quotas.QuotaObserverChore; import org.apache.hadoop.hbase.quotas.QuotaUtil; import org.apache.hadoop.hbase.quotas.SpaceQuotaSnapshotNotifier; @@ -794,6 +795,11 @@ public class HMaster extends HRegionServer implements MasterServices { conf, this.clusterConnection); tableCFsUpdater.update(); +// Add the Observer to delete space quotas on table deletion before starting all CPs by +// default with quota support, avoiding if user specifically asks to not load this Observer. +if (QuotaUtil.isQuotaEnabled(conf)) { + updateConfigurationForSpaceQuotaObserver(conf); +} // initialize master side coprocessors before we start handling requests status.setStatus("Initializing master coprocessors"); this.cpHost = new MasterCoprocessorHost(this, this.conf); @@ -942,6 +948,28 @@ public class HMaster extends HRegionServer implements MasterServices { zombieDetector.interrupt(); } + /** + * Adds the {@code MasterSpaceQuotaObserver} to the list of configured Master observers to + * automatically remove space quotas for a table when that table is deleted. + */ + @VisibleForTesting + public void updateConfigurationForSpaceQuotaObserver(Configuration conf) { +// We're configured to not delete quotas on table deletion, so we don't need to add the obs. +if (!conf.getBoolean( + MasterSpaceQuotaObserver.REMOVE_QUOTA_ON_TABLE_DELETE, + MasterSpaceQuotaObserver.REMOVE_QUOTA_ON_TABLE_DELETE_DEFAULT)) { + return; +} +String[] masterCoprocs = conf.getStrings(CoprocessorHost.MASTER_COPROCESSOR_CONF_KEY); +final int length = null == masterCoprocs ? 0 : masterCoprocs.length; +String[] updatedCoprocs = new String[length + 1]; +if (length > 0) { + System.arraycopy(masterCoprocs, 0, updatedCoprocs, 0, masterCoprocs.length); +} +updatedCoprocs[length] = MasterSpaceQuotaObserver.class.getName(); +conf.setStrings(CoprocessorHost.MASTER_COPROCESSOR_CONF_KEY, updatedCoprocs); + } + private void initMobCleaner() { this.expiredMobFileCleanerChore = new ExpiredMobFileCleanerChore(this); getChoreService().scheduleChore(expiredMobFileCleanerChore); http://git-wip-us.apache.org/repos/asf/hbase/blob/f1a99903/hbase-server/src/main/java/org/apache/hadoop/hbase/quotas/MasterSpaceQuotaObserver.java -- diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/quotas/MasterSpaceQuotaObserver.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/quotas/MasterSpaceQuotaObserver.java index 299ba39..7c86525 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/quotas/MasterSpaceQuotaObserver.java +++
[39/49] hbase git commit: HBASE-17981 Consolidate the space quota shell commands
http://git-wip-us.apache.org/repos/asf/hbase/blob/ed618da9/hbase-protocol-shaded/src/main/protobuf/Admin.proto -- diff --git a/hbase-protocol-shaded/src/main/protobuf/Admin.proto b/hbase-protocol-shaded/src/main/protobuf/Admin.proto index 964b035..39e73b6 100644 --- a/hbase-protocol-shaded/src/main/protobuf/Admin.proto +++ b/hbase-protocol-shaded/src/main/protobuf/Admin.proto @@ -329,8 +329,4 @@ service AdminService { /** Fetches the RegionServer's view of space quotas */ rpc GetSpaceQuotaSnapshots(GetSpaceQuotaSnapshotsRequest) returns(GetSpaceQuotaSnapshotsResponse); - - /** Fetches the RegionServer's space quota active enforcements */ - rpc GetSpaceQuotaEnforcements(GetSpaceQuotaEnforcementsRequest) -returns(GetSpaceQuotaEnforcementsResponse); } http://git-wip-us.apache.org/repos/asf/hbase/blob/ed618da9/hbase-protocol-shaded/src/main/protobuf/Quota.proto -- diff --git a/hbase-protocol-shaded/src/main/protobuf/Quota.proto b/hbase-protocol-shaded/src/main/protobuf/Quota.proto index 0d171b3..0d74435 100644 --- a/hbase-protocol-shaded/src/main/protobuf/Quota.proto +++ b/hbase-protocol-shaded/src/main/protobuf/Quota.proto @@ -136,18 +136,6 @@ message GetSpaceQuotaSnapshotsResponse { repeated TableQuotaSnapshot snapshots = 1; } -message GetSpaceQuotaEnforcementsRequest { -} - -message GetSpaceQuotaEnforcementsResponse { - // Cannot use TableName as a map key, do the repeated nested message by hand. - message TableViolationPolicy { -optional TableName table_name = 1; -optional SpaceViolationPolicy violation_policy = 2; - } - repeated TableViolationPolicy violation_policies = 1; -} - message GetQuotaStatesRequest { } http://git-wip-us.apache.org/repos/asf/hbase/blob/ed618da9/hbase-protocol/src/main/java/org/apache/hadoop/hbase/protobuf/generated/QuotaProtos.java -- diff --git a/hbase-protocol/src/main/java/org/apache/hadoop/hbase/protobuf/generated/QuotaProtos.java b/hbase-protocol/src/main/java/org/apache/hadoop/hbase/protobuf/generated/QuotaProtos.java index fad9f44..717ec73 100644 --- a/hbase-protocol/src/main/java/org/apache/hadoop/hbase/protobuf/generated/QuotaProtos.java +++ b/hbase-protocol/src/main/java/org/apache/hadoop/hbase/protobuf/generated/QuotaProtos.java @@ -982,7 +982,7 @@ public final class QuotaProtos { public final boolean isInitialized() { if (!hasTimeUnit()) { - + return false; } return true; @@ -2009,37 +2009,37 @@ public final class QuotaProtos { public final boolean isInitialized() { if (hasReqNum()) { if (!getReqNum().isInitialized()) { - + return false; } } if (hasReqSize()) { if (!getReqSize().isInitialized()) { - + return false; } } if (hasWriteNum()) { if (!getWriteNum().isInitialized()) { - + return false; } } if (hasWriteSize()) { if (!getWriteSize().isInitialized()) { - + return false; } } if (hasReadNum()) { if (!getReadNum().isInitialized()) { - + return false; } } if (hasReadSize()) { if (!getReadSize().isInitialized()) { - + return false; } } @@ -2169,7 +2169,7 @@ public final class QuotaProtos { * optional .hbase.pb.TimedQuota req_num = 1; */ private com.google.protobuf.SingleFieldBuilder< - org.apache.hadoop.hbase.protobuf.generated.QuotaProtos.TimedQuota, org.apache.hadoop.hbase.protobuf.generated.QuotaProtos.TimedQuota.Builder, org.apache.hadoop.hbase.protobuf.generated.QuotaProtos.TimedQuotaOrBuilder> + org.apache.hadoop.hbase.protobuf.generated.QuotaProtos.TimedQuota, org.apache.hadoop.hbase.protobuf.generated.QuotaProtos.TimedQuota.Builder, org.apache.hadoop.hbase.protobuf.generated.QuotaProtos.TimedQuotaOrBuilder> getReqNumFieldBuilder() { if (reqNumBuilder_ == null) { reqNumBuilder_ = new com.google.protobuf.SingleFieldBuilder< @@ -2286,7 +2286,7 @@ public final class QuotaProtos { * optional .hbase.pb.TimedQuota req_size = 2; */ private com.google.protobuf.SingleFieldBuilder< - org.apache.hadoop.hbase.protobuf.generated.QuotaProtos.TimedQuota, org.apache.hadoop.hbase.protobuf.generated.QuotaProtos.TimedQuota.Builder, org.apache.hadoop.hbase.protobuf.generated.QuotaProtos.TimedQuotaOrBuilder> + org.apache.hadoop.hbase.protobuf.generated.QuotaProtos.TimedQuota, org.apache.hadoop.hbase.protobuf.generated.QuotaProtos.TimedQuota.Builder,
[38/49] hbase git commit: HBASE-17259 API to remove space quotas on a table/namespace
HBASE-17259 API to remove space quotas on a table/namespace Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/6c9082fe Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/6c9082fe Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/6c9082fe Branch: refs/heads/master Commit: 6c9082fe162c2e940b556c9da5edc36e5501906e Parents: 34ba143 Author: Josh ElserAuthored: Wed Jan 11 12:47:06 2017 -0500 Committer: Josh Elser Committed: Mon May 22 13:41:35 2017 -0400 -- .../hbase/quotas/QuotaSettingsFactory.java | 22 +++ .../hadoop/hbase/quotas/QuotaTableUtil.java | 6 +- .../hadoop/hbase/quotas/SpaceLimitSettings.java | 44 - .../hbase/quotas/TestQuotaSettingsFactory.java | 20 +++ .../shaded/protobuf/generated/QuotaProtos.java | 157 +++--- .../src/main/protobuf/Quota.proto | 1 + .../hbase/protobuf/generated/QuotaProtos.java | 159 --- hbase-protocol/src/main/protobuf/Quota.proto| 1 + .../hadoop/hbase/quotas/MasterQuotaManager.java | 9 +- .../hadoop/hbase/quotas/TestQuotaAdmin.java | 49 +- 10 files changed, 423 insertions(+), 45 deletions(-) -- http://git-wip-us.apache.org/repos/asf/hbase/blob/6c9082fe/hbase-client/src/main/java/org/apache/hadoop/hbase/quotas/QuotaSettingsFactory.java -- diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/quotas/QuotaSettingsFactory.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/quotas/QuotaSettingsFactory.java index 7f1c180..184277d 100644 --- a/hbase-client/src/main/java/org/apache/hadoop/hbase/quotas/QuotaSettingsFactory.java +++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/quotas/QuotaSettingsFactory.java @@ -316,6 +316,17 @@ public class QuotaSettingsFactory { } /** + * Creates a {@link QuotaSettings} object to remove the FileSystem space quota for the given + * table. + * + * @param tableName The name of the table to remove the quota for. + * @return A {@link QuotaSettings} object. + */ + public static QuotaSettings removeTableSpaceLimit(TableName tableName) { +return new SpaceLimitSettings(tableName, true); + } + + /** * Creates a {@link QuotaSettings} object to limit the FileSystem space usage for the given * namespace to the given size in bytes. When the space usage is exceeded by all tables in the * namespace, the provided {@link SpaceViolationPolicy} is enacted on all tables in the namespace. @@ -329,4 +340,15 @@ public class QuotaSettingsFactory { final String namespace, long sizeLimit, final SpaceViolationPolicy violationPolicy) { return new SpaceLimitSettings(namespace, sizeLimit, violationPolicy); } + + /** + * Creates a {@link QuotaSettings} object to remove the FileSystem space quota for the given +* namespace. + * + * @param namespace The namespace to remove the quota on. + * @return A {@link QuotaSettings} object. + */ + public static QuotaSettings removeNamespaceSpaceLimit(String namespace) { +return new SpaceLimitSettings(namespace, true); + } } http://git-wip-us.apache.org/repos/asf/hbase/blob/6c9082fe/hbase-client/src/main/java/org/apache/hadoop/hbase/quotas/QuotaTableUtil.java -- diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/quotas/QuotaTableUtil.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/quotas/QuotaTableUtil.java index 66535b2..ce4cd04 100644 --- a/hbase-client/src/main/java/org/apache/hadoop/hbase/quotas/QuotaTableUtil.java +++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/quotas/QuotaTableUtil.java @@ -422,7 +422,11 @@ public class QuotaTableUtil { boolean hasSettings = false; hasSettings |= quotas.hasThrottle(); hasSettings |= quotas.hasBypassGlobals(); -hasSettings |= quotas.hasSpace(); +// Only when there is a space quota, make sure there's actually both fields provided +// Otherwise, it's a noop. +if (quotas.hasSpace()) { + hasSettings |= (quotas.getSpace().hasSoftLimit() && quotas.getSpace().hasViolationPolicy()); +} return !hasSettings; } http://git-wip-us.apache.org/repos/asf/hbase/blob/6c9082fe/hbase-client/src/main/java/org/apache/hadoop/hbase/quotas/SpaceLimitSettings.java -- diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/quotas/SpaceLimitSettings.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/quotas/SpaceLimitSettings.java index e54882e..8ff7623 100644 --- a/hbase-client/src/main/java/org/apache/hadoop/hbase/quotas/SpaceLimitSettings.java +++
[31/49] hbase git commit: HBASE-17602 Reduce some quota chore periods/delays
HBASE-17602 Reduce some quota chore periods/delays Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/8159eae7 Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/8159eae7 Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/8159eae7 Branch: refs/heads/master Commit: 8159eae7810a6bf6e13596fed9f8cb7f1aff9dfc Parents: f031b69 Author: Josh ElserAuthored: Tue Feb 7 11:21:08 2017 -0500 Committer: Josh Elser Committed: Mon May 22 13:41:35 2017 -0400 -- .../java/org/apache/hadoop/hbase/quotas/QuotaObserverChore.java | 4 ++-- .../org/apache/hadoop/hbase/quotas/SpaceQuotaRefresherChore.java | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) -- http://git-wip-us.apache.org/repos/asf/hbase/blob/8159eae7/hbase-server/src/main/java/org/apache/hadoop/hbase/quotas/QuotaObserverChore.java -- diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/quotas/QuotaObserverChore.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/quotas/QuotaObserverChore.java index b9f4592..7f894e4 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/quotas/QuotaObserverChore.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/quotas/QuotaObserverChore.java @@ -55,11 +55,11 @@ public class QuotaObserverChore extends ScheduledChore { private static final Log LOG = LogFactory.getLog(QuotaObserverChore.class); static final String QUOTA_OBSERVER_CHORE_PERIOD_KEY = "hbase.master.quotas.observer.chore.period"; - static final int QUOTA_OBSERVER_CHORE_PERIOD_DEFAULT = 1000 * 60 * 5; // 5 minutes in millis + static final int QUOTA_OBSERVER_CHORE_PERIOD_DEFAULT = 1000 * 60 * 1; // 1 minutes in millis static final String QUOTA_OBSERVER_CHORE_DELAY_KEY = "hbase.master.quotas.observer.chore.delay"; - static final long QUOTA_OBSERVER_CHORE_DELAY_DEFAULT = 1000L * 60L; // 1 minute + static final long QUOTA_OBSERVER_CHORE_DELAY_DEFAULT = 1000L * 15L; // 15 seconds in millis static final String QUOTA_OBSERVER_CHORE_TIMEUNIT_KEY = "hbase.master.quotas.observer.chore.timeunit"; http://git-wip-us.apache.org/repos/asf/hbase/blob/8159eae7/hbase-server/src/main/java/org/apache/hadoop/hbase/quotas/SpaceQuotaRefresherChore.java -- diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/quotas/SpaceQuotaRefresherChore.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/quotas/SpaceQuotaRefresherChore.java index e1a2693..8587e79 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/quotas/SpaceQuotaRefresherChore.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/quotas/SpaceQuotaRefresherChore.java @@ -44,11 +44,11 @@ public class SpaceQuotaRefresherChore extends ScheduledChore { static final String POLICY_REFRESHER_CHORE_PERIOD_KEY = "hbase.regionserver.quotas.policy.refresher.chore.period"; - static final int POLICY_REFRESHER_CHORE_PERIOD_DEFAULT = 1000 * 60 * 5; // 5 minutes in millis + static final int POLICY_REFRESHER_CHORE_PERIOD_DEFAULT = 1000 * 60 * 1; // 1 minute in millis static final String POLICY_REFRESHER_CHORE_DELAY_KEY = "hbase.regionserver.quotas.policy.refresher.chore.delay"; - static final long POLICY_REFRESHER_CHORE_DELAY_DEFAULT = 1000L * 60L; // 1 minute + static final long POLICY_REFRESHER_CHORE_DELAY_DEFAULT = 1000L * 15L; // 15 seconds in millis static final String POLICY_REFRESHER_CHORE_TIMEUNIT_KEY = "hbase.regionserver.quotas.policy.refresher.chore.timeunit";
[26/49] hbase git commit: HBASE-17001 Enforce quota violation policies in the RegionServer
http://git-wip-us.apache.org/repos/asf/hbase/blob/34ba143f/hbase-server/src/main/java/org/apache/hadoop/hbase/quotas/QuotaObserverChore.java -- diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/quotas/QuotaObserverChore.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/quotas/QuotaObserverChore.java index 8b127d9..973ac8c 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/quotas/QuotaObserverChore.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/quotas/QuotaObserverChore.java @@ -37,9 +37,8 @@ import org.apache.hadoop.hbase.classification.InterfaceAudience; import org.apache.hadoop.hbase.client.Connection; import org.apache.hadoop.hbase.client.Scan; import org.apache.hadoop.hbase.master.HMaster; -import org.apache.hadoop.hbase.quotas.QuotaViolationStore.ViolationState; -import org.apache.hadoop.hbase.shaded.protobuf.ProtobufUtil; -import org.apache.hadoop.hbase.shaded.protobuf.generated.QuotaProtos.Quotas; +import org.apache.hadoop.hbase.quotas.SpaceQuotaSnapshot; +import org.apache.hadoop.hbase.quotas.SpaceQuotaSnapshot.SpaceQuotaStatus; import org.apache.hadoop.hbase.shaded.protobuf.generated.QuotaProtos.SpaceQuota; import com.google.common.annotations.VisibleForTesting; @@ -54,51 +53,51 @@ import com.google.common.collect.Multimap; @InterfaceAudience.Private public class QuotaObserverChore extends ScheduledChore { private static final Log LOG = LogFactory.getLog(QuotaObserverChore.class); - static final String VIOLATION_OBSERVER_CHORE_PERIOD_KEY = - "hbase.master.quotas.violation.observer.chore.period"; - static final int VIOLATION_OBSERVER_CHORE_PERIOD_DEFAULT = 1000 * 60 * 5; // 5 minutes in millis + static final String QUOTA_OBSERVER_CHORE_PERIOD_KEY = + "hbase.master.quotas.observer.chore.period"; + static final int QUOTA_OBSERVER_CHORE_PERIOD_DEFAULT = 1000 * 60 * 5; // 5 minutes in millis - static final String VIOLATION_OBSERVER_CHORE_DELAY_KEY = - "hbase.master.quotas.violation.observer.chore.delay"; - static final long VIOLATION_OBSERVER_CHORE_DELAY_DEFAULT = 1000L * 60L; // 1 minute + static final String QUOTA_OBSERVER_CHORE_DELAY_KEY = + "hbase.master.quotas.observer.chore.delay"; + static final long QUOTA_OBSERVER_CHORE_DELAY_DEFAULT = 1000L * 60L; // 1 minute - static final String VIOLATION_OBSERVER_CHORE_TIMEUNIT_KEY = - "hbase.master.quotas.violation.observer.chore.timeunit"; - static final String VIOLATION_OBSERVER_CHORE_TIMEUNIT_DEFAULT = TimeUnit.MILLISECONDS.name(); + static final String QUOTA_OBSERVER_CHORE_TIMEUNIT_KEY = + "hbase.master.quotas.observer.chore.timeunit"; + static final String QUOTA_OBSERVER_CHORE_TIMEUNIT_DEFAULT = TimeUnit.MILLISECONDS.name(); - static final String VIOLATION_OBSERVER_CHORE_REPORT_PERCENT_KEY = - "hbase.master.quotas.violation.observer.report.percent"; - static final double VIOLATION_OBSERVER_CHORE_REPORT_PERCENT_DEFAULT= 0.95; + static final String QUOTA_OBSERVER_CHORE_REPORT_PERCENT_KEY = + "hbase.master.quotas.observer.report.percent"; + static final double QUOTA_OBSERVER_CHORE_REPORT_PERCENT_DEFAULT= 0.95; private final Connection conn; private final Configuration conf; private final MasterQuotaManager quotaManager; /* - * Callback that changes in quota violation are passed to. + * Callback that changes in quota snapshots are passed to. */ - private final SpaceQuotaViolationNotifier violationNotifier; + private final SpaceQuotaSnapshotNotifier snapshotNotifier; /* - * Preserves the state of quota violations for tables and namespaces + * Preserves the state of quota snapshots for tables and namespaces */ - private final MaptableQuotaViolationStates; - private final Map namespaceQuotaViolationStates; + private final Map tableQuotaSnapshots; + private final Map namespaceQuotaSnapshots; /* - * Encapsulates logic for moving tables/namespaces into or out of quota violation + * Encapsulates logic for tracking the state of a table/namespace WRT space quotas */ - private QuotaViolationStore tableViolationStore; - private QuotaViolationStore namespaceViolationStore; + private QuotaSnapshotStore tableSnapshotStore; + private QuotaSnapshotStore namespaceSnapshotStore; public QuotaObserverChore(HMaster master) { this( master.getConnection(), master.getConfiguration(), -master.getSpaceQuotaViolationNotifier(), master.getMasterQuotaManager(), +master.getSpaceQuotaSnapshotNotifier(), master.getMasterQuotaManager(), master); } QuotaObserverChore( - Connection conn, Configuration conf, SpaceQuotaViolationNotifier violationNotifier, + Connection conn, Configuration conf, SpaceQuotaSnapshotNotifier snapshotNotifier,
[36/49] hbase git commit: HBASE-16999 Implement master and regionserver synchronization of quota state
http://git-wip-us.apache.org/repos/asf/hbase/blob/98b4181f/hbase-server/src/test/java/org/apache/hadoop/hbase/quotas/TestTableSpaceQuotaViolationNotifier.java -- diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/quotas/TestTableSpaceQuotaViolationNotifier.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/quotas/TestTableSpaceQuotaViolationNotifier.java new file mode 100644 index 000..4a7000c --- /dev/null +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/quotas/TestTableSpaceQuotaViolationNotifier.java @@ -0,0 +1,144 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to you under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.hadoop.hbase.quotas; + +import static org.mockito.Matchers.argThat; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; + +import java.util.Arrays; +import java.util.List; +import java.util.Map.Entry; +import java.util.NavigableMap; +import java.util.Objects; + +import org.apache.hadoop.hbase.Cell; +import org.apache.hadoop.hbase.TableName; +import org.apache.hadoop.hbase.client.Connection; +import org.apache.hadoop.hbase.client.Delete; +import org.apache.hadoop.hbase.client.Mutation; +import org.apache.hadoop.hbase.client.Put; +import org.apache.hadoop.hbase.client.Table; +import org.apache.hadoop.hbase.shaded.protobuf.ProtobufUtil; +import org.apache.hadoop.hbase.shaded.protobuf.generated.QuotaProtos.SpaceQuota; +import org.apache.hadoop.hbase.testclassification.SmallTests; +import org.apache.hadoop.hbase.util.Bytes; +import org.junit.Before; +import org.junit.Test; +import org.junit.experimental.categories.Category; +import org.mockito.ArgumentMatcher; + +/** + * Test case for {@link TableSpaceQuotaViolationNotifier}. + */ +@Category(SmallTests.class) +public class TestTableSpaceQuotaViolationNotifier { + + private TableSpaceQuotaViolationNotifier notifier; + private Connection conn; + + @Before + public void setup() throws Exception { +notifier = new TableSpaceQuotaViolationNotifier(); +conn = mock(Connection.class); +notifier.initialize(conn); + } + + @Test + public void testToViolation() throws Exception { +final TableName tn = TableName.valueOf("inviolation"); +final SpaceViolationPolicy policy = SpaceViolationPolicy.NO_INSERTS; +final Table quotaTable = mock(Table.class); + when(conn.getTable(QuotaTableUtil.QUOTA_TABLE_NAME)).thenReturn(quotaTable); + +final Put expectedPut = new Put(Bytes.toBytes("t." + tn.getNameAsString())); +final SpaceQuota protoQuota = SpaceQuota.newBuilder() +.setViolationPolicy(ProtobufUtil.toProtoViolationPolicy(policy)) +.build(); +expectedPut.addColumn(Bytes.toBytes("u"), Bytes.toBytes("v"), protoQuota.toByteArray()); + +notifier.transitionTableToViolation(tn, policy); + +verify(quotaTable).put(argThat(new SingleCellPutMatcher(expectedPut))); + } + + @Test + public void testToObservance() throws Exception { +final TableName tn = TableName.valueOf("notinviolation"); +final Table quotaTable = mock(Table.class); + when(conn.getTable(QuotaTableUtil.QUOTA_TABLE_NAME)).thenReturn(quotaTable); + +final Delete expectedDelete = new Delete(Bytes.toBytes("t." + tn.getNameAsString())); +expectedDelete.addColumn(Bytes.toBytes("u"), Bytes.toBytes("v")); + +notifier.transitionTableToObservance(tn); + +verify(quotaTable).delete(argThat(new SingleCellDeleteMatcher(expectedDelete))); + } + + /** + * Parameterized for Puts. + */ + private static class SingleCellPutMatcher extends SingleCellMutationMatcher { +private SingleCellPutMatcher(Put expected) { + super(expected); +} + } + + /** + * Parameterized for Deletes. + */ + private static class SingleCellDeleteMatcher extends SingleCellMutationMatcher { +private SingleCellDeleteMatcher(Delete expected) { + super(expected); +} + } + + /** + * Quick hack to verify a Mutation with one column. + */ + private static class SingleCellMutationMatcher extends ArgumentMatcher { +private final Mutation expected; + +private SingleCellMutationMatcher(Mutation expected) { +
[06/49] hbase git commit: HBASE-16995 Build client Java API and client protobuf messages (Josh Elser)
http://git-wip-us.apache.org/repos/asf/hbase/blob/4dfafd6e/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/protobuf/generated/QuotaProtos.java -- diff --git a/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/protobuf/generated/QuotaProtos.java b/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/protobuf/generated/QuotaProtos.java index 01ba8f6..e3c6bfd 100644 --- a/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/protobuf/generated/QuotaProtos.java +++ b/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/protobuf/generated/QuotaProtos.java @@ -239,12 +239,20 @@ public final class QuotaProtos { * THROTTLE = 1; */ THROTTLE(1), +/** + * SPACE = 2; + */ +SPACE(2), ; /** * THROTTLE = 1; */ public static final int THROTTLE_VALUE = 1; +/** + * SPACE = 2; + */ +public static final int SPACE_VALUE = 2; public final int getNumber() { @@ -262,6 +270,7 @@ public final class QuotaProtos { public static QuotaType forNumber(int value) { switch (value) { case 1: return THROTTLE; +case 2: return SPACE; default: return null; } } @@ -311,6 +320,150 @@ public final class QuotaProtos { // @@protoc_insertion_point(enum_scope:hbase.pb.QuotaType) } + /** + * + * Defines what action should be taken when the SpaceQuota is violated + * + * + * Protobuf enum {@code hbase.pb.SpaceViolationPolicy} + */ + public enum SpaceViolationPolicy + implements org.apache.hadoop.hbase.shaded.com.google.protobuf.ProtocolMessageEnum { +/** + * + * Disable the table(s) + * + * + * DISABLE = 1; + */ +DISABLE(1), +/** + * + * No writes, bulk-loads, or compactions + * + * + * NO_WRITES_COMPACTIONS = 2; + */ +NO_WRITES_COMPACTIONS(2), +/** + * + * No writes or bulk-loads + * + * + * NO_WRITES = 3; + */ +NO_WRITES(3), +/** + * + * No puts or bulk-loads, but deletes are allowed + * + * + * NO_INSERTS = 4; + */ +NO_INSERTS(4), +; + +/** + * + * Disable the table(s) + * + * + * DISABLE = 1; + */ +public static final int DISABLE_VALUE = 1; +/** + * + * No writes, bulk-loads, or compactions + * + * + * NO_WRITES_COMPACTIONS = 2; + */ +public static final int NO_WRITES_COMPACTIONS_VALUE = 2; +/** + * + * No writes or bulk-loads + * + * + * NO_WRITES = 3; + */ +public static final int NO_WRITES_VALUE = 3; +/** + * + * No puts or bulk-loads, but deletes are allowed + * + * + * NO_INSERTS = 4; + */ +public static final int NO_INSERTS_VALUE = 4; + + +public final int getNumber() { + return value; +} + +/** + * @deprecated Use {@link #forNumber(int)} instead. + */ +@java.lang.Deprecated +public static SpaceViolationPolicy valueOf(int value) { + return forNumber(value); +} + +public static SpaceViolationPolicy forNumber(int value) { + switch (value) { +case 1: return DISABLE; +case 2: return NO_WRITES_COMPACTIONS; +case 3: return NO_WRITES; +case 4: return NO_INSERTS; +default: return null; + } +} + +public static org.apache.hadoop.hbase.shaded.com.google.protobuf.Internal.EnumLiteMap +internalGetValueMap() { + return internalValueMap; +} +private static final org.apache.hadoop.hbase.shaded.com.google.protobuf.Internal.EnumLiteMap< +SpaceViolationPolicy> internalValueMap = + new org.apache.hadoop.hbase.shaded.com.google.protobuf.Internal.EnumLiteMap() { +public SpaceViolationPolicy findValueByNumber(int number) { + return SpaceViolationPolicy.forNumber(number); +} + }; + +public final org.apache.hadoop.hbase.shaded.com.google.protobuf.Descriptors.EnumValueDescriptor +getValueDescriptor() { + return getDescriptor().getValues().get(ordinal()); +} +public final org.apache.hadoop.hbase.shaded.com.google.protobuf.Descriptors.EnumDescriptor +getDescriptorForType() { + return getDescriptor(); +} +public static final org.apache.hadoop.hbase.shaded.com.google.protobuf.Descriptors.EnumDescriptor +getDescriptor() { + return org.apache.hadoop.hbase.shaded.protobuf.generated.QuotaProtos.getDescriptor().getEnumTypes().get(3); +} + +private static final SpaceViolationPolicy[] VALUES = values(); + +public static SpaceViolationPolicy valueOf( + org.apache.hadoop.hbase.shaded.com.google.protobuf.Descriptors.EnumValueDescriptor desc) { + if (desc.getType() != getDescriptor()) { +throw new
[45/49] hbase git commit: HBASE-17976 Remove stability annotation from public audience class
HBASE-17976 Remove stability annotation from public audience class Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/13b9a1ed Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/13b9a1ed Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/13b9a1ed Branch: refs/heads/master Commit: 13b9a1ed01d8115863e09fd09d4628281d1dbb90 Parents: d671a1d Author: Josh ElserAuthored: Fri Apr 28 16:51:17 2017 -0400 Committer: Josh Elser Committed: Mon May 22 13:41:36 2017 -0400 -- .../java/org/apache/hadoop/hbase/quotas/SpaceViolationPolicy.java | 2 -- 1 file changed, 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/hbase/blob/13b9a1ed/hbase-client/src/main/java/org/apache/hadoop/hbase/quotas/SpaceViolationPolicy.java -- diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/quotas/SpaceViolationPolicy.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/quotas/SpaceViolationPolicy.java index 34d2542..023e855 100644 --- a/hbase-client/src/main/java/org/apache/hadoop/hbase/quotas/SpaceViolationPolicy.java +++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/quotas/SpaceViolationPolicy.java @@ -17,7 +17,6 @@ package org.apache.hadoop.hbase.quotas; import org.apache.hadoop.hbase.classification.InterfaceAudience; -import org.apache.hadoop.hbase.classification.InterfaceStability; /** * Enumeration that represents the action HBase will take when a space quota is violated. @@ -26,7 +25,6 @@ import org.apache.hadoop.hbase.classification.InterfaceStability; * namespace, it is treated as a collection of tables (all tables are subject to the same policy). */ @InterfaceAudience.Public -@InterfaceStability.Evolving public enum SpaceViolationPolicy { /** * Disables the table(s).
[46/49] hbase git commit: HBASE-17955 Various reviewboard improvements to space quota work
http://git-wip-us.apache.org/repos/asf/hbase/blob/d671a1db/hbase-server/src/main/java/org/apache/hadoop/hbase/quotas/ActivePolicyEnforcement.java -- diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/quotas/ActivePolicyEnforcement.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/quotas/ActivePolicyEnforcement.java index a313fa1..c558b26 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/quotas/ActivePolicyEnforcement.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/quotas/ActivePolicyEnforcement.java @@ -17,6 +17,7 @@ package org.apache.hadoop.hbase.quotas; import java.util.Collections; +import java.util.HashMap; import java.util.Map; import java.util.Objects; @@ -28,7 +29,12 @@ import org.apache.hadoop.hbase.regionserver.RegionServerServices; /** * A class to ease dealing with tables that have and do not have violation policies - * being enforced in a uniform manner. Immutable. + * being enforced. This class is immutable, expect for {@code locallyCachedPolicies}. + * + * The {@code locallyCachedPolicies} are mutable given the current {@code activePolicies} + * and {@code snapshots}. It is expected that when a new instance of this class is + * instantiated, we also want to invalidate those previously cached policies (as they + * may now be invalidate if we received new quota usage information). */ @InterfaceAudience.Private @InterfaceStability.Evolving @@ -36,12 +42,23 @@ public class ActivePolicyEnforcement { private final MapactivePolicies; private final Map snapshots; private final RegionServerServices rss; + private final SpaceViolationPolicyEnforcementFactory factory; + private final Map locallyCachedPolicies; public ActivePolicyEnforcement(Map activePolicies, Map snapshots, RegionServerServices rss) { +this(activePolicies, snapshots, rss, SpaceViolationPolicyEnforcementFactory.getInstance()); + } + + public ActivePolicyEnforcement(Map activePolicies, + Map snapshots, RegionServerServices rss, + SpaceViolationPolicyEnforcementFactory factory) { this.activePolicies = activePolicies; this.snapshots = snapshots; this.rss = rss; +this.factory = factory; +// Mutable! +this.locallyCachedPolicies = new HashMap<>(); } /** @@ -65,16 +82,25 @@ public class ActivePolicyEnforcement { */ public SpaceViolationPolicyEnforcement getPolicyEnforcement(TableName tableName) { SpaceViolationPolicyEnforcement policy = activePolicies.get(Objects.requireNonNull(tableName)); -if (null == policy) { - synchronized (activePolicies) { -// If we've never seen a snapshot, assume no use, and infinite limit -SpaceQuotaSnapshot snapshot = snapshots.get(tableName); -if (null == snapshot) { - snapshot = SpaceQuotaSnapshot.getNoSuchSnapshot(); +if (policy == null) { + synchronized (locallyCachedPolicies) { +// When we don't have an policy enforcement for the table, there could be one of two cases: +// 1) The table has no quota defined +// 2) The table is not in violation of its quota +// In both of these cases, we want to make sure that access remains fast and we minimize +// object creation. We can accomplish this by locally caching policies instead of creating +// a new instance of the policy each time. +policy = locallyCachedPolicies.get(tableName); +// We have already created/cached the enforcement, use it again. `activePolicies` and +// `snapshots` are immutable, thus this policy is valid for the lifetime of `this`. +if (policy != null) { + return policy; } -// Create the default policy and cache it -return SpaceViolationPolicyEnforcementFactory.getInstance().createWithoutViolation( -rss, tableName, snapshot); +// Create a PolicyEnforcement for this table and snapshot. The snapshot may be null +// which is OK. +policy = factory.createWithoutViolation(rss, tableName, snapshots.get(tableName)); +// Cache the policy we created +locallyCachedPolicies.put(tableName, policy); } } return policy; @@ -87,6 +113,14 @@ public class ActivePolicyEnforcement { return Collections.unmodifiableMap(activePolicies); } + /** + * Returns an unmodifiable version of the policy enforcements that were cached because they are + * not in violation of their quota. + */ + Map getLocallyCachedPolicies() { +return Collections.unmodifiableMap(locallyCachedPolicies); +
[08/49] hbase git commit: HBASE-16995 Build client Java API and client protobuf messages (Josh Elser)
HBASE-16995 Build client Java API and client protobuf messages (Josh Elser) Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/4dfafd6e Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/4dfafd6e Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/4dfafd6e Branch: refs/heads/master Commit: 4dfafd6e508e2e32c6a44e1957065abe2dd65fea Parents: 56cbc68 Author: tedyuAuthored: Thu Nov 17 10:19:52 2016 -0800 Committer: Josh Elser Committed: Mon May 22 13:41:35 2017 -0400 -- .../hbase/quotas/QuotaSettingsFactory.java | 47 + .../apache/hadoop/hbase/quotas/QuotaType.java |1 + .../hadoop/hbase/quotas/SpaceLimitSettings.java | 166 ++ .../hbase/quotas/SpaceViolationPolicy.java | 44 + .../hbase/shaded/protobuf/ProtobufUtil.java | 51 + .../hbase/quotas/TestQuotaSettingsFactory.java | 148 ++ .../hbase/quotas/TestSpaceLimitSettings.java| 119 ++ .../shaded/protobuf/generated/MasterProtos.java | 1310 +++-- .../shaded/protobuf/generated/QuotaProtos.java | 1739 +- .../src/main/protobuf/Master.proto |2 + .../src/main/protobuf/Quota.proto | 21 + .../hbase/protobuf/generated/QuotaProtos.java | 1682 - hbase-protocol/src/main/protobuf/Quota.proto| 21 + 13 files changed, 4654 insertions(+), 697 deletions(-) -- http://git-wip-us.apache.org/repos/asf/hbase/blob/4dfafd6e/hbase-client/src/main/java/org/apache/hadoop/hbase/quotas/QuotaSettingsFactory.java -- diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/quotas/QuotaSettingsFactory.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/quotas/QuotaSettingsFactory.java index 3622a32..8512e39 100644 --- a/hbase-client/src/main/java/org/apache/hadoop/hbase/quotas/QuotaSettingsFactory.java +++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/quotas/QuotaSettingsFactory.java @@ -27,6 +27,7 @@ import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.SetQuotaRe import org.apache.hadoop.hbase.shaded.protobuf.ProtobufUtil; import org.apache.hadoop.hbase.shaded.protobuf.generated.QuotaProtos; import org.apache.hadoop.hbase.shaded.protobuf.generated.QuotaProtos.Quotas; +import org.apache.hadoop.hbase.shaded.protobuf.generated.QuotaProtos.SpaceQuota; @InterfaceAudience.Public public class QuotaSettingsFactory { @@ -89,6 +90,9 @@ public class QuotaSettingsFactory { if (quotas.getBypassGlobals() == true) { settings.add(new QuotaGlobalsSettingsBypass(userName, tableName, namespace, true)); } +if (quotas.hasSpace()) { + settings.add(fromSpace(tableName, namespace, quotas.getSpace())); +} return settings; } @@ -122,6 +126,18 @@ public class QuotaSettingsFactory { return settings; } + static QuotaSettings fromSpace(TableName table, String namespace, SpaceQuota protoQuota) { +if ((null == table && null == namespace) || (null != table && null != namespace)) { + throw new IllegalArgumentException("Can only construct SpaceLimitSettings for a table or namespace."); +} +if (null != table) { + return SpaceLimitSettings.fromSpaceQuota(table, protoQuota); +} else { + // namespace must be non-null + return SpaceLimitSettings.fromSpaceQuota(namespace, protoQuota); +} + } + /* == * RPC Throttle */ @@ -278,4 +294,35 @@ public class QuotaSettingsFactory { public static QuotaSettings bypassGlobals(final String userName, final boolean bypassGlobals) { return new QuotaGlobalsSettingsBypass(userName, null, null, bypassGlobals); } + + /* == + * FileSystem Space Settings + */ + + /** + * Creates a {@link QuotaSettings} object to limit the FileSystem space usage for the given table to the given size in bytes. + * When the space usage is exceeded by the table, the provided {@link SpaceViolationPolicy} is enacted on the table. + * + * @param tableName The name of the table on which the quota should be applied. + * @param sizeLimit The limit of a table's size in bytes. + * @param violationPolicy The action to take when the quota is exceeded. + * @return An {@link QuotaSettings} object. + */ + public static QuotaSettings limitTableSpace(final TableName tableName, long sizeLimit, final SpaceViolationPolicy violationPolicy) { +return new SpaceLimitSettings(tableName, sizeLimit, violationPolicy); + } + + /** + * Creates a {@link QuotaSettings} object to limit the FileSystem space usage for the given namespace to the given size in bytes.
[28/49] hbase git commit: HBASE-17001 Enforce quota violation policies in the RegionServer
HBASE-17001 Enforce quota violation policies in the RegionServer The nuts-and-bolts of filesystem quotas. The Master must inform RegionServers of the violation of a quota by a table. The RegionServer must apply the violation policy as configured. Need to ensure that the proper interfaces exist to satisfy all necessary policies. This required a massive rewrite of the internal tracking by the general space quota feature. Instead of tracking "violations", we need to start tracking "usage". This allows us to make the decision at the RegionServer level as to when the files in a bulk load request should be accept or rejected which ultimately lets us avoid bulk loads dramatically exceeding a configured space quota. Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/34ba143f Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/34ba143f Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/34ba143f Branch: refs/heads/master Commit: 34ba143fc8f484134e229eb3cfff0bd3a1e311d1 Parents: 98b4181 Author: Josh ElserAuthored: Thu Dec 15 13:27:56 2016 -0500 Committer: Josh Elser Committed: Mon May 22 13:41:35 2017 -0400 -- .../hbase/quotas/QuotaExceededException.java|4 + .../hadoop/hbase/quotas/QuotaTableUtil.java | 47 +- .../hadoop/hbase/quotas/SpaceQuotaSnapshot.java | 192 +++ .../shaded/protobuf/generated/QuotaProtos.java | 1384 +- .../src/main/protobuf/Quota.proto | 15 + .../hbase/protobuf/generated/QuotaProtos.java | 1324 - hbase-protocol/src/main/protobuf/Quota.proto| 15 + .../org/apache/hadoop/hbase/master/HMaster.java | 29 +- .../hbase/quotas/ActivePolicyEnforcement.java | 86 ++ .../quotas/NamespaceQuotaSnapshotStore.java | 127 ++ .../quotas/NamespaceQuotaViolationStore.java| 127 -- .../hadoop/hbase/quotas/QuotaObserverChore.java | 344 +++-- .../hadoop/hbase/quotas/QuotaSnapshotStore.java | 96 ++ .../hbase/quotas/QuotaViolationStore.java | 89 -- .../quotas/RegionServerSpaceQuotaManager.java | 179 ++- .../hbase/quotas/SpaceLimitingException.java| 95 ++ .../hbase/quotas/SpaceQuotaRefresherChore.java | 225 +++ .../quotas/SpaceQuotaSnapshotNotifier.java | 45 + .../SpaceQuotaSnapshotNotifierFactory.java | 62 + .../quotas/SpaceQuotaViolationNotifier.java | 54 - .../SpaceQuotaViolationNotifierFactory.java | 62 - .../SpaceQuotaViolationNotifierForTest.java | 54 - ...SpaceQuotaViolationPolicyRefresherChore.java | 154 -- .../quotas/SpaceViolationPolicyEnforcement.java | 91 ++ .../SpaceViolationPolicyEnforcementFactory.java | 95 ++ .../hbase/quotas/TableQuotaSnapshotStore.java | 127 ++ .../hbase/quotas/TableQuotaViolationStore.java | 127 -- .../quotas/TableSpaceQuotaSnapshotNotifier.java | 52 + .../TableSpaceQuotaViolationNotifier.java | 55 - .../AbstractViolationPolicyEnforcement.java | 118 ++ ...LoadVerifyingViolationPolicyEnforcement.java | 50 + .../DisableTableViolationPolicyEnforcement.java | 80 + .../NoInsertsViolationPolicyEnforcement.java| 55 + ...esCompactionsViolationPolicyEnforcement.java | 64 + .../NoWritesViolationPolicyEnforcement.java | 54 + .../hbase/regionserver/CompactSplitThread.java | 12 + .../hbase/regionserver/RSRpcServices.java | 89 +- .../hbase/quotas/SpaceQuotaHelperForTests.java | 228 +++ .../SpaceQuotaSnapshotNotifierForTest.java | 55 + .../quotas/TestActivePolicyEnforcement.java | 74 + .../quotas/TestFileSystemUtilizationChore.java |3 +- .../TestNamespaceQuotaViolationStore.java | 16 +- .../hbase/quotas/TestQuotaObserverChore.java| 30 +- .../TestQuotaObserverChoreWithMiniCluster.java | 351 ++--- .../hadoop/hbase/quotas/TestQuotaTableUtil.java | 34 +- .../TestRegionServerSpaceQuotaManager.java | 174 ++- ...SpaceQuotaViolationPolicyRefresherChore.java | 193 ++- .../hadoop/hbase/quotas/TestSpaceQuotas.java| 452 ++ .../quotas/TestTableQuotaViolationStore.java| 22 +- .../TestTableSpaceQuotaViolationNotifier.java | 48 +- .../hbase/quotas/TestTablesWithQuotas.java |8 +- .../BaseViolationPolicyEnforcement.java | 31 + ...kLoadCheckingViolationPolicyEnforcement.java | 142 ++ ...tDisableTableViolationPolicyEnforcement.java | 59 + ...TestNoInsertsViolationPolicyEnforcement.java | 57 + ...esCompactionsViolationPolicyEnforcement.java | 58 + .../TestNoWritesViolationPolicyEnforcement.java | 57 + 57 files changed, 6490 insertions(+), 1480 deletions(-) -- http://git-wip-us.apache.org/repos/asf/hbase/blob/34ba143f/hbase-client/src/main/java/org/apache/hadoop/hbase/quotas/QuotaExceededException.java
[10/49] hbase git commit: HBASE-16996 Implement storage/retrieval of filesystem-use quotas into quota table (Josh Elser)
HBASE-16996 Implement storage/retrieval of filesystem-use quotas into quota table (Josh Elser) Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/f74e051b Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/f74e051b Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/f74e051b Branch: refs/heads/master Commit: f74e051bce94200ae99c7d97c913c1bef658f53c Parents: c517216 Author: tedyuAuthored: Sat Dec 3 14:30:48 2016 -0800 Committer: Josh Elser Committed: Mon May 22 13:41:35 2017 -0400 -- .../hadoop/hbase/quotas/QuotaTableUtil.java | 13 +- .../hadoop/hbase/quotas/MasterQuotaManager.java | 30 + .../hadoop/hbase/quotas/TestQuotaAdmin.java | 125 ++- 3 files changed, 165 insertions(+), 3 deletions(-) -- http://git-wip-us.apache.org/repos/asf/hbase/blob/f74e051b/hbase-client/src/main/java/org/apache/hadoop/hbase/quotas/QuotaTableUtil.java -- diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/quotas/QuotaTableUtil.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/quotas/QuotaTableUtil.java index c44090f..8ef4f08 100644 --- a/hbase-client/src/main/java/org/apache/hadoop/hbase/quotas/QuotaTableUtil.java +++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/quotas/QuotaTableUtil.java @@ -53,7 +53,9 @@ import org.apache.hadoop.hbase.util.Strings; * * ROW-KEY FAM/QUALDATA * n.namespace q:s global-quotas + * n.namespace u:dusize in bytes * t.table q:s global-quotas + * t.table u:dusize in bytes * u.user q:s global-quotas * u.user q:s.table table-quotas * u.user q:s.ns: namespace-quotas @@ -72,6 +74,7 @@ public class QuotaTableUtil { protected static final byte[] QUOTA_FAMILY_USAGE = Bytes.toBytes("u"); protected static final byte[] QUOTA_QUALIFIER_SETTINGS = Bytes.toBytes("s"); protected static final byte[] QUOTA_QUALIFIER_SETTINGS_PREFIX = Bytes.toBytes("s."); + protected static final byte[] QUOTA_QUALIFIER_DISKUSAGE = Bytes.toBytes("du"); protected static final byte[] QUOTA_USER_ROW_KEY_PREFIX = Bytes.toBytes("u."); protected static final byte[] QUOTA_TABLE_ROW_KEY_PREFIX = Bytes.toBytes("t."); protected static final byte[] QUOTA_NAMESPACE_ROW_KEY_PREFIX = Bytes.toBytes("n."); @@ -330,11 +333,16 @@ public class QuotaTableUtil { * Quotas protobuf helpers */ protected static Quotas quotasFromData(final byte[] data) throws IOException { +return quotasFromData(data, 0, data.length); + } + + protected static Quotas quotasFromData( + final byte[] data, int offset, int length) throws IOException { int magicLen = ProtobufMagic.lengthOfPBMagic(); -if (!ProtobufMagic.isPBMagicPrefix(data, 0, magicLen)) { +if (!ProtobufMagic.isPBMagicPrefix(data, offset, magicLen)) { throw new IOException("Missing pb magic prefix"); } -return Quotas.parseFrom(new ByteArrayInputStream(data, magicLen, data.length - magicLen)); +return Quotas.parseFrom(new ByteArrayInputStream(data, offset + magicLen, length - magicLen)); } protected static byte[] quotasToData(final Quotas data) throws IOException { @@ -348,6 +356,7 @@ public class QuotaTableUtil { boolean hasSettings = false; hasSettings |= quotas.hasThrottle(); hasSettings |= quotas.hasBypassGlobals(); +hasSettings |= quotas.hasSpace(); return !hasSettings; } http://git-wip-us.apache.org/repos/asf/hbase/blob/f74e051b/hbase-server/src/main/java/org/apache/hadoop/hbase/quotas/MasterQuotaManager.java -- diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/quotas/MasterQuotaManager.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/quotas/MasterQuotaManager.java index 5dab2e3..1469268 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/quotas/MasterQuotaManager.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/quotas/MasterQuotaManager.java @@ -37,6 +37,8 @@ import org.apache.hadoop.hbase.shaded.protobuf.ProtobufUtil; import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.SetQuotaRequest; import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.SetQuotaResponse; import org.apache.hadoop.hbase.shaded.protobuf.generated.QuotaProtos.Quotas; +import org.apache.hadoop.hbase.shaded.protobuf.generated.QuotaProtos.SpaceLimitRequest; +import org.apache.hadoop.hbase.shaded.protobuf.generated.QuotaProtos.SpaceQuota; import org.apache.hadoop.hbase.shaded.protobuf.generated.QuotaProtos.Throttle; import
[32/49] hbase git commit: HBASE-17557 HRegionServer#reportRegionSizesForQuotas() should respond to UnsupportedOperationException
HBASE-17557 HRegionServer#reportRegionSizesForQuotas() should respond to UnsupportedOperationException Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/7fb0ac26 Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/7fb0ac26 Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/7fb0ac26 Branch: refs/heads/master Commit: 7fb0ac26e3a85a01b285078c198578216e3e8524 Parents: 6b334cd Author: tedyuAuthored: Mon Jan 30 07:47:40 2017 -0800 Committer: Josh Elser Committed: Mon May 22 13:41:35 2017 -0400 -- .../quotas/FileSystemUtilizationChore.java | 20 +--- .../hbase/regionserver/HRegionServer.java | 24 2 files changed, 36 insertions(+), 8 deletions(-) -- http://git-wip-us.apache.org/repos/asf/hbase/blob/7fb0ac26/hbase-server/src/main/java/org/apache/hadoop/hbase/quotas/FileSystemUtilizationChore.java -- diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/quotas/FileSystemUtilizationChore.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/quotas/FileSystemUtilizationChore.java index 01540eb..efc17ff 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/quotas/FileSystemUtilizationChore.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/quotas/FileSystemUtilizationChore.java @@ -53,6 +53,9 @@ public class FileSystemUtilizationChore extends ScheduledChore { static final String FS_UTILIZATION_MAX_ITERATION_DURATION_KEY = "hbase.regionserver.quotas.fs.utilization.chore.max.iteration.millis"; static final long FS_UTILIZATION_MAX_ITERATION_DURATION_DEFAULT = 5000L; + private int numberOfCyclesToSkip = 0, prevNumberOfCyclesToSkip = 0; + private static final int CYCLE_UPPER_BOUND = 32; + private final HRegionServer rs; private final long maxIterationMillis; private Iterator leftoverRegions; @@ -67,6 +70,10 @@ public class FileSystemUtilizationChore extends ScheduledChore { @Override protected void chore() { +if (numberOfCyclesToSkip > 0) { + numberOfCyclesToSkip--; + return; +} final Map onlineRegionSizes = new HashMap<>(); final Set onlineRegions = new HashSet<>(rs.getOnlineRegions()); // Process the regions from the last run if we have any. If we are somehow having difficulty @@ -126,7 +133,14 @@ public class FileSystemUtilizationChore extends ScheduledChore { + skippedSplitParents + " regions due to being the parent of a split, and" + skippedRegionReplicas + " regions due to being region replicas."); } -reportRegionSizesToMaster(onlineRegionSizes); +if (!reportRegionSizesToMaster(onlineRegionSizes)) { + // backoff reporting + numberOfCyclesToSkip = prevNumberOfCyclesToSkip > 0 ? 2 * prevNumberOfCyclesToSkip : 1; + if (numberOfCyclesToSkip > CYCLE_UPPER_BOUND) { +numberOfCyclesToSkip = CYCLE_UPPER_BOUND; + } + prevNumberOfCyclesToSkip = numberOfCyclesToSkip; +} } /** @@ -166,8 +180,8 @@ public class FileSystemUtilizationChore extends ScheduledChore { * * @param onlineRegionSizes The computed region sizes to report. */ - void reportRegionSizesToMaster(Map onlineRegionSizes) { -this.rs.reportRegionSizesForQuotas(onlineRegionSizes); + boolean reportRegionSizesToMaster(Map onlineRegionSizes) { +return this.rs.reportRegionSizesForQuotas(onlineRegionSizes); } /** http://git-wip-us.apache.org/repos/asf/hbase/blob/7fb0ac26/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java -- diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java index 8130312..2b3e8f5 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java @@ -66,6 +66,7 @@ import org.apache.hadoop.hbase.ChoreService; import org.apache.hadoop.hbase.ClockOutOfSyncException; import org.apache.hadoop.hbase.CoordinatedStateManager; import org.apache.hadoop.hbase.CoordinatedStateManagerFactory; +import org.apache.hadoop.hbase.DoNotRetryIOException; import org.apache.hadoop.hbase.HBaseConfiguration; import org.apache.hadoop.hbase.HBaseInterfaceAudience; import org.apache.hadoop.hbase.HConstants; @@ -1248,13 +1249,14 @@ public class HRegionServer extends HasThread implements * Reports the given map of Regions and their size on the filesystem to the active Master. * * @param
[19/49] hbase git commit: HBASE-17428 Implement informational RPCs for space quotas
HBASE-17428 Implement informational RPCs for space quotas Create some RPCs that can expose the in-memory state that the RegionServers and Master hold to drive the space quota "state machine". Then, create some hbase shell commands to interact with those. Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/80a1f8fa Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/80a1f8fa Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/80a1f8fa Branch: refs/heads/master Commit: 80a1f8fa2aec6687774ffeb03178efcdda2e136b Parents: 4ad49bc Author: Josh ElserAuthored: Tue Feb 21 15:36:39 2017 -0500 Committer: Josh Elser Committed: Mon May 22 13:41:35 2017 -0400 -- .../hbase/client/ConnectionImplementation.java |9 + .../hadoop/hbase/client/QuotaStatusCalls.java | 125 + .../client/ShortCircuitMasterConnection.java|7 + .../hadoop/hbase/quotas/QuotaTableUtil.java | 77 + .../hbase/shaded/protobuf/RequestConverter.java | 33 + .../shaded/protobuf/generated/AdminProtos.java | 650 +- .../shaded/protobuf/generated/MasterProtos.java | 88 +- .../shaded/protobuf/generated/QuotaProtos.java | 5986 +- .../generated/RegionServerStatusProtos.java | 28 +- .../src/main/protobuf/Admin.proto |9 + .../src/main/protobuf/Master.proto |4 + .../src/main/protobuf/Quota.proto | 35 + .../hbase/protobuf/generated/QuotaProtos.java |6 +- .../hadoop/hbase/master/MasterRpcServices.java | 60 + .../hbase/quotas/ActivePolicyEnforcement.java |8 + .../hbase/regionserver/RSRpcServices.java | 57 + .../hadoop/hbase/master/MockRegionServer.java | 18 + .../hbase/quotas/TestQuotaStatusRPCs.java | 192 + hbase-shell/src/main/ruby/hbase/quotas.rb | 16 + hbase-shell/src/main/ruby/shell.rb |3 + .../ruby/shell/commands/list_quota_snapshots.rb | 59 + .../shell/commands/list_quota_table_sizes.rb| 47 + .../shell/commands/list_quota_violations.rb | 48 + hbase-shell/src/test/ruby/hbase/quotas_test.rb | 24 - .../test/ruby/hbase/quotas_test_no_cluster.rb | 69 + 25 files changed, 7212 insertions(+), 446 deletions(-) -- http://git-wip-us.apache.org/repos/asf/hbase/blob/80a1f8fa/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ConnectionImplementation.java -- diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ConnectionImplementation.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ConnectionImplementation.java index 564cfb4..5242efc 100644 --- a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ConnectionImplementation.java +++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ConnectionImplementation.java @@ -92,6 +92,8 @@ import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.SecurityCa import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.SecurityCapabilitiesResponse; import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.SetNormalizerRunningRequest; import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.SetNormalizerRunningResponse; +import org.apache.hadoop.hbase.shaded.protobuf.generated.QuotaProtos.GetSpaceQuotaRegionSizesRequest; +import org.apache.hadoop.hbase.shaded.protobuf.generated.QuotaProtos.GetSpaceQuotaRegionSizesResponse; import org.apache.hadoop.hbase.shaded.protobuf.generated.ReplicationProtos.AddReplicationPeerRequest; import org.apache.hadoop.hbase.shaded.protobuf.generated.ReplicationProtos.AddReplicationPeerResponse; import org.apache.hadoop.hbase.shaded.protobuf.generated.ReplicationProtos.DisableReplicationPeerRequest; @@ -1750,6 +1752,13 @@ class ConnectionImplementation implements ClusterConnection, Closeable { ListReplicationPeersRequest request) throws ServiceException { return stub.listReplicationPeers(controller, request); } + + @Override + public GetSpaceQuotaRegionSizesResponse getSpaceQuotaRegionSizes( + RpcController controller, GetSpaceQuotaRegionSizesRequest request) + throws ServiceException { +return stub.getSpaceQuotaRegionSizes(controller, request); + } }; } http://git-wip-us.apache.org/repos/asf/hbase/blob/80a1f8fa/hbase-client/src/main/java/org/apache/hadoop/hbase/client/QuotaStatusCalls.java -- diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/QuotaStatusCalls.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/QuotaStatusCalls.java new file mode 100644 index 000..f0f385d --- /dev/null
[16/49] hbase git commit: HBASE-17428 Implement informational RPCs for space quotas
http://git-wip-us.apache.org/repos/asf/hbase/blob/80a1f8fa/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/protobuf/generated/QuotaProtos.java -- diff --git a/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/protobuf/generated/QuotaProtos.java b/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/protobuf/generated/QuotaProtos.java index a4c6095..d56def5 100644 --- a/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/protobuf/generated/QuotaProtos.java +++ b/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/protobuf/generated/QuotaProtos.java @@ -4362,7 +4362,7 @@ public final class QuotaProtos { * optional .hbase.pb.SpaceQuota space = 3; */ private org.apache.hadoop.hbase.shaded.com.google.protobuf.SingleFieldBuilderV3< - org.apache.hadoop.hbase.shaded.protobuf.generated.QuotaProtos.SpaceQuota, org.apache.hadoop.hbase.shaded.protobuf.generated.QuotaProtos.SpaceQuota.Builder, org.apache.hadoop.hbase.shaded.protobuf.generated.QuotaProtos.SpaceQuotaOrBuilder> + org.apache.hadoop.hbase.shaded.protobuf.generated.QuotaProtos.SpaceQuota, org.apache.hadoop.hbase.shaded.protobuf.generated.QuotaProtos.SpaceQuota.Builder, org.apache.hadoop.hbase.shaded.protobuf.generated.QuotaProtos.SpaceQuotaOrBuilder> getSpaceFieldBuilder() { if (spaceBuilder_ == null) { spaceBuilder_ = new org.apache.hadoop.hbase.shaded.com.google.protobuf.SingleFieldBuilderV3< @@ -6077,7 +6077,7 @@ public final class QuotaProtos { * optional .hbase.pb.SpaceQuota quota = 1; */ private org.apache.hadoop.hbase.shaded.com.google.protobuf.SingleFieldBuilderV3< - org.apache.hadoop.hbase.shaded.protobuf.generated.QuotaProtos.SpaceQuota, org.apache.hadoop.hbase.shaded.protobuf.generated.QuotaProtos.SpaceQuota.Builder, org.apache.hadoop.hbase.shaded.protobuf.generated.QuotaProtos.SpaceQuotaOrBuilder> + org.apache.hadoop.hbase.shaded.protobuf.generated.QuotaProtos.SpaceQuota, org.apache.hadoop.hbase.shaded.protobuf.generated.QuotaProtos.SpaceQuota.Builder, org.apache.hadoop.hbase.shaded.protobuf.generated.QuotaProtos.SpaceQuotaOrBuilder> getQuotaFieldBuilder() { if (quotaBuilder_ == null) { quotaBuilder_ = new org.apache.hadoop.hbase.shaded.com.google.protobuf.SingleFieldBuilderV3< @@ -6351,7 +6351,7 @@ public final class QuotaProtos { return memoizedHashCode; } int hash = 41; - hash = (19 * hash) + getDescriptorForType().hashCode(); + hash = (19 * hash) + getDescriptor().hashCode(); if (hasPolicy()) { hash = (37 * hash) + POLICY_FIELD_NUMBER; hash = (53 * hash) + policy_; @@ -6978,7 +6978,7 @@ public final class QuotaProtos { return memoizedHashCode; } int hash = 41; - hash = (19 * hash) + getDescriptorForType().hashCode(); + hash = (19 * hash) + getDescriptor().hashCode(); if (hasStatus()) { hash = (37 * hash) + STATUS_FIELD_NUMBER; hash = (53 * hash) + getStatus().hashCode(); @@ -7351,7 +7351,7 @@ public final class QuotaProtos { * optional .hbase.pb.SpaceQuotaStatus status = 1; */ private org.apache.hadoop.hbase.shaded.com.google.protobuf.SingleFieldBuilderV3< - org.apache.hadoop.hbase.shaded.protobuf.generated.QuotaProtos.SpaceQuotaStatus, org.apache.hadoop.hbase.shaded.protobuf.generated.QuotaProtos.SpaceQuotaStatus.Builder, org.apache.hadoop.hbase.shaded.protobuf.generated.QuotaProtos.SpaceQuotaStatusOrBuilder> + org.apache.hadoop.hbase.shaded.protobuf.generated.QuotaProtos.SpaceQuotaStatus, org.apache.hadoop.hbase.shaded.protobuf.generated.QuotaProtos.SpaceQuotaStatus.Builder, org.apache.hadoop.hbase.shaded.protobuf.generated.QuotaProtos.SpaceQuotaStatusOrBuilder> getStatusFieldBuilder() { if (statusBuilder_ == null) { statusBuilder_ = new org.apache.hadoop.hbase.shaded.com.google.protobuf.SingleFieldBuilderV3< @@ -7476,163 +7476,5829 @@ public final class QuotaProtos { } - private static final org.apache.hadoop.hbase.shaded.com.google.protobuf.Descriptors.Descriptor -internal_static_hbase_pb_TimedQuota_descriptor; - private static final - org.apache.hadoop.hbase.shaded.com.google.protobuf.GeneratedMessageV3.FieldAccessorTable - internal_static_hbase_pb_TimedQuota_fieldAccessorTable; - private static final org.apache.hadoop.hbase.shaded.com.google.protobuf.Descriptors.Descriptor -internal_static_hbase_pb_Throttle_descriptor; - private static final - org.apache.hadoop.hbase.shaded.com.google.protobuf.GeneratedMessageV3.FieldAccessorTable - internal_static_hbase_pb_Throttle_fieldAccessorTable; - private static final org.apache.hadoop.hbase.shaded.com.google.protobuf.Descriptors.Descriptor -
[15/49] hbase git commit: HBASE-17428 Implement informational RPCs for space quotas
http://git-wip-us.apache.org/repos/asf/hbase/blob/80a1f8fa/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/protobuf/generated/RegionServerStatusProtos.java -- diff --git a/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/protobuf/generated/RegionServerStatusProtos.java b/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/protobuf/generated/RegionServerStatusProtos.java index e90c934..c70b736 100644 --- a/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/protobuf/generated/RegionServerStatusProtos.java +++ b/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/protobuf/generated/RegionServerStatusProtos.java @@ -10429,7 +10429,7 @@ public final class RegionServerStatusProtos { return memoizedHashCode; } int hash = 41; - hash = (19 * hash) + getDescriptorForType().hashCode(); + hash = (19 * hash) + getDescriptor().hashCode(); if (hasRegion()) { hash = (37 * hash) + REGION_FIELD_NUMBER; hash = (53 * hash) + getRegion().hashCode(); @@ -10824,7 +10824,7 @@ public final class RegionServerStatusProtos { * optional .hbase.pb.RegionInfo region = 1; */ private org.apache.hadoop.hbase.shaded.com.google.protobuf.SingleFieldBuilderV3< - org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos.RegionInfo, org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos.RegionInfo.Builder, org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos.RegionInfoOrBuilder> + org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos.RegionInfo, org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos.RegionInfo.Builder, org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos.RegionInfoOrBuilder> getRegionFieldBuilder() { if (regionBuilder_ == null) { regionBuilder_ = new org.apache.hadoop.hbase.shaded.com.google.protobuf.SingleFieldBuilderV3< @@ -10940,7 +10940,7 @@ public final class RegionServerStatusProtos { /** * repeated .hbase.pb.RegionSpaceUse space_use = 1; */ - java.util.List + java.util.List getSpaceUseList(); /** * repeated .hbase.pb.RegionSpaceUse space_use = 1; @@ -10953,7 +10953,7 @@ public final class RegionServerStatusProtos { /** * repeated .hbase.pb.RegionSpaceUse space_use = 1; */ -java.util.List +java.util.List getSpaceUseOrBuilderList(); /** * repeated .hbase.pb.RegionSpaceUse space_use = 1; @@ -11056,7 +11056,7 @@ public final class RegionServerStatusProtos { /** * repeated .hbase.pb.RegionSpaceUse space_use = 1; */ -public java.util.List +public java.util.List getSpaceUseOrBuilderList() { return spaceUse_; } @@ -11142,7 +11142,7 @@ public final class RegionServerStatusProtos { return memoizedHashCode; } int hash = 41; - hash = (19 * hash) + getDescriptorForType().hashCode(); + hash = (19 * hash) + getDescriptor().hashCode(); if (getSpaceUseCount() > 0) { hash = (37 * hash) + SPACE_USE_FIELD_NUMBER; hash = (53 * hash) + getSpaceUseList().hashCode(); @@ -11368,7 +11368,7 @@ public final class RegionServerStatusProtos { spaceUseBuilder_ = null; spaceUse_ = other.spaceUse_; bitField0_ = (bitField0_ & ~0x0001); - spaceUseBuilder_ = + spaceUseBuilder_ = org.apache.hadoop.hbase.shaded.com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders ? getSpaceUseFieldBuilder() : null; } else { @@ -11604,7 +11604,7 @@ public final class RegionServerStatusProtos { /** * repeated .hbase.pb.RegionSpaceUse space_use = 1; */ - public java.util.List + public java.util.List getSpaceUseOrBuilderList() { if (spaceUseBuilder_ != null) { return spaceUseBuilder_.getMessageOrBuilderList(); @@ -11630,12 +11630,12 @@ public final class RegionServerStatusProtos { /** * repeated .hbase.pb.RegionSpaceUse space_use = 1; */ - public java.util.List + public java.util.List getSpaceUseBuilderList() { return getSpaceUseFieldBuilder().getBuilderList(); } private org.apache.hadoop.hbase.shaded.com.google.protobuf.RepeatedFieldBuilderV3< - org.apache.hadoop.hbase.shaded.protobuf.generated.RegionServerStatusProtos.RegionSpaceUse, org.apache.hadoop.hbase.shaded.protobuf.generated.RegionServerStatusProtos.RegionSpaceUse.Builder, org.apache.hadoop.hbase.shaded.protobuf.generated.RegionServerStatusProtos.RegionSpaceUseOrBuilder> + org.apache.hadoop.hbase.shaded.protobuf.generated.RegionServerStatusProtos.RegionSpaceUse,
[35/49] hbase git commit: HBASE-17002 JMX metrics and some UI additions for space quotas
HBASE-17002 JMX metrics and some UI additions for space quotas Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/13af7f8a Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/13af7f8a Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/13af7f8a Branch: refs/heads/master Commit: 13af7f8ac6e393dc7895b6fb1d35fac2367c5a17 Parents: 91b4d2e Author: Josh ElserAuthored: Wed Feb 15 14:24:57 2017 -0500 Committer: Josh Elser Committed: Mon May 22 13:41:35 2017 -0400 -- .../hbase/client/ConnectionImplementation.java |8 + .../hadoop/hbase/client/QuotaStatusCalls.java | 39 +- .../client/ShortCircuitMasterConnection.java|8 + .../hadoop/hbase/quotas/QuotaTableUtil.java | 41 + .../hbase/shaded/protobuf/RequestConverter.java | 11 + .../hbase/master/MetricsMasterQuotaSource.java | 75 + .../master/MetricsMasterQuotaSourceFactory.java | 26 + .../hbase/master/MetricsMasterWrapper.java | 13 + .../MetricsRegionServerQuotaSource.java | 54 + .../MetricsMasterQuotaSourceFactoryImpl.java| 36 + .../master/MetricsMasterQuotaSourceImpl.java| 129 + ...hadoop.hbase.master.MetricsMasterQuotaSource | 18 + ...hbase.master.MetricsMasterQuotaSourceFactory | 18 + .../shaded/protobuf/generated/MasterProtos.java | 93 +- .../shaded/protobuf/generated/QuotaProtos.java | 3099 +- .../src/main/protobuf/Master.proto |6 +- .../src/main/protobuf/Quota.proto | 17 + .../org/apache/hadoop/hbase/master/HMaster.java |2 +- .../hadoop/hbase/master/MasterRpcServices.java | 38 + .../hadoop/hbase/master/MetricsMaster.java | 42 + .../hbase/master/MetricsMasterWrapperImpl.java | 42 +- .../hadoop/hbase/quotas/QuotaObserverChore.java | 92 +- .../resources/hbase-webapps/master/table.jsp| 59 + .../hbase/master/TestMasterMetricsWrapper.java | 17 + .../hbase/quotas/TestQuotaStatusRPCs.java | 83 + 25 files changed, 4032 insertions(+), 34 deletions(-) -- http://git-wip-us.apache.org/repos/asf/hbase/blob/13af7f8a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ConnectionImplementation.java -- diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ConnectionImplementation.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ConnectionImplementation.java index 5242efc..e5f5694 100644 --- a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ConnectionImplementation.java +++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ConnectionImplementation.java @@ -92,6 +92,8 @@ import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.SecurityCa import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.SecurityCapabilitiesResponse; import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.SetNormalizerRunningRequest; import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.SetNormalizerRunningResponse; +import org.apache.hadoop.hbase.shaded.protobuf.generated.QuotaProtos.GetQuotaStatesRequest; +import org.apache.hadoop.hbase.shaded.protobuf.generated.QuotaProtos.GetQuotaStatesResponse; import org.apache.hadoop.hbase.shaded.protobuf.generated.QuotaProtos.GetSpaceQuotaRegionSizesRequest; import org.apache.hadoop.hbase.shaded.protobuf.generated.QuotaProtos.GetSpaceQuotaRegionSizesResponse; import org.apache.hadoop.hbase.shaded.protobuf.generated.ReplicationProtos.AddReplicationPeerRequest; @@ -1759,6 +1761,12 @@ class ConnectionImplementation implements ClusterConnection, Closeable { throws ServiceException { return stub.getSpaceQuotaRegionSizes(controller, request); } + + @Override + public GetQuotaStatesResponse getQuotaStates( + RpcController controller, GetQuotaStatesRequest request) throws ServiceException { +return stub.getQuotaStates(controller, request); + } }; } http://git-wip-us.apache.org/repos/asf/hbase/blob/13af7f8a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/QuotaStatusCalls.java -- diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/QuotaStatusCalls.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/QuotaStatusCalls.java index f0f385d..af36d1e 100644 --- a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/QuotaStatusCalls.java +++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/QuotaStatusCalls.java @@ -25,6 +25,7 @@ import org.apache.hadoop.hbase.ipc.RpcControllerFactory; import org.apache.hadoop.hbase.shaded.protobuf.ProtobufUtil; import
[05/49] hbase git commit: HBASE-16995 Build client Java API and client protobuf messages (Josh Elser)
http://git-wip-us.apache.org/repos/asf/hbase/blob/4dfafd6e/hbase-protocol/src/main/java/org/apache/hadoop/hbase/protobuf/generated/QuotaProtos.java -- diff --git a/hbase-protocol/src/main/java/org/apache/hadoop/hbase/protobuf/generated/QuotaProtos.java b/hbase-protocol/src/main/java/org/apache/hadoop/hbase/protobuf/generated/QuotaProtos.java index 05894b9..1925828 100644 --- a/hbase-protocol/src/main/java/org/apache/hadoop/hbase/protobuf/generated/QuotaProtos.java +++ b/hbase-protocol/src/main/java/org/apache/hadoop/hbase/protobuf/generated/QuotaProtos.java @@ -217,12 +217,20 @@ public final class QuotaProtos { * THROTTLE = 1; */ THROTTLE(0, 1), +/** + * SPACE = 2; + */ +SPACE(1, 2), ; /** * THROTTLE = 1; */ public static final int THROTTLE_VALUE = 1; +/** + * SPACE = 2; + */ +public static final int SPACE_VALUE = 2; public final int getNumber() { return value; } @@ -230,6 +238,7 @@ public final class QuotaProtos { public static QuotaType valueOf(int value) { switch (value) { case 1: return THROTTLE; +case 2: return SPACE; default: return null; } } @@ -281,6 +290,142 @@ public final class QuotaProtos { // @@protoc_insertion_point(enum_scope:hbase.pb.QuotaType) } + /** + * Protobuf enum {@code hbase.pb.SpaceViolationPolicy} + * + * + * Defines what action should be taken when the SpaceQuota is violated + * + */ + public enum SpaceViolationPolicy + implements com.google.protobuf.ProtocolMessageEnum { +/** + * DISABLE = 1; + * + * + * Disable the table(s) + * + */ +DISABLE(0, 1), +/** + * NO_WRITES_COMPACTIONS = 2; + * + * + * No writes, bulk-loads, or compactions + * + */ +NO_WRITES_COMPACTIONS(1, 2), +/** + * NO_WRITES = 3; + * + * + * No writes or bulk-loads + * + */ +NO_WRITES(2, 3), +/** + * NO_INSERTS = 4; + * + * + * No puts or bulk-loads, but deletes are allowed + * + */ +NO_INSERTS(3, 4), +; + +/** + * DISABLE = 1; + * + * + * Disable the table(s) + * + */ +public static final int DISABLE_VALUE = 1; +/** + * NO_WRITES_COMPACTIONS = 2; + * + * + * No writes, bulk-loads, or compactions + * + */ +public static final int NO_WRITES_COMPACTIONS_VALUE = 2; +/** + * NO_WRITES = 3; + * + * + * No writes or bulk-loads + * + */ +public static final int NO_WRITES_VALUE = 3; +/** + * NO_INSERTS = 4; + * + * + * No puts or bulk-loads, but deletes are allowed + * + */ +public static final int NO_INSERTS_VALUE = 4; + + +public final int getNumber() { return value; } + +public static SpaceViolationPolicy valueOf(int value) { + switch (value) { +case 1: return DISABLE; +case 2: return NO_WRITES_COMPACTIONS; +case 3: return NO_WRITES; +case 4: return NO_INSERTS; +default: return null; + } +} + +public static com.google.protobuf.Internal.EnumLiteMap +internalGetValueMap() { + return internalValueMap; +} +private static com.google.protobuf.Internal.EnumLiteMap +internalValueMap = + new com.google.protobuf.Internal.EnumLiteMap() { +public SpaceViolationPolicy findValueByNumber(int number) { + return SpaceViolationPolicy.valueOf(number); +} + }; + +public final com.google.protobuf.Descriptors.EnumValueDescriptor +getValueDescriptor() { + return getDescriptor().getValues().get(index); +} +public final com.google.protobuf.Descriptors.EnumDescriptor +getDescriptorForType() { + return getDescriptor(); +} +public static final com.google.protobuf.Descriptors.EnumDescriptor +getDescriptor() { + return org.apache.hadoop.hbase.protobuf.generated.QuotaProtos.getDescriptor().getEnumTypes().get(3); +} + +private static final SpaceViolationPolicy[] VALUES = values(); + +public static SpaceViolationPolicy valueOf( +com.google.protobuf.Descriptors.EnumValueDescriptor desc) { + if (desc.getType() != getDescriptor()) { +throw new java.lang.IllegalArgumentException( + "EnumValueDescriptor is not for this type."); + } + return VALUES[desc.getIndex()]; +} + +private final int index; +private final int value; + +private SpaceViolationPolicy(int index, int value) { + this.index = index; + this.value = value; +} + +// @@protoc_insertion_point(enum_scope:hbase.pb.SpaceViolationPolicy) + } + public interface TimedQuotaOrBuilder extends com.google.protobuf.MessageOrBuilder { @@ -3315,6 +3460,20 @@ public final class QuotaProtos {
[29/49] hbase git commit: HBASE-17003 Documentation updates for space quotas
HBASE-17003 Documentation updates for space quotas Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/f7da41d0 Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/f7da41d0 Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/f7da41d0 Branch: refs/heads/master Commit: f7da41d0bf5812c074102beadda160b46b463158 Parents: 13af7f8 Author: Josh ElserAuthored: Thu Mar 16 16:21:14 2017 -0400 Committer: Josh Elser Committed: Mon May 22 13:41:35 2017 -0400 -- src/main/asciidoc/_chapters/ops_mgt.adoc | 64 ++- 1 file changed, 63 insertions(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/hbase/blob/f7da41d0/src/main/asciidoc/_chapters/ops_mgt.adoc -- diff --git a/src/main/asciidoc/_chapters/ops_mgt.adoc b/src/main/asciidoc/_chapters/ops_mgt.adoc index e4c077f..f9009f3 100644 --- a/src/main/asciidoc/_chapters/ops_mgt.adoc +++ b/src/main/asciidoc/_chapters/ops_mgt.adoc @@ -1705,7 +1705,7 @@ handling multiple workloads: [[quota]] === Quotas -HBASE-11598 introduces quotas, which allow you to throttle requests based on +HBASE-11598 introduces RPC quotas, which allow you to throttle requests based on the following limits: . < > @@ -1885,6 +1885,68 @@ at the same time and that fewer scans can be executed at the same time. A value `0.9` will give more queue/handlers to scans, so the number of scans executed will increase and the number of gets will decrease. +[[space-quotas]] +=== Space Quotas + +link:https://issues.apache.org/jira/browse/HBASE-16961[HBASE-16961] introduces a new type of +quotas for HBase to leverage: filesystem quotas. These "space" quotas limit the amount of space +on the filesystem that HBase namespaces and tables can consume. If a user, malicious or ignorant, +has the ability to write data into HBase, with enough time, that user can effectively crash HBase +(or worse HDFS) by consuming all available space. When there is no filesystem space available, +HBase crashes because it can no longer create/sync data to the write-ahead log. + +This feature allows a for a limit to be set on the size of a table or namespace. When a space quota is set +on a namespace, the quota's limit applies to the sum of usage of all tables in that namespace. +When a table with a quota exists in a namespace with a quota, the table quota takes priority +over the namespace quota. This allows for a scenario where a large limit can be placed on +a collection of tables, but a single table in that collection can have a fine-grained limit set. + +The existing `set_quota` and `list_quota` HBase shell commands can be used to interact with +space quotas. Space quotas are quotas with a `TYPE` of `SPACE` and have `LIMIT` and `POLICY` +attributes. The `LIMIT` is a string that refers to the amount of space on the filesystem +that the quota subject (e.g. the table or namespace) may consume. For example, valid values +of `LIMIT` are `'10G'`, `'2T'`, or `'256M'`. The `POLICY` refers to the action that HBase will +take when the quota subject's usage exceeds the `LIMIT`. The following are valid `POLICY` values. + +* `NO_INSERTS` - No new data may be written (e.g. `Put`, `Increment`, `Append`). +* `NO_WRITES` - Same as `NO_INSERTS` but `Deletes` are also disallowed. +* `NO_WRITES_COMPACTIONS` - Same as `NO_WRITES` but compactions are also disallowed. +* `DISABLE` - The table(s) are disabled, preventing all read/write access. + +.Setting simple space quotas + +# Sets a quota on the table 't1' with a limit of 1GB, disallowing Puts/Increments/Appends when the table exceeds 1GB +hbase> set_quota TYPE => SPACE, TABLE => 't1', LIMIT => '1G', POLICY => NO_INSERTS + +# Sets a quota on the namespace 'ns1' with a limit of 50TB, disallowing Puts/Increments/Appends/Deletes +hbase> set_quota TYPE => SPACE, NAMESPACE => 'ns1', LIMIT => '50T', POLICY => NO_WRITES + +# Sets a quota on the table 't3' with a limit of 2TB, disallowing any writes and compactions when the table exceeds 2TB. +hbase> set_quota TYPE => SPACE, TABLE => 't3', LIMIT => '2T', POLICY => NO_WRITES_COMPACTIONS + +# Sets a quota on the table 't2' with a limit of 50GB, disabling the table when it exceeds 50GB +hbase> set_quota TYPE => SPACE, TABLE => 't2', LIMIT => '50G', POLICY => DISABLE + + +Consider the following scenario to set up quotas on a namespace, overriding the quota on tables in that namespace + +.Table and Namespace space quotas + +hbase> create_namespace 'ns1' +hbase> create 'ns1:t1' +hbase> create 'ns1:t2' +hbase> create 'ns1:t3' +hbase> set_quota TYPE => SPACE, NAMESPACE => 'ns1',
[02/49] hbase git commit: HBASE-17794 Swap "violation" for "snapshot" where appropriate
HBASE-17794 Swap "violation" for "snapshot" where appropriate A couple of variables and comments in which violation is incorrectly used to describe what the code is doing. This was a hold over from early implementation -- need to scrub these out for clarity. Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/a8460b8b Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/a8460b8b Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/a8460b8b Branch: refs/heads/master Commit: a8460b8bad746fc4815845bcaa9740a51bdd3c25 Parents: f7da41d Author: Josh ElserAuthored: Thu Mar 16 19:26:14 2017 -0400 Committer: Josh Elser Committed: Mon May 22 13:41:35 2017 -0400 -- .../java/org/apache/hadoop/hbase/quotas/QuotaTableUtil.java| 4 ++-- hbase-protocol-shaded/src/main/protobuf/Quota.proto| 2 +- .../org/apache/hadoop/hbase/quotas/QuotaObserverChore.java | 6 +++--- .../apache/hadoop/hbase/quotas/TableQuotaSnapshotStore.java| 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) -- http://git-wip-us.apache.org/repos/asf/hbase/blob/a8460b8b/hbase-client/src/main/java/org/apache/hadoop/hbase/quotas/QuotaTableUtil.java -- diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/quotas/QuotaTableUtil.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/quotas/QuotaTableUtil.java index ad59517..c008702 100644 --- a/hbase-client/src/main/java/org/apache/hadoop/hbase/quotas/QuotaTableUtil.java +++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/quotas/QuotaTableUtil.java @@ -228,7 +228,7 @@ public class QuotaTableUtil { } /** - * Creates a {@link Scan} which returns only quota violations from the quota table. + * Creates a {@link Scan} which returns only quota snapshots from the quota table. */ public static Scan makeQuotaSnapshotScan() { Scan s = new Scan(); @@ -246,7 +246,7 @@ public class QuotaTableUtil { * will throw an {@link IllegalArgumentException}. * * @param result A row from the quota table. - * @param snapshots A map of violations to add the result of this method into. + * @param snapshots A map of snapshots to add the result of this method into. */ public static void extractQuotaSnapshot( Result result, Map snapshots) { http://git-wip-us.apache.org/repos/asf/hbase/blob/a8460b8b/hbase-protocol-shaded/src/main/protobuf/Quota.proto -- diff --git a/hbase-protocol-shaded/src/main/protobuf/Quota.proto b/hbase-protocol-shaded/src/main/protobuf/Quota.proto index 1a6d5ed..364c58b 100644 --- a/hbase-protocol-shaded/src/main/protobuf/Quota.proto +++ b/hbase-protocol-shaded/src/main/protobuf/Quota.proto @@ -98,7 +98,7 @@ message SpaceLimitRequest { } // Represents the state of a quota on a table. Either the quota is not in violation -// or it is in violatino there is a violation policy which should be in effect. +// or it is in violation there is a violation policy which should be in effect. message SpaceQuotaStatus { optional SpaceViolationPolicy policy = 1; optional bool in_violation = 2; http://git-wip-us.apache.org/repos/asf/hbase/blob/a8460b8b/hbase-server/src/main/java/org/apache/hadoop/hbase/quotas/QuotaObserverChore.java -- diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/quotas/QuotaObserverChore.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/quotas/QuotaObserverChore.java index 94c5c87..254f2a1 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/quotas/QuotaObserverChore.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/quotas/QuotaObserverChore.java @@ -532,9 +532,9 @@ public class QuotaObserverChore extends ScheduledChore { } /** - * Stores the quota violation state for the given table. + * Stores the quota state for the given table. */ - void setTableQuotaViolation(TableName table, SpaceQuotaSnapshot snapshot) { + void setTableQuotaSnapshot(TableName table, SpaceQuotaSnapshot snapshot) { this.tableQuotaSnapshots.put(table, snapshot); } @@ -552,7 +552,7 @@ public class QuotaObserverChore extends ScheduledChore { } /** - * Stores the quota violation state for the given namespace. + * Stores the quota state for the given namespace. */ void setNamespaceQuotaSnapshot(String namespace, SpaceQuotaSnapshot snapshot) { this.namespaceQuotaSnapshots.put(namespace, snapshot); http://git-wip-us.apache.org/repos/asf/hbase/blob/a8460b8b/hbase-server/src/main/java/org/apache/hadoop/hbase/quotas/TableQuotaSnapshotStore.java
[42/49] hbase git commit: HBASE-17981 Consolidate the space quota shell commands
HBASE-17981 Consolidate the space quota shell commands Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/ed618da9 Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/ed618da9 Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/ed618da9 Branch: refs/heads/master Commit: ed618da906c56cfac7b7bcee862413d3ae851b57 Parents: 13b9a1e Author: Josh ElserAuthored: Mon May 1 19:44:47 2017 -0400 Committer: Josh Elser Committed: Mon May 22 13:41:36 2017 -0400 -- .../hadoop/hbase/client/QuotaStatusCalls.java | 29 - .../hadoop/hbase/quotas/QuotaTableUtil.java | 44 +- .../hbase/shaded/protobuf/RequestConverter.java | 11 - .../shaded/protobuf/generated/AdminProtos.java | 338 ++- .../shaded/protobuf/generated/QuotaProtos.java | 1923 +- .../src/main/protobuf/Admin.proto |4 - .../src/main/protobuf/Quota.proto | 12 - .../hbase/protobuf/generated/QuotaProtos.java | 34 +- .../hbase/regionserver/RSRpcServices.java | 30 - .../hadoop/hbase/master/MockRegionServer.java |9 - .../hbase/quotas/TestQuotaStatusRPCs.java | 13 +- hbase-shell/src/main/ruby/hbase/quotas.rb | 18 +- hbase-shell/src/main/ruby/hbase_constants.rb|1 + hbase-shell/src/main/ruby/shell.rb |1 - .../ruby/shell/commands/list_quota_snapshots.rb | 48 +- .../shell/commands/list_quota_table_sizes.rb|8 +- .../shell/commands/list_quota_violations.rb | 48 - .../test/ruby/hbase/quotas_test_no_cluster.rb | 19 +- 18 files changed, 273 insertions(+), 2317 deletions(-) -- http://git-wip-us.apache.org/repos/asf/hbase/blob/ed618da9/hbase-client/src/main/java/org/apache/hadoop/hbase/client/QuotaStatusCalls.java -- diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/QuotaStatusCalls.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/QuotaStatusCalls.java index af36d1e..70f6fb6 100644 --- a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/QuotaStatusCalls.java +++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/QuotaStatusCalls.java @@ -26,7 +26,6 @@ import org.apache.hadoop.hbase.shaded.protobuf.ProtobufUtil; import org.apache.hadoop.hbase.shaded.protobuf.RequestConverter; import org.apache.hadoop.hbase.shaded.protobuf.generated.AdminProtos.AdminService; import org.apache.hadoop.hbase.shaded.protobuf.generated.QuotaProtos.GetQuotaStatesResponse; -import org.apache.hadoop.hbase.shaded.protobuf.generated.QuotaProtos.GetSpaceQuotaEnforcementsResponse; import org.apache.hadoop.hbase.shaded.protobuf.generated.QuotaProtos.GetSpaceQuotaRegionSizesResponse; import org.apache.hadoop.hbase.shaded.protobuf.generated.QuotaProtos.GetSpaceQuotaSnapshotsResponse; @@ -127,32 +126,4 @@ public class QuotaStatusCalls { }; return ProtobufUtil.call(callable); } - - /** - * See {@link #getRegionServerSpaceQuotaEnforcements(ClusterConnection, RpcControllerFactory, int, ServerName)} - */ - public static GetSpaceQuotaEnforcementsResponse getRegionServerSpaceQuotaEnforcements( - ClusterConnection clusterConn, int timeout, ServerName sn) throws IOException { -RpcControllerFactory rpcController = clusterConn.getRpcControllerFactory(); -return getRegionServerSpaceQuotaEnforcements(clusterConn, rpcController, timeout, sn); - } - - /** - * Executes an RPC to the RegionServer identified by the {@code ServerName} to fetch its view on - * enforced space quotas. - */ - public static GetSpaceQuotaEnforcementsResponse getRegionServerSpaceQuotaEnforcements( - ClusterConnection conn, RpcControllerFactory factory, - int timeout, ServerName sn) throws IOException { -final AdminService.BlockingInterface admin = conn.getAdmin(sn); -Callable callable = -new Callable() { - @Override - public GetSpaceQuotaEnforcementsResponse call() throws Exception { -return admin.getSpaceQuotaEnforcements( -factory.newController(), RequestConverter.buildGetSpaceQuotaEnforcementsRequest()); - } -}; -return ProtobufUtil.call(callable); - } } http://git-wip-us.apache.org/repos/asf/hbase/blob/ed618da9/hbase-client/src/main/java/org/apache/hadoop/hbase/quotas/QuotaTableUtil.java -- diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/quotas/QuotaTableUtil.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/quotas/QuotaTableUtil.java index ec480c4..1b670e6 100644 --- a/hbase-client/src/main/java/org/apache/hadoop/hbase/quotas/QuotaTableUtil.java +++
[41/49] hbase git commit: HBASE-17981 Consolidate the space quota shell commands
http://git-wip-us.apache.org/repos/asf/hbase/blob/ed618da9/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/protobuf/generated/AdminProtos.java -- diff --git a/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/protobuf/generated/AdminProtos.java b/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/protobuf/generated/AdminProtos.java index 3760619..711b9c8 100644 --- a/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/protobuf/generated/AdminProtos.java +++ b/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/protobuf/generated/AdminProtos.java @@ -601,7 +601,7 @@ public final class AdminProtos { * required .hbase.pb.RegionSpecifier region = 1; */ private org.apache.hadoop.hbase.shaded.com.google.protobuf.SingleFieldBuilderV3< - org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos.RegionSpecifier, org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos.RegionSpecifier.Builder, org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos.RegionSpecifierOrBuilder> + org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos.RegionSpecifier, org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos.RegionSpecifier.Builder, org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos.RegionSpecifierOrBuilder> getRegionFieldBuilder() { if (regionBuilder_ == null) { regionBuilder_ = new org.apache.hadoop.hbase.shaded.com.google.protobuf.SingleFieldBuilderV3< @@ -1450,7 +1450,7 @@ public final class AdminProtos { * required .hbase.pb.RegionInfo region_info = 1; */ private org.apache.hadoop.hbase.shaded.com.google.protobuf.SingleFieldBuilderV3< - org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos.RegionInfo, org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos.RegionInfo.Builder, org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos.RegionInfoOrBuilder> + org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos.RegionInfo, org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos.RegionInfo.Builder, org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos.RegionInfoOrBuilder> getRegionInfoFieldBuilder() { if (regionInfoBuilder_ == null) { regionInfoBuilder_ = new org.apache.hadoop.hbase.shaded.com.google.protobuf.SingleFieldBuilderV3< @@ -2204,7 +2204,7 @@ public final class AdminProtos { * required .hbase.pb.RegionSpecifier region = 1; */ private org.apache.hadoop.hbase.shaded.com.google.protobuf.SingleFieldBuilderV3< - org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos.RegionSpecifier, org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos.RegionSpecifier.Builder, org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos.RegionSpecifierOrBuilder> + org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos.RegionSpecifier, org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos.RegionSpecifier.Builder, org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos.RegionSpecifierOrBuilder> getRegionFieldBuilder() { if (regionBuilder_ == null) { regionBuilder_ = new org.apache.hadoop.hbase.shaded.com.google.protobuf.SingleFieldBuilderV3< @@ -3281,7 +3281,7 @@ public final class AdminProtos { /** * repeated .hbase.pb.RegionInfo region_info = 1; */ - java.util.List + java.util.List getRegionInfoList(); /** * repeated .hbase.pb.RegionInfo region_info = 1; @@ -3294,7 +3294,7 @@ public final class AdminProtos { /** * repeated .hbase.pb.RegionInfo region_info = 1; */ -java.util.List +java.util.List getRegionInfoOrBuilderList(); /** * repeated .hbase.pb.RegionInfo region_info = 1; @@ -3392,7 +3392,7 @@ public final class AdminProtos { /** * repeated .hbase.pb.RegionInfo region_info = 1; */ -public java.util.List +public java.util.List getRegionInfoOrBuilderList() { return regionInfo_; } @@ -3699,7 +3699,7 @@ public final class AdminProtos { regionInfoBuilder_ = null; regionInfo_ = other.regionInfo_; bitField0_ = (bitField0_ & ~0x0001); - regionInfoBuilder_ = + regionInfoBuilder_ = org.apache.hadoop.hbase.shaded.com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders ? getRegionInfoFieldBuilder() : null; } else { @@ -3935,7 +3935,7 @@ public final class AdminProtos { /** * repeated .hbase.pb.RegionInfo region_info = 1; */ - public java.util.List + public java.util.List getRegionInfoOrBuilderList() {
[14/49] hbase git commit: HBASE-17516 Correctly handle case where table and NS quotas both apply
HBASE-17516 Correctly handle case where table and NS quotas both apply The logic surrounding when a table and namespace quota both apply to a table was incorrect, leading to a case where a table quota violation which should have fired did not because of the less-strict namespace quota. Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/f031b699 Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/f031b699 Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/f031b699 Branch: refs/heads/master Commit: f031b69969003b7b33111312060a73858bada319 Parents: 80a1f8f Author: Josh ElserAuthored: Wed Feb 22 18:32:55 2017 -0500 Committer: Josh Elser Committed: Mon May 22 13:41:35 2017 -0400 -- .../hadoop/hbase/quotas/QuotaObserverChore.java | 10 ++- .../TestQuotaObserverChoreWithMiniCluster.java | 66 .../hbase/quotas/TestQuotaStatusRPCs.java | 21 ++- .../hadoop/hbase/quotas/TestSpaceQuotas.java| 32 +- 4 files changed, 97 insertions(+), 32 deletions(-) -- http://git-wip-us.apache.org/repos/asf/hbase/blob/f031b699/hbase-server/src/main/java/org/apache/hadoop/hbase/quotas/QuotaObserverChore.java -- diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/quotas/QuotaObserverChore.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/quotas/QuotaObserverChore.java index 973ac8c..b9f4592 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/quotas/QuotaObserverChore.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/quotas/QuotaObserverChore.java @@ -287,7 +287,8 @@ public class QuotaObserverChore extends ScheduledChore { // We want to have a policy of "NONE", moving out of violation if (!targetStatus.isInViolation()) { for (TableName tableInNS : tablesByNamespace.get(namespace)) { - if (!tableSnapshotStore.getCurrentState(tableInNS).getQuotaStatus().isInViolation()) { + // If there is a quota on this table in violation + if (tableSnapshotStore.getCurrentState(tableInNS).getQuotaStatus().isInViolation()) { // Table-level quota violation policy is being applied here. if (LOG.isTraceEnabled()) { LOG.trace("Not activating Namespace violation policy because a Table violation" @@ -298,16 +299,21 @@ public class QuotaObserverChore extends ScheduledChore { this.snapshotNotifier.transitionTable(tableInNS, targetSnapshot); } } + // We want to move into violation at the NS level } else { // Moving tables in the namespace into violation or to a different violation policy for (TableName tableInNS : tablesByNamespace.get(namespace)) { - if (tableSnapshotStore.getCurrentState(tableInNS).getQuotaStatus().isInViolation()) { + final SpaceQuotaSnapshot tableQuotaSnapshot = +tableSnapshotStore.getCurrentState(tableInNS); + final boolean hasTableQuota = QuotaSnapshotStore.NO_QUOTA != tableQuotaSnapshot; + if (hasTableQuota && tableQuotaSnapshot.getQuotaStatus().isInViolation()) { // Table-level quota violation policy is being applied here. if (LOG.isTraceEnabled()) { LOG.trace("Not activating Namespace violation policy because a Table violation" + " policy is already in effect for " + tableInNS); } } else { +// No table quota present or a table quota present that is not in violation LOG.info(tableInNS + " moving into violation of namespace space quota with policy " + targetStatus.getPolicy()); this.snapshotNotifier.transitionTable(tableInNS, targetSnapshot); } http://git-wip-us.apache.org/repos/asf/hbase/blob/f031b699/hbase-server/src/test/java/org/apache/hadoop/hbase/quotas/TestQuotaObserverChoreWithMiniCluster.java -- diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/quotas/TestQuotaObserverChoreWithMiniCluster.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/quotas/TestQuotaObserverChoreWithMiniCluster.java index 943c898..63198a8 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/quotas/TestQuotaObserverChoreWithMiniCluster.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/quotas/TestQuotaObserverChoreWithMiniCluster.java @@ -193,40 +193,42 @@ public class TestQuotaObserverChoreWithMiniCluster { helper.writeData(tn1, 2L * SpaceQuotaHelperForTests.ONE_MEGABYTE); admin.flush(tn1); -Map violatedQuotas =
[25/49] hbase git commit: HBASE-17001 Enforce quota violation policies in the RegionServer
http://git-wip-us.apache.org/repos/asf/hbase/blob/34ba143f/hbase-server/src/main/java/org/apache/hadoop/hbase/quotas/SpaceViolationPolicyEnforcementFactory.java -- diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/quotas/SpaceViolationPolicyEnforcementFactory.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/quotas/SpaceViolationPolicyEnforcementFactory.java new file mode 100644 index 000..6b754b9 --- /dev/null +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/quotas/SpaceViolationPolicyEnforcementFactory.java @@ -0,0 +1,95 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to you under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.hadoop.hbase.quotas; + +import org.apache.hadoop.hbase.TableName; +import org.apache.hadoop.hbase.classification.InterfaceAudience; +import org.apache.hadoop.hbase.classification.InterfaceStability; +import org.apache.hadoop.hbase.quotas.SpaceQuotaSnapshot.SpaceQuotaStatus; +import org.apache.hadoop.hbase.quotas.policies.BulkLoadVerifyingViolationPolicyEnforcement; +import org.apache.hadoop.hbase.quotas.policies.DisableTableViolationPolicyEnforcement; +import org.apache.hadoop.hbase.quotas.policies.NoInsertsViolationPolicyEnforcement; +import org.apache.hadoop.hbase.quotas.policies.NoWritesCompactionsViolationPolicyEnforcement; +import org.apache.hadoop.hbase.quotas.policies.NoWritesViolationPolicyEnforcement; +import org.apache.hadoop.hbase.regionserver.RegionServerServices; + +/** + * A factory class for instantiating {@link SpaceViolationPolicyEnforcement} instances. + */ +@InterfaceAudience.Private +@InterfaceStability.Evolving +public class SpaceViolationPolicyEnforcementFactory { + + private static final SpaceViolationPolicyEnforcementFactory INSTANCE = + new SpaceViolationPolicyEnforcementFactory(); + + private SpaceViolationPolicyEnforcementFactory() {} + + /** + * Returns an instance of this factory. + */ + public static SpaceViolationPolicyEnforcementFactory getInstance() { +return INSTANCE; + } + + /** + * Constructs the appropriate {@link SpaceViolationPolicyEnforcement} for tables that are + * in violation of their space quota. + */ + public SpaceViolationPolicyEnforcement create( + RegionServerServices rss, TableName tableName, SpaceQuotaSnapshot snapshot) { +SpaceViolationPolicyEnforcement enforcement; +SpaceQuotaStatus status = snapshot.getQuotaStatus(); +if (!status.isInViolation()) { + throw new IllegalArgumentException(tableName + " is not in violation. Snapshot=" + snapshot); +} +switch (status.getPolicy()) { + case DISABLE: +enforcement = new DisableTableViolationPolicyEnforcement(); +break; + case NO_WRITES_COMPACTIONS: +enforcement = new NoWritesCompactionsViolationPolicyEnforcement(); +break; + case NO_WRITES: +enforcement = new NoWritesViolationPolicyEnforcement(); +break; + case NO_INSERTS: +enforcement = new NoInsertsViolationPolicyEnforcement(); +break; + default: +throw new IllegalArgumentException("Unhandled SpaceViolationPolicy: " + status.getPolicy()); +} +enforcement.initialize(rss, tableName, snapshot); +return enforcement; + } + + /** + * Creates the "default" {@link SpaceViolationPolicyEnforcement} for a table that isn't in + * violation. This is used to have uniform policy checking for tables in and not quotas. + */ + public SpaceViolationPolicyEnforcement createWithoutViolation( + RegionServerServices rss, TableName tableName, SpaceQuotaSnapshot snapshot) { +SpaceQuotaStatus status = snapshot.getQuotaStatus(); +if (status.isInViolation()) { + throw new IllegalArgumentException( + tableName + " is in violation. Logic error. Snapshot=" + snapshot); +} +BulkLoadVerifyingViolationPolicyEnforcement enforcement = new BulkLoadVerifyingViolationPolicyEnforcement(); +enforcement.initialize(rss, tableName, snapshot); +return enforcement; + } +} http://git-wip-us.apache.org/repos/asf/hbase/blob/34ba143f/hbase-server/src/main/java/org/apache/hadoop/hbase/quotas/TableQuotaSnapshotStore.java
[13/49] hbase git commit: HBASE-17000 Implement computation of online region sizes and report to the Master
HBASE-17000 Implement computation of online region sizes and report to the Master Includes a trivial implementation of the Master-side collection to avoid. Only enough to write a test to verify RS collection. Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/6b334cd8 Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/6b334cd8 Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/6b334cd8 Branch: refs/heads/master Commit: 6b334cd817e37a3727160cc754187e8f40893ced Parents: f74e051 Author: Josh ElserAuthored: Mon Nov 7 13:46:42 2016 -0500 Committer: Josh Elser Committed: Mon May 22 13:41:35 2017 -0400 -- .../generated/RegionServerStatusProtos.java | 2071 +- .../src/main/protobuf/RegionServerStatus.proto | 22 + .../hadoop/hbase/master/MasterRpcServices.java | 19 + .../quotas/FileSystemUtilizationChore.java | 205 ++ .../hadoop/hbase/quotas/MasterQuotaManager.java | 15 + .../hbase/regionserver/HRegionServer.java | 72 + .../quotas/TestFileSystemUtilizationChore.java | 357 +++ .../hadoop/hbase/quotas/TestRegionSizeUse.java | 194 ++ .../TestRegionServerRegionSpaceUseReport.java | 99 + 9 files changed, 3032 insertions(+), 22 deletions(-) --
[22/49] hbase git commit: HBASE-16995 Build client Java API and client protobuf messages - addendum fixes white spaces (Josh Elser)
HBASE-16995 Build client Java API and client protobuf messages - addendum fixes white spaces (Josh Elser) Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/140413c1 Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/140413c1 Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/140413c1 Branch: refs/heads/master Commit: 140413c11b9b856f0dc688bf61bbaeae722a87c2 Parents: 4dfafd6 Author: tedyuAuthored: Thu Nov 17 10:42:18 2016 -0800 Committer: Josh Elser Committed: Mon May 22 13:41:35 2017 -0400 -- .../hbase/quotas/TestQuotaSettingsFactory.java| 2 +- .../shaded/protobuf/generated/QuotaProtos.java| 18 +- .../hbase/protobuf/generated/QuotaProtos.java | 4 ++-- 3 files changed, 12 insertions(+), 12 deletions(-) -- http://git-wip-us.apache.org/repos/asf/hbase/blob/140413c1/hbase-client/src/test/java/org/apache/hadoop/hbase/quotas/TestQuotaSettingsFactory.java -- diff --git a/hbase-client/src/test/java/org/apache/hadoop/hbase/quotas/TestQuotaSettingsFactory.java b/hbase-client/src/test/java/org/apache/hadoop/hbase/quotas/TestQuotaSettingsFactory.java index 17015d6..e0012a7 100644 --- a/hbase-client/src/test/java/org/apache/hadoop/hbase/quotas/TestQuotaSettingsFactory.java +++ b/hbase-client/src/test/java/org/apache/hadoop/hbase/quotas/TestQuotaSettingsFactory.java @@ -44,7 +44,7 @@ import org.junit.experimental.categories.Category; */ @Category(SmallTests.class) public class TestQuotaSettingsFactory { - + @Test public void testAllQuotasAddedToList() { final SpaceQuota spaceQuota = SpaceQuota.newBuilder() http://git-wip-us.apache.org/repos/asf/hbase/blob/140413c1/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/protobuf/generated/QuotaProtos.java -- diff --git a/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/protobuf/generated/QuotaProtos.java b/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/protobuf/generated/QuotaProtos.java index e3c6bfd..0ab2576 100644 --- a/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/protobuf/generated/QuotaProtos.java +++ b/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/protobuf/generated/QuotaProtos.java @@ -4362,7 +4362,7 @@ public final class QuotaProtos { * optional .hbase.pb.SpaceQuota space = 3; */ private org.apache.hadoop.hbase.shaded.com.google.protobuf.SingleFieldBuilderV3< - org.apache.hadoop.hbase.shaded.protobuf.generated.QuotaProtos.SpaceQuota, org.apache.hadoop.hbase.shaded.protobuf.generated.QuotaProtos.SpaceQuota.Builder, org.apache.hadoop.hbase.shaded.protobuf.generated.QuotaProtos.SpaceQuotaOrBuilder> + org.apache.hadoop.hbase.shaded.protobuf.generated.QuotaProtos.SpaceQuota, org.apache.hadoop.hbase.shaded.protobuf.generated.QuotaProtos.SpaceQuota.Builder, org.apache.hadoop.hbase.shaded.protobuf.generated.QuotaProtos.SpaceQuotaOrBuilder> getSpaceFieldBuilder() { if (spaceBuilder_ == null) { spaceBuilder_ = new org.apache.hadoop.hbase.shaded.com.google.protobuf.SingleFieldBuilderV3< @@ -5957,7 +5957,7 @@ public final class QuotaProtos { * optional .hbase.pb.SpaceQuota quota = 1; */ private org.apache.hadoop.hbase.shaded.com.google.protobuf.SingleFieldBuilderV3< - org.apache.hadoop.hbase.shaded.protobuf.generated.QuotaProtos.SpaceQuota, org.apache.hadoop.hbase.shaded.protobuf.generated.QuotaProtos.SpaceQuota.Builder, org.apache.hadoop.hbase.shaded.protobuf.generated.QuotaProtos.SpaceQuotaOrBuilder> + org.apache.hadoop.hbase.shaded.protobuf.generated.QuotaProtos.SpaceQuota, org.apache.hadoop.hbase.shaded.protobuf.generated.QuotaProtos.SpaceQuota.Builder, org.apache.hadoop.hbase.shaded.protobuf.generated.QuotaProtos.SpaceQuotaOrBuilder> getQuotaFieldBuilder() { if (quotaBuilder_ == null) { quotaBuilder_ = new org.apache.hadoop.hbase.shaded.com.google.protobuf.SingleFieldBuilderV3< @@ -6020,37 +6020,37 @@ public final class QuotaProtos { private static final org.apache.hadoop.hbase.shaded.com.google.protobuf.Descriptors.Descriptor internal_static_hbase_pb_TimedQuota_descriptor; - private static final + private static final org.apache.hadoop.hbase.shaded.com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internal_static_hbase_pb_TimedQuota_fieldAccessorTable; private static final org.apache.hadoop.hbase.shaded.com.google.protobuf.Descriptors.Descriptor internal_static_hbase_pb_Throttle_descriptor; - private static final
[20/49] hbase git commit: HBASE-16998 Implement Master-side analysis of region space reports
http://git-wip-us.apache.org/repos/asf/hbase/blob/533470f8/hbase-server/src/test/java/org/apache/hadoop/hbase/quotas/TestQuotaObserverChoreWithMiniCluster.java -- diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/quotas/TestQuotaObserverChoreWithMiniCluster.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/quotas/TestQuotaObserverChoreWithMiniCluster.java new file mode 100644 index 000..98236c2 --- /dev/null +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/quotas/TestQuotaObserverChoreWithMiniCluster.java @@ -0,0 +1,596 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to you under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.hadoop.hbase.quotas; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertNull; +import static org.junit.Assert.assertTrue; +import static org.junit.Assert.fail; + +import java.io.IOException; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collections; +import java.util.HashMap; +import java.util.HashSet; +import java.util.List; +import java.util.Map; +import java.util.Map.Entry; +import java.util.Random; +import java.util.Set; +import java.util.concurrent.TimeUnit; +import java.util.concurrent.atomic.AtomicLong; + +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.apache.hadoop.conf.Configuration; +import org.apache.hadoop.hbase.HBaseTestingUtility; +import org.apache.hadoop.hbase.HColumnDescriptor; +import org.apache.hadoop.hbase.HTableDescriptor; +import org.apache.hadoop.hbase.NamespaceDescriptor; +import org.apache.hadoop.hbase.NamespaceNotFoundException; +import org.apache.hadoop.hbase.TableName; +import org.apache.hadoop.hbase.client.Admin; +import org.apache.hadoop.hbase.client.Connection; +import org.apache.hadoop.hbase.client.Put; +import org.apache.hadoop.hbase.client.Table; +import org.apache.hadoop.hbase.master.HMaster; +import org.apache.hadoop.hbase.quotas.QuotaObserverChore.TablesWithQuotas; +import org.apache.hadoop.hbase.shaded.protobuf.generated.QuotaProtos.SpaceQuota; +import org.apache.hadoop.hbase.testclassification.LargeTests; +import org.apache.hadoop.hbase.util.Bytes; +import org.junit.AfterClass; +import org.junit.Before; +import org.junit.BeforeClass; +import org.junit.Rule; +import org.junit.Test; +import org.junit.experimental.categories.Category; +import org.junit.rules.TestName; + +import com.google.common.collect.HashMultimap; +import com.google.common.collect.Iterables; +import com.google.common.collect.Multimap; + +/** + * Test class for {@link QuotaObserverChore} that uses a live HBase cluster. + */ +@Category(LargeTests.class) +public class TestQuotaObserverChoreWithMiniCluster { + private static final Log LOG = LogFactory.getLog(TestQuotaObserverChoreWithMiniCluster.class); + private static final int SIZE_PER_VALUE = 256; + private static final String F1 = "f1"; + private static final HBaseTestingUtility TEST_UTIL = new HBaseTestingUtility(); + private static final AtomicLong COUNTER = new AtomicLong(0); + private static final long ONE_MEGABYTE = 1024L * 1024L; + private static final long DEFAULT_WAIT_MILLIS = 500; + + @Rule + public TestName testName = new TestName(); + + private HMaster master; + private QuotaObserverChore chore; + private SpaceQuotaViolationNotifierForTest violationNotifier; + + @BeforeClass + public static void setUp() throws Exception { +Configuration conf = TEST_UTIL.getConfiguration(); +conf.setInt(FileSystemUtilizationChore.FS_UTILIZATION_CHORE_DELAY_KEY, 1000); +conf.setInt(FileSystemUtilizationChore.FS_UTILIZATION_CHORE_PERIOD_KEY, 1000); +conf.setInt(QuotaObserverChore.VIOLATION_OBSERVER_CHORE_DELAY_KEY, 1000); +conf.setInt(QuotaObserverChore.VIOLATION_OBSERVER_CHORE_PERIOD_KEY, 1000); +conf.setBoolean(QuotaUtil.QUOTA_CONF_KEY, true); +TEST_UTIL.startMiniCluster(1); + } + + @AfterClass + public static void tearDown() throws Exception { +TEST_UTIL.shutdownMiniCluster(); + } + + @Before + public void removeAllQuotas() throws Exception { +final Connection conn = TEST_UTIL.getConnection(); +
[18/49] hbase git commit: HBASE-17428 Implement informational RPCs for space quotas
http://git-wip-us.apache.org/repos/asf/hbase/blob/80a1f8fa/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/protobuf/generated/AdminProtos.java -- diff --git a/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/protobuf/generated/AdminProtos.java b/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/protobuf/generated/AdminProtos.java index a567f97..3760619 100644 --- a/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/protobuf/generated/AdminProtos.java +++ b/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/protobuf/generated/AdminProtos.java @@ -601,7 +601,7 @@ public final class AdminProtos { * required .hbase.pb.RegionSpecifier region = 1; */ private org.apache.hadoop.hbase.shaded.com.google.protobuf.SingleFieldBuilderV3< - org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos.RegionSpecifier, org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos.RegionSpecifier.Builder, org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos.RegionSpecifierOrBuilder> + org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos.RegionSpecifier, org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos.RegionSpecifier.Builder, org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos.RegionSpecifierOrBuilder> getRegionFieldBuilder() { if (regionBuilder_ == null) { regionBuilder_ = new org.apache.hadoop.hbase.shaded.com.google.protobuf.SingleFieldBuilderV3< @@ -1450,7 +1450,7 @@ public final class AdminProtos { * required .hbase.pb.RegionInfo region_info = 1; */ private org.apache.hadoop.hbase.shaded.com.google.protobuf.SingleFieldBuilderV3< - org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos.RegionInfo, org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos.RegionInfo.Builder, org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos.RegionInfoOrBuilder> + org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos.RegionInfo, org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos.RegionInfo.Builder, org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos.RegionInfoOrBuilder> getRegionInfoFieldBuilder() { if (regionInfoBuilder_ == null) { regionInfoBuilder_ = new org.apache.hadoop.hbase.shaded.com.google.protobuf.SingleFieldBuilderV3< @@ -2204,7 +2204,7 @@ public final class AdminProtos { * required .hbase.pb.RegionSpecifier region = 1; */ private org.apache.hadoop.hbase.shaded.com.google.protobuf.SingleFieldBuilderV3< - org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos.RegionSpecifier, org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos.RegionSpecifier.Builder, org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos.RegionSpecifierOrBuilder> + org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos.RegionSpecifier, org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos.RegionSpecifier.Builder, org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos.RegionSpecifierOrBuilder> getRegionFieldBuilder() { if (regionBuilder_ == null) { regionBuilder_ = new org.apache.hadoop.hbase.shaded.com.google.protobuf.SingleFieldBuilderV3< @@ -3281,7 +3281,7 @@ public final class AdminProtos { /** * repeated .hbase.pb.RegionInfo region_info = 1; */ - java.util.List + java.util.List getRegionInfoList(); /** * repeated .hbase.pb.RegionInfo region_info = 1; @@ -3294,7 +3294,7 @@ public final class AdminProtos { /** * repeated .hbase.pb.RegionInfo region_info = 1; */ -java.util.List +java.util.List getRegionInfoOrBuilderList(); /** * repeated .hbase.pb.RegionInfo region_info = 1; @@ -3392,7 +3392,7 @@ public final class AdminProtos { /** * repeated .hbase.pb.RegionInfo region_info = 1; */ -public java.util.List +public java.util.List getRegionInfoOrBuilderList() { return regionInfo_; } @@ -3699,7 +3699,7 @@ public final class AdminProtos { regionInfoBuilder_ = null; regionInfo_ = other.regionInfo_; bitField0_ = (bitField0_ & ~0x0001); - regionInfoBuilder_ = + regionInfoBuilder_ = org.apache.hadoop.hbase.shaded.com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders ? getRegionInfoFieldBuilder() : null; } else { @@ -3935,7 +3935,7 @@ public final class AdminProtos { /** * repeated .hbase.pb.RegionInfo region_info = 1; */ - public java.util.List + public java.util.List getRegionInfoOrBuilderList() {
[24/49] hbase git commit: HBASE-17001 Enforce quota violation policies in the RegionServer
http://git-wip-us.apache.org/repos/asf/hbase/blob/34ba143f/hbase-server/src/test/java/org/apache/hadoop/hbase/quotas/TestQuotaObserverChoreWithMiniCluster.java -- diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/quotas/TestQuotaObserverChoreWithMiniCluster.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/quotas/TestQuotaObserverChoreWithMiniCluster.java index c493b25..943c898 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/quotas/TestQuotaObserverChoreWithMiniCluster.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/quotas/TestQuotaObserverChoreWithMiniCluster.java @@ -22,16 +22,12 @@ import static org.junit.Assert.assertNull; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; -import java.io.IOException; -import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; import java.util.HashMap; import java.util.HashSet; -import java.util.List; import java.util.Map; import java.util.Map.Entry; -import java.util.Random; import java.util.Set; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicLong; @@ -40,20 +36,15 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.hbase.HBaseTestingUtility; -import org.apache.hadoop.hbase.HColumnDescriptor; -import org.apache.hadoop.hbase.HTableDescriptor; import org.apache.hadoop.hbase.NamespaceDescriptor; import org.apache.hadoop.hbase.NamespaceNotFoundException; import org.apache.hadoop.hbase.TableName; import org.apache.hadoop.hbase.client.Admin; import org.apache.hadoop.hbase.client.Connection; -import org.apache.hadoop.hbase.client.Put; -import org.apache.hadoop.hbase.client.Table; import org.apache.hadoop.hbase.master.HMaster; import org.apache.hadoop.hbase.quotas.QuotaObserverChore.TablesWithQuotas; import org.apache.hadoop.hbase.shaded.protobuf.generated.QuotaProtos.SpaceQuota; import org.apache.hadoop.hbase.testclassification.LargeTests; -import org.apache.hadoop.hbase.util.Bytes; import org.junit.AfterClass; import org.junit.Before; import org.junit.BeforeClass; @@ -62,7 +53,6 @@ import org.junit.Test; import org.junit.experimental.categories.Category; import org.junit.rules.TestName; -import com.google.common.collect.HashMultimap; import com.google.common.collect.Iterables; import com.google.common.collect.Multimap; @@ -72,11 +62,8 @@ import com.google.common.collect.Multimap; @Category(LargeTests.class) public class TestQuotaObserverChoreWithMiniCluster { private static final Log LOG = LogFactory.getLog(TestQuotaObserverChoreWithMiniCluster.class); - private static final int SIZE_PER_VALUE = 256; - private static final String F1 = "f1"; private static final HBaseTestingUtility TEST_UTIL = new HBaseTestingUtility(); private static final AtomicLong COUNTER = new AtomicLong(0); - private static final long ONE_MEGABYTE = 1024L * 1024L; private static final long DEFAULT_WAIT_MILLIS = 500; @Rule @@ -84,18 +71,19 @@ public class TestQuotaObserverChoreWithMiniCluster { private HMaster master; private QuotaObserverChore chore; - private SpaceQuotaViolationNotifierForTest violationNotifier; + private SpaceQuotaSnapshotNotifierForTest snapshotNotifier; + private SpaceQuotaHelperForTests helper; @BeforeClass public static void setUp() throws Exception { Configuration conf = TEST_UTIL.getConfiguration(); conf.setInt(FileSystemUtilizationChore.FS_UTILIZATION_CHORE_DELAY_KEY, 1000); conf.setInt(FileSystemUtilizationChore.FS_UTILIZATION_CHORE_PERIOD_KEY, 1000); -conf.setInt(QuotaObserverChore.VIOLATION_OBSERVER_CHORE_DELAY_KEY, 1000); -conf.setInt(QuotaObserverChore.VIOLATION_OBSERVER_CHORE_PERIOD_KEY, 1000); +conf.setInt(QuotaObserverChore.QUOTA_OBSERVER_CHORE_DELAY_KEY, 1000); +conf.setInt(QuotaObserverChore.QUOTA_OBSERVER_CHORE_PERIOD_KEY, 1000); conf.setBoolean(QuotaUtil.QUOTA_CONF_KEY, true); -conf.setClass(SpaceQuotaViolationNotifierFactory.VIOLATION_NOTIFIER_KEY, -SpaceQuotaViolationNotifierForTest.class, SpaceQuotaViolationNotifier.class); +conf.setClass(SpaceQuotaSnapshotNotifierFactory.SNAPSHOT_NOTIFIER_KEY, +SpaceQuotaSnapshotNotifierForTest.class, SpaceQuotaSnapshotNotifier.class); TEST_UTIL.startMiniCluster(1); } @@ -131,40 +119,55 @@ public class TestQuotaObserverChoreWithMiniCluster { } master = TEST_UTIL.getMiniHBaseCluster().getMaster(); -violationNotifier = -(SpaceQuotaViolationNotifierForTest) master.getSpaceQuotaViolationNotifier(); -violationNotifier.clearTableViolations(); +snapshotNotifier = +(SpaceQuotaSnapshotNotifierForTest) master.getSpaceQuotaSnapshotNotifier(); +snapshotNotifier.clearSnapshots(); chore = master.getQuotaObserverChore(); +
[09/49] hbase git commit: HBASE-16995 Build client Java API and client protobuf messages - addendum fixes line lengths (Josh Elser)
HBASE-16995 Build client Java API and client protobuf messages - addendum fixes line lengths (Josh Elser) Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/c5172169 Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/c5172169 Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/c5172169 Branch: refs/heads/master Commit: c5172169f23e20fb4df55f803dad115a47164be9 Parents: 140413c Author: tedyuAuthored: Mon Nov 21 13:00:27 2016 -0800 Committer: Josh Elser Committed: Mon May 22 13:41:35 2017 -0400 -- .../hbase/quotas/QuotaSettingsFactory.java | 20 .../hadoop/hbase/quotas/SpaceLimitSettings.java | 8 .../hbase/shaded/protobuf/ProtobufUtil.java | 7 --- 3 files changed, 20 insertions(+), 15 deletions(-) -- http://git-wip-us.apache.org/repos/asf/hbase/blob/c5172169/hbase-client/src/main/java/org/apache/hadoop/hbase/quotas/QuotaSettingsFactory.java -- diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/quotas/QuotaSettingsFactory.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/quotas/QuotaSettingsFactory.java index 8512e39..7f1c180 100644 --- a/hbase-client/src/main/java/org/apache/hadoop/hbase/quotas/QuotaSettingsFactory.java +++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/quotas/QuotaSettingsFactory.java @@ -128,7 +128,8 @@ public class QuotaSettingsFactory { static QuotaSettings fromSpace(TableName table, String namespace, SpaceQuota protoQuota) { if ((null == table && null == namespace) || (null != table && null != namespace)) { - throw new IllegalArgumentException("Can only construct SpaceLimitSettings for a table or namespace."); + throw new IllegalArgumentException( + "Can only construct SpaceLimitSettings for a table or namespace."); } if (null != table) { return SpaceLimitSettings.fromSpaceQuota(table, protoQuota); @@ -300,29 +301,32 @@ public class QuotaSettingsFactory { */ /** - * Creates a {@link QuotaSettings} object to limit the FileSystem space usage for the given table to the given size in bytes. - * When the space usage is exceeded by the table, the provided {@link SpaceViolationPolicy} is enacted on the table. + * Creates a {@link QuotaSettings} object to limit the FileSystem space usage for the given table + * to the given size in bytes. When the space usage is exceeded by the table, the provided + * {@link SpaceViolationPolicy} is enacted on the table. * * @param tableName The name of the table on which the quota should be applied. * @param sizeLimit The limit of a table's size in bytes. * @param violationPolicy The action to take when the quota is exceeded. * @return An {@link QuotaSettings} object. */ - public static QuotaSettings limitTableSpace(final TableName tableName, long sizeLimit, final SpaceViolationPolicy violationPolicy) { + public static QuotaSettings limitTableSpace( + final TableName tableName, long sizeLimit, final SpaceViolationPolicy violationPolicy) { return new SpaceLimitSettings(tableName, sizeLimit, violationPolicy); } /** - * Creates a {@link QuotaSettings} object to limit the FileSystem space usage for the given namespace to the given size in bytes. - * When the space usage is exceeded by all tables in the namespace, the provided {@link SpaceViolationPolicy} is enacted on - * all tables in the namespace. + * Creates a {@link QuotaSettings} object to limit the FileSystem space usage for the given + * namespace to the given size in bytes. When the space usage is exceeded by all tables in the + * namespace, the provided {@link SpaceViolationPolicy} is enacted on all tables in the namespace. * * @param namespace The namespace on which the quota should be applied. * @param sizeLimit The limit of the namespace's size in bytes. * @param violationPolicy The action to take when the the quota is exceeded. * @return An {@link QuotaSettings} object. */ - public static QuotaSettings limitNamespaceSpace(final String namespace, long sizeLimit, final SpaceViolationPolicy violationPolicy) { + public static QuotaSettings limitNamespaceSpace( + final String namespace, long sizeLimit, final SpaceViolationPolicy violationPolicy) { return new SpaceLimitSettings(namespace, sizeLimit, violationPolicy); } } http://git-wip-us.apache.org/repos/asf/hbase/blob/c5172169/hbase-client/src/main/java/org/apache/hadoop/hbase/quotas/SpaceLimitSettings.java -- diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/quotas/SpaceLimitSettings.java
[30/49] hbase git commit: HBASE-17568 Better handle stale/missing region size reports
HBASE-17568 Better handle stale/missing region size reports * Expire region reports in the master after a timeout. * Move regions in violation out of violation when insufficient region size reports are observed. Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/91b4d2e8 Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/91b4d2e8 Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/91b4d2e8 Branch: refs/heads/master Commit: 91b4d2e827e61a4bedae232aae3f8f5a10015ae3 Parents: 8159eae Author: Josh ElserAuthored: Fri Feb 3 16:33:47 2017 -0500 Committer: Josh Elser Committed: Mon May 22 13:41:35 2017 -0400 -- .../hadoop/hbase/master/MasterRpcServices.java | 4 +- .../hadoop/hbase/quotas/MasterQuotaManager.java | 86 ++- .../hadoop/hbase/quotas/QuotaObserverChore.java | 53 - .../hbase/quotas/TestMasterQuotaManager.java| 48 +++- .../TestQuotaObserverChoreRegionReports.java| 233 +++ 5 files changed, 412 insertions(+), 12 deletions(-) -- http://git-wip-us.apache.org/repos/asf/hbase/blob/91b4d2e8/hbase-server/src/main/java/org/apache/hadoop/hbase/master/MasterRpcServices.java -- diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/MasterRpcServices.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/MasterRpcServices.java index 867fd84..50a75b9 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/MasterRpcServices.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/MasterRpcServices.java @@ -150,6 +150,7 @@ import org.apache.hadoop.hbase.shaded.protobuf.generated.SnapshotProtos.Snapshot import org.apache.hadoop.hbase.snapshot.ClientSnapshotDescriptionUtils; import org.apache.hadoop.hbase.snapshot.SnapshotDescriptionUtils; import org.apache.hadoop.hbase.util.Bytes; +import org.apache.hadoop.hbase.util.EnvironmentEdgeManager; import org.apache.hadoop.hbase.util.ForeignExceptionUtil; import org.apache.hadoop.hbase.util.Pair; import org.apache.zookeeper.KeeperException; @@ -1942,8 +1943,9 @@ public class MasterRpcServices extends RSRpcServices return RegionSpaceUseReportResponse.newBuilder().build(); } MasterQuotaManager quotaManager = this.master.getMasterQuotaManager(); + final long now = EnvironmentEdgeManager.currentTime(); for (RegionSpaceUse report : request.getSpaceUseList()) { -quotaManager.addRegionSize(HRegionInfo.convert(report.getRegion()), report.getSize()); +quotaManager.addRegionSize(HRegionInfo.convert(report.getRegion()), report.getSize(), now); } return RegionSpaceUseReportResponse.newBuilder().build(); } catch (Exception e) { http://git-wip-us.apache.org/repos/asf/hbase/blob/91b4d2e8/hbase-server/src/main/java/org/apache/hadoop/hbase/quotas/MasterQuotaManager.java -- diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/quotas/MasterQuotaManager.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/quotas/MasterQuotaManager.java index cb614ea..0622dba 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/quotas/MasterQuotaManager.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/quotas/MasterQuotaManager.java @@ -22,9 +22,12 @@ import java.io.IOException; import java.util.Collections; import java.util.HashMap; import java.util.HashSet; +import java.util.Iterator; import java.util.Map; +import java.util.Map.Entry; import java.util.concurrent.ConcurrentHashMap; +import org.apache.commons.lang.builder.HashCodeBuilder; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.hadoop.hbase.DoNotRetryIOException; @@ -47,6 +50,8 @@ import org.apache.hadoop.hbase.shaded.protobuf.generated.QuotaProtos.Throttle; import org.apache.hadoop.hbase.shaded.protobuf.generated.QuotaProtos.ThrottleRequest; import org.apache.hadoop.hbase.shaded.protobuf.generated.QuotaProtos.TimedQuota; +import com.google.common.annotations.VisibleForTesting; + /** * Master Quota Manager. * It is responsible for initialize the quota table on the first-run and @@ -68,7 +73,7 @@ public class MasterQuotaManager implements RegionStateListener { private NamedLock userLocks; private boolean enabled = false; private NamespaceAuditor namespaceQuotaManager; - private ConcurrentHashMap regionSizes; + private ConcurrentHashMap regionSizes; public MasterQuotaManager(final MasterServices masterServices) { this.masterServices = masterServices; @@ -531,21 +536,88 @@ public class
[11/49] hbase git commit: HBASE-17000 Implement computation of online region sizes and report to the Master
http://git-wip-us.apache.org/repos/asf/hbase/blob/6b334cd8/hbase-protocol-shaded/src/main/protobuf/RegionServerStatus.proto -- diff --git a/hbase-protocol-shaded/src/main/protobuf/RegionServerStatus.proto b/hbase-protocol-shaded/src/main/protobuf/RegionServerStatus.proto index 1c373ee..23ddd43 100644 --- a/hbase-protocol-shaded/src/main/protobuf/RegionServerStatus.proto +++ b/hbase-protocol-shaded/src/main/protobuf/RegionServerStatus.proto @@ -141,6 +141,22 @@ message SplitTableRegionResponse { optional uint64 proc_id = 1; } +message RegionSpaceUse { + optional RegionInfo region = 1; // A region identifier + optional uint64 size = 2; // The size in bytes of the region +} + +/** + * Reports filesystem usage for regions. + */ +message RegionSpaceUseReportRequest { + repeated RegionSpaceUse space_use = 1; +} + +message RegionSpaceUseReportResponse { + +} + service RegionServerStatusService { /** Called when a region server first starts. */ rpc RegionServerStartup(RegionServerStartupRequest) @@ -182,4 +198,10 @@ service RegionServerStatusService { */ rpc getProcedureResult(GetProcedureResultRequest) returns(GetProcedureResultResponse); + + /** + * Reports Region filesystem space use + */ + rpc ReportRegionSpaceUse(RegionSpaceUseReportRequest) +returns(RegionSpaceUseReportResponse); } http://git-wip-us.apache.org/repos/asf/hbase/blob/6b334cd8/hbase-server/src/main/java/org/apache/hadoop/hbase/master/MasterRpcServices.java -- diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/MasterRpcServices.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/MasterRpcServices.java index baf962d..db48bdb 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/MasterRpcServices.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/MasterRpcServices.java @@ -58,6 +58,7 @@ import org.apache.hadoop.hbase.mob.MobUtils; import org.apache.hadoop.hbase.procedure.MasterProcedureManager; import org.apache.hadoop.hbase.procedure2.LockInfo; import org.apache.hadoop.hbase.procedure2.Procedure; +import org.apache.hadoop.hbase.quotas.MasterQuotaManager; import org.apache.hadoop.hbase.regionserver.RSRpcServices; import org.apache.hadoop.hbase.replication.ReplicationException; import org.apache.hadoop.hbase.replication.ReplicationPeerConfig; @@ -94,6 +95,9 @@ import org.apache.hadoop.hbase.shaded.protobuf.generated.RegionServerStatusProto import org.apache.hadoop.hbase.shaded.protobuf.generated.RegionServerStatusProtos.RegionServerStartupRequest; import org.apache.hadoop.hbase.shaded.protobuf.generated.RegionServerStatusProtos.RegionServerStartupResponse; import org.apache.hadoop.hbase.shaded.protobuf.generated.RegionServerStatusProtos.RegionServerStatusService; +import org.apache.hadoop.hbase.shaded.protobuf.generated.RegionServerStatusProtos.RegionSpaceUse; +import org.apache.hadoop.hbase.shaded.protobuf.generated.RegionServerStatusProtos.RegionSpaceUseReportRequest; +import org.apache.hadoop.hbase.shaded.protobuf.generated.RegionServerStatusProtos.RegionSpaceUseReportResponse; import org.apache.hadoop.hbase.shaded.protobuf.generated.RegionServerStatusProtos.RegionStateTransition; import org.apache.hadoop.hbase.shaded.protobuf.generated.RegionServerStatusProtos.ReportRSFatalErrorRequest; import org.apache.hadoop.hbase.shaded.protobuf.generated.RegionServerStatusProtos.ReportRSFatalErrorResponse; @@ -1901,4 +1905,19 @@ public class MasterRpcServices extends RSRpcServices throw new ServiceException(e); } } + + @Override + public RegionSpaceUseReportResponse reportRegionSpaceUse(RpcController controller, + RegionSpaceUseReportRequest request) throws ServiceException { +try { + master.checkInitialized(); + MasterQuotaManager quotaManager = this.master.getMasterQuotaManager(); + for (RegionSpaceUse report : request.getSpaceUseList()) { +quotaManager.addRegionSize(HRegionInfo.convert(report.getRegion()), report.getSize()); + } + return RegionSpaceUseReportResponse.newBuilder().build(); +} catch (Exception e) { + throw new ServiceException(e); +} + } } http://git-wip-us.apache.org/repos/asf/hbase/blob/6b334cd8/hbase-server/src/main/java/org/apache/hadoop/hbase/quotas/FileSystemUtilizationChore.java -- diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/quotas/FileSystemUtilizationChore.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/quotas/FileSystemUtilizationChore.java new file mode 100644 index 000..01540eb --- /dev/null +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/quotas/FileSystemUtilizationChore.java @@ -0,0 +1,205 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + *
[43/49] hbase git commit: HBASE-17978 Ensure superusers can circumvent actions restricted by space quota violations
HBASE-17978 Ensure superusers can circumvent actions restricted by space quota violations Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/b971b449 Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/b971b449 Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/b971b449 Branch: refs/heads/master Commit: b971b449e8de700d7709df2032a5a1429d369394 Parents: ed618da Author: Josh ElserAuthored: Wed May 3 12:10:50 2017 -0400 Committer: Josh Elser Committed: Mon May 22 13:41:36 2017 -0400 -- .../hbase/regionserver/RSRpcServices.java | 4 + .../hbase/quotas/SpaceQuotaHelperForTests.java | 27 +- .../quotas/TestSuperUserQuotaPermissions.java | 300 +++ 3 files changed, 329 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/hbase/blob/b971b449/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/RSRpcServices.java -- diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/RSRpcServices.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/RSRpcServices.java index 41fe3e5..b3ca94d 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/RSRpcServices.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/RSRpcServices.java @@ -105,6 +105,7 @@ import org.apache.hadoop.hbase.regionserver.handler.OpenMetaHandler; import org.apache.hadoop.hbase.regionserver.handler.OpenPriorityRegionHandler; import org.apache.hadoop.hbase.regionserver.handler.OpenRegionHandler; import org.apache.hadoop.hbase.regionserver.wal.WALEdit; +import org.apache.hadoop.hbase.security.Superusers; import org.apache.hadoop.hbase.security.User; import org.apache.hadoop.hbase.shaded.com.google.protobuf.ByteString; import org.apache.hadoop.hbase.shaded.com.google.protobuf.Message; @@ -1509,7 +1510,10 @@ public class RSRpcServices implements HBaseRPCErrorHandler, checkOpen(); requestCount.increment(); Region region = getRegion(request.getRegion()); + // Quota support is enabled, the requesting user is not system/super user + // and a quota policy is enforced that disables compactions. if (QuotaUtil.isQuotaEnabled(getConfiguration()) && + !Superusers.isSuperUser(RpcServer.getRequestUser()) && this.regionServer.getRegionServerSpaceQuotaManager().areCompactionsDisabled( region.getTableDesc().getTableName())) { throw new DoNotRetryIOException("Compactions on this region are " http://git-wip-us.apache.org/repos/asf/hbase/blob/b971b449/hbase-server/src/test/java/org/apache/hadoop/hbase/quotas/SpaceQuotaHelperForTests.java -- diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/quotas/SpaceQuotaHelperForTests.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/quotas/SpaceQuotaHelperForTests.java index b7c51a2..1e2235a 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/quotas/SpaceQuotaHelperForTests.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/quotas/SpaceQuotaHelperForTests.java @@ -110,6 +110,18 @@ public class SpaceQuotaHelperForTests { } } + QuotaSettings getTableSpaceQuota(Connection conn, TableName tn) throws IOException { +try (QuotaRetriever scanner = QuotaRetriever.open( +conn.getConfiguration(), new QuotaFilter().setTableFilter(tn.getNameAsString( { + for (QuotaSettings setting : scanner) { +if (setting.getTableName().equals(tn) && setting.getQuotaType() == QuotaType.SPACE) { + return setting; +} + } + return null; +} + } + /** * Waits 30seconds for the HBase quota table to exist. */ @@ -130,7 +142,10 @@ public class SpaceQuotaHelperForTests { } void writeData(TableName tn, long sizeInBytes) throws IOException { -final Connection conn = testUtil.getConnection(); +writeData(testUtil.getConnection(), tn, sizeInBytes); + } + + void writeData(Connection conn, TableName tn, long sizeInBytes) throws IOException { final Table table = conn.getTable(tn); try { List updates = new ArrayList<>(); @@ -226,8 +241,16 @@ public class SpaceQuotaHelperForTests { return createTableWithRegions(NamespaceDescriptor.DEFAULT_NAMESPACE_NAME_STR, numRegions); } + TableName createTableWithRegions(Admin admin, int numRegions) throws Exception { +return createTableWithRegions( +testUtil.getAdmin(), NamespaceDescriptor.DEFAULT_NAMESPACE_NAME_STR, numRegions); + } + TableName createTableWithRegions(String namespace, int numRegions) throws Exception { -
[17/49] hbase git commit: HBASE-17428 Implement informational RPCs for space quotas
http://git-wip-us.apache.org/repos/asf/hbase/blob/80a1f8fa/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/protobuf/generated/MasterProtos.java -- diff --git a/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/protobuf/generated/MasterProtos.java b/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/protobuf/generated/MasterProtos.java index b5b41f3..6780414 100644 --- a/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/protobuf/generated/MasterProtos.java +++ b/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/protobuf/generated/MasterProtos.java @@ -72382,6 +72382,18 @@ public final class MasterProtos { org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.RemoveDrainFromRegionServersRequest request, org.apache.hadoop.hbase.shaded.com.google.protobuf.RpcCallback done); + /** + * + ** Fetches the Master's view of space quotas + * + * + * rpc GetSpaceQuotaRegionSizes(.hbase.pb.GetSpaceQuotaRegionSizesRequest) returns (.hbase.pb.GetSpaceQuotaRegionSizesResponse); + */ + public abstract void getSpaceQuotaRegionSizes( + org.apache.hadoop.hbase.shaded.com.google.protobuf.RpcController controller, + org.apache.hadoop.hbase.shaded.protobuf.generated.QuotaProtos.GetSpaceQuotaRegionSizesRequest request, + org.apache.hadoop.hbase.shaded.com.google.protobuf.RpcCallback done); + } public static org.apache.hadoop.hbase.shaded.com.google.protobuf.Service newReflectiveService( @@ -72955,6 +72967,14 @@ public final class MasterProtos { impl.removeDrainFromRegionServers(controller, request, done); } +@java.lang.Override +public void getSpaceQuotaRegionSizes( +org.apache.hadoop.hbase.shaded.com.google.protobuf.RpcController controller, + org.apache.hadoop.hbase.shaded.protobuf.generated.QuotaProtos.GetSpaceQuotaRegionSizesRequest request, + org.apache.hadoop.hbase.shaded.com.google.protobuf.RpcCallback done) { + impl.getSpaceQuotaRegionSizes(controller, request, done); +} + }; } @@ -73119,6 +73139,8 @@ public final class MasterProtos { return impl.drainRegionServers(controller, (org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.DrainRegionServersRequest)request); case 70: return impl.removeDrainFromRegionServers(controller, (org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.RemoveDrainFromRegionServersRequest)request); +case 71: + return impl.getSpaceQuotaRegionSizes(controller, (org.apache.hadoop.hbase.shaded.protobuf.generated.QuotaProtos.GetSpaceQuotaRegionSizesRequest)request); default: throw new java.lang.AssertionError("Can't get here."); } @@ -73275,6 +73297,8 @@ public final class MasterProtos { return org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.DrainRegionServersRequest.getDefaultInstance(); case 70: return org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.RemoveDrainFromRegionServersRequest.getDefaultInstance(); +case 71: + return org.apache.hadoop.hbase.shaded.protobuf.generated.QuotaProtos.GetSpaceQuotaRegionSizesRequest.getDefaultInstance(); default: throw new java.lang.AssertionError("Can't get here."); } @@ -73431,6 +73455,8 @@ public final class MasterProtos { return org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.DrainRegionServersResponse.getDefaultInstance(); case 70: return org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.RemoveDrainFromRegionServersResponse.getDefaultInstance(); +case 71: + return org.apache.hadoop.hbase.shaded.protobuf.generated.QuotaProtos.GetSpaceQuotaRegionSizesResponse.getDefaultInstance(); default: throw new java.lang.AssertionError("Can't get here."); } @@ -74318,6 +74344,18 @@ public final class MasterProtos { org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.RemoveDrainFromRegionServersRequest request, org.apache.hadoop.hbase.shaded.com.google.protobuf.RpcCallback done); +/** + * + ** Fetches the Master's view of space quotas + * + * + * rpc GetSpaceQuotaRegionSizes(.hbase.pb.GetSpaceQuotaRegionSizesRequest) returns (.hbase.pb.GetSpaceQuotaRegionSizesResponse); + */ +public abstract void getSpaceQuotaRegionSizes( +org.apache.hadoop.hbase.shaded.com.google.protobuf.RpcController controller, + org.apache.hadoop.hbase.shaded.protobuf.generated.QuotaProtos.GetSpaceQuotaRegionSizesRequest
[33/49] hbase git commit: HBASE-17002 JMX metrics and some UI additions for space quotas
http://git-wip-us.apache.org/repos/asf/hbase/blob/13af7f8a/hbase-protocol-shaded/src/main/protobuf/Master.proto -- diff --git a/hbase-protocol-shaded/src/main/protobuf/Master.proto b/hbase-protocol-shaded/src/main/protobuf/Master.proto index 4706e90..3d6ae1b 100644 --- a/hbase-protocol-shaded/src/main/protobuf/Master.proto +++ b/hbase-protocol-shaded/src/main/protobuf/Master.proto @@ -943,7 +943,11 @@ service MasterService { rpc removeDrainFromRegionServers(RemoveDrainFromRegionServersRequest) returns(RemoveDrainFromRegionServersResponse); - /** Fetches the Master's view of space quotas */ + /** Fetches the Master's view of space utilization */ rpc GetSpaceQuotaRegionSizes(GetSpaceQuotaRegionSizesRequest) returns(GetSpaceQuotaRegionSizesResponse); + + /** Fetches the Master's view of quotas */ + rpc GetQuotaStates(GetQuotaStatesRequest) +returns(GetQuotaStatesResponse); } http://git-wip-us.apache.org/repos/asf/hbase/blob/13af7f8a/hbase-protocol-shaded/src/main/protobuf/Quota.proto -- diff --git a/hbase-protocol-shaded/src/main/protobuf/Quota.proto b/hbase-protocol-shaded/src/main/protobuf/Quota.proto index 2d7e5f5..1a6d5ed 100644 --- a/hbase-protocol-shaded/src/main/protobuf/Quota.proto +++ b/hbase-protocol-shaded/src/main/protobuf/Quota.proto @@ -119,6 +119,7 @@ message GetSpaceQuotaRegionSizesResponse { message RegionSizes { optional TableName table_name = 1; optional uint64 size = 2; + } repeated RegionSizes sizes = 1; } @@ -146,3 +147,19 @@ message GetSpaceQuotaEnforcementsResponse { } repeated TableViolationPolicy violation_policies = 1; } + +message GetQuotaStatesRequest { +} + +message GetQuotaStatesResponse { + message TableQuotaSnapshot { +optional TableName table_name = 1; +optional SpaceQuotaSnapshot snapshot = 2; + } + message NamespaceQuotaSnapshot { +optional string namespace = 1; +optional SpaceQuotaSnapshot snapshot = 2; + } + repeated TableQuotaSnapshot table_snapshots = 1; + repeated NamespaceQuotaSnapshot ns_snapshots = 2; +} http://git-wip-us.apache.org/repos/asf/hbase/blob/13af7f8a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java -- diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java index 78268a8..33927de 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java @@ -912,7 +912,7 @@ public class HMaster extends HRegionServer implements MasterServices { // Create the quota snapshot notifier spaceQuotaSnapshotNotifier = createQuotaSnapshotNotifier(); spaceQuotaSnapshotNotifier.initialize(getClusterConnection()); - this.quotaObserverChore = new QuotaObserverChore(this); + this.quotaObserverChore = new QuotaObserverChore(this, getMasterMetrics()); // Start the chore to read the region FS space reports and act on them getChoreService().scheduleChore(quotaObserverChore); } http://git-wip-us.apache.org/repos/asf/hbase/blob/13af7f8a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/MasterRpcServices.java -- diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/MasterRpcServices.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/MasterRpcServices.java index 50a75b9..2ac6fee 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/MasterRpcServices.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/MasterRpcServices.java @@ -62,7 +62,9 @@ import org.apache.hadoop.hbase.procedure.MasterProcedureManager; import org.apache.hadoop.hbase.procedure2.LockInfo; import org.apache.hadoop.hbase.procedure2.Procedure; import org.apache.hadoop.hbase.quotas.MasterQuotaManager; +import org.apache.hadoop.hbase.quotas.QuotaObserverChore; import org.apache.hadoop.hbase.quotas.QuotaUtil; +import org.apache.hadoop.hbase.quotas.SpaceQuotaSnapshot; import org.apache.hadoop.hbase.regionserver.RSRpcServices; import org.apache.hadoop.hbase.replication.ReplicationException; import org.apache.hadoop.hbase.replication.ReplicationPeerConfig; @@ -112,8 +114,12 @@ import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.TruncateTa import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.TruncateTableResponse; import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.UnassignRegionRequest; import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.UnassignRegionResponse; +import org.apache.hadoop.hbase.shaded.protobuf.generated.QuotaProtos.GetQuotaStatesRequest;
[48/49] hbase git commit: HBASE-17955 Various reviewboard improvements to space quota work
http://git-wip-us.apache.org/repos/asf/hbase/blob/d671a1db/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/protobuf/generated/QuotaProtos.java -- diff --git a/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/protobuf/generated/QuotaProtos.java b/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/protobuf/generated/QuotaProtos.java index 4577bcf..e8a57e9 100644 --- a/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/protobuf/generated/QuotaProtos.java +++ b/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/protobuf/generated/QuotaProtos.java @@ -4362,7 +4362,7 @@ public final class QuotaProtos { * optional .hbase.pb.SpaceQuota space = 3; */ private org.apache.hadoop.hbase.shaded.com.google.protobuf.SingleFieldBuilderV3< - org.apache.hadoop.hbase.shaded.protobuf.generated.QuotaProtos.SpaceQuota, org.apache.hadoop.hbase.shaded.protobuf.generated.QuotaProtos.SpaceQuota.Builder, org.apache.hadoop.hbase.shaded.protobuf.generated.QuotaProtos.SpaceQuotaOrBuilder> + org.apache.hadoop.hbase.shaded.protobuf.generated.QuotaProtos.SpaceQuota, org.apache.hadoop.hbase.shaded.protobuf.generated.QuotaProtos.SpaceQuota.Builder, org.apache.hadoop.hbase.shaded.protobuf.generated.QuotaProtos.SpaceQuotaOrBuilder> getSpaceFieldBuilder() { if (spaceBuilder_ == null) { spaceBuilder_ = new org.apache.hadoop.hbase.shaded.com.google.protobuf.SingleFieldBuilderV3< @@ -6077,7 +6077,7 @@ public final class QuotaProtos { * optional .hbase.pb.SpaceQuota quota = 1; */ private org.apache.hadoop.hbase.shaded.com.google.protobuf.SingleFieldBuilderV3< - org.apache.hadoop.hbase.shaded.protobuf.generated.QuotaProtos.SpaceQuota, org.apache.hadoop.hbase.shaded.protobuf.generated.QuotaProtos.SpaceQuota.Builder, org.apache.hadoop.hbase.shaded.protobuf.generated.QuotaProtos.SpaceQuotaOrBuilder> + org.apache.hadoop.hbase.shaded.protobuf.generated.QuotaProtos.SpaceQuota, org.apache.hadoop.hbase.shaded.protobuf.generated.QuotaProtos.SpaceQuota.Builder, org.apache.hadoop.hbase.shaded.protobuf.generated.QuotaProtos.SpaceQuotaOrBuilder> getQuotaFieldBuilder() { if (quotaBuilder_ == null) { quotaBuilder_ = new org.apache.hadoop.hbase.shaded.com.google.protobuf.SingleFieldBuilderV3< @@ -6143,13 +6143,13 @@ public final class QuotaProtos { org.apache.hadoop.hbase.shaded.com.google.protobuf.MessageOrBuilder { /** - * optional .hbase.pb.SpaceViolationPolicy policy = 1; + * optional .hbase.pb.SpaceViolationPolicy violation_policy = 1; */ -boolean hasPolicy(); +boolean hasViolationPolicy(); /** - * optional .hbase.pb.SpaceViolationPolicy policy = 1; + * optional .hbase.pb.SpaceViolationPolicy violation_policy = 1; */ - org.apache.hadoop.hbase.shaded.protobuf.generated.QuotaProtos.SpaceViolationPolicy getPolicy(); + org.apache.hadoop.hbase.shaded.protobuf.generated.QuotaProtos.SpaceViolationPolicy getViolationPolicy(); /** * optional bool in_violation = 2; @@ -6163,7 +6163,7 @@ public final class QuotaProtos { /** * * Represents the state of a quota on a table. Either the quota is not in violation - * or it is in violatino there is a violation policy which should be in effect. + * or it is in violation there is a violation policy which should be in effect. * * * Protobuf type {@code hbase.pb.SpaceQuotaStatus} @@ -6177,7 +6177,7 @@ public final class QuotaProtos { super(builder); } private SpaceQuotaStatus() { - policy_ = 1; + violationPolicy_ = 1; inViolation_ = false; } @@ -6216,7 +6216,7 @@ public final class QuotaProtos { unknownFields.mergeVarintField(1, rawValue); } else { bitField0_ |= 0x0001; -policy_ = rawValue; +violationPolicy_ = rawValue; } break; } @@ -6250,19 +6250,19 @@ public final class QuotaProtos { } private int bitField0_; -public static final int POLICY_FIELD_NUMBER = 1; -private int policy_; +public static final int VIOLATION_POLICY_FIELD_NUMBER = 1; +private int violationPolicy_; /** - * optional .hbase.pb.SpaceViolationPolicy policy = 1; + * optional .hbase.pb.SpaceViolationPolicy violation_policy = 1; */ -public boolean hasPolicy() { +public boolean hasViolationPolicy() { return ((bitField0_ & 0x0001) == 0x0001); } /** - * optional .hbase.pb.SpaceViolationPolicy policy = 1; + * optional .hbase.pb.SpaceViolationPolicy violation_policy = 1; */ -public org.apache.hadoop.hbase.shaded.protobuf.generated.QuotaProtos.SpaceViolationPolicy getPolicy()
[01/49] hbase git commit: HBASE-17447 Implement a MasterObserver for automatically deleting space quotas
Repository: hbase Updated Branches: refs/heads/master 56cbc68b0 -> f1a999032 HBASE-17447 Implement a MasterObserver for automatically deleting space quotas When a table or namespace is deleted, it would be nice to automatically delete the quota on said table/NS. It's possible that not all people would want this functionality so we can leave it up to the user to configure this Observer. Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/98ace3d5 Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/98ace3d5 Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/98ace3d5 Branch: refs/heads/master Commit: 98ace3d586d068db03cba14f3dc904628b917eb9 Parents: a8460b8 Author: Josh ElserAuthored: Thu Mar 16 18:54:01 2017 -0400 Committer: Josh Elser Committed: Mon May 22 13:41:35 2017 -0400 -- .../hbase/quotas/MasterSpaceQuotaObserver.java | 85 ++ .../quotas/TestMasterSpaceQuotaObserver.java| 169 +++ src/main/asciidoc/_chapters/ops_mgt.adoc| 17 ++ 3 files changed, 271 insertions(+) -- http://git-wip-us.apache.org/repos/asf/hbase/blob/98ace3d5/hbase-server/src/main/java/org/apache/hadoop/hbase/quotas/MasterSpaceQuotaObserver.java -- diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/quotas/MasterSpaceQuotaObserver.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/quotas/MasterSpaceQuotaObserver.java new file mode 100644 index 000..a3abf32 --- /dev/null +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/quotas/MasterSpaceQuotaObserver.java @@ -0,0 +1,85 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to you under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.hadoop.hbase.quotas; + +import java.io.IOException; + +import org.apache.hadoop.conf.Configuration; +import org.apache.hadoop.hbase.CoprocessorEnvironment; +import org.apache.hadoop.hbase.TableName; +import org.apache.hadoop.hbase.classification.InterfaceAudience; +import org.apache.hadoop.hbase.client.Admin; +import org.apache.hadoop.hbase.client.Connection; +import org.apache.hadoop.hbase.coprocessor.MasterCoprocessorEnvironment; +import org.apache.hadoop.hbase.coprocessor.MasterObserver; +import org.apache.hadoop.hbase.coprocessor.ObserverContext; +import org.apache.hadoop.hbase.master.MasterServices; +import org.apache.hadoop.hbase.shaded.protobuf.generated.QuotaProtos.Quotas; + +/** + * An observer to automatically delete space quotas when a table/namespace + * are deleted. + */ +@InterfaceAudience.Private +public class MasterSpaceQuotaObserver implements MasterObserver { + private CoprocessorEnvironment cpEnv; + private Configuration conf; + private boolean quotasEnabled = false; + + @Override + public void start(CoprocessorEnvironment ctx) throws IOException { +this.cpEnv = ctx; +this.conf = cpEnv.getConfiguration(); +this.quotasEnabled = QuotaUtil.isQuotaEnabled(conf); + } + + @Override + public void postDeleteTable( + ObserverContext ctx, TableName tableName) throws IOException { +// Do nothing if quotas aren't enabled +if (!quotasEnabled) { + return; +} +final MasterServices master = ctx.getEnvironment().getMasterServices(); +final Connection conn = master.getConnection(); +Quotas quotas = QuotaUtil.getTableQuota(master.getConnection(), tableName); +if (null != quotas && quotas.hasSpace()) { + QuotaSettings settings = QuotaSettingsFactory.removeTableSpaceLimit(tableName); + try (Admin admin = conn.getAdmin()) { +admin.setQuota(settings); + } +} + } + + @Override + public void postDeleteNamespace( + ObserverContext ctx, String namespace) throws IOException { +// Do nothing if quotas aren't enabled +if (!quotasEnabled) { + return; +} +final MasterServices master = ctx.getEnvironment().getMasterServices(); +final Connection conn = master.getConnection(); +Quotas quotas = QuotaUtil.getNamespaceQuota(master.getConnection(),
[03/49] hbase git commit: HBASE-17478 Avoid reporting FS use when quotas are disabled
HBASE-17478 Avoid reporting FS use when quotas are disabled Also, gracefully produce responses when quotas are disabled. Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/4ad49bc3 Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/4ad49bc3 Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/4ad49bc3 Branch: refs/heads/master Commit: 4ad49bc3ac86708144d126ea0a4cbfa68f226834 Parents: f1066cd Author: Josh ElserAuthored: Tue Jan 17 14:41:45 2017 -0500 Committer: Josh Elser Committed: Mon May 22 13:41:35 2017 -0400 -- .../hadoop/hbase/master/MasterRpcServices.java | 4 +++ .../hadoop/hbase/quotas/MasterQuotaManager.java | 13 +-- .../hbase/regionserver/HRegionServer.java | 5 ++- .../hbase/quotas/TestMasterQuotaManager.java| 37 4 files changed, 56 insertions(+), 3 deletions(-) -- http://git-wip-us.apache.org/repos/asf/hbase/blob/4ad49bc3/hbase-server/src/main/java/org/apache/hadoop/hbase/master/MasterRpcServices.java -- diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/MasterRpcServices.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/MasterRpcServices.java index db48bdb..be782df 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/MasterRpcServices.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/MasterRpcServices.java @@ -59,6 +59,7 @@ import org.apache.hadoop.hbase.procedure.MasterProcedureManager; import org.apache.hadoop.hbase.procedure2.LockInfo; import org.apache.hadoop.hbase.procedure2.Procedure; import org.apache.hadoop.hbase.quotas.MasterQuotaManager; +import org.apache.hadoop.hbase.quotas.QuotaUtil; import org.apache.hadoop.hbase.regionserver.RSRpcServices; import org.apache.hadoop.hbase.replication.ReplicationException; import org.apache.hadoop.hbase.replication.ReplicationPeerConfig; @@ -1911,6 +1912,9 @@ public class MasterRpcServices extends RSRpcServices RegionSpaceUseReportRequest request) throws ServiceException { try { master.checkInitialized(); + if (!QuotaUtil.isQuotaEnabled(master.getConfiguration())) { +return RegionSpaceUseReportResponse.newBuilder().build(); + } MasterQuotaManager quotaManager = this.master.getMasterQuotaManager(); for (RegionSpaceUse report : request.getSpaceUseList()) { quotaManager.addRegionSize(HRegionInfo.convert(report.getRegion()), report.getSize()); http://git-wip-us.apache.org/repos/asf/hbase/blob/4ad49bc3/hbase-server/src/main/java/org/apache/hadoop/hbase/quotas/MasterQuotaManager.java -- diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/quotas/MasterQuotaManager.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/quotas/MasterQuotaManager.java index a5832f9..cb614ea 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/quotas/MasterQuotaManager.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/quotas/MasterQuotaManager.java @@ -19,6 +19,7 @@ package org.apache.hadoop.hbase.quotas; import java.io.IOException; +import java.util.Collections; import java.util.HashMap; import java.util.HashSet; import java.util.Map; @@ -58,6 +59,8 @@ import org.apache.hadoop.hbase.shaded.protobuf.generated.QuotaProtos.TimedQuota; @InterfaceStability.Evolving public class MasterQuotaManager implements RegionStateListener { private static final Log LOG = LogFactory.getLog(MasterQuotaManager.class); + private static final Map EMPTY_MAP = Collections.unmodifiableMap( + new HashMap<>()); private final MasterServices masterServices; private NamedLock namespaceLocks; @@ -529,13 +532,19 @@ public class MasterQuotaManager implements RegionStateListener { } public void addRegionSize(HRegionInfo hri, long size) { -// TODO Make proper API +if (null == regionSizes) { + return; +} +// TODO Make proper API? // TODO Prevent from growing indefinitely regionSizes.put(hri, size); } public Map snapshotRegionSizes() { -// TODO Make proper API +if (null == regionSizes) { + return EMPTY_MAP; +} +// TODO Make proper API? return new HashMap<>(regionSizes); } } http://git-wip-us.apache.org/repos/asf/hbase/blob/4ad49bc3/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java -- diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java
[23/49] hbase git commit: HBASE-17001 Enforce quota violation policies in the RegionServer
http://git-wip-us.apache.org/repos/asf/hbase/blob/34ba143f/hbase-server/src/test/java/org/apache/hadoop/hbase/quotas/policies/BaseViolationPolicyEnforcement.java -- diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/quotas/policies/BaseViolationPolicyEnforcement.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/quotas/policies/BaseViolationPolicyEnforcement.java new file mode 100644 index 000..ec8f1bf --- /dev/null +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/quotas/policies/BaseViolationPolicyEnforcement.java @@ -0,0 +1,31 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to you under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.hadoop.hbase.quotas.policies; + +import org.apache.hadoop.hbase.client.Append; +import org.apache.hadoop.hbase.client.Delete; +import org.apache.hadoop.hbase.client.Increment; +import org.apache.hadoop.hbase.client.Put; +import org.apache.hadoop.hbase.util.Bytes; + +public class BaseViolationPolicyEnforcement { + + static final Append APPEND = new Append(Bytes.toBytes("foo")); + static final Delete DELETE = new Delete(Bytes.toBytes("foo")); + static final Increment INCREMENT = new Increment(Bytes.toBytes("foo")); + static final Put PUT = new Put(Bytes.toBytes("foo")); +} http://git-wip-us.apache.org/repos/asf/hbase/blob/34ba143f/hbase-server/src/test/java/org/apache/hadoop/hbase/quotas/policies/TestBulkLoadCheckingViolationPolicyEnforcement.java -- diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/quotas/policies/TestBulkLoadCheckingViolationPolicyEnforcement.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/quotas/policies/TestBulkLoadCheckingViolationPolicyEnforcement.java new file mode 100644 index 000..abe1b9d --- /dev/null +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/quotas/policies/TestBulkLoadCheckingViolationPolicyEnforcement.java @@ -0,0 +1,142 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to you under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.hadoop.hbase.quotas.policies; + +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.when; + +import java.util.ArrayList; +import java.util.List; + +import org.apache.hadoop.fs.FileStatus; +import org.apache.hadoop.fs.FileSystem; +import org.apache.hadoop.fs.Path; +import org.apache.hadoop.hbase.TableName; +import org.apache.hadoop.hbase.quotas.SpaceLimitingException; +import org.apache.hadoop.hbase.quotas.SpaceQuotaSnapshot; +import org.apache.hadoop.hbase.quotas.SpaceQuotaSnapshot.SpaceQuotaStatus; +import org.apache.hadoop.hbase.quotas.SpaceViolationPolicyEnforcement; +import org.apache.hadoop.hbase.regionserver.RegionServerServices; +import org.apache.hadoop.hbase.testclassification.SmallTests; +import org.junit.Before; +import org.junit.Test; +import org.junit.experimental.categories.Category; + +@Category(SmallTests.class) +public class TestBulkLoadCheckingViolationPolicyEnforcement { + + FileSystem fs; + RegionServerServices rss; + TableName tableName; + SpaceViolationPolicyEnforcement policy; + + @Before + public void setup() { +fs = mock(FileSystem.class); +rss = mock(RegionServerServices.class); +tableName = TableName.valueOf("foo"); +policy = new BulkLoadVerifyingViolationPolicyEnforcement(); + } + + @Test + public void testFilesUnderLimit() throws Exception { +final List paths = new ArrayList<>(); +final List
[04/49] hbase git commit: HBASE-17025 Add shell commands for space quotas
HBASE-17025 Add shell commands for space quotas Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/f1066cd7 Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/f1066cd7 Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/f1066cd7 Branch: refs/heads/master Commit: f1066cd7744e185044dcc33aae09623d10ed2631 Parents: 6c9082f Author: Josh ElserAuthored: Wed Jan 11 11:55:29 2017 -0500 Committer: Josh Elser Committed: Mon May 22 13:41:35 2017 -0400 -- hbase-shell/src/main/ruby/hbase/quotas.rb | 62 - hbase-shell/src/main/ruby/hbase_constants.rb| 1 + .../src/main/ruby/shell/commands/set_quota.rb | 45 +- .../hadoop/hbase/client/AbstractTestShell.java | 1 + hbase-shell/src/test/ruby/hbase/quotas_test.rb | 137 +++ hbase-shell/src/test/ruby/tests_runner.rb | 1 + 6 files changed, 242 insertions(+), 5 deletions(-) -- http://git-wip-us.apache.org/repos/asf/hbase/blob/f1066cd7/hbase-shell/src/main/ruby/hbase/quotas.rb -- diff --git a/hbase-shell/src/main/ruby/hbase/quotas.rb b/hbase-shell/src/main/ruby/hbase/quotas.rb index bf2dc63..d99fe72 100644 --- a/hbase-shell/src/main/ruby/hbase/quotas.rb +++ b/hbase-shell/src/main/ruby/hbase/quotas.rb @@ -24,14 +24,22 @@ java_import org.apache.hadoop.hbase.quotas.ThrottleType java_import org.apache.hadoop.hbase.quotas.QuotaFilter java_import org.apache.hadoop.hbase.quotas.QuotaRetriever java_import org.apache.hadoop.hbase.quotas.QuotaSettingsFactory +java_import org.apache.hadoop.hbase.quotas.SpaceViolationPolicy module HBaseQuotasConstants + # RPC Quota constants GLOBAL_BYPASS = 'GLOBAL_BYPASS' THROTTLE_TYPE = 'THROTTLE_TYPE' THROTTLE = 'THROTTLE' REQUEST = 'REQUEST' WRITE = 'WRITE' READ = 'READ' + # Space quota constants + SPACE = 'SPACE' + NO_INSERTS = 'NO_INSERTS' + NO_WRITES = 'NO_WRITES' + NO_WRITES_COMPACTIONS = 'NO_WRITES_COMPACTIONS' + DISABLE = 'DISABLE' end module Hbase @@ -107,6 +115,54 @@ module Hbase @admin.setQuota(settings) end +def limit_space(args) + raise(ArgumentError, 'Argument should be a Hash') unless (not args.nil? and args.kind_of?(Hash)) + # Let the user provide a raw number + if args[LIMIT].is_a?(Numeric) +limit = args[LIMIT] + else +# Parse a string a 1K, 2G, etc. +limit = _parse_size(args[LIMIT]) + end + # Extract the policy, failing if something bogus was provided + policy = SpaceViolationPolicy.valueOf(args[POLICY]) + # Create a table or namespace quota + if args.key?(TABLE) +if args.key?(NAMESPACE) + raise(ArgumentError, "Only one of TABLE or NAMESPACE can be specified.") +end +settings = QuotaSettingsFactory.limitTableSpace(TableName.valueOf(args.delete(TABLE)), limit, policy) + elsif args.key?(NAMESPACE) +if args.key?(TABLE) + raise(ArgumentError, "Only one of TABLE or NAMESPACE can be specified.") +end +settings = QuotaSettingsFactory.limitNamespaceSpace(args.delete(NAMESPACE), limit, policy) + else +raise(ArgumentError, 'One of TABLE or NAMESPACE must be specified.') + end + # Apply the quota + @admin.setQuota(settings) +end + +def remove_space_limit(args) + raise(ArgumentError, 'Argument should be a Hash') unless (not args.nil? and args.kind_of?(Hash)) + if args.key?(TABLE) +if args.key?(NAMESPACE) + raise(ArgumentError, "Only one of TABLE or NAMESPACE can be specified.") +end +table = TableName.valueOf(args.delete(TABLE)) +settings = QuotaSettingsFactory.removeTableSpaceLimit(table) + elsif args.key?(NAMESPACE) +if args.key?(TABLE) + raise(ArgumentError, "Only one of TABLE or NAMESPACE can be specified.") +end +settings = QuotaSettingsFactory.removeNamespaceSpaceLimit(args.delete(NAMESPACE)) + else +raise(ArgumentError, 'One of TABLE or NAMESPACE must be specified.') + end + @admin.setQuota(settings) +end + def set_global_bypass(bypass, args) raise(ArgumentError, "Arguments should be a Hash") unless args.kind_of?(Hash) @@ -171,7 +227,7 @@ module Hbase return _size_from_str(match[1].to_i, match[2]) end else -raise "Invalid size limit syntax" +raise(ArgumentError, "Invalid size limit syntax") end end @@ -188,7 +244,7 @@ module Hbase end if limit <= 0 - raise "Invalid throttle limit, must be greater then 0" + raise(ArgumentError, "Invalid throttle limit, must be greater then 0") end case
[12/49] hbase git commit: HBASE-17000 Implement computation of online region sizes and report to the Master
http://git-wip-us.apache.org/repos/asf/hbase/blob/6b334cd8/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/protobuf/generated/RegionServerStatusProtos.java -- diff --git a/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/protobuf/generated/RegionServerStatusProtos.java b/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/protobuf/generated/RegionServerStatusProtos.java index d7d4db0..e90c934 100644 --- a/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/protobuf/generated/RegionServerStatusProtos.java +++ b/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/protobuf/generated/RegionServerStatusProtos.java @@ -10164,6 +10164,1912 @@ public final class RegionServerStatusProtos { } + public interface RegionSpaceUseOrBuilder extends + // @@protoc_insertion_point(interface_extends:hbase.pb.RegionSpaceUse) + org.apache.hadoop.hbase.shaded.com.google.protobuf.MessageOrBuilder { + +/** + * + * A region identifier + * + * + * optional .hbase.pb.RegionInfo region = 1; + */ +boolean hasRegion(); +/** + * + * A region identifier + * + * + * optional .hbase.pb.RegionInfo region = 1; + */ +org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos.RegionInfo getRegion(); +/** + * + * A region identifier + * + * + * optional .hbase.pb.RegionInfo region = 1; + */ + org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos.RegionInfoOrBuilder getRegionOrBuilder(); + +/** + * + * The size in bytes of the region + * + * + * optional uint64 size = 2; + */ +boolean hasSize(); +/** + * + * The size in bytes of the region + * + * + * optional uint64 size = 2; + */ +long getSize(); + } + /** + * Protobuf type {@code hbase.pb.RegionSpaceUse} + */ + public static final class RegionSpaceUse extends + org.apache.hadoop.hbase.shaded.com.google.protobuf.GeneratedMessageV3 implements + // @@protoc_insertion_point(message_implements:hbase.pb.RegionSpaceUse) + RegionSpaceUseOrBuilder { +// Use RegionSpaceUse.newBuilder() to construct. +private RegionSpaceUse(org.apache.hadoop.hbase.shaded.com.google.protobuf.GeneratedMessageV3.Builder builder) { + super(builder); +} +private RegionSpaceUse() { + size_ = 0L; +} + +@java.lang.Override +public final org.apache.hadoop.hbase.shaded.com.google.protobuf.UnknownFieldSet +getUnknownFields() { + return this.unknownFields; +} +private RegionSpaceUse( +org.apache.hadoop.hbase.shaded.com.google.protobuf.CodedInputStream input, + org.apache.hadoop.hbase.shaded.com.google.protobuf.ExtensionRegistryLite extensionRegistry) +throws org.apache.hadoop.hbase.shaded.com.google.protobuf.InvalidProtocolBufferException { + this(); + int mutable_bitField0_ = 0; + org.apache.hadoop.hbase.shaded.com.google.protobuf.UnknownFieldSet.Builder unknownFields = + org.apache.hadoop.hbase.shaded.com.google.protobuf.UnknownFieldSet.newBuilder(); + try { +boolean done = false; +while (!done) { + int tag = input.readTag(); + switch (tag) { +case 0: + done = true; + break; +default: { + if (!parseUnknownField(input, unknownFields, + extensionRegistry, tag)) { +done = true; + } + break; +} +case 10: { + org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos.RegionInfo.Builder subBuilder = null; + if (((bitField0_ & 0x0001) == 0x0001)) { +subBuilder = region_.toBuilder(); + } + region_ = input.readMessage(org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos.RegionInfo.PARSER, extensionRegistry); + if (subBuilder != null) { +subBuilder.mergeFrom(region_); +region_ = subBuilder.buildPartial(); + } + bitField0_ |= 0x0001; + break; +} +case 16: { + bitField0_ |= 0x0002; + size_ = input.readUInt64(); + break; +} + } +} + } catch (org.apache.hadoop.hbase.shaded.com.google.protobuf.InvalidProtocolBufferException e) { +throw e.setUnfinishedMessage(this); + } catch (java.io.IOException e) { +throw new org.apache.hadoop.hbase.shaded.com.google.protobuf.InvalidProtocolBufferException( +e).setUnfinishedMessage(this); + } finally { +this.unknownFields = unknownFields.build(); +makeExtensionsImmutable(); + } +} +
[07/49] hbase git commit: HBASE-16995 Build client Java API and client protobuf messages (Josh Elser)
http://git-wip-us.apache.org/repos/asf/hbase/blob/4dfafd6e/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/protobuf/generated/MasterProtos.java -- diff --git a/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/protobuf/generated/MasterProtos.java b/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/protobuf/generated/MasterProtos.java index 3560de0..b5b41f3 100644 --- a/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/protobuf/generated/MasterProtos.java +++ b/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/protobuf/generated/MasterProtos.java @@ -842,7 +842,7 @@ public final class MasterProtos { * required .hbase.pb.TableName table_name = 1; */ private org.apache.hadoop.hbase.shaded.com.google.protobuf.SingleFieldBuilderV3< - org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos.TableName, org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos.TableName.Builder, org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos.TableNameOrBuilder> + org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos.TableName, org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos.TableName.Builder, org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos.TableNameOrBuilder> getTableNameFieldBuilder() { if (tableNameBuilder_ == null) { tableNameBuilder_ = new org.apache.hadoop.hbase.shaded.com.google.protobuf.SingleFieldBuilderV3< @@ -960,7 +960,7 @@ public final class MasterProtos { * required .hbase.pb.ColumnFamilySchema column_families = 2; */ private org.apache.hadoop.hbase.shaded.com.google.protobuf.SingleFieldBuilderV3< - org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos.ColumnFamilySchema, org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos.ColumnFamilySchema.Builder, org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos.ColumnFamilySchemaOrBuilder> + org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos.ColumnFamilySchema, org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos.ColumnFamilySchema.Builder, org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos.ColumnFamilySchemaOrBuilder> getColumnFamiliesFieldBuilder() { if (columnFamiliesBuilder_ == null) { columnFamiliesBuilder_ = new org.apache.hadoop.hbase.shaded.com.google.protobuf.SingleFieldBuilderV3< @@ -2257,7 +2257,7 @@ public final class MasterProtos { * required .hbase.pb.TableName table_name = 1; */ private org.apache.hadoop.hbase.shaded.com.google.protobuf.SingleFieldBuilderV3< - org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos.TableName, org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos.TableName.Builder, org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos.TableNameOrBuilder> + org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos.TableName, org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos.TableName.Builder, org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos.TableNameOrBuilder> getTableNameFieldBuilder() { if (tableNameBuilder_ == null) { tableNameBuilder_ = new org.apache.hadoop.hbase.shaded.com.google.protobuf.SingleFieldBuilderV3< @@ -3622,7 +3622,7 @@ public final class MasterProtos { * required .hbase.pb.TableName table_name = 1; */ private org.apache.hadoop.hbase.shaded.com.google.protobuf.SingleFieldBuilderV3< - org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos.TableName, org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos.TableName.Builder, org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos.TableNameOrBuilder> + org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos.TableName, org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos.TableName.Builder, org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos.TableNameOrBuilder> getTableNameFieldBuilder() { if (tableNameBuilder_ == null) { tableNameBuilder_ = new org.apache.hadoop.hbase.shaded.com.google.protobuf.SingleFieldBuilderV3< @@ -3740,7 +3740,7 @@ public final class MasterProtos { * required .hbase.pb.ColumnFamilySchema column_families = 2; */ private org.apache.hadoop.hbase.shaded.com.google.protobuf.SingleFieldBuilderV3< - org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos.ColumnFamilySchema, org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos.ColumnFamilySchema.Builder, org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos.ColumnFamilySchemaOrBuilder> +
[36/42] hbase-site git commit: Published site at 82d554e3783372cc6b05489452c815b57c06f6cd.
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/9dfe3cd8/devapidocs/org/apache/hadoop/hbase/client/AsyncHBaseAdmin.html -- diff --git a/devapidocs/org/apache/hadoop/hbase/client/AsyncHBaseAdmin.html b/devapidocs/org/apache/hadoop/hbase/client/AsyncHBaseAdmin.html index 3fca0a8..ef1f870 100644 --- a/devapidocs/org/apache/hadoop/hbase/client/AsyncHBaseAdmin.html +++ b/devapidocs/org/apache/hadoop/hbase/client/AsyncHBaseAdmin.html @@ -18,7 +18,7 @@ catch(err) { } //--> -var methods = {"i0":10,"i1":10,"i2":10,"i3":10,"i4":10,"i5":10,"i6":10,"i7":10,"i8":10,"i9":10,"i10":10,"i11":10,"i12":10,"i13":10,"i14":10,"i15":10,"i16":10,"i17":10,"i18":10,"i19":10,"i20":10,"i21":10,"i22":10,"i23":10,"i24":10,"i25":10,"i26":10,"i27":10,"i28":10,"i29":10,"i30":10,"i31":10,"i32":10,"i33":10,"i34":10,"i35":10,"i36":10,"i37":10,"i38":10,"i39":10,"i40":10,"i41":10,"i42":10,"i43":10,"i44":10,"i45":10,"i46":10,"i47":10,"i48":10,"i49":10,"i50":10,"i51":10,"i52":10,"i53":10,"i54":10,"i55":10,"i56":10,"i57":10,"i58":10,"i59":10,"i60":10,"i61":10,"i62":10,"i63":10,"i64":10,"i65":10,"i66":10,"i67":10,"i68":10,"i69":10,"i70":10,"i71":10,"i72":10,"i73":10,"i74":10,"i75":10,"i76":10,"i77":10,"i78":10,"i79":10,"i80":10,"i81":10,"i82":10,"i83":10,"i84":10,"i85":10,"i86":10,"i87":10,"i88":10,"i89":10,"i90":10,"i91":10,"i92":10,"i93":10,"i94":10,"i95":10,"i96":10,"i97":10,"i98":10,"i99":10,"i100":10,"i101":10,"i102":10,"i103":10,"i104":10,"i105":10,"i106":10,"i107":10,"i108":10,"i 109":10,"i110":10,"i111":10,"i112":10,"i113":10,"i114":10,"i115":10,"i116":10,"i117":10,"i118":10,"i119":10,"i120":10,"i121":10,"i122":10,"i123":10,"i124":10,"i125":10}; +var methods = {"i0":10,"i1":10,"i2":10,"i3":10,"i4":10,"i5":10,"i6":10,"i7":10,"i8":10,"i9":10,"i10":10,"i11":10,"i12":10,"i13":10,"i14":10,"i15":10,"i16":10,"i17":10,"i18":10,"i19":10,"i20":10,"i21":10,"i22":10,"i23":10,"i24":10,"i25":10,"i26":10,"i27":10,"i28":10,"i29":10,"i30":10,"i31":10,"i32":10,"i33":10,"i34":10,"i35":10,"i36":10,"i37":10,"i38":10,"i39":10,"i40":10,"i41":10,"i42":10,"i43":10,"i44":10,"i45":10,"i46":10,"i47":10,"i48":10,"i49":10,"i50":10,"i51":10,"i52":10,"i53":10,"i54":10,"i55":10,"i56":10,"i57":10,"i58":10,"i59":10,"i60":10,"i61":10,"i62":10,"i63":10,"i64":10,"i65":10,"i66":10,"i67":10,"i68":10,"i69":10,"i70":10,"i71":10,"i72":10,"i73":10,"i74":10,"i75":10,"i76":10,"i77":10,"i78":10,"i79":10,"i80":10,"i81":10,"i82":10,"i83":10,"i84":10,"i85":10,"i86":10,"i87":10,"i88":10,"i89":10,"i90":10,"i91":10,"i92":10,"i93":10,"i94":10,"i95":10,"i96":10,"i97":10,"i98":10,"i99":10,"i100":10,"i101":10,"i102":10,"i103":10,"i104":10,"i105":10,"i106":10,"i107":10,"i108":10,"i 109":10,"i110":10,"i111":10,"i112":10,"i113":10,"i114":10,"i115":10,"i116":10,"i117":10,"i118":10,"i119":10,"i120":10,"i121":10,"i122":10,"i123":10,"i124":10,"i125":10,"i126":10}; var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],8:["t4","Concrete Methods"]}; var altColor = "altColor"; var rowColor = "rowColor"; @@ -115,7 +115,7 @@ var activeTableTab = "activeTableTab"; @InterfaceAudience.Private @InterfaceStability.Evolving -public class AsyncHBaseAdmin +public class AsyncHBaseAdmin extends http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true; title="class or interface in java.lang">Object implements AsyncAdmin The implementation of AsyncAdmin. @@ -474,30 +474,35 @@ implements +private Tvoid +completeConditionalOnFuture(http://docs.oracle.com/javase/8/docs/api/java/util/concurrent/CompletableFuture.html?is-external=true; title="class or interface in java.util.concurrent">CompletableFutureTdependentFuture, + http://docs.oracle.com/javase/8/docs/api/java/util/concurrent/CompletableFuture.html?is-external=true; title="class or interface in java.util.concurrent">CompletableFutureTparentFuture) + + private Tboolean completeExceptionally(http://docs.oracle.com/javase/8/docs/api/java/util/concurrent/CompletableFuture.html?is-external=true; title="class or interface in java.util.concurrent">CompletableFutureTfuture, http://docs.oracle.com/javase/8/docs/api/java/lang/Throwable.html?is-external=true; title="class or interface in java.lang">Throwableerror) - + http://docs.oracle.com/javase/8/docs/api/java/util/concurrent/CompletableFuture.html?is-external=true; title="class or interface in java.util.concurrent">CompletableFuturehttp://docs.oracle.com/javase/8/docs/api/java/lang/Void.html?is-external=true; title="class or interface in java.lang">Void createNamespace(NamespaceDescriptordescriptor) Create a new namespace. - + http://docs.oracle.com/javase/8/docs/api/java/util/concurrent/CompletableFuture.html?is-external=true; title="class or interface in java.util.concurrent">CompletableFuturehttp://docs.oracle.com/javase/8/docs/api/java/lang/Void.html?is-external=true; title="class or interface in
hbase-site git commit: INFRA-10751 Empty commit
Repository: hbase-site Updated Branches: refs/heads/asf-site 9dfe3cd80 -> 64facdcf5 INFRA-10751 Empty commit Project: http://git-wip-us.apache.org/repos/asf/hbase-site/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase-site/commit/64facdcf Tree: http://git-wip-us.apache.org/repos/asf/hbase-site/tree/64facdcf Diff: http://git-wip-us.apache.org/repos/asf/hbase-site/diff/64facdcf Branch: refs/heads/asf-site Commit: 64facdcf5bdbab2b75588637325ec475cef66e16 Parents: 9dfe3cd Author: jenkinsAuthored: Mon May 22 17:47:40 2017 + Committer: jenkins Committed: Mon May 22 17:47:40 2017 + -- --
[01/42] hbase-site git commit: Published site at 82d554e3783372cc6b05489452c815b57c06f6cd.
Repository: hbase-site Updated Branches: refs/heads/asf-site bb0e51758 -> 9dfe3cd80 http://git-wip-us.apache.org/repos/asf/hbase-site/blob/9dfe3cd8/testdevapidocs/src-html/org/apache/hadoop/hbase/client/replication/TestReplicationAdminWithClusters.html -- diff --git a/testdevapidocs/src-html/org/apache/hadoop/hbase/client/replication/TestReplicationAdminWithClusters.html b/testdevapidocs/src-html/org/apache/hadoop/hbase/client/replication/TestReplicationAdminWithClusters.html index 95a03d8..9042c26 100644 --- a/testdevapidocs/src-html/org/apache/hadoop/hbase/client/replication/TestReplicationAdminWithClusters.html +++ b/testdevapidocs/src-html/org/apache/hadoop/hbase/client/replication/TestReplicationAdminWithClusters.html @@ -163,126 +163,122 @@ 155for (HColumnDescriptor fam : table.getColumnFamilies()) { 156 assertEquals(fam.getScope(), HConstants.REPLICATION_SCOPE_LOCAL); 157} -158table = admin2.getTableDescriptor(tableName); -159for (HColumnDescriptor fam : table.getColumnFamilies()) { -160 assertEquals(fam.getScope(), HConstants.REPLICATION_SCOPE_LOCAL); -161} -162 admin1.enableTableReplication(tableName); -163table = admin1.getTableDescriptor(tableName); -164for (HColumnDescriptor fam : table.getColumnFamilies()) { -165 assertEquals(fam.getScope(), HConstants.REPLICATION_SCOPE_GLOBAL); -166} -167 } -168 -169 @Test(timeout = 30, expected = TableNotFoundException.class) -170 public void testDisableReplicationForNonExistingTable() throws Exception { -171 admin1.disableTableReplication(TableName.valueOf(name.getMethodName())); -172 } -173 -174 @Test(timeout = 30, expected = TableNotFoundException.class) -175 public void testEnableReplicationForNonExistingTable() throws Exception { -176 admin1.enableTableReplication(TableName.valueOf(name.getMethodName())); -177 } -178 -179 @Test(timeout = 30, expected = IllegalArgumentException.class) -180 public void testDisableReplicationWhenTableNameAsNull() throws Exception { -181 admin1.disableTableReplication(null); -182 } -183 -184 @Test(timeout = 30, expected = IllegalArgumentException.class) -185 public void testEnableReplicationWhenTableNameAsNull() throws Exception { -186 admin1.enableTableReplication(null); -187 } -188 -189 /* -190 * Test enable table replication should create table only in user explicit specified table-cfs. -191 * HBASE-14717 -192 */ -193 @Test(timeout = 30) -194 public void testEnableReplicationForExplicitSetTableCfs() throws Exception { -195final TableName tableName = TableName.valueOf(name.getMethodName()); -196String peerId = "2"; -197if (admin2.isTableAvailable(TestReplicationBase.tableName)) { -198 admin2.disableTable(TestReplicationBase.tableName); -199 admin2.deleteTable(TestReplicationBase.tableName); -200} -201assertFalse("Table should not exists in the peer cluster", admin2.isTableAvailable(TestReplicationBase.tableName)); -202 -203MapTableName, ? extends CollectionString tableCfs = new HashMap(); -204tableCfs.put(tableName, null); -205try { -206 adminExt.setPeerTableCFs(peerId, tableCfs); -207 admin1.enableTableReplication(TestReplicationBase.tableName); -208 assertFalse("Table should not be created if user has set table cfs explicitly for the " -209 + "peer and this is not part of that collection", -210 admin2.isTableAvailable(TestReplicationBase.tableName)); -211 -212 tableCfs.put(TestReplicationBase.tableName, null); -213 adminExt.setPeerTableCFs(peerId, tableCfs); -214 admin1.enableTableReplication(TestReplicationBase.tableName); -215 assertTrue( -216"Table should be created if user has explicitly added table into table cfs collection", -217 admin2.isTableAvailable(TestReplicationBase.tableName)); -218} finally { -219 adminExt.removePeerTableCFs(peerId, adminExt.getPeerTableCFs(peerId)); -220 admin1.disableTableReplication(TestReplicationBase.tableName); -221} -222 } -223 -224 @Test(timeout=30) -225 public void testReplicationPeerConfigUpdateCallback() throws Exception { -226String peerId = "1"; -227ReplicationPeerConfig rpc = new ReplicationPeerConfig(); -228 rpc.setClusterKey(utility2.getClusterKey()); -229 rpc.setReplicationEndpointImpl(TestUpdatableReplicationEndpoint.class.getName()); -230rpc.getConfiguration().put("key1", "value1"); -231 -232admin1.addReplicationPeer(peerId, rpc); -233 -234rpc.getConfiguration().put("key1", "value2"); -235admin.updatePeerConfig(peerId, rpc); -236if (!TestUpdatableReplicationEndpoint.hasCalledBack()) { -237 synchronized(TestUpdatableReplicationEndpoint.class) { -238 TestUpdatableReplicationEndpoint.class.wait(2000L); -239 } -240} -241 -242assertEquals(true,
[16/42] hbase-site git commit: Published site at 82d554e3783372cc6b05489452c815b57c06f6cd.
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/9dfe3cd8/devapidocs/src-html/org/apache/hadoop/hbase/client/AsyncHBaseAdmin.NamespaceProcedureBiConsumer.html -- diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/client/AsyncHBaseAdmin.NamespaceProcedureBiConsumer.html b/devapidocs/src-html/org/apache/hadoop/hbase/client/AsyncHBaseAdmin.NamespaceProcedureBiConsumer.html index 1b2d845..47f510c 100644 --- a/devapidocs/src-html/org/apache/hadoop/hbase/client/AsyncHBaseAdmin.NamespaceProcedureBiConsumer.html +++ b/devapidocs/src-html/org/apache/hadoop/hbase/client/AsyncHBaseAdmin.NamespaceProcedureBiConsumer.html @@ -98,1445 +98,1445 @@ 090import org.apache.hadoop.hbase.shaded.protobuf.generated.AdminProtos.GetOnlineRegionResponse; 091import org.apache.hadoop.hbase.shaded.protobuf.generated.AdminProtos.SplitRegionRequest; 092import org.apache.hadoop.hbase.shaded.protobuf.generated.AdminProtos.SplitRegionResponse; -093import org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos; -094import org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos.ProcedureDescription; -095import org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos.TableSchema; -096import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.AbortProcedureRequest; -097import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.AbortProcedureResponse; -098import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.AddColumnRequest; -099import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.AddColumnResponse; -100import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.AssignRegionRequest; -101import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.AssignRegionResponse; -102import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.BalanceRequest; -103import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.BalanceResponse; -104import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.CreateNamespaceRequest; -105import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.CreateNamespaceResponse; -106import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.DeleteNamespaceRequest; -107import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.DeleteNamespaceResponse; -108import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.DeleteSnapshotRequest; -109import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.DeleteSnapshotResponse; -110import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.DisableTableRequest; -111import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.DisableTableResponse; -112import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.EnableTableRequest; -113import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.EnableTableResponse; -114import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.DeleteColumnRequest; -115import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.DeleteColumnResponse; -116import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.ExecProcedureRequest; -117import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.ExecProcedureResponse; -118import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.GetCompletedSnapshotsRequest; -119import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.GetCompletedSnapshotsResponse; -120import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.GetNamespaceDescriptorRequest; -121import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.GetNamespaceDescriptorResponse; -122import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.GetProcedureResultRequest; -123import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.GetProcedureResultResponse; -124import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.GetSchemaAlterStatusRequest; -125import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.GetSchemaAlterStatusResponse; -126import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.GetTableDescriptorsRequest; -127import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.GetTableDescriptorsResponse; -128import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.GetTableNamesRequest; -129import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.GetTableNamesResponse; -130import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.CreateTableRequest; -131import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.CreateTableResponse; -132import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.DeleteTableRequest; -133import
[37/42] hbase-site git commit: Published site at 82d554e3783372cc6b05489452c815b57c06f6cd.
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/9dfe3cd8/devapidocs/org/apache/hadoop/hbase/client/AsyncHBaseAdmin.DeleteTableProcedureBiConsumer.html -- diff --git a/devapidocs/org/apache/hadoop/hbase/client/AsyncHBaseAdmin.DeleteTableProcedureBiConsumer.html b/devapidocs/org/apache/hadoop/hbase/client/AsyncHBaseAdmin.DeleteTableProcedureBiConsumer.html index 527581b..bc7794f 100644 --- a/devapidocs/org/apache/hadoop/hbase/client/AsyncHBaseAdmin.DeleteTableProcedureBiConsumer.html +++ b/devapidocs/org/apache/hadoop/hbase/client/AsyncHBaseAdmin.DeleteTableProcedureBiConsumer.html @@ -127,7 +127,7 @@ var activeTableTab = "activeTableTab"; -private class AsyncHBaseAdmin.DeleteTableProcedureBiConsumer +private class AsyncHBaseAdmin.DeleteTableProcedureBiConsumer extends AsyncHBaseAdmin.TableProcedureBiConsumer @@ -244,7 +244,7 @@ extends DeleteTableProcedureBiConsumer -DeleteTableProcedureBiConsumer(AsyncAdminadmin, +DeleteTableProcedureBiConsumer(AsyncAdminadmin, TableNametableName) @@ -262,7 +262,7 @@ extends getOperationType -http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true; title="class or interface in java.lang">StringgetOperationType() +http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true; title="class or interface in java.lang">StringgetOperationType() Specified by: getOperationTypein classAsyncHBaseAdmin.TableProcedureBiConsumer @@ -275,7 +275,7 @@ extends onFinished -voidonFinished() +voidonFinished() Overrides: onFinishedin classAsyncHBaseAdmin.TableProcedureBiConsumer http://git-wip-us.apache.org/repos/asf/hbase-site/blob/9dfe3cd8/devapidocs/org/apache/hadoop/hbase/client/AsyncHBaseAdmin.DisableTableProcedureBiConsumer.html -- diff --git a/devapidocs/org/apache/hadoop/hbase/client/AsyncHBaseAdmin.DisableTableProcedureBiConsumer.html b/devapidocs/org/apache/hadoop/hbase/client/AsyncHBaseAdmin.DisableTableProcedureBiConsumer.html index c2e0e5c..349e87a 100644 --- a/devapidocs/org/apache/hadoop/hbase/client/AsyncHBaseAdmin.DisableTableProcedureBiConsumer.html +++ b/devapidocs/org/apache/hadoop/hbase/client/AsyncHBaseAdmin.DisableTableProcedureBiConsumer.html @@ -127,7 +127,7 @@ var activeTableTab = "activeTableTab"; -private class AsyncHBaseAdmin.DisableTableProcedureBiConsumer +private class AsyncHBaseAdmin.DisableTableProcedureBiConsumer extends AsyncHBaseAdmin.TableProcedureBiConsumer @@ -240,7 +240,7 @@ extends DisableTableProcedureBiConsumer -DisableTableProcedureBiConsumer(AsyncAdminadmin, +DisableTableProcedureBiConsumer(AsyncAdminadmin, TableNametableName) @@ -258,7 +258,7 @@ extends getOperationType -http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true; title="class or interface in java.lang">StringgetOperationType() +http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true; title="class or interface in java.lang">StringgetOperationType() Specified by: getOperationTypein classAsyncHBaseAdmin.TableProcedureBiConsumer http://git-wip-us.apache.org/repos/asf/hbase-site/blob/9dfe3cd8/devapidocs/org/apache/hadoop/hbase/client/AsyncHBaseAdmin.EnableTableProcedureBiConsumer.html -- diff --git a/devapidocs/org/apache/hadoop/hbase/client/AsyncHBaseAdmin.EnableTableProcedureBiConsumer.html b/devapidocs/org/apache/hadoop/hbase/client/AsyncHBaseAdmin.EnableTableProcedureBiConsumer.html index e9094b0..7f07d73 100644 --- a/devapidocs/org/apache/hadoop/hbase/client/AsyncHBaseAdmin.EnableTableProcedureBiConsumer.html +++ b/devapidocs/org/apache/hadoop/hbase/client/AsyncHBaseAdmin.EnableTableProcedureBiConsumer.html @@ -127,7 +127,7 @@ var activeTableTab = "activeTableTab"; -private class AsyncHBaseAdmin.EnableTableProcedureBiConsumer +private class AsyncHBaseAdmin.EnableTableProcedureBiConsumer extends AsyncHBaseAdmin.TableProcedureBiConsumer @@ -240,7 +240,7 @@ extends EnableTableProcedureBiConsumer -EnableTableProcedureBiConsumer(AsyncAdminadmin, +EnableTableProcedureBiConsumer(AsyncAdminadmin, TableNametableName) @@ -258,7 +258,7 @@ extends getOperationType -http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true; title="class or interface in java.lang">StringgetOperationType() +http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true; title="class or interface in java.lang">StringgetOperationType() Specified by: getOperationTypein classAsyncHBaseAdmin.TableProcedureBiConsumer http://git-wip-us.apache.org/repos/asf/hbase-site/blob/9dfe3cd8/devapidocs/org/apache/hadoop/hbase/client/AsyncHBaseAdmin.MasterRpcCall.html
[33/42] hbase-site git commit: Published site at 82d554e3783372cc6b05489452c815b57c06f6cd.
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/9dfe3cd8/devapidocs/org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmpl.ImplData.html -- diff --git a/devapidocs/org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmpl.ImplData.html b/devapidocs/org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmpl.ImplData.html index ccde903..dd707c2 100644 --- a/devapidocs/org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmpl.ImplData.html +++ b/devapidocs/org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmpl.ImplData.html @@ -293,22 +293,22 @@ extends org.jamon.AbstractTemplateProxy.ImplData privateHRegionServer m_regionServer - + -m_bcn -privatehttp://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true; title="class or interface in java.lang">String m_bcn +m_bcv +privatehttp://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true; title="class or interface in java.lang">String m_bcv - + -m_bcn__IsNotDefault -privateboolean m_bcn__IsNotDefault +m_bcv__IsNotDefault +privateboolean m_bcv__IsNotDefault @@ -347,22 +347,22 @@ extends org.jamon.AbstractTemplateProxy.ImplData privateboolean m_format__IsNotDefault - + -m_bcv -privatehttp://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true; title="class or interface in java.lang">String m_bcv +m_bcn +privatehttp://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true; title="class or interface in java.lang">String m_bcn - + -m_bcv__IsNotDefault -privateboolean m_bcv__IsNotDefault +m_bcn__IsNotDefault +privateboolean m_bcn__IsNotDefault @@ -408,31 +408,31 @@ extends org.jamon.AbstractTemplateProxy.ImplData publicHRegionServergetRegionServer() - + -setBcn -publicvoidsetBcn(http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true; title="class or interface in java.lang">Stringbcn) +setBcv +publicvoidsetBcv(http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true; title="class or interface in java.lang">Stringbcv) - + -getBcn -publichttp://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true; title="class or interface in java.lang">StringgetBcn() +getBcv +publichttp://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true; title="class or interface in java.lang">StringgetBcv() - + -getBcn__IsNotDefault -publicbooleangetBcn__IsNotDefault() +getBcv__IsNotDefault +publicbooleangetBcv__IsNotDefault() @@ -489,31 +489,31 @@ extends org.jamon.AbstractTemplateProxy.ImplData publicbooleangetFormat__IsNotDefault() - + -setBcv -publicvoidsetBcv(http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true; title="class or interface in java.lang">Stringbcv) +setBcn +publicvoidsetBcn(http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true; title="class or interface in java.lang">Stringbcn) - + -getBcv -publichttp://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true; title="class or interface in java.lang">StringgetBcv() +getBcn +publichttp://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true; title="class or interface in java.lang">StringgetBcn() - + -getBcv__IsNotDefault -publicbooleangetBcv__IsNotDefault() +getBcn__IsNotDefault +publicbooleangetBcn__IsNotDefault() http://git-wip-us.apache.org/repos/asf/hbase-site/blob/9dfe3cd8/devapidocs/org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmpl.html -- diff --git a/devapidocs/org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmpl.html b/devapidocs/org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmpl.html index 21d8cd2..0c38afa 100644 --- a/devapidocs/org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmpl.html +++ b/devapidocs/org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmpl.html @@ -297,13 +297,13 @@ extends org.jamon.AbstractTemplateProxy Field Detail - + -bcn -protectedhttp://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true; title="class or interface in java.lang">String bcn +bcv +protectedhttp://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true; title="class or interface in java.lang">String bcv @@ -324,13 +324,13 @@ extends org.jamon.AbstractTemplateProxy protectedhttp://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true; title="class or interface in java.lang">String format - + -bcv -protectedhttp://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true; title="class or interface in java.lang">String bcv +bcn +protectedhttp://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true; title="class or interface in java.lang">String bcn
[29/42] hbase-site git commit: Published site at 82d554e3783372cc6b05489452c815b57c06f6cd.
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/9dfe3cd8/devapidocs/src-html/org/apache/hadoop/hbase/client/AsyncHBaseAdmin.AdminRpcCall.html -- diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/client/AsyncHBaseAdmin.AdminRpcCall.html b/devapidocs/src-html/org/apache/hadoop/hbase/client/AsyncHBaseAdmin.AdminRpcCall.html index 1b2d845..47f510c 100644 --- a/devapidocs/src-html/org/apache/hadoop/hbase/client/AsyncHBaseAdmin.AdminRpcCall.html +++ b/devapidocs/src-html/org/apache/hadoop/hbase/client/AsyncHBaseAdmin.AdminRpcCall.html @@ -98,1445 +98,1445 @@ 090import org.apache.hadoop.hbase.shaded.protobuf.generated.AdminProtos.GetOnlineRegionResponse; 091import org.apache.hadoop.hbase.shaded.protobuf.generated.AdminProtos.SplitRegionRequest; 092import org.apache.hadoop.hbase.shaded.protobuf.generated.AdminProtos.SplitRegionResponse; -093import org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos; -094import org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos.ProcedureDescription; -095import org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos.TableSchema; -096import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.AbortProcedureRequest; -097import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.AbortProcedureResponse; -098import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.AddColumnRequest; -099import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.AddColumnResponse; -100import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.AssignRegionRequest; -101import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.AssignRegionResponse; -102import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.BalanceRequest; -103import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.BalanceResponse; -104import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.CreateNamespaceRequest; -105import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.CreateNamespaceResponse; -106import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.DeleteNamespaceRequest; -107import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.DeleteNamespaceResponse; -108import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.DeleteSnapshotRequest; -109import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.DeleteSnapshotResponse; -110import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.DisableTableRequest; -111import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.DisableTableResponse; -112import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.EnableTableRequest; -113import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.EnableTableResponse; -114import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.DeleteColumnRequest; -115import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.DeleteColumnResponse; -116import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.ExecProcedureRequest; -117import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.ExecProcedureResponse; -118import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.GetCompletedSnapshotsRequest; -119import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.GetCompletedSnapshotsResponse; -120import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.GetNamespaceDescriptorRequest; -121import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.GetNamespaceDescriptorResponse; -122import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.GetProcedureResultRequest; -123import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.GetProcedureResultResponse; -124import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.GetSchemaAlterStatusRequest; -125import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.GetSchemaAlterStatusResponse; -126import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.GetTableDescriptorsRequest; -127import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.GetTableDescriptorsResponse; -128import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.GetTableNamesRequest; -129import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.GetTableNamesResponse; -130import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.CreateTableRequest; -131import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.CreateTableResponse; -132import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.DeleteTableRequest; -133import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.DeleteTableResponse; -134import
[03/42] hbase-site git commit: Published site at 82d554e3783372cc6b05489452c815b57c06f6cd.
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/9dfe3cd8/testdevapidocs/src-html/org/apache/hadoop/hbase/TestHTableDescriptor.html -- diff --git a/testdevapidocs/src-html/org/apache/hadoop/hbase/TestHTableDescriptor.html b/testdevapidocs/src-html/org/apache/hadoop/hbase/TestHTableDescriptor.html index 120ebea..a53e6ec 100644 --- a/testdevapidocs/src-html/org/apache/hadoop/hbase/TestHTableDescriptor.html +++ b/testdevapidocs/src-html/org/apache/hadoop/hbase/TestHTableDescriptor.html @@ -31,304 +31,320 @@ 023import static org.junit.Assert.fail; 024 025import java.io.IOException; -026import java.util.regex.Pattern; -027 -028import org.apache.commons.logging.Log; -029import org.apache.commons.logging.LogFactory; -030import org.apache.hadoop.hbase.client.Durability; -031import org.apache.hadoop.hbase.exceptions.DeserializationException; -032import org.apache.hadoop.hbase.testclassification.MiscTests; -033import org.apache.hadoop.hbase.testclassification.SmallTests; -034import org.apache.hadoop.hbase.util.BuilderStyleTest; -035import org.apache.hadoop.hbase.util.Bytes; -036import org.junit.Rule; -037import org.junit.Test; -038import org.junit.experimental.categories.Category; -039import org.junit.rules.TestName; -040 -041/** -042 * Test setting values in the descriptor -043 */ -044@Category({MiscTests.class, SmallTests.class}) -045public class TestHTableDescriptor { -046 private static final Log LOG = LogFactory.getLog(TestHTableDescriptor.class); -047 -048 @Rule -049 public TestName name = new TestName(); -050 -051 @Test (expected=IOException.class) -052 public void testAddCoprocessorTwice() throws IOException { -053HTableDescriptor htd = new HTableDescriptor(TableName.META_TABLE_NAME); -054String cpName = "a.b.c.d"; -055htd.addCoprocessor(cpName); +026import java.util.Arrays; +027import java.util.regex.Pattern; +028 +029import org.apache.commons.logging.Log; +030import org.apache.commons.logging.LogFactory; +031import org.apache.hadoop.hbase.client.Durability; +032import org.apache.hadoop.hbase.exceptions.DeserializationException; +033import org.apache.hadoop.hbase.testclassification.MiscTests; +034import org.apache.hadoop.hbase.testclassification.SmallTests; +035import org.apache.hadoop.hbase.util.BuilderStyleTest; +036import org.apache.hadoop.hbase.util.Bytes; +037import org.junit.Rule; +038import org.junit.Test; +039import org.junit.experimental.categories.Category; +040import org.junit.rules.TestName; +041 +042/** +043 * Test setting values in the descriptor +044 */ +045@Category({MiscTests.class, SmallTests.class}) +046public class TestHTableDescriptor { +047 private static final Log LOG = LogFactory.getLog(TestHTableDescriptor.class); +048 +049 @Rule +050 public TestName name = new TestName(); +051 +052 @Test (expected=IOException.class) +053 public void testAddCoprocessorTwice() throws IOException { +054HTableDescriptor htd = new HTableDescriptor(TableName.META_TABLE_NAME); +055String cpName = "a.b.c.d"; 056htd.addCoprocessor(cpName); -057 } -058 -059 @Test -060 public void testAddCoprocessorWithSpecStr() throws IOException { -061HTableDescriptor htd = new HTableDescriptor(TableName.META_TABLE_NAME); -062String cpName = "a.b.c.d"; -063try { -064 htd.addCoprocessorWithSpec(cpName); -065 fail(); -066} catch (IllegalArgumentException iae) { -067 // Expected as cpName is invalid -068} -069 -070// Try minimal spec. -071try { -072 htd.addCoprocessorWithSpec("file:///some/path" + "|" + cpName); -073 fail(); -074} catch (IllegalArgumentException iae) { -075 // Expected to be invalid -076} -077 -078// Try more spec. -079String spec = "hdfs:///foo.jar|com.foo.FooRegionObserver|1001|arg1=1,arg2=2"; -080try { -081 htd.addCoprocessorWithSpec(spec); -082} catch (IllegalArgumentException iae) { -083 fail(); -084} -085 -086// Try double add of same coprocessor -087try { -088 htd.addCoprocessorWithSpec(spec); -089 fail(); -090} catch (IOException ioe) { -091 // Expect that the coprocessor already exists -092} -093 } -094 -095 @Test -096 public void testPb() throws DeserializationException, IOException { -097HTableDescriptor htd = new HTableDescriptor(TableName.META_TABLE_NAME); -098final int v = 123; -099htd.setMaxFileSize(v); -100 htd.setDurability(Durability.ASYNC_WAL); -101htd.setReadOnly(true); -102htd.setRegionReplication(2); -103byte [] bytes = htd.toByteArray(); -104HTableDescriptor deserializedHtd = HTableDescriptor.parseFrom(bytes); -105assertEquals(htd, deserializedHtd); -106assertEquals(v, deserializedHtd.getMaxFileSize()); -107 assertTrue(deserializedHtd.isReadOnly()); -108assertEquals(Durability.ASYNC_WAL, deserializedHtd.getDurability()); -109
[30/42] hbase-site git commit: Published site at 82d554e3783372cc6b05489452c815b57c06f6cd.
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/9dfe3cd8/devapidocs/src-html/org/apache/hadoop/hbase/client/AsyncHBaseAdmin.AddColumnFamilyProcedureBiConsumer.html -- diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/client/AsyncHBaseAdmin.AddColumnFamilyProcedureBiConsumer.html b/devapidocs/src-html/org/apache/hadoop/hbase/client/AsyncHBaseAdmin.AddColumnFamilyProcedureBiConsumer.html index 1b2d845..47f510c 100644 --- a/devapidocs/src-html/org/apache/hadoop/hbase/client/AsyncHBaseAdmin.AddColumnFamilyProcedureBiConsumer.html +++ b/devapidocs/src-html/org/apache/hadoop/hbase/client/AsyncHBaseAdmin.AddColumnFamilyProcedureBiConsumer.html @@ -98,1445 +98,1445 @@ 090import org.apache.hadoop.hbase.shaded.protobuf.generated.AdminProtos.GetOnlineRegionResponse; 091import org.apache.hadoop.hbase.shaded.protobuf.generated.AdminProtos.SplitRegionRequest; 092import org.apache.hadoop.hbase.shaded.protobuf.generated.AdminProtos.SplitRegionResponse; -093import org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos; -094import org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos.ProcedureDescription; -095import org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos.TableSchema; -096import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.AbortProcedureRequest; -097import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.AbortProcedureResponse; -098import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.AddColumnRequest; -099import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.AddColumnResponse; -100import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.AssignRegionRequest; -101import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.AssignRegionResponse; -102import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.BalanceRequest; -103import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.BalanceResponse; -104import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.CreateNamespaceRequest; -105import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.CreateNamespaceResponse; -106import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.DeleteNamespaceRequest; -107import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.DeleteNamespaceResponse; -108import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.DeleteSnapshotRequest; -109import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.DeleteSnapshotResponse; -110import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.DisableTableRequest; -111import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.DisableTableResponse; -112import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.EnableTableRequest; -113import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.EnableTableResponse; -114import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.DeleteColumnRequest; -115import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.DeleteColumnResponse; -116import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.ExecProcedureRequest; -117import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.ExecProcedureResponse; -118import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.GetCompletedSnapshotsRequest; -119import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.GetCompletedSnapshotsResponse; -120import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.GetNamespaceDescriptorRequest; -121import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.GetNamespaceDescriptorResponse; -122import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.GetProcedureResultRequest; -123import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.GetProcedureResultResponse; -124import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.GetSchemaAlterStatusRequest; -125import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.GetSchemaAlterStatusResponse; -126import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.GetTableDescriptorsRequest; -127import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.GetTableDescriptorsResponse; -128import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.GetTableNamesRequest; -129import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.GetTableNamesResponse; -130import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.CreateTableRequest; -131import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.CreateTableResponse; -132import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.DeleteTableRequest; -133import
[22/42] hbase-site git commit: Published site at 82d554e3783372cc6b05489452c815b57c06f6cd.
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/9dfe3cd8/devapidocs/src-html/org/apache/hadoop/hbase/client/AsyncHBaseAdmin.DisableTableProcedureBiConsumer.html -- diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/client/AsyncHBaseAdmin.DisableTableProcedureBiConsumer.html b/devapidocs/src-html/org/apache/hadoop/hbase/client/AsyncHBaseAdmin.DisableTableProcedureBiConsumer.html index 1b2d845..47f510c 100644 --- a/devapidocs/src-html/org/apache/hadoop/hbase/client/AsyncHBaseAdmin.DisableTableProcedureBiConsumer.html +++ b/devapidocs/src-html/org/apache/hadoop/hbase/client/AsyncHBaseAdmin.DisableTableProcedureBiConsumer.html @@ -98,1445 +98,1445 @@ 090import org.apache.hadoop.hbase.shaded.protobuf.generated.AdminProtos.GetOnlineRegionResponse; 091import org.apache.hadoop.hbase.shaded.protobuf.generated.AdminProtos.SplitRegionRequest; 092import org.apache.hadoop.hbase.shaded.protobuf.generated.AdminProtos.SplitRegionResponse; -093import org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos; -094import org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos.ProcedureDescription; -095import org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos.TableSchema; -096import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.AbortProcedureRequest; -097import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.AbortProcedureResponse; -098import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.AddColumnRequest; -099import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.AddColumnResponse; -100import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.AssignRegionRequest; -101import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.AssignRegionResponse; -102import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.BalanceRequest; -103import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.BalanceResponse; -104import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.CreateNamespaceRequest; -105import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.CreateNamespaceResponse; -106import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.DeleteNamespaceRequest; -107import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.DeleteNamespaceResponse; -108import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.DeleteSnapshotRequest; -109import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.DeleteSnapshotResponse; -110import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.DisableTableRequest; -111import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.DisableTableResponse; -112import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.EnableTableRequest; -113import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.EnableTableResponse; -114import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.DeleteColumnRequest; -115import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.DeleteColumnResponse; -116import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.ExecProcedureRequest; -117import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.ExecProcedureResponse; -118import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.GetCompletedSnapshotsRequest; -119import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.GetCompletedSnapshotsResponse; -120import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.GetNamespaceDescriptorRequest; -121import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.GetNamespaceDescriptorResponse; -122import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.GetProcedureResultRequest; -123import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.GetProcedureResultResponse; -124import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.GetSchemaAlterStatusRequest; -125import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.GetSchemaAlterStatusResponse; -126import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.GetTableDescriptorsRequest; -127import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.GetTableDescriptorsResponse; -128import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.GetTableNamesRequest; -129import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.GetTableNamesResponse; -130import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.CreateTableRequest; -131import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.CreateTableResponse; -132import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.DeleteTableRequest; -133import
[12/42] hbase-site git commit: Published site at 82d554e3783372cc6b05489452c815b57c06f6cd.
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/9dfe3cd8/devapidocs/src-html/org/apache/hadoop/hbase/client/AsyncHBaseAdmin.TruncateTableProcedureBiConsumer.html -- diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/client/AsyncHBaseAdmin.TruncateTableProcedureBiConsumer.html b/devapidocs/src-html/org/apache/hadoop/hbase/client/AsyncHBaseAdmin.TruncateTableProcedureBiConsumer.html index 1b2d845..47f510c 100644 --- a/devapidocs/src-html/org/apache/hadoop/hbase/client/AsyncHBaseAdmin.TruncateTableProcedureBiConsumer.html +++ b/devapidocs/src-html/org/apache/hadoop/hbase/client/AsyncHBaseAdmin.TruncateTableProcedureBiConsumer.html @@ -98,1445 +98,1445 @@ 090import org.apache.hadoop.hbase.shaded.protobuf.generated.AdminProtos.GetOnlineRegionResponse; 091import org.apache.hadoop.hbase.shaded.protobuf.generated.AdminProtos.SplitRegionRequest; 092import org.apache.hadoop.hbase.shaded.protobuf.generated.AdminProtos.SplitRegionResponse; -093import org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos; -094import org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos.ProcedureDescription; -095import org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos.TableSchema; -096import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.AbortProcedureRequest; -097import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.AbortProcedureResponse; -098import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.AddColumnRequest; -099import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.AddColumnResponse; -100import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.AssignRegionRequest; -101import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.AssignRegionResponse; -102import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.BalanceRequest; -103import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.BalanceResponse; -104import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.CreateNamespaceRequest; -105import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.CreateNamespaceResponse; -106import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.DeleteNamespaceRequest; -107import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.DeleteNamespaceResponse; -108import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.DeleteSnapshotRequest; -109import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.DeleteSnapshotResponse; -110import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.DisableTableRequest; -111import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.DisableTableResponse; -112import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.EnableTableRequest; -113import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.EnableTableResponse; -114import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.DeleteColumnRequest; -115import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.DeleteColumnResponse; -116import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.ExecProcedureRequest; -117import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.ExecProcedureResponse; -118import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.GetCompletedSnapshotsRequest; -119import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.GetCompletedSnapshotsResponse; -120import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.GetNamespaceDescriptorRequest; -121import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.GetNamespaceDescriptorResponse; -122import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.GetProcedureResultRequest; -123import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.GetProcedureResultResponse; -124import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.GetSchemaAlterStatusRequest; -125import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.GetSchemaAlterStatusResponse; -126import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.GetTableDescriptorsRequest; -127import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.GetTableDescriptorsResponse; -128import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.GetTableNamesRequest; -129import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.GetTableNamesResponse; -130import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.CreateTableRequest; -131import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.CreateTableResponse; -132import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.DeleteTableRequest; -133import
[06/42] hbase-site git commit: Published site at 82d554e3783372cc6b05489452c815b57c06f6cd.
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/9dfe3cd8/hbase-annotations/integration.html -- diff --git a/hbase-annotations/integration.html b/hbase-annotations/integration.html index d324672..cec3571 100644 --- a/hbase-annotations/integration.html +++ b/hbase-annotations/integration.html @@ -1,5 +1,5 @@ http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd;> - + http://www.w3.org/1999/xhtml; xml:lang="en" lang="en"> @@ -10,7 +10,7 @@ @import url("./css/site.css"); - + @@ -27,7 +27,7 @@ -Last Published: 2017-05-21 +Last Published: 2017-05-22 | Version: 2.0.0-SNAPSHOT Apache HBase - Annotations http://git-wip-us.apache.org/repos/asf/hbase-site/blob/9dfe3cd8/hbase-annotations/issue-tracking.html -- diff --git a/hbase-annotations/issue-tracking.html b/hbase-annotations/issue-tracking.html index e1329bf..ef7140e 100644 --- a/hbase-annotations/issue-tracking.html +++ b/hbase-annotations/issue-tracking.html @@ -1,5 +1,5 @@ http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd;> - + http://www.w3.org/1999/xhtml; xml:lang="en" lang="en"> @@ -10,7 +10,7 @@ @import url("./css/site.css"); - + @@ -27,7 +27,7 @@ -Last Published: 2017-05-21 +Last Published: 2017-05-22 | Version: 2.0.0-SNAPSHOT Apache HBase - Annotations http://git-wip-us.apache.org/repos/asf/hbase-site/blob/9dfe3cd8/hbase-annotations/license.html -- diff --git a/hbase-annotations/license.html b/hbase-annotations/license.html index f7736a9..54888b1 100644 --- a/hbase-annotations/license.html +++ b/hbase-annotations/license.html @@ -1,5 +1,5 @@ http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd;> - + http://www.w3.org/1999/xhtml; xml:lang="en" lang="en"> @@ -10,7 +10,7 @@ @import url("./css/site.css"); - + @@ -27,7 +27,7 @@ -Last Published: 2017-05-21 +Last Published: 2017-05-22 | Version: 2.0.0-SNAPSHOT Apache HBase - Annotations http://git-wip-us.apache.org/repos/asf/hbase-site/blob/9dfe3cd8/hbase-annotations/mail-lists.html -- diff --git a/hbase-annotations/mail-lists.html b/hbase-annotations/mail-lists.html index 5b22085..67e88f5 100644 --- a/hbase-annotations/mail-lists.html +++ b/hbase-annotations/mail-lists.html @@ -1,5 +1,5 @@ http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd;> - + http://www.w3.org/1999/xhtml; xml:lang="en" lang="en"> @@ -10,7 +10,7 @@ @import url("./css/site.css"); - + @@ -27,7 +27,7 @@ -Last Published: 2017-05-21 +Last Published: 2017-05-22 | Version: 2.0.0-SNAPSHOT Apache HBase - Annotations http://git-wip-us.apache.org/repos/asf/hbase-site/blob/9dfe3cd8/hbase-annotations/plugin-management.html -- diff --git a/hbase-annotations/plugin-management.html b/hbase-annotations/plugin-management.html index d533f10..edd7978 100644 --- a/hbase-annotations/plugin-management.html +++ b/hbase-annotations/plugin-management.html @@ -1,5 +1,5 @@ http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd;> - + http://www.w3.org/1999/xhtml; xml:lang="en" lang="en"> @@ -10,7 +10,7 @@ @import url("./css/site.css"); - + @@ -27,7 +27,7 @@ -Last Published: 2017-05-21 +Last Published: 2017-05-22 | Version: 2.0.0-SNAPSHOT Apache HBase - Annotations http://git-wip-us.apache.org/repos/asf/hbase-site/blob/9dfe3cd8/hbase-annotations/plugins.html -- diff --git a/hbase-annotations/plugins.html b/hbase-annotations/plugins.html index 59a993b..63d701b 100644 --- a/hbase-annotations/plugins.html +++ b/hbase-annotations/plugins.html @@ -1,5 +1,5 @@ http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd;> - + http://www.w3.org/1999/xhtml; xml:lang="en" lang="en"> @@ -10,7 +10,7 @@
[23/42] hbase-site git commit: Published site at 82d554e3783372cc6b05489452c815b57c06f6cd.
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/9dfe3cd8/devapidocs/src-html/org/apache/hadoop/hbase/client/AsyncHBaseAdmin.DeleteTableProcedureBiConsumer.html -- diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/client/AsyncHBaseAdmin.DeleteTableProcedureBiConsumer.html b/devapidocs/src-html/org/apache/hadoop/hbase/client/AsyncHBaseAdmin.DeleteTableProcedureBiConsumer.html index 1b2d845..47f510c 100644 --- a/devapidocs/src-html/org/apache/hadoop/hbase/client/AsyncHBaseAdmin.DeleteTableProcedureBiConsumer.html +++ b/devapidocs/src-html/org/apache/hadoop/hbase/client/AsyncHBaseAdmin.DeleteTableProcedureBiConsumer.html @@ -98,1445 +98,1445 @@ 090import org.apache.hadoop.hbase.shaded.protobuf.generated.AdminProtos.GetOnlineRegionResponse; 091import org.apache.hadoop.hbase.shaded.protobuf.generated.AdminProtos.SplitRegionRequest; 092import org.apache.hadoop.hbase.shaded.protobuf.generated.AdminProtos.SplitRegionResponse; -093import org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos; -094import org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos.ProcedureDescription; -095import org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos.TableSchema; -096import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.AbortProcedureRequest; -097import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.AbortProcedureResponse; -098import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.AddColumnRequest; -099import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.AddColumnResponse; -100import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.AssignRegionRequest; -101import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.AssignRegionResponse; -102import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.BalanceRequest; -103import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.BalanceResponse; -104import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.CreateNamespaceRequest; -105import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.CreateNamespaceResponse; -106import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.DeleteNamespaceRequest; -107import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.DeleteNamespaceResponse; -108import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.DeleteSnapshotRequest; -109import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.DeleteSnapshotResponse; -110import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.DisableTableRequest; -111import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.DisableTableResponse; -112import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.EnableTableRequest; -113import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.EnableTableResponse; -114import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.DeleteColumnRequest; -115import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.DeleteColumnResponse; -116import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.ExecProcedureRequest; -117import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.ExecProcedureResponse; -118import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.GetCompletedSnapshotsRequest; -119import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.GetCompletedSnapshotsResponse; -120import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.GetNamespaceDescriptorRequest; -121import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.GetNamespaceDescriptorResponse; -122import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.GetProcedureResultRequest; -123import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.GetProcedureResultResponse; -124import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.GetSchemaAlterStatusRequest; -125import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.GetSchemaAlterStatusResponse; -126import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.GetTableDescriptorsRequest; -127import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.GetTableDescriptorsResponse; -128import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.GetTableNamesRequest; -129import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.GetTableNamesResponse; -130import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.CreateTableRequest; -131import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.CreateTableResponse; -132import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.DeleteTableRequest; -133import
[26/42] hbase-site git commit: Published site at 82d554e3783372cc6b05489452c815b57c06f6cd.
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/9dfe3cd8/devapidocs/src-html/org/apache/hadoop/hbase/client/AsyncHBaseAdmin.CreateTableProcedureBiConsumer.html -- diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/client/AsyncHBaseAdmin.CreateTableProcedureBiConsumer.html b/devapidocs/src-html/org/apache/hadoop/hbase/client/AsyncHBaseAdmin.CreateTableProcedureBiConsumer.html index 1b2d845..47f510c 100644 --- a/devapidocs/src-html/org/apache/hadoop/hbase/client/AsyncHBaseAdmin.CreateTableProcedureBiConsumer.html +++ b/devapidocs/src-html/org/apache/hadoop/hbase/client/AsyncHBaseAdmin.CreateTableProcedureBiConsumer.html @@ -98,1445 +98,1445 @@ 090import org.apache.hadoop.hbase.shaded.protobuf.generated.AdminProtos.GetOnlineRegionResponse; 091import org.apache.hadoop.hbase.shaded.protobuf.generated.AdminProtos.SplitRegionRequest; 092import org.apache.hadoop.hbase.shaded.protobuf.generated.AdminProtos.SplitRegionResponse; -093import org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos; -094import org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos.ProcedureDescription; -095import org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos.TableSchema; -096import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.AbortProcedureRequest; -097import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.AbortProcedureResponse; -098import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.AddColumnRequest; -099import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.AddColumnResponse; -100import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.AssignRegionRequest; -101import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.AssignRegionResponse; -102import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.BalanceRequest; -103import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.BalanceResponse; -104import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.CreateNamespaceRequest; -105import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.CreateNamespaceResponse; -106import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.DeleteNamespaceRequest; -107import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.DeleteNamespaceResponse; -108import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.DeleteSnapshotRequest; -109import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.DeleteSnapshotResponse; -110import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.DisableTableRequest; -111import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.DisableTableResponse; -112import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.EnableTableRequest; -113import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.EnableTableResponse; -114import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.DeleteColumnRequest; -115import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.DeleteColumnResponse; -116import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.ExecProcedureRequest; -117import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.ExecProcedureResponse; -118import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.GetCompletedSnapshotsRequest; -119import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.GetCompletedSnapshotsResponse; -120import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.GetNamespaceDescriptorRequest; -121import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.GetNamespaceDescriptorResponse; -122import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.GetProcedureResultRequest; -123import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.GetProcedureResultResponse; -124import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.GetSchemaAlterStatusRequest; -125import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.GetSchemaAlterStatusResponse; -126import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.GetTableDescriptorsRequest; -127import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.GetTableDescriptorsResponse; -128import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.GetTableNamesRequest; -129import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.GetTableNamesResponse; -130import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.CreateTableRequest; -131import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.CreateTableResponse; -132import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.DeleteTableRequest; -133import
[27/42] hbase-site git commit: Published site at 82d554e3783372cc6b05489452c815b57c06f6cd.
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/9dfe3cd8/devapidocs/src-html/org/apache/hadoop/hbase/client/AsyncHBaseAdmin.CreateNamespaceProcedureBiConsumer.html -- diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/client/AsyncHBaseAdmin.CreateNamespaceProcedureBiConsumer.html b/devapidocs/src-html/org/apache/hadoop/hbase/client/AsyncHBaseAdmin.CreateNamespaceProcedureBiConsumer.html index 1b2d845..47f510c 100644 --- a/devapidocs/src-html/org/apache/hadoop/hbase/client/AsyncHBaseAdmin.CreateNamespaceProcedureBiConsumer.html +++ b/devapidocs/src-html/org/apache/hadoop/hbase/client/AsyncHBaseAdmin.CreateNamespaceProcedureBiConsumer.html @@ -98,1445 +98,1445 @@ 090import org.apache.hadoop.hbase.shaded.protobuf.generated.AdminProtos.GetOnlineRegionResponse; 091import org.apache.hadoop.hbase.shaded.protobuf.generated.AdminProtos.SplitRegionRequest; 092import org.apache.hadoop.hbase.shaded.protobuf.generated.AdminProtos.SplitRegionResponse; -093import org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos; -094import org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos.ProcedureDescription; -095import org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos.TableSchema; -096import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.AbortProcedureRequest; -097import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.AbortProcedureResponse; -098import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.AddColumnRequest; -099import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.AddColumnResponse; -100import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.AssignRegionRequest; -101import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.AssignRegionResponse; -102import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.BalanceRequest; -103import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.BalanceResponse; -104import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.CreateNamespaceRequest; -105import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.CreateNamespaceResponse; -106import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.DeleteNamespaceRequest; -107import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.DeleteNamespaceResponse; -108import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.DeleteSnapshotRequest; -109import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.DeleteSnapshotResponse; -110import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.DisableTableRequest; -111import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.DisableTableResponse; -112import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.EnableTableRequest; -113import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.EnableTableResponse; -114import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.DeleteColumnRequest; -115import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.DeleteColumnResponse; -116import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.ExecProcedureRequest; -117import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.ExecProcedureResponse; -118import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.GetCompletedSnapshotsRequest; -119import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.GetCompletedSnapshotsResponse; -120import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.GetNamespaceDescriptorRequest; -121import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.GetNamespaceDescriptorResponse; -122import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.GetProcedureResultRequest; -123import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.GetProcedureResultResponse; -124import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.GetSchemaAlterStatusRequest; -125import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.GetSchemaAlterStatusResponse; -126import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.GetTableDescriptorsRequest; -127import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.GetTableDescriptorsResponse; -128import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.GetTableNamesRequest; -129import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.GetTableNamesResponse; -130import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.CreateTableRequest; -131import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.CreateTableResponse; -132import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.DeleteTableRequest; -133import
[08/42] hbase-site git commit: Published site at 82d554e3783372cc6b05489452c815b57c06f6cd.
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/9dfe3cd8/devapidocs/src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.ImplData.html -- diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.ImplData.html b/devapidocs/src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.ImplData.html index 8424538..fb2b7e1 100644 --- a/devapidocs/src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.ImplData.html +++ b/devapidocs/src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.ImplData.html @@ -69,15 +69,15 @@ 061 requiredArguments = { 062@org.jamon.annotations.Argument(name = "master", type = "HMaster")}, 063 optionalArguments = { -064@org.jamon.annotations.Argument(name = "deadServers", type = "SetServerName"), -065@org.jamon.annotations.Argument(name = "frags", type = "MapString,Integer"), +064@org.jamon.annotations.Argument(name = "servers", type = "ListServerName"), +065@org.jamon.annotations.Argument(name = "deadServers", type = "SetServerName"), 066@org.jamon.annotations.Argument(name = "format", type = "String"), -067@org.jamon.annotations.Argument(name = "metaLocation", type = "ServerName"), -068@org.jamon.annotations.Argument(name = "servers", type = "ListServerName"), -069@org.jamon.annotations.Argument(name = "filter", type = "String"), -070@org.jamon.annotations.Argument(name = "catalogJanitorEnabled", type = "boolean"), +067@org.jamon.annotations.Argument(name = "frags", type = "MapString,Integer"), +068@org.jamon.annotations.Argument(name = "assignmentManager", type = "AssignmentManager"), +069@org.jamon.annotations.Argument(name = "catalogJanitorEnabled", type = "boolean"), +070@org.jamon.annotations.Argument(name = "filter", type = "String"), 071@org.jamon.annotations.Argument(name = "serverManager", type = "ServerManager"), -072@org.jamon.annotations.Argument(name = "assignmentManager", type = "AssignmentManager")}) +072@org.jamon.annotations.Argument(name = "metaLocation", type = "ServerName")}) 073public class MasterStatusTmpl 074 extends org.jamon.AbstractTemplateProxy 075{ @@ -118,40 +118,40 @@ 110 return m_master; 111} 112private HMaster m_master; -113// 24, 1 -114public void setDeadServers(SetServerName deadServers) +113// 23, 1 +114public void setServers(ListServerName servers) 115{ -116 // 24, 1 -117 m_deadServers = deadServers; -118 m_deadServers__IsNotDefault = true; +116 // 23, 1 +117 m_servers = servers; +118 m_servers__IsNotDefault = true; 119} -120public SetServerName getDeadServers() +120public ListServerName getServers() 121{ -122 return m_deadServers; +122 return m_servers; 123} -124private SetServerName m_deadServers; -125public boolean getDeadServers__IsNotDefault() +124private ListServerName m_servers; +125public boolean getServers__IsNotDefault() 126{ -127 return m_deadServers__IsNotDefault; +127 return m_servers__IsNotDefault; 128} -129private boolean m_deadServers__IsNotDefault; -130// 21, 1 -131public void setFrags(MapString,Integer frags) +129private boolean m_servers__IsNotDefault; +130// 24, 1 +131public void setDeadServers(SetServerName deadServers) 132{ -133 // 21, 1 -134 m_frags = frags; -135 m_frags__IsNotDefault = true; +133 // 24, 1 +134 m_deadServers = deadServers; +135 m_deadServers__IsNotDefault = true; 136} -137public MapString,Integer getFrags() +137public SetServerName getDeadServers() 138{ -139 return m_frags; +139 return m_deadServers; 140} -141private MapString,Integer m_frags; -142public boolean getFrags__IsNotDefault() +141private SetServerName m_deadServers; +142public boolean getDeadServers__IsNotDefault() 143{ -144 return m_frags__IsNotDefault; +144 return m_deadServers__IsNotDefault; 145} -146private boolean m_frags__IsNotDefault; +146private boolean m_deadServers__IsNotDefault; 147// 27, 1 148public void setFormat(String format) 149{ @@ -169,74 +169,74 @@ 161 return m_format__IsNotDefault; 162} 163private boolean m_format__IsNotDefault; -164// 22, 1 -165public void setMetaLocation(ServerName metaLocation) +164// 21, 1 +165public void setFrags(MapString,Integer frags) 166{ -167 // 22, 1 -168 m_metaLocation = metaLocation; -169 m_metaLocation__IsNotDefault = true; +167 // 21, 1 +168 m_frags = frags; +169 m_frags__IsNotDefault = true; 170} -171public ServerName getMetaLocation() +171public MapString,Integer getFrags() 172{ -173 return m_metaLocation; +173 return m_frags; 174} -175private ServerName
[11/42] hbase-site git commit: Published site at 82d554e3783372cc6b05489452c815b57c06f6cd.
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/9dfe3cd8/devapidocs/src-html/org/apache/hadoop/hbase/client/AsyncHBaseAdmin.html -- diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/client/AsyncHBaseAdmin.html b/devapidocs/src-html/org/apache/hadoop/hbase/client/AsyncHBaseAdmin.html index 1b2d845..47f510c 100644 --- a/devapidocs/src-html/org/apache/hadoop/hbase/client/AsyncHBaseAdmin.html +++ b/devapidocs/src-html/org/apache/hadoop/hbase/client/AsyncHBaseAdmin.html @@ -98,1445 +98,1445 @@ 090import org.apache.hadoop.hbase.shaded.protobuf.generated.AdminProtos.GetOnlineRegionResponse; 091import org.apache.hadoop.hbase.shaded.protobuf.generated.AdminProtos.SplitRegionRequest; 092import org.apache.hadoop.hbase.shaded.protobuf.generated.AdminProtos.SplitRegionResponse; -093import org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos; -094import org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos.ProcedureDescription; -095import org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos.TableSchema; -096import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.AbortProcedureRequest; -097import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.AbortProcedureResponse; -098import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.AddColumnRequest; -099import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.AddColumnResponse; -100import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.AssignRegionRequest; -101import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.AssignRegionResponse; -102import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.BalanceRequest; -103import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.BalanceResponse; -104import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.CreateNamespaceRequest; -105import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.CreateNamespaceResponse; -106import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.DeleteNamespaceRequest; -107import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.DeleteNamespaceResponse; -108import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.DeleteSnapshotRequest; -109import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.DeleteSnapshotResponse; -110import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.DisableTableRequest; -111import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.DisableTableResponse; -112import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.EnableTableRequest; -113import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.EnableTableResponse; -114import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.DeleteColumnRequest; -115import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.DeleteColumnResponse; -116import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.ExecProcedureRequest; -117import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.ExecProcedureResponse; -118import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.GetCompletedSnapshotsRequest; -119import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.GetCompletedSnapshotsResponse; -120import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.GetNamespaceDescriptorRequest; -121import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.GetNamespaceDescriptorResponse; -122import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.GetProcedureResultRequest; -123import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.GetProcedureResultResponse; -124import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.GetSchemaAlterStatusRequest; -125import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.GetSchemaAlterStatusResponse; -126import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.GetTableDescriptorsRequest; -127import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.GetTableDescriptorsResponse; -128import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.GetTableNamesRequest; -129import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.GetTableNamesResponse; -130import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.CreateTableRequest; -131import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.CreateTableResponse; -132import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.DeleteTableRequest; -133import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.DeleteTableResponse; -134import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.IsBalancerEnabledRequest; -135import
[41/42] hbase-site git commit: Published site at 82d554e3783372cc6b05489452c815b57c06f6cd.
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/9dfe3cd8/apidocs/org/apache/hadoop/hbase/client/AsyncTableBase.html -- diff --git a/apidocs/org/apache/hadoop/hbase/client/AsyncTableBase.html b/apidocs/org/apache/hadoop/hbase/client/AsyncTableBase.html index cb02aca..af44abf 100644 --- a/apidocs/org/apache/hadoop/hbase/client/AsyncTableBase.html +++ b/apidocs/org/apache/hadoop/hbase/client/AsyncTableBase.html @@ -633,7 +633,7 @@ public interface checkAndPut -defaulthttp://docs.oracle.com/javase/8/docs/api/java/util/concurrent/CompletableFuture.html?is-external=true; title="class or interface in java.util.concurrent">CompletableFuturehttp://docs.oracle.com/javase/8/docs/api/java/lang/Boolean.html?is-external=true; title="class or interface in java.lang">BooleancheckAndPut(byte[]row, +defaulthttp://docs.oracle.com/javase/8/docs/api/java/util/concurrent/CompletableFuture.html?is-external=true; title="class or interface in java.util.concurrent">CompletableFuturehttp://docs.oracle.com/javase/8/docs/api/java/lang/Boolean.html?is-external=true; title="class or interface in java.lang">BooleancheckAndPut(byte[]row, byte[]family, byte[]qualifier, byte[]value, @@ -660,7 +660,7 @@ public interface checkAndPut -http://docs.oracle.com/javase/8/docs/api/java/util/concurrent/CompletableFuture.html?is-external=true; title="class or interface in java.util.concurrent">CompletableFuturehttp://docs.oracle.com/javase/8/docs/api/java/lang/Boolean.html?is-external=true; title="class or interface in java.lang">BooleancheckAndPut(byte[]row, +http://docs.oracle.com/javase/8/docs/api/java/util/concurrent/CompletableFuture.html?is-external=true; title="class or interface in java.util.concurrent">CompletableFuturehttp://docs.oracle.com/javase/8/docs/api/java/lang/Boolean.html?is-external=true; title="class or interface in java.lang">BooleancheckAndPut(byte[]row, byte[]family, byte[]qualifier, CompareFilter.CompareOpcompareOp, @@ -689,7 +689,7 @@ public interface checkAndDelete -defaulthttp://docs.oracle.com/javase/8/docs/api/java/util/concurrent/CompletableFuture.html?is-external=true; title="class or interface in java.util.concurrent">CompletableFuturehttp://docs.oracle.com/javase/8/docs/api/java/lang/Boolean.html?is-external=true; title="class or interface in java.lang">BooleancheckAndDelete(byte[]row, +defaulthttp://docs.oracle.com/javase/8/docs/api/java/util/concurrent/CompletableFuture.html?is-external=true; title="class or interface in java.util.concurrent">CompletableFuturehttp://docs.oracle.com/javase/8/docs/api/java/lang/Boolean.html?is-external=true; title="class or interface in java.lang">BooleancheckAndDelete(byte[]row, byte[]family, byte[]qualifier, byte[]value, @@ -716,7 +716,7 @@ public interface checkAndDelete -http://docs.oracle.com/javase/8/docs/api/java/util/concurrent/CompletableFuture.html?is-external=true; title="class or interface in java.util.concurrent">CompletableFuturehttp://docs.oracle.com/javase/8/docs/api/java/lang/Boolean.html?is-external=true; title="class or interface in java.lang">BooleancheckAndDelete(byte[]row, +http://docs.oracle.com/javase/8/docs/api/java/util/concurrent/CompletableFuture.html?is-external=true; title="class or interface in java.util.concurrent">CompletableFuturehttp://docs.oracle.com/javase/8/docs/api/java/lang/Boolean.html?is-external=true; title="class or interface in java.lang">BooleancheckAndDelete(byte[]row, byte[]family, byte[]qualifier, CompareFilter.CompareOpcompareOp, @@ -745,7 +745,7 @@ public interface mutateRow -http://docs.oracle.com/javase/8/docs/api/java/util/concurrent/CompletableFuture.html?is-external=true; title="class or interface in java.util.concurrent">CompletableFuturehttp://docs.oracle.com/javase/8/docs/api/java/lang/Void.html?is-external=true; title="class or interface in java.lang">VoidmutateRow(RowMutationsmutation) +http://docs.oracle.com/javase/8/docs/api/java/util/concurrent/CompletableFuture.html?is-external=true; title="class or interface in java.util.concurrent">CompletableFuturehttp://docs.oracle.com/javase/8/docs/api/java/lang/Void.html?is-external=true; title="class or interface in java.lang">VoidmutateRow(RowMutationsmutation) Performs multiple mutations atomically on a single row. Currently Put and Delete are supported. @@ -762,7 +762,7 @@ public interface checkAndMutate
[07/42] hbase-site git commit: Published site at 82d554e3783372cc6b05489452c815b57c06f6cd.
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/9dfe3cd8/devapidocs/src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.html -- diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.html b/devapidocs/src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.html index 8424538..fb2b7e1 100644 --- a/devapidocs/src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.html +++ b/devapidocs/src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.html @@ -69,15 +69,15 @@ 061 requiredArguments = { 062@org.jamon.annotations.Argument(name = "master", type = "HMaster")}, 063 optionalArguments = { -064@org.jamon.annotations.Argument(name = "deadServers", type = "SetServerName"), -065@org.jamon.annotations.Argument(name = "frags", type = "MapString,Integer"), +064@org.jamon.annotations.Argument(name = "servers", type = "ListServerName"), +065@org.jamon.annotations.Argument(name = "deadServers", type = "SetServerName"), 066@org.jamon.annotations.Argument(name = "format", type = "String"), -067@org.jamon.annotations.Argument(name = "metaLocation", type = "ServerName"), -068@org.jamon.annotations.Argument(name = "servers", type = "ListServerName"), -069@org.jamon.annotations.Argument(name = "filter", type = "String"), -070@org.jamon.annotations.Argument(name = "catalogJanitorEnabled", type = "boolean"), +067@org.jamon.annotations.Argument(name = "frags", type = "MapString,Integer"), +068@org.jamon.annotations.Argument(name = "assignmentManager", type = "AssignmentManager"), +069@org.jamon.annotations.Argument(name = "catalogJanitorEnabled", type = "boolean"), +070@org.jamon.annotations.Argument(name = "filter", type = "String"), 071@org.jamon.annotations.Argument(name = "serverManager", type = "ServerManager"), -072@org.jamon.annotations.Argument(name = "assignmentManager", type = "AssignmentManager")}) +072@org.jamon.annotations.Argument(name = "metaLocation", type = "ServerName")}) 073public class MasterStatusTmpl 074 extends org.jamon.AbstractTemplateProxy 075{ @@ -118,40 +118,40 @@ 110 return m_master; 111} 112private HMaster m_master; -113// 24, 1 -114public void setDeadServers(SetServerName deadServers) +113// 23, 1 +114public void setServers(ListServerName servers) 115{ -116 // 24, 1 -117 m_deadServers = deadServers; -118 m_deadServers__IsNotDefault = true; +116 // 23, 1 +117 m_servers = servers; +118 m_servers__IsNotDefault = true; 119} -120public SetServerName getDeadServers() +120public ListServerName getServers() 121{ -122 return m_deadServers; +122 return m_servers; 123} -124private SetServerName m_deadServers; -125public boolean getDeadServers__IsNotDefault() +124private ListServerName m_servers; +125public boolean getServers__IsNotDefault() 126{ -127 return m_deadServers__IsNotDefault; +127 return m_servers__IsNotDefault; 128} -129private boolean m_deadServers__IsNotDefault; -130// 21, 1 -131public void setFrags(MapString,Integer frags) +129private boolean m_servers__IsNotDefault; +130// 24, 1 +131public void setDeadServers(SetServerName deadServers) 132{ -133 // 21, 1 -134 m_frags = frags; -135 m_frags__IsNotDefault = true; +133 // 24, 1 +134 m_deadServers = deadServers; +135 m_deadServers__IsNotDefault = true; 136} -137public MapString,Integer getFrags() +137public SetServerName getDeadServers() 138{ -139 return m_frags; +139 return m_deadServers; 140} -141private MapString,Integer m_frags; -142public boolean getFrags__IsNotDefault() +141private SetServerName m_deadServers; +142public boolean getDeadServers__IsNotDefault() 143{ -144 return m_frags__IsNotDefault; +144 return m_deadServers__IsNotDefault; 145} -146private boolean m_frags__IsNotDefault; +146private boolean m_deadServers__IsNotDefault; 147// 27, 1 148public void setFormat(String format) 149{ @@ -169,74 +169,74 @@ 161 return m_format__IsNotDefault; 162} 163private boolean m_format__IsNotDefault; -164// 22, 1 -165public void setMetaLocation(ServerName metaLocation) +164// 21, 1 +165public void setFrags(MapString,Integer frags) 166{ -167 // 22, 1 -168 m_metaLocation = metaLocation; -169 m_metaLocation__IsNotDefault = true; +167 // 21, 1 +168 m_frags = frags; +169 m_frags__IsNotDefault = true; 170} -171public ServerName getMetaLocation() +171public MapString,Integer getFrags() 172{ -173 return m_metaLocation; +173 return m_frags; 174} -175private ServerName m_metaLocation; -176public boolean
[19/42] hbase-site git commit: Published site at 82d554e3783372cc6b05489452c815b57c06f6cd.
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/9dfe3cd8/devapidocs/src-html/org/apache/hadoop/hbase/client/AsyncHBaseAdmin.MergeTableRegionProcedureBiConsumer.html -- diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/client/AsyncHBaseAdmin.MergeTableRegionProcedureBiConsumer.html b/devapidocs/src-html/org/apache/hadoop/hbase/client/AsyncHBaseAdmin.MergeTableRegionProcedureBiConsumer.html index 1b2d845..47f510c 100644 --- a/devapidocs/src-html/org/apache/hadoop/hbase/client/AsyncHBaseAdmin.MergeTableRegionProcedureBiConsumer.html +++ b/devapidocs/src-html/org/apache/hadoop/hbase/client/AsyncHBaseAdmin.MergeTableRegionProcedureBiConsumer.html @@ -98,1445 +98,1445 @@ 090import org.apache.hadoop.hbase.shaded.protobuf.generated.AdminProtos.GetOnlineRegionResponse; 091import org.apache.hadoop.hbase.shaded.protobuf.generated.AdminProtos.SplitRegionRequest; 092import org.apache.hadoop.hbase.shaded.protobuf.generated.AdminProtos.SplitRegionResponse; -093import org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos; -094import org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos.ProcedureDescription; -095import org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos.TableSchema; -096import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.AbortProcedureRequest; -097import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.AbortProcedureResponse; -098import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.AddColumnRequest; -099import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.AddColumnResponse; -100import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.AssignRegionRequest; -101import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.AssignRegionResponse; -102import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.BalanceRequest; -103import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.BalanceResponse; -104import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.CreateNamespaceRequest; -105import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.CreateNamespaceResponse; -106import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.DeleteNamespaceRequest; -107import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.DeleteNamespaceResponse; -108import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.DeleteSnapshotRequest; -109import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.DeleteSnapshotResponse; -110import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.DisableTableRequest; -111import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.DisableTableResponse; -112import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.EnableTableRequest; -113import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.EnableTableResponse; -114import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.DeleteColumnRequest; -115import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.DeleteColumnResponse; -116import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.ExecProcedureRequest; -117import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.ExecProcedureResponse; -118import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.GetCompletedSnapshotsRequest; -119import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.GetCompletedSnapshotsResponse; -120import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.GetNamespaceDescriptorRequest; -121import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.GetNamespaceDescriptorResponse; -122import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.GetProcedureResultRequest; -123import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.GetProcedureResultResponse; -124import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.GetSchemaAlterStatusRequest; -125import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.GetSchemaAlterStatusResponse; -126import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.GetTableDescriptorsRequest; -127import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.GetTableDescriptorsResponse; -128import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.GetTableNamesRequest; -129import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.GetTableNamesResponse; -130import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.CreateTableRequest; -131import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.CreateTableResponse; -132import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.DeleteTableRequest; -133import
[40/42] hbase-site git commit: Published site at 82d554e3783372cc6b05489452c815b57c06f6cd.
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/9dfe3cd8/apidocs/src-html/org/apache/hadoop/hbase/TableName.html -- diff --git a/apidocs/src-html/org/apache/hadoop/hbase/TableName.html b/apidocs/src-html/org/apache/hadoop/hbase/TableName.html index d45a9a4..87d2a05 100644 --- a/apidocs/src-html/org/apache/hadoop/hbase/TableName.html +++ b/apidocs/src-html/org/apache/hadoop/hbase/TableName.html @@ -27,515 +27,537 @@ 019package org.apache.hadoop.hbase; 020 021import java.nio.ByteBuffer; -022import java.util.Arrays; -023import java.util.Set; -024import java.util.concurrent.CopyOnWriteArraySet; -025 -026import org.apache.hadoop.hbase.classification.InterfaceAudience; -027import org.apache.hadoop.hbase.util.Bytes; -028import org.apache.hadoop.hbase.KeyValue.KVComparator; -029 -030/** -031 * Immutable POJO class for representing a table name. -032 * Which is of the form: -033 * lt;table namespacegt;:lt;table qualifiergt; -034 * -035 * Two special namespaces: -036 * -037 * 1. hbase - system namespace, used to contain hbase internal tables -038 * 2. default - tables with no explicit specified namespace will -039 * automatically fall into this namespace. -040 * -041 * ie -042 * -043 * a) foo:bar, means namespace=foo and qualifier=bar -044 * b) bar, means namespace=default and qualifier=bar -045 * c) default:bar, means namespace=default and qualifier=bar -046 * -047 * p -048 * Internally, in this class, we cache the instances to limit the number of objects and -049 * make the "equals" faster. We try to minimize the number of objects created of -050 * the number of array copy to check if we already have an instance of this TableName. The code -051 * is not optimize for a new instance creation but is optimized to check for existence. -052 * /p -053 */ -054@InterfaceAudience.Public -055public final class TableName implements ComparableTableName { -056 -057 /** See {@link #createTableNameIfNecessary(ByteBuffer, ByteBuffer)} */ -058 private static final SetTableName tableCache = new CopyOnWriteArraySet(); -059 -060 /** Namespace delimiter */ -061 //this should always be only 1 byte long -062 public final static char NAMESPACE_DELIM = ':'; -063 -064 // A non-capture group so that this can be embedded. -065 // regex is a bit more complicated to support nuance of tables -066 // in default namespace -067 //Allows only letters, digits and '_' -068 public static final String VALID_NAMESPACE_REGEX = -069 "(?:[a-zA-Z_0-9]+)"; -070 //Allows only letters, digits, '_', '-' and '.' -071 public static final String VALID_TABLE_QUALIFIER_REGEX = -072 "(?:[a-zA-Z_0-9][a-zA-Z_0-9-.]*)"; -073 //Concatenation of NAMESPACE_REGEX and TABLE_QUALIFIER_REGEX, -074 //with NAMESPACE_DELIM as delimiter -075 public static final String VALID_USER_TABLE_REGEX = -076 "(?:(?:(?:"+VALID_NAMESPACE_REGEX+"\\"+NAMESPACE_DELIM+")?)" + -077 "(?:"+VALID_TABLE_QUALIFIER_REGEX+"))"; -078 -079 /** The hbase:meta table's name. */ -080 public static final TableName META_TABLE_NAME = -081 valueOf(NamespaceDescriptor.SYSTEM_NAMESPACE_NAME_STR, "meta"); -082 -083 /** The Namespace table's name. */ -084 public static final TableName NAMESPACE_TABLE_NAME = -085 valueOf(NamespaceDescriptor.SYSTEM_NAMESPACE_NAME_STR, "namespace"); -086 -087 public static final String OLD_META_STR = ".META."; -088 public static final String OLD_ROOT_STR = "-ROOT-"; -089 -090 /** -091 * @return True if codetn/code is the hbase:meta table name. -092 */ -093 public static boolean isMetaTableName(final TableName tn) { -094return tn.equals(TableName.META_TABLE_NAME); -095 } -096 -097 /** -098 * TableName for old -ROOT- table. It is used to read/process old WALs which have -099 * ROOT edits. -100 */ -101 public static final TableName OLD_ROOT_TABLE_NAME = getADummyTableName(OLD_ROOT_STR); -102 /** -103 * TableName for old .META. table. Used in testing. +022import java.nio.charset.StandardCharsets; +023import java.util.Arrays; +024import java.util.Set; +025import java.util.concurrent.CopyOnWriteArraySet; +026 +027import org.apache.hadoop.hbase.classification.InterfaceAudience; +028import org.apache.hadoop.hbase.util.Bytes; +029import org.apache.hadoop.hbase.KeyValue.KVComparator; +030 +031/** +032 * Immutable POJO class for representing a table name. +033 * Which is of the form: +034 * lt;table namespacegt;:lt;table qualifiergt; +035 * +036 * Two special namespaces: +037 * +038 * 1. hbase - system namespace, used to contain hbase internal tables +039 * 2. default - tables with no explicit specified namespace will +040 * automatically fall into this namespace. +041 * +042 * ie +043 * +044 * a) foo:bar, means namespace=foo and qualifier=bar +045 * b) bar, means namespace=default and qualifier=bar +046 * c) default:bar, means namespace=default and qualifier=bar +047 * +048 * p +049 *
[17/42] hbase-site git commit: Published site at 82d554e3783372cc6b05489452c815b57c06f6cd.
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/9dfe3cd8/devapidocs/src-html/org/apache/hadoop/hbase/client/AsyncHBaseAdmin.ModifyNamespaceProcedureBiConsumer.html -- diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/client/AsyncHBaseAdmin.ModifyNamespaceProcedureBiConsumer.html b/devapidocs/src-html/org/apache/hadoop/hbase/client/AsyncHBaseAdmin.ModifyNamespaceProcedureBiConsumer.html index 1b2d845..47f510c 100644 --- a/devapidocs/src-html/org/apache/hadoop/hbase/client/AsyncHBaseAdmin.ModifyNamespaceProcedureBiConsumer.html +++ b/devapidocs/src-html/org/apache/hadoop/hbase/client/AsyncHBaseAdmin.ModifyNamespaceProcedureBiConsumer.html @@ -98,1445 +98,1445 @@ 090import org.apache.hadoop.hbase.shaded.protobuf.generated.AdminProtos.GetOnlineRegionResponse; 091import org.apache.hadoop.hbase.shaded.protobuf.generated.AdminProtos.SplitRegionRequest; 092import org.apache.hadoop.hbase.shaded.protobuf.generated.AdminProtos.SplitRegionResponse; -093import org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos; -094import org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos.ProcedureDescription; -095import org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos.TableSchema; -096import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.AbortProcedureRequest; -097import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.AbortProcedureResponse; -098import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.AddColumnRequest; -099import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.AddColumnResponse; -100import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.AssignRegionRequest; -101import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.AssignRegionResponse; -102import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.BalanceRequest; -103import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.BalanceResponse; -104import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.CreateNamespaceRequest; -105import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.CreateNamespaceResponse; -106import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.DeleteNamespaceRequest; -107import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.DeleteNamespaceResponse; -108import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.DeleteSnapshotRequest; -109import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.DeleteSnapshotResponse; -110import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.DisableTableRequest; -111import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.DisableTableResponse; -112import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.EnableTableRequest; -113import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.EnableTableResponse; -114import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.DeleteColumnRequest; -115import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.DeleteColumnResponse; -116import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.ExecProcedureRequest; -117import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.ExecProcedureResponse; -118import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.GetCompletedSnapshotsRequest; -119import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.GetCompletedSnapshotsResponse; -120import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.GetNamespaceDescriptorRequest; -121import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.GetNamespaceDescriptorResponse; -122import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.GetProcedureResultRequest; -123import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.GetProcedureResultResponse; -124import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.GetSchemaAlterStatusRequest; -125import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.GetSchemaAlterStatusResponse; -126import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.GetTableDescriptorsRequest; -127import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.GetTableDescriptorsResponse; -128import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.GetTableNamesRequest; -129import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.GetTableNamesResponse; -130import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.CreateTableRequest; -131import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.CreateTableResponse; -132import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.DeleteTableRequest; -133import
[35/42] hbase-site git commit: Published site at 82d554e3783372cc6b05489452c815b57c06f6cd.
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/9dfe3cd8/devapidocs/org/apache/hadoop/hbase/client/AsyncTableBase.html -- diff --git a/devapidocs/org/apache/hadoop/hbase/client/AsyncTableBase.html b/devapidocs/org/apache/hadoop/hbase/client/AsyncTableBase.html index af7ca2e..bf11f91 100644 --- a/devapidocs/org/apache/hadoop/hbase/client/AsyncTableBase.html +++ b/devapidocs/org/apache/hadoop/hbase/client/AsyncTableBase.html @@ -637,7 +637,7 @@ public interface checkAndPut -defaulthttp://docs.oracle.com/javase/8/docs/api/java/util/concurrent/CompletableFuture.html?is-external=true; title="class or interface in java.util.concurrent">CompletableFuturehttp://docs.oracle.com/javase/8/docs/api/java/lang/Boolean.html?is-external=true; title="class or interface in java.lang">BooleancheckAndPut(byte[]row, +defaulthttp://docs.oracle.com/javase/8/docs/api/java/util/concurrent/CompletableFuture.html?is-external=true; title="class or interface in java.util.concurrent">CompletableFuturehttp://docs.oracle.com/javase/8/docs/api/java/lang/Boolean.html?is-external=true; title="class or interface in java.lang">BooleancheckAndPut(byte[]row, byte[]family, byte[]qualifier, byte[]value, @@ -664,7 +664,7 @@ public interface checkAndPut -http://docs.oracle.com/javase/8/docs/api/java/util/concurrent/CompletableFuture.html?is-external=true; title="class or interface in java.util.concurrent">CompletableFuturehttp://docs.oracle.com/javase/8/docs/api/java/lang/Boolean.html?is-external=true; title="class or interface in java.lang">BooleancheckAndPut(byte[]row, +http://docs.oracle.com/javase/8/docs/api/java/util/concurrent/CompletableFuture.html?is-external=true; title="class or interface in java.util.concurrent">CompletableFuturehttp://docs.oracle.com/javase/8/docs/api/java/lang/Boolean.html?is-external=true; title="class or interface in java.lang">BooleancheckAndPut(byte[]row, byte[]family, byte[]qualifier, CompareFilter.CompareOpcompareOp, @@ -693,7 +693,7 @@ public interface checkAndDelete -defaulthttp://docs.oracle.com/javase/8/docs/api/java/util/concurrent/CompletableFuture.html?is-external=true; title="class or interface in java.util.concurrent">CompletableFuturehttp://docs.oracle.com/javase/8/docs/api/java/lang/Boolean.html?is-external=true; title="class or interface in java.lang">BooleancheckAndDelete(byte[]row, +defaulthttp://docs.oracle.com/javase/8/docs/api/java/util/concurrent/CompletableFuture.html?is-external=true; title="class or interface in java.util.concurrent">CompletableFuturehttp://docs.oracle.com/javase/8/docs/api/java/lang/Boolean.html?is-external=true; title="class or interface in java.lang">BooleancheckAndDelete(byte[]row, byte[]family, byte[]qualifier, byte[]value, @@ -720,7 +720,7 @@ public interface checkAndDelete -http://docs.oracle.com/javase/8/docs/api/java/util/concurrent/CompletableFuture.html?is-external=true; title="class or interface in java.util.concurrent">CompletableFuturehttp://docs.oracle.com/javase/8/docs/api/java/lang/Boolean.html?is-external=true; title="class or interface in java.lang">BooleancheckAndDelete(byte[]row, +http://docs.oracle.com/javase/8/docs/api/java/util/concurrent/CompletableFuture.html?is-external=true; title="class or interface in java.util.concurrent">CompletableFuturehttp://docs.oracle.com/javase/8/docs/api/java/lang/Boolean.html?is-external=true; title="class or interface in java.lang">BooleancheckAndDelete(byte[]row, byte[]family, byte[]qualifier, CompareFilter.CompareOpcompareOp, @@ -749,7 +749,7 @@ public interface mutateRow -http://docs.oracle.com/javase/8/docs/api/java/util/concurrent/CompletableFuture.html?is-external=true; title="class or interface in java.util.concurrent">CompletableFuturehttp://docs.oracle.com/javase/8/docs/api/java/lang/Void.html?is-external=true; title="class or interface in java.lang">VoidmutateRow(RowMutationsmutation) +http://docs.oracle.com/javase/8/docs/api/java/util/concurrent/CompletableFuture.html?is-external=true; title="class or interface in java.util.concurrent">CompletableFuturehttp://docs.oracle.com/javase/8/docs/api/java/lang/Void.html?is-external=true; title="class or interface in java.lang">VoidmutateRow(RowMutationsmutation) Performs multiple mutations atomically on a single row. Currently Put and Delete are supported. @@ -766,7 +766,7 @@ public interface
[32/42] hbase-site git commit: Published site at 82d554e3783372cc6b05489452c815b57c06f6cd.
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/9dfe3cd8/devapidocs/src-html/org/apache/hadoop/hbase/TableName.html -- diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/TableName.html b/devapidocs/src-html/org/apache/hadoop/hbase/TableName.html index d45a9a4..87d2a05 100644 --- a/devapidocs/src-html/org/apache/hadoop/hbase/TableName.html +++ b/devapidocs/src-html/org/apache/hadoop/hbase/TableName.html @@ -27,515 +27,537 @@ 019package org.apache.hadoop.hbase; 020 021import java.nio.ByteBuffer; -022import java.util.Arrays; -023import java.util.Set; -024import java.util.concurrent.CopyOnWriteArraySet; -025 -026import org.apache.hadoop.hbase.classification.InterfaceAudience; -027import org.apache.hadoop.hbase.util.Bytes; -028import org.apache.hadoop.hbase.KeyValue.KVComparator; -029 -030/** -031 * Immutable POJO class for representing a table name. -032 * Which is of the form: -033 * lt;table namespacegt;:lt;table qualifiergt; -034 * -035 * Two special namespaces: -036 * -037 * 1. hbase - system namespace, used to contain hbase internal tables -038 * 2. default - tables with no explicit specified namespace will -039 * automatically fall into this namespace. -040 * -041 * ie -042 * -043 * a) foo:bar, means namespace=foo and qualifier=bar -044 * b) bar, means namespace=default and qualifier=bar -045 * c) default:bar, means namespace=default and qualifier=bar -046 * -047 * p -048 * Internally, in this class, we cache the instances to limit the number of objects and -049 * make the "equals" faster. We try to minimize the number of objects created of -050 * the number of array copy to check if we already have an instance of this TableName. The code -051 * is not optimize for a new instance creation but is optimized to check for existence. -052 * /p -053 */ -054@InterfaceAudience.Public -055public final class TableName implements ComparableTableName { -056 -057 /** See {@link #createTableNameIfNecessary(ByteBuffer, ByteBuffer)} */ -058 private static final SetTableName tableCache = new CopyOnWriteArraySet(); -059 -060 /** Namespace delimiter */ -061 //this should always be only 1 byte long -062 public final static char NAMESPACE_DELIM = ':'; -063 -064 // A non-capture group so that this can be embedded. -065 // regex is a bit more complicated to support nuance of tables -066 // in default namespace -067 //Allows only letters, digits and '_' -068 public static final String VALID_NAMESPACE_REGEX = -069 "(?:[a-zA-Z_0-9]+)"; -070 //Allows only letters, digits, '_', '-' and '.' -071 public static final String VALID_TABLE_QUALIFIER_REGEX = -072 "(?:[a-zA-Z_0-9][a-zA-Z_0-9-.]*)"; -073 //Concatenation of NAMESPACE_REGEX and TABLE_QUALIFIER_REGEX, -074 //with NAMESPACE_DELIM as delimiter -075 public static final String VALID_USER_TABLE_REGEX = -076 "(?:(?:(?:"+VALID_NAMESPACE_REGEX+"\\"+NAMESPACE_DELIM+")?)" + -077 "(?:"+VALID_TABLE_QUALIFIER_REGEX+"))"; -078 -079 /** The hbase:meta table's name. */ -080 public static final TableName META_TABLE_NAME = -081 valueOf(NamespaceDescriptor.SYSTEM_NAMESPACE_NAME_STR, "meta"); -082 -083 /** The Namespace table's name. */ -084 public static final TableName NAMESPACE_TABLE_NAME = -085 valueOf(NamespaceDescriptor.SYSTEM_NAMESPACE_NAME_STR, "namespace"); -086 -087 public static final String OLD_META_STR = ".META."; -088 public static final String OLD_ROOT_STR = "-ROOT-"; -089 -090 /** -091 * @return True if codetn/code is the hbase:meta table name. -092 */ -093 public static boolean isMetaTableName(final TableName tn) { -094return tn.equals(TableName.META_TABLE_NAME); -095 } -096 -097 /** -098 * TableName for old -ROOT- table. It is used to read/process old WALs which have -099 * ROOT edits. -100 */ -101 public static final TableName OLD_ROOT_TABLE_NAME = getADummyTableName(OLD_ROOT_STR); -102 /** -103 * TableName for old .META. table. Used in testing. +022import java.nio.charset.StandardCharsets; +023import java.util.Arrays; +024import java.util.Set; +025import java.util.concurrent.CopyOnWriteArraySet; +026 +027import org.apache.hadoop.hbase.classification.InterfaceAudience; +028import org.apache.hadoop.hbase.util.Bytes; +029import org.apache.hadoop.hbase.KeyValue.KVComparator; +030 +031/** +032 * Immutable POJO class for representing a table name. +033 * Which is of the form: +034 * lt;table namespacegt;:lt;table qualifiergt; +035 * +036 * Two special namespaces: +037 * +038 * 1. hbase - system namespace, used to contain hbase internal tables +039 * 2. default - tables with no explicit specified namespace will +040 * automatically fall into this namespace. +041 * +042 * ie +043 * +044 * a) foo:bar, means namespace=foo and qualifier=bar +045 * b) bar, means namespace=default and qualifier=bar +046 * c) default:bar, means namespace=default and qualifier=bar +047 *
[38/42] hbase-site git commit: Published site at 82d554e3783372cc6b05489452c815b57c06f6cd.
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/9dfe3cd8/devapidocs/index-all.html -- diff --git a/devapidocs/index-all.html b/devapidocs/index-all.html index 9616acc..aeb7adf 100644 --- a/devapidocs/index-all.html +++ b/devapidocs/index-all.html @@ -14705,6 +14705,8 @@ It works by processing a compaction that's been written to disk. +completeConditionalOnFuture(CompletableFutureT, CompletableFutureT) - Method in class org.apache.hadoop.hbase.client.AsyncHBaseAdmin + completed(Channel) - Method in class org.apache.hadoop.hbase.io.asyncfs.FanOutOneBlockAsyncDFSOutput completed - Variable in class org.apache.hadoop.hbase.procedure2.ProcedureExecutor @@ -23817,6 +23819,10 @@ DISALLOW_WRITES_IN_RECOVERING - Static variable in class org.apache.hadoop.hbase.HConstants +DISALLOWED_TABLE_NAME - Static variable in class org.apache.hadoop.hbase.TableName + +One globally disallowed name + disallowWritesInRecovering - Variable in class org.apache.hadoop.hbase.regionserver.HRegion Config setting for whether to allow writes when a region is in recovering or not. @@ -57321,7 +57327,7 @@ isLegalTableQualifierName(byte[], int, int) - Static method in class org.apache.hadoop.hbase.TableName Qualifier names can only contain 'word' characters - [a-zA-Z_0-9] or '_', '.' or '-'. + [\p{IsAlphabetic}\p{Digit}] or '_', '.' or '-'. isLegalTableQualifierName(byte[], int, int, boolean) - Static method in class org.apache.hadoop.hbase.TableName http://git-wip-us.apache.org/repos/asf/hbase-site/blob/9dfe3cd8/devapidocs/org/apache/hadoop/hbase/TableName.html -- diff --git a/devapidocs/org/apache/hadoop/hbase/TableName.html b/devapidocs/org/apache/hadoop/hbase/TableName.html index cc138a8..398962d 100644 --- a/devapidocs/org/apache/hadoop/hbase/TableName.html +++ b/devapidocs/org/apache/hadoop/hbase/TableName.html @@ -114,7 +114,7 @@ var activeTableTab = "activeTableTab"; @InterfaceAudience.Public -public final class TableName +public final class TableName extends http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true; title="class or interface in java.lang">Object implements http://docs.oracle.com/javase/8/docs/api/java/lang/Comparable.html?is-external=true; title="class or interface in java.lang">ComparableTableName Immutable POJO class for representing a table name. @@ -158,90 +158,96 @@ implements http://docs.oracle.com/javase/8/docs/api/java/lang/Comparabl Field and Description +static http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true; title="class or interface in java.lang">String +DISALLOWED_TABLE_NAME +One globally disallowed name + + + private int hashCode - + static TableName META_TABLE_NAME The hbase:meta table's name. - + private byte[] name - + private http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true; title="class or interface in java.lang">String nameAsString - + private byte[] namespace - + static char NAMESPACE_DELIM Namespace delimiter - + static TableName NAMESPACE_TABLE_NAME The Namespace table's name. - + private http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true; title="class or interface in java.lang">String namespaceAsString - + static http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true; title="class or interface in java.lang">String OLD_META_STR - + static TableName OLD_META_TABLE_NAME TableName for old .META. - + static http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true; title="class or interface in java.lang">String OLD_ROOT_STR - + static TableName OLD_ROOT_TABLE_NAME TableName for old -ROOT- table. - + private byte[] qualifier - + private http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true; title="class or interface in java.lang">String qualifierAsString - + private boolean systemTable - + private static http://docs.oracle.com/javase/8/docs/api/java/util/Set.html?is-external=true; title="class or interface in java.util">SetTableName tableCache See createTableNameIfNecessary(ByteBuffer, ByteBuffer) - + static http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true; title="class or interface in java.lang">String VALID_NAMESPACE_REGEX - + static http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true; title="class or interface in java.lang">String VALID_TABLE_QUALIFIER_REGEX - + static http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true; title="class or interface in java.lang">String VALID_USER_TABLE_REGEX @@ -386,7 +392,7 @@ implements http://docs.oracle.com/javase/8/docs/api/java/lang/Comparabl intstart,
[42/42] hbase-site git commit: Published site at 82d554e3783372cc6b05489452c815b57c06f6cd.
Published site at 82d554e3783372cc6b05489452c815b57c06f6cd. Project: http://git-wip-us.apache.org/repos/asf/hbase-site/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase-site/commit/9dfe3cd8 Tree: http://git-wip-us.apache.org/repos/asf/hbase-site/tree/9dfe3cd8 Diff: http://git-wip-us.apache.org/repos/asf/hbase-site/diff/9dfe3cd8 Branch: refs/heads/asf-site Commit: 9dfe3cd804a5a6af0cdc02e3ecfb6a71be66d612 Parents: bb0e517 Author: jenkinsAuthored: Mon May 22 17:47:07 2017 + Committer: jenkins Committed: Mon May 22 17:47:07 2017 + -- acid-semantics.html |4 +- apache_hbase_reference_guide.pdf|4 +- apache_hbase_reference_guide.pdfmarks |4 +- apidocs/constant-values.html| 23 +- apidocs/index-all.html |6 +- apidocs/org/apache/hadoop/hbase/TableName.html | 122 +- .../hadoop/hbase/client/AsyncTableBase.html | 36 +- .../org/apache/hadoop/hbase/TableName.html | 1010 ++--- .../hadoop/hbase/client/AsyncTableBase.html | 495 ++- bulk-loads.html |4 +- checkstyle-aggregate.html | 174 +- coc.html|4 +- cygwin.html |4 +- dependencies.html |4 +- dependency-convergence.html |4 +- dependency-info.html|4 +- dependency-management.html |4 +- devapidocs/constant-values.html | 29 +- devapidocs/index-all.html |8 +- .../org/apache/hadoop/hbase/TableName.html | 168 +- .../hadoop/hbase/backup/package-tree.html |6 +- .../hbase/classification/package-tree.html |6 +- ...dmin.AddColumnFamilyProcedureBiConsumer.html |6 +- .../client/AsyncHBaseAdmin.AdminRpcCall.html|4 +- .../hbase/client/AsyncHBaseAdmin.Converter.html |4 +- ...dmin.CreateNamespaceProcedureBiConsumer.html |6 +- ...aseAdmin.CreateTableProcedureBiConsumer.html |6 +- ...n.DeleteColumnFamilyProcedureBiConsumer.html |6 +- ...dmin.DeleteNamespaceProcedureBiConsumer.html |6 +- ...aseAdmin.DeleteTableProcedureBiConsumer.html |8 +- ...seAdmin.DisableTableProcedureBiConsumer.html |6 +- ...aseAdmin.EnableTableProcedureBiConsumer.html |6 +- .../client/AsyncHBaseAdmin.MasterRpcCall.html |4 +- ...min.MergeTableRegionProcedureBiConsumer.html |6 +- ...n.ModifyColumnFamilyProcedureBiConsumer.html |6 +- ...dmin.ModifyNamespaceProcedureBiConsumer.html |6 +- ...HBaseAdmin.NamespaceProcedureBiConsumer.html | 14 +- .../AsyncHBaseAdmin.ProcedureBiConsumer.html| 12 +- .../client/AsyncHBaseAdmin.TableOperator.html |4 +- ...syncHBaseAdmin.TableProcedureBiConsumer.html | 14 +- ...eAdmin.TruncateTableProcedureBiConsumer.html |6 +- .../hadoop/hbase/client/AsyncHBaseAdmin.html| 453 +- .../hadoop/hbase/client/AsyncTableBase.html | 36 +- .../hadoop/hbase/client/package-tree.html | 26 +- .../hadoop/hbase/executor/package-tree.html |2 +- .../hadoop/hbase/filter/package-tree.html | 10 +- .../org/apache/hadoop/hbase/io/HFileLink.html | 69 +- .../hadoop/hbase/io/hfile/package-tree.html |4 +- .../apache/hadoop/hbase/ipc/package-tree.html |2 +- .../hadoop/hbase/mapreduce/package-tree.html|2 +- .../hadoop/hbase/master/package-tree.html |4 +- .../hbase/master/procedure/package-tree.html|2 +- .../org/apache/hadoop/hbase/package-tree.html | 12 +- .../hadoop/hbase/procedure2/package-tree.html |4 +- .../hadoop/hbase/quotas/package-tree.html |4 +- .../hadoop/hbase/regionserver/package-tree.html | 20 +- .../regionserver/querymatcher/package-tree.html |4 +- .../hadoop/hbase/rest/model/package-tree.html |2 +- .../hadoop/hbase/security/package-tree.html |4 +- .../hadoop/hbase/thrift/package-tree.html |2 +- .../tmpl/master/MasterStatusTmpl.ImplData.html | 210 +- .../hbase/tmpl/master/MasterStatusTmpl.html | 84 +- .../hbase/tmpl/master/MasterStatusTmplImpl.html | 42 +- .../regionserver/RSStatusTmpl.ImplData.html | 60 +- .../hbase/tmpl/regionserver/RSStatusTmpl.html | 24 +- .../tmpl/regionserver/RSStatusTmplImpl.html | 12 +- .../apache/hadoop/hbase/util/package-tree.html |8 +- .../apache/hadoop/hbase/wal/package-tree.html |2 +- .../org/apache/hadoop/hbase/TableName.html | 1010 ++--- .../org/apache/hadoop/hbase/Version.html|6 +- ...dmin.AddColumnFamilyProcedureBiConsumer.html | 3940 +- .../client/AsyncHBaseAdmin.AdminRpcCall.html| 3940 +-
[39/42] hbase-site git commit: Published site at 82d554e3783372cc6b05489452c815b57c06f6cd.
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/9dfe3cd8/apidocs/src-html/org/apache/hadoop/hbase/client/AsyncTableBase.html -- diff --git a/apidocs/src-html/org/apache/hadoop/hbase/client/AsyncTableBase.html b/apidocs/src-html/org/apache/hadoop/hbase/client/AsyncTableBase.html index ed21559..da6c0fb 100644 --- a/apidocs/src-html/org/apache/hadoop/hbase/client/AsyncTableBase.html +++ b/apidocs/src-html/org/apache/hadoop/hbase/client/AsyncTableBase.html @@ -192,254 +192,253 @@ 184 long amount, Durability durability) { 185Preconditions.checkNotNull(row, "row is null"); 186Preconditions.checkNotNull(family, "family is null"); -187Preconditions.checkNotNull(qualifier, "qualifier is null"); -188return increment( -189 new Increment(row).addColumn(family, qualifier, amount).setDurability(durability)) -190 .thenApply(r - Bytes.toLong(r.getValue(family, qualifier))); -191 } -192 -193 /** -194 * Atomically checks if a row/family/qualifier value equals to the expected value. If it does, it -195 * adds the put. If the passed value is null, the check is for the lack of column (ie: -196 * non-existence) -197 * @param row to check -198 * @param family column family to check -199 * @param qualifier column qualifier to check -200 * @param value the expected value -201 * @param put data to put if check succeeds -202 * @return true if the new put was executed, false otherwise. The return value will be wrapped by -203 * a {@link CompletableFuture}. -204 */ -205 default CompletableFutureBoolean checkAndPut(byte[] row, byte[] family, byte[] qualifier, -206 byte[] value, Put put) { -207return checkAndPut(row, family, qualifier, CompareOp.EQUAL, value, put); -208 } -209 -210 /** -211 * Atomically checks if a row/family/qualifier value matches the expected value. If it does, it -212 * adds the put. If the passed value is null, the check is for the lack of column (ie: -213 * non-existence) -214 * @param row to check -215 * @param family column family to check -216 * @param qualifier column qualifier to check -217 * @param compareOp comparison operator to use -218 * @param value the expected value -219 * @param put data to put if check succeeds -220 * @return true if the new put was executed, false otherwise. The return value will be wrapped by -221 * a {@link CompletableFuture}. -222 */ -223 CompletableFutureBoolean checkAndPut(byte[] row, byte[] family, byte[] qualifier, -224 CompareOp compareOp, byte[] value, Put put); -225 -226 /** -227 * Atomically checks if a row/family/qualifier value equals to the expected value. If it does, it -228 * adds the delete. If the passed value is null, the check is for the lack of column (ie: -229 * non-existence) -230 * @param row to check -231 * @param family column family to check -232 * @param qualifier column qualifier to check -233 * @param value the expected value -234 * @param delete data to delete if check succeeds -235 * @return true if the new delete was executed, false otherwise. The return value will be wrapped -236 * by a {@link CompletableFuture}. -237 */ -238 default CompletableFutureBoolean checkAndDelete(byte[] row, byte[] family, byte[] qualifier, -239 byte[] value, Delete delete) { -240return checkAndDelete(row, family, qualifier, CompareOp.EQUAL, value, delete); -241 } -242 -243 /** -244 * Atomically checks if a row/family/qualifier value matches the expected value. If it does, it -245 * adds the delete. If the passed value is null, the check is for the lack of column (ie: -246 * non-existence) -247 * @param row to check -248 * @param family column family to check -249 * @param qualifier column qualifier to check -250 * @param compareOp comparison operator to use -251 * @param value the expected value -252 * @param delete data to delete if check succeeds -253 * @return true if the new delete was executed, false otherwise. The return value will be wrapped -254 * by a {@link CompletableFuture}. -255 */ -256 CompletableFutureBoolean checkAndDelete(byte[] row, byte[] family, byte[] qualifier, -257 CompareOp compareOp, byte[] value, Delete delete); -258 -259 /** -260 * Performs multiple mutations atomically on a single row. Currently {@link Put} and -261 * {@link Delete} are supported. -262 * @param mutation object that specifies the set of mutations to perform atomically -263 * @return A {@link CompletableFuture} that always returns null when complete normally. -264 */ -265 CompletableFutureVoid mutateRow(RowMutations mutation); -266 -267 /** -268 * Atomically checks if a row/family/qualifier value equals to the expected value. If it does, it -269 * performs the row mutations. If the passed value is null, the check is for the lack of
[34/42] hbase-site git commit: Published site at 82d554e3783372cc6b05489452c815b57c06f6cd.
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/9dfe3cd8/devapidocs/org/apache/hadoop/hbase/master/package-tree.html -- diff --git a/devapidocs/org/apache/hadoop/hbase/master/package-tree.html b/devapidocs/org/apache/hadoop/hbase/master/package-tree.html index b1b9d7a..e634b62 100644 --- a/devapidocs/org/apache/hadoop/hbase/master/package-tree.html +++ b/devapidocs/org/apache/hadoop/hbase/master/package-tree.html @@ -322,11 +322,11 @@ java.lang.http://docs.oracle.com/javase/8/docs/api/java/lang/Enum.html?is-external=true; title="class or interface in java.lang">EnumE (implements java.lang.http://docs.oracle.com/javase/8/docs/api/java/lang/Comparable.html?is-external=true; title="class or interface in java.lang">ComparableT, java.io.http://docs.oracle.com/javase/8/docs/api/java/io/Serializable.html?is-external=true; title="class or interface in java.io">Serializable) +org.apache.hadoop.hbase.master.SplitLogManager.TerminationStatus org.apache.hadoop.hbase.master.MetricsMasterSourceFactoryImpl.FactoryStorage org.apache.hadoop.hbase.master.MasterRpcServices.BalanceSwitchMode -org.apache.hadoop.hbase.master.SplitLogManager.TerminationStatus -org.apache.hadoop.hbase.master.SplitLogManager.ResubmitDirective org.apache.hadoop.hbase.master.RegionState.State +org.apache.hadoop.hbase.master.SplitLogManager.ResubmitDirective http://git-wip-us.apache.org/repos/asf/hbase-site/blob/9dfe3cd8/devapidocs/org/apache/hadoop/hbase/master/procedure/package-tree.html -- diff --git a/devapidocs/org/apache/hadoop/hbase/master/procedure/package-tree.html b/devapidocs/org/apache/hadoop/hbase/master/procedure/package-tree.html index 059f37d..a3aadda 100644 --- a/devapidocs/org/apache/hadoop/hbase/master/procedure/package-tree.html +++ b/devapidocs/org/apache/hadoop/hbase/master/procedure/package-tree.html @@ -174,8 +174,8 @@ java.lang.http://docs.oracle.com/javase/8/docs/api/java/lang/Enum.html?is-external=true; title="class or interface in java.lang">EnumE (implements java.lang.http://docs.oracle.com/javase/8/docs/api/java/lang/Comparable.html?is-external=true; title="class or interface in java.lang">ComparableT, java.io.http://docs.oracle.com/javase/8/docs/api/java/io/Serializable.html?is-external=true; title="class or interface in java.io">Serializable) -org.apache.hadoop.hbase.master.procedure.DisableTableProcedure.MarkRegionOfflineOpResult org.apache.hadoop.hbase.master.procedure.ServerProcedureInterface.ServerOperationType +org.apache.hadoop.hbase.master.procedure.DisableTableProcedure.MarkRegionOfflineOpResult org.apache.hadoop.hbase.master.procedure.TableProcedureInterface.TableOperationType http://git-wip-us.apache.org/repos/asf/hbase-site/blob/9dfe3cd8/devapidocs/org/apache/hadoop/hbase/package-tree.html -- diff --git a/devapidocs/org/apache/hadoop/hbase/package-tree.html b/devapidocs/org/apache/hadoop/hbase/package-tree.html index 395802d..c843229 100644 --- a/devapidocs/org/apache/hadoop/hbase/package-tree.html +++ b/devapidocs/org/apache/hadoop/hbase/package-tree.html @@ -422,16 +422,16 @@ java.lang.http://docs.oracle.com/javase/8/docs/api/java/lang/Enum.html?is-external=true; title="class or interface in java.lang">EnumE (implements java.lang.http://docs.oracle.com/javase/8/docs/api/java/lang/Comparable.html?is-external=true; title="class or interface in java.lang">ComparableT, java.io.http://docs.oracle.com/javase/8/docs/api/java/io/Serializable.html?is-external=true; title="class or interface in java.io">Serializable) -org.apache.hadoop.hbase.HealthChecker.HealthCheckerExitStatus -org.apache.hadoop.hbase.MetaTableAccessor.QueryType -org.apache.hadoop.hbase.ProcedureState -org.apache.hadoop.hbase.MemoryCompactionPolicy org.apache.hadoop.hbase.CompatibilitySingletonFactory.SingletonStorage org.apache.hadoop.hbase.KeyValue.Type -org.apache.hadoop.hbase.HConstants.OperationStatusCode -org.apache.hadoop.hbase.KeepDeletedCells org.apache.hadoop.hbase.HConstants.Modify +org.apache.hadoop.hbase.KeepDeletedCells +org.apache.hadoop.hbase.HealthChecker.HealthCheckerExitStatus org.apache.hadoop.hbase.Coprocessor.State +org.apache.hadoop.hbase.ProcedureState +org.apache.hadoop.hbase.MetaTableAccessor.QueryType +org.apache.hadoop.hbase.MemoryCompactionPolicy +org.apache.hadoop.hbase.HConstants.OperationStatusCode http://git-wip-us.apache.org/repos/asf/hbase-site/blob/9dfe3cd8/devapidocs/org/apache/hadoop/hbase/procedure2/package-tree.html -- diff --git a/devapidocs/org/apache/hadoop/hbase/procedure2/package-tree.html b/devapidocs/org/apache/hadoop/hbase/procedure2/package-tree.html index 0cafc82..f5898bb 100644 --- a/devapidocs/org/apache/hadoop/hbase/procedure2/package-tree.html +++
[31/42] hbase-site git commit: Published site at 82d554e3783372cc6b05489452c815b57c06f6cd.
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/9dfe3cd8/devapidocs/src-html/org/apache/hadoop/hbase/Version.html -- diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/Version.html b/devapidocs/src-html/org/apache/hadoop/hbase/Version.html index 437a1ab..9978ba4 100644 --- a/devapidocs/src-html/org/apache/hadoop/hbase/Version.html +++ b/devapidocs/src-html/org/apache/hadoop/hbase/Version.html @@ -16,11 +16,11 @@ 008@InterfaceAudience.Private 009public class Version { 010 public static final String version = "2.0.0-SNAPSHOT"; -011 public static final String revision = "1ceb25cf09f5057bb9ec23eef90373c8febbc6e2"; +011 public static final String revision = "23ea2c36f52283631ce665e04f2af433fc25ae55"; 012 public static final String user = "jenkins"; -013 public static final String date = "Sun May 21 14:39:02 UTC 2017"; +013 public static final String date = "Mon May 22 17:26:54 UTC 2017"; 014 public static final String url = "git://asf920.gq1.ygridcore.net/home/jenkins/jenkins-slave/workspace/hbase_generate_website/hbase"; -015 public static final String srcChecksum = "959709dc479cd43cb2c015fa35707b84"; +015 public static final String srcChecksum = "be37f05208e627bd537f4c7287c5ea62"; 016}
[28/42] hbase-site git commit: Published site at 82d554e3783372cc6b05489452c815b57c06f6cd.
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/9dfe3cd8/devapidocs/src-html/org/apache/hadoop/hbase/client/AsyncHBaseAdmin.Converter.html -- diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/client/AsyncHBaseAdmin.Converter.html b/devapidocs/src-html/org/apache/hadoop/hbase/client/AsyncHBaseAdmin.Converter.html index 1b2d845..47f510c 100644 --- a/devapidocs/src-html/org/apache/hadoop/hbase/client/AsyncHBaseAdmin.Converter.html +++ b/devapidocs/src-html/org/apache/hadoop/hbase/client/AsyncHBaseAdmin.Converter.html @@ -98,1445 +98,1445 @@ 090import org.apache.hadoop.hbase.shaded.protobuf.generated.AdminProtos.GetOnlineRegionResponse; 091import org.apache.hadoop.hbase.shaded.protobuf.generated.AdminProtos.SplitRegionRequest; 092import org.apache.hadoop.hbase.shaded.protobuf.generated.AdminProtos.SplitRegionResponse; -093import org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos; -094import org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos.ProcedureDescription; -095import org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos.TableSchema; -096import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.AbortProcedureRequest; -097import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.AbortProcedureResponse; -098import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.AddColumnRequest; -099import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.AddColumnResponse; -100import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.AssignRegionRequest; -101import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.AssignRegionResponse; -102import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.BalanceRequest; -103import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.BalanceResponse; -104import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.CreateNamespaceRequest; -105import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.CreateNamespaceResponse; -106import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.DeleteNamespaceRequest; -107import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.DeleteNamespaceResponse; -108import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.DeleteSnapshotRequest; -109import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.DeleteSnapshotResponse; -110import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.DisableTableRequest; -111import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.DisableTableResponse; -112import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.EnableTableRequest; -113import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.EnableTableResponse; -114import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.DeleteColumnRequest; -115import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.DeleteColumnResponse; -116import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.ExecProcedureRequest; -117import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.ExecProcedureResponse; -118import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.GetCompletedSnapshotsRequest; -119import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.GetCompletedSnapshotsResponse; -120import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.GetNamespaceDescriptorRequest; -121import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.GetNamespaceDescriptorResponse; -122import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.GetProcedureResultRequest; -123import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.GetProcedureResultResponse; -124import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.GetSchemaAlterStatusRequest; -125import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.GetSchemaAlterStatusResponse; -126import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.GetTableDescriptorsRequest; -127import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.GetTableDescriptorsResponse; -128import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.GetTableNamesRequest; -129import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.GetTableNamesResponse; -130import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.CreateTableRequest; -131import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.CreateTableResponse; -132import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.DeleteTableRequest; -133import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.DeleteTableResponse; -134import
[04/42] hbase-site git commit: Published site at 82d554e3783372cc6b05489452c815b57c06f6cd.
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/9dfe3cd8/resources.html -- diff --git a/resources.html b/resources.html index 4aa2b6c..12b4c33 100644 --- a/resources.html +++ b/resources.html @@ -7,7 +7,7 @@ - + Apache HBase Other Apache HBase (TM) Resources @@ -336,7 +336,7 @@ under the License. --> https://www.apache.org/;>The Apache Software Foundation. All rights reserved. - Last Published: 2017-05-21 + Last Published: 2017-05-22 http://git-wip-us.apache.org/repos/asf/hbase-site/blob/9dfe3cd8/source-repository.html -- diff --git a/source-repository.html b/source-repository.html index f8834fa..da52a69 100644 --- a/source-repository.html +++ b/source-repository.html @@ -7,7 +7,7 @@ - + Apache HBase Source Repository @@ -304,7 +304,7 @@ https://www.apache.org/;>The Apache Software Foundation. All rights reserved. - Last Published: 2017-05-21 + Last Published: 2017-05-22 http://git-wip-us.apache.org/repos/asf/hbase-site/blob/9dfe3cd8/sponsors.html -- diff --git a/sponsors.html b/sponsors.html index 691762f..35ae591 100644 --- a/sponsors.html +++ b/sponsors.html @@ -7,7 +7,7 @@ - + Apache HBase Apache HBase™ Sponsors @@ -338,7 +338,7 @@ under the License. --> https://www.apache.org/;>The Apache Software Foundation. All rights reserved. - Last Published: 2017-05-21 + Last Published: 2017-05-22 http://git-wip-us.apache.org/repos/asf/hbase-site/blob/9dfe3cd8/supportingprojects.html -- diff --git a/supportingprojects.html b/supportingprojects.html index 8e1f117..31f29ac 100644 --- a/supportingprojects.html +++ b/supportingprojects.html @@ -7,7 +7,7 @@ - + Apache HBase Supporting Projects @@ -525,7 +525,7 @@ under the License. --> https://www.apache.org/;>The Apache Software Foundation. All rights reserved. - Last Published: 2017-05-21 + Last Published: 2017-05-22 http://git-wip-us.apache.org/repos/asf/hbase-site/blob/9dfe3cd8/team-list.html -- diff --git a/team-list.html b/team-list.html index 7a515e1..0060fa8 100644 --- a/team-list.html +++ b/team-list.html @@ -7,7 +7,7 @@ - + Apache HBase Team list @@ -799,7 +799,7 @@ window.onLoad = init(); https://www.apache.org/;>The Apache Software Foundation. All rights reserved. - Last Published: 2017-05-21 + Last Published: 2017-05-22 http://git-wip-us.apache.org/repos/asf/hbase-site/blob/9dfe3cd8/testdevapidocs/index-all.html -- diff --git a/testdevapidocs/index-all.html b/testdevapidocs/index-all.html index 536e29d..a9a5898 100644 --- a/testdevapidocs/index-all.html +++ b/testdevapidocs/index-all.html @@ -3703,6 +3703,8 @@ cleanup() - Method in class org.apache.hadoop.hbase.backup.TestBackupHFileCleaner +cleanup() - Method in class org.apache.hadoop.hbase.client.TestAsyncSnapshotAdminApi + cleanup() - Method in class org.apache.hadoop.hbase.constraint.TestConstraint cleanup() - Static method in class org.apache.hadoop.hbase.http.jmx.TestJMXJsonServlet @@ -30392,6 +30394,8 @@ setUp() - Static method in class org.apache.hadoop.hbase.client.TestAsyncRegionLocatorTimeout +setup() - Method in class org.apache.hadoop.hbase.client.TestAsyncSnapshotAdminApi + setUp() - Method in class org.apache.hadoop.hbase.client.TestAsyncTable setUp() - Static method in class org.apache.hadoop.hbase.client.TestAsyncTableBatch @@ -32629,18 +32633,24 @@ snapshotName0 - Variable in class org.apache.hadoop.hbase.snapshot.TestRestoreFlushSnapshotFromClient +snapshotName1 - Variable in class org.apache.hadoop.hbase.client.TestAsyncSnapshotAdminApi + snapshotName1 - Variable in class org.apache.hadoop.hbase.client.TestCloneSnapshotFromClient snapshotName1 - Variable in class org.apache.hadoop.hbase.client.TestRestoreSnapshotFromClient snapshotName1 - Variable in
[21/42] hbase-site git commit: Published site at 82d554e3783372cc6b05489452c815b57c06f6cd.
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/9dfe3cd8/devapidocs/src-html/org/apache/hadoop/hbase/client/AsyncHBaseAdmin.EnableTableProcedureBiConsumer.html -- diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/client/AsyncHBaseAdmin.EnableTableProcedureBiConsumer.html b/devapidocs/src-html/org/apache/hadoop/hbase/client/AsyncHBaseAdmin.EnableTableProcedureBiConsumer.html index 1b2d845..47f510c 100644 --- a/devapidocs/src-html/org/apache/hadoop/hbase/client/AsyncHBaseAdmin.EnableTableProcedureBiConsumer.html +++ b/devapidocs/src-html/org/apache/hadoop/hbase/client/AsyncHBaseAdmin.EnableTableProcedureBiConsumer.html @@ -98,1445 +98,1445 @@ 090import org.apache.hadoop.hbase.shaded.protobuf.generated.AdminProtos.GetOnlineRegionResponse; 091import org.apache.hadoop.hbase.shaded.protobuf.generated.AdminProtos.SplitRegionRequest; 092import org.apache.hadoop.hbase.shaded.protobuf.generated.AdminProtos.SplitRegionResponse; -093import org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos; -094import org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos.ProcedureDescription; -095import org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos.TableSchema; -096import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.AbortProcedureRequest; -097import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.AbortProcedureResponse; -098import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.AddColumnRequest; -099import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.AddColumnResponse; -100import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.AssignRegionRequest; -101import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.AssignRegionResponse; -102import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.BalanceRequest; -103import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.BalanceResponse; -104import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.CreateNamespaceRequest; -105import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.CreateNamespaceResponse; -106import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.DeleteNamespaceRequest; -107import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.DeleteNamespaceResponse; -108import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.DeleteSnapshotRequest; -109import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.DeleteSnapshotResponse; -110import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.DisableTableRequest; -111import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.DisableTableResponse; -112import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.EnableTableRequest; -113import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.EnableTableResponse; -114import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.DeleteColumnRequest; -115import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.DeleteColumnResponse; -116import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.ExecProcedureRequest; -117import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.ExecProcedureResponse; -118import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.GetCompletedSnapshotsRequest; -119import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.GetCompletedSnapshotsResponse; -120import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.GetNamespaceDescriptorRequest; -121import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.GetNamespaceDescriptorResponse; -122import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.GetProcedureResultRequest; -123import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.GetProcedureResultResponse; -124import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.GetSchemaAlterStatusRequest; -125import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.GetSchemaAlterStatusResponse; -126import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.GetTableDescriptorsRequest; -127import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.GetTableDescriptorsResponse; -128import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.GetTableNamesRequest; -129import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.GetTableNamesResponse; -130import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.CreateTableRequest; -131import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.CreateTableResponse; -132import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.DeleteTableRequest; -133import
[20/42] hbase-site git commit: Published site at 82d554e3783372cc6b05489452c815b57c06f6cd.
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/9dfe3cd8/devapidocs/src-html/org/apache/hadoop/hbase/client/AsyncHBaseAdmin.MasterRpcCall.html -- diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/client/AsyncHBaseAdmin.MasterRpcCall.html b/devapidocs/src-html/org/apache/hadoop/hbase/client/AsyncHBaseAdmin.MasterRpcCall.html index 1b2d845..47f510c 100644 --- a/devapidocs/src-html/org/apache/hadoop/hbase/client/AsyncHBaseAdmin.MasterRpcCall.html +++ b/devapidocs/src-html/org/apache/hadoop/hbase/client/AsyncHBaseAdmin.MasterRpcCall.html @@ -98,1445 +98,1445 @@ 090import org.apache.hadoop.hbase.shaded.protobuf.generated.AdminProtos.GetOnlineRegionResponse; 091import org.apache.hadoop.hbase.shaded.protobuf.generated.AdminProtos.SplitRegionRequest; 092import org.apache.hadoop.hbase.shaded.protobuf.generated.AdminProtos.SplitRegionResponse; -093import org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos; -094import org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos.ProcedureDescription; -095import org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos.TableSchema; -096import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.AbortProcedureRequest; -097import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.AbortProcedureResponse; -098import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.AddColumnRequest; -099import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.AddColumnResponse; -100import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.AssignRegionRequest; -101import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.AssignRegionResponse; -102import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.BalanceRequest; -103import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.BalanceResponse; -104import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.CreateNamespaceRequest; -105import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.CreateNamespaceResponse; -106import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.DeleteNamespaceRequest; -107import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.DeleteNamespaceResponse; -108import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.DeleteSnapshotRequest; -109import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.DeleteSnapshotResponse; -110import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.DisableTableRequest; -111import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.DisableTableResponse; -112import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.EnableTableRequest; -113import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.EnableTableResponse; -114import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.DeleteColumnRequest; -115import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.DeleteColumnResponse; -116import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.ExecProcedureRequest; -117import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.ExecProcedureResponse; -118import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.GetCompletedSnapshotsRequest; -119import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.GetCompletedSnapshotsResponse; -120import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.GetNamespaceDescriptorRequest; -121import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.GetNamespaceDescriptorResponse; -122import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.GetProcedureResultRequest; -123import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.GetProcedureResultResponse; -124import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.GetSchemaAlterStatusRequest; -125import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.GetSchemaAlterStatusResponse; -126import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.GetTableDescriptorsRequest; -127import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.GetTableDescriptorsResponse; -128import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.GetTableNamesRequest; -129import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.GetTableNamesResponse; -130import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.CreateTableRequest; -131import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.CreateTableResponse; -132import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.DeleteTableRequest; -133import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.DeleteTableResponse; -134import
[14/42] hbase-site git commit: Published site at 82d554e3783372cc6b05489452c815b57c06f6cd.
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/9dfe3cd8/devapidocs/src-html/org/apache/hadoop/hbase/client/AsyncHBaseAdmin.TableOperator.html -- diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/client/AsyncHBaseAdmin.TableOperator.html b/devapidocs/src-html/org/apache/hadoop/hbase/client/AsyncHBaseAdmin.TableOperator.html index 1b2d845..47f510c 100644 --- a/devapidocs/src-html/org/apache/hadoop/hbase/client/AsyncHBaseAdmin.TableOperator.html +++ b/devapidocs/src-html/org/apache/hadoop/hbase/client/AsyncHBaseAdmin.TableOperator.html @@ -98,1445 +98,1445 @@ 090import org.apache.hadoop.hbase.shaded.protobuf.generated.AdminProtos.GetOnlineRegionResponse; 091import org.apache.hadoop.hbase.shaded.protobuf.generated.AdminProtos.SplitRegionRequest; 092import org.apache.hadoop.hbase.shaded.protobuf.generated.AdminProtos.SplitRegionResponse; -093import org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos; -094import org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos.ProcedureDescription; -095import org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos.TableSchema; -096import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.AbortProcedureRequest; -097import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.AbortProcedureResponse; -098import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.AddColumnRequest; -099import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.AddColumnResponse; -100import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.AssignRegionRequest; -101import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.AssignRegionResponse; -102import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.BalanceRequest; -103import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.BalanceResponse; -104import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.CreateNamespaceRequest; -105import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.CreateNamespaceResponse; -106import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.DeleteNamespaceRequest; -107import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.DeleteNamespaceResponse; -108import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.DeleteSnapshotRequest; -109import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.DeleteSnapshotResponse; -110import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.DisableTableRequest; -111import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.DisableTableResponse; -112import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.EnableTableRequest; -113import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.EnableTableResponse; -114import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.DeleteColumnRequest; -115import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.DeleteColumnResponse; -116import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.ExecProcedureRequest; -117import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.ExecProcedureResponse; -118import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.GetCompletedSnapshotsRequest; -119import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.GetCompletedSnapshotsResponse; -120import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.GetNamespaceDescriptorRequest; -121import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.GetNamespaceDescriptorResponse; -122import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.GetProcedureResultRequest; -123import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.GetProcedureResultResponse; -124import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.GetSchemaAlterStatusRequest; -125import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.GetSchemaAlterStatusResponse; -126import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.GetTableDescriptorsRequest; -127import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.GetTableDescriptorsResponse; -128import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.GetTableNamesRequest; -129import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.GetTableNamesResponse; -130import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.CreateTableRequest; -131import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.CreateTableResponse; -132import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.DeleteTableRequest; -133import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.DeleteTableResponse; -134import
[24/42] hbase-site git commit: Published site at 82d554e3783372cc6b05489452c815b57c06f6cd.
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/9dfe3cd8/devapidocs/src-html/org/apache/hadoop/hbase/client/AsyncHBaseAdmin.DeleteNamespaceProcedureBiConsumer.html -- diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/client/AsyncHBaseAdmin.DeleteNamespaceProcedureBiConsumer.html b/devapidocs/src-html/org/apache/hadoop/hbase/client/AsyncHBaseAdmin.DeleteNamespaceProcedureBiConsumer.html index 1b2d845..47f510c 100644 --- a/devapidocs/src-html/org/apache/hadoop/hbase/client/AsyncHBaseAdmin.DeleteNamespaceProcedureBiConsumer.html +++ b/devapidocs/src-html/org/apache/hadoop/hbase/client/AsyncHBaseAdmin.DeleteNamespaceProcedureBiConsumer.html @@ -98,1445 +98,1445 @@ 090import org.apache.hadoop.hbase.shaded.protobuf.generated.AdminProtos.GetOnlineRegionResponse; 091import org.apache.hadoop.hbase.shaded.protobuf.generated.AdminProtos.SplitRegionRequest; 092import org.apache.hadoop.hbase.shaded.protobuf.generated.AdminProtos.SplitRegionResponse; -093import org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos; -094import org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos.ProcedureDescription; -095import org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos.TableSchema; -096import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.AbortProcedureRequest; -097import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.AbortProcedureResponse; -098import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.AddColumnRequest; -099import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.AddColumnResponse; -100import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.AssignRegionRequest; -101import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.AssignRegionResponse; -102import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.BalanceRequest; -103import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.BalanceResponse; -104import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.CreateNamespaceRequest; -105import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.CreateNamespaceResponse; -106import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.DeleteNamespaceRequest; -107import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.DeleteNamespaceResponse; -108import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.DeleteSnapshotRequest; -109import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.DeleteSnapshotResponse; -110import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.DisableTableRequest; -111import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.DisableTableResponse; -112import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.EnableTableRequest; -113import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.EnableTableResponse; -114import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.DeleteColumnRequest; -115import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.DeleteColumnResponse; -116import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.ExecProcedureRequest; -117import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.ExecProcedureResponse; -118import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.GetCompletedSnapshotsRequest; -119import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.GetCompletedSnapshotsResponse; -120import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.GetNamespaceDescriptorRequest; -121import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.GetNamespaceDescriptorResponse; -122import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.GetProcedureResultRequest; -123import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.GetProcedureResultResponse; -124import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.GetSchemaAlterStatusRequest; -125import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.GetSchemaAlterStatusResponse; -126import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.GetTableDescriptorsRequest; -127import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.GetTableDescriptorsResponse; -128import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.GetTableNamesRequest; -129import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.GetTableNamesResponse; -130import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.CreateTableRequest; -131import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.CreateTableResponse; -132import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.DeleteTableRequest; -133import
[25/42] hbase-site git commit: Published site at 82d554e3783372cc6b05489452c815b57c06f6cd.
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/9dfe3cd8/devapidocs/src-html/org/apache/hadoop/hbase/client/AsyncHBaseAdmin.DeleteColumnFamilyProcedureBiConsumer.html -- diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/client/AsyncHBaseAdmin.DeleteColumnFamilyProcedureBiConsumer.html b/devapidocs/src-html/org/apache/hadoop/hbase/client/AsyncHBaseAdmin.DeleteColumnFamilyProcedureBiConsumer.html index 1b2d845..47f510c 100644 --- a/devapidocs/src-html/org/apache/hadoop/hbase/client/AsyncHBaseAdmin.DeleteColumnFamilyProcedureBiConsumer.html +++ b/devapidocs/src-html/org/apache/hadoop/hbase/client/AsyncHBaseAdmin.DeleteColumnFamilyProcedureBiConsumer.html @@ -98,1445 +98,1445 @@ 090import org.apache.hadoop.hbase.shaded.protobuf.generated.AdminProtos.GetOnlineRegionResponse; 091import org.apache.hadoop.hbase.shaded.protobuf.generated.AdminProtos.SplitRegionRequest; 092import org.apache.hadoop.hbase.shaded.protobuf.generated.AdminProtos.SplitRegionResponse; -093import org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos; -094import org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos.ProcedureDescription; -095import org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos.TableSchema; -096import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.AbortProcedureRequest; -097import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.AbortProcedureResponse; -098import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.AddColumnRequest; -099import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.AddColumnResponse; -100import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.AssignRegionRequest; -101import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.AssignRegionResponse; -102import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.BalanceRequest; -103import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.BalanceResponse; -104import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.CreateNamespaceRequest; -105import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.CreateNamespaceResponse; -106import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.DeleteNamespaceRequest; -107import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.DeleteNamespaceResponse; -108import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.DeleteSnapshotRequest; -109import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.DeleteSnapshotResponse; -110import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.DisableTableRequest; -111import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.DisableTableResponse; -112import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.EnableTableRequest; -113import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.EnableTableResponse; -114import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.DeleteColumnRequest; -115import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.DeleteColumnResponse; -116import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.ExecProcedureRequest; -117import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.ExecProcedureResponse; -118import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.GetCompletedSnapshotsRequest; -119import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.GetCompletedSnapshotsResponse; -120import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.GetNamespaceDescriptorRequest; -121import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.GetNamespaceDescriptorResponse; -122import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.GetProcedureResultRequest; -123import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.GetProcedureResultResponse; -124import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.GetSchemaAlterStatusRequest; -125import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.GetSchemaAlterStatusResponse; -126import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.GetTableDescriptorsRequest; -127import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.GetTableDescriptorsResponse; -128import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.GetTableNamesRequest; -129import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.GetTableNamesResponse; -130import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.CreateTableRequest; -131import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.CreateTableResponse; -132import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.DeleteTableRequest; -133import
[05/42] hbase-site git commit: Published site at 82d554e3783372cc6b05489452c815b57c06f6cd.
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/9dfe3cd8/hbase-archetypes/hbase-shaded-client-project/dependency-info.html -- diff --git a/hbase-archetypes/hbase-shaded-client-project/dependency-info.html b/hbase-archetypes/hbase-shaded-client-project/dependency-info.html index 826b9cd..3834bf3 100644 --- a/hbase-archetypes/hbase-shaded-client-project/dependency-info.html +++ b/hbase-archetypes/hbase-shaded-client-project/dependency-info.html @@ -1,5 +1,5 @@ http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd;> - + http://www.w3.org/1999/xhtml; xml:lang="en" lang="en"> @@ -10,7 +10,7 @@ @import url("./css/site.css"); - + @@ -27,7 +27,7 @@ -Last Published: 2017-05-21 +Last Published: 2017-05-22 | Version: 2.0.0-SNAPSHOT Apache HBase - Exemplar for hbase-shaded-client archetype http://git-wip-us.apache.org/repos/asf/hbase-site/blob/9dfe3cd8/hbase-archetypes/hbase-shaded-client-project/dependency-management.html -- diff --git a/hbase-archetypes/hbase-shaded-client-project/dependency-management.html b/hbase-archetypes/hbase-shaded-client-project/dependency-management.html index cb22c1e..e6e59df 100644 --- a/hbase-archetypes/hbase-shaded-client-project/dependency-management.html +++ b/hbase-archetypes/hbase-shaded-client-project/dependency-management.html @@ -1,5 +1,5 @@ http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd;> - + http://www.w3.org/1999/xhtml; xml:lang="en" lang="en"> @@ -10,7 +10,7 @@ @import url("./css/site.css"); - + @@ -27,7 +27,7 @@ -Last Published: 2017-05-21 +Last Published: 2017-05-22 | Version: 2.0.0-SNAPSHOT Apache HBase - Exemplar for hbase-shaded-client archetype http://git-wip-us.apache.org/repos/asf/hbase-site/blob/9dfe3cd8/hbase-archetypes/hbase-shaded-client-project/index.html -- diff --git a/hbase-archetypes/hbase-shaded-client-project/index.html b/hbase-archetypes/hbase-shaded-client-project/index.html index 7876e22..79b316c 100644 --- a/hbase-archetypes/hbase-shaded-client-project/index.html +++ b/hbase-archetypes/hbase-shaded-client-project/index.html @@ -1,5 +1,5 @@ http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd;> - + http://www.w3.org/1999/xhtml; xml:lang="en" lang="en"> @@ -10,7 +10,7 @@ @import url("./css/site.css"); - + @@ -27,7 +27,7 @@ -Last Published: 2017-05-21 +Last Published: 2017-05-22 | Version: 2.0.0-SNAPSHOT Apache HBase - Exemplar for hbase-shaded-client archetype http://git-wip-us.apache.org/repos/asf/hbase-site/blob/9dfe3cd8/hbase-archetypes/hbase-shaded-client-project/integration.html -- diff --git a/hbase-archetypes/hbase-shaded-client-project/integration.html b/hbase-archetypes/hbase-shaded-client-project/integration.html index db6b125..41cafc7 100644 --- a/hbase-archetypes/hbase-shaded-client-project/integration.html +++ b/hbase-archetypes/hbase-shaded-client-project/integration.html @@ -1,5 +1,5 @@ http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd;> - + http://www.w3.org/1999/xhtml; xml:lang="en" lang="en"> @@ -10,7 +10,7 @@ @import url("./css/site.css"); - + @@ -27,7 +27,7 @@ -Last Published: 2017-05-21 +Last Published: 2017-05-22 | Version: 2.0.0-SNAPSHOT Apache HBase - Exemplar for hbase-shaded-client archetype http://git-wip-us.apache.org/repos/asf/hbase-site/blob/9dfe3cd8/hbase-archetypes/hbase-shaded-client-project/issue-tracking.html -- diff --git a/hbase-archetypes/hbase-shaded-client-project/issue-tracking.html b/hbase-archetypes/hbase-shaded-client-project/issue-tracking.html index 339c3bd..cc657e2 100644 --- a/hbase-archetypes/hbase-shaded-client-project/issue-tracking.html +++ b/hbase-archetypes/hbase-shaded-client-project/issue-tracking.html @@ -1,5 +1,5 @@ http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd;> - + http://www.w3.org/1999/xhtml; xml:lang="en" lang="en"> @@ -10,7 +10,7 @@ @import
[15/42] hbase-site git commit: Published site at 82d554e3783372cc6b05489452c815b57c06f6cd.
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/9dfe3cd8/devapidocs/src-html/org/apache/hadoop/hbase/client/AsyncHBaseAdmin.ProcedureBiConsumer.html -- diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/client/AsyncHBaseAdmin.ProcedureBiConsumer.html b/devapidocs/src-html/org/apache/hadoop/hbase/client/AsyncHBaseAdmin.ProcedureBiConsumer.html index 1b2d845..47f510c 100644 --- a/devapidocs/src-html/org/apache/hadoop/hbase/client/AsyncHBaseAdmin.ProcedureBiConsumer.html +++ b/devapidocs/src-html/org/apache/hadoop/hbase/client/AsyncHBaseAdmin.ProcedureBiConsumer.html @@ -98,1445 +98,1445 @@ 090import org.apache.hadoop.hbase.shaded.protobuf.generated.AdminProtos.GetOnlineRegionResponse; 091import org.apache.hadoop.hbase.shaded.protobuf.generated.AdminProtos.SplitRegionRequest; 092import org.apache.hadoop.hbase.shaded.protobuf.generated.AdminProtos.SplitRegionResponse; -093import org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos; -094import org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos.ProcedureDescription; -095import org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos.TableSchema; -096import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.AbortProcedureRequest; -097import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.AbortProcedureResponse; -098import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.AddColumnRequest; -099import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.AddColumnResponse; -100import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.AssignRegionRequest; -101import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.AssignRegionResponse; -102import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.BalanceRequest; -103import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.BalanceResponse; -104import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.CreateNamespaceRequest; -105import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.CreateNamespaceResponse; -106import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.DeleteNamespaceRequest; -107import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.DeleteNamespaceResponse; -108import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.DeleteSnapshotRequest; -109import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.DeleteSnapshotResponse; -110import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.DisableTableRequest; -111import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.DisableTableResponse; -112import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.EnableTableRequest; -113import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.EnableTableResponse; -114import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.DeleteColumnRequest; -115import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.DeleteColumnResponse; -116import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.ExecProcedureRequest; -117import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.ExecProcedureResponse; -118import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.GetCompletedSnapshotsRequest; -119import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.GetCompletedSnapshotsResponse; -120import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.GetNamespaceDescriptorRequest; -121import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.GetNamespaceDescriptorResponse; -122import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.GetProcedureResultRequest; -123import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.GetProcedureResultResponse; -124import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.GetSchemaAlterStatusRequest; -125import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.GetSchemaAlterStatusResponse; -126import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.GetTableDescriptorsRequest; -127import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.GetTableDescriptorsResponse; -128import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.GetTableNamesRequest; -129import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.GetTableNamesResponse; -130import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.CreateTableRequest; -131import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.CreateTableResponse; -132import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.DeleteTableRequest; -133import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.DeleteTableResponse; -134import
[18/42] hbase-site git commit: Published site at 82d554e3783372cc6b05489452c815b57c06f6cd.
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/9dfe3cd8/devapidocs/src-html/org/apache/hadoop/hbase/client/AsyncHBaseAdmin.ModifyColumnFamilyProcedureBiConsumer.html -- diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/client/AsyncHBaseAdmin.ModifyColumnFamilyProcedureBiConsumer.html b/devapidocs/src-html/org/apache/hadoop/hbase/client/AsyncHBaseAdmin.ModifyColumnFamilyProcedureBiConsumer.html index 1b2d845..47f510c 100644 --- a/devapidocs/src-html/org/apache/hadoop/hbase/client/AsyncHBaseAdmin.ModifyColumnFamilyProcedureBiConsumer.html +++ b/devapidocs/src-html/org/apache/hadoop/hbase/client/AsyncHBaseAdmin.ModifyColumnFamilyProcedureBiConsumer.html @@ -98,1445 +98,1445 @@ 090import org.apache.hadoop.hbase.shaded.protobuf.generated.AdminProtos.GetOnlineRegionResponse; 091import org.apache.hadoop.hbase.shaded.protobuf.generated.AdminProtos.SplitRegionRequest; 092import org.apache.hadoop.hbase.shaded.protobuf.generated.AdminProtos.SplitRegionResponse; -093import org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos; -094import org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos.ProcedureDescription; -095import org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos.TableSchema; -096import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.AbortProcedureRequest; -097import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.AbortProcedureResponse; -098import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.AddColumnRequest; -099import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.AddColumnResponse; -100import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.AssignRegionRequest; -101import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.AssignRegionResponse; -102import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.BalanceRequest; -103import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.BalanceResponse; -104import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.CreateNamespaceRequest; -105import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.CreateNamespaceResponse; -106import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.DeleteNamespaceRequest; -107import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.DeleteNamespaceResponse; -108import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.DeleteSnapshotRequest; -109import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.DeleteSnapshotResponse; -110import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.DisableTableRequest; -111import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.DisableTableResponse; -112import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.EnableTableRequest; -113import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.EnableTableResponse; -114import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.DeleteColumnRequest; -115import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.DeleteColumnResponse; -116import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.ExecProcedureRequest; -117import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.ExecProcedureResponse; -118import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.GetCompletedSnapshotsRequest; -119import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.GetCompletedSnapshotsResponse; -120import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.GetNamespaceDescriptorRequest; -121import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.GetNamespaceDescriptorResponse; -122import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.GetProcedureResultRequest; -123import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.GetProcedureResultResponse; -124import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.GetSchemaAlterStatusRequest; -125import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.GetSchemaAlterStatusResponse; -126import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.GetTableDescriptorsRequest; -127import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.GetTableDescriptorsResponse; -128import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.GetTableNamesRequest; -129import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.GetTableNamesResponse; -130import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.CreateTableRequest; -131import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.CreateTableResponse; -132import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.DeleteTableRequest; -133import
[09/42] hbase-site git commit: Published site at 82d554e3783372cc6b05489452c815b57c06f6cd.
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/9dfe3cd8/devapidocs/src-html/org/apache/hadoop/hbase/io/HFileLink.html -- diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/io/HFileLink.html b/devapidocs/src-html/org/apache/hadoop/hbase/io/HFileLink.html index eb2b4cd..c2153d8 100644 --- a/devapidocs/src-html/org/apache/hadoop/hbase/io/HFileLink.html +++ b/devapidocs/src-html/org/apache/hadoop/hbase/io/HFileLink.html @@ -72,468 +72,469 @@ 064 * The HFileLink describe a link to an hfile in a different table/region 065 * and the name is in the form: table=region-hfile. 066 * p -067 * Table name is ([a-zA-Z_0-9][a-zA-Z_0-9.-]*), so '=' is an invalid character for the table name. -068 * Region name is ([a-f0-9]+), so '-' is an invalid character for the region name. -069 * HFile is ([0-9a-f]+(?:_SeqId_[0-9]+_)?) covering the plain hfiles (uuid) -070 * and the bulk loaded (_SeqId_[0-9]+_) hfiles. -071 */ -072 public static final String LINK_NAME_REGEX = -073 String.format("(?:(?:%s=)?)%s=%s-%s", -074 TableName.VALID_NAMESPACE_REGEX, TableName.VALID_TABLE_QUALIFIER_REGEX, -075 HRegionInfo.ENCODED_REGION_NAME_REGEX, StoreFileInfo.HFILE_NAME_REGEX); -076 -077 /** Define the HFile Link name parser in the form of: table=region-hfile */ -078 //made package private for testing -079 static final Pattern LINK_NAME_PATTERN = -080 Pattern.compile(String.format("^(?:(%s)(?:\\=))?(%s)=(%s)-(%s)$", -081 TableName.VALID_NAMESPACE_REGEX, TableName.VALID_TABLE_QUALIFIER_REGEX, -082 HRegionInfo.ENCODED_REGION_NAME_REGEX, StoreFileInfo.HFILE_NAME_REGEX)); -083 -084 /** -085 * The pattern should be used for hfile and reference links -086 * that can be found in /hbase/table/region/family/ -087 */ -088 private static final Pattern REF_OR_HFILE_LINK_PATTERN = -089 Pattern.compile(String.format("^(?:(%s)(?:=))?(%s)=(%s)-(.+)$", -090 TableName.VALID_NAMESPACE_REGEX, TableName.VALID_TABLE_QUALIFIER_REGEX, -091 HRegionInfo.ENCODED_REGION_NAME_REGEX)); -092 -093 private final Path archivePath; -094 private final Path originPath; -095 private final Path mobPath; -096 private final Path tempPath; -097 -098 /** -099 * Dead simple hfile link constructor -100 */ -101 public HFileLink(final Path originPath, final Path tempPath, final Path mobPath, -102 final Path archivePath) { -103this.tempPath = tempPath; -104this.originPath = originPath; -105this.mobPath = mobPath; -106this.archivePath = archivePath; -107setLocations(originPath, tempPath, mobPath, archivePath); -108 } -109 +067 * Table name is ([\p{IsAlphabetic}\p{Digit}][\p{IsAlphabetic}\p{Digit}.-]*), so '=' is an invalid +068 * character for the table name. +069 * Region name is ([a-f0-9]+), so '-' is an invalid character for the region name. +070 * HFile is ([0-9a-f]+(?:_SeqId_[0-9]+_)?) covering the plain hfiles (uuid) +071 * and the bulk loaded (_SeqId_[0-9]+_) hfiles. +072 */ +073 public static final String LINK_NAME_REGEX = +074 String.format("(?:(?:%s=)?)%s=%s-%s", +075 TableName.VALID_NAMESPACE_REGEX, TableName.VALID_TABLE_QUALIFIER_REGEX, +076 HRegionInfo.ENCODED_REGION_NAME_REGEX, StoreFileInfo.HFILE_NAME_REGEX); +077 +078 /** Define the HFile Link name parser in the form of: table=region-hfile */ +079 //made package private for testing +080 static final Pattern LINK_NAME_PATTERN = +081 Pattern.compile(String.format("^(?:(%s)(?:\\=))?(%s)=(%s)-(%s)$", +082 TableName.VALID_NAMESPACE_REGEX, TableName.VALID_TABLE_QUALIFIER_REGEX, +083 HRegionInfo.ENCODED_REGION_NAME_REGEX, StoreFileInfo.HFILE_NAME_REGEX)); +084 +085 /** +086 * The pattern should be used for hfile and reference links +087 * that can be found in /hbase/table/region/family/ +088 */ +089 private static final Pattern REF_OR_HFILE_LINK_PATTERN = +090 Pattern.compile(String.format("^(?:(%s)(?:=))?(%s)=(%s)-(.+)$", +091 TableName.VALID_NAMESPACE_REGEX, TableName.VALID_TABLE_QUALIFIER_REGEX, +092 HRegionInfo.ENCODED_REGION_NAME_REGEX)); +093 +094 private final Path archivePath; +095 private final Path originPath; +096 private final Path mobPath; +097 private final Path tempPath; +098 +099 /** +100 * Dead simple hfile link constructor +101 */ +102 public HFileLink(final Path originPath, final Path tempPath, final Path mobPath, +103 final Path archivePath) { +104this.tempPath = tempPath; +105this.originPath = originPath; +106this.mobPath = mobPath; +107this.archivePath = archivePath; +108setLocations(originPath, tempPath, mobPath, archivePath); +109 } 110 -111 /** -112 * @param conf {@link Configuration} from which to extract specific archive locations -113 * @param hFileLinkPattern The path ending with a HFileLink pattern. (table=region-hfile) -114 * @throws
[13/42] hbase-site git commit: Published site at 82d554e3783372cc6b05489452c815b57c06f6cd.
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/9dfe3cd8/devapidocs/src-html/org/apache/hadoop/hbase/client/AsyncHBaseAdmin.TableProcedureBiConsumer.html -- diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/client/AsyncHBaseAdmin.TableProcedureBiConsumer.html b/devapidocs/src-html/org/apache/hadoop/hbase/client/AsyncHBaseAdmin.TableProcedureBiConsumer.html index 1b2d845..47f510c 100644 --- a/devapidocs/src-html/org/apache/hadoop/hbase/client/AsyncHBaseAdmin.TableProcedureBiConsumer.html +++ b/devapidocs/src-html/org/apache/hadoop/hbase/client/AsyncHBaseAdmin.TableProcedureBiConsumer.html @@ -98,1445 +98,1445 @@ 090import org.apache.hadoop.hbase.shaded.protobuf.generated.AdminProtos.GetOnlineRegionResponse; 091import org.apache.hadoop.hbase.shaded.protobuf.generated.AdminProtos.SplitRegionRequest; 092import org.apache.hadoop.hbase.shaded.protobuf.generated.AdminProtos.SplitRegionResponse; -093import org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos; -094import org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos.ProcedureDescription; -095import org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos.TableSchema; -096import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.AbortProcedureRequest; -097import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.AbortProcedureResponse; -098import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.AddColumnRequest; -099import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.AddColumnResponse; -100import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.AssignRegionRequest; -101import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.AssignRegionResponse; -102import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.BalanceRequest; -103import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.BalanceResponse; -104import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.CreateNamespaceRequest; -105import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.CreateNamespaceResponse; -106import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.DeleteNamespaceRequest; -107import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.DeleteNamespaceResponse; -108import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.DeleteSnapshotRequest; -109import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.DeleteSnapshotResponse; -110import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.DisableTableRequest; -111import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.DisableTableResponse; -112import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.EnableTableRequest; -113import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.EnableTableResponse; -114import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.DeleteColumnRequest; -115import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.DeleteColumnResponse; -116import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.ExecProcedureRequest; -117import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.ExecProcedureResponse; -118import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.GetCompletedSnapshotsRequest; -119import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.GetCompletedSnapshotsResponse; -120import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.GetNamespaceDescriptorRequest; -121import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.GetNamespaceDescriptorResponse; -122import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.GetProcedureResultRequest; -123import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.GetProcedureResultResponse; -124import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.GetSchemaAlterStatusRequest; -125import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.GetSchemaAlterStatusResponse; -126import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.GetTableDescriptorsRequest; -127import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.GetTableDescriptorsResponse; -128import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.GetTableNamesRequest; -129import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.GetTableNamesResponse; -130import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.CreateTableRequest; -131import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.CreateTableResponse; -132import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.DeleteTableRequest; -133import
[10/42] hbase-site git commit: Published site at 82d554e3783372cc6b05489452c815b57c06f6cd.
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/9dfe3cd8/devapidocs/src-html/org/apache/hadoop/hbase/client/AsyncTableBase.html -- diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/client/AsyncTableBase.html b/devapidocs/src-html/org/apache/hadoop/hbase/client/AsyncTableBase.html index ed21559..da6c0fb 100644 --- a/devapidocs/src-html/org/apache/hadoop/hbase/client/AsyncTableBase.html +++ b/devapidocs/src-html/org/apache/hadoop/hbase/client/AsyncTableBase.html @@ -192,254 +192,253 @@ 184 long amount, Durability durability) { 185Preconditions.checkNotNull(row, "row is null"); 186Preconditions.checkNotNull(family, "family is null"); -187Preconditions.checkNotNull(qualifier, "qualifier is null"); -188return increment( -189 new Increment(row).addColumn(family, qualifier, amount).setDurability(durability)) -190 .thenApply(r - Bytes.toLong(r.getValue(family, qualifier))); -191 } -192 -193 /** -194 * Atomically checks if a row/family/qualifier value equals to the expected value. If it does, it -195 * adds the put. If the passed value is null, the check is for the lack of column (ie: -196 * non-existence) -197 * @param row to check -198 * @param family column family to check -199 * @param qualifier column qualifier to check -200 * @param value the expected value -201 * @param put data to put if check succeeds -202 * @return true if the new put was executed, false otherwise. The return value will be wrapped by -203 * a {@link CompletableFuture}. -204 */ -205 default CompletableFutureBoolean checkAndPut(byte[] row, byte[] family, byte[] qualifier, -206 byte[] value, Put put) { -207return checkAndPut(row, family, qualifier, CompareOp.EQUAL, value, put); -208 } -209 -210 /** -211 * Atomically checks if a row/family/qualifier value matches the expected value. If it does, it -212 * adds the put. If the passed value is null, the check is for the lack of column (ie: -213 * non-existence) -214 * @param row to check -215 * @param family column family to check -216 * @param qualifier column qualifier to check -217 * @param compareOp comparison operator to use -218 * @param value the expected value -219 * @param put data to put if check succeeds -220 * @return true if the new put was executed, false otherwise. The return value will be wrapped by -221 * a {@link CompletableFuture}. -222 */ -223 CompletableFutureBoolean checkAndPut(byte[] row, byte[] family, byte[] qualifier, -224 CompareOp compareOp, byte[] value, Put put); -225 -226 /** -227 * Atomically checks if a row/family/qualifier value equals to the expected value. If it does, it -228 * adds the delete. If the passed value is null, the check is for the lack of column (ie: -229 * non-existence) -230 * @param row to check -231 * @param family column family to check -232 * @param qualifier column qualifier to check -233 * @param value the expected value -234 * @param delete data to delete if check succeeds -235 * @return true if the new delete was executed, false otherwise. The return value will be wrapped -236 * by a {@link CompletableFuture}. -237 */ -238 default CompletableFutureBoolean checkAndDelete(byte[] row, byte[] family, byte[] qualifier, -239 byte[] value, Delete delete) { -240return checkAndDelete(row, family, qualifier, CompareOp.EQUAL, value, delete); -241 } -242 -243 /** -244 * Atomically checks if a row/family/qualifier value matches the expected value. If it does, it -245 * adds the delete. If the passed value is null, the check is for the lack of column (ie: -246 * non-existence) -247 * @param row to check -248 * @param family column family to check -249 * @param qualifier column qualifier to check -250 * @param compareOp comparison operator to use -251 * @param value the expected value -252 * @param delete data to delete if check succeeds -253 * @return true if the new delete was executed, false otherwise. The return value will be wrapped -254 * by a {@link CompletableFuture}. -255 */ -256 CompletableFutureBoolean checkAndDelete(byte[] row, byte[] family, byte[] qualifier, -257 CompareOp compareOp, byte[] value, Delete delete); -258 -259 /** -260 * Performs multiple mutations atomically on a single row. Currently {@link Put} and -261 * {@link Delete} are supported. -262 * @param mutation object that specifies the set of mutations to perform atomically -263 * @return A {@link CompletableFuture} that always returns null when complete normally. -264 */ -265 CompletableFutureVoid mutateRow(RowMutations mutation); -266 -267 /** -268 * Atomically checks if a row/family/qualifier value equals to the expected value. If it does, it -269 * performs the row mutations. If the passed value is null, the check is for
[02/42] hbase-site git commit: Published site at 82d554e3783372cc6b05489452c815b57c06f6cd.
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/9dfe3cd8/testdevapidocs/src-html/org/apache/hadoop/hbase/client/TestAsyncSnapshotAdminApi.html -- diff --git a/testdevapidocs/src-html/org/apache/hadoop/hbase/client/TestAsyncSnapshotAdminApi.html b/testdevapidocs/src-html/org/apache/hadoop/hbase/client/TestAsyncSnapshotAdminApi.html index 0f8b3b4..aa19a52 100644 --- a/testdevapidocs/src-html/org/apache/hadoop/hbase/client/TestAsyncSnapshotAdminApi.html +++ b/testdevapidocs/src-html/org/apache/hadoop/hbase/client/TestAsyncSnapshotAdminApi.html @@ -30,227 +30,201 @@ 022import org.apache.hadoop.hbase.testclassification.ClientTests; 023import org.apache.hadoop.hbase.testclassification.MediumTests; 024import org.apache.hadoop.hbase.util.Bytes; -025import org.junit.Assert; -026import org.junit.Test; -027import org.junit.experimental.categories.Category; -028 -029import java.io.IOException; -030import java.util.Collections; -031import java.util.List; -032import java.util.regex.Pattern; -033 -034@Category({ MediumTests.class, ClientTests.class }) -035public class TestAsyncSnapshotAdminApi extends TestAsyncAdminBase { -036 -037 @Test -038 public void testTakeSnapshot() throws Exception { -039String snapshotName1 = "snapshotName1"; -040String snapshotName2 = "snapshotName2"; -041TableName tableName = TableName.valueOf("testTakeSnapshot"); -042Admin syncAdmin = TEST_UTIL.getAdmin(); -043 -044try { -045 Table table = TEST_UTIL.createTable(tableName, Bytes.toBytes("f1")); -046 for (int i = 0; i 3000; i++) { -047table.put(new Put(Bytes.toBytes(i)).addColumn(Bytes.toBytes("f1"), Bytes.toBytes("cq"), -048 Bytes.toBytes(i))); -049 } -050 -051 admin.snapshot(snapshotName1, tableName).get(); -052 admin.snapshot(snapshotName2, tableName).get(); -053 ListSnapshotDescription snapshots = syncAdmin.listSnapshots(); -054 Collections.sort(snapshots, (snap1, snap2) - { -055Assert.assertNotNull(snap1); -056 Assert.assertNotNull(snap1.getName()); -057Assert.assertNotNull(snap2); -058 Assert.assertNotNull(snap2.getName()); -059return snap1.getName().compareTo(snap2.getName()); -060 }); -061 -062 Assert.assertEquals(snapshotName1, snapshots.get(0).getName()); -063 Assert.assertEquals(tableName, snapshots.get(0).getTableName()); -064 Assert.assertEquals(SnapshotType.FLUSH, snapshots.get(0).getType()); -065 Assert.assertEquals(snapshotName2, snapshots.get(1).getName()); -066 Assert.assertEquals(tableName, snapshots.get(1).getTableName()); -067 Assert.assertEquals(SnapshotType.FLUSH, snapshots.get(1).getType()); -068} finally { -069 syncAdmin.deleteSnapshot(snapshotName1); -070 syncAdmin.deleteSnapshot(snapshotName2); -071 TEST_UTIL.deleteTable(tableName); -072} -073 } -074 -075 @Test -076 public void testCloneSnapshot() throws Exception { -077String snapshotName1 = "snapshotName1"; -078TableName tableName = TableName.valueOf("testCloneSnapshot"); -079TableName tableName2 = TableName.valueOf("testCloneSnapshot2"); -080Admin syncAdmin = TEST_UTIL.getAdmin(); +025import org.junit.After; +026import org.junit.Assert; +027import org.junit.Before; +028import org.junit.Rule; +029import org.junit.Test; +030import org.junit.experimental.categories.Category; +031import org.junit.rules.TestName; +032 +033import java.io.IOException; +034import java.util.Collections; +035import java.util.List; +036import java.util.regex.Pattern; +037 +038@Category({ MediumTests.class, ClientTests.class }) +039public class TestAsyncSnapshotAdminApi extends TestAsyncAdminBase { +040 +041 String snapshotName1 = "snapshotName1"; +042 String snapshotName2 = "snapshotName2"; +043 String snapshotName3 = "snapshotName3"; +044 +045 @Rule +046 public TestName testName = new TestName(); +047 TableName tableName; +048 +049 @Before +050 public void setup() { +051tableName = TableName.valueOf(testName.getMethodName()); +052 } +053 +054 @After +055 public void cleanup() throws Exception { +056admin.deleteSnapshots(".*").get(); +057admin.disableTables(".*").get(); +058admin.deleteTables(".*").get(); +059 } +060 +061 @Test +062 public void testTakeSnapshot() throws Exception { +063Admin syncAdmin = TEST_UTIL.getAdmin(); +064 +065Table table = TEST_UTIL.createTable(tableName, Bytes.toBytes("f1")); +066for (int i = 0; i 3000; i++) { +067 table.put(new Put(Bytes.toBytes(i)).addColumn(Bytes.toBytes("f1"), Bytes.toBytes("cq"), +068Bytes.toBytes(i))); +069} +070 +071admin.snapshot(snapshotName1, tableName).get(); +072admin.snapshot(snapshotName2, tableName).get(); +073ListSnapshotDescription snapshots = syncAdmin.listSnapshots(); +074Collections.sort(snapshots, (snap1, snap2) - { +075
hbase git commit: HBASE-18075 (addendum) Correct javadoc for valid namespaces
Repository: hbase Updated Branches: refs/heads/master 23ea2c36f -> 56cbc68b0 HBASE-18075 (addendum) Correct javadoc for valid namespaces Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/56cbc68b Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/56cbc68b Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/56cbc68b Branch: refs/heads/master Commit: 56cbc68b0da37db6a34e14e2bdc52245b848d173 Parents: 23ea2c3 Author: Josh ElserAuthored: Mon May 22 11:54:27 2017 -0400 Committer: Josh Elser Committed: Mon May 22 13:28:57 2017 -0400 -- hbase-common/src/main/java/org/apache/hadoop/hbase/TableName.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/hbase/blob/56cbc68b/hbase-common/src/main/java/org/apache/hadoop/hbase/TableName.java -- diff --git a/hbase-common/src/main/java/org/apache/hadoop/hbase/TableName.java b/hbase-common/src/main/java/org/apache/hadoop/hbase/TableName.java index a9b2527..08bd763 100644 --- a/hbase-common/src/main/java/org/apache/hadoop/hbase/TableName.java +++ b/hbase-common/src/main/java/org/apache/hadoop/hbase/TableName.java @@ -221,7 +221,7 @@ public final class TableName implements Comparable { } /** - * Valid namespace characters are [a-zA-Z_0-9] + * Valid namespace characters are alphabetic characters, numbers, and underscores. */ public static void isLegalNamespaceName(final byte[] namespaceName, final int start,
[46/50] [abbrv] hbase git commit: HBASE-17977 Enable the MasterSpaceQuotaObserver by default
HBASE-17977 Enable the MasterSpaceQuotaObserver by default It should be the normal case that HBase automatically deletes quotas for deleted tables. Switch the Observer to be on by default and add an option to instead prevent it from being added. Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/fae5f7e6 Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/fae5f7e6 Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/fae5f7e6 Branch: refs/heads/HBASE-16961 Commit: fae5f7e66900f647801f373ecff56e4729378412 Parents: 3b2de2a Author: Josh ElserAuthored: Tue May 2 14:58:10 2017 -0400 Committer: Josh Elser Committed: Mon May 22 13:08:12 2017 -0400 -- .../org/apache/hadoop/hbase/master/HMaster.java | 28 +++ .../hbase/quotas/MasterSpaceQuotaObserver.java | 3 + .../quotas/TestMasterSpaceQuotaObserver.java| 15 +++- .../TestMasterSpaceQuotaObserverWithMocks.java | 84 src/main/asciidoc/_chapters/ops_mgt.adoc| 11 ++- 5 files changed, 134 insertions(+), 7 deletions(-) -- http://git-wip-us.apache.org/repos/asf/hbase/blob/fae5f7e6/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java -- diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java index 89f085e..cd96552 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java @@ -134,6 +134,7 @@ import org.apache.hadoop.hbase.procedure2.ProcedureEvent; import org.apache.hadoop.hbase.procedure2.ProcedureExecutor; import org.apache.hadoop.hbase.procedure2.store.wal.WALProcedureStore; import org.apache.hadoop.hbase.quotas.MasterQuotaManager; +import org.apache.hadoop.hbase.quotas.MasterSpaceQuotaObserver; import org.apache.hadoop.hbase.quotas.QuotaObserverChore; import org.apache.hadoop.hbase.quotas.QuotaUtil; import org.apache.hadoop.hbase.quotas.SpaceQuotaSnapshotNotifier; @@ -794,6 +795,11 @@ public class HMaster extends HRegionServer implements MasterServices { conf, this.clusterConnection); tableCFsUpdater.update(); +// Add the Observer to delete space quotas on table deletion before starting all CPs by +// default with quota support, avoiding if user specifically asks to not load this Observer. +if (QuotaUtil.isQuotaEnabled(conf)) { + updateConfigurationForSpaceQuotaObserver(conf); +} // initialize master side coprocessors before we start handling requests status.setStatus("Initializing master coprocessors"); this.cpHost = new MasterCoprocessorHost(this, this.conf); @@ -942,6 +948,28 @@ public class HMaster extends HRegionServer implements MasterServices { zombieDetector.interrupt(); } + /** + * Adds the {@code MasterSpaceQuotaObserver} to the list of configured Master observers to + * automatically remove space quotas for a table when that table is deleted. + */ + @VisibleForTesting + public void updateConfigurationForSpaceQuotaObserver(Configuration conf) { +// We're configured to not delete quotas on table deletion, so we don't need to add the obs. +if (!conf.getBoolean( + MasterSpaceQuotaObserver.REMOVE_QUOTA_ON_TABLE_DELETE, + MasterSpaceQuotaObserver.REMOVE_QUOTA_ON_TABLE_DELETE_DEFAULT)) { + return; +} +String[] masterCoprocs = conf.getStrings(CoprocessorHost.MASTER_COPROCESSOR_CONF_KEY); +final int length = null == masterCoprocs ? 0 : masterCoprocs.length; +String[] updatedCoprocs = new String[length + 1]; +if (length > 0) { + System.arraycopy(masterCoprocs, 0, updatedCoprocs, 0, masterCoprocs.length); +} +updatedCoprocs[length] = MasterSpaceQuotaObserver.class.getName(); +conf.setStrings(CoprocessorHost.MASTER_COPROCESSOR_CONF_KEY, updatedCoprocs); + } + private void initMobCleaner() { this.expiredMobFileCleanerChore = new ExpiredMobFileCleanerChore(this); getChoreService().scheduleChore(expiredMobFileCleanerChore); http://git-wip-us.apache.org/repos/asf/hbase/blob/fae5f7e6/hbase-server/src/main/java/org/apache/hadoop/hbase/quotas/MasterSpaceQuotaObserver.java -- diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/quotas/MasterSpaceQuotaObserver.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/quotas/MasterSpaceQuotaObserver.java index 299ba39..7c86525 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/quotas/MasterSpaceQuotaObserver.java +++
[38/50] [abbrv] hbase git commit: HBASE-17981 Consolidate the space quota shell commands
http://git-wip-us.apache.org/repos/asf/hbase/blob/dd4066a5/hbase-protocol-shaded/src/main/protobuf/Admin.proto -- diff --git a/hbase-protocol-shaded/src/main/protobuf/Admin.proto b/hbase-protocol-shaded/src/main/protobuf/Admin.proto index 964b035..39e73b6 100644 --- a/hbase-protocol-shaded/src/main/protobuf/Admin.proto +++ b/hbase-protocol-shaded/src/main/protobuf/Admin.proto @@ -329,8 +329,4 @@ service AdminService { /** Fetches the RegionServer's view of space quotas */ rpc GetSpaceQuotaSnapshots(GetSpaceQuotaSnapshotsRequest) returns(GetSpaceQuotaSnapshotsResponse); - - /** Fetches the RegionServer's space quota active enforcements */ - rpc GetSpaceQuotaEnforcements(GetSpaceQuotaEnforcementsRequest) -returns(GetSpaceQuotaEnforcementsResponse); } http://git-wip-us.apache.org/repos/asf/hbase/blob/dd4066a5/hbase-protocol-shaded/src/main/protobuf/Quota.proto -- diff --git a/hbase-protocol-shaded/src/main/protobuf/Quota.proto b/hbase-protocol-shaded/src/main/protobuf/Quota.proto index 0d171b3..0d74435 100644 --- a/hbase-protocol-shaded/src/main/protobuf/Quota.proto +++ b/hbase-protocol-shaded/src/main/protobuf/Quota.proto @@ -136,18 +136,6 @@ message GetSpaceQuotaSnapshotsResponse { repeated TableQuotaSnapshot snapshots = 1; } -message GetSpaceQuotaEnforcementsRequest { -} - -message GetSpaceQuotaEnforcementsResponse { - // Cannot use TableName as a map key, do the repeated nested message by hand. - message TableViolationPolicy { -optional TableName table_name = 1; -optional SpaceViolationPolicy violation_policy = 2; - } - repeated TableViolationPolicy violation_policies = 1; -} - message GetQuotaStatesRequest { } http://git-wip-us.apache.org/repos/asf/hbase/blob/dd4066a5/hbase-protocol/src/main/java/org/apache/hadoop/hbase/protobuf/generated/QuotaProtos.java -- diff --git a/hbase-protocol/src/main/java/org/apache/hadoop/hbase/protobuf/generated/QuotaProtos.java b/hbase-protocol/src/main/java/org/apache/hadoop/hbase/protobuf/generated/QuotaProtos.java index fad9f44..717ec73 100644 --- a/hbase-protocol/src/main/java/org/apache/hadoop/hbase/protobuf/generated/QuotaProtos.java +++ b/hbase-protocol/src/main/java/org/apache/hadoop/hbase/protobuf/generated/QuotaProtos.java @@ -982,7 +982,7 @@ public final class QuotaProtos { public final boolean isInitialized() { if (!hasTimeUnit()) { - + return false; } return true; @@ -2009,37 +2009,37 @@ public final class QuotaProtos { public final boolean isInitialized() { if (hasReqNum()) { if (!getReqNum().isInitialized()) { - + return false; } } if (hasReqSize()) { if (!getReqSize().isInitialized()) { - + return false; } } if (hasWriteNum()) { if (!getWriteNum().isInitialized()) { - + return false; } } if (hasWriteSize()) { if (!getWriteSize().isInitialized()) { - + return false; } } if (hasReadNum()) { if (!getReadNum().isInitialized()) { - + return false; } } if (hasReadSize()) { if (!getReadSize().isInitialized()) { - + return false; } } @@ -2169,7 +2169,7 @@ public final class QuotaProtos { * optional .hbase.pb.TimedQuota req_num = 1; */ private com.google.protobuf.SingleFieldBuilder< - org.apache.hadoop.hbase.protobuf.generated.QuotaProtos.TimedQuota, org.apache.hadoop.hbase.protobuf.generated.QuotaProtos.TimedQuota.Builder, org.apache.hadoop.hbase.protobuf.generated.QuotaProtos.TimedQuotaOrBuilder> + org.apache.hadoop.hbase.protobuf.generated.QuotaProtos.TimedQuota, org.apache.hadoop.hbase.protobuf.generated.QuotaProtos.TimedQuota.Builder, org.apache.hadoop.hbase.protobuf.generated.QuotaProtos.TimedQuotaOrBuilder> getReqNumFieldBuilder() { if (reqNumBuilder_ == null) { reqNumBuilder_ = new com.google.protobuf.SingleFieldBuilder< @@ -2286,7 +2286,7 @@ public final class QuotaProtos { * optional .hbase.pb.TimedQuota req_size = 2; */ private com.google.protobuf.SingleFieldBuilder< - org.apache.hadoop.hbase.protobuf.generated.QuotaProtos.TimedQuota, org.apache.hadoop.hbase.protobuf.generated.QuotaProtos.TimedQuota.Builder, org.apache.hadoop.hbase.protobuf.generated.QuotaProtos.TimedQuotaOrBuilder> + org.apache.hadoop.hbase.protobuf.generated.QuotaProtos.TimedQuota, org.apache.hadoop.hbase.protobuf.generated.QuotaProtos.TimedQuota.Builder,
[50/50] [abbrv] hbase git commit: HBASE-17002 JMX metrics and some UI additions for space quotas
HBASE-17002 JMX metrics and some UI additions for space quotas Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/1e843b4d Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/1e843b4d Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/1e843b4d Branch: refs/heads/HBASE-16961 Commit: 1e843b4d1edf30f887a867614cb8c74fa3595e74 Parents: f13e5de Author: Josh ElserAuthored: Wed Feb 15 14:24:57 2017 -0500 Committer: Josh Elser Committed: Mon May 22 13:08:12 2017 -0400 -- .../hbase/client/ConnectionImplementation.java |8 + .../hadoop/hbase/client/QuotaStatusCalls.java | 39 +- .../client/ShortCircuitMasterConnection.java|8 + .../hadoop/hbase/quotas/QuotaTableUtil.java | 41 + .../hbase/shaded/protobuf/RequestConverter.java | 11 + .../hbase/master/MetricsMasterQuotaSource.java | 75 + .../master/MetricsMasterQuotaSourceFactory.java | 26 + .../hbase/master/MetricsMasterWrapper.java | 13 + .../MetricsRegionServerQuotaSource.java | 54 + .../MetricsMasterQuotaSourceFactoryImpl.java| 36 + .../master/MetricsMasterQuotaSourceImpl.java| 129 + ...hadoop.hbase.master.MetricsMasterQuotaSource | 18 + ...hbase.master.MetricsMasterQuotaSourceFactory | 18 + .../shaded/protobuf/generated/MasterProtos.java | 93 +- .../shaded/protobuf/generated/QuotaProtos.java | 3099 +- .../src/main/protobuf/Master.proto |6 +- .../src/main/protobuf/Quota.proto | 17 + .../org/apache/hadoop/hbase/master/HMaster.java |2 +- .../hadoop/hbase/master/MasterRpcServices.java | 38 + .../hadoop/hbase/master/MetricsMaster.java | 42 + .../hbase/master/MetricsMasterWrapperImpl.java | 42 +- .../hadoop/hbase/quotas/QuotaObserverChore.java | 92 +- .../resources/hbase-webapps/master/table.jsp| 59 + .../hbase/master/TestMasterMetricsWrapper.java | 17 + .../hbase/quotas/TestQuotaStatusRPCs.java | 83 + 25 files changed, 4032 insertions(+), 34 deletions(-) -- http://git-wip-us.apache.org/repos/asf/hbase/blob/1e843b4d/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ConnectionImplementation.java -- diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ConnectionImplementation.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ConnectionImplementation.java index 5242efc..e5f5694 100644 --- a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ConnectionImplementation.java +++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ConnectionImplementation.java @@ -92,6 +92,8 @@ import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.SecurityCa import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.SecurityCapabilitiesResponse; import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.SetNormalizerRunningRequest; import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.SetNormalizerRunningResponse; +import org.apache.hadoop.hbase.shaded.protobuf.generated.QuotaProtos.GetQuotaStatesRequest; +import org.apache.hadoop.hbase.shaded.protobuf.generated.QuotaProtos.GetQuotaStatesResponse; import org.apache.hadoop.hbase.shaded.protobuf.generated.QuotaProtos.GetSpaceQuotaRegionSizesRequest; import org.apache.hadoop.hbase.shaded.protobuf.generated.QuotaProtos.GetSpaceQuotaRegionSizesResponse; import org.apache.hadoop.hbase.shaded.protobuf.generated.ReplicationProtos.AddReplicationPeerRequest; @@ -1759,6 +1761,12 @@ class ConnectionImplementation implements ClusterConnection, Closeable { throws ServiceException { return stub.getSpaceQuotaRegionSizes(controller, request); } + + @Override + public GetQuotaStatesResponse getQuotaStates( + RpcController controller, GetQuotaStatesRequest request) throws ServiceException { +return stub.getQuotaStates(controller, request); + } }; } http://git-wip-us.apache.org/repos/asf/hbase/blob/1e843b4d/hbase-client/src/main/java/org/apache/hadoop/hbase/client/QuotaStatusCalls.java -- diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/QuotaStatusCalls.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/QuotaStatusCalls.java index f0f385d..af36d1e 100644 --- a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/QuotaStatusCalls.java +++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/QuotaStatusCalls.java @@ -25,6 +25,7 @@ import org.apache.hadoop.hbase.ipc.RpcControllerFactory; import org.apache.hadoop.hbase.shaded.protobuf.ProtobufUtil; import
[39/50] [abbrv] hbase git commit: HBASE-17981 Consolidate the space quota shell commands
http://git-wip-us.apache.org/repos/asf/hbase/blob/dd4066a5/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/protobuf/generated/QuotaProtos.java -- diff --git a/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/protobuf/generated/QuotaProtos.java b/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/protobuf/generated/QuotaProtos.java index e8a57e9..2435564 100644 --- a/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/protobuf/generated/QuotaProtos.java +++ b/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/protobuf/generated/QuotaProtos.java @@ -2210,7 +2210,7 @@ public final class QuotaProtos { * optional .hbase.pb.TimedQuota req_num = 1; */ private org.apache.hadoop.hbase.shaded.com.google.protobuf.SingleFieldBuilderV3< - org.apache.hadoop.hbase.shaded.protobuf.generated.QuotaProtos.TimedQuota, org.apache.hadoop.hbase.shaded.protobuf.generated.QuotaProtos.TimedQuota.Builder, org.apache.hadoop.hbase.shaded.protobuf.generated.QuotaProtos.TimedQuotaOrBuilder> + org.apache.hadoop.hbase.shaded.protobuf.generated.QuotaProtos.TimedQuota, org.apache.hadoop.hbase.shaded.protobuf.generated.QuotaProtos.TimedQuota.Builder, org.apache.hadoop.hbase.shaded.protobuf.generated.QuotaProtos.TimedQuotaOrBuilder> getReqNumFieldBuilder() { if (reqNumBuilder_ == null) { reqNumBuilder_ = new org.apache.hadoop.hbase.shaded.com.google.protobuf.SingleFieldBuilderV3< @@ -2328,7 +2328,7 @@ public final class QuotaProtos { * optional .hbase.pb.TimedQuota req_size = 2; */ private org.apache.hadoop.hbase.shaded.com.google.protobuf.SingleFieldBuilderV3< - org.apache.hadoop.hbase.shaded.protobuf.generated.QuotaProtos.TimedQuota, org.apache.hadoop.hbase.shaded.protobuf.generated.QuotaProtos.TimedQuota.Builder, org.apache.hadoop.hbase.shaded.protobuf.generated.QuotaProtos.TimedQuotaOrBuilder> + org.apache.hadoop.hbase.shaded.protobuf.generated.QuotaProtos.TimedQuota, org.apache.hadoop.hbase.shaded.protobuf.generated.QuotaProtos.TimedQuota.Builder, org.apache.hadoop.hbase.shaded.protobuf.generated.QuotaProtos.TimedQuotaOrBuilder> getReqSizeFieldBuilder() { if (reqSizeBuilder_ == null) { reqSizeBuilder_ = new org.apache.hadoop.hbase.shaded.com.google.protobuf.SingleFieldBuilderV3< @@ -2446,7 +2446,7 @@ public final class QuotaProtos { * optional .hbase.pb.TimedQuota write_num = 3; */ private org.apache.hadoop.hbase.shaded.com.google.protobuf.SingleFieldBuilderV3< - org.apache.hadoop.hbase.shaded.protobuf.generated.QuotaProtos.TimedQuota, org.apache.hadoop.hbase.shaded.protobuf.generated.QuotaProtos.TimedQuota.Builder, org.apache.hadoop.hbase.shaded.protobuf.generated.QuotaProtos.TimedQuotaOrBuilder> + org.apache.hadoop.hbase.shaded.protobuf.generated.QuotaProtos.TimedQuota, org.apache.hadoop.hbase.shaded.protobuf.generated.QuotaProtos.TimedQuota.Builder, org.apache.hadoop.hbase.shaded.protobuf.generated.QuotaProtos.TimedQuotaOrBuilder> getWriteNumFieldBuilder() { if (writeNumBuilder_ == null) { writeNumBuilder_ = new org.apache.hadoop.hbase.shaded.com.google.protobuf.SingleFieldBuilderV3< @@ -2564,7 +2564,7 @@ public final class QuotaProtos { * optional .hbase.pb.TimedQuota write_size = 4; */ private org.apache.hadoop.hbase.shaded.com.google.protobuf.SingleFieldBuilderV3< - org.apache.hadoop.hbase.shaded.protobuf.generated.QuotaProtos.TimedQuota, org.apache.hadoop.hbase.shaded.protobuf.generated.QuotaProtos.TimedQuota.Builder, org.apache.hadoop.hbase.shaded.protobuf.generated.QuotaProtos.TimedQuotaOrBuilder> + org.apache.hadoop.hbase.shaded.protobuf.generated.QuotaProtos.TimedQuota, org.apache.hadoop.hbase.shaded.protobuf.generated.QuotaProtos.TimedQuota.Builder, org.apache.hadoop.hbase.shaded.protobuf.generated.QuotaProtos.TimedQuotaOrBuilder> getWriteSizeFieldBuilder() { if (writeSizeBuilder_ == null) { writeSizeBuilder_ = new org.apache.hadoop.hbase.shaded.com.google.protobuf.SingleFieldBuilderV3< @@ -2682,7 +2682,7 @@ public final class QuotaProtos { * optional .hbase.pb.TimedQuota read_num = 5; */ private org.apache.hadoop.hbase.shaded.com.google.protobuf.SingleFieldBuilderV3< - org.apache.hadoop.hbase.shaded.protobuf.generated.QuotaProtos.TimedQuota, org.apache.hadoop.hbase.shaded.protobuf.generated.QuotaProtos.TimedQuota.Builder, org.apache.hadoop.hbase.shaded.protobuf.generated.QuotaProtos.TimedQuotaOrBuilder> + org.apache.hadoop.hbase.shaded.protobuf.generated.QuotaProtos.TimedQuota, org.apache.hadoop.hbase.shaded.protobuf.generated.QuotaProtos.TimedQuota.Builder,
[14/50] [abbrv] hbase git commit: HBASE-17557 HRegionServer#reportRegionSizesForQuotas() should respond to UnsupportedOperationException
HBASE-17557 HRegionServer#reportRegionSizesForQuotas() should respond to UnsupportedOperationException Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/e4bef6e0 Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/e4bef6e0 Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/e4bef6e0 Branch: refs/heads/HBASE-16961 Commit: e4bef6e0ce25ec8090d99a89ad8035fcf0482d4c Parents: f1b6208 Author: tedyuAuthored: Mon Jan 30 07:47:40 2017 -0800 Committer: Josh Elser Committed: Mon May 22 13:07:56 2017 -0400 -- .../quotas/FileSystemUtilizationChore.java | 20 +--- .../hbase/regionserver/HRegionServer.java | 24 2 files changed, 36 insertions(+), 8 deletions(-) -- http://git-wip-us.apache.org/repos/asf/hbase/blob/e4bef6e0/hbase-server/src/main/java/org/apache/hadoop/hbase/quotas/FileSystemUtilizationChore.java -- diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/quotas/FileSystemUtilizationChore.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/quotas/FileSystemUtilizationChore.java index 01540eb..efc17ff 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/quotas/FileSystemUtilizationChore.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/quotas/FileSystemUtilizationChore.java @@ -53,6 +53,9 @@ public class FileSystemUtilizationChore extends ScheduledChore { static final String FS_UTILIZATION_MAX_ITERATION_DURATION_KEY = "hbase.regionserver.quotas.fs.utilization.chore.max.iteration.millis"; static final long FS_UTILIZATION_MAX_ITERATION_DURATION_DEFAULT = 5000L; + private int numberOfCyclesToSkip = 0, prevNumberOfCyclesToSkip = 0; + private static final int CYCLE_UPPER_BOUND = 32; + private final HRegionServer rs; private final long maxIterationMillis; private Iterator leftoverRegions; @@ -67,6 +70,10 @@ public class FileSystemUtilizationChore extends ScheduledChore { @Override protected void chore() { +if (numberOfCyclesToSkip > 0) { + numberOfCyclesToSkip--; + return; +} final Map onlineRegionSizes = new HashMap<>(); final Set onlineRegions = new HashSet<>(rs.getOnlineRegions()); // Process the regions from the last run if we have any. If we are somehow having difficulty @@ -126,7 +133,14 @@ public class FileSystemUtilizationChore extends ScheduledChore { + skippedSplitParents + " regions due to being the parent of a split, and" + skippedRegionReplicas + " regions due to being region replicas."); } -reportRegionSizesToMaster(onlineRegionSizes); +if (!reportRegionSizesToMaster(onlineRegionSizes)) { + // backoff reporting + numberOfCyclesToSkip = prevNumberOfCyclesToSkip > 0 ? 2 * prevNumberOfCyclesToSkip : 1; + if (numberOfCyclesToSkip > CYCLE_UPPER_BOUND) { +numberOfCyclesToSkip = CYCLE_UPPER_BOUND; + } + prevNumberOfCyclesToSkip = numberOfCyclesToSkip; +} } /** @@ -166,8 +180,8 @@ public class FileSystemUtilizationChore extends ScheduledChore { * * @param onlineRegionSizes The computed region sizes to report. */ - void reportRegionSizesToMaster(Map onlineRegionSizes) { -this.rs.reportRegionSizesForQuotas(onlineRegionSizes); + boolean reportRegionSizesToMaster(Map onlineRegionSizes) { +return this.rs.reportRegionSizesForQuotas(onlineRegionSizes); } /** http://git-wip-us.apache.org/repos/asf/hbase/blob/e4bef6e0/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java -- diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java index 8130312..2b3e8f5 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java @@ -66,6 +66,7 @@ import org.apache.hadoop.hbase.ChoreService; import org.apache.hadoop.hbase.ClockOutOfSyncException; import org.apache.hadoop.hbase.CoordinatedStateManager; import org.apache.hadoop.hbase.CoordinatedStateManagerFactory; +import org.apache.hadoop.hbase.DoNotRetryIOException; import org.apache.hadoop.hbase.HBaseConfiguration; import org.apache.hadoop.hbase.HBaseInterfaceAudience; import org.apache.hadoop.hbase.HConstants; @@ -1248,13 +1249,14 @@ public class HRegionServer extends HasThread implements * Reports the given map of Regions and their size on the filesystem to the active Master. * *