You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by el...@apache.org on 2015/12/31 02:45:04 UTC
[1/9] accumulo git commit: ACCUMULO-3835 leave the locator cache
alone if the BatchReader has been closed
Repository: accumulo
Updated Branches:
refs/heads/1.6 2a2bfbb2a -> 7aaecbbb3
refs/heads/1.7 76d9ed769 -> e4ccbbfe9
refs/heads/master e721c3915 -> a491dd121
ACCUMULO-3835 leave the locator cache alone if the BatchReader has been closed
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/1338d037
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/1338d037
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/1338d037
Branch: refs/heads/1.6
Commit: 1338d0379db1ce9d3595052c3408b4f4a22f9591
Parents: 2a2bfbb
Author: Eric C. Newton <er...@gmail.com>
Authored: Tue May 26 13:05:11 2015 -0400
Committer: Josh Elser <el...@apache.org>
Committed: Wed Dec 30 19:58:26 2015 -0500
----------------------------------------------------------------------
.../client/impl/TabletServerBatchReaderIterator.java | 12 +++++++-----
1 file changed, 7 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/1338d037/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 814e9ce..64ccac1 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
@@ -383,12 +383,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(tsLocation);
+ locator.invalidateCache(tsLocation);
+ }
log.debug(e.getMessage(), e);
} catch (AccumuloSecurityException e) {
e.setTableInfo(getTableInfo());
[7/9] accumulo git commit: Merge branch '1.6' into 1.7
Posted by el...@apache.org.
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 <el...@apache.org>
Authored: Wed Dec 30 20:30:38 2015 -0500
Committer: Josh Elser <el...@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());
[9/9] accumulo git commit: Merge branch '1.7'
Posted by el...@apache.org.
Merge branch '1.7'
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/a491dd12
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/a491dd12
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/a491dd12
Branch: refs/heads/master
Commit: a491dd121d593aa500d7ae37128dffe0e1806f89
Parents: e721c39 e4ccbbf
Author: Josh Elser <el...@apache.org>
Authored: Wed Dec 30 20:43:37 2015 -0500
Committer: Josh Elser <el...@apache.org>
Committed: Wed Dec 30 20:43:37 2015 -0500
----------------------------------------------------------------------
----------------------------------------------------------------------
[6/9] accumulo git commit: ACCUMULO-3508 Remove empty javadoc comment
Posted by el...@apache.org.
ACCUMULO-3508 Remove empty javadoc comment
Work around the screwed up checkstyle rule re-adding the space.
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/7aaecbbb
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/7aaecbbb
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/7aaecbbb
Branch: refs/heads/master
Commit: 7aaecbbb3073b34660d205f096cf1876a9ab5022
Parents: 1338d03
Author: Josh Elser <el...@apache.org>
Authored: Wed Dec 30 20:00:30 2015 -0500
Committer: Josh Elser <el...@apache.org>
Committed: Wed Dec 30 20:29:11 2015 -0500
----------------------------------------------------------------------
.../main/java/org/apache/accumulo/fate/zookeeper/ZooCache.java | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/7aaecbbb/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooCache.java
----------------------------------------------------------------------
diff --git a/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooCache.java b/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooCache.java
index b30bb15..ceb5427 100644
--- a/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooCache.java
+++ b/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooCache.java
@@ -286,10 +286,8 @@ public class ZooCache {
/*
* The following call to exists() is important, since we are caching that a node does not exist. Once the node comes into existence, it will be added to
- * the cache. But this notification of a node coming into existence will only be given if exists() was previously called.
- *
- * If the call to exists() is bypassed and only getData() is called with a special case that looks for Code.NONODE in the KeeperException, then
- * non-existence can not be cached.
+ * the cache. But this notification of a node coming into existence will only be given if exists() was previously called. If the call to exists() is
+ * bypassed and only getData() is called with a special case that looks for Code.NONODE in the KeeperException, then non-existence can not be cached.
*/
cacheWriteLock.lock();
try {
[8/9] accumulo git commit: Merge branch '1.6' into 1.7
Posted by el...@apache.org.
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/master
Commit: e4ccbbfe9753c5d3a81e11616bdd49d7ecc758c3
Parents: 76d9ed7 7aaecbb
Author: Josh Elser <el...@apache.org>
Authored: Wed Dec 30 20:30:38 2015 -0500
Committer: Josh Elser <el...@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());
[5/9] accumulo git commit: ACCUMULO-3508 Remove empty javadoc comment
Posted by el...@apache.org.
ACCUMULO-3508 Remove empty javadoc comment
Work around the screwed up checkstyle rule re-adding the space.
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/7aaecbbb
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/7aaecbbb
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/7aaecbbb
Branch: refs/heads/1.7
Commit: 7aaecbbb3073b34660d205f096cf1876a9ab5022
Parents: 1338d03
Author: Josh Elser <el...@apache.org>
Authored: Wed Dec 30 20:00:30 2015 -0500
Committer: Josh Elser <el...@apache.org>
Committed: Wed Dec 30 20:29:11 2015 -0500
----------------------------------------------------------------------
.../main/java/org/apache/accumulo/fate/zookeeper/ZooCache.java | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/7aaecbbb/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooCache.java
----------------------------------------------------------------------
diff --git a/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooCache.java b/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooCache.java
index b30bb15..ceb5427 100644
--- a/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooCache.java
+++ b/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooCache.java
@@ -286,10 +286,8 @@ public class ZooCache {
/*
* The following call to exists() is important, since we are caching that a node does not exist. Once the node comes into existence, it will be added to
- * the cache. But this notification of a node coming into existence will only be given if exists() was previously called.
- *
- * If the call to exists() is bypassed and only getData() is called with a special case that looks for Code.NONODE in the KeeperException, then
- * non-existence can not be cached.
+ * the cache. But this notification of a node coming into existence will only be given if exists() was previously called. If the call to exists() is
+ * bypassed and only getData() is called with a special case that looks for Code.NONODE in the KeeperException, then non-existence can not be cached.
*/
cacheWriteLock.lock();
try {
[3/9] accumulo git commit: ACCUMULO-3835 leave the locator cache
alone if the BatchReader has been closed
Posted by el...@apache.org.
ACCUMULO-3835 leave the locator cache alone if the BatchReader has been closed
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/1338d037
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/1338d037
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/1338d037
Branch: refs/heads/master
Commit: 1338d0379db1ce9d3595052c3408b4f4a22f9591
Parents: 2a2bfbb
Author: Eric C. Newton <er...@gmail.com>
Authored: Tue May 26 13:05:11 2015 -0400
Committer: Josh Elser <el...@apache.org>
Committed: Wed Dec 30 19:58:26 2015 -0500
----------------------------------------------------------------------
.../client/impl/TabletServerBatchReaderIterator.java | 12 +++++++-----
1 file changed, 7 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/1338d037/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 814e9ce..64ccac1 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
@@ -383,12 +383,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(tsLocation);
+ locator.invalidateCache(tsLocation);
+ }
log.debug(e.getMessage(), e);
} catch (AccumuloSecurityException e) {
e.setTableInfo(getTableInfo());
[4/9] accumulo git commit: ACCUMULO-3508 Remove empty javadoc comment
Posted by el...@apache.org.
ACCUMULO-3508 Remove empty javadoc comment
Work around the screwed up checkstyle rule re-adding the space.
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/7aaecbbb
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/7aaecbbb
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/7aaecbbb
Branch: refs/heads/1.6
Commit: 7aaecbbb3073b34660d205f096cf1876a9ab5022
Parents: 1338d03
Author: Josh Elser <el...@apache.org>
Authored: Wed Dec 30 20:00:30 2015 -0500
Committer: Josh Elser <el...@apache.org>
Committed: Wed Dec 30 20:29:11 2015 -0500
----------------------------------------------------------------------
.../main/java/org/apache/accumulo/fate/zookeeper/ZooCache.java | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/7aaecbbb/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooCache.java
----------------------------------------------------------------------
diff --git a/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooCache.java b/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooCache.java
index b30bb15..ceb5427 100644
--- a/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooCache.java
+++ b/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooCache.java
@@ -286,10 +286,8 @@ public class ZooCache {
/*
* The following call to exists() is important, since we are caching that a node does not exist. Once the node comes into existence, it will be added to
- * the cache. But this notification of a node coming into existence will only be given if exists() was previously called.
- *
- * If the call to exists() is bypassed and only getData() is called with a special case that looks for Code.NONODE in the KeeperException, then
- * non-existence can not be cached.
+ * the cache. But this notification of a node coming into existence will only be given if exists() was previously called. If the call to exists() is
+ * bypassed and only getData() is called with a special case that looks for Code.NONODE in the KeeperException, then non-existence can not be cached.
*/
cacheWriteLock.lock();
try {
[2/9] accumulo git commit: ACCUMULO-3835 leave the locator cache
alone if the BatchReader has been closed
Posted by el...@apache.org.
ACCUMULO-3835 leave the locator cache alone if the BatchReader has been closed
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/1338d037
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/1338d037
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/1338d037
Branch: refs/heads/1.7
Commit: 1338d0379db1ce9d3595052c3408b4f4a22f9591
Parents: 2a2bfbb
Author: Eric C. Newton <er...@gmail.com>
Authored: Tue May 26 13:05:11 2015 -0400
Committer: Josh Elser <el...@apache.org>
Committed: Wed Dec 30 19:58:26 2015 -0500
----------------------------------------------------------------------
.../client/impl/TabletServerBatchReaderIterator.java | 12 +++++++-----
1 file changed, 7 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/1338d037/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 814e9ce..64ccac1 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
@@ -383,12 +383,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(tsLocation);
+ locator.invalidateCache(tsLocation);
+ }
log.debug(e.getMessage(), e);
} catch (AccumuloSecurityException e) {
e.setTableInfo(getTableInfo());