accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From els...@apache.org
Subject [7/9] accumulo git commit: Merge branch '1.6' into 1.7
Date Thu, 31 Dec 2015 01:45:10 GMT
Merge branch '1.6' into 1.7

Conflicts:
	core/src/main/java/org/apache/accumulo/core/client/impl/TabletServerBatchReaderIterator.java


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

Branch: refs/heads/1.7
Commit: e4ccbbfe9753c5d3a81e11616bdd49d7ecc758c3
Parents: 76d9ed7 7aaecbb
Author: Josh Elser <elserj@apache.org>
Authored: Wed Dec 30 20:30:38 2015 -0500
Committer: Josh Elser <elserj@apache.org>
Committed: Wed Dec 30 20:30:38 2015 -0500

----------------------------------------------------------------------
 .../client/impl/TabletServerBatchReaderIterator.java    | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/e4ccbbfe/core/src/main/java/org/apache/accumulo/core/client/impl/TabletServerBatchReaderIterator.java
----------------------------------------------------------------------
diff --cc core/src/main/java/org/apache/accumulo/core/client/impl/TabletServerBatchReaderIterator.java
index 2a0e1d8,64ccac1..053f2b3
--- a/core/src/main/java/org/apache/accumulo/core/client/impl/TabletServerBatchReaderIterator.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/impl/TabletServerBatchReaderIterator.java
@@@ -355,12 -383,14 +355,14 @@@ public class TabletServerBatchReaderIte
          }
  
        } catch (IOException e) {
-         synchronized (failures) {
-           failures.putAll(tsFailures);
-           failures.putAll(unscanned);
-         }
+         if (!TabletServerBatchReaderIterator.this.queryThreadPool.isShutdown()) {
+           synchronized (failures) {
+             failures.putAll(tsFailures);
+             failures.putAll(unscanned);
+           }
  
-         locator.invalidateCache(context.getInstance(), tsLocation);
 -          locator.invalidateCache(tsLocation);
++          locator.invalidateCache(context.getInstance(), tsLocation);
+         }
          log.debug(e.getMessage(), e);
        } catch (AccumuloSecurityException e) {
          e.setTableInfo(getTableInfo());


Mime
View raw message