accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From e..@apache.org
Subject [2/2] accumulo git commit: ACCUMULO-3297 merge 1.6 to master
Date Thu, 06 Nov 2014 18:53:00 GMT
ACCUMULO-3297 merge 1.6 to master


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

Branch: refs/heads/master
Commit: cc48e37dd0ed7e4a0e0f058641d3949745f4f9b3
Parents: ce37a67 c85bf4f
Author: Eric C. Newton <eric.newton@gmail.com>
Authored: Thu Nov 6 13:52:36 2014 -0500
Committer: Eric C. Newton <eric.newton@gmail.com>
Committed: Thu Nov 6 13:52:36 2014 -0500

----------------------------------------------------------------------
 .../apache/accumulo/tserver/FileManager.java    |  35 +++---
 .../apache/accumulo/test/MetaGetsReadersIT.java | 114 +++++++++++++++++++
 2 files changed, 135 insertions(+), 14 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/cc48e37d/server/tserver/src/main/java/org/apache/accumulo/tserver/FileManager.java
----------------------------------------------------------------------
diff --cc server/tserver/src/main/java/org/apache/accumulo/tserver/FileManager.java
index 8d5335a,1735aec..fb14ca5
--- a/server/tserver/src/main/java/org/apache/accumulo/tserver/FileManager.java
+++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/FileManager.java
@@@ -522,9 -529,9 +529,9 @@@ public class FileManager 
        return iters;
      }
      
 -    synchronized void detach() {
 +    public synchronized void detach() {
        
-       releaseReaders(tabletReservedReaders, false);
+       releaseReaders(tablet, tabletReservedReaders, false);
        tabletReservedReaders.clear();
        
        for (FileDataSource fds : dataSources)
@@@ -558,8 -565,8 +565,8 @@@
        }
      }
      
 -    synchronized void releaseOpenFiles(boolean sawIOException) {
 +    public synchronized void releaseOpenFiles(boolean sawIOException) {
-       releaseReaders(tabletReservedReaders, sawIOException);
+       releaseReaders(tablet, tabletReservedReaders, sawIOException);
        tabletReservedReaders.clear();
        dataSources.clear();
      }


Mime
View raw message