[GitHub] Humbedooh removed a comment on issue #736: ZOOKEEPER-3217 owasp job flagging slf4j on trunk
Humbedooh removed a comment on issue #736: ZOOKEEPER-3217 owasp job flagging slf4j on trunk URL: https://github.com/apache/zookeeper/pull/736#issuecomment-451108055 Please ignore this comment, checking JIRA integration. This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] Humbedooh commented on issue #736: ZOOKEEPER-3217 owasp job flagging slf4j on trunk
Humbedooh commented on issue #736: ZOOKEEPER-3217 owasp job flagging slf4j on trunk URL: https://github.com/apache/zookeeper/pull/736#issuecomment-451108446 one more test, found a bug :) This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] Humbedooh removed a comment on issue #736: ZOOKEEPER-3217 owasp job flagging slf4j on trunk
Humbedooh removed a comment on issue #736: ZOOKEEPER-3217 owasp job flagging slf4j on trunk URL: https://github.com/apache/zookeeper/pull/736#issuecomment-451108446 one more test, found a bug :) This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] anmolnar commented on a change in pull request #742: ZOOKEEPER-3223: Configure Spotbugs
anmolnar commented on a change in pull request #742: ZOOKEEPER-3223: Configure
Spotbugs
URL: https://github.com/apache/zookeeper/pull/742#discussion_r244963490
##
File path:
zookeeper-server/src/main/java/org/apache/zookeeper/server/EphemeralType.java
##
@@ -212,7 +212,8 @@ public static void validateServerId(long serverId) {
*/
public static void validateTTL(CreateMode mode, long ttl) {
if (mode.isTTL()) {
-TTL.toEphemeralOwner(ttl);
+// nothing to do in 3.5 was:
+// TTL.toEphemeralOwner(ttl);
Review comment:
@eolivelli How is this code change related to this patch?
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
With regards,
Apache Git Services
[GitHub] anmolnar commented on a change in pull request #742: ZOOKEEPER-3223: Configure Spotbugs
anmolnar commented on a change in pull request #742: ZOOKEEPER-3223: Configure Spotbugs URL: https://github.com/apache/zookeeper/pull/742#discussion_r244963240 ## File path: zookeeper-server/src/main/java/org/apache/zookeeper/ClientCnxn.java ## @@ -18,6 +18,7 @@ package org.apache.zookeeper; +import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; Review comment: Do we have to migrate to this annotation-based approach of defining filters? Can't we just re-use the existing findBugs filter file? This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] anmolnar commented on a change in pull request #742: ZOOKEEPER-3223: Configure Spotbugs
anmolnar commented on a change in pull request #742: ZOOKEEPER-3223: Configure
Spotbugs
URL: https://github.com/apache/zookeeper/pull/742#discussion_r244963646
##
File path:
zookeeper-server/src/main/java/org/apache/zookeeper/server/persistence/FileTxnLog.java
##
@@ -180,7 +180,7 @@ public static void setPreallocSize(long size) {
* @param serverStats used to update fsyncThresholdExceedCount
*/
@Override
-public void setServerStats(ServerStats serverStats) {
+public synchronized void setServerStats(ServerStats serverStats) {
Review comment:
I'm not sure if we need to synchronize here, but it shouldn't be part of
this patch.
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
With regards,
Apache Git Services
[GitHub] anmolnar commented on a change in pull request #742: ZOOKEEPER-3223: Configure Spotbugs
anmolnar commented on a change in pull request #742: ZOOKEEPER-3223: Configure Spotbugs URL: https://github.com/apache/zookeeper/pull/742#discussion_r244962944 ## File path: excludeFindBugsFilter.xml ## @@ -0,0 +1,14 @@ + + + Review comment: Naming is a little bit confusing I think. Given that this is a config file of `spotBugs`, shouldn't we call it `spotBugsFilter.xml` instead? Though the XML tag name has remained "FindBugs", so I'm not sure. This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] anmolnar commented on issue #744: ZOOKEEPER-3229: [TLS] add AES-256 ciphers to default cipher list
anmolnar commented on issue #744: ZOOKEEPER-3229: [TLS] add AES-256 ciphers to default cipher list URL: https://github.com/apache/zookeeper/pull/744#issuecomment-451113306 @ivmaykov `QuorumSSLTest.testProtocolVersion` is failing, because TLSv1.1 participant is able to join TLSv1.2-only quorum. Not sure how is it related to this change, but could you please take a look? This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] anmolnar commented on issue #740: ZOOKEEPER-3222. Flaky: multiple intermittent segfaults in C++ tests
anmolnar commented on issue #740: ZOOKEEPER-3222. Flaky: multiple intermittent segfaults in C++ tests URL: https://github.com/apache/zookeeper/pull/740#issuecomment-451117487 retest this please This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] anmolnar commented on issue #740: ZOOKEEPER-3222. Flaky: multiple intermittent segfaults in C++ tests
anmolnar commented on issue #740: ZOOKEEPER-3222. Flaky: multiple intermittent segfaults in C++ tests URL: https://github.com/apache/zookeeper/pull/740#issuecomment-451120479 retest this please This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] anmolnar commented on issue #736: ZOOKEEPER-3217 owasp job flagging slf4j on trunk
anmolnar commented on issue #736: ZOOKEEPER-3217 owasp job flagging slf4j on trunk URL: https://github.com/apache/zookeeper/pull/736#issuecomment-451121539 retest this please This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] anmolnar commented on issue #736: ZOOKEEPER-3217 owasp job flagging slf4j on trunk
anmolnar commented on issue #736: ZOOKEEPER-3217 owasp job flagging slf4j on trunk URL: https://github.com/apache/zookeeper/pull/736#issuecomment-451125713 retest this please This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] ArtemChernatsky commented on issue #730: Zookeeper-3188: Improve resilience to network
ArtemChernatsky commented on issue #730: Zookeeper-3188: Improve resilience to network URL: https://github.com/apache/zookeeper/pull/730#issuecomment-451128577 retest this please This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] coheigea opened a new pull request #752: ZOOKEEPER-3197 - Improve documentation in ZooKeeperServer.superSecret
coheigea opened a new pull request #752: ZOOKEEPER-3197 - Improve documentation in ZooKeeperServer.superSecret URL: https://github.com/apache/zookeeper/pull/752 This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] eolivelli commented on a change in pull request #742: ZOOKEEPER-3223: Configure Spotbugs
eolivelli commented on a change in pull request #742: ZOOKEEPER-3223: Configure Spotbugs URL: https://github.com/apache/zookeeper/pull/742#discussion_r244994756 ## File path: excludeFindBugsFilter.xml ## @@ -0,0 +1,14 @@ + + + Review comment: @anmolnar this name is very common, as many project migrated from findbugs. I can change, no problem. But I don't feel strong about it. This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] eolivelli commented on a change in pull request #742: ZOOKEEPER-3223: Configure Spotbugs
eolivelli commented on a change in pull request #742: ZOOKEEPER-3223: Configure Spotbugs URL: https://github.com/apache/zookeeper/pull/742#discussion_r244995163 ## File path: zookeeper-server/src/main/java/org/apache/zookeeper/ClientCnxn.java ## @@ -18,6 +18,7 @@ package org.apache.zookeeper; +import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; Review comment: @anmolnar personally I like to use annotation because when you read the java file you see the problems. And I am usually using the configuration file for coarse grained control, like when there is some kind of check you don't want to consider at all or in many files This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] eolivelli commented on issue #742: ZOOKEEPER-3223: Configure Spotbugs
eolivelli commented on issue #742: ZOOKEEPER-3223: Configure Spotbugs URL: https://github.com/apache/zookeeper/pull/742#issuecomment-451139535 @anmolnar the change around `// TTL.toEphemeralOwner(ttl);` was because that method for spotbugs won't have any side effects, but indeed it is a false positive, so I am reverting it and adding a suppression This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] eolivelli commented on a change in pull request #742: ZOOKEEPER-3223: Configure Spotbugs
eolivelli commented on a change in pull request #742: ZOOKEEPER-3223: Configure
Spotbugs
URL: https://github.com/apache/zookeeper/pull/742#discussion_r244996468
##
File path:
zookeeper-server/src/main/java/org/apache/zookeeper/server/persistence/FileTxnLog.java
##
@@ -180,7 +180,7 @@ public static void setPreallocSize(long size) {
* @param serverStats used to update fsyncThresholdExceedCount
*/
@Override
-public void setServerStats(ServerStats serverStats) {
+public synchronized void setServerStats(ServerStats serverStats) {
Review comment:
This is spotbugs error:
`[ERROR] Inconsistent synchronization of
org.apache.zookeeper.server.persistence.FileTxnLog.serverStats; locked 66% of
time [org.apache.zookeeper.server.persistence.FileTxnLog,
org.apache.zookeeper.server.persistence.FileTxnLog,
org.apache.zookeeper.server.persistence.FileTxnLog] Unsynchronized access at
FileTxnLog.java:[line 184]Synchronized access at FileTxnLog.java:[line
381]Synchronized access at FileTxnLog.java:[line 382] IS2_INCONSISTENT_SYNC
`
I think this change is safe
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
With regards,
Apache Git Services
[GitHub] anmolnar commented on issue #736: ZOOKEEPER-3217 owasp job flagging slf4j on trunk
anmolnar commented on issue #736: ZOOKEEPER-3217 owasp job flagging slf4j on trunk URL: https://github.com/apache/zookeeper/pull/736#issuecomment-451145230 retest this please This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] anmolnar commented on a change in pull request #742: ZOOKEEPER-3223: Configure Spotbugs
anmolnar commented on a change in pull request #742: ZOOKEEPER-3223: Configure Spotbugs URL: https://github.com/apache/zookeeper/pull/742#discussion_r245004005 ## File path: excludeFindBugsFilter.xml ## @@ -0,0 +1,14 @@ + + + Review comment: Leave it, I'm fine with that. This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] anmolnar commented on a change in pull request #742: ZOOKEEPER-3223: Configure Spotbugs
anmolnar commented on a change in pull request #742: ZOOKEEPER-3223: Configure Spotbugs URL: https://github.com/apache/zookeeper/pull/742#discussion_r245008359 ## File path: zookeeper-server/src/main/java/org/apache/zookeeper/ClientCnxn.java ## @@ -18,6 +18,7 @@ package org.apache.zookeeper; +import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; Review comment: I'm willing to accept it, but it makes the patch slightly bigger and I feel like we need some additional support from the community in this case. At least one more approval from a committer. This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] anmolnar commented on issue #740: ZOOKEEPER-3222. Flaky: multiple intermittent segfaults in C++ tests
anmolnar commented on issue #740: ZOOKEEPER-3222. Flaky: multiple intermittent segfaults in C++ tests URL: https://github.com/apache/zookeeper/pull/740#issuecomment-451154938 retest this please This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] ArtemChernatsky commented on issue #730: Zookeeper-3188: Improve resilience to network
ArtemChernatsky commented on issue #730: Zookeeper-3188: Improve resilience to network URL: https://github.com/apache/zookeeper/pull/730#issuecomment-451166896 retest this please This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] asfgit closed pull request #740: ZOOKEEPER-3222. Flaky: multiple intermittent segfaults in C++ tests
asfgit closed pull request #740: ZOOKEEPER-3222. Flaky: multiple intermittent segfaults in C++ tests URL: https://github.com/apache/zookeeper/pull/740 This is a PR merged from a forked repository. As GitHub hides the original diff on merge, it is displayed below for the sake of provenance: As this is a foreign pull request (from a fork), the diff is supplied below (as it won't show otherwise due to GitHub magic): diff --git a/zookeeper-client/zookeeper-client-c/tests/TestClient.cc b/zookeeper-client/zookeeper-client-c/tests/TestClient.cc index 008bfdbf83..2006c45878 100644 --- a/zookeeper-client/zookeeper-client-c/tests/TestClient.cc +++ b/zookeeper-client/zookeeper-client-c/tests/TestClient.cc @@ -669,15 +669,6 @@ class Zookeeper_simpleSystem : public CPPUNIT_NS::TestFixture CPPUNIT_ASSERT(count == 1); count = 0; CPPUNIT_ASSERT_EQUAL((int) ZOK, zookeeper_close(zk_auth)); - -// [ZOOKEEPER-800] zoo_add_auth should return ZINVALIDSTATE if -// the connection is closed. -zhandle_t *zk2 = zookeeper_init(hostPorts, NULL, 1, 0, NULL, 0); -sleep(1); -CPPUNIT_ASSERT_EQUAL((int) ZOK, zookeeper_close(zk2)); -CPPUNIT_ASSERT_EQUAL(0, zoo_state(zk2)); // 0 ==> ZOO_CLOSED_STATE -rc = zoo_add_auth(zk2, "digest", "pat:passwd", 10, voidCompletion, (void*)ZOK); -CPPUNIT_ASSERT_EQUAL((int) ZINVALIDSTATE, rc); struct sockaddr addr; socklen_t addr_len = sizeof(addr); @@ -1351,9 +1342,9 @@ class Zookeeper_simpleSystem : public CPPUNIT_NS::TestFixture int blen = sizeof(buf); int rc; watchctx_t ctx; - zhandle_t *zk; + zhandle_t *zk; - /* setup path */ + /* setup path */ zk = createClient(&ctx); CPPUNIT_ASSERT(zk); @@ -1409,6 +1400,8 @@ class Zookeeper_simpleSystem : public CPPUNIT_NS::TestFixture watcher_rw, NULL, 0); CPPUNIT_ASSERT_EQUAL((int)ZCONNECTIONLOSS, rc); + zookeeper_close(zk); + /* bring the server back */ startServer(); zk = createClient(&ctx); This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] anmolnar commented on issue #740: ZOOKEEPER-3222. Flaky: multiple intermittent segfaults in C++ tests
anmolnar commented on issue #740: ZOOKEEPER-3222. Flaky: multiple intermittent segfaults in C++ tests URL: https://github.com/apache/zookeeper/pull/740#issuecomment-451167753 Committed to master and 3.5 branches. Thanks @lvfangmin ! This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] anmolnar commented on issue #736: ZOOKEEPER-3217 owasp job flagging slf4j on trunk
anmolnar commented on issue #736: ZOOKEEPER-3217 owasp job flagging slf4j on trunk URL: https://github.com/apache/zookeeper/pull/736#issuecomment-451167996 retest this please This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] anmolnar commented on issue #728: ZOOKEEPER-3160: Custom User SSLContext
anmolnar commented on issue #728: ZOOKEEPER-3160: Custom User SSLContext URL: https://github.com/apache/zookeeper/pull/728#issuecomment-451174697 @arankin-irl Please rebase on top of current master. @ivmaykov @hanm Would you please take a quick a look at this patch? I'd like to get your support to confidently merge it. This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] ArtemChernatsky commented on issue #730: Zookeeper-3188: Improve resilience to network
ArtemChernatsky commented on issue #730: Zookeeper-3188: Improve resilience to network URL: https://github.com/apache/zookeeper/pull/730#issuecomment-451177021 retest this please This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] asfgit closed pull request #736: ZOOKEEPER-3217 owasp job flagging slf4j on trunk
asfgit closed pull request #736: ZOOKEEPER-3217 owasp job flagging slf4j on
trunk
URL: https://github.com/apache/zookeeper/pull/736
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git a/build.xml b/build.xml
index 58685327f8..423c108362 100644
--- a/build.xml
+++ b/build.xml
@@ -1705,6 +1705,7 @@ xmlns:cs="antlib:com.puppycrawl.tools.checkstyle.ant">
reportoutputdirectory="${owasp.out.dir}"
reportformat="ALL"
failBuildOnCVSS="0">
+
diff --git a/owaspSuppressions.xml b/owaspSuppressions.xml
new file mode 100644
index 00..0165b9ada1
--- /dev/null
+++ b/owaspSuppressions.xml
@@ -0,0 +1,25 @@
+
+
+
+
+https://jeremylong.github.io/DependencyCheck/dependency-suppression.1.2.xsd";>
+
+
+ CVE-2018-8088
+
+
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
With regards,
Apache Git Services
[GitHub] anmolnar commented on issue #736: ZOOKEEPER-3217 owasp job flagging slf4j on trunk
anmolnar commented on issue #736: ZOOKEEPER-3217 owasp job flagging slf4j on trunk URL: https://github.com/apache/zookeeper/pull/736#issuecomment-451178971 Committed to 3.4, 3.5 and master branches. Thanks @eolivelli ! This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] anmolnar commented on issue #710: ZOOKEEPER-3195: TLS - disable client-initiated renegotiation
anmolnar commented on issue #710: ZOOKEEPER-3195: TLS - disable client-initiated renegotiation URL: https://github.com/apache/zookeeper/pull/710#issuecomment-451179479 retest this please This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] arankin-irl commented on issue #728: ZOOKEEPER-3160: Custom User SSLContext
arankin-irl commented on issue #728: ZOOKEEPER-3160: Custom User SSLContext URL: https://github.com/apache/zookeeper/pull/728#issuecomment-451193461 @anmolnar - should be up to date now. This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] dineshappavoo commented on issue #752: ZOOKEEPER-3197 - Improve documentation in ZooKeeperServer.superSecret
dineshappavoo commented on issue #752: ZOOKEEPER-3197 - Improve documentation in ZooKeeperServer.superSecret URL: https://github.com/apache/zookeeper/pull/752#issuecomment-451256979 LGTM 👍 This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] enixon commented on issue #752: ZOOKEEPER-3197 - Improve documentation in ZooKeeperServer.superSecret
enixon commented on issue #752: ZOOKEEPER-3197 - Improve documentation in ZooKeeperServer.superSecret URL: https://github.com/apache/zookeeper/pull/752#issuecomment-451351904 I like it :) This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] anmolnar opened a new pull request #753: ZOOKEEPER-3204: Reconfig tests are constantly failing on 3.5 after applying Java 11 fix
anmolnar opened a new pull request #753: ZOOKEEPER-3204: Reconfig tests are constantly failing on 3.5 after applying Java 11 fix URL: https://github.com/apache/zookeeper/pull/753 Looks like that Netty 3 also having problems with correctly closing sockets and we keep getting "Bind failed" exceptions on the 3.5 branch. In this patch I'm trying to cherry-pick the upgrade-to-Netty4 commit by @ivmaykov from master branch and it looks like it solves the problem. I know this change is quite radical at this time of 3.5 release, but here're my 2 cents: - Netty 3 is rather old, would be a lot nicer to release 3.5 with a shiny new Netty lib support which will become stable in this release anyway (Netty is optional in 3.4) - After digging the net, I have absolutely no idea how to fix the Java11 binding issue with Netty 3. I suspect that the lib is as old as nobody bothers with the problem. Please take your time for a careful review. This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] anmolnar opened a new pull request #754: ZOOKEEPER-3233: Run github pre-commit hook tests on 4 threads (branch-3.5)
anmolnar opened a new pull request #754: ZOOKEEPER-3233: Run github pre-commit hook tests on 4 threads (branch-3.5) URL: https://github.com/apache/zookeeper/pull/754 1. Changed number of threads: 8 -> 4 2. Turned off test.output: yes -> no (backport from master) This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] anmolnar commented on issue #754: ZOOKEEPER-3233: Run github pre-commit hook tests on 4 threads (branch-3.5)
anmolnar commented on issue #754: ZOOKEEPER-3233: Run github pre-commit hook tests on 4 threads (branch-3.5) URL: https://github.com/apache/zookeeper/pull/754#issuecomment-451417583 retest this please This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] anmolnar commented on issue #753: ZOOKEEPER-3204: Reconfig tests are constantly failing on 3.5 after applying Java 11 fix
anmolnar commented on issue #753: ZOOKEEPER-3204: Reconfig tests are constantly failing on 3.5 after applying Java 11 fix URL: https://github.com/apache/zookeeper/pull/753#issuecomment-451428246 @eolivelli Unfortunately I have to agree with you. But that also means Java 11 support of 3.5 is broken and it blocks the release. This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] nkalmar commented on issue #753: ZOOKEEPER-3204: Reconfig tests are constantly failing on 3.5 after applying Java 11 fix
nkalmar commented on issue #753: ZOOKEEPER-3204: Reconfig tests are constantly failing on 3.5 after applying Java 11 fix URL: https://github.com/apache/zookeeper/pull/753#issuecomment-451432777 Tough call, maybe worth a vote on DEV list. A freshly released 3.5 stable not supporting java11 is... not the best either. Even though we plan to release 3.6 very fast, looking at past release dates, that's something we can't reliably build upon. So if there's no solution for this bug (possibly bug in netty 3 itself, at least we did not find a workaround yet) than maybe it's worth the backport. But I think this question shouldn't be decided only by a very few people on the PR, so DEV list vote / consulting? This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] eolivelli commented on issue #753: ZOOKEEPER-3204: Reconfig tests are constantly failing on 3.5 after applying Java 11 fix
eolivelli commented on issue #753: ZOOKEEPER-3204: Reconfig tests are constantly failing on 3.5 after applying Java 11 fix URL: https://github.com/apache/zookeeper/pull/753#issuecomment-451433617 For what is worth I have been running 3.5 in production on jdk11 for some month without particular issues. I will take a look to the failures again maybe I will be lucky :) This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] anmolnar commented on issue #753: ZOOKEEPER-3204: Reconfig tests are constantly failing on 3.5 after applying Java 11 fix
anmolnar commented on issue #753: ZOOKEEPER-3204: Reconfig tests are constantly failing on 3.5 after applying Java 11 fix URL: https://github.com/apache/zookeeper/pull/753#issuecomment-451442468 @eolivelli Let's move the discussion to the mailing list. This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] anmolnar commented on issue #754: ZOOKEEPER-3233: Run github pre-commit hook tests on 4 threads (branch-3.5)
anmolnar commented on issue #754: ZOOKEEPER-3233: Run github pre-commit hook tests on 4 threads (branch-3.5) URL: https://github.com/apache/zookeeper/pull/754#issuecomment-451473571 Merged. Thanks. This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] anmolnar closed pull request #754: ZOOKEEPER-3233: Run github pre-commit hook tests on 4 threads (branch-3.5)
anmolnar closed pull request #754: ZOOKEEPER-3233: Run github pre-commit hook
tests on 4 threads (branch-3.5)
URL: https://github.com/apache/zookeeper/pull/754
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git a/zookeeper-server/src/test/resources/test-github-pr.sh
b/zookeeper-server/src/test/resources/test-github-pr.sh
index f4d65ff7ba..3a38bd 100755
--- a/zookeeper-server/src/test/resources/test-github-pr.sh
+++ b/zookeeper-server/src/test/resources/test-github-pr.sh
@@ -450,8 +450,8 @@ runCoreTests () {
### Kill any rogue build processes from the last attempt
$PS auxwww | $GREP ZookeeperPatchProcess | /usr/bin/nawk '{print $2}' |
/usr/bin/xargs -t -I {} /bin/kill -9 {} > /dev/null
- echo "$ANT_HOME/bin/ant -DZookeeperPatchProcess=
-Dtest.junit.output.format=xml -Dtest.output=yes -Dtest.junit.threads=8
-Dcompile.c++=yes -Djava5.home=$JAVA5_HOME test-core"
- $ANT_HOME/bin/ant -DZookeeperPatchProcess= -Dtest.junit.output.format=xml
-Dtest.output=yes -Dtest.junit.threads=8 -Dcompile.c++=yes
-Djava5.home=$JAVA5_HOME test-core
+ echo "$ANT_HOME/bin/ant -DZookeeperPatchProcess=
-Dtest.junit.output.format=xml -Dtest.output=no -Dtest.junit.threads=4
-Dcompile.c++=yes -Djava5.home=$JAVA5_HOME test-core"
+ $ANT_HOME/bin/ant -DZookeeperPatchProcess= -Dtest.junit.output.format=xml
-Dtest.output=no -Dtest.junit.threads=4 -Dcompile.c++=yes
-Djava5.home=$JAVA5_HOME test-core
if [[ $? != 0 ]] ; then
JIRA_COMMENT="$JIRA_COMMENT
@@ -480,8 +480,8 @@ runContribTests () {
### Kill any rogue build processes from the last attempt
$PS auxwww | $GREP ZookeeperPatchProcess | /usr/bin/nawk '{print $2}' |
/usr/bin/xargs -t -I {} /bin/kill -9 {} > /dev/null
- echo "$ANT_HOME/bin/ant -DZookeeperPatchProcess=
-Dtest.junit.output.format=xml -Dtest.output=yes test-contrib"
- $ANT_HOME/bin/ant -DZookeeperPatchProcess= -Dtest.junit.output.format=xml
-Dtest.output=yes test-contrib
+ echo "$ANT_HOME/bin/ant -DZookeeperPatchProcess=
-Dtest.junit.output.format=xml -Dtest.output=no test-contrib"
+ $ANT_HOME/bin/ant -DZookeeperPatchProcess= -Dtest.junit.output.format=xml
-Dtest.output=no test-contrib
if [[ $? != 0 ]] ; then
JIRA_COMMENT="$JIRA_COMMENT
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
With regards,
Apache Git Services
[GitHub] eolivelli commented on issue #753: ZOOKEEPER-3204: Reconfig tests are constantly failing on 3.5 after applying Java 11 fix
eolivelli commented on issue #753: ZOOKEEPER-3204: Reconfig tests are constantly failing on 3.5 after applying Java 11 fix URL: https://github.com/apache/zookeeper/pull/753#issuecomment-451474494 I will answer to the mailing list as well. I have thought more about this problem, and I have checked that Netty 3 is really dead/unmantained (last release in 2016). If I understand correctly there is no easy workaround (nothing without hacking Netty 3 internals) As soon as we will declare 3.5.5 "stable" the world will hopefully abandon 3.4 and switch to 3.5 + Netty (because of SSL support). The network stack is very important so it is better to have Netty 4 as foundation, I am thinking about security issues, we won't make an "hotfix" release with the switch to Netty 4 because there is a bad bug in Netty 3. So better to switch now. But Facebooks guys, expecially @ivmaykov did a lot of bugfixes around Netty on master branch, we must be sure that what we are delivering in 3.5.5 is stable. We will also have to state clearly in the "release notes" that Netty version is changed, as this may have a non trivial impact to memory usage (i.e. Netty 4 uses more Direct memory by default) So after all if we take care of porting all of the changes about Netty 4 from master I am +1 to this patch @anmolnar @nkalmar This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] asfgit closed pull request #742: ZOOKEEPER-3223: Configure Spotbugs
asfgit closed pull request #742: ZOOKEEPER-3223: Configure Spotbugs
URL: https://github.com/apache/zookeeper/pull/742
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git a/build.xml b/build.xml
index f8a0546740..dca2e0bf49 100644
--- a/build.xml
+++ b/build.xml
@@ -28,6 +28,7 @@ xmlns:cs="antlib:com.puppycrawl.tools.checkstyle.ant">
+
diff --git a/excludeFindBugsFilter.xml b/excludeFindBugsFilter.xml
new file mode 100644
index 00..c836911dbe
--- /dev/null
+++ b/excludeFindBugsFilter.xml
@@ -0,0 +1,14 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/ivy.xml b/ivy.xml
index c7f79b6634..a95331780d 100644
--- a/ivy.xml
+++ b/ivy.xml
@@ -46,6 +46,7 @@
+
diff --git a/pom.xml b/pom.xml
index 58c9e50d36..0dc71743c5 100755
--- a/pom.xml
+++ b/pom.xml
@@ -276,6 +276,7 @@
1.1.0
1.56
3.2.2
+3.1.8
@@ -408,6 +409,13 @@
jline
${jline.version}
+
+ com.github.spotbugs
+ spotbugs-annotations
+ ${spotbugsannotations.version}
+ provided
+ true
+
@@ -459,6 +467,14 @@
clover-maven-plugin
4.3.1
+
+ com.github.spotbugs
+ spotbugs-maven-plugin
+ 3.1.8
+
+excludeFindBugsFilter.xml
+
+
@@ -486,7 +502,11 @@
-
+
+com.github.spotbugs
+spotbugs-maven-plugin
+
+
diff --git a/zookeeper-jute/pom.xml b/zookeeper-jute/pom.xml
index bc133b29b7..9bb696e9a7 100755
--- a/zookeeper-jute/pom.xml
+++ b/zookeeper-jute/pom.xml
@@ -145,6 +145,14 @@
+
+
+com.github.spotbugs
+spotbugs-maven-plugin
+
+true
+
+
diff --git a/zookeeper-server/pom.xml b/zookeeper-server/pom.xml
index b4ee890d2a..9062469352 100755
--- a/zookeeper-server/pom.xml
+++ b/zookeeper-server/pom.xml
@@ -34,6 +34,12 @@
ZooKeeper server
+
+ com.github.spotbugs
+ spotbugs-annotations
+ provided
+ true
+
org.hamcrest
hamcrest-all
diff --git
a/zookeeper-server/src/main/java/org/apache/zookeeper/ClientCnxn.java
b/zookeeper-server/src/main/java/org/apache/zookeeper/ClientCnxn.java
index ef53edf0a8..db2b4866af 100644
--- a/zookeeper-server/src/main/java/org/apache/zookeeper/ClientCnxn.java
+++ b/zookeeper-server/src/main/java/org/apache/zookeeper/ClientCnxn.java
@@ -18,6 +18,7 @@
package org.apache.zookeeper;
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
import java.io.BufferedReader;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
@@ -97,6 +98,7 @@
* connected to as needed.
*
*/
+@SuppressFBWarnings({"EI_EXPOSE_REP", "EI_EXPOSE_REP2"})
public class ClientCnxn {
private static final Logger LOG =
LoggerFactory.getLogger(ClientCnxn.class);
@@ -479,6 +481,7 @@ public void queueCallback(AsyncCallback cb, int rc, String
path,
waitingEvents.add(new LocalCallback(cb, rc, path, ctx));
}
+ @SuppressFBWarnings("JLM_JSR166_UTILCONCURRENT_MONITORENTER")
public void queuePacket(Packet packet) {
if (wasKilled) {
synchronized (waitingEvents) {
@@ -495,6 +498,7 @@ public void queueEventOfDeath() {
}
@Override
+@SuppressFBWarnings("JLM_JSR166_UTILCONCURRENT_MONITORENTER")
public void run() {
try {
isRunning = true;
diff --git a/zookeeper-server/src/main/java/org/apache/zookeeper/ZooDefs.java
b/zookeeper-server/src/main/java/org/apache/zookeeper/ZooDefs.java
index f685e32e2a..97aa28a7c7 100644
--- a/zookeeper-server/src/main/java/org/apache/zookeeper/ZooDefs.java
+++ b/zookeeper-server/src/main/java/org/apache/zookeeper/ZooDefs.java
@@ -18,6 +18,7 @@
package org.apache.zookeeper;
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
import java.util.ArrayList;
import java.util.Collections;
@@ -118,18 +119,21 @@
/**
* This is a completely open ACL .
*/
+@SuppressFBWarnings(value = "MS_MUTABLE_COLLECTION", justification =
"Cannot break API")
public final ArrayList OPEN_ACL_UNSAFE = new ArrayList(
Collections.singletonList(new ACL(Perms.ALL,
ANYONE_ID_UNSAFE)));
/**
* This ACL gives the creators authentication id's all permissions.
*/
+@SuppressFBWarnings(value = "MS_MUTABLE_COLLECTION", justification =
"Cannot break API")
public final ArrayList CREATOR_ALL_ACL = new ArrayList(
Collecti
[GitHub] anmolnar commented on issue #742: ZOOKEEPER-3223: Configure Spotbugs
anmolnar commented on issue #742: ZOOKEEPER-3223: Configure Spotbugs URL: https://github.com/apache/zookeeper/pull/742#issuecomment-451933856 Committed to master branch. Thanks @eolivelli ! This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] anmolnar commented on issue #742: ZOOKEEPER-3223: Configure Spotbugs
anmolnar commented on issue #742: ZOOKEEPER-3223: Configure Spotbugs URL: https://github.com/apache/zookeeper/pull/742#issuecomment-451934012 @eolivelli Please create separate pull request for 3.4 and 3.5 branches. This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] anmolnar commented on issue #710: ZOOKEEPER-3195: TLS - disable client-initiated renegotiation
anmolnar commented on issue #710: ZOOKEEPER-3195: TLS - disable client-initiated renegotiation URL: https://github.com/apache/zookeeper/pull/710#issuecomment-451936850 @eolivelli @lvfangmin Do you accept the patch? This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] asfgit closed pull request #748: ZOOKEEPER-2641:AvgRequestLatency metric improves to be more accurate
asfgit closed pull request #748: ZOOKEEPER-2641:AvgRequestLatency metric
improves to be more accurate
URL: https://github.com/apache/zookeeper/pull/748
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git a/zookeeper-docs/src/main/resources/markdown/zookeeperAdmin.md
b/zookeeper-docs/src/main/resources/markdown/zookeeperAdmin.md
index 0e92cf9737..2b68e38268 100644
--- a/zookeeper-docs/src/main/resources/markdown/zookeeperAdmin.md
+++ b/zookeeper-docs/src/main/resources/markdown/zookeeperAdmin.md
@@ -1270,7 +1270,7 @@ Moving forward, Four Letter Words will be deprecated,
please use
$ echo mntr | nc localhost 2185
zk_version 3.4.0
- zk_avg_latency 0
+ zk_avg_latency 0.7561 - be account to four
decimal places
zk_max_latency 0
zk_min_latency 0
zk_packets_received 70
diff --git
a/zookeeper-server/src/main/java/org/apache/zookeeper/server/ServerMetrics.java
b/zookeeper-server/src/main/java/org/apache/zookeeper/server/ServerMetrics.java
index 203d0f6976..c5d82deebb 100644
---
a/zookeeper-server/src/main/java/org/apache/zookeeper/server/ServerMetrics.java
+++
b/zookeeper-server/src/main/java/org/apache/zookeeper/server/ServerMetrics.java
@@ -83,12 +83,12 @@ public void reset() {
metric.reset();
}
-Map getValues() {
+Map getValues() {
return metric.values();
}
-static public Map getAllValues() {
-LinkedHashMap m = new LinkedHashMap<>();
+static public Map getAllValues() {
+LinkedHashMap m = new LinkedHashMap<>();
for (ServerMetrics metric : ServerMetrics.values()) {
m.putAll(metric.getValues());
}
diff --git
a/zookeeper-server/src/main/java/org/apache/zookeeper/server/ServerStats.java
b/zookeeper-server/src/main/java/org/apache/zookeeper/server/ServerStats.java
index e52ef8e004..bb5cbb4b75 100644
---
a/zookeeper-server/src/main/java/org/apache/zookeeper/server/ServerStats.java
+++
b/zookeeper-server/src/main/java/org/apache/zookeeper/server/ServerStats.java
@@ -64,7 +64,7 @@ public long getMinLatency() {
return requestLatency.getMin();
}
-public long getAvgLatency() {
+public double getAvgLatency() {
return requestLatency.getAvg();
}
diff --git
a/zookeeper-server/src/main/java/org/apache/zookeeper/server/ZooKeeperServerBean.java
b/zookeeper-server/src/main/java/org/apache/zookeeper/server/ZooKeeperServerBean.java
index 6ac76021b3..cf84b2f9e5 100644
---
a/zookeeper-server/src/main/java/org/apache/zookeeper/server/ZooKeeperServerBean.java
+++
b/zookeeper-server/src/main/java/org/apache/zookeeper/server/ZooKeeperServerBean.java
@@ -59,7 +59,7 @@ public String getVersion() {
return Version.getFullVersion();
}
-public long getAvgRequestLatency() {
+public double getAvgRequestLatency() {
return zks.serverStats().getAvgLatency();
}
diff --git
a/zookeeper-server/src/main/java/org/apache/zookeeper/server/ZooKeeperServerMXBean.java
b/zookeeper-server/src/main/java/org/apache/zookeeper/server/ZooKeeperServerMXBean.java
index d7e50d3ccf..feb6875870 100644
---
a/zookeeper-server/src/main/java/org/apache/zookeeper/server/ZooKeeperServerMXBean.java
+++
b/zookeeper-server/src/main/java/org/apache/zookeeper/server/ZooKeeperServerMXBean.java
@@ -41,7 +41,7 @@
/**
* @return average request latency in ms
*/
-public long getAvgRequestLatency();
+public double getAvgRequestLatency();
/**
* @return max request latency in ms
*/
diff --git
a/zookeeper-server/src/main/java/org/apache/zookeeper/server/command/MonitorCommand.java
b/zookeeper-server/src/main/java/org/apache/zookeeper/server/command/MonitorCommand.java
index b89d557473..e3ac230cc7 100644
---
a/zookeeper-server/src/main/java/org/apache/zookeeper/server/command/MonitorCommand.java
+++
b/zookeeper-server/src/main/java/org/apache/zookeeper/server/command/MonitorCommand.java
@@ -84,6 +84,10 @@ public void commandRun() {
private void print(String key, long number) {
print(key, "" + number);
}
+
+private void print(String key, double number) {
+print(key, "" + number);
+}
private void print(String key, String value) {
pw.print("zk_");
diff --git
a/zookeeper-server/src/main/java/org/apache/zookeeper/server/metric/AvgMinMaxCounter.java
b/zookeeper-server/src/main/java/org/apache/zookeeper/server/metric/AvgMinMaxCounter.java
index 499c9a0e2d..3029f9485c 100644
---
a/zookeeper-server/src/main/java/org/apache/zookeeper/server/metric/AvgMinMaxCounter.java
+++
b/zookeeper-server/src/main/java/org/apache/zookeeper/server/me
[GitHub] anmolnar commented on issue #748: ZOOKEEPER-2641:AvgRequestLatency metric improves to be more accurate
anmolnar commented on issue #748: ZOOKEEPER-2641:AvgRequestLatency metric improves to be more accurate URL: https://github.com/apache/zookeeper/pull/748#issuecomment-451937660 Merged to master branch. Thanks @maoling ! This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] eolivelli commented on issue #742: ZOOKEEPER-3223: Configure Spotbugs
eolivelli commented on issue #742: ZOOKEEPER-3223: Configure Spotbugs URL: https://github.com/apache/zookeeper/pull/742#issuecomment-451942104 @anmolnar cherry pick fails because some commits about Maven migration are missing on branch-3.5 and branch-3.4 @nkalmar can we sync Maven Migration commits before the Spotbugs one ? This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] asfgit closed pull request #722: [ZOOKEEPER-3203] Tracking the number of non voting followers in ZK
asfgit closed pull request #722: [ZOOKEEPER-3203] Tracking the number of non
voting followers in ZK
URL: https://github.com/apache/zookeeper/pull/722
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git
a/zookeeper-server/src/main/java/org/apache/zookeeper/server/admin/Commands.java
b/zookeeper-server/src/main/java/org/apache/zookeeper/server/admin/Commands.java
index 29e18456a8..f1e5500563 100644
---
a/zookeeper-server/src/main/java/org/apache/zookeeper/server/admin/Commands.java
+++
b/zookeeper-server/src/main/java/org/apache/zookeeper/server/admin/Commands.java
@@ -369,6 +369,7 @@ public CommandResponse run(ZooKeeperServer zkServer,
Map kwargs)
response.put("learners", leader.getLearners().size());
response.put("synced_followers",
leader.getForwardingFollowers().size());
+response.put("synced_non_voting_followers",
leader.getNonVotingFollowers().size());
response.put("synced_observers",
leader.getObservingLearners().size());
response.put("pending_syncs", leader.getNumPendingSyncs());
response.put("leader_uptime", leader.getUptime());
diff --git
a/zookeeper-server/src/main/java/org/apache/zookeeper/server/command/MonitorCommand.java
b/zookeeper-server/src/main/java/org/apache/zookeeper/server/command/MonitorCommand.java
index b89d557473..75d1dea655 100644
---
a/zookeeper-server/src/main/java/org/apache/zookeeper/server/command/MonitorCommand.java
+++
b/zookeeper-server/src/main/java/org/apache/zookeeper/server/command/MonitorCommand.java
@@ -73,6 +73,7 @@ public void commandRun() {
print("learners", leader.getLearners().size());
print("synced_followers", leader.getForwardingFollowers().size());
+print("synced_non_voting_followers",
leader.getNonVotingFollowers().size());
print("pending_syncs", leader.getNumPendingSyncs());
print("last_proposal_size",
leader.getProposalStats().getLastBufferSize());
diff --git
a/zookeeper-server/src/main/java/org/apache/zookeeper/server/quorum/Leader.java
b/zookeeper-server/src/main/java/org/apache/zookeeper/server/quorum/Leader.java
index 397ea6d4e8..c284debfc4 100644
---
a/zookeeper-server/src/main/java/org/apache/zookeeper/server/quorum/Leader.java
+++
b/zookeeper-server/src/main/java/org/apache/zookeeper/server/quorum/Leader.java
@@ -152,7 +152,19 @@ public LearnerSnapshotThrottler
createLearnerSnapshotThrottler(
}
}
-private void addForwardingFollower(LearnerHandler lh) {
+public List getNonVotingFollowers() {
+List nonVotingFollowers = new
ArrayList();
+synchronized (forwardingFollowers) {
+for (LearnerHandler lh : forwardingFollowers) {
+if (!isParticipant(lh.getSid())) {
+nonVotingFollowers.add(lh);
+}
+}
+}
+return nonVotingFollowers;
+}
+
+void addForwardingFollower(LearnerHandler lh) {
synchronized (forwardingFollowers) {
forwardingFollowers.add(lh);
}
diff --git
a/zookeeper-server/src/main/java/org/apache/zookeeper/server/quorum/LeaderBean.java
b/zookeeper-server/src/main/java/org/apache/zookeeper/server/quorum/LeaderBean.java
index 0c3be4a252..1c178f6bd9 100644
---
a/zookeeper-server/src/main/java/org/apache/zookeeper/server/quorum/LeaderBean.java
+++
b/zookeeper-server/src/main/java/org/apache/zookeeper/server/quorum/LeaderBean.java
@@ -51,6 +51,15 @@ public String followerInfo() {
return sb.toString();
}
+@Override
+public String nonVotingFollowerInfo() {
+StringBuilder sb = new StringBuilder();
+for (LearnerHandler handler : leader.getNonVotingFollowers()) {
+sb.append(handler.toString()).append("\n");
+}
+return sb.toString();
+}
+
@Override
public long getElectionTimeTaken() {
return leader.self.getElectionTimeTaken();
diff --git
a/zookeeper-server/src/main/java/org/apache/zookeeper/server/quorum/LeaderMXBean.java
b/zookeeper-server/src/main/java/org/apache/zookeeper/server/quorum/LeaderMXBean.java
index 7a1a439fa0..4aed18608d 100644
---
a/zookeeper-server/src/main/java/org/apache/zookeeper/server/quorum/LeaderMXBean.java
+++
b/zookeeper-server/src/main/java/org/apache/zookeeper/server/quorum/LeaderMXBean.java
@@ -34,6 +34,11 @@
*/
public String followerInfo();
+/**
+ * @return information about current non-voting followers
+ */
+public String nonVotingFollowerInfo();
+
/**
* @return time taken for leader election in milliseconds.
*/
diff --git
a/zookeeper-server/src/test/java/org/apache/zookeeper/server/quorum/LeaderBean
[GitHub] anmolnar commented on issue #722: [ZOOKEEPER-3203] Tracking the number of non voting followers in ZK
anmolnar commented on issue #722: [ZOOKEEPER-3203] Tracking the number of non voting followers in ZK URL: https://github.com/apache/zookeeper/pull/722#issuecomment-451942215 Merged to master branch. Thanks @lvfangmin ! This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] nkalmar opened a new pull request #755: MAVEN MIGRATION 3.5 - ZOOKEEPER-3029
nkalmar opened a new pull request #755: MAVEN MIGRATION 3.5 - ZOOKEEPER-3029 URL: https://github.com/apache/zookeeper/pull/755 Work In Progress Creating the maven build for zookeeper-server, zookeeper-jute and zookeeper-client (which only contains C client right now, and it hasn't been implemented yet - maven is not calling make or autoconf) Author: Norbert Kalmar Reviewers: an...@apache.org Closes #708 from nkalmar/ZOOKEEPER-3029r and squashes the following commits: 4b1354f41 [Norbert Kalmar] ZOOKEEPER-3029 - add java clover coverage 9c4591ce5 [Norbert Kalmar] ZOOKEEPER-3029 - fix pom issues and clover classpath 5b9350abd [Norbert Kalmar] ZOOKEEPER-3029 - fix C maven test classpath issues 69a2c51b6 [Norbert Kalmar] ZOOKEEPER-3029 - change git-wip-us git to gitbox daf273a7e [Norbert Kalmar] ZOOKEEPER-3029 - remove build.xml from c-client, use maven e328cb812 [Norbert Kalmar] ZOOKEEPER-3029 - fix cppunit tests 5133abe46 [Norbert Kalmar] ZOOKEEPER-3029 - fix portAssigment bug with maven eb7b4abfb [Norbert Kalmar] ZOOKEEPER-3029 - fix jute dependency import d786b90a2 [Norbert Kalmar] ZOOKEEPER-3029 - Build C library and fix tests 438cd43de [Norbert Kalmar] ZOOKEEPER-3029 - add pom.xml for jute, client and server This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] asfgit closed pull request #752: ZOOKEEPER-3197 - Improve documentation in ZooKeeperServer.superSecret
asfgit closed pull request #752: ZOOKEEPER-3197 - Improve documentation in ZooKeeperServer.superSecret URL: https://github.com/apache/zookeeper/pull/752 This is a PR merged from a forked repository. As GitHub hides the original diff on merge, it is displayed below for the sake of provenance: As this is a foreign pull request (from a fork), the diff is supplied below (as it won't show otherwise due to GitHub magic): diff --git a/zookeeper-server/src/main/java/org/apache/zookeeper/server/ZooKeeperServer.java b/zookeeper-server/src/main/java/org/apache/zookeeper/server/ZooKeeperServer.java index b417a8f095..20ab023ec5 100644 --- a/zookeeper-server/src/main/java/org/apache/zookeeper/server/ZooKeeperServer.java +++ b/zookeeper-server/src/main/java/org/apache/zookeeper/server/ZooKeeperServer.java @@ -116,8 +116,10 @@ } /** - * This is the secret that we use to generate passwords, for the moment it - * is more of a sanity check. + * This is the secret that we use to generate passwords. For the moment, + * it's more of a checksum that's used in reconnection, which carries no + * security weight, and is treated internally as if it carries no + * security weight. */ static final private long superSecret = 0XB3415C00L; This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] anmolnar commented on issue #752: ZOOKEEPER-3197 - Improve documentation in ZooKeeperServer.superSecret
anmolnar commented on issue #752: ZOOKEEPER-3197 - Improve documentation in ZooKeeperServer.superSecret URL: https://github.com/apache/zookeeper/pull/752#issuecomment-451954037 Committed to 3.5 and master branches. Thanks @coheigea ! This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] anmolnar commented on a change in pull request #684: ZOOKEEPER-3180: Add response cache to improve the throughput of read …
anmolnar commented on a change in pull request #684: ZOOKEEPER-3180: Add
response cache to improve the throughput of read …
URL: https://github.com/apache/zookeeper/pull/684#discussion_r245674890
##
File path:
zookeeper-server/src/main/java/org/apache/zookeeper/server/ResponseCache.java
##
@@ -0,0 +1,84 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.zookeeper.server;
+
+import java.util.Collections;
+import java.util.LinkedHashMap;
+import java.util.Map;
+
+import org.apache.jute.Record;
+import org.apache.zookeeper.data.Stat;
+
+@SuppressWarnings("serial")
+public class ResponseCache {
+private static final int DEFAULT_RESPONSE_CACHE_SIZE = 400;
+
+private static class Entry {
+public Stat stat;
+public byte[] data;
+}
+
+private Map cache = Collections.synchronizedMap(
+new LRUCache(getResponseCacheSize()));
+
+public ResponseCache() {
+}
+
+public void put(String path, byte[] data, Stat stat) {
+Entry entry = new Entry();
+entry.data = data;
+entry.stat = stat;
+cache.put(path, entry);
+}
+
+public byte[] get(String key, Stat stat) {
+Entry entry = cache.get(key);
+if (entry == null) {
+return null;
+}
+if (!stat.equals(entry.stat)) {
+// The node has been modified, invalidate cache.
+cache.remove(key);
+return null;
+} else {
+return entry.data;
+}
+}
+
+private static int getResponseCacheSize() {
+String value = System.getProperty("zookeeper.maxResponseCacheSize");
Review comment:
I prefer to add documentation changes to this patch instead of creating a
separate one.
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
With regards,
Apache Git Services
[GitHub] nkalmar opened a new pull request #756: MAVEN MIGRATION 3.4 - ZOOKEEPER-3029
nkalmar opened a new pull request #756: MAVEN MIGRATION 3.4 - ZOOKEEPER-3029 URL: https://github.com/apache/zookeeper/pull/756 Author: Norbert Kalmar Reviewers: an...@apache.org Closes #708 from nkalmar/ZOOKEEPER-3029r and squashes the following commits: 4b1354f41 [Norbert Kalmar] ZOOKEEPER-3029 - add java clover coverage 9c4591ce5 [Norbert Kalmar] ZOOKEEPER-3029 - fix pom issues and clover classpath 5b9350abd [Norbert Kalmar] ZOOKEEPER-3029 - fix C maven test classpath issues 69a2c51b6 [Norbert Kalmar] ZOOKEEPER-3029 - change git-wip-us git to gitbox daf273a7e [Norbert Kalmar] ZOOKEEPER-3029 - remove build.xml from c-client, use maven e328cb812 [Norbert Kalmar] ZOOKEEPER-3029 - fix cppunit tests 5133abe46 [Norbert Kalmar] ZOOKEEPER-3029 - fix portAssigment bug with maven eb7b4abfb [Norbert Kalmar] ZOOKEEPER-3029 - fix jute dependency import d786b90a2 [Norbert Kalmar] ZOOKEEPER-3029 - Build C library and fix tests 438cd43de [Norbert Kalmar] ZOOKEEPER-3029 - add pom.xml for jute, client and server This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] anmolnar commented on issue #724: ZOOKEEPER-2488: Synchronized access to shuttingDownLE in QuorumPeer
anmolnar commented on issue #724: ZOOKEEPER-2488: Synchronized access to shuttingDownLE in QuorumPeer URL: https://github.com/apache/zookeeper/pull/724#issuecomment-451957905 @hanm Do you accept this patch? (you reported the jira) This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] anmolnar commented on issue #716: Enable secure processing and disallow DTDs in the SAXParserFactory
anmolnar commented on issue #716: Enable secure processing and disallow DTDs in the SAXParserFactory URL: https://github.com/apache/zookeeper/pull/716#issuecomment-451958971 @coheigea Thanks for providing this patch. Would you please create a Jira for it, so that I can merge it. This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] coheigea commented on issue #716: Enable secure processing and disallow DTDs in the SAXParserFactory
coheigea commented on issue #716: Enable secure processing and disallow DTDs in the SAXParserFactory URL: https://github.com/apache/zookeeper/pull/716#issuecomment-451962420 @anmolnar done This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] coheigea opened a new pull request #757: ZOOKEEPER-3236 - Upgrade BouncyCastle
coheigea opened a new pull request #757: ZOOKEEPER-3236 - Upgrade BouncyCastle URL: https://github.com/apache/zookeeper/pull/757 This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] maoling commented on issue #751: ZOOKEEPER-3234: Add Travis-CI configuration file
maoling commented on issue #751: ZOOKEEPER-3234: Add Travis-CI configuration file URL: https://github.com/apache/zookeeper/pull/751#issuecomment-452157392 1. this needs a committer/member to sign up and auth the [travis](https://travis-ci.org/) ? 2. why chose the openjdk, rather than oraclejdk? 3. we may need a `build:passing` flag in the Readme-homepage.could you pzl look at an example of [zipkin](https://github.com/openzipkin/zipkin/blob/master/.travis.yml)? This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] eolivelli commented on issue #751: ZOOKEEPER-3234: Add Travis-CI configuration file
eolivelli commented on issue #751: ZOOKEEPER-3234: Add Travis-CI configuration file URL: https://github.com/apache/zookeeper/pull/751#issuecomment-452186181 In order to enable Travis we have to commit this file to master and ask ASF INFRA to enable it. We can enable Travis and then commit to master, there is no specific order. If is better to add the 'badge' only when the setup is complete and working properly I prefer openjdk because it is the reference implementation. There is no much difference, a part branding and license This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] anmolnar commented on issue #755: MAVEN MIGRATION 3.5 - ZOOKEEPER-3029
anmolnar commented on issue #755: MAVEN MIGRATION 3.5 - ZOOKEEPER-3029 URL: https://github.com/apache/zookeeper/pull/755#issuecomment-452230578 Committed to 3.5 branch. Please close this PR. Thanks @nkalmar ! This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] nkalmar closed pull request #755: MAVEN MIGRATION 3.5 - ZOOKEEPER-3029
nkalmar closed pull request #755: MAVEN MIGRATION 3.5 - ZOOKEEPER-3029
URL: https://github.com/apache/zookeeper/pull/755
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git a/.gitignore b/.gitignore
index 6674eb1813..5fe044fae9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,6 @@
# Java
hs_err_pid*
+zookeeper-server/version-2/*
# Git
*.orij
@@ -67,7 +68,6 @@ zookeeper-client/zookeeper-client-c/*.la
zookeeper-client/zookeeper-client-c/*.lo
zookeeper-client/zookeeper-client-c/*.o
zookeeper-client/zookeeper-client-c/generated/
-src/java/generated/
zookeeper-server/src/main/resources/lib/ant-eclipse-*
zookeeper-server/src/main/resources/lib/ivy-*
zookeeper-client/zookeeper-client-c/Makefile.in
@@ -82,3 +82,5 @@ zookeeper-client/zookeeper-client-c/depcomp
zookeeper-client/zookeeper-client-c/install-sh
zookeeper-client/zookeeper-client-c/ltmain.sh
zookeeper-client/zookeeper-client-c/missing
+zookeeper-server/src/main/java/org/apache/zookeeper/version/Info.java
+zookeeper-server/src/test/resources/
diff --git a/bin/zkEnv.sh b/bin/zkEnv.sh
index d189c37204..3ae89baed1 100755
--- a/bin/zkEnv.sh
+++ b/bin/zkEnv.sh
@@ -116,9 +116,17 @@ do
CLASSPATH="$d:$CLASSPATH"
done
+for d in "$ZOOBINDIR"/../zookeeper-server/target/lib/*.jar
+do
+ CLASSPATH="$d:$CLASSPATH"
+done
+
#make it work for developers
CLASSPATH="$ZOOBINDIR/../build/classes:$CLASSPATH"
+#make it work for developers
+CLASSPATH="$ZOOBINDIR/../zookeeper-server/target/classes:$CLASSPATH"
+
case "`uname`" in
CYGWIN*) cygwin=true ;;
*) cygwin=false ;;
diff --git a/pom.xml b/pom.xml
index dc4fb619b8..95b85a1407 100755
--- a/pom.xml
+++ b/pom.xml
@@ -24,7 +24,7 @@
org.apache
apache
18
-
+
org.apache.zookeeper
@@ -57,11 +57,15 @@
zookeeper-docs
+zookeeper-jute
+zookeeper-server
+zookeeper-client
+
scm:git:git://git.apache.org/zookeeper.git
-
scm:git:https://git-wip-us.apache.org/repos/asf/zookeeper.git
-https://git-wip-us.apache.org/repos/asf?p=zookeeper.git
+
scm:git:https://gitbox.apache.org/repos/asf/zookeeper.git
+https://gitbox.apache.org/repos/asf/zookeeper.git
JIRA
@@ -233,4 +237,245 @@
+
+
+1.8
+1.8
+false
+
+8
+
+
+1.7.25
+0.5.0
+4.12
+1.2.17
+1.8.5
+1.3
+1.2
+3.10.6.Final
+9.4.10.v20180503
+2.9.5
+1.1.1
+2.11
+1.1.0
+1.56
+3.2.2
+
+
+
+
+
+org.hamcrest
+hamcrest-all
+${hamcrest.version}
+
+
+commons-collections
+commons-collections
+${commons-collections.version}
+
+
+org.apache.yetus
+audience-annotations
+${audience-annotations.version}
+
+
+commons-cli
+commons-cli
+${commons-cli.version}
+
+
+org.apache.kerby
+kerb-core
+${kerby.version}
+
+
+org.slf4j
+slf4j-api
+
+
+
+
+org.apache.kerby
+kerb-simplekdc
+${kerby.version}
+
+
+org.slf4j
+slf4j-api
+
+
+
+
+org.apache.kerby
+kerby-config
+${kerby.version}
+
+
+org.slf4j
+slf4j-api
+
+
+org.slf4j
+slf4j-log4j12
+
+
+
+
+org.bouncycastle
+bcprov-jdk15on
+${bouncycastle.version}
+
+
+org.bouncycastle
+bcpkix-jdk15on
+${bouncycastle.version}
+
+
+org.slf4j
+slf4j-api
+${slf4j.version}
+
+
+org.slf4j
+slf4j-log4j12
+${slf4j.version}
+
+
+*
+*
+
+
+
+
+log4j
+log4j
+${log4j.version}
+
+
+junit
+junit
+${junit.version}
+
+
+org.mockito
+mockito-all
+${mockito.version}
+
+
+io.netty
+netty
+${netty.version}
+
+
+org.eclipse.jetty
+jetty-server
+${jetty.version}
+
+
+org.eclipse.jetty
+jetty-servlet
+${jetty.version}
+
+
+com.fasterxml.jackson.core
+jackson-databind
+${jackson.version}
+
+
+com.googlecode.json-simple
+json-simple
+${json.version}
+
+
+jline
+jline
+${jline.version}
+
+
+
+
+
+
+
+
+ org.apache.maven.
[GitHub] anmolnar commented on issue #756: MAVEN MIGRATION 3.4 - ZOOKEEPER-3029
anmolnar commented on issue #756: MAVEN MIGRATION 3.4 - ZOOKEEPER-3029 URL: https://github.com/apache/zookeeper/pull/756#issuecomment-452231156 Merged to 3.4 branch. Please close this PR. Thanks @nkalmar ! This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] nkalmar closed pull request #756: MAVEN MIGRATION 3.4 - ZOOKEEPER-3029
nkalmar closed pull request #756: MAVEN MIGRATION 3.4 - ZOOKEEPER-3029
URL: https://github.com/apache/zookeeper/pull/756
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git a/.gitignore b/.gitignore
index f9f1b56f92..0a884d3188 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,6 @@
# Java
hs_err_pid*
+zookeeper-server/version-2/*
# Git
*.orij
@@ -67,7 +68,6 @@ zookeeper-client/zookeeper-client-c/*.la
zookeeper-client/zookeeper-client-c/*.lo
zookeeper-client/zookeeper-client-c/*.o
zookeeper-client/zookeeper-client-c/generated/
-src/java/generated/
zookeeper-server/src/main/resources/lib/ant-eclipse-*
zookeeper-server/src/main/resources/lib/ivy-*
zookeeper-client/zookeeper-client-c/Makefile.in
@@ -82,3 +82,5 @@ zookeeper-client/zookeeper-client-c/depcomp
zookeeper-client/zookeeper-client-c/install-sh
zookeeper-client/zookeeper-client-c/ltmain.sh
zookeeper-client/zookeeper-client-c/missing
+zookeeper-server/src/main/java/org/apache/zookeeper/version/Info.java
+zookeeper-server/src/test/resources/
diff --git a/bin/zkEnv.sh b/bin/zkEnv.sh
index 5c860ced54..5ce2cd8164 100755
--- a/bin/zkEnv.sh
+++ b/bin/zkEnv.sh
@@ -99,9 +99,17 @@ do
CLASSPATH="$d:$CLASSPATH"
done
+for d in "$ZOOBINDIR"/../zookeeper-server/target/lib/*.jar
+do
+ CLASSPATH="$d:$CLASSPATH"
+done
+
#make it work for developers
CLASSPATH="$ZOOBINDIR/../build/classes:$CLASSPATH"
+#make it work for developers
+CLASSPATH="$ZOOBINDIR/../zookeeper-server/target/classes:$CLASSPATH"
+
case "`uname`" in
CYGWIN*) cygwin=true ;;
*) cygwin=false ;;
diff --git a/pom.xml b/pom.xml
index e8745fd1cc..ec53dff518 100755
--- a/pom.xml
+++ b/pom.xml
@@ -24,7 +24,7 @@
org.apache
apache
18
-
+
org.apache.zookeeper
@@ -57,11 +57,15 @@
zookeeper-docs
+zookeeper-jute
+zookeeper-server
+zookeeper-client
+
scm:git:git://git.apache.org/zookeeper.git
-
scm:git:https://git-wip-us.apache.org/repos/asf/zookeeper.git
-https://git-wip-us.apache.org/repos/asf?p=zookeeper.git
+
scm:git:https://gitbox.apache.org/repos/asf/zookeeper.git
+https://gitbox.apache.org/repos/asf/zookeeper.git
JIRA
@@ -233,4 +237,489 @@
+
+
+1.8
+1.8
+false
+
+8
+
+
+1.7.25
+0.5.0
+4.12
+1.2.17
+1.8.5
+1.3
+1.2
+3.10.6.Final
+9.4.10.v20180503
+2.9.5
+1.1.1
+0.9.94
+1.1.0
+1.56
+3.2.2
+2.4
+
2.0.0-M15
+1.0.0-M20
+
+
+
+
+
+org.hamcrest
+hamcrest-all
+${hamcrest.version}
+
+
+commons-collections
+commons-collections
+${commons-collections.version}
+
+
+org.apache.yetus
+audience-annotations
+${audience-annotations.version}
+
+
+commons-cli
+commons-cli
+${commons-cli.version}
+
+
+org.apache.kerby
+kerb-core
+${kerby.version}
+
+
+org.slf4j
+slf4j-api
+
+
+
+
+org.apache.kerby
+kerb-simplekdc
+${kerby.version}
+
+
+org.slf4j
+slf4j-api
+
+
+
+
+org.apache.kerby
+kerby-config
+${kerby.version}
+
+
+org.slf4j
+slf4j-api
+
+
+org.slf4j
+slf4j-log4j12
+
+
+
+
+org.bouncycastle
+bcprov-jdk15on
+${bouncycastle.version}
+
+
+org.bouncycastle
+bcpkix-jdk15on
+${bouncycastle.version}
+
+
+org.slf4j
+slf4j-api
+${slf4j.version}
+
+
+org.slf4j
+slf4j-log4j12
+${slf4j.version}
+
+
+*
+*
+
+
+
+
+log4j
+log4j
+${log4j.version}
+
+
+junit
+junit
+${junit.version}
+
+
+org.mockito
+mockito-all
+${mockito.version}
+
+
+io.netty
+netty
+${netty.version}
+
+
+org.eclipse.jetty
+jetty-server
+${jetty.version}
+
+
+org.eclipse.jetty
+jetty-servlet
+${jetty.version}
+
+
+com.fasterxml.jackson.core
+jackson-databind
+${jackson.version}
+
+
+com.googlecode.json-simple
+json-simple
+${json.version}
+
+
+jline
+jline
+${jline.version}
+
+
+commons-lan
[GitHub] nkalmar opened a new pull request #758: MAVEN MIGRATION - 3.4 - 3.5 - ZOOKEEPER-3226
nkalmar opened a new pull request #758: MAVEN MIGRATION - 3.4 - 3.5 - ZOOKEEPER-3226 URL: https://github.com/apache/zookeeper/pull/758 Author: Norbert Kalmar Reviewers: an...@apache.org Closes #741 from nkalmar/ZOOKEEPER-3226 This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] nkalmar opened a new pull request #759: MAVEN MIGRATION - 3.4 - ZOOKEEPER-3226
nkalmar opened a new pull request #759: MAVEN MIGRATION - 3.4 - ZOOKEEPER-3226 URL: https://github.com/apache/zookeeper/pull/759 Author: Norbert Kalmar Reviewers: an...@apache.org Closes #741 from nkalmar/ZOOKEEPER-3226 This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] nkalmar commented on issue #759: MAVEN MIGRATION - 3.4 - ZOOKEEPER-3226
nkalmar commented on issue #759: MAVEN MIGRATION - 3.4 - ZOOKEEPER-3226 URL: https://github.com/apache/zookeeper/pull/759#issuecomment-452285412 retest this please This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] anmolnar commented on issue #716: Enable secure processing and disallow DTDs in the SAXParserFactory
anmolnar commented on issue #716: Enable secure processing and disallow DTDs in the SAXParserFactory URL: https://github.com/apache/zookeeper/pull/716#issuecomment-452286216 @coheigea Thanks. I added you to the contributor list and assigned the Jira to you. How safe is this change in terms of XML processing? I'm willing to commit it to 3.6 for sure, maybe 3.5 too, but not 3.4 unless it has an exploitable security issue. This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] coheigea commented on issue #716: Enable secure processing and disallow DTDs in the SAXParserFactory
coheigea commented on issue #716: Enable secure processing and disallow DTDs in the SAXParserFactory URL: https://github.com/apache/zookeeper/pull/716#issuecomment-452287803 @anmolnar I haven't analysed the exploitability for it - so I agree that it is reasonable not to backport to 3.4. This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] anmolnar commented on issue #716: Enable secure processing and disallow DTDs in the SAXParserFactory
anmolnar commented on issue #716: Enable secure processing and disallow DTDs in the SAXParserFactory URL: https://github.com/apache/zookeeper/pull/716#issuecomment-452293575 Looks like we don't use `XmlInputArchive` in the code at all (`BinaryInputArchive` is hardcoded everywhere) Do you have a use case where it comes in handy or this patch is just a general improvement? This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] coheigea commented on issue #716: Enable secure processing and disallow DTDs in the SAXParserFactory
coheigea commented on issue #716: Enable secure processing and disallow DTDs in the SAXParserFactory URL: https://github.com/apache/zookeeper/pull/716#issuecomment-452294795 It's just a general improvement flagged by a static code analysis tool This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] maoling commented on issue #732: [ZOOKEEPER-3210] typo in zookeeperInternals doc
maoling commented on issue #732: [ZOOKEEPER-3210] typo in zookeeperInternals doc URL: https://github.com/apache/zookeeper/pull/732#issuecomment-452344078 ping @lvfangmin @anmolnar This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] maoling commented on issue #624: ZOOKEEPER-3108:use a new property server.id in the zoo.cfg to substitute for myid file
maoling commented on issue #624: ZOOKEEPER-3108:use a new property server.id in the zoo.cfg to substitute for myid file URL: https://github.com/apache/zookeeper/pull/624#issuecomment-452348629 I will give this issue another hit this weekend. This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] maoling commented on issue #720: add an API to get total count of recursive sub nodes of one node
maoling commented on issue #720: add an API to get total count of recursive sub nodes of one node URL: https://github.com/apache/zookeeper/pull/720#issuecomment-452348676 @TyqITstudent are you still working on this issue?can we move on?or let me pick it up(smirk)? This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] TyqITstudent commented on issue #720: add an API to get total count of recursive sub nodes of one node
TyqITstudent commented on issue #720: add an API to get total count of recursive sub nodes of one node URL: https://github.com/apache/zookeeper/pull/720#issuecomment-452356223 > are you still working on this issue?can we move on?or let me pick it up(smirk)? I have no time to pay attention to this issue recently. You can do whatever you want. This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] TyqITstudent commented on issue #720: add an API to get total count of recursive sub nodes of one node
TyqITstudent commented on issue #720: add an API to get total count of recursive sub nodes of one node URL: https://github.com/apache/zookeeper/pull/720#issuecomment-452357630 > @TyqITstudent > are you still working on this issue?can we move on?or let me pick it up(smirk)? Thanks for that. This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] asfgit closed pull request #732: [ZOOKEEPER-3210] typo in zookeeperInternals doc
asfgit closed pull request #732: [ZOOKEEPER-3210] typo in zookeeperInternals doc URL: https://github.com/apache/zookeeper/pull/732 This is a PR merged from a forked repository. As GitHub hides the original diff on merge, it is displayed below for the sake of provenance: As this is a foreign pull request (from a fork), the diff is supplied below (as it won't show otherwise due to GitHub magic): diff --git a/zookeeper-docs/src/main/resources/markdown/zookeeperInternals.md b/zookeeper-docs/src/main/resources/markdown/zookeeperInternals.md index 84793f127c..13cde10240 100644 --- a/zookeeper-docs/src/main/resources/markdown/zookeeperInternals.md +++ b/zookeeper-docs/src/main/resources/markdown/zookeeperInternals.md @@ -185,7 +185,7 @@ to the leader, the leader will tell the follower to discard U. A new leader establishes a zxid to start using for new proposals by getting the epoch, e, of the highest zxid it has seen and setting the next zxid to use to be -(e+1, 0), fter the leader syncs with a follower, it will propose a NEW_LEADER +(e+1, 0), after the leader syncs with a follower, it will propose a NEW_LEADER proposal. Once the NEW_LEADER proposal has been committed, the leader will activate and start receiving and issuing proposals. This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] anmolnar commented on issue #732: [ZOOKEEPER-3210] typo in zookeeperInternals doc
anmolnar commented on issue #732: [ZOOKEEPER-3210] typo in zookeeperInternals doc URL: https://github.com/apache/zookeeper/pull/732#issuecomment-452360183 Committed to all major branches: 3.4, 3.5, 3.6 Thanks @stanlyDoge ! This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] anmolnar commented on issue #758: MAVEN MIGRATION - 3.5 - ZOOKEEPER-3226
anmolnar commented on issue #758: MAVEN MIGRATION - 3.5 - ZOOKEEPER-3226 URL: https://github.com/apache/zookeeper/pull/758#issuecomment-452361164 Please close this PR. This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] anmolnar commented on issue #758: MAVEN MIGRATION - 3.5 - ZOOKEEPER-3226
anmolnar commented on issue #758: MAVEN MIGRATION - 3.5 - ZOOKEEPER-3226 URL: https://github.com/apache/zookeeper/pull/758#issuecomment-452361106 Committed to 3.5 branch. Thanks @nkalmar ! This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] vivekpatani opened a new pull request #760: ZOOKEEPER-3215: Handle Java 9/11 additions of covariant return types …
vivekpatani opened a new pull request #760: ZOOKEEPER-3215: Handle Java 9/11 additions of covariant return types … URL: https://github.com/apache/zookeeper/pull/760 …to java.nio.ByteBuffer methods Co-authored-by: Brandon Miles Java 9 introduces covariant return types which allows one to have different return types if return type in the overridden method is a sub type. Since Java 9, few functions return ByteBuffer, whereas the parent method return Buffer, resulting in causing issues for Java 8 and below since for them the method does not exist. To fix this, we must cast the ByteBuffer instances to Buffer before we call the method. The methods that need this are: - position(int newPosition) - limit(int newLimit) - flip() - clear() - mark() - reset() - rewind() Signed-off-by: Vivek Patani This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] eolivelli closed pull request #751: ZOOKEEPER-3234: Add Travis-CI configuration file
eolivelli closed pull request #751: ZOOKEEPER-3234: Add Travis-CI configuration file URL: https://github.com/apache/zookeeper/pull/751 This is a PR merged from a forked repository. As GitHub hides the original diff on merge, it is displayed below for the sake of provenance: As this is a foreign pull request (from a fork), the diff is supplied below (as it won't show otherwise due to GitHub magic): diff --git a/.travis.yml b/.travis.yml new file mode 100644 index 00..af911cd292 --- /dev/null +++ b/.travis.yml @@ -0,0 +1,16 @@ +language: java +sudo: false + +cache: + directories: + - "$HOME/.m2" + +jobs: + include: + - stage: test +jdk: openjdk11 +script: mvn verify -Dmaven.test.redirectTestOutputToFile=true + +branches: + only: + - master This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] eolivelli opened a new pull request #751: ZOOKEEPER-3234: Add Travis-CI configuration file
eolivelli opened a new pull request #751: ZOOKEEPER-3234: Add Travis-CI configuration file URL: https://github.com/apache/zookeeper/pull/751 This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] enixon opened a new pull request #761: ZOOKEEPER-3237: Allow IPv6 wildcard address in peer config
enixon opened a new pull request #761: ZOOKEEPER-3237: Allow IPv6 wildcard address in peer config URL: https://github.com/apache/zookeeper/pull/761 This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] maoling commented on issue #630: ZOOKEEPER-2284:LogFormatter and SnapshotFormatter does not handle FileNotFoundException gracefully
maoling commented on issue #630: ZOOKEEPER-2284:LogFormatter and SnapshotFormatter does not handle FileNotFoundException gracefully URL: https://github.com/apache/zookeeper/pull/630#issuecomment-452528548 ping @lvfangmin @anmolnar This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] anmolnar commented on issue #630: ZOOKEEPER-2284:LogFormatter and SnapshotFormatter does not handle FileNotFoundException gracefully
anmolnar commented on issue #630: ZOOKEEPER-2284:LogFormatter and SnapshotFormatter does not handle FileNotFoundException gracefully URL: https://github.com/apache/zookeeper/pull/630#issuecomment-452650187 Thanks for the heads-up @maoling . Please move the test file to `zookeeper-server/src/test/java/org/apache/zookeeper/common/`. We reverted the change to separate the common project, because the refactor wasn't possible. This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] nkalmar closed pull request #758: MAVEN MIGRATION - 3.5 - ZOOKEEPER-3226
nkalmar closed pull request #758: MAVEN MIGRATION - 3.5 - ZOOKEEPER-3226
URL: https://github.com/apache/zookeeper/pull/758
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git a/pom.xml b/pom.xml
index 95b85a1407..719e69ab47 100755
--- a/pom.xml
+++ b/pom.xml
@@ -237,6 +237,18 @@
+
+
+ full-build
+
+
+ java-build
+
+true
+
+
+
+
1.8
diff --git a/zookeeper-client/pom.xml b/zookeeper-client/pom.xml
index cc0da9702a..a1eda68175 100755
--- a/zookeeper-client/pom.xml
+++ b/zookeeper-client/pom.xml
@@ -33,8 +33,19 @@
Apache ZooKeeper - Client
ZooKeeper client
-
-zookeeper-client-c
-
+
+
+
+
+ full-build
+
+zookeeper-client-c
+
+
+
+ java-build
+
+
+
\ No newline at end of file
diff --git a/zookeeper-client/zookeeper-client-c/pom.xml
b/zookeeper-client/zookeeper-client-c/pom.xml
index 4dc985b9e4..84235eaeac 100755
--- a/zookeeper-client/zookeeper-client-c/pom.xml
+++ b/zookeeper-client/zookeeper-client-c/pom.xml
@@ -33,126 +33,109 @@
Apache ZooKeeper - Client - C
ZooKeeper c client
-
-
- linux
-
-
- unix
- Linux
-
-
-
-
-
-org.apache.maven.plugins
-maven-antrun-plugin
-
-
-generate-sources
-generate-sources
-
-
-
-
-
-
- run
-
-
-
-test-cppunit
-test
-
-
-
-
-
-
-
-
-
-
-
-
-
- run
-
-
-
-
-
-org.codehaus.mojo
-exec-maven-plugin
-
-
-autoreconf
-test-compile
-
- exec
-
-
- ${project.basedir}
- autoreconf
-
-aclocal -I /usr/share/aclocal
-
-
--if
-
-
-
-
-configure
-test-compile
-
- exec
-
-
-
${project.build.directory}/c
- ${project.basedir}/configure
-
-${project.basedir}/../..
-ANT
-
-
---prefix=${project.build.directory}/c
---enable-gcov
-
-
-
-
-
-
-
-
-
-
- non-linux
-
-true
-
-
-
+
+
+
+org.apache.maven.plugins
+maven-antrun-plugin
+
+
+generate-sources
+generate-sources
+
+
+
+
+
+
+ run
+
+
+
+test-cppunit
+test
+
+
+
+
+
+
+
+
+
+
+
+
+
+ run
+
+
+
+
+
+org.codehaus.mojo
+exec-maven-plugin
+
+
+autoreconf
+test-compile
+
+ exec
+
+
+ ${project.basedir}
+ autoreconf
+
+aclocal -I /usr/share/aclocal
+
+
+-if
+
+
+
+
+configure
+test-compile
+
+ exec
+
+
+ ${project.build.directory}/c
+ ${project.basedir}/configure
+
+${project.basedir}/../..
+ANT
+
+
+--prefix=${project.build.directory}/c
+--enable-gcov
+
+
+
+
+
+
+
+
\ No
[GitHub] coheigea opened a new pull request #762: ZOOKEEPER-3238 - Adding noreferrer to target blank link
coheigea opened a new pull request #762: ZOOKEEPER-3238 - Adding noreferrer to target blank link URL: https://github.com/apache/zookeeper/pull/762 In zookeeper-contrib-huebrowser, there is a link that uses target="_blank". Best security practise is to also add rel="noopener noreferrer". See for example: https://dev.to/ben/the-targetblank-vulnerability-by-example. Note I did not test this as I do not use hue. However it is a fairly trivial change. This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] anmolnar commented on issue #759: MAVEN MIGRATION - 3.4 - ZOOKEEPER-3226
anmolnar commented on issue #759: MAVEN MIGRATION - 3.4 - ZOOKEEPER-3226 URL: https://github.com/apache/zookeeper/pull/759#issuecomment-452707628 Merged to 3.4 branch. Please close this PR. Thanks @nkalmar ! This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] asfgit closed pull request #716: Enable secure processing and disallow DTDs in the SAXParserFactory
asfgit closed pull request #716: Enable secure processing and disallow DTDs in
the SAXParserFactory
URL: https://github.com/apache/zookeeper/pull/716
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git a/zookeeper-jute/src/main/java/org/apache/jute/XmlInputArchive.java
b/zookeeper-jute/src/main/java/org/apache/jute/XmlInputArchive.java
index 99e11d10ea..a4ae9381c3 100644
--- a/zookeeper-jute/src/main/java/org/apache/jute/XmlInputArchive.java
+++ b/zookeeper-jute/src/main/java/org/apache/jute/XmlInputArchive.java
@@ -143,6 +143,8 @@ public XmlInputArchive(InputStream in)
valList = new ArrayList();
DefaultHandler handler = new XMLParser(valList);
SAXParserFactory factory = SAXParserFactory.newInstance();
+factory.setFeature(javax.xml.XMLConstants.FEATURE_SECURE_PROCESSING,
Boolean.TRUE);
+
factory.setFeature("http://apache.org/xml/features/disallow-doctype-decl";,
true);
SAXParser parser = factory.newSAXParser();
parser.parse(in, handler);
vLen = valList.size();
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
With regards,
Apache Git Services
[GitHub] anmolnar commented on issue #716: Enable secure processing and disallow DTDs in the SAXParserFactory
anmolnar commented on issue #716: Enable secure processing and disallow DTDs in the SAXParserFactory URL: https://github.com/apache/zookeeper/pull/716#issuecomment-452709048 Committed to 3.5 and master branches. Thanks @coheigea ! This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] nkalmar closed pull request #759: MAVEN MIGRATION - 3.4 - ZOOKEEPER-3226
nkalmar closed pull request #759: MAVEN MIGRATION - 3.4 - ZOOKEEPER-3226
URL: https://github.com/apache/zookeeper/pull/759
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git a/pom.xml b/pom.xml
index ec53dff518..09b80cfa1a 100755
--- a/pom.xml
+++ b/pom.xml
@@ -237,6 +237,18 @@
+
+
+ full-build
+
+
+ java-build
+
+true
+
+
+
+
1.8
diff --git a/zookeeper-client/pom.xml b/zookeeper-client/pom.xml
index a8a92c5457..37a5074b6c 100755
--- a/zookeeper-client/pom.xml
+++ b/zookeeper-client/pom.xml
@@ -33,8 +33,19 @@
Apache ZooKeeper - Client
ZooKeeper client
-
-zookeeper-client-c
-
+
+
+
+
+ full-build
+
+zookeeper-client-c
+
+
+
+ java-build
+
+
+
\ No newline at end of file
diff --git a/zookeeper-client/zookeeper-client-c/pom.xml
b/zookeeper-client/zookeeper-client-c/pom.xml
index 63818ca632..4a6b78305f 100755
--- a/zookeeper-client/zookeeper-client-c/pom.xml
+++ b/zookeeper-client/zookeeper-client-c/pom.xml
@@ -33,126 +33,109 @@
Apache ZooKeeper - Client - C
ZooKeeper c client
-
-
- linux
-
-
- unix
- Linux
-
-
-
-
-
-org.apache.maven.plugins
-maven-antrun-plugin
-
-
-generate-sources
-generate-sources
-
-
-
-
-
-
- run
-
-
-
-test-cppunit
-test
-
-
-
-
-
-
-
-
-
-
-
-
-
- run
-
-
-
-
-
-org.codehaus.mojo
-exec-maven-plugin
-
-
-autoreconf
-test-compile
-
- exec
-
-
- ${project.basedir}
- autoreconf
-
-aclocal -I /usr/share/aclocal
-
-
--if
-
-
-
-
-configure
-test-compile
-
- exec
-
-
-
${project.build.directory}/c
- ${project.basedir}/configure
-
-${project.basedir}/../..
-ANT
-
-
---prefix=${project.build.directory}/c
---enable-gcov
-
-
-
-
-
-
-
-
-
-
- non-linux
-
-true
-
-
-
+
+
+
+org.apache.maven.plugins
+maven-antrun-plugin
+
+
+generate-sources
+generate-sources
+
+
+
+
+
+
+ run
+
+
+
+test-cppunit
+test
+
+
+
+
+
+
+
+
+
+
+
+
+
+ run
+
+
+
+
+
+org.codehaus.mojo
+exec-maven-plugin
+
+
+autoreconf
+test-compile
+
+ exec
+
+
+ ${project.basedir}
+ autoreconf
+
+aclocal -I /usr/share/aclocal
+
+
+-if
+
+
+
+
+configure
+test-compile
+
+ exec
+
+
+ ${project.build.directory}/c
+ ${project.basedir}/configure
+
+${project.basedir}/../..
+ANT
+
+
+--prefix=${project.build.directory}/c
+--enable-gcov
+
+
+
+
+
+
+
+
\ No
[GitHub] anmolnar edited a comment on issue #760: ZOOKEEPER-3215: Handle Java 9/11 additions of covariant return types …
anmolnar edited a comment on issue #760: ZOOKEEPER-3215: Handle Java 9/11 additions of covariant return types … URL: https://github.com/apache/zookeeper/pull/760#issuecomment-452734142 @vivekpatani Since Java 9 there's a `--release` switch for the javac compiler which sets the "source", "target" and "bootclasspath" properties in order to properly cross-compile. Wouldn't it be better to use that for cross-compile ZooKeeper instead of code change? I tested it on branch-3.4 and it works fine. This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] anmolnar commented on issue #760: ZOOKEEPER-3215: Handle Java 9/11 additions of covariant return types …
anmolnar commented on issue #760: ZOOKEEPER-3215: Handle Java 9/11 additions of covariant return types … URL: https://github.com/apache/zookeeper/pull/760#issuecomment-452734142 @vivekpatani Since Java 1.9 there's a `--release` switch for the javac compiler which sets the "source", "target" and "bootclasspath" properties in order to properly cross-compile. Wouldn't it be better to use that for cross-compile ZooKeeper instead of code change? I tested it on branch-3.4 and it works fine. This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] anmolnar commented on issue #760: ZOOKEEPER-3215: Handle Java 9/11 additions of covariant return types …
anmolnar commented on issue #760: ZOOKEEPER-3215: Handle Java 9/11 additions of covariant return types … URL: https://github.com/apache/zookeeper/pull/760#issuecomment-452735551 https://openjdk.java.net/jeps/247 This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] anmolnar commented on issue #753: ZOOKEEPER-3204: Reconfig tests are constantly failing on 3.5 after applying Java 11 fix
anmolnar commented on issue #753: ZOOKEEPER-3204: Reconfig tests are constantly failing on 3.5 after applying Java 11 fix URL: https://github.com/apache/zookeeper/pull/753#issuecomment-452838938 retest this please This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
