hbase git commit: HBASE-18014 A case of Region remain unassigned when table enabled (Allan Yang)
Repository: hbase Updated Branches: refs/heads/branch-1.3 72edf521c -> 36ebe05fc HBASE-18014 A case of Region remain unassigned when table enabled (Allan Yang) Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/36ebe05f Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/36ebe05f Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/36ebe05f Branch: refs/heads/branch-1.3 Commit: 36ebe05fc9013fe27ba0eca410ed11e5c5b112cb Parents: 72edf52 Author: Andrew PurtellAuthored: Fri May 12 16:59:38 2017 -0700 Committer: Andrew Purtell Committed: Fri May 12 17:46:12 2017 -0700 -- .../hadoop/hbase/master/AssignmentManager.java | 2 ++ .../apache/hadoop/hbase/client/TestAdmin2.java | 35 2 files changed, 37 insertions(+) -- http://git-wip-us.apache.org/repos/asf/hbase/blob/36ebe05f/hbase-server/src/main/java/org/apache/hadoop/hbase/master/AssignmentManager.java -- diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/AssignmentManager.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/AssignmentManager.java index 1e19397..d247b11 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/AssignmentManager.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/AssignmentManager.java @@ -1561,6 +1561,8 @@ public class AssignmentManager extends ZooKeeperListener { EventType.RS_ZK_REGION_CLOSED, EventType.M_ZK_REGION_OFFLINE); } replicasToClose.remove(regionInfo); +//Set servername in regionstate to null, see HBASE-18014 +getRegionStates().updateRegionState(regionInfo, State.OFFLINE, null); regionOffline(regionInfo); } http://git-wip-us.apache.org/repos/asf/hbase/blob/36ebe05f/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestAdmin2.java -- diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestAdmin2.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestAdmin2.java index 051998b..72f41a76 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestAdmin2.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestAdmin2.java @@ -88,6 +88,12 @@ public class TestAdmin2 { TEST_UTIL.getConfiguration().setInt("hbase.regionserver.metahandler.count", 30); TEST_UTIL.getConfiguration().setBoolean( "hbase.master.enabletable.roundrobin", true); +//Set a very short keeptime for processedServers, see HBASE-18014 + TEST_UTIL.getConfiguration().setLong("hbase.master.maximum.logsplit.keeptime", 100); +//HBASE-18014, don't Know why @Test (timeout=3) attribute doesn't work when +//calling enableTable.So I have to set the sync wait time to a short time to timeout +//the test of testEnableTableAfterprocessedServersCleaned +TEST_UTIL.getConfiguration().setInt("hbase.client.sync.wait.timeout.msec", 3); TEST_UTIL.startMiniCluster(3); } @@ -790,4 +796,33 @@ public class TestAdmin2 { // Current state should be the original state again assertEquals(initialState, admin.isNormalizerEnabled()); } + + /** + * a UT for HBASE-18014 + * @throws Exception + */ + @Test (timeout=3) + public void testEnableTableAfterprocessedServersCleaned() throws Exception { +String TABLENAME = "testEnableTableAfterprocessedServersCleaned"; +HBaseAdmin admin = TEST_UTIL.getHBaseAdmin(); +HTableDescriptor hds = new HTableDescriptor(TableName.valueOf(TABLENAME)); +HColumnDescriptor hcs = new HColumnDescriptor("cf".getBytes()); +hds.addFamily(hcs); +admin.createTable(hds); +HRegionServer server = TEST_UTIL.getHBaseCluster().getRegionServer(0); +ServerName serverName = server.getServerName(); +HRegionInfo region = admin.getTableRegions(TableName.valueOf(TABLENAME)).get(0); +//move the region to the first server so we can abort this rs +admin.move(region.getEncodedNameAsBytes(), Bytes.toBytes(serverName.toString())); +TEST_UTIL.waitUntilAllRegionsAssigned(TableName.valueOf(TABLENAME)); +admin.disableTable(TABLENAME); +server.abort("abort"); +//wait for SSH to handle server shutdown +Thread.sleep(5000); +//trigger a clean of processedServers +TEST_UTIL.getHBaseCluster().getMaster().getAssignmentManager() +.getRegionStates().logSplit(ServerName.valueOf("fakeServer", 5000, 0)); +admin.enableTable(TABLENAME); +TEST_UTIL.waitUntilAllRegionsAssigned(TableName.valueOf(TABLENAME), 1); + } }
hbase git commit: HBASE-18014 A case of Region remain unassigned when table enabled (Allan Yang)
Repository: hbase Updated Branches: refs/heads/branch-1 f81486445 -> 0a4528225 HBASE-18014 A case of Region remain unassigned when table enabled (Allan Yang) Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/0a452822 Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/0a452822 Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/0a452822 Branch: refs/heads/branch-1 Commit: 0a4528225c71cf515b69ab194779107d24de9852 Parents: f814864 Author: Andrew PurtellAuthored: Fri May 12 16:59:38 2017 -0700 Committer: Andrew Purtell Committed: Fri May 12 16:59:38 2017 -0700 -- .../hadoop/hbase/master/AssignmentManager.java | 2 ++ .../apache/hadoop/hbase/client/TestAdmin2.java | 35 2 files changed, 37 insertions(+) -- http://git-wip-us.apache.org/repos/asf/hbase/blob/0a452822/hbase-server/src/main/java/org/apache/hadoop/hbase/master/AssignmentManager.java -- diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/AssignmentManager.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/AssignmentManager.java index fe94f42..0a28967 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/AssignmentManager.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/AssignmentManager.java @@ -1587,6 +1587,8 @@ public class AssignmentManager extends ZooKeeperListener { EventType.RS_ZK_REGION_CLOSED, EventType.M_ZK_REGION_OFFLINE); } replicasToClose.remove(regionInfo); +//Set servername in regionstate to null, see HBASE-18014 +getRegionStates().updateRegionState(regionInfo, State.OFFLINE, null); regionOffline(regionInfo); } http://git-wip-us.apache.org/repos/asf/hbase/blob/0a452822/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestAdmin2.java -- diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestAdmin2.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestAdmin2.java index 051998b..72f41a76 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestAdmin2.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestAdmin2.java @@ -88,6 +88,12 @@ public class TestAdmin2 { TEST_UTIL.getConfiguration().setInt("hbase.regionserver.metahandler.count", 30); TEST_UTIL.getConfiguration().setBoolean( "hbase.master.enabletable.roundrobin", true); +//Set a very short keeptime for processedServers, see HBASE-18014 + TEST_UTIL.getConfiguration().setLong("hbase.master.maximum.logsplit.keeptime", 100); +//HBASE-18014, don't Know why @Test (timeout=3) attribute doesn't work when +//calling enableTable.So I have to set the sync wait time to a short time to timeout +//the test of testEnableTableAfterprocessedServersCleaned +TEST_UTIL.getConfiguration().setInt("hbase.client.sync.wait.timeout.msec", 3); TEST_UTIL.startMiniCluster(3); } @@ -790,4 +796,33 @@ public class TestAdmin2 { // Current state should be the original state again assertEquals(initialState, admin.isNormalizerEnabled()); } + + /** + * a UT for HBASE-18014 + * @throws Exception + */ + @Test (timeout=3) + public void testEnableTableAfterprocessedServersCleaned() throws Exception { +String TABLENAME = "testEnableTableAfterprocessedServersCleaned"; +HBaseAdmin admin = TEST_UTIL.getHBaseAdmin(); +HTableDescriptor hds = new HTableDescriptor(TableName.valueOf(TABLENAME)); +HColumnDescriptor hcs = new HColumnDescriptor("cf".getBytes()); +hds.addFamily(hcs); +admin.createTable(hds); +HRegionServer server = TEST_UTIL.getHBaseCluster().getRegionServer(0); +ServerName serverName = server.getServerName(); +HRegionInfo region = admin.getTableRegions(TableName.valueOf(TABLENAME)).get(0); +//move the region to the first server so we can abort this rs +admin.move(region.getEncodedNameAsBytes(), Bytes.toBytes(serverName.toString())); +TEST_UTIL.waitUntilAllRegionsAssigned(TableName.valueOf(TABLENAME)); +admin.disableTable(TABLENAME); +server.abort("abort"); +//wait for SSH to handle server shutdown +Thread.sleep(5000); +//trigger a clean of processedServers +TEST_UTIL.getHBaseCluster().getMaster().getAssignmentManager() +.getRegionStates().logSplit(ServerName.valueOf("fakeServer", 5000, 0)); +admin.enableTable(TABLENAME); +TEST_UTIL.waitUntilAllRegionsAssigned(TableName.valueOf(TABLENAME), 1); + } }
hbase git commit: Fix broke unit test. Use nice facility I found in procedure testing utility in a few other tests... in place of checking for symptom
Repository: hbase Updated Branches: refs/heads/HBASE-14614 4ab52f2c1 -> 61ed02691 Fix broke unit test. Use nice facility I found in procedure testing utility in a few other tests... in place of checking for symptom Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/61ed0269 Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/61ed0269 Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/61ed0269 Branch: refs/heads/HBASE-14614 Commit: 61ed02691bf4dd66fb5ac4e5205a884a908eea00 Parents: 4ab52f2 Author: Michael StackAuthored: Fri May 12 17:07:27 2017 -0700 Committer: Michael Stack Committed: Fri May 12 17:07:27 2017 -0700 -- .../hadoop/hbase/master/CatalogJanitor.java | 8 -- .../hadoop/hbase/master/TestCatalogJanitor.java | 28 .../TestSplitTransactionOnCluster.java | 3 ++- 3 files changed, 19 insertions(+), 20 deletions(-) -- http://git-wip-us.apache.org/repos/asf/hbase/blob/61ed0269/hbase-server/src/main/java/org/apache/hadoop/hbase/master/CatalogJanitor.java -- diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/CatalogJanitor.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/CatalogJanitor.java index 2331d8f..7d43f2f 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/CatalogJanitor.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/CatalogJanitor.java @@ -45,6 +45,7 @@ import org.apache.hadoop.hbase.master.assignment.AssignmentManager; import org.apache.hadoop.hbase.master.assignment.GCMergedRegionsProcedure; import org.apache.hadoop.hbase.master.assignment.GCRegionProcedure; import org.apache.hadoop.hbase.master.procedure.MasterProcedureEnv; +import org.apache.hadoop.hbase.procedure2.Procedure; import org.apache.hadoop.hbase.procedure2.ProcedureExecutor; import org.apache.hadoop.hbase.regionserver.HRegionFileSystem; import org.apache.hadoop.hbase.util.Bytes; @@ -54,6 +55,8 @@ import org.apache.hadoop.hbase.util.PairOfSameType; import org.apache.hadoop.hbase.util.Threads; import org.apache.hadoop.hbase.util.Triple; +import com.google.common.annotations.VisibleForTesting; + /** * A janitor for the catalog tables. Scans the hbase:meta catalog * table on a period looking for unused regions to garbage collect. @@ -66,6 +69,7 @@ public class CatalogJanitor extends ScheduledChore { private final AtomicBoolean enabled = new AtomicBoolean(true); private final MasterServices services; private final Connection connection; + // PID of the last Procedure launched herein. Keep around for Tests. CatalogJanitor(final MasterServices services) { super("CatalogJanitor-" + services.getServerName().toShortString(), services, @@ -215,8 +219,8 @@ public class CatalogJanitor extends ScheduledChore { + regionB.getShortNameToLog() + " from fs because merged region no longer holds references"); ProcedureExecutor pe = this.services.getMasterProcedureExecutor(); - pe.submitProcedure(new GCMergedRegionsProcedure(pe.getEnvironment(),mergedRegion, - regionA, regionB)); + pe.submitProcedure(new GCMergedRegionsProcedure(pe.getEnvironment(), + mergedRegion, regionA, regionB)); return true; } return false; http://git-wip-us.apache.org/repos/asf/hbase/blob/61ed0269/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestCatalogJanitor.java -- diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestCatalogJanitor.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestCatalogJanitor.java index 5c082a4..59e8fb3 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestCatalogJanitor.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestCatalogJanitor.java @@ -53,6 +53,7 @@ import org.apache.hadoop.hbase.client.TableDescriptorBuilder; import org.apache.hadoop.hbase.io.Reference; import org.apache.hadoop.hbase.master.CatalogJanitor.SplitParentFirstComparator; import org.apache.hadoop.hbase.master.assignment.MockMasterServices; +import org.apache.hadoop.hbase.procedure2.ProcedureTestingUtility; import org.apache.hadoop.hbase.regionserver.ChunkCreator; import org.apache.hadoop.hbase.regionserver.HStore; import org.apache.hadoop.hbase.regionserver.MemStoreLABImpl; @@ -135,14 +136,14 @@ public class TestCatalogJanitor { // Add a parentdir for kicks so can check it gets removed by the catalogjanitor. fs.mkdirs(parentdir); assertFalse(this.janitor.cleanParent(parent, r)); +
hbase git commit: archive is for hfiles only and the cleaner is removing my pv2 files
Repository: hbase Updated Branches: refs/heads/HBASE-14614 f209990b5 -> 4ab52f2c1 archive is for hfiles only and the cleaner is removing my pv2 files Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/4ab52f2c Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/4ab52f2c Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/4ab52f2c Branch: refs/heads/HBASE-14614 Commit: 4ab52f2c199850e65f5eefe6ffe7be559f090671 Parents: f209990 Author: Michael StackAuthored: Fri May 12 16:25:55 2017 -0700 Committer: Michael Stack Committed: Fri May 12 16:25:55 2017 -0700 -- .../hadoop/hbase/procedure2/store/wal/WALProcedureStore.java | 7 --- .../src/main/java/org/apache/hadoop/hbase/master/HMaster.java | 5 ++--- 2 files changed, 6 insertions(+), 6 deletions(-) -- http://git-wip-us.apache.org/repos/asf/hbase/blob/4ab52f2c/hbase-procedure/src/main/java/org/apache/hadoop/hbase/procedure2/store/wal/WALProcedureStore.java -- diff --git a/hbase-procedure/src/main/java/org/apache/hadoop/hbase/procedure2/store/wal/WALProcedureStore.java b/hbase-procedure/src/main/java/org/apache/hadoop/hbase/procedure2/store/wal/WALProcedureStore.java index b64fd54..1791cae 100644 --- a/hbase-procedure/src/main/java/org/apache/hadoop/hbase/procedure2/store/wal/WALProcedureStore.java +++ b/hbase-procedure/src/main/java/org/apache/hadoop/hbase/procedure2/store/wal/WALProcedureStore.java @@ -66,6 +66,7 @@ import com.google.common.annotations.VisibleForTesting; @InterfaceStability.Evolving public class WALProcedureStore extends ProcedureStoreBase { private static final Log LOG = LogFactory.getLog(WALProcedureStore.class); + public static final String LOG_PREFIX = "pv2-"; public interface LeaseRecovery { void recoverFileLease(FileSystem fs, Path path) throws IOException; @@ -1145,7 +1146,7 @@ public class WALProcedureStore extends ProcedureStoreBase { } protected Path getLogFilePath(final long logId) throws IOException { -return new Path(walDir, String.format("state-%020d.log", logId)); +return new Path(walDir, String.format(LOG_PREFIX + "%020d.log", logId)); } private static long getLogIdFromName(final String name) { @@ -1158,7 +1159,7 @@ public class WALProcedureStore extends ProcedureStoreBase { @Override public boolean accept(Path path) { String name = path.getName(); - return name.startsWith("state-") && name.endsWith(".log"); + return name.startsWith(LOG_PREFIX) && name.endsWith(".log"); } }; @@ -1248,7 +1249,7 @@ public class WALProcedureStore extends ProcedureStoreBase { return null; } if (LOG.isDebugEnabled()) { - LOG.debug("Opening state-log: " + logFile); + LOG.debug("Opening Pv2 " + logFile); } try { log.open(); http://git-wip-us.apache.org/repos/asf/hbase/blob/4ab52f2c/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 142547d..9b02873 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 @@ -,9 +,8 @@ public class HMaster extends HRegionServer implements MasterServices { final MasterProcedureEnv procEnv = new MasterProcedureEnv(this); final Path walDir = new Path(FSUtils.getWALRootDir(this.conf), MasterProcedureConstants.MASTER_PROCEDURE_LOGDIR); -final Path walArchiveDir = new Path(HFileArchiveUtil.getArchivePath(this.conf), -MasterProcedureConstants.MASTER_PROCEDURE_LOGDIR); - +// TODO: No cleaner currently! +final Path walArchiveDir = new Path(walDir, HConstants.HFILE_ARCHIVE_DIRECTORY); procedureStore = new WALProcedureStore(conf, walDir.getFileSystem(conf), walDir, walArchiveDir, new MasterProcedureEnv.WALStoreLeaseRecovery(this)); procedureStore.registerListener(new MasterProcedureEnv.MasterProcedureStoreListener(this));
hbase git commit: Archive dir setting
Repository: hbase Updated Branches: refs/heads/HBASE-14614 7e4e547e2 -> f209990b5 Archive dir setting Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/f209990b Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/f209990b Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/f209990b Branch: refs/heads/HBASE-14614 Commit: f209990b59b8a9fafcbac5353a4711d344f99e01 Parents: 7e4e547 Author: Michael StackAuthored: Fri May 12 15:56:10 2017 -0700 Committer: Michael Stack Committed: Fri May 12 15:56:10 2017 -0700 -- .../src/main/java/org/apache/hadoop/hbase/master/HMaster.java| 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/hbase/blob/f209990b/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 984afb8..142547d 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 @@ -,8 +,8 @@ public class HMaster extends HRegionServer implements MasterServices { final MasterProcedureEnv procEnv = new MasterProcedureEnv(this); final Path walDir = new Path(FSUtils.getWALRootDir(this.conf), MasterProcedureConstants.MASTER_PROCEDURE_LOGDIR); -final Path walArchiveDir = new Path(new Path(FSUtils.getWALRootDir(this.conf), -HConstants.HFILE_ARCHIVE_DIRECTORY), MasterProcedureConstants.MASTER_PROCEDURE_LOGDIR); +final Path walArchiveDir = new Path(HFileArchiveUtil.getArchivePath(this.conf), +MasterProcedureConstants.MASTER_PROCEDURE_LOGDIR); procedureStore = new WALProcedureStore(conf, walDir.getFileSystem(conf), walDir, walArchiveDir, new MasterProcedureEnv.WALStoreLeaseRecovery(this));
hbase git commit: Add an exists
Repository: hbase Updated Branches: refs/heads/HBASE-14614 61c904732 -> 7e4e547e2 Add an exists Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/7e4e547e Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/7e4e547e Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/7e4e547e Branch: refs/heads/HBASE-14614 Commit: 7e4e547e2069a41a02563b9cc56455461f478584 Parents: 61c9047 Author: Michael StackAuthored: Fri May 12 15:43:23 2017 -0700 Committer: Michael Stack Committed: Fri May 12 15:43:23 2017 -0700 -- .../hbase/procedure2/store/wal/ProcedureWALFile.java| 2 +- .../hbase/procedure2/store/wal/WALProcedureStore.java | 12 +++- .../java/org/apache/hadoop/hbase/master/HMaster.java| 4 ++-- 3 files changed, 14 insertions(+), 4 deletions(-) -- http://git-wip-us.apache.org/repos/asf/hbase/blob/7e4e547e/hbase-procedure/src/main/java/org/apache/hadoop/hbase/procedure2/store/wal/ProcedureWALFile.java -- diff --git a/hbase-procedure/src/main/java/org/apache/hadoop/hbase/procedure2/store/wal/ProcedureWALFile.java b/hbase-procedure/src/main/java/org/apache/hadoop/hbase/procedure2/store/wal/ProcedureWALFile.java index 42abe8f..95a1ef6 100644 --- a/hbase-procedure/src/main/java/org/apache/hadoop/hbase/procedure2/store/wal/ProcedureWALFile.java +++ b/hbase-procedure/src/main/java/org/apache/hadoop/hbase/procedure2/store/wal/ProcedureWALFile.java @@ -160,7 +160,7 @@ public class ProcedureWALFile implements Comparable { boolean archived = false; if (walArchiveDir != null) { Path archivedFile = new Path(walArchiveDir, logFile.getName()); - LOG.info("ARCHIVED (TODO: FILES ARE NOT PURGED FROM ARCHIVE!) " + logFile + " to " + walArchiveDir); + LOG.info("ARCHIVED (TODO: FILES ARE NOT PURGED FROM ARCHIVE!) " + logFile + " to " + archivedFile); if (!fs.rename(logFile, archivedFile)) { LOG.warn("Failed archive of " + logFile + ", deleting"); } else { http://git-wip-us.apache.org/repos/asf/hbase/blob/7e4e547e/hbase-procedure/src/main/java/org/apache/hadoop/hbase/procedure2/store/wal/WALProcedureStore.java -- diff --git a/hbase-procedure/src/main/java/org/apache/hadoop/hbase/procedure2/store/wal/WALProcedureStore.java b/hbase-procedure/src/main/java/org/apache/hadoop/hbase/procedure2/store/wal/WALProcedureStore.java index df818fe..b64fd54 100644 --- a/hbase-procedure/src/main/java/org/apache/hadoop/hbase/procedure2/store/wal/WALProcedureStore.java +++ b/hbase-procedure/src/main/java/org/apache/hadoop/hbase/procedure2/store/wal/WALProcedureStore.java @@ -246,6 +246,16 @@ public class WALProcedureStore extends ProcedureStoreBase { } }; syncThread.start(); + +// Create archive dir up front. Rename won't work w/o it up on HDFS. +if (this.walArchiveDir != null && !this.fs.exists(this.walArchiveDir)) { + if (this.fs.mkdirs(this.walArchiveDir)) { +if (LOG.isDebugEnabled()) LOG.debug("Created Procedure Store WAL archive dir " + +this.walArchiveDir); + } else { +LOG.warn("Failed create of " + this.walArchiveDir); + } +} } @Override @@ -1113,7 +1123,7 @@ public class WALProcedureStore extends ProcedureStoreBase { log.removeFile(walArchiveDir); logs.remove(log); if (LOG.isDebugEnabled()) { -LOG.info("Removed log=" + log + " activeLogs=" + logs); +LOG.info("Removed log=" + log + ", activeLogs=" + logs); } assert logs.size() > 0 : "expected at least one log"; } catch (IOException e) { http://git-wip-us.apache.org/repos/asf/hbase/blob/7e4e547e/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 5c6fdda..984afb8 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 @@ -,10 +,10 @@ public class HMaster extends HRegionServer implements MasterServices { final MasterProcedureEnv procEnv = new MasterProcedureEnv(this); final Path walDir = new Path(FSUtils.getWALRootDir(this.conf), MasterProcedureConstants.MASTER_PROCEDURE_LOGDIR); -final Path archiveWalDir = new Path(new Path(FSUtils.getWALRootDir(this.conf), +final Path walArchiveDir = new Path(new Path(FSUtils.getWALRootDir(this.conf), HConstants.HFILE_ARCHIVE_DIRECTORY),
[2/2] hbase git commit: Fix archiving of pv2 WAL files
Fix archiving of pv2 WAL files Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/61c90473 Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/61c90473 Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/61c90473 Branch: refs/heads/HBASE-14614 Commit: 61c9047329234f6cefcc53edbd807d21b3aea740 Parents: 3d9d69b Author: Michael StackAuthored: Fri May 12 13:02:32 2017 -0700 Committer: Michael Stack Committed: Fri May 12 13:02:32 2017 -0700 -- .../procedure2/store/wal/ProcedureWALFile.java | 28 ++-- .../procedure2/store/wal/WALProcedureStore.java | 28 +--- .../org/apache/hadoop/hbase/master/HMaster.java | 4 ++- .../assignment/TestAssignmentManager.java | 2 +- 4 files changed, 36 insertions(+), 26 deletions(-) -- http://git-wip-us.apache.org/repos/asf/hbase/blob/61c90473/hbase-procedure/src/main/java/org/apache/hadoop/hbase/procedure2/store/wal/ProcedureWALFile.java -- diff --git a/hbase-procedure/src/main/java/org/apache/hadoop/hbase/procedure2/store/wal/ProcedureWALFile.java b/hbase-procedure/src/main/java/org/apache/hadoop/hbase/procedure2/store/wal/ProcedureWALFile.java index 2221cfc..42abe8f 100644 --- a/hbase-procedure/src/main/java/org/apache/hadoop/hbase/procedure2/store/wal/ProcedureWALFile.java +++ b/hbase-procedure/src/main/java/org/apache/hadoop/hbase/procedure2/store/wal/ProcedureWALFile.java @@ -26,7 +26,6 @@ import org.apache.hadoop.fs.FSDataInputStream; import org.apache.hadoop.fs.FileStatus; import org.apache.hadoop.fs.FileSystem; import org.apache.hadoop.fs.Path; -import org.apache.hadoop.hbase.HConstants; import org.apache.hadoop.hbase.classification.InterfaceAudience; import org.apache.hadoop.hbase.classification.InterfaceStability; import org.apache.hadoop.hbase.procedure2.store.ProcedureStoreTracker; @@ -156,22 +155,23 @@ public class ProcedureWALFile implements Comparable { this.logSize += size; } - public void removeFile() throws IOException { + public void removeFile(final Path walArchiveDir) throws IOException { close(); -// TODO: FIX THIS. MAKE THIS ARCHIVE FORMAL. -Path archiveDir = -new Path(logFile.getParent().getParent(), HConstants.HFILE_ARCHIVE_DIRECTORY); -try { - fs.mkdirs(archiveDir); -} catch (IOException ioe) { - LOG.warn("Making " + archiveDir, ioe); +boolean archived = false; +if (walArchiveDir != null) { + Path archivedFile = new Path(walArchiveDir, logFile.getName()); + LOG.info("ARCHIVED (TODO: FILES ARE NOT PURGED FROM ARCHIVE!) " + logFile + " to " + walArchiveDir); + if (!fs.rename(logFile, archivedFile)) { +LOG.warn("Failed archive of " + logFile + ", deleting"); + } else { +archived = true; + } } -Path archivedFile = new Path(archiveDir, logFile.getName()); -LOG.info("ARCHIVED WAL (TODO: FILES ARE NOT PURGED FROM ARCHIVE!) " + logFile + " to " + archivedFile); -if (!fs.rename(logFile, archivedFile)) { - LOG.warn("Failed archive of " + logFile); +if (!archived) { + if (!fs.delete(logFile, false)) { +LOG.warn("Failed delete of " + logFile); + } } -// fs.delete(logFile, false); } public void setProcIds(long minId, long maxId) { http://git-wip-us.apache.org/repos/asf/hbase/blob/61c90473/hbase-procedure/src/main/java/org/apache/hadoop/hbase/procedure2/store/wal/WALProcedureStore.java -- diff --git a/hbase-procedure/src/main/java/org/apache/hadoop/hbase/procedure2/store/wal/WALProcedureStore.java b/hbase-procedure/src/main/java/org/apache/hadoop/hbase/procedure2/store/wal/WALProcedureStore.java index 300e023..df818fe 100644 --- a/hbase-procedure/src/main/java/org/apache/hadoop/hbase/procedure2/store/wal/WALProcedureStore.java +++ b/hbase-procedure/src/main/java/org/apache/hadoop/hbase/procedure2/store/wal/WALProcedureStore.java @@ -124,6 +124,7 @@ public class WALProcedureStore extends ProcedureStoreBase { private final Configuration conf; private final FileSystem fs; private final Path walDir; + private final Path walArchiveDir; private final AtomicReference syncException = new AtomicReference<>(); private final AtomicBoolean loading = new AtomicBoolean(true); @@ -185,9 +186,15 @@ public class WALProcedureStore extends ProcedureStoreBase { public WALProcedureStore(final Configuration conf, final FileSystem fs, final Path walDir, final LeaseRecovery leaseRecovery) { +this(conf, fs, walDir, null, leaseRecovery); + } + + public WALProcedureStore(final Configuration conf, final FileSystem fs, final Path walDir, + final
[1/2] hbase git commit: Making more logging trace-level
Repository: hbase Updated Branches: refs/heads/HBASE-14614 8bfc2a221 -> 61c904732 Making more logging trace-level Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/3d9d69bc Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/3d9d69bc Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/3d9d69bc Branch: refs/heads/HBASE-14614 Commit: 3d9d69bc998d3a079a91ad005a6f62e365445c60 Parents: 8bfc2a2 Author: Michael StackAuthored: Fri May 12 10:28:39 2017 -0700 Committer: Michael Stack Committed: Fri May 12 10:28:39 2017 -0700 -- .../hadoop/hbase/procedure2/store/wal/ProcedureWALFile.java| 6 -- .../hadoop/hbase/procedure2/store/wal/WALProcedureStore.java | 4 ++-- .../org/apache/hadoop/hbase/zookeeper/RegionServerTracker.java | 4 ++-- 3 files changed, 8 insertions(+), 6 deletions(-) -- http://git-wip-us.apache.org/repos/asf/hbase/blob/3d9d69bc/hbase-procedure/src/main/java/org/apache/hadoop/hbase/procedure2/store/wal/ProcedureWALFile.java -- diff --git a/hbase-procedure/src/main/java/org/apache/hadoop/hbase/procedure2/store/wal/ProcedureWALFile.java b/hbase-procedure/src/main/java/org/apache/hadoop/hbase/procedure2/store/wal/ProcedureWALFile.java index 585762b..2221cfc 100644 --- a/hbase-procedure/src/main/java/org/apache/hadoop/hbase/procedure2/store/wal/ProcedureWALFile.java +++ b/hbase-procedure/src/main/java/org/apache/hadoop/hbase/procedure2/store/wal/ProcedureWALFile.java @@ -167,8 +167,10 @@ public class ProcedureWALFile implements Comparable { LOG.warn("Making " + archiveDir, ioe); } Path archivedFile = new Path(archiveDir, logFile.getName()); -LOG.info("ARCHIVED WAL (FIX) " + logFile + " to " + archivedFile); -fs.rename(logFile, archivedFile); +LOG.info("ARCHIVED WAL (TODO: FILES ARE NOT PURGED FROM ARCHIVE!) " + logFile + " to " + archivedFile); +if (!fs.rename(logFile, archivedFile)) { + LOG.warn("Failed archive of " + logFile); +} // fs.delete(logFile, false); } http://git-wip-us.apache.org/repos/asf/hbase/blob/3d9d69bc/hbase-procedure/src/main/java/org/apache/hadoop/hbase/procedure2/store/wal/WALProcedureStore.java -- diff --git a/hbase-procedure/src/main/java/org/apache/hadoop/hbase/procedure2/store/wal/WALProcedureStore.java b/hbase-procedure/src/main/java/org/apache/hadoop/hbase/procedure2/store/wal/WALProcedureStore.java index 7eeb2df..300e023 100644 --- a/hbase-procedure/src/main/java/org/apache/hadoop/hbase/procedure2/store/wal/WALProcedureStore.java +++ b/hbase-procedure/src/main/java/org/apache/hadoop/hbase/procedure2/store/wal/WALProcedureStore.java @@ -1079,8 +1079,8 @@ public class WALProcedureStore extends ProcedureStoreBase { private void removeAllLogs(long lastLogId) { if (logs.size() <= 1) return; -if (LOG.isDebugEnabled()) { - LOG.debug("Remove all state logs with ID less than " + lastLogId); +if (LOG.isTraceEnabled()) { + LOG.trace("Remove all state logs with ID less than " + lastLogId); } boolean removed = false; http://git-wip-us.apache.org/repos/asf/hbase/blob/3d9d69bc/hbase-server/src/main/java/org/apache/hadoop/hbase/zookeeper/RegionServerTracker.java -- diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/zookeeper/RegionServerTracker.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/zookeeper/RegionServerTracker.java index 69cd233..a6a5c17 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/zookeeper/RegionServerTracker.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/zookeeper/RegionServerTracker.java @@ -88,8 +88,8 @@ public class RegionServerTracker extends ZooKeeperListener { int magicLen = ProtobufUtil.lengthOfPBMagic(); ProtobufUtil.mergeFrom(rsInfoBuilder, data, magicLen, data.length - magicLen); } -if (LOG.isDebugEnabled()) { - LOG.debug("Added tracking of RS " + nodePath); +if (LOG.isTraceEnabled()) { + LOG.trace("Added tracking of RS " + nodePath); } } catch (KeeperException e) { LOG.warn("Get Rs info port from ephemeral node", e);
hbase git commit: WALSplitter was spewing log about skipped edits messing up my long-running test
Repository: hbase Updated Branches: refs/heads/HBASE-14614 d64de305f -> 8bfc2a221 WALSplitter was spewing log about skipped edits messing up my long-running test Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/8bfc2a22 Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/8bfc2a22 Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/8bfc2a22 Branch: refs/heads/HBASE-14614 Commit: 8bfc2a221824894873b08c381f148063751df291 Parents: d64de30 Author: Michael StackAuthored: Fri May 12 10:00:31 2017 -0700 Committer: Michael Stack Committed: Fri May 12 10:00:31 2017 -0700 -- .../hbase/procedure2/ProcedureExecutor.java | 16 ++- .../hadoop/hbase/master/CatalogJanitor.java | 21 +--- .../org/apache/hadoop/hbase/master/HMaster.java | 14 + .../apache/hadoop/hbase/wal/WALSplitter.java| 6 -- 4 files changed, 29 insertions(+), 28 deletions(-) -- http://git-wip-us.apache.org/repos/asf/hbase/blob/8bfc2a22/hbase-procedure/src/main/java/org/apache/hadoop/hbase/procedure2/ProcedureExecutor.java -- diff --git a/hbase-procedure/src/main/java/org/apache/hadoop/hbase/procedure2/ProcedureExecutor.java b/hbase-procedure/src/main/java/org/apache/hadoop/hbase/procedure2/ProcedureExecutor.java index fa3df04..258e268 100644 --- a/hbase-procedure/src/main/java/org/apache/hadoop/hbase/procedure2/ProcedureExecutor.java +++ b/hbase-procedure/src/main/java/org/apache/hadoop/hbase/procedure2/ProcedureExecutor.java @@ -1526,17 +1526,13 @@ public class ProcedureExecutor { } // If this procedure is the last child awake the parent procedure -if (LOG.isDebugEnabled()) { - LOG.debug("Finish suprocedure " + procedure); -} +LOG.info("Finish suprocedure " + procedure); if (parent.tryRunnable()) { // If we succeeded in making the parent runnable -- i.e. all of its // children have completed, move parent to front of the queue. store.update(parent); scheduler.addFront(parent); - if (LOG.isDebugEnabled()) { -LOG.debug("Finished subprocedure(s) of " + parent + "; resume parent processing."); - } + LOG.info("Finished subprocedure(s) of " + parent + "; resume parent processing."); return; } } @@ -1646,8 +1642,8 @@ public class ProcedureExecutor { if (this.activeProcedure == null) continue; int activeCount = activeExecutorCount.incrementAndGet(); int runningCount = store.setRunningProcedureCount(activeCount); - if (LOG.isDebugEnabled()) { -LOG.debug("Execute pid=" + this.activeProcedure.getProcId() + + if (LOG.isTraceEnabled()) { +LOG.trace("Execute pid=" + this.activeProcedure.getProcId() + " runningCount=" + runningCount + ", activeCount=" + activeCount); } executionStartTime.set(EnvironmentEdgeManager.currentTime()); @@ -1659,8 +1655,8 @@ public class ProcedureExecutor { } finally { activeCount = activeExecutorCount.decrementAndGet(); runningCount = store.setRunningProcedureCount(activeCount); -if (LOG.isDebugEnabled()) { - LOG.debug("Halt pid=" + this.activeProcedure.getProcId() + +if (LOG.isTraceEnabled()) { + LOG.trace("Halt pid=" + this.activeProcedure.getProcId() + " runningCount=" + runningCount + ", activeCount=" + activeCount); } this.activeProcedure = null; http://git-wip-us.apache.org/repos/asf/hbase/blob/8bfc2a22/hbase-server/src/main/java/org/apache/hadoop/hbase/master/CatalogJanitor.java -- diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/CatalogJanitor.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/CatalogJanitor.java index edd163c..2331d8f 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/CatalogJanitor.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/CatalogJanitor.java @@ -211,14 +211,12 @@ public class CatalogJanitor extends ScheduledChore { LOG.warn("Merged region does not exist: " + mergedRegion.getEncodedName()); } if (regionFs == null || !regionFs.hasReferences(htd)) { - LOG.debug("Deleting region " + regionA.getRegionNameAsString() + " and " - + regionB.getRegionNameAsString() + LOG.debug("Deleting region " + regionA.getShortNameToLog() + " and " + + regionB.getShortNameToLog() + " from fs because merged region no longer holds references"); ProcedureExecutor pe =
hbase git commit: HBASE-17938 General fault - tolerance framework for backup/restore operations (Vladimir Rodionov)
Repository: hbase Updated Branches: refs/heads/master da68537ae -> 305ffcb04 HBASE-17938 General fault - tolerance framework for backup/restore operations (Vladimir Rodionov) Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/305ffcb0 Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/305ffcb0 Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/305ffcb0 Branch: refs/heads/master Commit: 305ffcb04025ea6f7880e9961120d309f55bf8ba Parents: da68537 Author: tedyuAuthored: Fri May 12 09:27:58 2017 -0700 Committer: tedyu Committed: Fri May 12 09:27:58 2017 -0700 -- .../hbase/backup/BackupClientFactory.java | 53 + .../hadoop/hbase/backup/BackupDriver.java | 2 + .../hbase/backup/BackupRestoreConstants.java| 2 - .../hbase/backup/impl/BackupAdminImpl.java | 14 +- .../hbase/backup/impl/BackupCommands.java | 125 ++- .../hadoop/hbase/backup/impl/BackupManager.java | 17 ++ .../hbase/backup/impl/BackupSystemTable.java| 56 - .../backup/impl/FullTableBackupClient.java | 9 +- .../impl/IncrementalTableBackupClient.java | 33 +-- .../hbase/backup/impl/TableBackupClient.java| 160 ++ .../backup/TestFullBackupWithFailures.java | 206 +++ 11 files changed, 566 insertions(+), 111 deletions(-) -- http://git-wip-us.apache.org/repos/asf/hbase/blob/305ffcb0/hbase-server/src/main/java/org/apache/hadoop/hbase/backup/BackupClientFactory.java -- diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/backup/BackupClientFactory.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/backup/BackupClientFactory.java new file mode 100644 index 000..21d73cc --- /dev/null +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/backup/BackupClientFactory.java @@ -0,0 +1,53 @@ +/** + * 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.backup; + +import java.io.IOException; + +import org.apache.hadoop.conf.Configuration; +import org.apache.hadoop.hbase.backup.impl.FullTableBackupClient; +import org.apache.hadoop.hbase.backup.impl.IncrementalTableBackupClient; +import org.apache.hadoop.hbase.backup.impl.TableBackupClient; +import org.apache.hadoop.hbase.client.Connection; + +public class BackupClientFactory { + + public static TableBackupClient create (Connection conn, String backupId, BackupRequest request) +throws IOException + { +Configuration conf = conn.getConfiguration(); +try { + String clsName = conf.get(TableBackupClient.BACKUP_CLIENT_IMPL_CLASS); + if (clsName != null) { +Class clientImpl = Class.forName(clsName); +TableBackupClient client = (TableBackupClient) clientImpl.newInstance(); +client.init(conn, backupId, request); +return client; + } +} catch (Exception e) { + throw new IOException(e); +} + +BackupType type = request.getBackupType(); +if (type == BackupType.FULL) { + return new FullTableBackupClient(conn, backupId, request); +} else { + return new IncrementalTableBackupClient(conn, backupId, request); +} + } +} http://git-wip-us.apache.org/repos/asf/hbase/blob/305ffcb0/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 5794fce..cc5cc95 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 @@ -134,6 +134,8 @@ public class BackupDriver extends AbstractHBaseTool { return -1; } throw e; +} finally { + command.finish(); } return 0; }
hbase git commit: HBASE-17786 Create LoadBalancer perf-test tool to benchmark Load Balancer algorithm performance
Repository: hbase Updated Branches: refs/heads/master b34ab5980 -> da68537ae HBASE-17786 Create LoadBalancer perf-test tool to benchmark Load Balancer algorithm performance Signed-off-by: Michael StackSigned-off-by: Sean Busbey Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/da68537a Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/da68537a Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/da68537a Branch: refs/heads/master Commit: da68537ae63ffbfc784de4dd6159d5d24f23f262 Parents: b34ab59 Author: Umesh Agashe Authored: Wed May 3 16:34:13 2017 -0700 Committer: Sean Busbey Committed: Fri May 12 11:22:15 2017 -0500 -- .../hadoop/hbase/master/LoadBalancer.java | 4 +- .../hbase/master/balancer/BaseLoadBalancer.java | 8 +- .../hbase/master/balancer/BalancerTestBase.java | 21 --- .../LoadBalancerPerformanceEvaluation.java | 180 +++ .../master/balancer/TestBaseLoadBalancer.java | 7 +- .../TestFavoredStochasticLoadBalancer.java | 1 - 6 files changed, 187 insertions(+), 34 deletions(-) -- http://git-wip-us.apache.org/repos/asf/hbase/blob/da68537a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/LoadBalancer.java -- diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/LoadBalancer.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/LoadBalancer.java index 01540b7..129fa7a 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/LoadBalancer.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/LoadBalancer.java @@ -44,7 +44,7 @@ import edu.umd.cs.findbugs.annotations.Nullable; * On cluster startup, bulk assignment can be used to determine * locations for all Regions in a cluster. * - * This classes produces plans for the + * This class produces plans for the * {@link org.apache.hadoop.hbase.master.AssignmentManager} * to execute. */ @@ -52,7 +52,7 @@ import edu.umd.cs.findbugs.annotations.Nullable; public interface LoadBalancer extends Configurable, Stoppable, ConfigurationObserver { // Used to signal to the caller that the region(s) cannot be assigned - static final ServerName BOGUS_SERVER_NAME = ServerName.valueOf("bogus.example.com,1,1"); + ServerName BOGUS_SERVER_NAME = ServerName.valueOf("bogus.example.com,1,1"); /** * Set the current cluster status. This allows a LoadBalancer to map host name to a server http://git-wip-us.apache.org/repos/asf/hbase/blob/da68537a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/balancer/BaseLoadBalancer.java -- diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/balancer/BaseLoadBalancer.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/balancer/BaseLoadBalancer.java index 196e693..6410375 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/balancer/BaseLoadBalancer.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/balancer/BaseLoadBalancer.java @@ -62,11 +62,9 @@ import com.google.common.collect.Lists; import com.google.common.collect.Sets; /** - * The base class for load balancers. It provides the the functions used to by - * {@link org.apache.hadoop.hbase.master.AssignmentManager} to assign regions - * in the edge cases. It doesn't provide an implementation of the - * actual balancing algorithm. - * + * The base class for load balancers. It provides functions used by + * {@link org.apache.hadoop.hbase.master.AssignmentManager} to assign regions in the edge cases. + * It doesn't provide an implementation of the actual balancing algorithm. */ public abstract class BaseLoadBalancer implements LoadBalancer { protected static final int MIN_SERVER_BALANCE = 2; http://git-wip-us.apache.org/repos/asf/hbase/blob/da68537a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/balancer/BalancerTestBase.java -- diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/balancer/BalancerTestBase.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/balancer/BalancerTestBase.java index f93449c..de4a250 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/balancer/BalancerTestBase.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/balancer/BalancerTestBase.java @@ -21,7 +21,6 @@ import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNull; import static org.junit.Assert.assertTrue; -import java.io.IOException; import
[13/51] [partial] hbase-site git commit: Published site at 82d554e3783372cc6b05489452c815b57c06f6cd.
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/709b8fcc/devapidocs/src-html/org/apache/hadoop/hbase/client/HBaseAdmin.RestoreSnapshotFuture.html -- diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/client/HBaseAdmin.RestoreSnapshotFuture.html b/devapidocs/src-html/org/apache/hadoop/hbase/client/HBaseAdmin.RestoreSnapshotFuture.html index f2c44db..6cf2fc8 100644 --- a/devapidocs/src-html/org/apache/hadoop/hbase/client/HBaseAdmin.RestoreSnapshotFuture.html +++ b/devapidocs/src-html/org/apache/hadoop/hbase/client/HBaseAdmin.RestoreSnapshotFuture.html @@ -2581,7 +2581,7 @@ 2573try { 2574 // Restore snapshot 2575 get( -2576 internalRestoreSnapshotAsync(snapshotName, tableName, false), +2576 internalRestoreSnapshotAsync(snapshotName, tableName), 2577syncWaitTimeout, 2578TimeUnit.MILLISECONDS); 2579} catch (IOException e) { @@ -2590,7 +2590,7 @@ 2582 if (takeFailSafeSnapshot) { 2583try { 2584 get( -2585 internalRestoreSnapshotAsync(failSafeSnapshotSnapshotName, tableName, false), +2585 internalRestoreSnapshotAsync(failSafeSnapshotSnapshotName, tableName), 2586syncWaitTimeout, 2587TimeUnit.MILLISECONDS); 2588 String msg = "Restore snapshot=" + snapshotName + @@ -2633,7 +2633,7 @@ 2625 throw new TableNotDisabledException(tableName); 2626} 2627 -2628return internalRestoreSnapshotAsync(snapshotName, tableName, false); +2628return internalRestoreSnapshotAsync(snapshotName, tableName); 2629 } 2630 2631 @Override @@ -2643,1621 +2643,1614 @@ 2635 } 2636 2637 @Override -2638 public void cloneSnapshot(String snapshotName, TableName tableName, boolean restoreAcl) +2638 public void cloneSnapshot(final String snapshotName, final TableName tableName) 2639 throws IOException, TableExistsException, RestoreSnapshotException { 2640if (tableExists(tableName)) { 2641 throw new TableExistsException(tableName); 2642} 2643get( -2644 internalRestoreSnapshotAsync(snapshotName, tableName, restoreAcl), +2644 internalRestoreSnapshotAsync(snapshotName, tableName), 2645 Integer.MAX_VALUE, 2646 TimeUnit.MILLISECONDS); 2647 } 2648 2649 @Override -2650 public void cloneSnapshot(final String snapshotName, final TableName tableName) -2651 throws IOException, TableExistsException, RestoreSnapshotException { -2652cloneSnapshot(snapshotName, tableName, false); -2653 } -2654 -2655 @Override -2656 public FutureVoid cloneSnapshotAsync(final String snapshotName, final TableName tableName) -2657 throws IOException, TableExistsException { -2658if (tableExists(tableName)) { -2659 throw new TableExistsException(tableName); -2660} -2661return internalRestoreSnapshotAsync(snapshotName, tableName, false); -2662 } -2663 -2664 @Override -2665 public byte[] execProcedureWithRet(String signature, String instance, MapString, String props) -2666 throws IOException { -2667ProcedureDescription desc = ProtobufUtil.buildProcedureDescription(signature, instance, props); -2668final ExecProcedureRequest request = -2669 ExecProcedureRequest.newBuilder().setProcedure(desc).build(); -2670// run the procedure on the master -2671ExecProcedureResponse response = executeCallable( -2672 new MasterCallableExecProcedureResponse(getConnection(), getRpcControllerFactory()) { -2673@Override -2674protected ExecProcedureResponse rpcCall() throws Exception { -2675 return master.execProcedureWithRet(getRpcController(), request); -2676} -2677 }); -2678 -2679return response.hasReturnData() ? response.getReturnData().toByteArray() : null; -2680 } -2681 -2682 @Override -2683 public void execProcedure(String signature, String instance, MapString, String props) -2684 throws IOException { -2685ProcedureDescription desc = ProtobufUtil.buildProcedureDescription(signature, instance, props); -2686final ExecProcedureRequest request = -2687 ExecProcedureRequest.newBuilder().setProcedure(desc).build(); -2688// run the procedure on the master -2689ExecProcedureResponse response = executeCallable(new MasterCallableExecProcedureResponse( -2690getConnection(), getRpcControllerFactory()) { -2691 @Override -2692 protected ExecProcedureResponse rpcCall() throws Exception { -2693return master.execProcedure(getRpcController(), request); -2694 } -2695}); -2696 -2697long start = EnvironmentEdgeManager.currentTime(); -2698long max = response.getExpectedTimeout(); -2699long maxPauseTime = max / this.numRetries; -2700int tries = 0; -2701LOG.debug("Waiting a max of " + max + " ms for procedure '" + -2702signature + " : " + instance + "'' to complete. (max " +
[09/51] [partial] hbase-site git commit: Published site at 82d554e3783372cc6b05489452c815b57c06f6cd.
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/709b8fcc/devapidocs/src-html/org/apache/hadoop/hbase/client/HBaseAdmin.TruncateTableFuture.html -- diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/client/HBaseAdmin.TruncateTableFuture.html b/devapidocs/src-html/org/apache/hadoop/hbase/client/HBaseAdmin.TruncateTableFuture.html index f2c44db..6cf2fc8 100644 --- a/devapidocs/src-html/org/apache/hadoop/hbase/client/HBaseAdmin.TruncateTableFuture.html +++ b/devapidocs/src-html/org/apache/hadoop/hbase/client/HBaseAdmin.TruncateTableFuture.html @@ -2581,7 +2581,7 @@ 2573try { 2574 // Restore snapshot 2575 get( -2576 internalRestoreSnapshotAsync(snapshotName, tableName, false), +2576 internalRestoreSnapshotAsync(snapshotName, tableName), 2577syncWaitTimeout, 2578TimeUnit.MILLISECONDS); 2579} catch (IOException e) { @@ -2590,7 +2590,7 @@ 2582 if (takeFailSafeSnapshot) { 2583try { 2584 get( -2585 internalRestoreSnapshotAsync(failSafeSnapshotSnapshotName, tableName, false), +2585 internalRestoreSnapshotAsync(failSafeSnapshotSnapshotName, tableName), 2586syncWaitTimeout, 2587TimeUnit.MILLISECONDS); 2588 String msg = "Restore snapshot=" + snapshotName + @@ -2633,7 +2633,7 @@ 2625 throw new TableNotDisabledException(tableName); 2626} 2627 -2628return internalRestoreSnapshotAsync(snapshotName, tableName, false); +2628return internalRestoreSnapshotAsync(snapshotName, tableName); 2629 } 2630 2631 @Override @@ -2643,1621 +2643,1614 @@ 2635 } 2636 2637 @Override -2638 public void cloneSnapshot(String snapshotName, TableName tableName, boolean restoreAcl) +2638 public void cloneSnapshot(final String snapshotName, final TableName tableName) 2639 throws IOException, TableExistsException, RestoreSnapshotException { 2640if (tableExists(tableName)) { 2641 throw new TableExistsException(tableName); 2642} 2643get( -2644 internalRestoreSnapshotAsync(snapshotName, tableName, restoreAcl), +2644 internalRestoreSnapshotAsync(snapshotName, tableName), 2645 Integer.MAX_VALUE, 2646 TimeUnit.MILLISECONDS); 2647 } 2648 2649 @Override -2650 public void cloneSnapshot(final String snapshotName, final TableName tableName) -2651 throws IOException, TableExistsException, RestoreSnapshotException { -2652cloneSnapshot(snapshotName, tableName, false); -2653 } -2654 -2655 @Override -2656 public FutureVoid cloneSnapshotAsync(final String snapshotName, final TableName tableName) -2657 throws IOException, TableExistsException { -2658if (tableExists(tableName)) { -2659 throw new TableExistsException(tableName); -2660} -2661return internalRestoreSnapshotAsync(snapshotName, tableName, false); -2662 } -2663 -2664 @Override -2665 public byte[] execProcedureWithRet(String signature, String instance, MapString, String props) -2666 throws IOException { -2667ProcedureDescription desc = ProtobufUtil.buildProcedureDescription(signature, instance, props); -2668final ExecProcedureRequest request = -2669 ExecProcedureRequest.newBuilder().setProcedure(desc).build(); -2670// run the procedure on the master -2671ExecProcedureResponse response = executeCallable( -2672 new MasterCallableExecProcedureResponse(getConnection(), getRpcControllerFactory()) { -2673@Override -2674protected ExecProcedureResponse rpcCall() throws Exception { -2675 return master.execProcedureWithRet(getRpcController(), request); -2676} -2677 }); -2678 -2679return response.hasReturnData() ? response.getReturnData().toByteArray() : null; -2680 } -2681 -2682 @Override -2683 public void execProcedure(String signature, String instance, MapString, String props) -2684 throws IOException { -2685ProcedureDescription desc = ProtobufUtil.buildProcedureDescription(signature, instance, props); -2686final ExecProcedureRequest request = -2687 ExecProcedureRequest.newBuilder().setProcedure(desc).build(); -2688// run the procedure on the master -2689ExecProcedureResponse response = executeCallable(new MasterCallableExecProcedureResponse( -2690getConnection(), getRpcControllerFactory()) { -2691 @Override -2692 protected ExecProcedureResponse rpcCall() throws Exception { -2693return master.execProcedure(getRpcController(), request); -2694 } -2695}); -2696 -2697long start = EnvironmentEdgeManager.currentTime(); -2698long max = response.getExpectedTimeout(); -2699long maxPauseTime = max / this.numRetries; -2700int tries = 0; -2701LOG.debug("Waiting a max of " + max + " ms for procedure '" + -2702signature + " : " + instance + "'' to complete. (max " + maxPauseTime + "
[31/51] [partial] hbase-site git commit: Published site at 82d554e3783372cc6b05489452c815b57c06f6cd.
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/709b8fcc/devapidocs/org/apache/hadoop/hbase/security/access/UserPermission.html -- diff --git a/devapidocs/org/apache/hadoop/hbase/security/access/UserPermission.html b/devapidocs/org/apache/hadoop/hbase/security/access/UserPermission.html index df15fe9..7fadd12 100644 --- a/devapidocs/org/apache/hadoop/hbase/security/access/UserPermission.html +++ b/devapidocs/org/apache/hadoop/hbase/security/access/UserPermission.html @@ -314,7 +314,7 @@ extends TablePermission -getFamily, getNamespace, getQualifier, getTableName, hasFamily, hasNamespace, hasQualifier, hasTable, implies, implies, implies, matchesFamily, matchesFamilyQualifier, setTableName, tableFieldsEqual +getFamily, getNamespace, getQualifier, getTableName, hasFamily, hasNamespace, hasQualifier, hasTable, implies, implies, implies, matchesFamily, matchesFamilyQualifier, tableFieldsEqual http://git-wip-us.apache.org/repos/asf/hbase-site/blob/709b8fcc/devapidocs/org/apache/hadoop/hbase/security/access/class-use/TablePermission.html -- diff --git a/devapidocs/org/apache/hadoop/hbase/security/access/class-use/TablePermission.html b/devapidocs/org/apache/hadoop/hbase/security/access/class-use/TablePermission.html index bc6b3b2..7a2e1a0 100644 --- a/devapidocs/org/apache/hadoop/hbase/security/access/class-use/TablePermission.html +++ b/devapidocs/org/apache/hadoop/hbase/security/access/class-use/TablePermission.html @@ -169,7 +169,7 @@ -static com.google.common.collect.ListMultimaphttp://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true; title="class or interface in java.lang">String,TablePermission +(package private) static com.google.common.collect.ListMultimaphttp://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true; title="class or interface in java.lang">String,TablePermission AccessControlLists.getTablePermissions(org.apache.hadoop.conf.Configurationconf, TableNametableName) http://git-wip-us.apache.org/repos/asf/hbase-site/blob/709b8fcc/devapidocs/org/apache/hadoop/hbase/security/access/package-tree.html -- diff --git a/devapidocs/org/apache/hadoop/hbase/security/access/package-tree.html b/devapidocs/org/apache/hadoop/hbase/security/access/package-tree.html index f7d6190..518b62c 100644 --- a/devapidocs/org/apache/hadoop/hbase/security/access/package-tree.html +++ b/devapidocs/org/apache/hadoop/hbase/security/access/package-tree.html @@ -136,8 +136,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.security.access.AccessControlFilter.Strategy -org.apache.hadoop.hbase.security.access.Permission.Action org.apache.hadoop.hbase.security.access.AccessController.OpType +org.apache.hadoop.hbase.security.access.Permission.Action http://git-wip-us.apache.org/repos/asf/hbase-site/blob/709b8fcc/devapidocs/org/apache/hadoop/hbase/security/package-tree.html -- diff --git a/devapidocs/org/apache/hadoop/hbase/security/package-tree.html b/devapidocs/org/apache/hadoop/hbase/security/package-tree.html index e40986a..59a46a4 100644 --- a/devapidocs/org/apache/hadoop/hbase/security/package-tree.html +++ b/devapidocs/org/apache/hadoop/hbase/security/package-tree.html @@ -191,8 +191,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.security.SaslUtil.QualityOfProtection org.apache.hadoop.hbase.security.AuthMethod +org.apache.hadoop.hbase.security.SaslUtil.QualityOfProtection org.apache.hadoop.hbase.security.SaslStatus http://git-wip-us.apache.org/repos/asf/hbase-site/blob/709b8fcc/devapidocs/org/apache/hadoop/hbase/snapshot/SnapshotDescriptionUtils.CompletedSnaphotDirectoriesFilter.html -- diff --git a/devapidocs/org/apache/hadoop/hbase/snapshot/SnapshotDescriptionUtils.CompletedSnaphotDirectoriesFilter.html
[02/51] [partial] hbase-site git commit: Published site at 82d554e3783372cc6b05489452c815b57c06f6cd.
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/709b8fcc/devapidocs/src-html/org/apache/hadoop/hbase/master/MasterRpcServices.BalanceSwitchMode.html -- diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/master/MasterRpcServices.BalanceSwitchMode.html b/devapidocs/src-html/org/apache/hadoop/hbase/master/MasterRpcServices.BalanceSwitchMode.html index d4b753c..b7ad62a 100644 --- a/devapidocs/src-html/org/apache/hadoop/hbase/master/MasterRpcServices.BalanceSwitchMode.html +++ b/devapidocs/src-html/org/apache/hadoop/hbase/master/MasterRpcServices.BalanceSwitchMode.html @@ -1229,8 +1229,8 @@ 1221 public RestoreSnapshotResponse restoreSnapshot(RpcController controller, 1222 RestoreSnapshotRequest request) throws ServiceException { 1223try { -1224 long procId = master.restoreSnapshot(request.getSnapshot(), request.getNonceGroup(), -1225request.getNonce(), request.getRestoreACL()); +1224 long procId = master.restoreSnapshot(request.getSnapshot(), +1225 request.getNonceGroup(), request.getNonce()); 1226 return RestoreSnapshotResponse.newBuilder().setProcId(procId).build(); 1227} catch (ForeignException e) { 1228 throw new ServiceException(e.getCause()); http://git-wip-us.apache.org/repos/asf/hbase-site/blob/709b8fcc/devapidocs/src-html/org/apache/hadoop/hbase/master/MasterRpcServices.html -- diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/master/MasterRpcServices.html b/devapidocs/src-html/org/apache/hadoop/hbase/master/MasterRpcServices.html index d4b753c..b7ad62a 100644 --- a/devapidocs/src-html/org/apache/hadoop/hbase/master/MasterRpcServices.html +++ b/devapidocs/src-html/org/apache/hadoop/hbase/master/MasterRpcServices.html @@ -1229,8 +1229,8 @@ 1221 public RestoreSnapshotResponse restoreSnapshot(RpcController controller, 1222 RestoreSnapshotRequest request) throws ServiceException { 1223try { -1224 long procId = master.restoreSnapshot(request.getSnapshot(), request.getNonceGroup(), -1225request.getNonce(), request.getRestoreACL()); +1224 long procId = master.restoreSnapshot(request.getSnapshot(), +1225 request.getNonceGroup(), request.getNonce()); 1226 return RestoreSnapshotResponse.newBuilder().setProcId(procId).build(); 1227} catch (ForeignException e) { 1228 throw new ServiceException(e.getCause()); http://git-wip-us.apache.org/repos/asf/hbase-site/blob/709b8fcc/devapidocs/src-html/org/apache/hadoop/hbase/master/procedure/CloneSnapshotProcedure.html -- diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/master/procedure/CloneSnapshotProcedure.html b/devapidocs/src-html/org/apache/hadoop/hbase/master/procedure/CloneSnapshotProcedure.html index c2a995c..2277513 100644 --- a/devapidocs/src-html/org/apache/hadoop/hbase/master/procedure/CloneSnapshotProcedure.html +++ b/devapidocs/src-html/org/apache/hadoop/hbase/master/procedure/CloneSnapshotProcedure.html @@ -77,412 +77,393 @@ 069 070 private HTableDescriptor hTableDescriptor; 071 private SnapshotDescription snapshot; -072 private boolean restoreAcl; -073 private ListHRegionInfo newRegions = null; -074 private MapString, PairString, String parentsToChildrenPairMap = new HashMap(); -075 -076 // Monitor -077 private MonitoredTask monitorStatus = null; -078 -079 private Boolean traceEnabled = null; -080 -081 /** -082 * Constructor (for failover) -083 */ -084 public CloneSnapshotProcedure() { -085 } -086 -087 public CloneSnapshotProcedure(final MasterProcedureEnv env, -088 final HTableDescriptor hTableDescriptor, final SnapshotDescription snapshot) { -089this(env, hTableDescriptor, snapshot, false); -090 } -091 -092 /** -093 * Constructor -094 * @param env MasterProcedureEnv -095 * @param hTableDescriptor the table to operate on -096 * @param snapshot snapshot to clone from -097 */ -098 public CloneSnapshotProcedure(final MasterProcedureEnv env, -099 final HTableDescriptor hTableDescriptor, final SnapshotDescription snapshot, -100 final boolean restoreAcl) { -101super(env); -102this.hTableDescriptor = hTableDescriptor; -103this.snapshot = snapshot; -104this.restoreAcl = restoreAcl; -105 -106getMonitorStatus(); -107 } -108 -109 /** -110 * Set up monitor status if it is not created. -111 */ -112 private MonitoredTask getMonitorStatus() { -113if (monitorStatus == null) { -114 monitorStatus = TaskMonitor.get().createStatus("Cloning snapshot '" + snapshot.getName() + -115"' to table " + getTableName()); -116} -117return monitorStatus; -118 } -119 -120 private void restoreSnapshotAcl(MasterProcedureEnv env) throws IOException { -121Configuration conf =
[38/51] [partial] hbase-site git commit: Published site at 82d554e3783372cc6b05489452c815b57c06f6cd.
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/709b8fcc/devapidocs/org/apache/hadoop/hbase/master/procedure/class-use/MasterProcedureEnv.html -- diff --git a/devapidocs/org/apache/hadoop/hbase/master/procedure/class-use/MasterProcedureEnv.html b/devapidocs/org/apache/hadoop/hbase/master/procedure/class-use/MasterProcedureEnv.html index 102df7d..9612340 100644 --- a/devapidocs/org/apache/hadoop/hbase/master/procedure/class-use/MasterProcedureEnv.html +++ b/devapidocs/org/apache/hadoop/hbase/master/procedure/class-use/MasterProcedureEnv.html @@ -1192,302 +1192,298 @@ private void -CloneSnapshotProcedure.restoreSnapshotAcl(MasterProcedureEnvenv) - - -private void ModifyColumnFamilyProcedure.restoreTableDescriptor(MasterProcedureEnvenv) Restore back to the old descriptor - + private void AddColumnFamilyProcedure.restoreTableDescriptor(MasterProcedureEnvenv) Restore the table descriptor back to pre-add - + private void ModifyTableProcedure.restoreTableDescriptor(MasterProcedureEnvenv) Undo the descriptor change (for rollback) - + private void DeleteColumnFamilyProcedure.restoreTableDescriptor(MasterProcedureEnvenv) Restore back to the old descriptor - + private void MergeTableRegionsProcedure.rollbackCloseRegionsForMerge(MasterProcedureEnvenv) Rollback close regions - + private void DeleteNamespaceProcedure.rollbackDeleteDirectory(MasterProcedureEnvenv) undo delete directory - + private void CreateNamespaceProcedure.rollbackSetNamespaceQuota(MasterProcedureEnvenv) remove quota for the namespace if exists - + protected void AddColumnFamilyProcedure.rollbackState(MasterProcedureEnvenv, org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProcedureProtos.AddColumnFamilyStatestate) - + protected void CloneSnapshotProcedure.rollbackState(MasterProcedureEnvenv, org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProcedureProtos.CloneSnapshotStatestate) - + protected void CreateNamespaceProcedure.rollbackState(MasterProcedureEnvenv, org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProcedureProtos.CreateNamespaceStatestate) - + protected void CreateTableProcedure.rollbackState(MasterProcedureEnvenv, org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProcedureProtos.CreateTableStatestate) - + protected void DeleteColumnFamilyProcedure.rollbackState(MasterProcedureEnvenv, org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProcedureProtos.DeleteColumnFamilyStatestate) - + protected void DeleteNamespaceProcedure.rollbackState(MasterProcedureEnvenv, org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProcedureProtos.DeleteNamespaceStatestate) - + protected void DeleteTableProcedure.rollbackState(MasterProcedureEnvenv, org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProcedureProtos.DeleteTableStatestate) - + protected void DisableTableProcedure.rollbackState(MasterProcedureEnvenv, org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProcedureProtos.DisableTableStatestate) - + protected void EnableTableProcedure.rollbackState(MasterProcedureEnvenv, org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProcedureProtos.EnableTableStatestate) - + protected void MergeTableRegionsProcedure.rollbackState(MasterProcedureEnvenv, org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProcedureProtos.MergeTableRegionsStatestate) - + protected void ModifyColumnFamilyProcedure.rollbackState(MasterProcedureEnvenv, org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProcedureProtos.ModifyColumnFamilyStatestate) - + protected void ModifyNamespaceProcedure.rollbackState(MasterProcedureEnvenv, org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProcedureProtos.ModifyNamespaceStatestate) - + protected void ModifyTableProcedure.rollbackState(MasterProcedureEnvenv, org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProcedureProtos.ModifyTableStatestate) - + protected void RestoreSnapshotProcedure.rollbackState(MasterProcedureEnvenv, org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProcedureProtos.RestoreSnapshotStatestate) - + protected void ServerCrashProcedure.rollbackState(MasterProcedureEnvenv, org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProcedureProtos.ServerCrashStatestate) - + protected void SplitTableRegionProcedure.rollbackState(MasterProcedureEnvenv, org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProcedureProtos.SplitTableRegionStatestate) - + protected void TruncateTableProcedure.rollbackState(MasterProcedureEnvenv,
[32/51] [partial] hbase-site git commit: Published site at 82d554e3783372cc6b05489452c815b57c06f6cd.
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/709b8fcc/devapidocs/org/apache/hadoop/hbase/regionserver/class-use/KeyValueScanner.html -- diff --git a/devapidocs/org/apache/hadoop/hbase/regionserver/class-use/KeyValueScanner.html b/devapidocs/org/apache/hadoop/hbase/regionserver/class-use/KeyValueScanner.html index 7a417ea..d8d95f6 100644 --- a/devapidocs/org/apache/hadoop/hbase/regionserver/class-use/KeyValueScanner.html +++ b/devapidocs/org/apache/hadoop/hbase/regionserver/class-use/KeyValueScanner.html @@ -438,13 +438,17 @@ private http://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true; title="class or interface in java.util">ListKeyValueScanner -MemStoreSnapshot.scanners +StoreScanner.memStoreScannersAfterFlush +private http://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true; title="class or interface in java.util">ListKeyValueScanner +MemStoreSnapshot.scanners + + (package private) http://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true; title="class or interface in java.util">ListKeyValueScanner MemStoreMergerSegmentsIterator.scanners - + protected http://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true; title="class or interface in java.util">ListKeyValueScanner KeyValueHeap.scannersForDelayedClose @@ -545,20 +549,24 @@ +protected http://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true; title="class or interface in java.util">ListKeyValueScanner +CompactingMemStore.createList(intcapacity) + + (package private) http://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true; title="class or interface in java.util">ListKeyValueScanner StoreScanner.getAllScannersForTesting() Used in testing. - + http://docs.oracle.com/javase/8/docs/api/java/util/PriorityQueue.html?is-external=true; title="class or interface in java.util">PriorityQueueKeyValueScanner KeyValueHeap.getHeap() - + http://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true; title="class or interface in java.util">ListKeyValueScanner MemStoreSnapshot.getScanners() - + default http://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true; title="class or interface in java.util">ListKeyValueScanner Store.getScanners(booleancacheBlocks, booleanisGet, @@ -571,7 +579,7 @@ Get all scanners with no filtering based on TTL (that happens further down the line). - + http://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true; title="class or interface in java.util">ListKeyValueScanner Store.getScanners(booleancacheBlocks, booleanusePread, @@ -585,7 +593,7 @@ Get all scanners with no filtering based on TTL (that happens further down the line). - + http://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true; title="class or interface in java.util">ListKeyValueScanner HStore.getScanners(booleancacheBlocks, booleanusePread, @@ -599,7 +607,7 @@ Get all scanners with no filtering based on TTL (that happens further down the line). - + default http://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true; title="class or interface in java.util">ListKeyValueScanner Store.getScanners(http://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true; title="class or interface in java.util">ListStoreFilefiles, booleancacheBlocks, @@ -615,7 +623,7 @@ (that happens further down the line). - + http://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true; title="class or interface in java.util">ListKeyValueScanner Store.getScanners(http://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true; title="class or interface in java.util">ListStoreFilefiles, booleancacheBlocks, @@ -632,7 +640,7 @@ (that happens further down the line). - + http://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true; title="class or interface in java.util">ListKeyValueScanner HStore.getScanners(http://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true; title="class or interface in java.util">ListStoreFilefiles, booleancacheBlocks, @@ -646,35 +654,35 @@ longreadPt, booleanincludeMemstoreScanner) - + http://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true; title="class or interface in java.util">ListKeyValueScanner MemStore.getScanners(longreadPt) - + http://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true; title="class or interface in java.util">ListKeyValueScanner CompactingMemStore.getScanners(longreadPt) - + http://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true; title="class or interface in java.util">ListKeyValueScanner
[40/51] [partial] hbase-site git commit: Published site at 82d554e3783372cc6b05489452c815b57c06f6cd.
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/709b8fcc/devapidocs/org/apache/hadoop/hbase/master/HMaster.html -- diff --git a/devapidocs/org/apache/hadoop/hbase/master/HMaster.html b/devapidocs/org/apache/hadoop/hbase/master/HMaster.html index 991126f..8967608 100644 --- a/devapidocs/org/apache/hadoop/hbase/master/HMaster.html +++ b/devapidocs/org/apache/hadoop/hbase/master/HMaster.html @@ -1204,10 +1204,9 @@ implements long -restoreSnapshot(org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos.SnapshotDescriptionsnapshotDesc, +restoreSnapshot(org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos.SnapshotDescriptionsnapshotDesc, longnonceGroup, - longnonce, - booleanrestoreAcl) + longnonce) private void @@ -3076,7 +3075,7 @@ implements + @@ -3084,8 +3083,7 @@ implements restoreSnapshot(org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos.SnapshotDescriptionsnapshotDesc, longnonceGroup, -longnonce, -booleanrestoreAcl) +longnonce) throws http://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true; title="class or interface in java.io">IOException Throws: @@ -3099,7 +3097,7 @@ implements checkTableModifiable -publicvoidcheckTableModifiable(TableNametableName) +publicvoidcheckTableModifiable(TableNametableName) throws http://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true; title="class or interface in java.io">IOException, TableNotFoundException, TableNotDisabledException @@ -3123,7 +3121,7 @@ implements getClusterStatus -publicClusterStatusgetClusterStatus() +publicClusterStatusgetClusterStatus() throws http://docs.oracle.com/javase/8/docs/api/java/io/InterruptedIOException.html?is-external=true; title="class or interface in java.io">InterruptedIOException Returns: @@ -3139,7 +3137,7 @@ implements getLoadedCoprocessors -public statichttp://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true; title="class or interface in java.lang">StringgetLoadedCoprocessors() +public statichttp://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true; title="class or interface in java.lang">StringgetLoadedCoprocessors() The set of loaded coprocessors is stored in a static set. Since it's statically allocated, it does not require that HMaster's cpHost be initialized prior to accessing it. @@ -3155,7 +3153,7 @@ implements getMasterStartTime -publiclonggetMasterStartTime() +publiclonggetMasterStartTime() Returns: timestamp in millis when HMaster was started. @@ -3168,7 +3166,7 @@ implements getMasterActiveTime -publiclonggetMasterActiveTime() +publiclonggetMasterActiveTime() Returns: timestamp in millis when HMaster became the active master. @@ -3181,7 +3179,7 @@ implements getNumWALFiles -publicintgetNumWALFiles() +publicintgetNumWALFiles() @@ -3190,7 +3188,7 @@ implements getWalProcedureStore -publicWALProcedureStoregetWalProcedureStore() +publicWALProcedureStoregetWalProcedureStore() @@ -3199,7 +3197,7 @@ implements getRegionServerInfoPort -publicintgetRegionServerInfoPort(ServerNamesn) +publicintgetRegionServerInfoPort(ServerNamesn) @@ -3208,7 +3206,7 @@ implements getRegionServerVersion -publichttp://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true; title="class or interface in java.lang">StringgetRegionServerVersion(ServerNamesn) +publichttp://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true; title="class or interface in java.lang">StringgetRegionServerVersion(ServerNamesn) @@ -3217,7 +3215,7 @@ implements getMasterCoprocessors -publichttp://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true; title="class or interface in java.lang">String[]getMasterCoprocessors() +publichttp://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true; title="class or interface in java.lang">String[]getMasterCoprocessors() Returns: array of coprocessor SimpleNames. @@ -3230,7 +3228,7 @@ implements abort -publicvoidabort(http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true; title="class or interface in java.lang">Stringmsg, +publicvoidabort(http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true; title="class or interface in java.lang">Stringmsg, http://docs.oracle.com/javase/8/docs/api/java/lang/Throwable.html?is-external=true; title="class or interface in java.lang">Throwablet) Description copied from class:HRegionServer Cause the server to exit without closing
[11/51] [partial] hbase-site git commit: Published site at 82d554e3783372cc6b05489452c815b57c06f6cd.
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/709b8fcc/devapidocs/src-html/org/apache/hadoop/hbase/client/HBaseAdmin.TableFuture.html -- diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/client/HBaseAdmin.TableFuture.html b/devapidocs/src-html/org/apache/hadoop/hbase/client/HBaseAdmin.TableFuture.html index f2c44db..6cf2fc8 100644 --- a/devapidocs/src-html/org/apache/hadoop/hbase/client/HBaseAdmin.TableFuture.html +++ b/devapidocs/src-html/org/apache/hadoop/hbase/client/HBaseAdmin.TableFuture.html @@ -2581,7 +2581,7 @@ 2573try { 2574 // Restore snapshot 2575 get( -2576 internalRestoreSnapshotAsync(snapshotName, tableName, false), +2576 internalRestoreSnapshotAsync(snapshotName, tableName), 2577syncWaitTimeout, 2578TimeUnit.MILLISECONDS); 2579} catch (IOException e) { @@ -2590,7 +2590,7 @@ 2582 if (takeFailSafeSnapshot) { 2583try { 2584 get( -2585 internalRestoreSnapshotAsync(failSafeSnapshotSnapshotName, tableName, false), +2585 internalRestoreSnapshotAsync(failSafeSnapshotSnapshotName, tableName), 2586syncWaitTimeout, 2587TimeUnit.MILLISECONDS); 2588 String msg = "Restore snapshot=" + snapshotName + @@ -2633,7 +2633,7 @@ 2625 throw new TableNotDisabledException(tableName); 2626} 2627 -2628return internalRestoreSnapshotAsync(snapshotName, tableName, false); +2628return internalRestoreSnapshotAsync(snapshotName, tableName); 2629 } 2630 2631 @Override @@ -2643,1621 +2643,1614 @@ 2635 } 2636 2637 @Override -2638 public void cloneSnapshot(String snapshotName, TableName tableName, boolean restoreAcl) +2638 public void cloneSnapshot(final String snapshotName, final TableName tableName) 2639 throws IOException, TableExistsException, RestoreSnapshotException { 2640if (tableExists(tableName)) { 2641 throw new TableExistsException(tableName); 2642} 2643get( -2644 internalRestoreSnapshotAsync(snapshotName, tableName, restoreAcl), +2644 internalRestoreSnapshotAsync(snapshotName, tableName), 2645 Integer.MAX_VALUE, 2646 TimeUnit.MILLISECONDS); 2647 } 2648 2649 @Override -2650 public void cloneSnapshot(final String snapshotName, final TableName tableName) -2651 throws IOException, TableExistsException, RestoreSnapshotException { -2652cloneSnapshot(snapshotName, tableName, false); -2653 } -2654 -2655 @Override -2656 public FutureVoid cloneSnapshotAsync(final String snapshotName, final TableName tableName) -2657 throws IOException, TableExistsException { -2658if (tableExists(tableName)) { -2659 throw new TableExistsException(tableName); -2660} -2661return internalRestoreSnapshotAsync(snapshotName, tableName, false); -2662 } -2663 -2664 @Override -2665 public byte[] execProcedureWithRet(String signature, String instance, MapString, String props) -2666 throws IOException { -2667ProcedureDescription desc = ProtobufUtil.buildProcedureDescription(signature, instance, props); -2668final ExecProcedureRequest request = -2669 ExecProcedureRequest.newBuilder().setProcedure(desc).build(); -2670// run the procedure on the master -2671ExecProcedureResponse response = executeCallable( -2672 new MasterCallableExecProcedureResponse(getConnection(), getRpcControllerFactory()) { -2673@Override -2674protected ExecProcedureResponse rpcCall() throws Exception { -2675 return master.execProcedureWithRet(getRpcController(), request); -2676} -2677 }); -2678 -2679return response.hasReturnData() ? response.getReturnData().toByteArray() : null; -2680 } -2681 -2682 @Override -2683 public void execProcedure(String signature, String instance, MapString, String props) -2684 throws IOException { -2685ProcedureDescription desc = ProtobufUtil.buildProcedureDescription(signature, instance, props); -2686final ExecProcedureRequest request = -2687 ExecProcedureRequest.newBuilder().setProcedure(desc).build(); -2688// run the procedure on the master -2689ExecProcedureResponse response = executeCallable(new MasterCallableExecProcedureResponse( -2690getConnection(), getRpcControllerFactory()) { -2691 @Override -2692 protected ExecProcedureResponse rpcCall() throws Exception { -2693return master.execProcedure(getRpcController(), request); -2694 } -2695}); -2696 -2697long start = EnvironmentEdgeManager.currentTime(); -2698long max = response.getExpectedTimeout(); -2699long maxPauseTime = max / this.numRetries; -2700int tries = 0; -2701LOG.debug("Waiting a max of " + max + " ms for procedure '" + -2702signature + " : " + instance + "'' to complete. (max " + maxPauseTime + " ms per retry)"); -2703boolean done
[44/51] [partial] hbase-site git commit: Published site at 82d554e3783372cc6b05489452c815b57c06f6cd.
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/709b8fcc/devapidocs/org/apache/hadoop/hbase/client/Admin.html -- diff --git a/devapidocs/org/apache/hadoop/hbase/client/Admin.html b/devapidocs/org/apache/hadoop/hbase/client/Admin.html index 1088dec..cfe06f0 100644 --- a/devapidocs/org/apache/hadoop/hbase/client/Admin.html +++ b/devapidocs/org/apache/hadoop/hbase/client/Admin.html @@ -18,7 +18,7 @@ catch(err) { } //--> -var methods = {"i0":6,"i1":6,"i2":6,"i3":38,"i4":6,"i5":6,"i6":18,"i7":18,"i8":6,"i9":6,"i10":6,"i11":6,"i12":6,"i13":6,"i14":6,"i15":6,"i16":6,"i17":6,"i18":6,"i19":6,"i20":6,"i21":6,"i22":6,"i23":6,"i24":6,"i25":6,"i26":6,"i27":6,"i28":6,"i29":6,"i30":6,"i31":6,"i32":6,"i33":6,"i34":6,"i35":6,"i36":38,"i37":6,"i38":6,"i39":6,"i40":6,"i41":6,"i42":6,"i43":6,"i44":6,"i45":6,"i46":6,"i47":6,"i48":6,"i49":6,"i50":6,"i51":18,"i52":6,"i53":6,"i54":6,"i55":6,"i56":6,"i57":6,"i58":6,"i59":18,"i60":6,"i61":6,"i62":6,"i63":6,"i64":6,"i65":6,"i66":6,"i67":6,"i68":6,"i69":38,"i70":6,"i71":6,"i72":6,"i73":6,"i74":6,"i75":6,"i76":6,"i77":6,"i78":6,"i79":6,"i80":6,"i81":6,"i82":6,"i83":6,"i84":6,"i85":6,"i86":6,"i87":18,"i88":6,"i89":6,"i90":6,"i91":6,"i92":6,"i93":6,"i94":6,"i95":6,"i96":6,"i97":6,"i98":6,"i99":6,"i100":6,"i101":6,"i102":6,"i103":6,"i104":6,"i105":6,"i106":6,"i107":6,"i108":6,"i109":6,"i110":6,"i111":18,"i112":18,"i113":18,"i114":6,"i115":6,"i116":6,"i117":6,"i118":6,"i119":6," i120":6,"i121":6,"i122":6,"i123":6,"i124":6,"i125":6,"i126":6,"i127":6,"i128":6,"i129":6,"i130":6,"i131":6,"i132":6,"i133":6,"i134":6,"i135":6,"i136":6,"i137":38,"i138":6,"i139":6,"i140":38,"i141":6,"i142":6,"i143":6,"i144":6,"i145":6,"i146":6,"i147":6,"i148":6,"i149":6,"i150":6,"i151":18,"i152":18,"i153":6,"i154":6,"i155":6,"i156":6,"i157":6,"i158":6,"i159":6,"i160":6,"i161":6,"i162":6,"i163":6,"i164":6,"i165":6,"i166":6,"i167":6,"i168":6,"i169":6,"i170":6,"i171":6,"i172":6,"i173":6,"i174":6,"i175":6,"i176":6,"i177":6,"i178":6,"i179":6,"i180":6,"i181":6,"i182":6,"i183":6,"i184":18}; +var methods = {"i0":6,"i1":6,"i2":6,"i3":38,"i4":6,"i5":6,"i6":18,"i7":18,"i8":6,"i9":6,"i10":6,"i11":6,"i12":6,"i13":6,"i14":6,"i15":6,"i16":6,"i17":6,"i18":6,"i19":6,"i20":6,"i21":6,"i22":6,"i23":6,"i24":6,"i25":6,"i26":6,"i27":6,"i28":6,"i29":6,"i30":6,"i31":6,"i32":6,"i33":6,"i34":6,"i35":38,"i36":6,"i37":6,"i38":6,"i39":6,"i40":6,"i41":6,"i42":6,"i43":6,"i44":6,"i45":6,"i46":6,"i47":6,"i48":6,"i49":6,"i50":18,"i51":6,"i52":6,"i53":6,"i54":6,"i55":6,"i56":6,"i57":6,"i58":18,"i59":6,"i60":6,"i61":6,"i62":6,"i63":6,"i64":6,"i65":6,"i66":6,"i67":6,"i68":38,"i69":6,"i70":6,"i71":6,"i72":6,"i73":6,"i74":6,"i75":6,"i76":6,"i77":6,"i78":6,"i79":6,"i80":6,"i81":6,"i82":6,"i83":6,"i84":6,"i85":6,"i86":18,"i87":6,"i88":6,"i89":6,"i90":6,"i91":6,"i92":6,"i93":6,"i94":6,"i95":6,"i96":6,"i97":6,"i98":6,"i99":6,"i100":6,"i101":6,"i102":6,"i103":6,"i104":6,"i105":6,"i106":6,"i107":6,"i108":6,"i109":6,"i110":18,"i111":18,"i112":18,"i113":6,"i114":6,"i115":6,"i116":6,"i117":6,"i118":6,"i119":6," i120":6,"i121":6,"i122":6,"i123":6,"i124":6,"i125":6,"i126":6,"i127":6,"i128":6,"i129":6,"i130":6,"i131":6,"i132":6,"i133":6,"i134":6,"i135":6,"i136":38,"i137":6,"i138":6,"i139":38,"i140":6,"i141":6,"i142":6,"i143":6,"i144":6,"i145":6,"i146":6,"i147":6,"i148":6,"i149":6,"i150":18,"i151":18,"i152":6,"i153":6,"i154":6,"i155":6,"i156":6,"i157":6,"i158":6,"i159":6,"i160":6,"i161":6,"i162":6,"i163":6,"i164":6,"i165":6,"i166":6,"i167":6,"i168":6,"i169":6,"i170":6,"i171":6,"i172":6,"i173":6,"i174":6,"i175":6,"i176":6,"i177":6,"i178":6,"i179":6,"i180":6,"i181":6,"i182":6,"i183":18}; var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],4:["t3","Abstract Methods"],16:["t5","Default Methods"],32:["t6","Deprecated Methods"]}; var altColor = "altColor"; var rowColor = "rowColor"; @@ -241,14 +241,6 @@ extends -void -cloneSnapshot(http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true; title="class or interface in java.lang">StringsnapshotName, - TableNametableName, - booleanrestoreAcl) -Create a new table by cloning the snapshot content. - - - http://docs.oracle.com/javase/8/docs/api/java/util/concurrent/Future.html?is-external=true; title="class or interface in java.util.concurrent">Futurehttp://docs.oracle.com/javase/8/docs/api/java/lang/Void.html?is-external=true; title="class or interface in java.lang">Void cloneSnapshotAsync(http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true; title="class or interface in java.lang">StringsnapshotName, TableNametableName) @@ -256,52 +248,52 @@ extends + void close() - + void closeRegion(byte[]regionname, http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true; title="class or interface in java.lang">StringserverName) Close a region. - + void closeRegion(ServerNamesn,
[04/51] [partial] hbase-site git commit: Published site at 82d554e3783372cc6b05489452c815b57c06f6cd.
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/709b8fcc/devapidocs/src-html/org/apache/hadoop/hbase/master/HMaster.RedirectServlet.html -- diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/master/HMaster.RedirectServlet.html b/devapidocs/src-html/org/apache/hadoop/hbase/master/HMaster.RedirectServlet.html index 1642d61..17bc96c 100644 --- a/devapidocs/src-html/org/apache/hadoop/hbase/master/HMaster.RedirectServlet.html +++ b/devapidocs/src-html/org/apache/hadoop/hbase/master/HMaster.RedirectServlet.html @@ -2317,7 +2317,7 @@ 2309 } 2310 2311 public long restoreSnapshot(final SnapshotDescription snapshotDesc, -2312 final long nonceGroup, final long nonce, final boolean restoreAcl) throws IOException { +2312 final long nonceGroup, final long nonce) throws IOException { 2313checkInitialized(); 2314 getSnapshotManager().checkSnapshotSupport(); 2315 @@ -2329,1032 +2329,1031 @@ 2321new MasterProcedureUtil.NonceProcedureRunnable(this, nonceGroup, nonce) { 2322 @Override 2323 protected void run() throws IOException { -2324 setProcId( -2325 getSnapshotManager().restoreOrCloneSnapshot(snapshotDesc, getNonceKey(), restoreAcl)); -2326 } -2327 -2328 @Override -2329 protected String getDescription() { -2330return "RestoreSnapshotProcedure"; -2331 } -2332}); -2333 } -2334 -2335 @Override -2336 public void checkTableModifiable(final TableName tableName) -2337 throws IOException, TableNotFoundException, TableNotDisabledException { -2338if (isCatalogTable(tableName)) { -2339 throw new IOException("Can't modify catalog tables"); -2340} -2341if (!MetaTableAccessor.tableExists(getConnection(), tableName)) { -2342 throw new TableNotFoundException(tableName); -2343} -2344if (!getTableStateManager().isTableState(tableName, TableState.State.DISABLED)) { -2345 throw new TableNotDisabledException(tableName); -2346} -2347 } -2348 -2349 /** -2350 * @return cluster status -2351 */ -2352 public ClusterStatus getClusterStatus() throws InterruptedIOException { -2353// Build Set of backup masters from ZK nodes -2354ListString backupMasterStrings; -2355try { -2356 backupMasterStrings = ZKUtil.listChildrenNoWatch(this.zooKeeper, -2357 this.zooKeeper.znodePaths.backupMasterAddressesZNode); -2358} catch (KeeperException e) { -2359 LOG.warn(this.zooKeeper.prefix("Unable to list backup servers"), e); -2360 backupMasterStrings = null; -2361} -2362 -2363ListServerName backupMasters = null; -2364if (backupMasterStrings != null !backupMasterStrings.isEmpty()) { -2365 backupMasters = new ArrayList(backupMasterStrings.size()); -2366 for (String s: backupMasterStrings) { -2367try { -2368 byte [] bytes; -2369 try { -2370bytes = ZKUtil.getData(this.zooKeeper, ZKUtil.joinZNode( -2371 this.zooKeeper.znodePaths.backupMasterAddressesZNode, s)); -2372 } catch (InterruptedException e) { -2373throw new InterruptedIOException(); -2374 } -2375 if (bytes != null) { -2376ServerName sn; -2377try { -2378 sn = ProtobufUtil.parseServerNameFrom(bytes); -2379} catch (DeserializationException e) { -2380 LOG.warn("Failed parse, skipping registering backup server", e); -2381 continue; -2382} -2383backupMasters.add(sn); -2384 } -2385} catch (KeeperException e) { -2386 LOG.warn(this.zooKeeper.prefix("Unable to get information about " + -2387 "backup servers"), e); -2388} -2389 } -2390 Collections.sort(backupMasters, new ComparatorServerName() { -2391@Override -2392public int compare(ServerName s1, ServerName s2) { -2393 return s1.getServerName().compareTo(s2.getServerName()); -2394}}); -2395} -2396 -2397String clusterId = fileSystemManager != null ? -2398 fileSystemManager.getClusterId().toString() : null; -2399SetRegionState regionsInTransition = assignmentManager != null ? -2400 assignmentManager.getRegionStates().getRegionsInTransition() : null; -2401String[] coprocessors = cpHost != null ? getMasterCoprocessors() : null; -2402boolean balancerOn = loadBalancerTracker != null ? -2403 loadBalancerTracker.isBalancerOn() : false; -2404MapServerName, ServerLoad onlineServers = null; -2405SetServerName deadServers = null; -2406if (serverManager != null) { -2407 deadServers = serverManager.getDeadServers().copyServerNames(); -2408 onlineServers = serverManager.getOnlineServers(); -2409} -2410return new ClusterStatus(VersionInfo.getVersion(), clusterId, -2411 onlineServers,
[16/51] [partial] hbase-site git commit: Published site at 82d554e3783372cc6b05489452c815b57c06f6cd.
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/709b8fcc/devapidocs/src-html/org/apache/hadoop/hbase/client/HBaseAdmin.ProcedureFuture.WaitForStateCallable.html -- diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/client/HBaseAdmin.ProcedureFuture.WaitForStateCallable.html b/devapidocs/src-html/org/apache/hadoop/hbase/client/HBaseAdmin.ProcedureFuture.WaitForStateCallable.html index f2c44db..6cf2fc8 100644 --- a/devapidocs/src-html/org/apache/hadoop/hbase/client/HBaseAdmin.ProcedureFuture.WaitForStateCallable.html +++ b/devapidocs/src-html/org/apache/hadoop/hbase/client/HBaseAdmin.ProcedureFuture.WaitForStateCallable.html @@ -2581,7 +2581,7 @@ 2573try { 2574 // Restore snapshot 2575 get( -2576 internalRestoreSnapshotAsync(snapshotName, tableName, false), +2576 internalRestoreSnapshotAsync(snapshotName, tableName), 2577syncWaitTimeout, 2578TimeUnit.MILLISECONDS); 2579} catch (IOException e) { @@ -2590,7 +2590,7 @@ 2582 if (takeFailSafeSnapshot) { 2583try { 2584 get( -2585 internalRestoreSnapshotAsync(failSafeSnapshotSnapshotName, tableName, false), +2585 internalRestoreSnapshotAsync(failSafeSnapshotSnapshotName, tableName), 2586syncWaitTimeout, 2587TimeUnit.MILLISECONDS); 2588 String msg = "Restore snapshot=" + snapshotName + @@ -2633,7 +2633,7 @@ 2625 throw new TableNotDisabledException(tableName); 2626} 2627 -2628return internalRestoreSnapshotAsync(snapshotName, tableName, false); +2628return internalRestoreSnapshotAsync(snapshotName, tableName); 2629 } 2630 2631 @Override @@ -2643,1621 +2643,1614 @@ 2635 } 2636 2637 @Override -2638 public void cloneSnapshot(String snapshotName, TableName tableName, boolean restoreAcl) +2638 public void cloneSnapshot(final String snapshotName, final TableName tableName) 2639 throws IOException, TableExistsException, RestoreSnapshotException { 2640if (tableExists(tableName)) { 2641 throw new TableExistsException(tableName); 2642} 2643get( -2644 internalRestoreSnapshotAsync(snapshotName, tableName, restoreAcl), +2644 internalRestoreSnapshotAsync(snapshotName, tableName), 2645 Integer.MAX_VALUE, 2646 TimeUnit.MILLISECONDS); 2647 } 2648 2649 @Override -2650 public void cloneSnapshot(final String snapshotName, final TableName tableName) -2651 throws IOException, TableExistsException, RestoreSnapshotException { -2652cloneSnapshot(snapshotName, tableName, false); -2653 } -2654 -2655 @Override -2656 public FutureVoid cloneSnapshotAsync(final String snapshotName, final TableName tableName) -2657 throws IOException, TableExistsException { -2658if (tableExists(tableName)) { -2659 throw new TableExistsException(tableName); -2660} -2661return internalRestoreSnapshotAsync(snapshotName, tableName, false); -2662 } -2663 -2664 @Override -2665 public byte[] execProcedureWithRet(String signature, String instance, MapString, String props) -2666 throws IOException { -2667ProcedureDescription desc = ProtobufUtil.buildProcedureDescription(signature, instance, props); -2668final ExecProcedureRequest request = -2669 ExecProcedureRequest.newBuilder().setProcedure(desc).build(); -2670// run the procedure on the master -2671ExecProcedureResponse response = executeCallable( -2672 new MasterCallableExecProcedureResponse(getConnection(), getRpcControllerFactory()) { -2673@Override -2674protected ExecProcedureResponse rpcCall() throws Exception { -2675 return master.execProcedureWithRet(getRpcController(), request); -2676} -2677 }); -2678 -2679return response.hasReturnData() ? response.getReturnData().toByteArray() : null; -2680 } -2681 -2682 @Override -2683 public void execProcedure(String signature, String instance, MapString, String props) -2684 throws IOException { -2685ProcedureDescription desc = ProtobufUtil.buildProcedureDescription(signature, instance, props); -2686final ExecProcedureRequest request = -2687 ExecProcedureRequest.newBuilder().setProcedure(desc).build(); -2688// run the procedure on the master -2689ExecProcedureResponse response = executeCallable(new MasterCallableExecProcedureResponse( -2690getConnection(), getRpcControllerFactory()) { -2691 @Override -2692 protected ExecProcedureResponse rpcCall() throws Exception { -2693return master.execProcedure(getRpcController(), request); -2694 } -2695}); -2696 -2697long start = EnvironmentEdgeManager.currentTime(); -2698long max = response.getExpectedTimeout(); -2699long maxPauseTime = max / this.numRetries; -2700int tries = 0; -2701LOG.debug("Waiting a max of " + max + " ms for procedure '" +
[49/51] [partial] hbase-site git commit: Published site at 82d554e3783372cc6b05489452c815b57c06f6cd.
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/709b8fcc/apidocs/org/apache/hadoop/hbase/snapshot/class-use/RestoreSnapshotException.html -- diff --git a/apidocs/org/apache/hadoop/hbase/snapshot/class-use/RestoreSnapshotException.html b/apidocs/org/apache/hadoop/hbase/snapshot/class-use/RestoreSnapshotException.html index bc5ab14..9eabc0d 100644 --- a/apidocs/org/apache/hadoop/hbase/snapshot/class-use/RestoreSnapshotException.html +++ b/apidocs/org/apache/hadoop/hbase/snapshot/class-use/RestoreSnapshotException.html @@ -120,39 +120,31 @@ void -Admin.cloneSnapshot(http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true; title="class or interface in java.lang">StringsnapshotName, - TableNametableName, - booleanrestoreAcl) -Create a new table by cloning the snapshot content. - - - -void Admin.restoreSnapshot(byte[]snapshotName) Restore the specified snapshot on the original table. - + void Admin.restoreSnapshot(byte[]snapshotName, booleantakeFailSafeSnapshot) Restore the specified snapshot on the original table. - + void Admin.restoreSnapshot(http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true; title="class or interface in java.lang">StringsnapshotName) Restore the specified snapshot on the original table. - + void Admin.restoreSnapshot(http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true; title="class or interface in java.lang">StringsnapshotName, booleantakeFailSafeSnapshot) Restore the specified snapshot on the original table. - + http://docs.oracle.com/javase/8/docs/api/java/util/concurrent/Future.html?is-external=true; title="class or interface in java.util.concurrent">Futurehttp://docs.oracle.com/javase/8/docs/api/java/lang/Void.html?is-external=true; title="class or interface in java.lang">Void Admin.restoreSnapshotAsync(http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true; title="class or interface in java.lang">StringsnapshotName) Restore the specified snapshot on the original table.
[30/51] [partial] hbase-site git commit: Published site at 82d554e3783372cc6b05489452c815b57c06f6cd.
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/709b8fcc/devapidocs/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.ImplData.html -- diff --git a/devapidocs/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.ImplData.html b/devapidocs/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.ImplData.html index 715514f..d72927b 100644 --- a/devapidocs/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.ImplData.html +++ b/devapidocs/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.ImplData.html @@ -393,166 +393,166 @@ extends org.jamon.AbstractTemplateProxy.ImplData privateHMaster m_master - + -m_catalogJanitorEnabled -privateboolean m_catalogJanitorEnabled +m_metaLocation +privateServerName m_metaLocation - + -m_catalogJanitorEnabled__IsNotDefault -privateboolean m_catalogJanitorEnabled__IsNotDefault +m_metaLocation__IsNotDefault +privateboolean m_metaLocation__IsNotDefault - + -m_filter -privatehttp://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true; title="class or interface in java.lang">String m_filter +m_frags +privatehttp://docs.oracle.com/javase/8/docs/api/java/util/Map.html?is-external=true; title="class or interface in java.util">Maphttp://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true; title="class or interface in java.lang">String,http://docs.oracle.com/javase/8/docs/api/java/lang/Integer.html?is-external=true; title="class or interface in java.lang">Integer m_frags - + -m_filter__IsNotDefault -privateboolean m_filter__IsNotDefault +m_frags__IsNotDefault +privateboolean m_frags__IsNotDefault - + -m_serverManager -privateServerManager m_serverManager +m_filter +privatehttp://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true; title="class or interface in java.lang">String m_filter - + -m_serverManager__IsNotDefault -privateboolean m_serverManager__IsNotDefault +m_filter__IsNotDefault +privateboolean m_filter__IsNotDefault - + -m_assignmentManager -privateAssignmentManager m_assignmentManager +m_serverManager +privateServerManager m_serverManager - + -m_assignmentManager__IsNotDefault -privateboolean m_assignmentManager__IsNotDefault +m_serverManager__IsNotDefault +privateboolean m_serverManager__IsNotDefault - + -m_deadServers -privatehttp://docs.oracle.com/javase/8/docs/api/java/util/Set.html?is-external=true; title="class or interface in java.util">SetServerName m_deadServers +m_servers +privatehttp://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true; title="class or interface in java.util">ListServerName m_servers - + -m_deadServers__IsNotDefault -privateboolean m_deadServers__IsNotDefault +m_servers__IsNotDefault +privateboolean m_servers__IsNotDefault - + -m_servers -privatehttp://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true; title="class or interface in java.util">ListServerName m_servers +m_assignmentManager +privateAssignmentManager m_assignmentManager - + -m_servers__IsNotDefault -privateboolean m_servers__IsNotDefault +m_assignmentManager__IsNotDefault +privateboolean m_assignmentManager__IsNotDefault - + -m_format -privatehttp://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true; title="class or interface in java.lang">String m_format +m_catalogJanitorEnabled +privateboolean m_catalogJanitorEnabled - + -m_format__IsNotDefault -privateboolean m_format__IsNotDefault +m_catalogJanitorEnabled__IsNotDefault +privateboolean m_catalogJanitorEnabled__IsNotDefault - + -m_frags -privatehttp://docs.oracle.com/javase/8/docs/api/java/util/Map.html?is-external=true; title="class or interface in java.util">Maphttp://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true; title="class or interface in java.lang">String,http://docs.oracle.com/javase/8/docs/api/java/lang/Integer.html?is-external=true; title="class or interface in java.lang">Integer m_frags +m_deadServers +privatehttp://docs.oracle.com/javase/8/docs/api/java/util/Set.html?is-external=true; title="class or interface in java.util">SetServerName m_deadServers - + -m_frags__IsNotDefault -privateboolean m_frags__IsNotDefault +m_deadServers__IsNotDefault +privateboolean m_deadServers__IsNotDefault - + -m_metaLocation -privateServerName m_metaLocation +m_format +privatehttp://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true; title="class or interface in java.lang">String m_format - + -m_metaLocation__IsNotDefault -privateboolean m_metaLocation__IsNotDefault +m_format__IsNotDefault +privateboolean m_format__IsNotDefault @@ -598,247 +598,247 @@ extends org.jamon.AbstractTemplateProxy.ImplData publicHMastergetMaster() - +
[14/51] [partial] hbase-site git commit: Published site at 82d554e3783372cc6b05489452c815b57c06f6cd.
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/709b8fcc/devapidocs/src-html/org/apache/hadoop/hbase/client/HBaseAdmin.ReplicationState.html -- diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/client/HBaseAdmin.ReplicationState.html b/devapidocs/src-html/org/apache/hadoop/hbase/client/HBaseAdmin.ReplicationState.html index f2c44db..6cf2fc8 100644 --- a/devapidocs/src-html/org/apache/hadoop/hbase/client/HBaseAdmin.ReplicationState.html +++ b/devapidocs/src-html/org/apache/hadoop/hbase/client/HBaseAdmin.ReplicationState.html @@ -2581,7 +2581,7 @@ 2573try { 2574 // Restore snapshot 2575 get( -2576 internalRestoreSnapshotAsync(snapshotName, tableName, false), +2576 internalRestoreSnapshotAsync(snapshotName, tableName), 2577syncWaitTimeout, 2578TimeUnit.MILLISECONDS); 2579} catch (IOException e) { @@ -2590,7 +2590,7 @@ 2582 if (takeFailSafeSnapshot) { 2583try { 2584 get( -2585 internalRestoreSnapshotAsync(failSafeSnapshotSnapshotName, tableName, false), +2585 internalRestoreSnapshotAsync(failSafeSnapshotSnapshotName, tableName), 2586syncWaitTimeout, 2587TimeUnit.MILLISECONDS); 2588 String msg = "Restore snapshot=" + snapshotName + @@ -2633,7 +2633,7 @@ 2625 throw new TableNotDisabledException(tableName); 2626} 2627 -2628return internalRestoreSnapshotAsync(snapshotName, tableName, false); +2628return internalRestoreSnapshotAsync(snapshotName, tableName); 2629 } 2630 2631 @Override @@ -2643,1621 +2643,1614 @@ 2635 } 2636 2637 @Override -2638 public void cloneSnapshot(String snapshotName, TableName tableName, boolean restoreAcl) +2638 public void cloneSnapshot(final String snapshotName, final TableName tableName) 2639 throws IOException, TableExistsException, RestoreSnapshotException { 2640if (tableExists(tableName)) { 2641 throw new TableExistsException(tableName); 2642} 2643get( -2644 internalRestoreSnapshotAsync(snapshotName, tableName, restoreAcl), +2644 internalRestoreSnapshotAsync(snapshotName, tableName), 2645 Integer.MAX_VALUE, 2646 TimeUnit.MILLISECONDS); 2647 } 2648 2649 @Override -2650 public void cloneSnapshot(final String snapshotName, final TableName tableName) -2651 throws IOException, TableExistsException, RestoreSnapshotException { -2652cloneSnapshot(snapshotName, tableName, false); -2653 } -2654 -2655 @Override -2656 public FutureVoid cloneSnapshotAsync(final String snapshotName, final TableName tableName) -2657 throws IOException, TableExistsException { -2658if (tableExists(tableName)) { -2659 throw new TableExistsException(tableName); -2660} -2661return internalRestoreSnapshotAsync(snapshotName, tableName, false); -2662 } -2663 -2664 @Override -2665 public byte[] execProcedureWithRet(String signature, String instance, MapString, String props) -2666 throws IOException { -2667ProcedureDescription desc = ProtobufUtil.buildProcedureDescription(signature, instance, props); -2668final ExecProcedureRequest request = -2669 ExecProcedureRequest.newBuilder().setProcedure(desc).build(); -2670// run the procedure on the master -2671ExecProcedureResponse response = executeCallable( -2672 new MasterCallableExecProcedureResponse(getConnection(), getRpcControllerFactory()) { -2673@Override -2674protected ExecProcedureResponse rpcCall() throws Exception { -2675 return master.execProcedureWithRet(getRpcController(), request); -2676} -2677 }); -2678 -2679return response.hasReturnData() ? response.getReturnData().toByteArray() : null; -2680 } -2681 -2682 @Override -2683 public void execProcedure(String signature, String instance, MapString, String props) -2684 throws IOException { -2685ProcedureDescription desc = ProtobufUtil.buildProcedureDescription(signature, instance, props); -2686final ExecProcedureRequest request = -2687 ExecProcedureRequest.newBuilder().setProcedure(desc).build(); -2688// run the procedure on the master -2689ExecProcedureResponse response = executeCallable(new MasterCallableExecProcedureResponse( -2690getConnection(), getRpcControllerFactory()) { -2691 @Override -2692 protected ExecProcedureResponse rpcCall() throws Exception { -2693return master.execProcedure(getRpcController(), request); -2694 } -2695}); -2696 -2697long start = EnvironmentEdgeManager.currentTime(); -2698long max = response.getExpectedTimeout(); -2699long maxPauseTime = max / this.numRetries; -2700int tries = 0; -2701LOG.debug("Waiting a max of " + max + " ms for procedure '" + -2702signature + " : " + instance + "'' to complete. (max " + maxPauseTime + " ms per
[48/51] [partial] hbase-site git commit: Published site at 82d554e3783372cc6b05489452c815b57c06f6cd.
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/709b8fcc/apidocs/src-html/org/apache/hadoop/hbase/client/Admin.html -- diff --git a/apidocs/src-html/org/apache/hadoop/hbase/client/Admin.html b/apidocs/src-html/org/apache/hadoop/hbase/client/Admin.html index d77512a..de81692 100644 --- a/apidocs/src-html/org/apache/hadoop/hbase/client/Admin.html +++ b/apidocs/src-html/org/apache/hadoop/hbase/client/Admin.html @@ -1543,47 +1543,47 @@ 1535 1536 /** 1537 * Create a new table by cloning the snapshot content. -1538 * @param snapshotName name of the snapshot to be cloned -1539 * @param tableName name of the table where the snapshot will be restored -1540 * @param restoreAcl true to clone acl into newly created table +1538 * +1539 * @param snapshotName name of the snapshot to be cloned +1540 * @param tableName name of the table where the snapshot will be restored 1541 * @throws IOException if a remote or network exception occurs 1542 * @throws TableExistsException if table to be created already exists 1543 * @throws RestoreSnapshotException if snapshot failed to be cloned 1544 * @throws IllegalArgumentException if the specified table has not a valid name 1545 */ -1546 void cloneSnapshot(final String snapshotName, final TableName tableName, final boolean restoreAcl) +1546 void cloneSnapshot(final String snapshotName, final TableName tableName) 1547 throws IOException, TableExistsException, RestoreSnapshotException; 1548 1549 /** -1550 * Create a new table by cloning the snapshot content. -1551 * -1552 * @param snapshotName name of the snapshot to be cloned -1553 * @param tableName name of the table where the snapshot will be restored -1554 * @throws IOException if a remote or network exception occurs -1555 * @throws TableExistsException if table to be created already exists -1556 * @throws RestoreSnapshotException if snapshot failed to be cloned -1557 * @throws IllegalArgumentException if the specified table has not a valid name -1558 */ -1559 void cloneSnapshot(final String snapshotName, final TableName tableName) -1560 throws IOException, TableExistsException, RestoreSnapshotException; -1561 -1562 /** -1563 * Create a new table by cloning the snapshot content, but does not block -1564 * and wait for it be completely cloned. -1565 * You can use Future.get(long, TimeUnit) to wait on the operation to complete. -1566 * It may throw ExecutionException if there was an error while executing the operation -1567 * or TimeoutException in case the wait timeout was not long enough to allow the -1568 * operation to complete. +1550 * Create a new table by cloning the snapshot content, but does not block +1551 * and wait for it be completely cloned. +1552 * You can use Future.get(long, TimeUnit) to wait on the operation to complete. +1553 * It may throw ExecutionException if there was an error while executing the operation +1554 * or TimeoutException in case the wait timeout was not long enough to allow the +1555 * operation to complete. +1556 * +1557 * @param snapshotName name of the snapshot to be cloned +1558 * @param tableName name of the table where the snapshot will be restored +1559 * @throws IOException if a remote or network exception occurs +1560 * @throws TableExistsException if table to be cloned already exists +1561 * @return the result of the async clone snapshot. You can use Future.get(long, TimeUnit) +1562 *to wait on the operation to complete. +1563 */ +1564 FutureVoid cloneSnapshotAsync(final String snapshotName, final TableName tableName) +1565 throws IOException, TableExistsException; +1566 +1567 /** +1568 * Execute a distributed procedure on a cluster. 1569 * -1570 * @param snapshotName name of the snapshot to be cloned -1571 * @param tableName name of the table where the snapshot will be restored -1572 * @throws IOException if a remote or network exception occurs -1573 * @throws TableExistsException if table to be cloned already exists -1574 * @return the result of the async clone snapshot. You can use Future.get(long, TimeUnit) -1575 *to wait on the operation to complete. +1570 * @param signature A distributed procedure is uniquely identified by its signature (default the +1571 * root ZK node name of the procedure). +1572 * @param instance The instance name of the procedure. For some procedures, this parameter is +1573 * optional. +1574 * @param props Property/Value pairs of properties passing to the procedure +1575 * @throws IOException 1576 */ -1577 FutureVoid cloneSnapshotAsync(final String snapshotName, final TableName tableName) -1578 throws IOException, TableExistsException; +1577 void execProcedure(String signature, String instance, MapString, String props) +1578 throws IOException; 1579 1580 /** 1581
[45/51] [partial] hbase-site git commit: Published site at 82d554e3783372cc6b05489452c815b57c06f6cd.
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/709b8fcc/checkstyle.rss -- diff --git a/checkstyle.rss b/checkstyle.rss index 34f7bff..dec8c84 100644 --- a/checkstyle.rss +++ b/checkstyle.rss @@ -26,7 +26,7 @@ under the License. 2007 - 2017 The Apache Software Foundation File: 2159, - Errors: 14333, + Errors: 14339, Warnings: 0, Infos: 0 @@ -993,7 +993,7 @@ under the License. 0 - 53 + 52 @@ -12053,7 +12053,7 @@ under the License. 0 - 3 + 6 @@ -16617,7 +16617,7 @@ under the License. 0 - 0 + 1 @@ -16841,7 +16841,7 @@ under the License. 0 - 23 + 25 @@ -18465,7 +18465,7 @@ under the License. 0 - 236 + 237 http://git-wip-us.apache.org/repos/asf/hbase-site/blob/709b8fcc/coc.html -- diff --git a/coc.html b/coc.html index b2a377a..3658a32 100644 --- a/coc.html +++ b/coc.html @@ -7,7 +7,7 @@ - + Apache HBase Code of Conduct Policy @@ -380,7 +380,7 @@ email to mailto:priv...@hbase.apache.org;>the priv https://www.apache.org/;>The Apache Software Foundation. All rights reserved. - Last Published: 2017-05-11 + Last Published: 2017-05-12 http://git-wip-us.apache.org/repos/asf/hbase-site/blob/709b8fcc/cygwin.html -- diff --git a/cygwin.html b/cygwin.html index d1697f4..8b4c73f 100644 --- a/cygwin.html +++ b/cygwin.html @@ -7,7 +7,7 @@ - + Apache HBase Installing Apache HBase (TM) on Windows using Cygwin @@ -679,7 +679,7 @@ Now your HBase server is running, start coding and build that next https://www.apache.org/;>The Apache Software Foundation. All rights reserved. - Last Published: 2017-05-11 + Last Published: 2017-05-12 http://git-wip-us.apache.org/repos/asf/hbase-site/blob/709b8fcc/dependencies.html -- diff --git a/dependencies.html b/dependencies.html index 17a4aa2..d46a5c7 100644 --- a/dependencies.html +++ b/dependencies.html @@ -7,7 +7,7 @@ - + Apache HBase Project Dependencies @@ -524,7 +524,7 @@ https://www.apache.org/;>The Apache Software Foundation. All rights reserved. - Last Published: 2017-05-11 + Last Published: 2017-05-12 http://git-wip-us.apache.org/repos/asf/hbase-site/blob/709b8fcc/dependency-convergence.html -- diff --git a/dependency-convergence.html b/dependency-convergence.html index 4a4f3e2..a0bcac9 100644 --- a/dependency-convergence.html +++ b/dependency-convergence.html @@ -7,7 +7,7 @@ - + Apache HBase Reactor Dependency Convergence @@ -1849,7 +1849,7 @@ https://www.apache.org/;>The Apache Software Foundation. All rights reserved. - Last Published: 2017-05-11 + Last Published: 2017-05-12 http://git-wip-us.apache.org/repos/asf/hbase-site/blob/709b8fcc/dependency-info.html -- diff --git a/dependency-info.html b/dependency-info.html index 24b2202..ce880b6 100644 --- a/dependency-info.html +++ b/dependency-info.html @@ -7,7 +7,7 @@ - + Apache HBase Dependency Information @@ -318,7 +318,7 @@ https://www.apache.org/;>The Apache Software Foundation. All rights reserved. - Last Published: 2017-05-11 + Last Published:
[42/51] [partial] hbase-site git commit: Published site at 82d554e3783372cc6b05489452c815b57c06f6cd.
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/709b8fcc/devapidocs/org/apache/hadoop/hbase/client/HBaseAdmin.html -- diff --git a/devapidocs/org/apache/hadoop/hbase/client/HBaseAdmin.html b/devapidocs/org/apache/hadoop/hbase/client/HBaseAdmin.html index a541e1a..b7e2419 100644 --- a/devapidocs/org/apache/hadoop/hbase/client/HBaseAdmin.html +++ b/devapidocs/org/apache/hadoop/hbase/client/HBaseAdmin.html @@ -18,7 +18,7 @@ catch(err) { } //--> -var methods = {"i0":10,"i1":10,"i2":10,"i3":42,"i4":10,"i5":10,"i6":10,"i7":10,"i8":10,"i9":10,"i10":9,"i11":10,"i12":10,"i13":10,"i14":41,"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":42,"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":9,"i79":10,"i80":10,"i81":9,"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,"i109 ":10,"i110":9,"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,"i127":10,"i128":10,"i129":10,"i130":10,"i131":10,"i132":10,"i133":10,"i134":10,"i135":10,"i136":10,"i137":10,"i138":10,"i139":10,"i140":10,"i141":10,"i142":10,"i143":10,"i144":10,"i145":10,"i146":10,"i147":10,"i148":10,"i149":10,"i150":10,"i151":10,"i152":10,"i153":10,"i154":10,"i155":10,"i156":10,"i157":10,"i158":10,"i159":10,"i160":10,"i161":10,"i162":10,"i163":10,"i164":42,"i165":10,"i166":10,"i167":10,"i168":42,"i169":10,"i170":10,"i171":10,"i172":10,"i173":10,"i174":10,"i175":10,"i176":10,"i177":10,"i178":10,"i179":10,"i180":10,"i181":10,"i182":10,"i183":10,"i184":10,"i185":10,"i186":10,"i187":42,"i188":10,"i189":10,"i190":10,"i191":10,"i192":10,"i193":10,"i194":10,"i195":10,"i196":10,"i197":10,"i198":10,"i199":10,"i200":10,"i201":10,"i202":10,"i203":10,"i204":10,"i205":10,"i206":10,"i207":10,"i208":10,"i2 09":10,"i210":10,"i211":10,"i212":10,"i213":10,"i214":10,"i215":10,"i216":10,"i217":10}; +var methods = {"i0":10,"i1":10,"i2":10,"i3":42,"i4":10,"i5":10,"i6":10,"i7":10,"i8":10,"i9":10,"i10":9,"i11":10,"i12":10,"i13":10,"i14":41,"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":42,"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":9,"i78":10,"i79":10,"i80":9,"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,"i109 ":9,"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,"i127":10,"i128":10,"i129":10,"i130":10,"i131":10,"i132":10,"i133":10,"i134":10,"i135":10,"i136":10,"i137":10,"i138":10,"i139":10,"i140":10,"i141":10,"i142":10,"i143":10,"i144":10,"i145":10,"i146":10,"i147":10,"i148":10,"i149":10,"i150":10,"i151":10,"i152":10,"i153":10,"i154":10,"i155":10,"i156":10,"i157":10,"i158":10,"i159":10,"i160":10,"i161":10,"i162":10,"i163":42,"i164":10,"i165":10,"i166":10,"i167":42,"i168":10,"i169":10,"i170":10,"i171":10,"i172":10,"i173":10,"i174":10,"i175":10,"i176":10,"i177":10,"i178":10,"i179":10,"i180":10,"i181":10,"i182":10,"i183":10,"i184":10,"i185":10,"i186":42,"i187":10,"i188":10,"i189":10,"i190":10,"i191":10,"i192":10,"i193":10,"i194":10,"i195":10,"i196":10,"i197":10,"i198":10,"i199":10,"i200":10,"i201":10,"i202":10,"i203":10,"i204":10,"i205":10,"i206":10,"i207":10,"i208":10,"i2 09":10,"i210":10,"i211":10,"i212":10,"i213":10,"i214":10,"i215":10,"i216":10}; var tabs = {65535:["t0","All Methods"],1:["t1","Static Methods"],2:["t2","Instance Methods"],8:["t4","Concrete Methods"],32:["t6","Deprecated Methods"]}; var altColor = "altColor"; var rowColor = "rowColor"; @@ -460,14 +460,6 @@ implements -void
[21/51] [partial] hbase-site git commit: Published site at 82d554e3783372cc6b05489452c815b57c06f6cd.
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/709b8fcc/devapidocs/src-html/org/apache/hadoop/hbase/client/HBaseAdmin.EnableTableFuture.html -- diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/client/HBaseAdmin.EnableTableFuture.html b/devapidocs/src-html/org/apache/hadoop/hbase/client/HBaseAdmin.EnableTableFuture.html index f2c44db..6cf2fc8 100644 --- a/devapidocs/src-html/org/apache/hadoop/hbase/client/HBaseAdmin.EnableTableFuture.html +++ b/devapidocs/src-html/org/apache/hadoop/hbase/client/HBaseAdmin.EnableTableFuture.html @@ -2581,7 +2581,7 @@ 2573try { 2574 // Restore snapshot 2575 get( -2576 internalRestoreSnapshotAsync(snapshotName, tableName, false), +2576 internalRestoreSnapshotAsync(snapshotName, tableName), 2577syncWaitTimeout, 2578TimeUnit.MILLISECONDS); 2579} catch (IOException e) { @@ -2590,7 +2590,7 @@ 2582 if (takeFailSafeSnapshot) { 2583try { 2584 get( -2585 internalRestoreSnapshotAsync(failSafeSnapshotSnapshotName, tableName, false), +2585 internalRestoreSnapshotAsync(failSafeSnapshotSnapshotName, tableName), 2586syncWaitTimeout, 2587TimeUnit.MILLISECONDS); 2588 String msg = "Restore snapshot=" + snapshotName + @@ -2633,7 +2633,7 @@ 2625 throw new TableNotDisabledException(tableName); 2626} 2627 -2628return internalRestoreSnapshotAsync(snapshotName, tableName, false); +2628return internalRestoreSnapshotAsync(snapshotName, tableName); 2629 } 2630 2631 @Override @@ -2643,1621 +2643,1614 @@ 2635 } 2636 2637 @Override -2638 public void cloneSnapshot(String snapshotName, TableName tableName, boolean restoreAcl) +2638 public void cloneSnapshot(final String snapshotName, final TableName tableName) 2639 throws IOException, TableExistsException, RestoreSnapshotException { 2640if (tableExists(tableName)) { 2641 throw new TableExistsException(tableName); 2642} 2643get( -2644 internalRestoreSnapshotAsync(snapshotName, tableName, restoreAcl), +2644 internalRestoreSnapshotAsync(snapshotName, tableName), 2645 Integer.MAX_VALUE, 2646 TimeUnit.MILLISECONDS); 2647 } 2648 2649 @Override -2650 public void cloneSnapshot(final String snapshotName, final TableName tableName) -2651 throws IOException, TableExistsException, RestoreSnapshotException { -2652cloneSnapshot(snapshotName, tableName, false); -2653 } -2654 -2655 @Override -2656 public FutureVoid cloneSnapshotAsync(final String snapshotName, final TableName tableName) -2657 throws IOException, TableExistsException { -2658if (tableExists(tableName)) { -2659 throw new TableExistsException(tableName); -2660} -2661return internalRestoreSnapshotAsync(snapshotName, tableName, false); -2662 } -2663 -2664 @Override -2665 public byte[] execProcedureWithRet(String signature, String instance, MapString, String props) -2666 throws IOException { -2667ProcedureDescription desc = ProtobufUtil.buildProcedureDescription(signature, instance, props); -2668final ExecProcedureRequest request = -2669 ExecProcedureRequest.newBuilder().setProcedure(desc).build(); -2670// run the procedure on the master -2671ExecProcedureResponse response = executeCallable( -2672 new MasterCallableExecProcedureResponse(getConnection(), getRpcControllerFactory()) { -2673@Override -2674protected ExecProcedureResponse rpcCall() throws Exception { -2675 return master.execProcedureWithRet(getRpcController(), request); -2676} -2677 }); -2678 -2679return response.hasReturnData() ? response.getReturnData().toByteArray() : null; -2680 } -2681 -2682 @Override -2683 public void execProcedure(String signature, String instance, MapString, String props) -2684 throws IOException { -2685ProcedureDescription desc = ProtobufUtil.buildProcedureDescription(signature, instance, props); -2686final ExecProcedureRequest request = -2687 ExecProcedureRequest.newBuilder().setProcedure(desc).build(); -2688// run the procedure on the master -2689ExecProcedureResponse response = executeCallable(new MasterCallableExecProcedureResponse( -2690getConnection(), getRpcControllerFactory()) { -2691 @Override -2692 protected ExecProcedureResponse rpcCall() throws Exception { -2693return master.execProcedure(getRpcController(), request); -2694 } -2695}); -2696 -2697long start = EnvironmentEdgeManager.currentTime(); -2698long max = response.getExpectedTimeout(); -2699long maxPauseTime = max / this.numRetries; -2700int tries = 0; -2701LOG.debug("Waiting a max of " + max + " ms for procedure '" + -2702signature + " : " + instance + "'' to complete. (max " + maxPauseTime + " ms per
[29/51] [partial] hbase-site git commit: Published site at 82d554e3783372cc6b05489452c815b57c06f6cd.
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/709b8fcc/devapidocs/org/apache/hadoop/hbase/util/package-tree.html -- diff --git a/devapidocs/org/apache/hadoop/hbase/util/package-tree.html b/devapidocs/org/apache/hadoop/hbase/util/package-tree.html index f47e1aa..eee7d6d 100644 --- a/devapidocs/org/apache/hadoop/hbase/util/package-tree.html +++ b/devapidocs/org/apache/hadoop/hbase/util/package-tree.html @@ -519,14 +519,14 @@ 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.util.PoolMap.PoolType -org.apache.hadoop.hbase.util.HBaseFsck.ErrorReporter.ERROR_CODE org.apache.hadoop.hbase.util.IdReadWriteLock.ReferenceType org.apache.hadoop.hbase.util.Bytes.LexicographicalComparerHolder.UnsafeComparer (implements org.apache.hadoop.hbase.util.Bytes.ComparerT) +org.apache.hadoop.hbase.util.PoolMap.PoolType +org.apache.hadoop.hbase.util.HBaseFsck.ErrorReporter.ERROR_CODE org.apache.hadoop.hbase.util.Bytes.LexicographicalComparerHolder.PureJavaComparer (implements org.apache.hadoop.hbase.util.Bytes.ComparerT) -org.apache.hadoop.hbase.util.ChecksumType org.apache.hadoop.hbase.util.PrettyPrinter.Unit org.apache.hadoop.hbase.util.Order +org.apache.hadoop.hbase.util.ChecksumType http://git-wip-us.apache.org/repos/asf/hbase-site/blob/709b8fcc/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 59c20a2..5ea0902 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 = "0ae0edcd630aa1dcb6c47ea11fa4367ae0a5baa8"; +011 public static final String revision = "b34ab5980ea7a21fd750537476027f9a8665eacc"; 012 public static final String user = "jenkins"; -013 public static final String date = "Thu May 11 14:39:11 UTC 2017"; +013 public static final String date = "Fri May 12 14:39:46 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 = "efd178ea03e208dadaff4a5dc2568a50"; +015 public static final String srcChecksum = "0475775f4a6a60d81d5ec4a190f550f8"; 016}
[28/51] [partial] hbase-site git commit: Published site at 82d554e3783372cc6b05489452c815b57c06f6cd.
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/709b8fcc/devapidocs/src-html/org/apache/hadoop/hbase/client/Admin.html -- diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/client/Admin.html b/devapidocs/src-html/org/apache/hadoop/hbase/client/Admin.html index d77512a..de81692 100644 --- a/devapidocs/src-html/org/apache/hadoop/hbase/client/Admin.html +++ b/devapidocs/src-html/org/apache/hadoop/hbase/client/Admin.html @@ -1543,47 +1543,47 @@ 1535 1536 /** 1537 * Create a new table by cloning the snapshot content. -1538 * @param snapshotName name of the snapshot to be cloned -1539 * @param tableName name of the table where the snapshot will be restored -1540 * @param restoreAcl true to clone acl into newly created table +1538 * +1539 * @param snapshotName name of the snapshot to be cloned +1540 * @param tableName name of the table where the snapshot will be restored 1541 * @throws IOException if a remote or network exception occurs 1542 * @throws TableExistsException if table to be created already exists 1543 * @throws RestoreSnapshotException if snapshot failed to be cloned 1544 * @throws IllegalArgumentException if the specified table has not a valid name 1545 */ -1546 void cloneSnapshot(final String snapshotName, final TableName tableName, final boolean restoreAcl) +1546 void cloneSnapshot(final String snapshotName, final TableName tableName) 1547 throws IOException, TableExistsException, RestoreSnapshotException; 1548 1549 /** -1550 * Create a new table by cloning the snapshot content. -1551 * -1552 * @param snapshotName name of the snapshot to be cloned -1553 * @param tableName name of the table where the snapshot will be restored -1554 * @throws IOException if a remote or network exception occurs -1555 * @throws TableExistsException if table to be created already exists -1556 * @throws RestoreSnapshotException if snapshot failed to be cloned -1557 * @throws IllegalArgumentException if the specified table has not a valid name -1558 */ -1559 void cloneSnapshot(final String snapshotName, final TableName tableName) -1560 throws IOException, TableExistsException, RestoreSnapshotException; -1561 -1562 /** -1563 * Create a new table by cloning the snapshot content, but does not block -1564 * and wait for it be completely cloned. -1565 * You can use Future.get(long, TimeUnit) to wait on the operation to complete. -1566 * It may throw ExecutionException if there was an error while executing the operation -1567 * or TimeoutException in case the wait timeout was not long enough to allow the -1568 * operation to complete. +1550 * Create a new table by cloning the snapshot content, but does not block +1551 * and wait for it be completely cloned. +1552 * You can use Future.get(long, TimeUnit) to wait on the operation to complete. +1553 * It may throw ExecutionException if there was an error while executing the operation +1554 * or TimeoutException in case the wait timeout was not long enough to allow the +1555 * operation to complete. +1556 * +1557 * @param snapshotName name of the snapshot to be cloned +1558 * @param tableName name of the table where the snapshot will be restored +1559 * @throws IOException if a remote or network exception occurs +1560 * @throws TableExistsException if table to be cloned already exists +1561 * @return the result of the async clone snapshot. You can use Future.get(long, TimeUnit) +1562 *to wait on the operation to complete. +1563 */ +1564 FutureVoid cloneSnapshotAsync(final String snapshotName, final TableName tableName) +1565 throws IOException, TableExistsException; +1566 +1567 /** +1568 * Execute a distributed procedure on a cluster. 1569 * -1570 * @param snapshotName name of the snapshot to be cloned -1571 * @param tableName name of the table where the snapshot will be restored -1572 * @throws IOException if a remote or network exception occurs -1573 * @throws TableExistsException if table to be cloned already exists -1574 * @return the result of the async clone snapshot. You can use Future.get(long, TimeUnit) -1575 *to wait on the operation to complete. +1570 * @param signature A distributed procedure is uniquely identified by its signature (default the +1571 * root ZK node name of the procedure). +1572 * @param instance The instance name of the procedure. For some procedures, this parameter is +1573 * optional. +1574 * @param props Property/Value pairs of properties passing to the procedure +1575 * @throws IOException 1576 */ -1577 FutureVoid cloneSnapshotAsync(final String snapshotName, final TableName tableName) -1578 throws IOException, TableExistsException; +1577 void execProcedure(String signature, String instance, MapString, String props) +1578 throws IOException; 1579
[41/51] [partial] hbase-site git commit: Published site at 82d554e3783372cc6b05489452c815b57c06f6cd.
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/709b8fcc/devapidocs/org/apache/hadoop/hbase/client/RpcRetryingCallerWithReadReplicas.html -- diff --git a/devapidocs/org/apache/hadoop/hbase/client/RpcRetryingCallerWithReadReplicas.html b/devapidocs/org/apache/hadoop/hbase/client/RpcRetryingCallerWithReadReplicas.html index 7587674..2ac9f51 100644 --- a/devapidocs/org/apache/hadoop/hbase/client/RpcRetryingCallerWithReadReplicas.html +++ b/devapidocs/org/apache/hadoop/hbase/client/RpcRetryingCallerWithReadReplicas.html @@ -479,7 +479,7 @@ extends http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html? throwEnrichedException -staticvoidthrowEnrichedException(http://docs.oracle.com/javase/8/docs/api/java/util/concurrent/ExecutionException.html?is-external=true; title="class or interface in java.util.concurrent">ExecutionExceptione, +staticvoidthrowEnrichedException(http://docs.oracle.com/javase/8/docs/api/java/util/concurrent/ExecutionException.html?is-external=true; title="class or interface in java.util.concurrent">ExecutionExceptione, intretries) throws RetriesExhaustedException, DoNotRetryIOException @@ -498,7 +498,7 @@ extends http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html? addCallsForReplica -privatevoidaddCallsForReplica(ResultBoundedCompletionServiceResultcs, +privatevoidaddCallsForReplica(ResultBoundedCompletionServiceResultcs, RegionLocationsrl, intmin, intmax) @@ -518,7 +518,7 @@ extends http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html? getRegionLocations -staticRegionLocationsgetRegionLocations(booleanuseCache, +staticRegionLocationsgetRegionLocations(booleanuseCache, intreplicaId, ClusterConnectioncConnection, TableNametableName, http://git-wip-us.apache.org/repos/asf/hbase-site/blob/709b8fcc/devapidocs/org/apache/hadoop/hbase/client/package-tree.html -- diff --git a/devapidocs/org/apache/hadoop/hbase/client/package-tree.html b/devapidocs/org/apache/hadoop/hbase/client/package-tree.html index 8708c08..a93430d 100644 --- a/devapidocs/org/apache/hadoop/hbase/client/package-tree.html +++ b/devapidocs/org/apache/hadoop/hbase/client/package-tree.html @@ -521,25 +521,25 @@ 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.client.MasterSwitchType -org.apache.hadoop.hbase.client.TableState.State -org.apache.hadoop.hbase.client.IsolationLevel +org.apache.hadoop.hbase.client.RegionLocateType +org.apache.hadoop.hbase.client.CompactionState org.apache.hadoop.hbase.client.AsyncScanSingleRegionRpcRetryingCaller.ScanResumerState org.apache.hadoop.hbase.client.CompactType -org.apache.hadoop.hbase.client.Consistency -org.apache.hadoop.hbase.client.CompactionState -org.apache.hadoop.hbase.client.RegionLocateType +org.apache.hadoop.hbase.client.MobCompactPartitionPolicy +org.apache.hadoop.hbase.client.IsolationLevel +org.apache.hadoop.hbase.client.TableState.State +org.apache.hadoop.hbase.client.AsyncRequestFutureImpl.Retry +org.apache.hadoop.hbase.client.AsyncProcessTask.SubmittedRows org.apache.hadoop.hbase.client.RequestController.ReturnCode org.apache.hadoop.hbase.client.SnapshotType -org.apache.hadoop.hbase.client.Durability +org.apache.hadoop.hbase.client.Scan.ReadType +org.apache.hadoop.hbase.client.Consistency org.apache.hadoop.hbase.client.AbstractResponse.ResponseType -org.apache.hadoop.hbase.client.HBaseAdmin.ReplicationState -org.apache.hadoop.hbase.client.AsyncProcessTask.SubmittedRows -org.apache.hadoop.hbase.client.AsyncRequestFutureImpl.Retry -org.apache.hadoop.hbase.client.MobCompactPartitionPolicy -org.apache.hadoop.hbase.client.AsyncScanSingleRegionRpcRetryingCaller.ScanControllerState +org.apache.hadoop.hbase.client.Durability +org.apache.hadoop.hbase.client.MasterSwitchType org.apache.hadoop.hbase.client.ScannerCallable.MoreResults -org.apache.hadoop.hbase.client.Scan.ReadType +org.apache.hadoop.hbase.client.AsyncScanSingleRegionRpcRetryingCaller.ScanControllerState +org.apache.hadoop.hbase.client.HBaseAdmin.ReplicationState
[51/51] [partial] 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/709b8fcc Tree: http://git-wip-us.apache.org/repos/asf/hbase-site/tree/709b8fcc Diff: http://git-wip-us.apache.org/repos/asf/hbase-site/diff/709b8fcc Branch: refs/heads/asf-site Commit: 709b8fccb6c27da2ce2cff4e7b133c389b122838 Parents: d5aa6a1 Author: jenkinsAuthored: Fri May 12 14:59:19 2017 + Committer: jenkins Committed: Fri May 12 14:59:19 2017 + -- acid-semantics.html | 4 +- apache_hbase_reference_guide.pdf| 4 +- apache_hbase_reference_guide.pdfmarks | 4 +- apidocs/index-all.html | 4 - .../hbase/class-use/TableExistsException.html | 8 - .../hadoop/hbase/class-use/TableName.html | 124 +- .../org/apache/hadoop/hbase/client/Admin.html | 472 +- .../class-use/RestoreSnapshotException.html |16 +- .../org/apache/hadoop/hbase/client/Admin.html | 949 +- bulk-loads.html | 4 +- checkstyle-aggregate.html | 13430 + checkstyle.rss |12 +- 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 |31 +- devapidocs/index-all.html |46 +- .../hadoop/hbase/backup/package-tree.html | 4 +- .../hbase/class-use/HTableDescriptor.html |28 +- .../hbase/class-use/TableExistsException.html |14 - .../hadoop/hbase/class-use/TableName.html |45 +- .../hbase/classification/package-tree.html | 4 +- .../org/apache/hadoop/hbase/client/Admin.html | 472 +- .../client/HBaseAdmin.NamespaceFuture.html |12 +- ...in.ProcedureFuture.WaitForStateCallable.html | 8 +- .../client/HBaseAdmin.ProcedureFuture.html |48 +- .../client/HBaseAdmin.ReplicationState.html |12 +- .../HBaseAdmin.RestoreSnapshotFuture.html | 8 +- ...n.TableFuture.TableWaitForStateCallable.html | 8 +- .../hbase/client/HBaseAdmin.TableFuture.html|30 +- .../client/HBaseAdmin.ThrowableAbortable.html | 8 +- .../apache/hadoop/hbase/client/HBaseAdmin.html | 572 +- .../RpcRetryingCallerWithReadReplicas.html | 6 +- .../hadoop/hbase/client/package-tree.html |26 +- .../hadoop/hbase/filter/package-tree.html |10 +- .../hadoop/hbase/io/hfile/package-tree.html | 8 +- .../hadoop/hbase/mapreduce/package-tree.html| 4 +- .../org/apache/hadoop/hbase/master/HMaster.html | 176 +- .../master/HMasterCommandLine.LocalHMaster.html | 2 +- .../hadoop/hbase/master/package-tree.html | 2 +- .../procedure/CloneSnapshotProcedure.html | 111 +- .../procedure/class-use/MasterProcedureEnv.html | 192 +- .../hbase/master/procedure/package-tree.html| 4 +- .../hbase/master/snapshot/SnapshotManager.html |64 +- .../master/snapshot/TakeSnapshotHandler.html|24 +- .../org/apache/hadoop/hbase/package-tree.html |10 +- .../hadoop/hbase/procedure2/package-tree.html | 6 +- .../hadoop/hbase/quotas/package-tree.html | 6 +- .../regionserver/ChangedReadersObserver.html|32 +- ...ompactingMemStore.InMemoryFlushRunnable.html | 6 +- .../hbase/regionserver/CompactingMemStore.html | 133 +- .../hadoop/hbase/regionserver/HMobStore.html| 2 +- .../regionserver/HStore.StoreFlusherImpl.html |32 +- .../hadoop/hbase/regionserver/HStore.html | 278 +- .../hbase/regionserver/MobStoreScanner.html | 2 +- .../regionserver/ReversedMobStoreScanner.html | 2 +- .../regionserver/ReversedStoreScanner.html | 2 +- ...StoreScanner.StoreScannerCompactionRace.html |12 +- .../hadoop/hbase/regionserver/StoreScanner.html | 304 +- .../regionserver/class-use/KeyValueScanner.html |96 +- .../regionserver/class-use/MutableSegment.html | 2 +- .../hbase/regionserver/class-use/StoreFile.html | 6 +- .../hadoop/hbase/regionserver/package-tree.html |12 +- .../regionserver/querymatcher/package-tree.html | 4 +- .../hadoop/hbase/rest/model/package-tree.html | 2 +- .../security/access/AccessControlLists.html | 8 +- .../hbase/security/access/TablePermission.html |53 +- .../hbase/security/access/UserPermission.html | 2 +- .../access/class-use/TablePermission.html | 2 +-
[27/51] [partial] hbase-site git commit: Published site at 82d554e3783372cc6b05489452c815b57c06f6cd.
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/709b8fcc/devapidocs/src-html/org/apache/hadoop/hbase/client/HBaseAdmin.AbortProcedureFuture.html -- diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/client/HBaseAdmin.AbortProcedureFuture.html b/devapidocs/src-html/org/apache/hadoop/hbase/client/HBaseAdmin.AbortProcedureFuture.html index f2c44db..6cf2fc8 100644 --- a/devapidocs/src-html/org/apache/hadoop/hbase/client/HBaseAdmin.AbortProcedureFuture.html +++ b/devapidocs/src-html/org/apache/hadoop/hbase/client/HBaseAdmin.AbortProcedureFuture.html @@ -2581,7 +2581,7 @@ 2573try { 2574 // Restore snapshot 2575 get( -2576 internalRestoreSnapshotAsync(snapshotName, tableName, false), +2576 internalRestoreSnapshotAsync(snapshotName, tableName), 2577syncWaitTimeout, 2578TimeUnit.MILLISECONDS); 2579} catch (IOException e) { @@ -2590,7 +2590,7 @@ 2582 if (takeFailSafeSnapshot) { 2583try { 2584 get( -2585 internalRestoreSnapshotAsync(failSafeSnapshotSnapshotName, tableName, false), +2585 internalRestoreSnapshotAsync(failSafeSnapshotSnapshotName, tableName), 2586syncWaitTimeout, 2587TimeUnit.MILLISECONDS); 2588 String msg = "Restore snapshot=" + snapshotName + @@ -2633,7 +2633,7 @@ 2625 throw new TableNotDisabledException(tableName); 2626} 2627 -2628return internalRestoreSnapshotAsync(snapshotName, tableName, false); +2628return internalRestoreSnapshotAsync(snapshotName, tableName); 2629 } 2630 2631 @Override @@ -2643,1621 +2643,1614 @@ 2635 } 2636 2637 @Override -2638 public void cloneSnapshot(String snapshotName, TableName tableName, boolean restoreAcl) +2638 public void cloneSnapshot(final String snapshotName, final TableName tableName) 2639 throws IOException, TableExistsException, RestoreSnapshotException { 2640if (tableExists(tableName)) { 2641 throw new TableExistsException(tableName); 2642} 2643get( -2644 internalRestoreSnapshotAsync(snapshotName, tableName, restoreAcl), +2644 internalRestoreSnapshotAsync(snapshotName, tableName), 2645 Integer.MAX_VALUE, 2646 TimeUnit.MILLISECONDS); 2647 } 2648 2649 @Override -2650 public void cloneSnapshot(final String snapshotName, final TableName tableName) -2651 throws IOException, TableExistsException, RestoreSnapshotException { -2652cloneSnapshot(snapshotName, tableName, false); -2653 } -2654 -2655 @Override -2656 public FutureVoid cloneSnapshotAsync(final String snapshotName, final TableName tableName) -2657 throws IOException, TableExistsException { -2658if (tableExists(tableName)) { -2659 throw new TableExistsException(tableName); -2660} -2661return internalRestoreSnapshotAsync(snapshotName, tableName, false); -2662 } -2663 -2664 @Override -2665 public byte[] execProcedureWithRet(String signature, String instance, MapString, String props) -2666 throws IOException { -2667ProcedureDescription desc = ProtobufUtil.buildProcedureDescription(signature, instance, props); -2668final ExecProcedureRequest request = -2669 ExecProcedureRequest.newBuilder().setProcedure(desc).build(); -2670// run the procedure on the master -2671ExecProcedureResponse response = executeCallable( -2672 new MasterCallableExecProcedureResponse(getConnection(), getRpcControllerFactory()) { -2673@Override -2674protected ExecProcedureResponse rpcCall() throws Exception { -2675 return master.execProcedureWithRet(getRpcController(), request); -2676} -2677 }); -2678 -2679return response.hasReturnData() ? response.getReturnData().toByteArray() : null; -2680 } -2681 -2682 @Override -2683 public void execProcedure(String signature, String instance, MapString, String props) -2684 throws IOException { -2685ProcedureDescription desc = ProtobufUtil.buildProcedureDescription(signature, instance, props); -2686final ExecProcedureRequest request = -2687 ExecProcedureRequest.newBuilder().setProcedure(desc).build(); -2688// run the procedure on the master -2689ExecProcedureResponse response = executeCallable(new MasterCallableExecProcedureResponse( -2690getConnection(), getRpcControllerFactory()) { -2691 @Override -2692 protected ExecProcedureResponse rpcCall() throws Exception { -2693return master.execProcedure(getRpcController(), request); -2694 } -2695}); -2696 -2697long start = EnvironmentEdgeManager.currentTime(); -2698long max = response.getExpectedTimeout(); -2699long maxPauseTime = max / this.numRetries; -2700int tries = 0; -2701LOG.debug("Waiting a max of " + max + " ms for procedure '" + -2702signature + " : " + instance + "'' to complete. (max " +
[34/51] [partial] hbase-site git commit: Published site at 82d554e3783372cc6b05489452c815b57c06f6cd.
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/709b8fcc/devapidocs/org/apache/hadoop/hbase/regionserver/MobStoreScanner.html -- diff --git a/devapidocs/org/apache/hadoop/hbase/regionserver/MobStoreScanner.html b/devapidocs/org/apache/hadoop/hbase/regionserver/MobStoreScanner.html index 352a852..a88ceb9 100644 --- a/devapidocs/org/apache/hadoop/hbase/regionserver/MobStoreScanner.html +++ b/devapidocs/org/apache/hadoop/hbase/regionserver/MobStoreScanner.html @@ -245,7 +245,7 @@ extends StoreScanner -checkFlushed, checkScanOrder, close, enableLazySeekGlobally, getAllScannersForTesting, getEstimatedNumberOfKvsScanned, getNextIndexedKey, getScannerOrder, next, next, peek, reopenAfterFlush, reseek, resetKVHeap, seek, seekAsDirection, seekScanners, seekToNextRow, selectScannersFrom, shipped, trySkipToNextColumn, trySkipToNextRow, updateReaders +checkFlushed, checkScanOrder, close, enableLazySeekGlobally, getAllScannersForTesting, getEstimatedNumberOfKvsScanned, getNextIndexedKey, getReadPoint, getScannerOrder, next, next, peek, reopenAfterFlush, reseek, resetKVHeap, seek, seekAsDirection, seekScanners, seekToNextRow, selectScannersFrom, shipped, trySkipToNextColumn, trySkipToNextRow, updateReaders http://git-wip-us.apache.org/repos/asf/hbase-site/blob/709b8fcc/devapidocs/org/apache/hadoop/hbase/regionserver/ReversedMobStoreScanner.html -- diff --git a/devapidocs/org/apache/hadoop/hbase/regionserver/ReversedMobStoreScanner.html b/devapidocs/org/apache/hadoop/hbase/regionserver/ReversedMobStoreScanner.html index 9a698ff..84f1a67 100644 --- a/devapidocs/org/apache/hadoop/hbase/regionserver/ReversedMobStoreScanner.html +++ b/devapidocs/org/apache/hadoop/hbase/regionserver/ReversedMobStoreScanner.html @@ -257,7 +257,7 @@ extends StoreScanner -checkFlushed, close, enableLazySeekGlobally, getAllScannersForTesting, getEstimatedNumberOfKvsScanned, getNextIndexedKey, getScannerOrder, next, next, peek, reopenAfterFlush, selectScannersFrom, shipped, trySkipToNextColumn, trySkipToNextRow, updateReaders +checkFlushed, close, enableLazySeekGlobally, getAllScannersForTesting, getEstimatedNumberOfKvsScanned, getNextIndexedKey, getReadPoint, getScannerOrder , next, next, peek, reopenAfterFlush, selectScannersFrom, shipped, trySkipToNextColumn, trySkipToNextRow, updateReaders http://git-wip-us.apache.org/repos/asf/hbase-site/blob/709b8fcc/devapidocs/org/apache/hadoop/hbase/regionserver/ReversedStoreScanner.html -- diff --git a/devapidocs/org/apache/hadoop/hbase/regionserver/ReversedStoreScanner.html b/devapidocs/org/apache/hadoop/hbase/regionserver/ReversedStoreScanner.html index 5c638e1..59bc1a0 100644 --- a/devapidocs/org/apache/hadoop/hbase/regionserver/ReversedStoreScanner.html +++ b/devapidocs/org/apache/hadoop/hbase/regionserver/ReversedStoreScanner.html @@ -292,7 +292,7 @@ implements StoreScanner -checkFlushed, close, enableLazySeekGlobally, getAllScannersForTesting, getEstimatedNumberOfKvsScanned, getNextIndexedKey, getScannerOrder, next, next, next, peek, reopenAfterFlush, selectScannersFrom, shipped, trySkipToNextColumn, trySkipToNextRow, updateReaders +checkFlushed, close, enableLazySeekGlobally, getAllScannersForTesting, getEstimatedNumberOfKvsScanned, getNextIndexedKey, getReadPoint, getScannerOrder , next, next, next, peek, reopenAfterFlush, selectScannersFrom, shipped, trySkipToNextColumn, trySkipToNextRow, updateReaders http://git-wip-us.apache.org/repos/asf/hbase-site/blob/709b8fcc/devapidocs/org/apache/hadoop/hbase/regionserver/StoreScanner.StoreScannerCompactionRace.html -- diff --git a/devapidocs/org/apache/hadoop/hbase/regionserver/StoreScanner.StoreScannerCompactionRace.html b/devapidocs/org/apache/hadoop/hbase/regionserver/StoreScanner.StoreScannerCompactionRace.html index 096436e..cb7da3f 100644 --- a/devapidocs/org/apache/hadoop/hbase/regionserver/StoreScanner.StoreScannerCompactionRace.html +++ b/devapidocs/org/apache/hadoop/hbase/regionserver/StoreScanner.StoreScannerCompactionRace.html @@ -122,7 +122,7 @@ var activeTableTab = "activeTableTab"; -static enum StoreScanner.StoreScannerCompactionRace +static enum StoreScanner.StoreScannerCompactionRace extends http://docs.oracle.com/javase/8/docs/api/java/lang/Enum.html?is-external=true; title="class or interface in java.lang">EnumStoreScanner.StoreScannerCompactionRace @@ -213,7 +213,7 @@ the order they are declared. BEFORE_SEEK -public static finalStoreScanner.StoreScannerCompactionRace BEFORE_SEEK +public static finalStoreScanner.StoreScannerCompactionRace BEFORE_SEEK @@ -222,7 +222,7 @@ the order they are declared.
[36/51] [partial] hbase-site git commit: Published site at 82d554e3783372cc6b05489452c815b57c06f6cd.
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/709b8fcc/devapidocs/org/apache/hadoop/hbase/regionserver/CompactingMemStore.html -- diff --git a/devapidocs/org/apache/hadoop/hbase/regionserver/CompactingMemStore.html b/devapidocs/org/apache/hadoop/hbase/regionserver/CompactingMemStore.html index e8faa1a..e94395c 100644 --- a/devapidocs/org/apache/hadoop/hbase/regionserver/CompactingMemStore.html +++ b/devapidocs/org/apache/hadoop/hbase/regionserver/CompactingMemStore.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}; +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}; var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],8:["t4","Concrete Methods"]}; var altColor = "altColor"; var rowColor = "rowColor"; @@ -279,146 +279,150 @@ extends +protected http://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true; title="class or interface in java.util">ListKeyValueScanner +createList(intcapacity) + + void debug() - + (package private) void disableCompaction() - + (package private) void enableCompaction() - + void flattenOneSegment(longrequesterVersion) - + (package private) void flushInMemory() - + http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true; title="class or interface in java.lang">String getFamilyName() - + private byte[] getFamilyNameInBytes() - + MemstoreSize getFlushableSize() On flush, how much memory we will clear. - + VersionedSegmentsList getImmutableSegments() - + (package private) long getInmemoryFlushSize() - + private Segment getLastSegment() - + (package private) Cell getNextRow(Cellcell) - + private http://docs.oracle.com/javase/8/docs/api/java/util/concurrent/ThreadPoolExecutor.html?is-external=true; title="class or interface in java.util.concurrent">ThreadPoolExecutor getPool() - + private RegionServicesForStores getRegionServices() - + http://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true; title="class or interface in java.util">ListKeyValueScanner getScanners(longreadPt) - + protected http://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true; title="class or interface in java.util">ListSegment getSegments() - + long getSmallestReadPoint() - + Store getStore() - + boolean hasImmutableSegments() - + protected long heapSize() - + (package private) void initiateType(MemoryCompactionPolicycompactionType) - + private void initInmemoryFlushSize(org.apache.hadoop.conf.Configurationconf) - + boolean isCompositeSnapshot() - + (package private) boolean isMemStoreFlushingInMemory() - + boolean isSloppy() - + protected long keySize() - + long preFlushSeqIDEstimation() This method is called before the flush is executed. - -private void + +protected void pushActiveToPipeline(MutableSegmentactive) - + private void pushPipelineToSnapshot() - + private void pushTailToSnapshot() - + private void pushToSnapshot(http://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true; title="class or interface in java.util">ListImmutableSegmentsegments) - + void setCompositeSnapshot(booleanuseCompositeSnapshot) - + private boolean shouldFlushInMemory() - + MemstoreSize size() - + MemStoreSnapshot snapshot() Push the current active memstore segment into the pipeline @@ -426,14 +430,14 @@ extends AbstractMemStore.clearSnapshot(long). - + void startReplayingFromWAL() This message intends to inform the MemStore that next coming updates are going to be part of the replaying edits from WAL - + private void stopCompaction() The request to cancel the compaction asynchronous task (caused by in-memory flush) @@ -441,20 +445,20 @@ extends + void stopReplayingFromWAL() This message intends to inform the MemStore that the replaying edits from WAL are done - + boolean swapCompactedSegments(VersionedSegmentsListversionedList, ImmutableSegmentresult, booleanmerge) - + void updateLowestUnflushedSequenceIdInWAL(booleanonlyIfGreater) Updates the wal with the lowest sequence id (oldest entry) that is still in
[43/51] [partial] hbase-site git commit: Published site at 82d554e3783372cc6b05489452c815b57c06f6cd.
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/709b8fcc/devapidocs/org/apache/hadoop/hbase/client/HBaseAdmin.NamespaceFuture.html -- diff --git a/devapidocs/org/apache/hadoop/hbase/client/HBaseAdmin.NamespaceFuture.html b/devapidocs/org/apache/hadoop/hbase/client/HBaseAdmin.NamespaceFuture.html index be5227a..379e5cf 100644 --- a/devapidocs/org/apache/hadoop/hbase/client/HBaseAdmin.NamespaceFuture.html +++ b/devapidocs/org/apache/hadoop/hbase/client/HBaseAdmin.NamespaceFuture.html @@ -124,7 +124,7 @@ var activeTableTab = "activeTableTab"; @InterfaceAudience.Private @InterfaceStability.Evolving -protected abstract static class HBaseAdmin.NamespaceFuture +protected abstract static class HBaseAdmin.NamespaceFuture extends HBaseAdmin.ProcedureFuturehttp://docs.oracle.com/javase/8/docs/api/java/lang/Void.html?is-external=true; title="class or interface in java.lang">Void @@ -244,7 +244,7 @@ extends namespaceName -private finalhttp://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true; title="class or interface in java.lang">String namespaceName +private finalhttp://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true; title="class or interface in java.lang">String namespaceName @@ -261,7 +261,7 @@ extends NamespaceFuture -publicNamespaceFuture(HBaseAdminadmin, +publicNamespaceFuture(HBaseAdminadmin, http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true; title="class or interface in java.lang">StringnamespaceName, http://docs.oracle.com/javase/8/docs/api/java/lang/Long.html?is-external=true; title="class or interface in java.lang">LongprocId) @@ -280,7 +280,7 @@ extends getNamespaceName -protectedhttp://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true; title="class or interface in java.lang">StringgetNamespaceName() +protectedhttp://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true; title="class or interface in java.lang">StringgetNamespaceName() Returns: the namespace name @@ -293,7 +293,7 @@ extends getOperationType -public abstracthttp://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true; title="class or interface in java.lang">StringgetOperationType() +public abstracthttp://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true; title="class or interface in java.lang">StringgetOperationType() Returns: the operation type like CREATE_NAMESPACE, DELETE_NAMESPACE, etc. @@ -306,7 +306,7 @@ extends toString -publichttp://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true; title="class or interface in java.lang">StringtoString() +publichttp://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true; title="class or interface in java.lang">StringtoString() Overrides: http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#toString--; title="class or interface in java.lang">toStringin classhttp://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true; title="class or interface in java.lang">Object http://git-wip-us.apache.org/repos/asf/hbase-site/blob/709b8fcc/devapidocs/org/apache/hadoop/hbase/client/HBaseAdmin.ProcedureFuture.WaitForStateCallable.html -- diff --git a/devapidocs/org/apache/hadoop/hbase/client/HBaseAdmin.ProcedureFuture.WaitForStateCallable.html b/devapidocs/org/apache/hadoop/hbase/client/HBaseAdmin.ProcedureFuture.WaitForStateCallable.html index faf681c..4ab2bb1 100644 --- a/devapidocs/org/apache/hadoop/hbase/client/HBaseAdmin.ProcedureFuture.WaitForStateCallable.html +++ b/devapidocs/org/apache/hadoop/hbase/client/HBaseAdmin.ProcedureFuture.WaitForStateCallable.html @@ -109,7 +109,7 @@ var activeTableTab = "activeTableTab"; -protected static interface HBaseAdmin.ProcedureFuture.WaitForStateCallable +protected static interface HBaseAdmin.ProcedureFuture.WaitForStateCallable @@ -161,7 +161,7 @@ var activeTableTab = "activeTableTab"; checkState -booleancheckState(inttries) +booleancheckState(inttries) throws http://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true; title="class or interface in java.io">IOException Throws: @@ -175,7 +175,7 @@ var activeTableTab = "activeTableTab"; throwInterruptedException -voidthrowInterruptedException() +voidthrowInterruptedException() throws http://docs.oracle.com/javase/8/docs/api/java/io/InterruptedIOException.html?is-external=true; title="class or interface in java.io">InterruptedIOException Throws: @@ -189,7 +189,7 @@ var activeTableTab = "activeTableTab"; throwTimeoutException -voidthrowTimeoutException(longelapsed) +voidthrowTimeoutException(longelapsed)
hbase-site git commit: INFRA-10751 Empty commit
Repository: hbase-site Updated Branches: refs/heads/asf-site 709b8fccb -> 80faeee01 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/80faeee0 Tree: http://git-wip-us.apache.org/repos/asf/hbase-site/tree/80faeee0 Diff: http://git-wip-us.apache.org/repos/asf/hbase-site/diff/80faeee0 Branch: refs/heads/asf-site Commit: 80faeee01fa266c9ed95be0508adb74b91822d76 Parents: 709b8fc Author: jenkinsAuthored: Fri May 12 14:59:55 2017 + Committer: jenkins Committed: Fri May 12 14:59:55 2017 + -- --
[50/51] [partial] hbase-site git commit: Published site at 82d554e3783372cc6b05489452c815b57c06f6cd.
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/709b8fcc/apidocs/org/apache/hadoop/hbase/client/Admin.html -- diff --git a/apidocs/org/apache/hadoop/hbase/client/Admin.html b/apidocs/org/apache/hadoop/hbase/client/Admin.html index 481e49c..a6255fb 100644 --- a/apidocs/org/apache/hadoop/hbase/client/Admin.html +++ b/apidocs/org/apache/hadoop/hbase/client/Admin.html @@ -18,7 +18,7 @@ catch(err) { } //--> -var methods = {"i0":6,"i1":6,"i2":6,"i3":38,"i4":6,"i5":6,"i6":18,"i7":18,"i8":6,"i9":6,"i10":6,"i11":6,"i12":6,"i13":6,"i14":6,"i15":6,"i16":6,"i17":6,"i18":6,"i19":6,"i20":6,"i21":6,"i22":6,"i23":6,"i24":6,"i25":6,"i26":6,"i27":6,"i28":6,"i29":6,"i30":6,"i31":6,"i32":6,"i33":6,"i34":6,"i35":6,"i36":38,"i37":6,"i38":6,"i39":6,"i40":6,"i41":6,"i42":6,"i43":6,"i44":6,"i45":6,"i46":6,"i47":6,"i48":6,"i49":6,"i50":6,"i51":18,"i52":6,"i53":6,"i54":6,"i55":6,"i56":6,"i57":6,"i58":6,"i59":18,"i60":6,"i61":6,"i62":6,"i63":6,"i64":6,"i65":6,"i66":6,"i67":6,"i68":6,"i69":38,"i70":6,"i71":6,"i72":6,"i73":6,"i74":6,"i75":6,"i76":6,"i77":6,"i78":6,"i79":6,"i80":6,"i81":6,"i82":6,"i83":6,"i84":6,"i85":6,"i86":6,"i87":18,"i88":6,"i89":6,"i90":6,"i91":6,"i92":6,"i93":6,"i94":6,"i95":6,"i96":6,"i97":6,"i98":6,"i99":6,"i100":6,"i101":6,"i102":6,"i103":6,"i104":6,"i105":6,"i106":6,"i107":6,"i108":6,"i109":6,"i110":6,"i111":18,"i112":18,"i113":18,"i114":6,"i115":6,"i116":6,"i117":6,"i118":6,"i119":6," i120":6,"i121":6,"i122":6,"i123":6,"i124":6,"i125":6,"i126":6,"i127":6,"i128":6,"i129":6,"i130":6,"i131":6,"i132":6,"i133":6,"i134":6,"i135":6,"i136":6,"i137":38,"i138":6,"i139":6,"i140":38,"i141":6,"i142":6,"i143":6,"i144":6,"i145":6,"i146":6,"i147":6,"i148":6,"i149":6,"i150":6,"i151":18,"i152":18,"i153":6,"i154":6,"i155":6,"i156":6,"i157":6,"i158":6,"i159":6,"i160":6,"i161":6,"i162":6,"i163":6,"i164":6,"i165":6,"i166":6,"i167":6,"i168":6,"i169":6,"i170":6,"i171":6,"i172":6,"i173":6,"i174":6,"i175":6,"i176":6,"i177":6,"i178":6,"i179":6,"i180":6,"i181":6,"i182":6,"i183":6,"i184":18}; +var methods = {"i0":6,"i1":6,"i2":6,"i3":38,"i4":6,"i5":6,"i6":18,"i7":18,"i8":6,"i9":6,"i10":6,"i11":6,"i12":6,"i13":6,"i14":6,"i15":6,"i16":6,"i17":6,"i18":6,"i19":6,"i20":6,"i21":6,"i22":6,"i23":6,"i24":6,"i25":6,"i26":6,"i27":6,"i28":6,"i29":6,"i30":6,"i31":6,"i32":6,"i33":6,"i34":6,"i35":38,"i36":6,"i37":6,"i38":6,"i39":6,"i40":6,"i41":6,"i42":6,"i43":6,"i44":6,"i45":6,"i46":6,"i47":6,"i48":6,"i49":6,"i50":18,"i51":6,"i52":6,"i53":6,"i54":6,"i55":6,"i56":6,"i57":6,"i58":18,"i59":6,"i60":6,"i61":6,"i62":6,"i63":6,"i64":6,"i65":6,"i66":6,"i67":6,"i68":38,"i69":6,"i70":6,"i71":6,"i72":6,"i73":6,"i74":6,"i75":6,"i76":6,"i77":6,"i78":6,"i79":6,"i80":6,"i81":6,"i82":6,"i83":6,"i84":6,"i85":6,"i86":18,"i87":6,"i88":6,"i89":6,"i90":6,"i91":6,"i92":6,"i93":6,"i94":6,"i95":6,"i96":6,"i97":6,"i98":6,"i99":6,"i100":6,"i101":6,"i102":6,"i103":6,"i104":6,"i105":6,"i106":6,"i107":6,"i108":6,"i109":6,"i110":18,"i111":18,"i112":18,"i113":6,"i114":6,"i115":6,"i116":6,"i117":6,"i118":6,"i119":6," i120":6,"i121":6,"i122":6,"i123":6,"i124":6,"i125":6,"i126":6,"i127":6,"i128":6,"i129":6,"i130":6,"i131":6,"i132":6,"i133":6,"i134":6,"i135":6,"i136":38,"i137":6,"i138":6,"i139":38,"i140":6,"i141":6,"i142":6,"i143":6,"i144":6,"i145":6,"i146":6,"i147":6,"i148":6,"i149":6,"i150":18,"i151":18,"i152":6,"i153":6,"i154":6,"i155":6,"i156":6,"i157":6,"i158":6,"i159":6,"i160":6,"i161":6,"i162":6,"i163":6,"i164":6,"i165":6,"i166":6,"i167":6,"i168":6,"i169":6,"i170":6,"i171":6,"i172":6,"i173":6,"i174":6,"i175":6,"i176":6,"i177":6,"i178":6,"i179":6,"i180":6,"i181":6,"i182":6,"i183":18}; var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],4:["t3","Abstract Methods"],16:["t5","Default Methods"],32:["t6","Deprecated Methods"]}; var altColor = "altColor"; var rowColor = "rowColor"; @@ -237,14 +237,6 @@ extends org.apache.hadoop.hbase.Abortable, http://docs.oracle.com/javas -void -cloneSnapshot(http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true; title="class or interface in java.lang">StringsnapshotName, - TableNametableName, - booleanrestoreAcl) -Create a new table by cloning the snapshot content. - - - http://docs.oracle.com/javase/8/docs/api/java/util/concurrent/Future.html?is-external=true; title="class or interface in java.util.concurrent">Futurehttp://docs.oracle.com/javase/8/docs/api/java/lang/Void.html?is-external=true; title="class or interface in java.lang">Void cloneSnapshotAsync(http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true; title="class or interface in java.lang">StringsnapshotName, TableNametableName) @@ -252,52 +244,52 @@ extends org.apache.hadoop.hbase.Abortable, http://docs.oracle.com/javas and wait for it be completely cloned. - + void close() - + void closeRegion(byte[]regionname,
[07/51] [partial] hbase-site git commit: Published site at 82d554e3783372cc6b05489452c815b57c06f6cd.
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/709b8fcc/devapidocs/src-html/org/apache/hadoop/hbase/client/RpcRetryingCallerWithReadReplicas.ReplicaRegionServerCallable.html -- diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/client/RpcRetryingCallerWithReadReplicas.ReplicaRegionServerCallable.html b/devapidocs/src-html/org/apache/hadoop/hbase/client/RpcRetryingCallerWithReadReplicas.ReplicaRegionServerCallable.html index 2f73534..8204859 100644 --- a/devapidocs/src-html/org/apache/hadoop/hbase/client/RpcRetryingCallerWithReadReplicas.ReplicaRegionServerCallable.html +++ b/devapidocs/src-html/org/apache/hadoop/hbase/client/RpcRetryingCallerWithReadReplicas.ReplicaRegionServerCallable.html @@ -217,92 +217,94 @@ 209 FutureResult f = cs.pollForFirstSuccessfullyCompletedTask(operationTimeout, 210 TimeUnit.MILLISECONDS, startIndex, endIndex); 211 if (f == null) { -212throw new RetriesExhaustedException("timed out after " + operationTimeout + " ms"); -213 } -214 return f.get(); -215} catch (ExecutionException e) { -216 throwEnrichedException(e, retries); -217} catch (CancellationException e) { -218 throw new InterruptedIOException(); -219} catch (InterruptedException e) { +212throw new RetriesExhaustedException("Timed out after " + operationTimeout + +213"ms. Get is sent to replicas with startIndex: " + startIndex + +214", endIndex: " + endIndex + ", Locations: " + rl); +215 } +216 return f.get(); +217} catch (ExecutionException e) { +218 throwEnrichedException(e, retries); +219} catch (CancellationException e) { 220 throw new InterruptedIOException(); -221} finally { -222 // We get there because we were interrupted or because one or more of the -223 // calls succeeded or failed. In all case, we stop all our tasks. -224 cs.cancelAll(); -225} -226 -227LOG.error("Imposible? Arrive at an unreachable line..."); // unreachable -228return null; // unreachable -229 } -230 -231 /** -232 * Extract the real exception from the ExecutionException, and throws what makes more -233 * sense. -234 */ -235 static void throwEnrichedException(ExecutionException e, int retries) -236 throws RetriesExhaustedException, DoNotRetryIOException { -237Throwable t = e.getCause(); -238assert t != null; // That's what ExecutionException is about: holding an exception -239 -240if (t instanceof RetriesExhaustedException) { -241 throw (RetriesExhaustedException) t; -242} -243 -244if (t instanceof DoNotRetryIOException) { -245 throw (DoNotRetryIOException) t; -246} -247 -248 RetriesExhaustedException.ThrowableWithExtraContext qt = -249new RetriesExhaustedException.ThrowableWithExtraContext(t, -250 EnvironmentEdgeManager.currentTime(), null); -251 -252 ListRetriesExhaustedException.ThrowableWithExtraContext exceptions = -253Collections.singletonList(qt); -254 -255throw new RetriesExhaustedException(retries, exceptions); -256 } -257 -258 /** -259 * Creates the calls and submit them -260 * -261 * @param cs - the completion service to use for submitting -262 * @param rl - the region locations -263 * @param min - the id of the first replica, inclusive -264 * @param max - the id of the last replica, inclusive. -265 */ -266 private void addCallsForReplica(ResultBoundedCompletionServiceResult cs, -267 RegionLocations rl, int min, int max) { -268for (int id = min; id = max; id++) { -269 HRegionLocation hrl = rl.getRegionLocation(id); -270 ReplicaRegionServerCallable callOnReplica = new ReplicaRegionServerCallable(id, hrl); -271 cs.submit(callOnReplica, operationTimeout, id); -272} -273 } -274 -275 static RegionLocations getRegionLocations(boolean useCache, int replicaId, -276 ClusterConnection cConnection, TableName tableName, byte[] row) -277 throws RetriesExhaustedException, DoNotRetryIOException, InterruptedIOException { -278 -279RegionLocations rl; -280try { -281 if (!useCache) { -282rl = cConnection.relocateRegion(tableName, row, replicaId); -283 } else { -284rl = cConnection.locateRegion(tableName, row, useCache, true, replicaId); -285 } -286} catch (DoNotRetryIOException | InterruptedIOException | RetriesExhaustedException e) { -287 throw e; -288} catch (IOException e) { -289 throw new RetriesExhaustedException("Can't get the location", e); -290} -291if (rl == null) { -292 throw new RetriesExhaustedException("Can't get the locations"); -293} -294 -295return rl; -296 } -297} +221} catch (InterruptedException e) { +222 throw new InterruptedIOException(); +223} finally { +224 // We get there
[37/51] [partial] hbase-site git commit: Published site at 82d554e3783372cc6b05489452c815b57c06f6cd.
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/709b8fcc/devapidocs/org/apache/hadoop/hbase/master/snapshot/SnapshotManager.html -- diff --git a/devapidocs/org/apache/hadoop/hbase/master/snapshot/SnapshotManager.html b/devapidocs/org/apache/hadoop/hbase/master/snapshot/SnapshotManager.html index 3a106be..b01d3f2 100644 --- a/devapidocs/org/apache/hadoop/hbase/master/snapshot/SnapshotManager.html +++ b/devapidocs/org/apache/hadoop/hbase/master/snapshot/SnapshotManager.html @@ -318,21 +318,19 @@ implements (package private) long -cloneSnapshot(org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos.SnapshotDescriptionsnapshot, +cloneSnapshot(org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos.SnapshotDescriptionsnapshot, HTableDescriptorhTableDescriptor, - NonceKeynonceKey, - booleanrestoreAcl) + NonceKeynonceKey) Clone the specified snapshot into a new table. private long -cloneSnapshot(org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos.SnapshotDescriptionreqSnapshot, +cloneSnapshot(org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos.SnapshotDescriptionreqSnapshot, TableNametableName, org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos.SnapshotDescriptionsnapshot, HTableDescriptorsnapshotTableDesc, - NonceKeynonceKey, - booleanrestoreAcl) + NonceKeynonceKey) Clone the specified snapshot. @@ -444,9 +442,8 @@ implements long -restoreOrCloneSnapshot(org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos.SnapshotDescriptionreqSnapshot, - NonceKeynonceKey, - booleanrestoreAcl) +restoreOrCloneSnapshot(org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos.SnapshotDescriptionreqSnapshot, + NonceKeynonceKey) Restore or Clone the specified snapshot @@ -1070,7 +1067,7 @@ implements - + @@ -1080,8 +1077,7 @@ implements TableNametableName, org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos.SnapshotDescriptionsnapshot, HTableDescriptorsnapshotTableDesc, - NonceKeynonceKey, - booleanrestoreAcl) + NonceKeynonceKey) throws http://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true; title="class or interface in java.io">IOException Clone the specified snapshot. The clone will fail if the destination table has a snapshot or restore in progress. @@ -1099,7 +1095,7 @@ implements - + @@ -1107,8 +1103,7 @@ implements cloneSnapshot longcloneSnapshot(org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos.SnapshotDescriptionsnapshot, HTableDescriptorhTableDescriptor, - NonceKeynonceKey, - booleanrestoreAcl) + NonceKeynonceKey) throws HBaseSnapshotException Clone the specified snapshot into a new table. The operation will fail if the destination table has a snapshot or restore in progress. @@ -1124,15 +1119,14 @@ implements - + restoreOrCloneSnapshot publiclongrestoreOrCloneSnapshot(org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos.SnapshotDescriptionreqSnapshot, - NonceKeynonceKey, - booleanrestoreAcl) + NonceKeynonceKey) throws http://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true; title="class or interface in java.io">IOException Restore or Clone the specified snapshot @@ -1150,7 +1144,7 @@ implements restoreSnapshot -privatelongrestoreSnapshot(org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos.SnapshotDescriptionreqSnapshot, +privatelongrestoreSnapshot(org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos.SnapshotDescriptionreqSnapshot, TableNametableName, org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos.SnapshotDescriptionsnapshot, HTableDescriptorsnapshotTableDesc, @@ -1178,7 +1172,7 @@ implements restoreSnapshot -privatelongrestoreSnapshot(org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos.SnapshotDescriptionsnapshot, +privatelongrestoreSnapshot(org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos.SnapshotDescriptionsnapshot, HTableDescriptorhTableDescriptor, NonceKeynonceKey) throws HBaseSnapshotException @@ -1202,7 +1196,7 @@ implements isRestoringTable -privatebooleanisRestoringTable(TableNametableName)
[23/51] [partial] hbase-site git commit: Published site at 82d554e3783372cc6b05489452c815b57c06f6cd.
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/709b8fcc/devapidocs/src-html/org/apache/hadoop/hbase/client/HBaseAdmin.DeleteTableFuture.html -- diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/client/HBaseAdmin.DeleteTableFuture.html b/devapidocs/src-html/org/apache/hadoop/hbase/client/HBaseAdmin.DeleteTableFuture.html index f2c44db..6cf2fc8 100644 --- a/devapidocs/src-html/org/apache/hadoop/hbase/client/HBaseAdmin.DeleteTableFuture.html +++ b/devapidocs/src-html/org/apache/hadoop/hbase/client/HBaseAdmin.DeleteTableFuture.html @@ -2581,7 +2581,7 @@ 2573try { 2574 // Restore snapshot 2575 get( -2576 internalRestoreSnapshotAsync(snapshotName, tableName, false), +2576 internalRestoreSnapshotAsync(snapshotName, tableName), 2577syncWaitTimeout, 2578TimeUnit.MILLISECONDS); 2579} catch (IOException e) { @@ -2590,7 +2590,7 @@ 2582 if (takeFailSafeSnapshot) { 2583try { 2584 get( -2585 internalRestoreSnapshotAsync(failSafeSnapshotSnapshotName, tableName, false), +2585 internalRestoreSnapshotAsync(failSafeSnapshotSnapshotName, tableName), 2586syncWaitTimeout, 2587TimeUnit.MILLISECONDS); 2588 String msg = "Restore snapshot=" + snapshotName + @@ -2633,7 +2633,7 @@ 2625 throw new TableNotDisabledException(tableName); 2626} 2627 -2628return internalRestoreSnapshotAsync(snapshotName, tableName, false); +2628return internalRestoreSnapshotAsync(snapshotName, tableName); 2629 } 2630 2631 @Override @@ -2643,1621 +2643,1614 @@ 2635 } 2636 2637 @Override -2638 public void cloneSnapshot(String snapshotName, TableName tableName, boolean restoreAcl) +2638 public void cloneSnapshot(final String snapshotName, final TableName tableName) 2639 throws IOException, TableExistsException, RestoreSnapshotException { 2640if (tableExists(tableName)) { 2641 throw new TableExistsException(tableName); 2642} 2643get( -2644 internalRestoreSnapshotAsync(snapshotName, tableName, restoreAcl), +2644 internalRestoreSnapshotAsync(snapshotName, tableName), 2645 Integer.MAX_VALUE, 2646 TimeUnit.MILLISECONDS); 2647 } 2648 2649 @Override -2650 public void cloneSnapshot(final String snapshotName, final TableName tableName) -2651 throws IOException, TableExistsException, RestoreSnapshotException { -2652cloneSnapshot(snapshotName, tableName, false); -2653 } -2654 -2655 @Override -2656 public FutureVoid cloneSnapshotAsync(final String snapshotName, final TableName tableName) -2657 throws IOException, TableExistsException { -2658if (tableExists(tableName)) { -2659 throw new TableExistsException(tableName); -2660} -2661return internalRestoreSnapshotAsync(snapshotName, tableName, false); -2662 } -2663 -2664 @Override -2665 public byte[] execProcedureWithRet(String signature, String instance, MapString, String props) -2666 throws IOException { -2667ProcedureDescription desc = ProtobufUtil.buildProcedureDescription(signature, instance, props); -2668final ExecProcedureRequest request = -2669 ExecProcedureRequest.newBuilder().setProcedure(desc).build(); -2670// run the procedure on the master -2671ExecProcedureResponse response = executeCallable( -2672 new MasterCallableExecProcedureResponse(getConnection(), getRpcControllerFactory()) { -2673@Override -2674protected ExecProcedureResponse rpcCall() throws Exception { -2675 return master.execProcedureWithRet(getRpcController(), request); -2676} -2677 }); -2678 -2679return response.hasReturnData() ? response.getReturnData().toByteArray() : null; -2680 } -2681 -2682 @Override -2683 public void execProcedure(String signature, String instance, MapString, String props) -2684 throws IOException { -2685ProcedureDescription desc = ProtobufUtil.buildProcedureDescription(signature, instance, props); -2686final ExecProcedureRequest request = -2687 ExecProcedureRequest.newBuilder().setProcedure(desc).build(); -2688// run the procedure on the master -2689ExecProcedureResponse response = executeCallable(new MasterCallableExecProcedureResponse( -2690getConnection(), getRpcControllerFactory()) { -2691 @Override -2692 protected ExecProcedureResponse rpcCall() throws Exception { -2693return master.execProcedure(getRpcController(), request); -2694 } -2695}); -2696 -2697long start = EnvironmentEdgeManager.currentTime(); -2698long max = response.getExpectedTimeout(); -2699long maxPauseTime = max / this.numRetries; -2700int tries = 0; -2701LOG.debug("Waiting a max of " + max + " ms for procedure '" + -2702signature + " : " + instance + "'' to complete. (max " + maxPauseTime + " ms per
[19/51] [partial] hbase-site git commit: Published site at 82d554e3783372cc6b05489452c815b57c06f6cd.
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/709b8fcc/devapidocs/src-html/org/apache/hadoop/hbase/client/HBaseAdmin.ModifyColumnFamilyFuture.html -- diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/client/HBaseAdmin.ModifyColumnFamilyFuture.html b/devapidocs/src-html/org/apache/hadoop/hbase/client/HBaseAdmin.ModifyColumnFamilyFuture.html index f2c44db..6cf2fc8 100644 --- a/devapidocs/src-html/org/apache/hadoop/hbase/client/HBaseAdmin.ModifyColumnFamilyFuture.html +++ b/devapidocs/src-html/org/apache/hadoop/hbase/client/HBaseAdmin.ModifyColumnFamilyFuture.html @@ -2581,7 +2581,7 @@ 2573try { 2574 // Restore snapshot 2575 get( -2576 internalRestoreSnapshotAsync(snapshotName, tableName, false), +2576 internalRestoreSnapshotAsync(snapshotName, tableName), 2577syncWaitTimeout, 2578TimeUnit.MILLISECONDS); 2579} catch (IOException e) { @@ -2590,7 +2590,7 @@ 2582 if (takeFailSafeSnapshot) { 2583try { 2584 get( -2585 internalRestoreSnapshotAsync(failSafeSnapshotSnapshotName, tableName, false), +2585 internalRestoreSnapshotAsync(failSafeSnapshotSnapshotName, tableName), 2586syncWaitTimeout, 2587TimeUnit.MILLISECONDS); 2588 String msg = "Restore snapshot=" + snapshotName + @@ -2633,7 +2633,7 @@ 2625 throw new TableNotDisabledException(tableName); 2626} 2627 -2628return internalRestoreSnapshotAsync(snapshotName, tableName, false); +2628return internalRestoreSnapshotAsync(snapshotName, tableName); 2629 } 2630 2631 @Override @@ -2643,1621 +2643,1614 @@ 2635 } 2636 2637 @Override -2638 public void cloneSnapshot(String snapshotName, TableName tableName, boolean restoreAcl) +2638 public void cloneSnapshot(final String snapshotName, final TableName tableName) 2639 throws IOException, TableExistsException, RestoreSnapshotException { 2640if (tableExists(tableName)) { 2641 throw new TableExistsException(tableName); 2642} 2643get( -2644 internalRestoreSnapshotAsync(snapshotName, tableName, restoreAcl), +2644 internalRestoreSnapshotAsync(snapshotName, tableName), 2645 Integer.MAX_VALUE, 2646 TimeUnit.MILLISECONDS); 2647 } 2648 2649 @Override -2650 public void cloneSnapshot(final String snapshotName, final TableName tableName) -2651 throws IOException, TableExistsException, RestoreSnapshotException { -2652cloneSnapshot(snapshotName, tableName, false); -2653 } -2654 -2655 @Override -2656 public FutureVoid cloneSnapshotAsync(final String snapshotName, final TableName tableName) -2657 throws IOException, TableExistsException { -2658if (tableExists(tableName)) { -2659 throw new TableExistsException(tableName); -2660} -2661return internalRestoreSnapshotAsync(snapshotName, tableName, false); -2662 } -2663 -2664 @Override -2665 public byte[] execProcedureWithRet(String signature, String instance, MapString, String props) -2666 throws IOException { -2667ProcedureDescription desc = ProtobufUtil.buildProcedureDescription(signature, instance, props); -2668final ExecProcedureRequest request = -2669 ExecProcedureRequest.newBuilder().setProcedure(desc).build(); -2670// run the procedure on the master -2671ExecProcedureResponse response = executeCallable( -2672 new MasterCallableExecProcedureResponse(getConnection(), getRpcControllerFactory()) { -2673@Override -2674protected ExecProcedureResponse rpcCall() throws Exception { -2675 return master.execProcedureWithRet(getRpcController(), request); -2676} -2677 }); -2678 -2679return response.hasReturnData() ? response.getReturnData().toByteArray() : null; -2680 } -2681 -2682 @Override -2683 public void execProcedure(String signature, String instance, MapString, String props) -2684 throws IOException { -2685ProcedureDescription desc = ProtobufUtil.buildProcedureDescription(signature, instance, props); -2686final ExecProcedureRequest request = -2687 ExecProcedureRequest.newBuilder().setProcedure(desc).build(); -2688// run the procedure on the master -2689ExecProcedureResponse response = executeCallable(new MasterCallableExecProcedureResponse( -2690getConnection(), getRpcControllerFactory()) { -2691 @Override -2692 protected ExecProcedureResponse rpcCall() throws Exception { -2693return master.execProcedure(getRpcController(), request); -2694 } -2695}); -2696 -2697long start = EnvironmentEdgeManager.currentTime(); -2698long max = response.getExpectedTimeout(); -2699long maxPauseTime = max / this.numRetries; -2700int tries = 0; -2701LOG.debug("Waiting a max of " + max + " ms for procedure '" + -2702signature + " : " + instance + "'' to complete.
[46/51] [partial] hbase-site git commit: Published site at 82d554e3783372cc6b05489452c815b57c06f6cd.
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/709b8fcc/checkstyle-aggregate.html -- diff --git a/checkstyle-aggregate.html b/checkstyle-aggregate.html index f9a0061..36ba1e1 100644 --- a/checkstyle-aggregate.html +++ b/checkstyle-aggregate.html @@ -7,7 +7,7 @@ - + Apache HBase Checkstyle Results @@ -289,7 +289,7 @@ 2159 0 0 -14333 +14339 Files @@ -2957,7 +2957,7 @@ org/apache/hadoop/hbase/master/HMaster.java 0 0 -236 +237 org/apache/hadoop/hbase/master/HMasterCommandLine.java 0 @@ -3869,3176 +3869,3181 @@ 0 1 -org/apache/hadoop/hbase/regionserver/Chunk.java +org/apache/hadoop/hbase/regionserver/ChangedReadersObserver.java 0 0 1 +org/apache/hadoop/hbase/regionserver/Chunk.java +0 +0 +1 + org/apache/hadoop/hbase/regionserver/ChunkCreator.java 0 0 6 - + org/apache/hadoop/hbase/regionserver/CompactSplitThread.java 0 0 11 - + org/apache/hadoop/hbase/regionserver/CompactedHFilesDischargeHandler.java 0 0 1 - + org/apache/hadoop/hbase/regionserver/CompactedHFilesDischarger.java 0 0 5 - + org/apache/hadoop/hbase/regionserver/CompactingMemStore.java 0 0 -3 - +6 + org/apache/hadoop/hbase/regionserver/CompactionPipeline.java 0 0 5 - + org/apache/hadoop/hbase/regionserver/CompactionRequestor.java 0 0 6 - + org/apache/hadoop/hbase/regionserver/CompactionTool.java 0 0 12 - + org/apache/hadoop/hbase/regionserver/CompositeImmutableSegment.java 0 0 3 - + org/apache/hadoop/hbase/regionserver/DefaultHeapMemoryTuner.java 0 0 31 - + org/apache/hadoop/hbase/regionserver/DefaultMemStore.java 0 0 1 - + org/apache/hadoop/hbase/regionserver/DefaultStoreFileManager.java 0 0 1 - + org/apache/hadoop/hbase/regionserver/DefaultStoreFlusher.java 0 0 2 - + org/apache/hadoop/hbase/regionserver/DisabledRegionSplitPolicy.java 0 0 1 - + org/apache/hadoop/hbase/regionserver/FavoredNodesForRegion.java 0 0 2 - + org/apache/hadoop/hbase/regionserver/FifoRpcSchedulerFactory.java 0 0 1 - + org/apache/hadoop/hbase/regionserver/FlushAllLargeStoresPolicy.java 0 0 1 - + org/apache/hadoop/hbase/regionserver/FlushNonSloppyStoresFirstPolicy.java 0 0 2 - + org/apache/hadoop/hbase/regionserver/FlushPolicyFactory.java 0 0 1 - + org/apache/hadoop/hbase/regionserver/FlushRequestListener.java 0 0 1 - + org/apache/hadoop/hbase/regionserver/FlushRequester.java 0 0 3 - + org/apache/hadoop/hbase/regionserver/HMobStore.java 0 0 8 - + org/apache/hadoop/hbase/regionserver/HRegion.java 0 0 204 - + org/apache/hadoop/hbase/regionserver/HRegionFileSystem.java 0 0 46 - + org/apache/hadoop/hbase/regionserver/HRegionServer.java 0 0 128 - + org/apache/hadoop/hbase/regionserver/HRegionServerCommandLine.java 0 0 3 - + org/apache/hadoop/hbase/regionserver/HStore.java 0 0 -53 - +52 + org/apache/hadoop/hbase/regionserver/HeapMemoryManager.java 0 0 15 - + org/apache/hadoop/hbase/regionserver/HeapMemoryTuner.java 0 0 2 - + org/apache/hadoop/hbase/regionserver/ImmutableSegment.java 0 0 8 - + org/apache/hadoop/hbase/regionserver/IncreasingToUpperBoundRegionSplitPolicy.java 0 0 2 - + org/apache/hadoop/hbase/regionserver/InternalScan.java 0 0 2 - + org/apache/hadoop/hbase/regionserver/InternalScanner.java 0 0 2 - + org/apache/hadoop/hbase/regionserver/KeyPrefixRegionSplitPolicy.java 0 0 1 - + org/apache/hadoop/hbase/regionserver/KeyValueHeap.java 0 0 10 - + org/apache/hadoop/hbase/regionserver/KeyValueScanner.java 0 0 4 - + org/apache/hadoop/hbase/regionserver/LeaseException.java 0 0 1 - + org/apache/hadoop/hbase/regionserver/Leases.java 0 0 12 - + org/apache/hadoop/hbase/regionserver/LogRoller.java 0 0 5 - + org/apache/hadoop/hbase/regionserver/MemStore.java 0 0 9 - + org/apache/hadoop/hbase/regionserver/MemStoreCompactor.java 0 0 19 - + org/apache/hadoop/hbase/regionserver/MemStoreCompactorSegmentsIterator.java 0 0 3 - + org/apache/hadoop/hbase/regionserver/MemStoreFlusher.java 0 0 31 - + org/apache/hadoop/hbase/regionserver/MemStoreLABImpl.java 0 0 2 - + org/apache/hadoop/hbase/regionserver/MemStoreMergerSegmentsIterator.java 0 0 1 - + org/apache/hadoop/hbase/regionserver/MemStoreSegmentsIterator.java 0 0 1 - + org/apache/hadoop/hbase/regionserver/MemStoreSnapshot.java 0 0 1 - + org/apache/hadoop/hbase/regionserver/MetricsHeapMemoryManagerSource.java 0 0 1 - + org/apache/hadoop/hbase/regionserver/MetricsRegion.java 0 0 1 - + org/apache/hadoop/hbase/regionserver/MetricsRegionServer.java 0 0 1 - + org/apache/hadoop/hbase/regionserver/MetricsRegionServerSourceFactoryImpl.java 0 0 1 - + org/apache/hadoop/hbase/regionserver/MetricsRegionServerSourceImpl.java 0 0 3 - + org/apache/hadoop/hbase/regionserver/MetricsRegionServerWrapperImpl.java 0 0 1 - + org/apache/hadoop/hbase/regionserver/MetricsRegionWrapperImpl.java 0 0 1 - +
[47/51] [partial] hbase-site git commit: Published site at 82d554e3783372cc6b05489452c815b57c06f6cd.
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/709b8fcc/bulk-loads.html -- diff --git a/bulk-loads.html b/bulk-loads.html index a81ff3f..c5551ed 100644 --- a/bulk-loads.html +++ b/bulk-loads.html @@ -7,7 +7,7 @@ - + Apache HBase Bulk Loads in Apache HBase (TM) @@ -311,7 +311,7 @@ under the License. --> https://www.apache.org/;>The Apache Software Foundation. All rights reserved. - Last Published: 2017-05-11 + Last Published: 2017-05-12
[35/51] [partial] hbase-site git commit: Published site at 82d554e3783372cc6b05489452c815b57c06f6cd.
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/709b8fcc/devapidocs/org/apache/hadoop/hbase/regionserver/HStore.html -- diff --git a/devapidocs/org/apache/hadoop/hbase/regionserver/HStore.html b/devapidocs/org/apache/hadoop/hbase/regionserver/HStore.html index 73d676f..324ef65 100644 --- a/devapidocs/org/apache/hadoop/hbase/regionserver/HStore.html +++ b/devapidocs/org/apache/hadoop/hbase/regionserver/HStore.html @@ -328,7 +328,7 @@ implements memstore -private static http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true; title="class or interface in java.lang">String +static http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true; title="class or interface in java.lang">String MEMSTORE_CLASS_NAME @@ -1177,7 +1177,7 @@ implements MEMSTORE_CLASS_NAME -private static finalhttp://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true; title="class or interface in java.lang">String MEMSTORE_CLASS_NAME +public static finalhttp://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true; title="class or interface in java.lang">String MEMSTORE_CLASS_NAME See Also: Constant Field Values @@ -1640,7 +1640,7 @@ implements FIXED_OVERHEAD -public static finallong FIXED_OVERHEAD +public static finallong FIXED_OVERHEAD @@ -1649,7 +1649,7 @@ implements DEEP_OVERHEAD -public static finallong DEEP_OVERHEAD +public static finallong DEEP_OVERHEAD @@ -1696,7 +1696,7 @@ implements createCacheConf -protectedvoidcreateCacheConf(HColumnDescriptorfamily) +protectedvoidcreateCacheConf(HColumnDescriptorfamily) Creates the cache config. Parameters: @@ -1710,7 +1710,7 @@ implements createStoreEngine -protectedStoreEngine?,?,?,?createStoreEngine(Storestore, +protectedStoreEngine?,?,?,?createStoreEngine(Storestore, org.apache.hadoop.conf.Configurationconf, CellComparatorkvComparator) throws http://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true; title="class or interface in java.io">IOException @@ -1734,7 +1734,7 @@ implements determineTTLFromFamily -public staticlongdetermineTTLFromFamily(HColumnDescriptorfamily) +public staticlongdetermineTTLFromFamily(HColumnDescriptorfamily) Parameters: family - @@ -1749,7 +1749,7 @@ implements getColumnFamilyName -publichttp://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true; title="class or interface in java.lang">StringgetColumnFamilyName() +publichttp://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true; title="class or interface in java.lang">StringgetColumnFamilyName() Specified by: getColumnFamilyNamein interfaceStore @@ -1762,7 +1762,7 @@ implements getTableName -publicTableNamegetTableName() +publicTableNamegetTableName() Specified by: getTableNamein interfaceStore @@ -1775,7 +1775,7 @@ implements getFileSystem -publicorg.apache.hadoop.fs.FileSystemgetFileSystem() +publicorg.apache.hadoop.fs.FileSystemgetFileSystem() Specified by: getFileSystemin interfaceStore @@ -1788,7 +1788,7 @@ implements getRegionFileSystem -publicHRegionFileSystemgetRegionFileSystem() +publicHRegionFileSystemgetRegionFileSystem() @@ -1797,7 +1797,7 @@ implements getStoreFileTtl -publiclonggetStoreFileTtl() +publiclonggetStoreFileTtl() Specified by: getStoreFileTtlin interfaceStoreConfigInformation @@ -1812,7 +1812,7 @@ implements getMemstoreFlushSize -publiclonggetMemstoreFlushSize() +publiclonggetMemstoreFlushSize() Specified by: getMemstoreFlushSizein interfaceStoreConfigInformation @@ -1828,7 +1828,7 @@ implements getFlushableSize http://docs.oracle.com/javase/8/docs/api/java/lang/Deprecated.html?is-external=true; title="class or interface in java.lang">@Deprecated -publiclonggetFlushableSize() +publiclonggetFlushableSize() Deprecated. Specified by: @@ -1846,7 +1846,7 @@ publiclong getSizeToFlush -publicMemstoreSizegetSizeToFlush() +publicMemstoreSizegetSizeToFlush() Specified by: getSizeToFlushin interfaceStore @@ -1864,7 +1864,7 @@ publiclong getSnapshotSize http://docs.oracle.com/javase/8/docs/api/java/lang/Deprecated.html?is-external=true; title="class or interface in java.lang">@Deprecated -publiclonggetSnapshotSize() +publiclonggetSnapshotSize() Deprecated. Description copied from interface:Store Returns the memstore snapshot size @@ -1882,7 +1882,7 @@ publiclong getSizeOfSnapshot -publicMemstoreSizegetSizeOfSnapshot() +publicMemstoreSizegetSizeOfSnapshot() Specified by: getSizeOfSnapshotin interfaceStore @@ -1897,7 +1897,7 @@ publiclong getCompactionCheckMultiplier -publiclonggetCompactionCheckMultiplier() +publiclonggetCompactionCheckMultiplier() Specified by:
[33/51] [partial] hbase-site git commit: Published site at 82d554e3783372cc6b05489452c815b57c06f6cd.
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/709b8fcc/devapidocs/org/apache/hadoop/hbase/regionserver/StoreScanner.html -- diff --git a/devapidocs/org/apache/hadoop/hbase/regionserver/StoreScanner.html b/devapidocs/org/apache/hadoop/hbase/regionserver/StoreScanner.html index 3391360..a606881 100644 --- a/devapidocs/org/apache/hadoop/hbase/regionserver/StoreScanner.html +++ b/devapidocs/org/apache/hadoop/hbase/regionserver/StoreScanner.html @@ -18,7 +18,7 @@ catch(err) { } //--> -var methods = {"i0":10,"i1":10,"i2":10,"i3":10,"i4":10,"i5":9,"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}; +var methods = {"i0":10,"i1":10,"i2":10,"i3":9,"i4":10,"i5":10,"i6":9,"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}; var tabs = {65535:["t0","All Methods"],1:["t1","Static Methods"],2:["t2","Instance Methods"],8:["t4","Concrete Methods"]}; var altColor = "altColor"; var rowColor = "rowColor"; @@ -128,7 +128,7 @@ var activeTableTab = "activeTableTab"; @InterfaceAudience.Private -public class StoreScanner +public class StoreScanner extends NonReversedNonLazyKeyValueScanner implements KeyValueScanner, InternalScanner, ChangedReadersObserver Scanner scans both the memstore and the Store. Coalesce KeyValue stream into ListKeyValue @@ -273,71 +273,75 @@ implements maxRowSize +private http://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true; title="class or interface in java.util">ListKeyValueScanner +memStoreScannersAfterFlush + + private int minVersions - + private long now - + private long oldestUnexpiredTS - + private boolean parallelSeekEnabled A flag that enables StoreFileScanner parallel-seeking - + private long preadMaxBytes - + private Cell prevCell - + protected long readPt - + private Scan.ReadType readType - + private Scan scan - + private boolean scanUsePread - + protected Store store - + private int storeLimit - + private int storeOffset - + static http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true; title="class or interface in java.lang">String STORESCANNER_PARALLEL_SEEK_ENABLE - + static http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true; title="class or interface in java.lang">String STORESCANNER_PREAD_MAX_BYTES If the read type if Scan.ReadType.DEFAULT, we will start with pread, and if the kvs we scanned reaches this limit, we will reopen the scanner with stream. - + private boolean useRowColBloom @@ -480,117 +484,125 @@ implements +private static void +clearAndClose(http://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true; title="class or interface in java.util">ListKeyValueScannerscanners) + + void close() Close the KeyValue scanner. - + private void close(booleanwithHeapClose) - + (package private) static void enableLazySeekGlobally(booleanenable) - + (package private) http://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true; title="class or interface in java.util">ListKeyValueScanner getAllScannersForTesting() Used in testing. - + long getEstimatedNumberOfKvsScanned() - + Cell getNextIndexedKey() - + +long +getReadPoint() + + long getScannerOrder() Get the order of this KeyValueScanner. - + private http://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true; title="class or interface in java.util">ListKeyValueScanner getScannersNoCompaction() Get a filtered list of scanners. - + KeyValue next() Return the next Cell in this scanner, iterating the scanner - + boolean next(http://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true; title="class or interface in java.util">ListCelloutResult) Grab the next row's worth of values. - + boolean next(http://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true; title="class or interface in java.util">ListCelloutResult, ScannerContextscannerContext) Get the next row of values from this Store. - + private void parallelSeek(http://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true; title="class or interface in java.util">List? extends KeyValueScannerscanners, Cellkv) Seek storefiles in parallel to optimize IO latency as much as possible - + Cell peek() Look at the next Cell in this scanner, but do not iterate scanner. - + protected boolean reopenAfterFlush() - + boolean reseek(Cellkv) Reseek the scanner at or
[25/51] [partial] hbase-site git commit: Published site at 82d554e3783372cc6b05489452c815b57c06f6cd.
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/709b8fcc/devapidocs/src-html/org/apache/hadoop/hbase/client/HBaseAdmin.CreateTableFuture.html -- diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/client/HBaseAdmin.CreateTableFuture.html b/devapidocs/src-html/org/apache/hadoop/hbase/client/HBaseAdmin.CreateTableFuture.html index f2c44db..6cf2fc8 100644 --- a/devapidocs/src-html/org/apache/hadoop/hbase/client/HBaseAdmin.CreateTableFuture.html +++ b/devapidocs/src-html/org/apache/hadoop/hbase/client/HBaseAdmin.CreateTableFuture.html @@ -2581,7 +2581,7 @@ 2573try { 2574 // Restore snapshot 2575 get( -2576 internalRestoreSnapshotAsync(snapshotName, tableName, false), +2576 internalRestoreSnapshotAsync(snapshotName, tableName), 2577syncWaitTimeout, 2578TimeUnit.MILLISECONDS); 2579} catch (IOException e) { @@ -2590,7 +2590,7 @@ 2582 if (takeFailSafeSnapshot) { 2583try { 2584 get( -2585 internalRestoreSnapshotAsync(failSafeSnapshotSnapshotName, tableName, false), +2585 internalRestoreSnapshotAsync(failSafeSnapshotSnapshotName, tableName), 2586syncWaitTimeout, 2587TimeUnit.MILLISECONDS); 2588 String msg = "Restore snapshot=" + snapshotName + @@ -2633,7 +2633,7 @@ 2625 throw new TableNotDisabledException(tableName); 2626} 2627 -2628return internalRestoreSnapshotAsync(snapshotName, tableName, false); +2628return internalRestoreSnapshotAsync(snapshotName, tableName); 2629 } 2630 2631 @Override @@ -2643,1621 +2643,1614 @@ 2635 } 2636 2637 @Override -2638 public void cloneSnapshot(String snapshotName, TableName tableName, boolean restoreAcl) +2638 public void cloneSnapshot(final String snapshotName, final TableName tableName) 2639 throws IOException, TableExistsException, RestoreSnapshotException { 2640if (tableExists(tableName)) { 2641 throw new TableExistsException(tableName); 2642} 2643get( -2644 internalRestoreSnapshotAsync(snapshotName, tableName, restoreAcl), +2644 internalRestoreSnapshotAsync(snapshotName, tableName), 2645 Integer.MAX_VALUE, 2646 TimeUnit.MILLISECONDS); 2647 } 2648 2649 @Override -2650 public void cloneSnapshot(final String snapshotName, final TableName tableName) -2651 throws IOException, TableExistsException, RestoreSnapshotException { -2652cloneSnapshot(snapshotName, tableName, false); -2653 } -2654 -2655 @Override -2656 public FutureVoid cloneSnapshotAsync(final String snapshotName, final TableName tableName) -2657 throws IOException, TableExistsException { -2658if (tableExists(tableName)) { -2659 throw new TableExistsException(tableName); -2660} -2661return internalRestoreSnapshotAsync(snapshotName, tableName, false); -2662 } -2663 -2664 @Override -2665 public byte[] execProcedureWithRet(String signature, String instance, MapString, String props) -2666 throws IOException { -2667ProcedureDescription desc = ProtobufUtil.buildProcedureDescription(signature, instance, props); -2668final ExecProcedureRequest request = -2669 ExecProcedureRequest.newBuilder().setProcedure(desc).build(); -2670// run the procedure on the master -2671ExecProcedureResponse response = executeCallable( -2672 new MasterCallableExecProcedureResponse(getConnection(), getRpcControllerFactory()) { -2673@Override -2674protected ExecProcedureResponse rpcCall() throws Exception { -2675 return master.execProcedureWithRet(getRpcController(), request); -2676} -2677 }); -2678 -2679return response.hasReturnData() ? response.getReturnData().toByteArray() : null; -2680 } -2681 -2682 @Override -2683 public void execProcedure(String signature, String instance, MapString, String props) -2684 throws IOException { -2685ProcedureDescription desc = ProtobufUtil.buildProcedureDescription(signature, instance, props); -2686final ExecProcedureRequest request = -2687 ExecProcedureRequest.newBuilder().setProcedure(desc).build(); -2688// run the procedure on the master -2689ExecProcedureResponse response = executeCallable(new MasterCallableExecProcedureResponse( -2690getConnection(), getRpcControllerFactory()) { -2691 @Override -2692 protected ExecProcedureResponse rpcCall() throws Exception { -2693return master.execProcedure(getRpcController(), request); -2694 } -2695}); -2696 -2697long start = EnvironmentEdgeManager.currentTime(); -2698long max = response.getExpectedTimeout(); -2699long maxPauseTime = max / this.numRetries; -2700int tries = 0; -2701LOG.debug("Waiting a max of " + max + " ms for procedure '" + -2702signature + " : " + instance + "'' to complete. (max " + maxPauseTime + " ms per
[39/51] [partial] hbase-site git commit: Published site at 82d554e3783372cc6b05489452c815b57c06f6cd.
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/709b8fcc/devapidocs/org/apache/hadoop/hbase/master/HMasterCommandLine.LocalHMaster.html -- diff --git a/devapidocs/org/apache/hadoop/hbase/master/HMasterCommandLine.LocalHMaster.html b/devapidocs/org/apache/hadoop/hbase/master/HMasterCommandLine.LocalHMaster.html index b9c7265..86e6e7f 100644 --- a/devapidocs/org/apache/hadoop/hbase/master/HMasterCommandLine.LocalHMaster.html +++ b/devapidocs/org/apache/hadoop/hbase/master/HMasterCommandLine.LocalHMaster.html @@ -248,7 +248,7 @@ extends Methods inherited from classorg.apache.hadoop.hbase.master.HMaster -abort, abortProcedure, addColumn, addReplicationPeer, balance, balance, balanceSwitch, canCreateBaseZNode, canUpdateTableDescriptor, checkInitialized, checkServiceStarted, checkTableModifiable, configureInfoServer, constructMaster, createMetaBootstrap, createNamespace, createRpcServices, createServerManager, createSystemTable, createTable, deleteColumn, deleteNamespace, deleteTable, disableReplicationPeer, disableTable, drainRegionServer, enableReplicationPeer, enableTable, getAssignmentManager, getAverageLoad, getCatalogJanitor, getClientIdAuditPrefix, getClusterSchema, getClusterStatus, getDumpServlet, getFavoredNodesManager, getFsTableDescriptors, getHFileCleaner, getInitializedEvent, getLastMajorCompactionTimestamp, getLastMajorCompactionTimestampForRegion, getLoadBalancer, getLoadBalancerClassName, getLoadedCoprocessors, getLockMan ager, getLogCleaner, getMasterActiveTime, getMasterCoprocessorHost, getMasterCoprocessors, getMasterFileSystem, getMasterMetrics, getMasterProcedureExecutor, getMasterProcedureManagerHost, getMasterQuotaManager, getMasterRpcServices, getMasterStartTime, getMasterWalManager, getMergePlanCount, getMobCompactionState, getNamespace, getNamespaces, getNumWALFiles, getProcessName, getRegionNormalizer, getRegionNormalizerTracker, getRegionServerFatalLogBuffer, getRegionServerInfoPort, getRegionServerVersion, getRemoteInetAddress, getReplicationPeerConfig, getServerCrashProcessingEnabledEvent, getServerManager, getServerName, getSnapshotManager, getSplitOrMergeTracker, getSplitPlanCount, getTableDescriptors, getTableRegionForRow, getTableStateManager, getWalProcedureStore, getZooKeeper, initClusterSchemaService, initializeZKBasedSystemTrackers, initQuotaManager, isActiveMaster, isBalancerOn, isCatalogJanitorEnabled, isCleanerChoreEnabled, isInitializationStartsMetaRegionAssignment, isInitialized, isInMaintenanceMode, isNormalizerOn, isServerCrashProcessingEnabled, isSplitOrMergeEnabled, listDrainingRegionServers, listLocks, listProcedures, listReplicationPeers, listTableDescriptors, listTableDescriptorsByNamespace, listTableNames , listTableNamesByNamespace, login, main, mergeRegions, modifyColumn, modifyNamespace, modifyTable, move, normalizeRegions, registerService, removeDrainFromRegionServer, removeReplicationPeer, reportMobCompactionEnd, reportMobCompactionStart, requestMobCompaction, restoreSnapshot, sendShutdownInterrupt, setCatalogJanitorEnabled, setInitialized, setServerCrashProcessingEnabled, shutdown, splitRegion, stopMaster, stopServiceThreads, truncateTable, updateReplicationPeerConfig, waitForMasterActive +abort, abortProcedure, addColumn, addReplicationPeer, balance, balance, balanceSwitch, canCreateBaseZNode, canUpdateTableDescriptor, checkInitialized, checkServiceStarted, checkTableModifiable, configureInfoServer, constructMaster, createMetaBootstrap, createNamespace, createRpcServices, createServerManager, createSystemTable, createTable, deleteColumn, deleteNamespace, deleteTable, disableReplicationPeer, disableTable, drainRegionServer, enableReplicationPeer, enableTable, getAssignmentManager, getAverageLoad, getCatalogJanitor, getClientIdAuditPrefix, getClusterSchema, getClusterStatus, getDumpServlet, getFavoredNodesManager, getFsTableDescriptors, getHFileCleaner, getInitializedEvent, getLastMajorCompactionTimestamp, getLastMajorCompactionTimestampForRegion, getLoadBalancer, getLoadBalancerClassName, getLoadedCoprocessors, getLockMan ager, getLogCleaner, getMasterActiveTime, getMasterCoprocessorHost, getMasterCoprocessors, getMasterFileSystem, getMasterMetrics, getMasterProcedureExecutor, getMasterProcedureManagerHost, getMasterQuotaManager, getMasterRpcServices, getMasterStartTime, getMasterWalManager, getMergePlanCount, getMobCompactionState, getNamespace, getNamespaces, getNumWALFiles, getProcessName, getRegionNormalizer, getRegionNormalizerTracker, getRegionServerFatalLogBuffer, getRegionServerInfoPort, getRegionServerVersion, getRemoteInetAddress, getReplicationPeerConfig, getServerCrashProcessingEnabledEvent, getServerManager, getServerName, getSnapshotManager, getSplitOrMergeTracker,
[01/51] [partial] hbase-site git commit: Published site at 82d554e3783372cc6b05489452c815b57c06f6cd.
Repository: hbase-site Updated Branches: refs/heads/asf-site d5aa6a181 -> 709b8fccb http://git-wip-us.apache.org/repos/asf/hbase-site/blob/709b8fcc/devapidocs/src-html/org/apache/hadoop/hbase/master/snapshot/SnapshotManager.html -- diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/master/snapshot/SnapshotManager.html b/devapidocs/src-html/org/apache/hadoop/hbase/master/snapshot/SnapshotManager.html index 40e88c1..740d74a 100644 --- a/devapidocs/src-html/org/apache/hadoop/hbase/master/snapshot/SnapshotManager.html +++ b/devapidocs/src-html/org/apache/hadoop/hbase/master/snapshot/SnapshotManager.html @@ -688,7 +688,7 @@ 680 */ 681 private long cloneSnapshot(final SnapshotDescription reqSnapshot, final TableName tableName, 682 final SnapshotDescription snapshot, final HTableDescriptor snapshotTableDesc, -683 final NonceKey nonceKey, final boolean restoreAcl) throws IOException { +683 final NonceKey nonceKey) throws IOException { 684MasterCoprocessorHost cpHost = master.getMasterCoprocessorHost(); 685HTableDescriptor htd = new HTableDescriptor(tableName, snapshotTableDesc); 686if (cpHost != null) { @@ -696,7 +696,7 @@ 688} 689long procId; 690try { -691 procId = cloneSnapshot(snapshot, htd, nonceKey, restoreAcl); +691 procId = cloneSnapshot(snapshot, htd, nonceKey); 692} catch (IOException e) { 693 LOG.error("Exception occurred while cloning the snapshot " + snapshot.getName() 694+ " as table " + tableName.getNameAsString(), e); @@ -720,7 +720,7 @@ 712 * @return procId the ID of the clone snapshot procedure 713 */ 714 synchronized long cloneSnapshot(final SnapshotDescription snapshot, -715 final HTableDescriptor hTableDescriptor, final NonceKey nonceKey, final boolean restoreAcl) +715 final HTableDescriptor hTableDescriptor, final NonceKey nonceKey) 716 throws HBaseSnapshotException { 717TableName tableName = hTableDescriptor.getTableName(); 718 @@ -736,8 +736,8 @@ 728 729try { 730 long procId = master.getMasterProcedureExecutor().submitProcedure( -731new CloneSnapshotProcedure(master.getMasterProcedureExecutor().getEnvironment(), -732hTableDescriptor, snapshot, restoreAcl), +731new CloneSnapshotProcedure( +732 master.getMasterProcedureExecutor().getEnvironment(), hTableDescriptor, snapshot), 733nonceKey); 734 this.restoreTableToProcIdMap.put(tableName, procId); 735 return procId; @@ -755,8 +755,8 @@ 747 * @param nonceKey unique identifier to prevent duplicated RPC 748 * @throws IOException 749 */ -750 public long restoreOrCloneSnapshot(final SnapshotDescription reqSnapshot, final NonceKey nonceKey, -751 final boolean restoreAcl) throws IOException { +750 public long restoreOrCloneSnapshot(final SnapshotDescription reqSnapshot, final NonceKey nonceKey) +751 throws IOException { 752FileSystem fs = master.getMasterFileSystem().getFileSystem(); 753Path snapshotDir = SnapshotDescriptionUtils.getCompletedSnapshotDir(reqSnapshot, rootDir); 754 @@ -787,394 +787,393 @@ 779if (MetaTableAccessor.tableExists(master.getConnection(), tableName)) { 780 procId = restoreSnapshot(reqSnapshot, tableName, snapshot, snapshotTableDesc, nonceKey); 781} else { -782 procId = -783 cloneSnapshot(reqSnapshot, tableName, snapshot, snapshotTableDesc, nonceKey, restoreAcl); -784} -785return procId; -786 } -787 -788 /** -789 * Restore the specified snapshot. -790 * The restore will fail if the destination table has a snapshot or restore in progress. -791 * -792 * @param reqSnapshot Snapshot Descriptor from request -793 * @param tableName table to restore -794 * @param snapshot Snapshot Descriptor -795 * @param snapshotTableDesc Table Descriptor -796 * @param nonceKey unique identifier to prevent duplicated RPC -797 * @return procId the ID of the restore snapshot procedure -798 * @throws IOException -799 */ -800 private long restoreSnapshot(final SnapshotDescription reqSnapshot, final TableName tableName, -801 final SnapshotDescription snapshot, final HTableDescriptor snapshotTableDesc, -802 final NonceKey nonceKey) throws IOException { -803MasterCoprocessorHost cpHost = master.getMasterCoprocessorHost(); -804 -805if (master.getTableStateManager().isTableState( -806 TableName.valueOf(snapshot.getTable()), TableState.State.ENABLED)) { -807 throw new UnsupportedOperationException("Table '" + -808 TableName.valueOf(snapshot.getTable()) + "' must be disabled in order to " + -809"perform a restore operation."); -810} -811 -812// call Coprocessor pre hook -813if (cpHost != null) { -814 cpHost.preRestoreSnapshot(reqSnapshot, snapshotTableDesc); -815} -816 -817long procId; -818
[26/51] [partial] hbase-site git commit: Published site at 82d554e3783372cc6b05489452c815b57c06f6cd.
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/709b8fcc/devapidocs/src-html/org/apache/hadoop/hbase/client/HBaseAdmin.AddColumnFamilyFuture.html -- diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/client/HBaseAdmin.AddColumnFamilyFuture.html b/devapidocs/src-html/org/apache/hadoop/hbase/client/HBaseAdmin.AddColumnFamilyFuture.html index f2c44db..6cf2fc8 100644 --- a/devapidocs/src-html/org/apache/hadoop/hbase/client/HBaseAdmin.AddColumnFamilyFuture.html +++ b/devapidocs/src-html/org/apache/hadoop/hbase/client/HBaseAdmin.AddColumnFamilyFuture.html @@ -2581,7 +2581,7 @@ 2573try { 2574 // Restore snapshot 2575 get( -2576 internalRestoreSnapshotAsync(snapshotName, tableName, false), +2576 internalRestoreSnapshotAsync(snapshotName, tableName), 2577syncWaitTimeout, 2578TimeUnit.MILLISECONDS); 2579} catch (IOException e) { @@ -2590,7 +2590,7 @@ 2582 if (takeFailSafeSnapshot) { 2583try { 2584 get( -2585 internalRestoreSnapshotAsync(failSafeSnapshotSnapshotName, tableName, false), +2585 internalRestoreSnapshotAsync(failSafeSnapshotSnapshotName, tableName), 2586syncWaitTimeout, 2587TimeUnit.MILLISECONDS); 2588 String msg = "Restore snapshot=" + snapshotName + @@ -2633,7 +2633,7 @@ 2625 throw new TableNotDisabledException(tableName); 2626} 2627 -2628return internalRestoreSnapshotAsync(snapshotName, tableName, false); +2628return internalRestoreSnapshotAsync(snapshotName, tableName); 2629 } 2630 2631 @Override @@ -2643,1621 +2643,1614 @@ 2635 } 2636 2637 @Override -2638 public void cloneSnapshot(String snapshotName, TableName tableName, boolean restoreAcl) +2638 public void cloneSnapshot(final String snapshotName, final TableName tableName) 2639 throws IOException, TableExistsException, RestoreSnapshotException { 2640if (tableExists(tableName)) { 2641 throw new TableExistsException(tableName); 2642} 2643get( -2644 internalRestoreSnapshotAsync(snapshotName, tableName, restoreAcl), +2644 internalRestoreSnapshotAsync(snapshotName, tableName), 2645 Integer.MAX_VALUE, 2646 TimeUnit.MILLISECONDS); 2647 } 2648 2649 @Override -2650 public void cloneSnapshot(final String snapshotName, final TableName tableName) -2651 throws IOException, TableExistsException, RestoreSnapshotException { -2652cloneSnapshot(snapshotName, tableName, false); -2653 } -2654 -2655 @Override -2656 public FutureVoid cloneSnapshotAsync(final String snapshotName, final TableName tableName) -2657 throws IOException, TableExistsException { -2658if (tableExists(tableName)) { -2659 throw new TableExistsException(tableName); -2660} -2661return internalRestoreSnapshotAsync(snapshotName, tableName, false); -2662 } -2663 -2664 @Override -2665 public byte[] execProcedureWithRet(String signature, String instance, MapString, String props) -2666 throws IOException { -2667ProcedureDescription desc = ProtobufUtil.buildProcedureDescription(signature, instance, props); -2668final ExecProcedureRequest request = -2669 ExecProcedureRequest.newBuilder().setProcedure(desc).build(); -2670// run the procedure on the master -2671ExecProcedureResponse response = executeCallable( -2672 new MasterCallableExecProcedureResponse(getConnection(), getRpcControllerFactory()) { -2673@Override -2674protected ExecProcedureResponse rpcCall() throws Exception { -2675 return master.execProcedureWithRet(getRpcController(), request); -2676} -2677 }); -2678 -2679return response.hasReturnData() ? response.getReturnData().toByteArray() : null; -2680 } -2681 -2682 @Override -2683 public void execProcedure(String signature, String instance, MapString, String props) -2684 throws IOException { -2685ProcedureDescription desc = ProtobufUtil.buildProcedureDescription(signature, instance, props); -2686final ExecProcedureRequest request = -2687 ExecProcedureRequest.newBuilder().setProcedure(desc).build(); -2688// run the procedure on the master -2689ExecProcedureResponse response = executeCallable(new MasterCallableExecProcedureResponse( -2690getConnection(), getRpcControllerFactory()) { -2691 @Override -2692 protected ExecProcedureResponse rpcCall() throws Exception { -2693return master.execProcedure(getRpcController(), request); -2694 } -2695}); -2696 -2697long start = EnvironmentEdgeManager.currentTime(); -2698long max = response.getExpectedTimeout(); -2699long maxPauseTime = max / this.numRetries; -2700int tries = 0; -2701LOG.debug("Waiting a max of " + max + " ms for procedure '" + -2702signature + " : " + instance + "'' to complete. (max " +
[12/51] [partial] hbase-site git commit: Published site at 82d554e3783372cc6b05489452c815b57c06f6cd.
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/709b8fcc/devapidocs/src-html/org/apache/hadoop/hbase/client/HBaseAdmin.TableFuture.TableWaitForStateCallable.html -- diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/client/HBaseAdmin.TableFuture.TableWaitForStateCallable.html b/devapidocs/src-html/org/apache/hadoop/hbase/client/HBaseAdmin.TableFuture.TableWaitForStateCallable.html index f2c44db..6cf2fc8 100644 --- a/devapidocs/src-html/org/apache/hadoop/hbase/client/HBaseAdmin.TableFuture.TableWaitForStateCallable.html +++ b/devapidocs/src-html/org/apache/hadoop/hbase/client/HBaseAdmin.TableFuture.TableWaitForStateCallable.html @@ -2581,7 +2581,7 @@ 2573try { 2574 // Restore snapshot 2575 get( -2576 internalRestoreSnapshotAsync(snapshotName, tableName, false), +2576 internalRestoreSnapshotAsync(snapshotName, tableName), 2577syncWaitTimeout, 2578TimeUnit.MILLISECONDS); 2579} catch (IOException e) { @@ -2590,7 +2590,7 @@ 2582 if (takeFailSafeSnapshot) { 2583try { 2584 get( -2585 internalRestoreSnapshotAsync(failSafeSnapshotSnapshotName, tableName, false), +2585 internalRestoreSnapshotAsync(failSafeSnapshotSnapshotName, tableName), 2586syncWaitTimeout, 2587TimeUnit.MILLISECONDS); 2588 String msg = "Restore snapshot=" + snapshotName + @@ -2633,7 +2633,7 @@ 2625 throw new TableNotDisabledException(tableName); 2626} 2627 -2628return internalRestoreSnapshotAsync(snapshotName, tableName, false); +2628return internalRestoreSnapshotAsync(snapshotName, tableName); 2629 } 2630 2631 @Override @@ -2643,1621 +2643,1614 @@ 2635 } 2636 2637 @Override -2638 public void cloneSnapshot(String snapshotName, TableName tableName, boolean restoreAcl) +2638 public void cloneSnapshot(final String snapshotName, final TableName tableName) 2639 throws IOException, TableExistsException, RestoreSnapshotException { 2640if (tableExists(tableName)) { 2641 throw new TableExistsException(tableName); 2642} 2643get( -2644 internalRestoreSnapshotAsync(snapshotName, tableName, restoreAcl), +2644 internalRestoreSnapshotAsync(snapshotName, tableName), 2645 Integer.MAX_VALUE, 2646 TimeUnit.MILLISECONDS); 2647 } 2648 2649 @Override -2650 public void cloneSnapshot(final String snapshotName, final TableName tableName) -2651 throws IOException, TableExistsException, RestoreSnapshotException { -2652cloneSnapshot(snapshotName, tableName, false); -2653 } -2654 -2655 @Override -2656 public FutureVoid cloneSnapshotAsync(final String snapshotName, final TableName tableName) -2657 throws IOException, TableExistsException { -2658if (tableExists(tableName)) { -2659 throw new TableExistsException(tableName); -2660} -2661return internalRestoreSnapshotAsync(snapshotName, tableName, false); -2662 } -2663 -2664 @Override -2665 public byte[] execProcedureWithRet(String signature, String instance, MapString, String props) -2666 throws IOException { -2667ProcedureDescription desc = ProtobufUtil.buildProcedureDescription(signature, instance, props); -2668final ExecProcedureRequest request = -2669 ExecProcedureRequest.newBuilder().setProcedure(desc).build(); -2670// run the procedure on the master -2671ExecProcedureResponse response = executeCallable( -2672 new MasterCallableExecProcedureResponse(getConnection(), getRpcControllerFactory()) { -2673@Override -2674protected ExecProcedureResponse rpcCall() throws Exception { -2675 return master.execProcedureWithRet(getRpcController(), request); -2676} -2677 }); -2678 -2679return response.hasReturnData() ? response.getReturnData().toByteArray() : null; -2680 } -2681 -2682 @Override -2683 public void execProcedure(String signature, String instance, MapString, String props) -2684 throws IOException { -2685ProcedureDescription desc = ProtobufUtil.buildProcedureDescription(signature, instance, props); -2686final ExecProcedureRequest request = -2687 ExecProcedureRequest.newBuilder().setProcedure(desc).build(); -2688// run the procedure on the master -2689ExecProcedureResponse response = executeCallable(new MasterCallableExecProcedureResponse( -2690getConnection(), getRpcControllerFactory()) { -2691 @Override -2692 protected ExecProcedureResponse rpcCall() throws Exception { -2693return master.execProcedure(getRpcController(), request); -2694 } -2695}); -2696 -2697long start = EnvironmentEdgeManager.currentTime(); -2698long max = response.getExpectedTimeout(); -2699long maxPauseTime = max / this.numRetries; -2700int tries = 0; -2701LOG.debug("Waiting a max of " + max + " ms for procedure '"
[20/51] [partial] hbase-site git commit: Published site at 82d554e3783372cc6b05489452c815b57c06f6cd.
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/709b8fcc/devapidocs/src-html/org/apache/hadoop/hbase/client/HBaseAdmin.MergeTableRegionsFuture.html -- diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/client/HBaseAdmin.MergeTableRegionsFuture.html b/devapidocs/src-html/org/apache/hadoop/hbase/client/HBaseAdmin.MergeTableRegionsFuture.html index f2c44db..6cf2fc8 100644 --- a/devapidocs/src-html/org/apache/hadoop/hbase/client/HBaseAdmin.MergeTableRegionsFuture.html +++ b/devapidocs/src-html/org/apache/hadoop/hbase/client/HBaseAdmin.MergeTableRegionsFuture.html @@ -2581,7 +2581,7 @@ 2573try { 2574 // Restore snapshot 2575 get( -2576 internalRestoreSnapshotAsync(snapshotName, tableName, false), +2576 internalRestoreSnapshotAsync(snapshotName, tableName), 2577syncWaitTimeout, 2578TimeUnit.MILLISECONDS); 2579} catch (IOException e) { @@ -2590,7 +2590,7 @@ 2582 if (takeFailSafeSnapshot) { 2583try { 2584 get( -2585 internalRestoreSnapshotAsync(failSafeSnapshotSnapshotName, tableName, false), +2585 internalRestoreSnapshotAsync(failSafeSnapshotSnapshotName, tableName), 2586syncWaitTimeout, 2587TimeUnit.MILLISECONDS); 2588 String msg = "Restore snapshot=" + snapshotName + @@ -2633,7 +2633,7 @@ 2625 throw new TableNotDisabledException(tableName); 2626} 2627 -2628return internalRestoreSnapshotAsync(snapshotName, tableName, false); +2628return internalRestoreSnapshotAsync(snapshotName, tableName); 2629 } 2630 2631 @Override @@ -2643,1621 +2643,1614 @@ 2635 } 2636 2637 @Override -2638 public void cloneSnapshot(String snapshotName, TableName tableName, boolean restoreAcl) +2638 public void cloneSnapshot(final String snapshotName, final TableName tableName) 2639 throws IOException, TableExistsException, RestoreSnapshotException { 2640if (tableExists(tableName)) { 2641 throw new TableExistsException(tableName); 2642} 2643get( -2644 internalRestoreSnapshotAsync(snapshotName, tableName, restoreAcl), +2644 internalRestoreSnapshotAsync(snapshotName, tableName), 2645 Integer.MAX_VALUE, 2646 TimeUnit.MILLISECONDS); 2647 } 2648 2649 @Override -2650 public void cloneSnapshot(final String snapshotName, final TableName tableName) -2651 throws IOException, TableExistsException, RestoreSnapshotException { -2652cloneSnapshot(snapshotName, tableName, false); -2653 } -2654 -2655 @Override -2656 public FutureVoid cloneSnapshotAsync(final String snapshotName, final TableName tableName) -2657 throws IOException, TableExistsException { -2658if (tableExists(tableName)) { -2659 throw new TableExistsException(tableName); -2660} -2661return internalRestoreSnapshotAsync(snapshotName, tableName, false); -2662 } -2663 -2664 @Override -2665 public byte[] execProcedureWithRet(String signature, String instance, MapString, String props) -2666 throws IOException { -2667ProcedureDescription desc = ProtobufUtil.buildProcedureDescription(signature, instance, props); -2668final ExecProcedureRequest request = -2669 ExecProcedureRequest.newBuilder().setProcedure(desc).build(); -2670// run the procedure on the master -2671ExecProcedureResponse response = executeCallable( -2672 new MasterCallableExecProcedureResponse(getConnection(), getRpcControllerFactory()) { -2673@Override -2674protected ExecProcedureResponse rpcCall() throws Exception { -2675 return master.execProcedureWithRet(getRpcController(), request); -2676} -2677 }); -2678 -2679return response.hasReturnData() ? response.getReturnData().toByteArray() : null; -2680 } -2681 -2682 @Override -2683 public void execProcedure(String signature, String instance, MapString, String props) -2684 throws IOException { -2685ProcedureDescription desc = ProtobufUtil.buildProcedureDescription(signature, instance, props); -2686final ExecProcedureRequest request = -2687 ExecProcedureRequest.newBuilder().setProcedure(desc).build(); -2688// run the procedure on the master -2689ExecProcedureResponse response = executeCallable(new MasterCallableExecProcedureResponse( -2690getConnection(), getRpcControllerFactory()) { -2691 @Override -2692 protected ExecProcedureResponse rpcCall() throws Exception { -2693return master.execProcedure(getRpcController(), request); -2694 } -2695}); -2696 -2697long start = EnvironmentEdgeManager.currentTime(); -2698long max = response.getExpectedTimeout(); -2699long maxPauseTime = max / this.numRetries; -2700int tries = 0; -2701LOG.debug("Waiting a max of " + max + " ms for procedure '" + -2702signature + " : " + instance + "'' to complete. (max
[03/51] [partial] hbase-site git commit: Published site at 82d554e3783372cc6b05489452c815b57c06f6cd.
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/709b8fcc/devapidocs/src-html/org/apache/hadoop/hbase/master/HMaster.html -- diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/master/HMaster.html b/devapidocs/src-html/org/apache/hadoop/hbase/master/HMaster.html index 1642d61..17bc96c 100644 --- a/devapidocs/src-html/org/apache/hadoop/hbase/master/HMaster.html +++ b/devapidocs/src-html/org/apache/hadoop/hbase/master/HMaster.html @@ -2317,7 +2317,7 @@ 2309 } 2310 2311 public long restoreSnapshot(final SnapshotDescription snapshotDesc, -2312 final long nonceGroup, final long nonce, final boolean restoreAcl) throws IOException { +2312 final long nonceGroup, final long nonce) throws IOException { 2313checkInitialized(); 2314 getSnapshotManager().checkSnapshotSupport(); 2315 @@ -2329,1032 +2329,1031 @@ 2321new MasterProcedureUtil.NonceProcedureRunnable(this, nonceGroup, nonce) { 2322 @Override 2323 protected void run() throws IOException { -2324 setProcId( -2325 getSnapshotManager().restoreOrCloneSnapshot(snapshotDesc, getNonceKey(), restoreAcl)); -2326 } -2327 -2328 @Override -2329 protected String getDescription() { -2330return "RestoreSnapshotProcedure"; -2331 } -2332}); -2333 } -2334 -2335 @Override -2336 public void checkTableModifiable(final TableName tableName) -2337 throws IOException, TableNotFoundException, TableNotDisabledException { -2338if (isCatalogTable(tableName)) { -2339 throw new IOException("Can't modify catalog tables"); -2340} -2341if (!MetaTableAccessor.tableExists(getConnection(), tableName)) { -2342 throw new TableNotFoundException(tableName); -2343} -2344if (!getTableStateManager().isTableState(tableName, TableState.State.DISABLED)) { -2345 throw new TableNotDisabledException(tableName); -2346} -2347 } -2348 -2349 /** -2350 * @return cluster status -2351 */ -2352 public ClusterStatus getClusterStatus() throws InterruptedIOException { -2353// Build Set of backup masters from ZK nodes -2354ListString backupMasterStrings; -2355try { -2356 backupMasterStrings = ZKUtil.listChildrenNoWatch(this.zooKeeper, -2357 this.zooKeeper.znodePaths.backupMasterAddressesZNode); -2358} catch (KeeperException e) { -2359 LOG.warn(this.zooKeeper.prefix("Unable to list backup servers"), e); -2360 backupMasterStrings = null; -2361} -2362 -2363ListServerName backupMasters = null; -2364if (backupMasterStrings != null !backupMasterStrings.isEmpty()) { -2365 backupMasters = new ArrayList(backupMasterStrings.size()); -2366 for (String s: backupMasterStrings) { -2367try { -2368 byte [] bytes; -2369 try { -2370bytes = ZKUtil.getData(this.zooKeeper, ZKUtil.joinZNode( -2371 this.zooKeeper.znodePaths.backupMasterAddressesZNode, s)); -2372 } catch (InterruptedException e) { -2373throw new InterruptedIOException(); -2374 } -2375 if (bytes != null) { -2376ServerName sn; -2377try { -2378 sn = ProtobufUtil.parseServerNameFrom(bytes); -2379} catch (DeserializationException e) { -2380 LOG.warn("Failed parse, skipping registering backup server", e); -2381 continue; -2382} -2383backupMasters.add(sn); -2384 } -2385} catch (KeeperException e) { -2386 LOG.warn(this.zooKeeper.prefix("Unable to get information about " + -2387 "backup servers"), e); -2388} -2389 } -2390 Collections.sort(backupMasters, new ComparatorServerName() { -2391@Override -2392public int compare(ServerName s1, ServerName s2) { -2393 return s1.getServerName().compareTo(s2.getServerName()); -2394}}); -2395} -2396 -2397String clusterId = fileSystemManager != null ? -2398 fileSystemManager.getClusterId().toString() : null; -2399SetRegionState regionsInTransition = assignmentManager != null ? -2400 assignmentManager.getRegionStates().getRegionsInTransition() : null; -2401String[] coprocessors = cpHost != null ? getMasterCoprocessors() : null; -2402boolean balancerOn = loadBalancerTracker != null ? -2403 loadBalancerTracker.isBalancerOn() : false; -2404MapServerName, ServerLoad onlineServers = null; -2405SetServerName deadServers = null; -2406if (serverManager != null) { -2407 deadServers = serverManager.getDeadServers().copyServerNames(); -2408 onlineServers = serverManager.getOnlineServers(); -2409} -2410return new ClusterStatus(VersionInfo.getVersion(), clusterId, -2411 onlineServers, deadServers, serverName, backupMasters, -2412 regionsInTransition, coprocessors,
[22/51] [partial] hbase-site git commit: Published site at 82d554e3783372cc6b05489452c815b57c06f6cd.
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/709b8fcc/devapidocs/src-html/org/apache/hadoop/hbase/client/HBaseAdmin.DisableTableFuture.html -- diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/client/HBaseAdmin.DisableTableFuture.html b/devapidocs/src-html/org/apache/hadoop/hbase/client/HBaseAdmin.DisableTableFuture.html index f2c44db..6cf2fc8 100644 --- a/devapidocs/src-html/org/apache/hadoop/hbase/client/HBaseAdmin.DisableTableFuture.html +++ b/devapidocs/src-html/org/apache/hadoop/hbase/client/HBaseAdmin.DisableTableFuture.html @@ -2581,7 +2581,7 @@ 2573try { 2574 // Restore snapshot 2575 get( -2576 internalRestoreSnapshotAsync(snapshotName, tableName, false), +2576 internalRestoreSnapshotAsync(snapshotName, tableName), 2577syncWaitTimeout, 2578TimeUnit.MILLISECONDS); 2579} catch (IOException e) { @@ -2590,7 +2590,7 @@ 2582 if (takeFailSafeSnapshot) { 2583try { 2584 get( -2585 internalRestoreSnapshotAsync(failSafeSnapshotSnapshotName, tableName, false), +2585 internalRestoreSnapshotAsync(failSafeSnapshotSnapshotName, tableName), 2586syncWaitTimeout, 2587TimeUnit.MILLISECONDS); 2588 String msg = "Restore snapshot=" + snapshotName + @@ -2633,7 +2633,7 @@ 2625 throw new TableNotDisabledException(tableName); 2626} 2627 -2628return internalRestoreSnapshotAsync(snapshotName, tableName, false); +2628return internalRestoreSnapshotAsync(snapshotName, tableName); 2629 } 2630 2631 @Override @@ -2643,1621 +2643,1614 @@ 2635 } 2636 2637 @Override -2638 public void cloneSnapshot(String snapshotName, TableName tableName, boolean restoreAcl) +2638 public void cloneSnapshot(final String snapshotName, final TableName tableName) 2639 throws IOException, TableExistsException, RestoreSnapshotException { 2640if (tableExists(tableName)) { 2641 throw new TableExistsException(tableName); 2642} 2643get( -2644 internalRestoreSnapshotAsync(snapshotName, tableName, restoreAcl), +2644 internalRestoreSnapshotAsync(snapshotName, tableName), 2645 Integer.MAX_VALUE, 2646 TimeUnit.MILLISECONDS); 2647 } 2648 2649 @Override -2650 public void cloneSnapshot(final String snapshotName, final TableName tableName) -2651 throws IOException, TableExistsException, RestoreSnapshotException { -2652cloneSnapshot(snapshotName, tableName, false); -2653 } -2654 -2655 @Override -2656 public FutureVoid cloneSnapshotAsync(final String snapshotName, final TableName tableName) -2657 throws IOException, TableExistsException { -2658if (tableExists(tableName)) { -2659 throw new TableExistsException(tableName); -2660} -2661return internalRestoreSnapshotAsync(snapshotName, tableName, false); -2662 } -2663 -2664 @Override -2665 public byte[] execProcedureWithRet(String signature, String instance, MapString, String props) -2666 throws IOException { -2667ProcedureDescription desc = ProtobufUtil.buildProcedureDescription(signature, instance, props); -2668final ExecProcedureRequest request = -2669 ExecProcedureRequest.newBuilder().setProcedure(desc).build(); -2670// run the procedure on the master -2671ExecProcedureResponse response = executeCallable( -2672 new MasterCallableExecProcedureResponse(getConnection(), getRpcControllerFactory()) { -2673@Override -2674protected ExecProcedureResponse rpcCall() throws Exception { -2675 return master.execProcedureWithRet(getRpcController(), request); -2676} -2677 }); -2678 -2679return response.hasReturnData() ? response.getReturnData().toByteArray() : null; -2680 } -2681 -2682 @Override -2683 public void execProcedure(String signature, String instance, MapString, String props) -2684 throws IOException { -2685ProcedureDescription desc = ProtobufUtil.buildProcedureDescription(signature, instance, props); -2686final ExecProcedureRequest request = -2687 ExecProcedureRequest.newBuilder().setProcedure(desc).build(); -2688// run the procedure on the master -2689ExecProcedureResponse response = executeCallable(new MasterCallableExecProcedureResponse( -2690getConnection(), getRpcControllerFactory()) { -2691 @Override -2692 protected ExecProcedureResponse rpcCall() throws Exception { -2693return master.execProcedure(getRpcController(), request); -2694 } -2695}); -2696 -2697long start = EnvironmentEdgeManager.currentTime(); -2698long max = response.getExpectedTimeout(); -2699long maxPauseTime = max / this.numRetries; -2700int tries = 0; -2701LOG.debug("Waiting a max of " + max + " ms for procedure '" + -2702signature + " : " + instance + "'' to complete. (max " + maxPauseTime + " ms
[08/51] [partial] hbase-site git commit: Published site at 82d554e3783372cc6b05489452c815b57c06f6cd.
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/709b8fcc/devapidocs/src-html/org/apache/hadoop/hbase/client/HBaseAdmin.html -- diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/client/HBaseAdmin.html b/devapidocs/src-html/org/apache/hadoop/hbase/client/HBaseAdmin.html index f2c44db..6cf2fc8 100644 --- a/devapidocs/src-html/org/apache/hadoop/hbase/client/HBaseAdmin.html +++ b/devapidocs/src-html/org/apache/hadoop/hbase/client/HBaseAdmin.html @@ -2581,7 +2581,7 @@ 2573try { 2574 // Restore snapshot 2575 get( -2576 internalRestoreSnapshotAsync(snapshotName, tableName, false), +2576 internalRestoreSnapshotAsync(snapshotName, tableName), 2577syncWaitTimeout, 2578TimeUnit.MILLISECONDS); 2579} catch (IOException e) { @@ -2590,7 +2590,7 @@ 2582 if (takeFailSafeSnapshot) { 2583try { 2584 get( -2585 internalRestoreSnapshotAsync(failSafeSnapshotSnapshotName, tableName, false), +2585 internalRestoreSnapshotAsync(failSafeSnapshotSnapshotName, tableName), 2586syncWaitTimeout, 2587TimeUnit.MILLISECONDS); 2588 String msg = "Restore snapshot=" + snapshotName + @@ -2633,7 +2633,7 @@ 2625 throw new TableNotDisabledException(tableName); 2626} 2627 -2628return internalRestoreSnapshotAsync(snapshotName, tableName, false); +2628return internalRestoreSnapshotAsync(snapshotName, tableName); 2629 } 2630 2631 @Override @@ -2643,1621 +2643,1614 @@ 2635 } 2636 2637 @Override -2638 public void cloneSnapshot(String snapshotName, TableName tableName, boolean restoreAcl) +2638 public void cloneSnapshot(final String snapshotName, final TableName tableName) 2639 throws IOException, TableExistsException, RestoreSnapshotException { 2640if (tableExists(tableName)) { 2641 throw new TableExistsException(tableName); 2642} 2643get( -2644 internalRestoreSnapshotAsync(snapshotName, tableName, restoreAcl), +2644 internalRestoreSnapshotAsync(snapshotName, tableName), 2645 Integer.MAX_VALUE, 2646 TimeUnit.MILLISECONDS); 2647 } 2648 2649 @Override -2650 public void cloneSnapshot(final String snapshotName, final TableName tableName) -2651 throws IOException, TableExistsException, RestoreSnapshotException { -2652cloneSnapshot(snapshotName, tableName, false); -2653 } -2654 -2655 @Override -2656 public FutureVoid cloneSnapshotAsync(final String snapshotName, final TableName tableName) -2657 throws IOException, TableExistsException { -2658if (tableExists(tableName)) { -2659 throw new TableExistsException(tableName); -2660} -2661return internalRestoreSnapshotAsync(snapshotName, tableName, false); -2662 } -2663 -2664 @Override -2665 public byte[] execProcedureWithRet(String signature, String instance, MapString, String props) -2666 throws IOException { -2667ProcedureDescription desc = ProtobufUtil.buildProcedureDescription(signature, instance, props); -2668final ExecProcedureRequest request = -2669 ExecProcedureRequest.newBuilder().setProcedure(desc).build(); -2670// run the procedure on the master -2671ExecProcedureResponse response = executeCallable( -2672 new MasterCallableExecProcedureResponse(getConnection(), getRpcControllerFactory()) { -2673@Override -2674protected ExecProcedureResponse rpcCall() throws Exception { -2675 return master.execProcedureWithRet(getRpcController(), request); -2676} -2677 }); -2678 -2679return response.hasReturnData() ? response.getReturnData().toByteArray() : null; -2680 } -2681 -2682 @Override -2683 public void execProcedure(String signature, String instance, MapString, String props) -2684 throws IOException { -2685ProcedureDescription desc = ProtobufUtil.buildProcedureDescription(signature, instance, props); -2686final ExecProcedureRequest request = -2687 ExecProcedureRequest.newBuilder().setProcedure(desc).build(); -2688// run the procedure on the master -2689ExecProcedureResponse response = executeCallable(new MasterCallableExecProcedureResponse( -2690getConnection(), getRpcControllerFactory()) { -2691 @Override -2692 protected ExecProcedureResponse rpcCall() throws Exception { -2693return master.execProcedure(getRpcController(), request); -2694 } -2695}); -2696 -2697long start = EnvironmentEdgeManager.currentTime(); -2698long max = response.getExpectedTimeout(); -2699long maxPauseTime = max / this.numRetries; -2700int tries = 0; -2701LOG.debug("Waiting a max of " + max + " ms for procedure '" + -2702signature + " : " + instance + "'' to complete. (max " + maxPauseTime + " ms per retry)"); -2703boolean done = false; -2704while (tries == 0 -2705||
[24/51] [partial] hbase-site git commit: Published site at 82d554e3783372cc6b05489452c815b57c06f6cd.
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/709b8fcc/devapidocs/src-html/org/apache/hadoop/hbase/client/HBaseAdmin.DeleteColumnFamilyFuture.html -- diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/client/HBaseAdmin.DeleteColumnFamilyFuture.html b/devapidocs/src-html/org/apache/hadoop/hbase/client/HBaseAdmin.DeleteColumnFamilyFuture.html index f2c44db..6cf2fc8 100644 --- a/devapidocs/src-html/org/apache/hadoop/hbase/client/HBaseAdmin.DeleteColumnFamilyFuture.html +++ b/devapidocs/src-html/org/apache/hadoop/hbase/client/HBaseAdmin.DeleteColumnFamilyFuture.html @@ -2581,7 +2581,7 @@ 2573try { 2574 // Restore snapshot 2575 get( -2576 internalRestoreSnapshotAsync(snapshotName, tableName, false), +2576 internalRestoreSnapshotAsync(snapshotName, tableName), 2577syncWaitTimeout, 2578TimeUnit.MILLISECONDS); 2579} catch (IOException e) { @@ -2590,7 +2590,7 @@ 2582 if (takeFailSafeSnapshot) { 2583try { 2584 get( -2585 internalRestoreSnapshotAsync(failSafeSnapshotSnapshotName, tableName, false), +2585 internalRestoreSnapshotAsync(failSafeSnapshotSnapshotName, tableName), 2586syncWaitTimeout, 2587TimeUnit.MILLISECONDS); 2588 String msg = "Restore snapshot=" + snapshotName + @@ -2633,7 +2633,7 @@ 2625 throw new TableNotDisabledException(tableName); 2626} 2627 -2628return internalRestoreSnapshotAsync(snapshotName, tableName, false); +2628return internalRestoreSnapshotAsync(snapshotName, tableName); 2629 } 2630 2631 @Override @@ -2643,1621 +2643,1614 @@ 2635 } 2636 2637 @Override -2638 public void cloneSnapshot(String snapshotName, TableName tableName, boolean restoreAcl) +2638 public void cloneSnapshot(final String snapshotName, final TableName tableName) 2639 throws IOException, TableExistsException, RestoreSnapshotException { 2640if (tableExists(tableName)) { 2641 throw new TableExistsException(tableName); 2642} 2643get( -2644 internalRestoreSnapshotAsync(snapshotName, tableName, restoreAcl), +2644 internalRestoreSnapshotAsync(snapshotName, tableName), 2645 Integer.MAX_VALUE, 2646 TimeUnit.MILLISECONDS); 2647 } 2648 2649 @Override -2650 public void cloneSnapshot(final String snapshotName, final TableName tableName) -2651 throws IOException, TableExistsException, RestoreSnapshotException { -2652cloneSnapshot(snapshotName, tableName, false); -2653 } -2654 -2655 @Override -2656 public FutureVoid cloneSnapshotAsync(final String snapshotName, final TableName tableName) -2657 throws IOException, TableExistsException { -2658if (tableExists(tableName)) { -2659 throw new TableExistsException(tableName); -2660} -2661return internalRestoreSnapshotAsync(snapshotName, tableName, false); -2662 } -2663 -2664 @Override -2665 public byte[] execProcedureWithRet(String signature, String instance, MapString, String props) -2666 throws IOException { -2667ProcedureDescription desc = ProtobufUtil.buildProcedureDescription(signature, instance, props); -2668final ExecProcedureRequest request = -2669 ExecProcedureRequest.newBuilder().setProcedure(desc).build(); -2670// run the procedure on the master -2671ExecProcedureResponse response = executeCallable( -2672 new MasterCallableExecProcedureResponse(getConnection(), getRpcControllerFactory()) { -2673@Override -2674protected ExecProcedureResponse rpcCall() throws Exception { -2675 return master.execProcedureWithRet(getRpcController(), request); -2676} -2677 }); -2678 -2679return response.hasReturnData() ? response.getReturnData().toByteArray() : null; -2680 } -2681 -2682 @Override -2683 public void execProcedure(String signature, String instance, MapString, String props) -2684 throws IOException { -2685ProcedureDescription desc = ProtobufUtil.buildProcedureDescription(signature, instance, props); -2686final ExecProcedureRequest request = -2687 ExecProcedureRequest.newBuilder().setProcedure(desc).build(); -2688// run the procedure on the master -2689ExecProcedureResponse response = executeCallable(new MasterCallableExecProcedureResponse( -2690getConnection(), getRpcControllerFactory()) { -2691 @Override -2692 protected ExecProcedureResponse rpcCall() throws Exception { -2693return master.execProcedure(getRpcController(), request); -2694 } -2695}); -2696 -2697long start = EnvironmentEdgeManager.currentTime(); -2698long max = response.getExpectedTimeout(); -2699long maxPauseTime = max / this.numRetries; -2700int tries = 0; -2701LOG.debug("Waiting a max of " + max + " ms for procedure '" + -2702signature + " : " + instance + "'' to complete.
[05/51] [partial] hbase-site git commit: Published site at 82d554e3783372cc6b05489452c815b57c06f6cd.
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/709b8fcc/devapidocs/src-html/org/apache/hadoop/hbase/master/HMaster.PeriodicDoMetrics.html -- diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/master/HMaster.PeriodicDoMetrics.html b/devapidocs/src-html/org/apache/hadoop/hbase/master/HMaster.PeriodicDoMetrics.html index 1642d61..17bc96c 100644 --- a/devapidocs/src-html/org/apache/hadoop/hbase/master/HMaster.PeriodicDoMetrics.html +++ b/devapidocs/src-html/org/apache/hadoop/hbase/master/HMaster.PeriodicDoMetrics.html @@ -2317,7 +2317,7 @@ 2309 } 2310 2311 public long restoreSnapshot(final SnapshotDescription snapshotDesc, -2312 final long nonceGroup, final long nonce, final boolean restoreAcl) throws IOException { +2312 final long nonceGroup, final long nonce) throws IOException { 2313checkInitialized(); 2314 getSnapshotManager().checkSnapshotSupport(); 2315 @@ -2329,1032 +2329,1031 @@ 2321new MasterProcedureUtil.NonceProcedureRunnable(this, nonceGroup, nonce) { 2322 @Override 2323 protected void run() throws IOException { -2324 setProcId( -2325 getSnapshotManager().restoreOrCloneSnapshot(snapshotDesc, getNonceKey(), restoreAcl)); -2326 } -2327 -2328 @Override -2329 protected String getDescription() { -2330return "RestoreSnapshotProcedure"; -2331 } -2332}); -2333 } -2334 -2335 @Override -2336 public void checkTableModifiable(final TableName tableName) -2337 throws IOException, TableNotFoundException, TableNotDisabledException { -2338if (isCatalogTable(tableName)) { -2339 throw new IOException("Can't modify catalog tables"); -2340} -2341if (!MetaTableAccessor.tableExists(getConnection(), tableName)) { -2342 throw new TableNotFoundException(tableName); -2343} -2344if (!getTableStateManager().isTableState(tableName, TableState.State.DISABLED)) { -2345 throw new TableNotDisabledException(tableName); -2346} -2347 } -2348 -2349 /** -2350 * @return cluster status -2351 */ -2352 public ClusterStatus getClusterStatus() throws InterruptedIOException { -2353// Build Set of backup masters from ZK nodes -2354ListString backupMasterStrings; -2355try { -2356 backupMasterStrings = ZKUtil.listChildrenNoWatch(this.zooKeeper, -2357 this.zooKeeper.znodePaths.backupMasterAddressesZNode); -2358} catch (KeeperException e) { -2359 LOG.warn(this.zooKeeper.prefix("Unable to list backup servers"), e); -2360 backupMasterStrings = null; -2361} -2362 -2363ListServerName backupMasters = null; -2364if (backupMasterStrings != null !backupMasterStrings.isEmpty()) { -2365 backupMasters = new ArrayList(backupMasterStrings.size()); -2366 for (String s: backupMasterStrings) { -2367try { -2368 byte [] bytes; -2369 try { -2370bytes = ZKUtil.getData(this.zooKeeper, ZKUtil.joinZNode( -2371 this.zooKeeper.znodePaths.backupMasterAddressesZNode, s)); -2372 } catch (InterruptedException e) { -2373throw new InterruptedIOException(); -2374 } -2375 if (bytes != null) { -2376ServerName sn; -2377try { -2378 sn = ProtobufUtil.parseServerNameFrom(bytes); -2379} catch (DeserializationException e) { -2380 LOG.warn("Failed parse, skipping registering backup server", e); -2381 continue; -2382} -2383backupMasters.add(sn); -2384 } -2385} catch (KeeperException e) { -2386 LOG.warn(this.zooKeeper.prefix("Unable to get information about " + -2387 "backup servers"), e); -2388} -2389 } -2390 Collections.sort(backupMasters, new ComparatorServerName() { -2391@Override -2392public int compare(ServerName s1, ServerName s2) { -2393 return s1.getServerName().compareTo(s2.getServerName()); -2394}}); -2395} -2396 -2397String clusterId = fileSystemManager != null ? -2398 fileSystemManager.getClusterId().toString() : null; -2399SetRegionState regionsInTransition = assignmentManager != null ? -2400 assignmentManager.getRegionStates().getRegionsInTransition() : null; -2401String[] coprocessors = cpHost != null ? getMasterCoprocessors() : null; -2402boolean balancerOn = loadBalancerTracker != null ? -2403 loadBalancerTracker.isBalancerOn() : false; -2404MapServerName, ServerLoad onlineServers = null; -2405SetServerName deadServers = null; -2406if (serverManager != null) { -2407 deadServers = serverManager.getDeadServers().copyServerNames(); -2408 onlineServers = serverManager.getOnlineServers(); -2409} -2410return new ClusterStatus(VersionInfo.getVersion(), clusterId, -2411 onlineServers,
[06/51] [partial] hbase-site git commit: Published site at 82d554e3783372cc6b05489452c815b57c06f6cd.
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/709b8fcc/devapidocs/src-html/org/apache/hadoop/hbase/master/HMaster.InitializationMonitor.html -- diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/master/HMaster.InitializationMonitor.html b/devapidocs/src-html/org/apache/hadoop/hbase/master/HMaster.InitializationMonitor.html index 1642d61..17bc96c 100644 --- a/devapidocs/src-html/org/apache/hadoop/hbase/master/HMaster.InitializationMonitor.html +++ b/devapidocs/src-html/org/apache/hadoop/hbase/master/HMaster.InitializationMonitor.html @@ -2317,7 +2317,7 @@ 2309 } 2310 2311 public long restoreSnapshot(final SnapshotDescription snapshotDesc, -2312 final long nonceGroup, final long nonce, final boolean restoreAcl) throws IOException { +2312 final long nonceGroup, final long nonce) throws IOException { 2313checkInitialized(); 2314 getSnapshotManager().checkSnapshotSupport(); 2315 @@ -2329,1032 +2329,1031 @@ 2321new MasterProcedureUtil.NonceProcedureRunnable(this, nonceGroup, nonce) { 2322 @Override 2323 protected void run() throws IOException { -2324 setProcId( -2325 getSnapshotManager().restoreOrCloneSnapshot(snapshotDesc, getNonceKey(), restoreAcl)); -2326 } -2327 -2328 @Override -2329 protected String getDescription() { -2330return "RestoreSnapshotProcedure"; -2331 } -2332}); -2333 } -2334 -2335 @Override -2336 public void checkTableModifiable(final TableName tableName) -2337 throws IOException, TableNotFoundException, TableNotDisabledException { -2338if (isCatalogTable(tableName)) { -2339 throw new IOException("Can't modify catalog tables"); -2340} -2341if (!MetaTableAccessor.tableExists(getConnection(), tableName)) { -2342 throw new TableNotFoundException(tableName); -2343} -2344if (!getTableStateManager().isTableState(tableName, TableState.State.DISABLED)) { -2345 throw new TableNotDisabledException(tableName); -2346} -2347 } -2348 -2349 /** -2350 * @return cluster status -2351 */ -2352 public ClusterStatus getClusterStatus() throws InterruptedIOException { -2353// Build Set of backup masters from ZK nodes -2354ListString backupMasterStrings; -2355try { -2356 backupMasterStrings = ZKUtil.listChildrenNoWatch(this.zooKeeper, -2357 this.zooKeeper.znodePaths.backupMasterAddressesZNode); -2358} catch (KeeperException e) { -2359 LOG.warn(this.zooKeeper.prefix("Unable to list backup servers"), e); -2360 backupMasterStrings = null; -2361} -2362 -2363ListServerName backupMasters = null; -2364if (backupMasterStrings != null !backupMasterStrings.isEmpty()) { -2365 backupMasters = new ArrayList(backupMasterStrings.size()); -2366 for (String s: backupMasterStrings) { -2367try { -2368 byte [] bytes; -2369 try { -2370bytes = ZKUtil.getData(this.zooKeeper, ZKUtil.joinZNode( -2371 this.zooKeeper.znodePaths.backupMasterAddressesZNode, s)); -2372 } catch (InterruptedException e) { -2373throw new InterruptedIOException(); -2374 } -2375 if (bytes != null) { -2376ServerName sn; -2377try { -2378 sn = ProtobufUtil.parseServerNameFrom(bytes); -2379} catch (DeserializationException e) { -2380 LOG.warn("Failed parse, skipping registering backup server", e); -2381 continue; -2382} -2383backupMasters.add(sn); -2384 } -2385} catch (KeeperException e) { -2386 LOG.warn(this.zooKeeper.prefix("Unable to get information about " + -2387 "backup servers"), e); -2388} -2389 } -2390 Collections.sort(backupMasters, new ComparatorServerName() { -2391@Override -2392public int compare(ServerName s1, ServerName s2) { -2393 return s1.getServerName().compareTo(s2.getServerName()); -2394}}); -2395} -2396 -2397String clusterId = fileSystemManager != null ? -2398 fileSystemManager.getClusterId().toString() : null; -2399SetRegionState regionsInTransition = assignmentManager != null ? -2400 assignmentManager.getRegionStates().getRegionsInTransition() : null; -2401String[] coprocessors = cpHost != null ? getMasterCoprocessors() : null; -2402boolean balancerOn = loadBalancerTracker != null ? -2403 loadBalancerTracker.isBalancerOn() : false; -2404MapServerName, ServerLoad onlineServers = null; -2405SetServerName deadServers = null; -2406if (serverManager != null) { -2407 deadServers = serverManager.getDeadServers().copyServerNames(); -2408 onlineServers = serverManager.getOnlineServers(); -2409} -2410return new ClusterStatus(VersionInfo.getVersion(), clusterId, -2411
[18/51] [partial] hbase-site git commit: Published site at 82d554e3783372cc6b05489452c815b57c06f6cd.
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/709b8fcc/devapidocs/src-html/org/apache/hadoop/hbase/client/HBaseAdmin.ModifyTableFuture.html -- diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/client/HBaseAdmin.ModifyTableFuture.html b/devapidocs/src-html/org/apache/hadoop/hbase/client/HBaseAdmin.ModifyTableFuture.html index f2c44db..6cf2fc8 100644 --- a/devapidocs/src-html/org/apache/hadoop/hbase/client/HBaseAdmin.ModifyTableFuture.html +++ b/devapidocs/src-html/org/apache/hadoop/hbase/client/HBaseAdmin.ModifyTableFuture.html @@ -2581,7 +2581,7 @@ 2573try { 2574 // Restore snapshot 2575 get( -2576 internalRestoreSnapshotAsync(snapshotName, tableName, false), +2576 internalRestoreSnapshotAsync(snapshotName, tableName), 2577syncWaitTimeout, 2578TimeUnit.MILLISECONDS); 2579} catch (IOException e) { @@ -2590,7 +2590,7 @@ 2582 if (takeFailSafeSnapshot) { 2583try { 2584 get( -2585 internalRestoreSnapshotAsync(failSafeSnapshotSnapshotName, tableName, false), +2585 internalRestoreSnapshotAsync(failSafeSnapshotSnapshotName, tableName), 2586syncWaitTimeout, 2587TimeUnit.MILLISECONDS); 2588 String msg = "Restore snapshot=" + snapshotName + @@ -2633,7 +2633,7 @@ 2625 throw new TableNotDisabledException(tableName); 2626} 2627 -2628return internalRestoreSnapshotAsync(snapshotName, tableName, false); +2628return internalRestoreSnapshotAsync(snapshotName, tableName); 2629 } 2630 2631 @Override @@ -2643,1621 +2643,1614 @@ 2635 } 2636 2637 @Override -2638 public void cloneSnapshot(String snapshotName, TableName tableName, boolean restoreAcl) +2638 public void cloneSnapshot(final String snapshotName, final TableName tableName) 2639 throws IOException, TableExistsException, RestoreSnapshotException { 2640if (tableExists(tableName)) { 2641 throw new TableExistsException(tableName); 2642} 2643get( -2644 internalRestoreSnapshotAsync(snapshotName, tableName, restoreAcl), +2644 internalRestoreSnapshotAsync(snapshotName, tableName), 2645 Integer.MAX_VALUE, 2646 TimeUnit.MILLISECONDS); 2647 } 2648 2649 @Override -2650 public void cloneSnapshot(final String snapshotName, final TableName tableName) -2651 throws IOException, TableExistsException, RestoreSnapshotException { -2652cloneSnapshot(snapshotName, tableName, false); -2653 } -2654 -2655 @Override -2656 public FutureVoid cloneSnapshotAsync(final String snapshotName, final TableName tableName) -2657 throws IOException, TableExistsException { -2658if (tableExists(tableName)) { -2659 throw new TableExistsException(tableName); -2660} -2661return internalRestoreSnapshotAsync(snapshotName, tableName, false); -2662 } -2663 -2664 @Override -2665 public byte[] execProcedureWithRet(String signature, String instance, MapString, String props) -2666 throws IOException { -2667ProcedureDescription desc = ProtobufUtil.buildProcedureDescription(signature, instance, props); -2668final ExecProcedureRequest request = -2669 ExecProcedureRequest.newBuilder().setProcedure(desc).build(); -2670// run the procedure on the master -2671ExecProcedureResponse response = executeCallable( -2672 new MasterCallableExecProcedureResponse(getConnection(), getRpcControllerFactory()) { -2673@Override -2674protected ExecProcedureResponse rpcCall() throws Exception { -2675 return master.execProcedureWithRet(getRpcController(), request); -2676} -2677 }); -2678 -2679return response.hasReturnData() ? response.getReturnData().toByteArray() : null; -2680 } -2681 -2682 @Override -2683 public void execProcedure(String signature, String instance, MapString, String props) -2684 throws IOException { -2685ProcedureDescription desc = ProtobufUtil.buildProcedureDescription(signature, instance, props); -2686final ExecProcedureRequest request = -2687 ExecProcedureRequest.newBuilder().setProcedure(desc).build(); -2688// run the procedure on the master -2689ExecProcedureResponse response = executeCallable(new MasterCallableExecProcedureResponse( -2690getConnection(), getRpcControllerFactory()) { -2691 @Override -2692 protected ExecProcedureResponse rpcCall() throws Exception { -2693return master.execProcedure(getRpcController(), request); -2694 } -2695}); -2696 -2697long start = EnvironmentEdgeManager.currentTime(); -2698long max = response.getExpectedTimeout(); -2699long maxPauseTime = max / this.numRetries; -2700int tries = 0; -2701LOG.debug("Waiting a max of " + max + " ms for procedure '" + -2702signature + " : " + instance + "'' to complete. (max " + maxPauseTime + " ms per
[17/51] [partial] hbase-site git commit: Published site at 82d554e3783372cc6b05489452c815b57c06f6cd.
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/709b8fcc/devapidocs/src-html/org/apache/hadoop/hbase/client/HBaseAdmin.NamespaceFuture.html -- diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/client/HBaseAdmin.NamespaceFuture.html b/devapidocs/src-html/org/apache/hadoop/hbase/client/HBaseAdmin.NamespaceFuture.html index f2c44db..6cf2fc8 100644 --- a/devapidocs/src-html/org/apache/hadoop/hbase/client/HBaseAdmin.NamespaceFuture.html +++ b/devapidocs/src-html/org/apache/hadoop/hbase/client/HBaseAdmin.NamespaceFuture.html @@ -2581,7 +2581,7 @@ 2573try { 2574 // Restore snapshot 2575 get( -2576 internalRestoreSnapshotAsync(snapshotName, tableName, false), +2576 internalRestoreSnapshotAsync(snapshotName, tableName), 2577syncWaitTimeout, 2578TimeUnit.MILLISECONDS); 2579} catch (IOException e) { @@ -2590,7 +2590,7 @@ 2582 if (takeFailSafeSnapshot) { 2583try { 2584 get( -2585 internalRestoreSnapshotAsync(failSafeSnapshotSnapshotName, tableName, false), +2585 internalRestoreSnapshotAsync(failSafeSnapshotSnapshotName, tableName), 2586syncWaitTimeout, 2587TimeUnit.MILLISECONDS); 2588 String msg = "Restore snapshot=" + snapshotName + @@ -2633,7 +2633,7 @@ 2625 throw new TableNotDisabledException(tableName); 2626} 2627 -2628return internalRestoreSnapshotAsync(snapshotName, tableName, false); +2628return internalRestoreSnapshotAsync(snapshotName, tableName); 2629 } 2630 2631 @Override @@ -2643,1621 +2643,1614 @@ 2635 } 2636 2637 @Override -2638 public void cloneSnapshot(String snapshotName, TableName tableName, boolean restoreAcl) +2638 public void cloneSnapshot(final String snapshotName, final TableName tableName) 2639 throws IOException, TableExistsException, RestoreSnapshotException { 2640if (tableExists(tableName)) { 2641 throw new TableExistsException(tableName); 2642} 2643get( -2644 internalRestoreSnapshotAsync(snapshotName, tableName, restoreAcl), +2644 internalRestoreSnapshotAsync(snapshotName, tableName), 2645 Integer.MAX_VALUE, 2646 TimeUnit.MILLISECONDS); 2647 } 2648 2649 @Override -2650 public void cloneSnapshot(final String snapshotName, final TableName tableName) -2651 throws IOException, TableExistsException, RestoreSnapshotException { -2652cloneSnapshot(snapshotName, tableName, false); -2653 } -2654 -2655 @Override -2656 public FutureVoid cloneSnapshotAsync(final String snapshotName, final TableName tableName) -2657 throws IOException, TableExistsException { -2658if (tableExists(tableName)) { -2659 throw new TableExistsException(tableName); -2660} -2661return internalRestoreSnapshotAsync(snapshotName, tableName, false); -2662 } -2663 -2664 @Override -2665 public byte[] execProcedureWithRet(String signature, String instance, MapString, String props) -2666 throws IOException { -2667ProcedureDescription desc = ProtobufUtil.buildProcedureDescription(signature, instance, props); -2668final ExecProcedureRequest request = -2669 ExecProcedureRequest.newBuilder().setProcedure(desc).build(); -2670// run the procedure on the master -2671ExecProcedureResponse response = executeCallable( -2672 new MasterCallableExecProcedureResponse(getConnection(), getRpcControllerFactory()) { -2673@Override -2674protected ExecProcedureResponse rpcCall() throws Exception { -2675 return master.execProcedureWithRet(getRpcController(), request); -2676} -2677 }); -2678 -2679return response.hasReturnData() ? response.getReturnData().toByteArray() : null; -2680 } -2681 -2682 @Override -2683 public void execProcedure(String signature, String instance, MapString, String props) -2684 throws IOException { -2685ProcedureDescription desc = ProtobufUtil.buildProcedureDescription(signature, instance, props); -2686final ExecProcedureRequest request = -2687 ExecProcedureRequest.newBuilder().setProcedure(desc).build(); -2688// run the procedure on the master -2689ExecProcedureResponse response = executeCallable(new MasterCallableExecProcedureResponse( -2690getConnection(), getRpcControllerFactory()) { -2691 @Override -2692 protected ExecProcedureResponse rpcCall() throws Exception { -2693return master.execProcedure(getRpcController(), request); -2694 } -2695}); -2696 -2697long start = EnvironmentEdgeManager.currentTime(); -2698long max = response.getExpectedTimeout(); -2699long maxPauseTime = max / this.numRetries; -2700int tries = 0; -2701LOG.debug("Waiting a max of " + max + " ms for procedure '" + -2702signature + " : " + instance + "'' to complete. (max " + maxPauseTime + " ms per retry)");
[10/51] [partial] hbase-site git commit: Published site at 82d554e3783372cc6b05489452c815b57c06f6cd.
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/709b8fcc/devapidocs/src-html/org/apache/hadoop/hbase/client/HBaseAdmin.ThrowableAbortable.html -- diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/client/HBaseAdmin.ThrowableAbortable.html b/devapidocs/src-html/org/apache/hadoop/hbase/client/HBaseAdmin.ThrowableAbortable.html index f2c44db..6cf2fc8 100644 --- a/devapidocs/src-html/org/apache/hadoop/hbase/client/HBaseAdmin.ThrowableAbortable.html +++ b/devapidocs/src-html/org/apache/hadoop/hbase/client/HBaseAdmin.ThrowableAbortable.html @@ -2581,7 +2581,7 @@ 2573try { 2574 // Restore snapshot 2575 get( -2576 internalRestoreSnapshotAsync(snapshotName, tableName, false), +2576 internalRestoreSnapshotAsync(snapshotName, tableName), 2577syncWaitTimeout, 2578TimeUnit.MILLISECONDS); 2579} catch (IOException e) { @@ -2590,7 +2590,7 @@ 2582 if (takeFailSafeSnapshot) { 2583try { 2584 get( -2585 internalRestoreSnapshotAsync(failSafeSnapshotSnapshotName, tableName, false), +2585 internalRestoreSnapshotAsync(failSafeSnapshotSnapshotName, tableName), 2586syncWaitTimeout, 2587TimeUnit.MILLISECONDS); 2588 String msg = "Restore snapshot=" + snapshotName + @@ -2633,7 +2633,7 @@ 2625 throw new TableNotDisabledException(tableName); 2626} 2627 -2628return internalRestoreSnapshotAsync(snapshotName, tableName, false); +2628return internalRestoreSnapshotAsync(snapshotName, tableName); 2629 } 2630 2631 @Override @@ -2643,1621 +2643,1614 @@ 2635 } 2636 2637 @Override -2638 public void cloneSnapshot(String snapshotName, TableName tableName, boolean restoreAcl) +2638 public void cloneSnapshot(final String snapshotName, final TableName tableName) 2639 throws IOException, TableExistsException, RestoreSnapshotException { 2640if (tableExists(tableName)) { 2641 throw new TableExistsException(tableName); 2642} 2643get( -2644 internalRestoreSnapshotAsync(snapshotName, tableName, restoreAcl), +2644 internalRestoreSnapshotAsync(snapshotName, tableName), 2645 Integer.MAX_VALUE, 2646 TimeUnit.MILLISECONDS); 2647 } 2648 2649 @Override -2650 public void cloneSnapshot(final String snapshotName, final TableName tableName) -2651 throws IOException, TableExistsException, RestoreSnapshotException { -2652cloneSnapshot(snapshotName, tableName, false); -2653 } -2654 -2655 @Override -2656 public FutureVoid cloneSnapshotAsync(final String snapshotName, final TableName tableName) -2657 throws IOException, TableExistsException { -2658if (tableExists(tableName)) { -2659 throw new TableExistsException(tableName); -2660} -2661return internalRestoreSnapshotAsync(snapshotName, tableName, false); -2662 } -2663 -2664 @Override -2665 public byte[] execProcedureWithRet(String signature, String instance, MapString, String props) -2666 throws IOException { -2667ProcedureDescription desc = ProtobufUtil.buildProcedureDescription(signature, instance, props); -2668final ExecProcedureRequest request = -2669 ExecProcedureRequest.newBuilder().setProcedure(desc).build(); -2670// run the procedure on the master -2671ExecProcedureResponse response = executeCallable( -2672 new MasterCallableExecProcedureResponse(getConnection(), getRpcControllerFactory()) { -2673@Override -2674protected ExecProcedureResponse rpcCall() throws Exception { -2675 return master.execProcedureWithRet(getRpcController(), request); -2676} -2677 }); -2678 -2679return response.hasReturnData() ? response.getReturnData().toByteArray() : null; -2680 } -2681 -2682 @Override -2683 public void execProcedure(String signature, String instance, MapString, String props) -2684 throws IOException { -2685ProcedureDescription desc = ProtobufUtil.buildProcedureDescription(signature, instance, props); -2686final ExecProcedureRequest request = -2687 ExecProcedureRequest.newBuilder().setProcedure(desc).build(); -2688// run the procedure on the master -2689ExecProcedureResponse response = executeCallable(new MasterCallableExecProcedureResponse( -2690getConnection(), getRpcControllerFactory()) { -2691 @Override -2692 protected ExecProcedureResponse rpcCall() throws Exception { -2693return master.execProcedure(getRpcController(), request); -2694 } -2695}); -2696 -2697long start = EnvironmentEdgeManager.currentTime(); -2698long max = response.getExpectedTimeout(); -2699long maxPauseTime = max / this.numRetries; -2700int tries = 0; -2701LOG.debug("Waiting a max of " + max + " ms for procedure '" + -2702signature + " : " + instance + "'' to complete. (max " + maxPauseTime + " ms
[15/51] [partial] hbase-site git commit: Published site at 82d554e3783372cc6b05489452c815b57c06f6cd.
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/709b8fcc/devapidocs/src-html/org/apache/hadoop/hbase/client/HBaseAdmin.ProcedureFuture.html -- diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/client/HBaseAdmin.ProcedureFuture.html b/devapidocs/src-html/org/apache/hadoop/hbase/client/HBaseAdmin.ProcedureFuture.html index f2c44db..6cf2fc8 100644 --- a/devapidocs/src-html/org/apache/hadoop/hbase/client/HBaseAdmin.ProcedureFuture.html +++ b/devapidocs/src-html/org/apache/hadoop/hbase/client/HBaseAdmin.ProcedureFuture.html @@ -2581,7 +2581,7 @@ 2573try { 2574 // Restore snapshot 2575 get( -2576 internalRestoreSnapshotAsync(snapshotName, tableName, false), +2576 internalRestoreSnapshotAsync(snapshotName, tableName), 2577syncWaitTimeout, 2578TimeUnit.MILLISECONDS); 2579} catch (IOException e) { @@ -2590,7 +2590,7 @@ 2582 if (takeFailSafeSnapshot) { 2583try { 2584 get( -2585 internalRestoreSnapshotAsync(failSafeSnapshotSnapshotName, tableName, false), +2585 internalRestoreSnapshotAsync(failSafeSnapshotSnapshotName, tableName), 2586syncWaitTimeout, 2587TimeUnit.MILLISECONDS); 2588 String msg = "Restore snapshot=" + snapshotName + @@ -2633,7 +2633,7 @@ 2625 throw new TableNotDisabledException(tableName); 2626} 2627 -2628return internalRestoreSnapshotAsync(snapshotName, tableName, false); +2628return internalRestoreSnapshotAsync(snapshotName, tableName); 2629 } 2630 2631 @Override @@ -2643,1621 +2643,1614 @@ 2635 } 2636 2637 @Override -2638 public void cloneSnapshot(String snapshotName, TableName tableName, boolean restoreAcl) +2638 public void cloneSnapshot(final String snapshotName, final TableName tableName) 2639 throws IOException, TableExistsException, RestoreSnapshotException { 2640if (tableExists(tableName)) { 2641 throw new TableExistsException(tableName); 2642} 2643get( -2644 internalRestoreSnapshotAsync(snapshotName, tableName, restoreAcl), +2644 internalRestoreSnapshotAsync(snapshotName, tableName), 2645 Integer.MAX_VALUE, 2646 TimeUnit.MILLISECONDS); 2647 } 2648 2649 @Override -2650 public void cloneSnapshot(final String snapshotName, final TableName tableName) -2651 throws IOException, TableExistsException, RestoreSnapshotException { -2652cloneSnapshot(snapshotName, tableName, false); -2653 } -2654 -2655 @Override -2656 public FutureVoid cloneSnapshotAsync(final String snapshotName, final TableName tableName) -2657 throws IOException, TableExistsException { -2658if (tableExists(tableName)) { -2659 throw new TableExistsException(tableName); -2660} -2661return internalRestoreSnapshotAsync(snapshotName, tableName, false); -2662 } -2663 -2664 @Override -2665 public byte[] execProcedureWithRet(String signature, String instance, MapString, String props) -2666 throws IOException { -2667ProcedureDescription desc = ProtobufUtil.buildProcedureDescription(signature, instance, props); -2668final ExecProcedureRequest request = -2669 ExecProcedureRequest.newBuilder().setProcedure(desc).build(); -2670// run the procedure on the master -2671ExecProcedureResponse response = executeCallable( -2672 new MasterCallableExecProcedureResponse(getConnection(), getRpcControllerFactory()) { -2673@Override -2674protected ExecProcedureResponse rpcCall() throws Exception { -2675 return master.execProcedureWithRet(getRpcController(), request); -2676} -2677 }); -2678 -2679return response.hasReturnData() ? response.getReturnData().toByteArray() : null; -2680 } -2681 -2682 @Override -2683 public void execProcedure(String signature, String instance, MapString, String props) -2684 throws IOException { -2685ProcedureDescription desc = ProtobufUtil.buildProcedureDescription(signature, instance, props); -2686final ExecProcedureRequest request = -2687 ExecProcedureRequest.newBuilder().setProcedure(desc).build(); -2688// run the procedure on the master -2689ExecProcedureResponse response = executeCallable(new MasterCallableExecProcedureResponse( -2690getConnection(), getRpcControllerFactory()) { -2691 @Override -2692 protected ExecProcedureResponse rpcCall() throws Exception { -2693return master.execProcedure(getRpcController(), request); -2694 } -2695}); -2696 -2697long start = EnvironmentEdgeManager.currentTime(); -2698long max = response.getExpectedTimeout(); -2699long maxPauseTime = max / this.numRetries; -2700int tries = 0; -2701LOG.debug("Waiting a max of " + max + " ms for procedure '" + -2702signature + " : " + instance + "'' to complete. (max " + maxPauseTime + " ms per retry)");
hbase git commit: HBASE-17887 Row-level consistency is broken for read
Repository: hbase Updated Branches: refs/heads/master 5e046151d -> b34ab5980 HBASE-17887 Row-level consistency is broken for read Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/b34ab598 Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/b34ab598 Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/b34ab598 Branch: refs/heads/master Commit: b34ab5980ea7a21fd750537476027f9a8665eacc Parents: 5e04615 Author: Chia-Ping TsaiAuthored: Fri May 12 19:45:07 2017 +0800 Committer: Chia-Ping Tsai Committed: Fri May 12 19:45:07 2017 +0800 -- .../regionserver/ChangedReadersObserver.java| 12 +- .../hbase/regionserver/CompactingMemStore.java | 12 +- .../hadoop/hbase/regionserver/HStore.java | 26 ++- .../hadoop/hbase/regionserver/StoreScanner.java | 38 +++- .../hadoop/hbase/regionserver/TestStore.java| 225 ++- .../hbase/regionserver/TestStoreScanner.java| 5 +- .../hbase/regionserver/TestWideScanner.java | 3 +- 7 files changed, 293 insertions(+), 28 deletions(-) -- http://git-wip-us.apache.org/repos/asf/hbase/blob/b34ab598/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/ChangedReadersObserver.java -- diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/ChangedReadersObserver.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/ChangedReadersObserver.java index 0bc75e7..a019666 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/ChangedReadersObserver.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/ChangedReadersObserver.java @@ -21,18 +21,24 @@ package org.apache.hadoop.hbase.regionserver; import java.io.IOException; import java.util.List; - import org.apache.hadoop.hbase.classification.InterfaceAudience; - /** * If set of MapFile.Readers in Store change, implementors are notified. */ @InterfaceAudience.Private public interface ChangedReadersObserver { + + /** + * @return the read point of the current scan + */ + long getReadPoint(); + /** * Notify observers. + * @param sfs The new files + * @param memStoreScanners scanner of current memstore * @throws IOException e */ - void updateReaders(List sfs) throws IOException; + void updateReaders(List sfs, List memStoreScanners) throws IOException; } http://git-wip-us.apache.org/repos/asf/hbase/blob/b34ab598/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/CompactingMemStore.java -- diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/CompactingMemStore.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/CompactingMemStore.java index aaf60e3..8d71efc 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/CompactingMemStore.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/CompactingMemStore.java @@ -317,18 +317,24 @@ public class CompactingMemStore extends AbstractMemStore { * Scanners are ordered from 0 (oldest) to newest in increasing order. */ public List getScanners(long readPt) throws IOException { +MutableSegment activeTmp = active; List pipelineList = pipeline.getSegments(); List snapshotList = snapshot.getAllSegments(); long order = 1 + pipelineList.size() + snapshotList.size(); // The list of elements in pipeline + the active element + the snapshot segment // The order is the Segment ordinal -List list = new ArrayList((int) order); -order = addToScanners(active, readPt, order, list); +List list = createList((int) order); +order = addToScanners(activeTmp, readPt, order, list); order = addToScanners(pipelineList, readPt, order, list); addToScanners(snapshotList, readPt, order, list); return list; } + @VisibleForTesting + protected List createList(int capacity) { + return new ArrayList<>(capacity); + } + /** * Check whether anything need to be done based on the current active set size. * The method is invoked upon every addition to the active set. @@ -428,7 +434,7 @@ public class CompactingMemStore extends AbstractMemStore { } } - private void pushActiveToPipeline(MutableSegment active) { + protected void pushActiveToPipeline(MutableSegment active) { if (!active.isEmpty()) { pipeline.pushHead(active); resetActive(); http://git-wip-us.apache.org/repos/asf/hbase/blob/b34ab598/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HStore.java -- diff --git
hbase git commit: HBASE-17887 Row-level consistency is broken for read
Repository: hbase Updated Branches: refs/heads/branch-1 51cb53776 -> f81486445 HBASE-17887 Row-level consistency is broken for read Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/f8148644 Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/f8148644 Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/f8148644 Branch: refs/heads/branch-1 Commit: f81486445c072096022cca77eb0a53f1594ff204 Parents: 51cb537 Author: Chia-Ping TsaiAuthored: Fri May 12 19:44:16 2017 +0800 Committer: Chia-Ping Tsai Committed: Fri May 12 19:44:16 2017 +0800 -- .../regionserver/ChangedReadersObserver.java| 9 +- .../hbase/regionserver/DefaultMemStore.java | 301 ++- .../hadoop/hbase/regionserver/HStore.java | 9 +- .../hadoop/hbase/regionserver/StoreScanner.java | 45 ++- .../apache/hadoop/hbase/io/TestHeapSize.java| 3 +- .../hbase/regionserver/TestDefaultMemStore.java | 68 ++--- .../hadoop/hbase/regionserver/TestHRegion.java | 4 +- .../regionserver/TestMemStoreChunkPool.java | 12 +- .../hadoop/hbase/regionserver/TestStore.java| 155 +- .../hbase/regionserver/TestStoreScanner.java| 5 +- .../hbase/regionserver/TestWideScanner.java | 3 +- 11 files changed, 401 insertions(+), 213 deletions(-) -- http://git-wip-us.apache.org/repos/asf/hbase/blob/f8148644/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/ChangedReadersObserver.java -- diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/ChangedReadersObserver.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/ChangedReadersObserver.java index 0bc75e7..4421ac5 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/ChangedReadersObserver.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/ChangedReadersObserver.java @@ -30,9 +30,16 @@ import org.apache.hadoop.hbase.classification.InterfaceAudience; */ @InterfaceAudience.Private public interface ChangedReadersObserver { + + /** + * @return the read point of the current scan + */ + long getReadPoint(); /** * Notify observers. + * @param sfs The new files + * @param memStoreScanners scanner of current memstore * @throws IOException e */ - void updateReaders(List sfs) throws IOException; + void updateReaders(List sfs, List memStoreScanners) throws IOException; } http://git-wip-us.apache.org/repos/asf/hbase/blob/f8148644/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/DefaultMemStore.java -- diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/DefaultMemStore.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/DefaultMemStore.java index 7b7446a..b1e9f32 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/DefaultMemStore.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/DefaultMemStore.java @@ -71,38 +71,26 @@ import com.google.common.annotations.VisibleForTesting; @InterfaceAudience.Private public class DefaultMemStore implements MemStore { private static final Log LOG = LogFactory.getLog(DefaultMemStore.class); + @VisibleForTesting static final String USEMSLAB_KEY = "hbase.hregion.memstore.mslab.enabled"; private static final boolean USEMSLAB_DEFAULT = true; - static final String MSLAB_CLASS_NAME = "hbase.regionserver.mslab.class"; + private static final String MSLAB_CLASS_NAME = "hbase.regionserver.mslab.class"; private Configuration conf; - // MemStore. Use a CellSkipListSet rather than SkipListSet because of the - // better semantics. The Map will overwrite if passed a key it already had - // whereas the Set will not add new Cell if key is same though value might be - // different. Value is not important -- just make sure always same - // reference passed. - volatile CellSkipListSet cellSet; - - // Snapshot of memstore. Made for flusher. - volatile CellSkipListSet snapshot; - + @VisibleForTesting final KeyValue.KVComparator comparator; - // Used to track own heapSize - final AtomicLong size; - private volatile long snapshotSize; - // Used to track when to flush - volatile long timeOfOldestEdit = Long.MAX_VALUE; + private volatile long timeOfOldestEdit = Long.MAX_VALUE; - TimeRangeTracker timeRangeTracker; - TimeRangeTracker snapshotTimeRangeTracker; + private volatile long snapshotId; + private volatile boolean tagsPresent; - volatile MemStoreLAB allocator; - volatile MemStoreLAB snapshotAllocator; - volatile long snapshotId; - volatile boolean
hbase git commit: HBASE-17887 Row-level consistency is broken for read
Repository: hbase Updated Branches: refs/heads/branch-1.3 5cbc041b9 -> 72edf521c HBASE-17887 Row-level consistency is broken for read Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/72edf521 Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/72edf521 Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/72edf521 Branch: refs/heads/branch-1.3 Commit: 72edf521c1effe3afe6ce6b39aaf843b8651a4a6 Parents: 5cbc041 Author: Chia-Ping TsaiAuthored: Fri May 12 19:42:45 2017 +0800 Committer: Chia-Ping Tsai Committed: Fri May 12 19:42:45 2017 +0800 -- .../regionserver/ChangedReadersObserver.java| 9 +- .../hbase/regionserver/DefaultMemStore.java | 300 ++- .../hadoop/hbase/regionserver/HStore.java | 9 +- .../hadoop/hbase/regionserver/StoreScanner.java | 44 ++- .../apache/hadoop/hbase/io/TestHeapSize.java| 3 +- .../hbase/regionserver/TestDefaultMemStore.java | 66 ++-- .../hadoop/hbase/regionserver/TestHRegion.java | 4 +- .../regionserver/TestMemStoreChunkPool.java | 12 +- .../hadoop/hbase/regionserver/TestStore.java| 151 +- .../hbase/regionserver/TestStoreScanner.java| 5 +- .../hbase/regionserver/TestWideScanner.java | 3 +- 11 files changed, 398 insertions(+), 208 deletions(-) -- http://git-wip-us.apache.org/repos/asf/hbase/blob/72edf521/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/ChangedReadersObserver.java -- diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/ChangedReadersObserver.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/ChangedReadersObserver.java index 0bc75e7..4421ac5 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/ChangedReadersObserver.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/ChangedReadersObserver.java @@ -30,9 +30,16 @@ import org.apache.hadoop.hbase.classification.InterfaceAudience; */ @InterfaceAudience.Private public interface ChangedReadersObserver { + + /** + * @return the read point of the current scan + */ + long getReadPoint(); /** * Notify observers. + * @param sfs The new files + * @param memStoreScanners scanner of current memstore * @throws IOException e */ - void updateReaders(List sfs) throws IOException; + void updateReaders(List sfs, List memStoreScanners) throws IOException; } http://git-wip-us.apache.org/repos/asf/hbase/blob/72edf521/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/DefaultMemStore.java -- diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/DefaultMemStore.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/DefaultMemStore.java index 70f5a12..884ef29 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/DefaultMemStore.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/DefaultMemStore.java @@ -70,38 +70,26 @@ import com.google.common.annotations.VisibleForTesting; @InterfaceAudience.Private public class DefaultMemStore implements MemStore { private static final Log LOG = LogFactory.getLog(DefaultMemStore.class); + @VisibleForTesting static final String USEMSLAB_KEY = "hbase.hregion.memstore.mslab.enabled"; private static final boolean USEMSLAB_DEFAULT = true; - static final String MSLAB_CLASS_NAME = "hbase.regionserver.mslab.class"; + private static final String MSLAB_CLASS_NAME = "hbase.regionserver.mslab.class"; private Configuration conf; - // MemStore. Use a CellSkipListSet rather than SkipListSet because of the - // better semantics. The Map will overwrite if passed a key it already had - // whereas the Set will not add new Cell if key is same though value might be - // different. Value is not important -- just make sure always same - // reference passed. - volatile CellSkipListSet cellSet; - - // Snapshot of memstore. Made for flusher. - volatile CellSkipListSet snapshot; - + @VisibleForTesting final KeyValue.KVComparator comparator; - // Used to track own heapSize - final AtomicLong size; - private volatile long snapshotSize; - // Used to track when to flush - volatile long timeOfOldestEdit = Long.MAX_VALUE; + private volatile long timeOfOldestEdit = Long.MAX_VALUE; - TimeRangeTracker timeRangeTracker; - TimeRangeTracker snapshotTimeRangeTracker; + private volatile long snapshotId; + private volatile boolean tagsPresent; - volatile MemStoreLAB allocator; - volatile MemStoreLAB snapshotAllocator; - volatile long snapshotId; - volatile boolean