accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From els...@apache.org
Subject [41/50] [abbrv] git commit: Merge remote-tracking branch 'origin/master' into ACCUMULO-378
Date Wed, 21 May 2014 02:00:00 GMT
Merge remote-tracking branch 'origin/master' into ACCUMULO-378


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

Branch: refs/heads/ACCUMULO-378
Commit: 1b4acdf99ba082dce58f21b1a0dcc57187a13388
Parents: d5c863d b510b76
Author: Josh Elser <elserj@apache.org>
Authored: Tue May 20 10:52:19 2014 -0400
Committer: Josh Elser <elserj@apache.org>
Committed: Tue May 20 10:52:19 2014 -0400

----------------------------------------------------------------------
 README                                          |  7 +++++++
 bin/bootstrap_hdfs.sh                           |  2 +-
 bin/build_native_library.sh                     |  1 +
 bin/generate_monitor_certificate.sh             |  6 +++---
 .../accumulo/core/util/LocalityGroupUtil.java   |  6 +++---
 .../main/asciidoc/chapters/administration.txt   | 19 +++++++++++------
 server/native/src/main/resources/Makefile       |  7 ++++---
 .../apache/accumulo/tserver/log/DfsLogger.java  |  4 ++--
 .../accumulo/tserver/logger/LogFileKey.java     |  3 +++
 .../tserver/log/LocalWALRecoveryTest.java       | 22 ++++++--------------
 .../classloader/vfs/UniqueFileReplicator.java   |  4 ++--
 11 files changed, 45 insertions(+), 36 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/1b4acdf9/server/tserver/src/test/java/org/apache/accumulo/tserver/log/LocalWALRecoveryTest.java
----------------------------------------------------------------------
diff --cc server/tserver/src/test/java/org/apache/accumulo/tserver/log/LocalWALRecoveryTest.java
index a678d41,df6ec2d..1a8909e
--- a/server/tserver/src/test/java/org/apache/accumulo/tserver/log/LocalWALRecoveryTest.java
+++ b/server/tserver/src/test/java/org/apache/accumulo/tserver/log/LocalWALRecoveryTest.java
@@@ -67,25 -66,16 +66,16 @@@ public class LocalWALRecoveryTest 
      recovery.parseArgs("--dfs-wal-directory", walTarget.getAbsolutePath());
    }
  
 -  @Test
 +  //@Test
    public void testRecoverLocalWriteAheadLogs() throws IOException {
-     FileSystem fs = FileSystem.get(walTarget.toURI(), new Configuration());
+     Path targetPath = new Path(walTarget.toURI());
+     FileSystem fs = FileSystem.get(targetPath.toUri(), new Configuration());
      recovery.recoverLocalWriteAheadLogs(fs);
  
-     assertEquals("Wrong number of WAL files recovered.", 1, walTarget.list(new FilenameFilter()
{
-       @Override
-       public boolean accept(File dir, String name) {
-         try {
-           // Filter out the CRC file
-           UUID.fromString(name);
-           return true;
-         } catch (IllegalArgumentException e) {
-           return false;
-         }
-       }
-     }).length);
+     FileStatus[] recovered = fs.listStatus(targetPath);
+     assertEquals("Wrong number of WAL files recovered.", 1, recovered.length);
  
-     final Path path = new Path(walTarget.listFiles()[0].getAbsolutePath());
+     final Path path = recovered[0].getPath();
      final VolumeManager volumeManager = VolumeManagerImpl.getLocal(folder.getRoot().getAbsolutePath());
  
      final DFSLoggerInputStreams streams = DfsLogger.readHeaderAndReturnStream(volumeManager,
path, configuration);


Mime
View raw message