Revert "zookeeper: remove work-around for ZOOKEEPER-2809"

This reverts commit 0cad361.
dCache · Dec 16, 2017 · 4a05834 · 4a05834
1 parent 0cad361
commit 4a05834
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 9 deletions.
diff --git a/pom.xml b/pom.xml
@@ -190,17 +190,8 @@
                         <groupId>log4j</groupId>
                         <artifactId>log4j</artifactId>
                     </exclusion>
-                    <exclusion>
-                        <groupId>org.apache.zookeeper</groupId>
-                        <artifactId>zookeeper</artifactId>
-                    </exclusion>
                 </exclusions>
             </dependency>
-            <dependency>
-                <groupId>org.apache.zookeeper</groupId>
-                <artifactId>zookeeper</artifactId>
-                <version>3.4.11</version>
-            </dependency>
             <dependency>
                 <groupId>jline</groupId>
                 <artifactId>jline</artifactId>

diff --git a/skel/etc/logback.xml b/skel/etc/logback.xml
@@ -192,6 +192,14 @@
         <logger>io.netty.handler.logging.LoggingHandler</logger>
         <level>off</level>
     </threshold>
+    <threshold>
+        <!-- With v3.4, ZK logs a stacktrace when the client
+             disconnects unexpectedly.  This is fixed with v3.5 and
+             later.  See
+             https://issues.apache.org/jira/browse/ZOOKEEPER-2809 -->
+        <logger>org.apache.zookeeper.server.NIOServerCnxn</logger>
+        <level>error</level>
+    </threshold>
     <threshold>
         <!-- ZK currently contains a race-condition that triggers a
              CancelledKeyException on shutdown; if triggered, a