HBASE-9073 Up retries on TestSnapshotFromMaster; retries only once

git-svn-id: https://svn.apache.org/repos/asf/hbase/trunk@1508155 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Michael Stack 2013-07-29 18:06:58 +00:00
parent f7de23fb90
commit d7810cdbfa
1 changed files with 4 additions and 6 deletions

View File

@ -114,8 +114,6 @@ public class TestSnapshotFromMaster {
conf.setInt("hbase.hstore.compactionThreshold", 5);
// block writes if we get to 12 store files
conf.setInt("hbase.hstore.blockingStoreFiles", 12);
// drop the number of attempts for the hbase admin
conf.setInt(HConstants.HBASE_CLIENT_RETRIES_NUMBER, 1);
// Ensure no extra cleaners on by default (e.g. TimeToLiveHFileCleaner)
conf.set(HFileCleaner.MASTER_HFILE_CLEANER_PLUGINS, "");
conf.set(HConstants.HBASE_MASTER_LOGCLEANER_PLUGINS, "");
@ -172,7 +170,7 @@ public class TestSnapshotFromMaster {
* <li>If asking about a snapshot has hasn't occurred, you should get an error.</li>
* </ol>
*/
@Test(timeout = 60000)
@Test(timeout = 300000)
public void testIsDoneContract() throws Exception {
IsSnapshotDoneRequest.Builder builder = IsSnapshotDoneRequest.newBuilder();
@ -226,7 +224,7 @@ public class TestSnapshotFromMaster {
assertTrue("Completed, on-disk snapshot not found", response.getDone());
}
@Test
@Test(timeout = 300000)
public void testGetCompletedSnapshots() throws Exception {
// first check when there are no snapshots
ListSnapshotRequest request = ListSnapshotRequest.newBuilder().build();
@ -260,7 +258,7 @@ public class TestSnapshotFromMaster {
assertEquals("Returned snapshots don't match created snapshots", expected, snapshots);
}
@Test
@Test(timeout = 300000)
public void testDeleteSnapshot() throws Exception {
String snapshotName = "completed";
@ -288,7 +286,7 @@ public class TestSnapshotFromMaster {
* should be retained, while those that are not in a snapshot should be deleted.
* @throws Exception on failure
*/
@Test
@Test(timeout = 300000)
public void testSnapshotHFileArchiving() throws Exception {
HBaseAdmin admin = UTIL.getHBaseAdmin();
// make sure we don't fail on listing snapshots