accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From els...@apache.org
Subject [2/2] git commit: Merge branch '1.5.1-SNAPSHOT'
Date Fri, 18 Oct 2013 16:02:31 GMT
Merge branch '1.5.1-SNAPSHOT'

Conflicts:
	server/src/test/java/org/apache/accumulo/server/tabletserver/TabletServerSyncCheckTest.java


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/4ccf2421
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/4ccf2421
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/4ccf2421

Branch: refs/heads/master
Commit: 4ccf2421b45bc7f10300a9a435c56fda0c977f3f
Parents: e498ebb 957676e
Author: Josh Elser <elserj@apache.org>
Authored: Fri Oct 18 12:02:12 2013 -0400
Committer: Josh Elser <elserj@apache.org>
Committed: Fri Oct 18 12:02:12 2013 -0400

----------------------------------------------------------------------
 .../tabletserver/TabletServerSyncCheckTest.java | 37 --------------------
 1 file changed, 37 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/4ccf2421/server/src/test/java/org/apache/accumulo/server/tabletserver/TabletServerSyncCheckTest.java
----------------------------------------------------------------------
diff --cc server/src/test/java/org/apache/accumulo/server/tabletserver/TabletServerSyncCheckTest.java
index 43a3ade,87b4afc..d7cf20e
--- a/server/src/test/java/org/apache/accumulo/server/tabletserver/TabletServerSyncCheckTest.java
+++ b/server/src/test/java/org/apache/accumulo/server/tabletserver/TabletServerSyncCheckTest.java
@@@ -60,53 -45,16 +60,16 @@@ public class TabletServerSyncCheckTest 
    }
    
    @Test(expected = RuntimeException.class)
 -  public void testFailureOnExplicitSyncAndAppendFalseConf() {
 +  public void testFailureOnExplicitAppendFalseConf() {
      Configuration conf = new Configuration();
      conf.set(DFS_SUPPORT_APPEND, "false");
 -    conf.set(DFS_DURABLE_SYNC, "false");
      
      FileSystem fs = new TestFileSystem(conf);
 +    TestVolumeManagerImpl vm = new TestVolumeManagerImpl(ImmutableMap.of("foo", fs));
      
 -    TabletServer.ensureHdfsSyncIsEnabled(fs);
 +    TabletServer.ensureHdfsSyncIsEnabled(vm);
    }
    
-   @Test(expected = RuntimeException.class)
-   public void testFailureOnExplicitSyncAndAppendFalseConf() {
-     Configuration conf = new Configuration();
-     conf.set(DFS_SUPPORT_APPEND, "false");
-     conf.set(DFS_DURABLE_SYNC, "false");
-     
-     FileSystem fs = new TestFileSystem(conf);
-     TestVolumeManagerImpl vm = new TestVolumeManagerImpl(ImmutableMap.of("foo", fs));
-     
-     TabletServer.ensureHdfsSyncIsEnabled(vm);
-   }
-   
-   @Test
-   public void testDefaultHadoopAction() {
-     // We currently depend on Hadoop-2.0.5 in this branch
-     // so this test should not throw an exception by default
-     Configuration conf = new Configuration();
-     
-     FileSystem fs = new TestFileSystem(conf);
-     TestVolumeManagerImpl vm = new TestVolumeManagerImpl(ImmutableMap.of("foo", fs));
-     
-     TabletServer.ensureHdfsSyncIsEnabled(vm);
-   }
-   
-   @Test
-   public void testNecessaryConfiguration() {
-     // We currently depend on Hadoop-2.0.5 in this branch
-     // By providing the override, we should not throw an exception
-     Configuration conf = new Configuration();
-     conf.set(DFS_SUPPORT_APPEND, "true");
-     
-     FileSystem fs = new TestFileSystem(conf);
-     TestVolumeManagerImpl vm = new TestVolumeManagerImpl(ImmutableMap.of("foo", fs));
-     
-     TabletServer.ensureHdfsSyncIsEnabled(vm);
-   }
-   
    private class TestFileSystem extends DistributedFileSystem {
      protected final Configuration conf;
      


Mime
View raw message