[
https://issues.apache.org/jira/browse/ACCUMULO-1889?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=13863533#comment-13863533
]
ASF subversion and git services commented on ACCUMULO-1889:
-----------------------------------------------------------
Commit e946ba052c3fcce8d07815b9daf51bcdc3febbd3 in branch
refs/heads/1.4.5-SNAPSHOT from [~keith_turner]
[ https://git-wip-us.apache.org/repos/asf?p=accumulo.git;h=e946ba0 ]
ACCUMULO-1858 revert commits that added ZooKeeperInstance.close()
Revert "ACCUMULO-2027 Synchronized access to ZooKeeperInstance methods that
mutated state"
This reverts commit 975e8c05e8d11f3848e6c800f4d2772026f6c3a3.
Revert "ACCUMULO-1984 Rework interruption for instance implementations."
This reverts commit 0d0bc4643a8680593e2cf5f828b7566c30fcb345.
Conflicts:
src/core/src/main/java/org/apache/accumulo/core/client/Instance.java
src/core/src/main/java/org/apache/accumulo/core/zookeeper/ZooCache.java
src/core/src/main/java/org/apache/accumulo/core/zookeeper/ZooReader.java
Revert "ACCUMULO-1889 mark ZKI as closed once close() is called."
This reverts commit ada4180379d46297c1531cf8065de5030d12953d.
Revert "ACCUMULO-1858 Backport ZooKeeper clean up to 1.4 and 1.5."
This reverts commit 79d686faa1e477b9cbd80c6f833ece402050b490.
Conflicts:
src/core/src/main/java/org/apache/accumulo/core/client/Instance.java
src/core/src/main/java/org/apache/accumulo/core/zookeeper/ZooCache.java
> ZooKeeperInstance close method should mark instance closed.
> -----------------------------------------------------------
>
> Key: ACCUMULO-1889
> URL: https://issues.apache.org/jira/browse/ACCUMULO-1889
> Project: Accumulo
> Issue Type: Bug
> Affects Versions: 1.4.5, 1.5.1, 1.6.0
> Reporter: Sean Busbey
> Assignee: Sean Busbey
> Fix For: 1.4.5, 1.5.1, 1.6.0
>
> Attachments: ACCUMULO-1889.1.patch.txt
>
>
> (1.4.5 and 1.5.1 impact presumes ACCUMULO-1858 gets applied)
> The current close() implementation on ZooKeeperInstance only marks a given
> instance as closed if the outstanding client count is 0.
> {code}
> public synchronized void close() throws AccumuloException {
> if (!closed && clientInstances.decrementAndGet() == 0) {
> try {
> zooCache.close();
> ThriftUtil.close();
> } catch (InterruptedException e) {
> clientInstances.incrementAndGet();
> throw new AccumuloException("Issues closing ZooKeeper.");
> }
> closed = true;
> }
> }
> {code}
> This is incorrect for two reason:
> 1) It allows continued operations on a given ZKI after it has had close()
> called on it
> 2) It allows a given ZKI to decrement the number of open clients more than
> once
--
This message was sent by Atlassian JIRA
(v6.1.5#6160)
