You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by ec...@apache.org on 2015/05/26 19:05:22 UTC
[1/2] accumulo git commit: ACCUMULO-3835 leave the locator cache
alone if the BatchReader has been closed
Repository: accumulo
Updated Branches:
refs/heads/master f453ecaa1 -> 56e211ae6
ACCUMULO-3835 leave the locator cache alone if the BatchReader has been closed
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/1c33be2c
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/1c33be2c
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/1c33be2c
Branch: refs/heads/master
Commit: 1c33be2cd8ad764eacd40af343879689971ea64f
Parents: 43c3831
Author: Eric C. Newton <er...@gmail.com>
Authored: Tue May 26 13:05:11 2015 -0400
Committer: Eric C. Newton <er...@gmail.com>
Committed: Tue May 26 13:05:11 2015 -0400
----------------------------------------------------------------------
.../client/impl/TabletServerBatchReaderIterator.java | 12 +++++++-----
1 file changed, 7 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/1c33be2c/core/src/main/java/org/apache/accumulo/core/client/impl/TabletServerBatchReaderIterator.java
----------------------------------------------------------------------
diff --git 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
index 2a0e1d8..053f2b3 100644
--- 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 +355,14 @@ public class TabletServerBatchReaderIterator implements Iterator<Entry<Key,Value
}
} 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(context.getInstance(), tsLocation);
+ }
log.debug(e.getMessage(), e);
} catch (AccumuloSecurityException e) {
e.setTableInfo(getTableInfo());
[2/2] accumulo git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/accumulo
Posted by ec...@apache.org.
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/accumulo
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/56e211ae
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/56e211ae
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/56e211ae
Branch: refs/heads/master
Commit: 56e211ae64542f17a5822ecdfb86f9cb358dcfd2
Parents: 1c33be2 f453eca
Author: Eric C. Newton <er...@gmail.com>
Authored: Tue May 26 13:05:15 2015 -0400
Committer: Eric C. Newton <er...@gmail.com>
Committed: Tue May 26 13:05:15 2015 -0400
----------------------------------------------------------------------
.../org/apache/accumulo/monitor/Monitor.java | 22 ++++++++++++++++++++
.../accumulo/monitor/servlets/BasicServlet.java | 22 ++------------------
2 files changed, 24 insertions(+), 20 deletions(-)
----------------------------------------------------------------------