[GitHub] zookeeper issue #673: [ZOOKEEPER-3177] Refactor request throttle logic in NI...
Github user lvfangmin commented on the issue: https://github.com/apache/zookeeper/pull/673 This seems able to be merged now, @anmolnar can you help merge it? ---
[GitHub] zookeeper issue #676: ZOOKEEPER-3181: ZOOKEEPER-2355 broke Curator TestingQu...
Github user lvfangmin commented on the issue: https://github.com/apache/zookeeper/pull/676 @Randgalt I'm not familiar with the Curator release here, do you think it's easy to make a new release for 2.x for this? ---
[GitHub] zookeeper pull request #689: ZOOKEEPER-3183:Notifying the WatcherCleaner thr...
Github user lvfangmin commented on a diff in the pull request: https://github.com/apache/zookeeper/pull/689#discussion_r234399372 --- Diff: zookeeper-server/src/main/java/org/apache/zookeeper/server/watch/WatcherCleaner.java --- @@ -50,6 +50,8 @@ private volatile boolean stopped = false; private final Object cleanEvent = new Object(); +private final Object produserAndConsumerLock = new Object(); --- End diff -- Can you give it a more explicit name? produserAndConsumerLock seems too general here. ---
[GitHub] zookeeper pull request #689: ZOOKEEPER-3183:Notifying the WatcherCleaner thr...
Github user lvfangmin commented on a diff in the pull request:
https://github.com/apache/zookeeper/pull/689#discussion_r234399479
--- Diff:
zookeeper-server/src/main/java/org/apache/zookeeper/server/watch/WatcherCleaner.java
---
@@ -177,6 +180,7 @@ public void shutdown() {
stopped = true;
deadWatchers.clear();
cleaners.stop();
+super.interrupt();
--- End diff --
Maybe just change it to this.interrupt(), since we're not overwriting it.
---
[GitHub] zookeeper pull request #689: ZOOKEEPER-3183:Notifying the WatcherCleaner thr...
Github user lvfangmin commented on a diff in the pull request:
https://github.com/apache/zookeeper/pull/689#discussion_r234399392
--- Diff:
zookeeper-server/src/main/java/org/apache/zookeeper/server/watch/WatcherCleaner.java
---
@@ -102,24 +104,25 @@ public void addDeadWatcher(int watcherBit) {
totalDeadWatchers.get() >= maxInProcessingDeadWatchers) {
try {
RATE_LOGGER.rateLimitLog("Waiting for dead watchers
cleaning");
-synchronized(totalDeadWatchers) {
-totalDeadWatchers.wait(100);
+synchronized(produserAndConsumerLock) {
+ produserAndConsumerLock.wait(100);
}
} catch (InterruptedException e) {
LOG.info("Got interrupted while waiting for dead watches "
+
"queue size");
+break;
}
}
-synchronized (this) {
-if (deadWatchers.add(watcherBit)) {
-totalDeadWatchers.incrementAndGet();
-if (deadWatchers.size() >= watcherCleanThreshold) {
-synchronized (cleanEvent) {
-cleanEvent.notifyAll();
+ synchronized (this) {
--- End diff --
The indent seems not correct.
---
[GitHub] zookeeper issue #690: ZOOKEEPER-3179: Add snapshot compression to reduce the...
Github user lvfangmin commented on the issue: https://github.com/apache/zookeeper/pull/690 retest this please ---
[GitHub] zookeeper pull request #692: ZOOKEEPER-3184: Use the same method to generate...
Github user lvfangmin commented on a diff in the pull request: https://github.com/apache/zookeeper/pull/692#discussion_r234399026 --- Diff: README.md --- @@ -1,49 +1,24 @@ ## Generating the static Apache ZooKeeper website -In this directory you will find text files formatted using Markdown, with an `.md` suffix. +In the `src/main/resources/markdown` directory you will find text files formatted using Markdown, with an `.md` suffix. -Building the site requires [Jekyll](http://jekyllrb.com/docs) 3.6.2 or newer. -The easiest way to install jekyll is via a Ruby Gem. Jekyll will create a directory called `_site` -containing `index.html` as well as the rest of the compiled directories and files. _site should not -be committed to git as this is the generated content. - -To install Jekyll and its required dependencies, execute `sudo gem install jekyll pygments.rb` -and `sudo pip install Pygments`. See the Jekyll installation page for more details. +Building the site requires [Maven](http://maven.apache.org/) 3.5.0 or newer. +The easiest way to [install Maven](http://maven.apache.org/install.html) depends on your OS. +The build process will create a directory called `target/html` containing `index.html` as well as the rest of the +compiled directories and files. `target` should not be committed to git as it is generated content. You can generate the static ZooKeeper website by running: -1. `jekyll build` in this directory. -2. `cp -RP _released_docs _site/doc` - this will include the documentation (see "sub-dir" section below) in the generated site. +1. `mvn clean install` in this directory. +2. `cp -RP _released_docs _target/html` - this will include the documentation (see "sub-dir" section below) in the generated site. --- End diff -- After 'mvn clean install' there is no _target dir but only target, is this a typo or am I missing any step? ---
[jira] [Updated] (ZOOKEEPER-1818) Fix don't care for trunk
[ https://issues.apache.org/jira/browse/ZOOKEEPER-1818?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] ASF GitHub Bot updated ZOOKEEPER-1818: -- Labels: pull-request-available (was: ) > Fix don't care for trunk > > > Key: ZOOKEEPER-1818 > URL: https://issues.apache.org/jira/browse/ZOOKEEPER-1818 > Project: ZooKeeper > Issue Type: Bug >Affects Versions: 3.5.1 >Reporter: Flavio Junqueira >Assignee: Fangmin Lv >Priority: Blocker > Labels: pull-request-available > Fix For: 3.6.0, 3.5.5 > > Attachments: ZOOKEEPER-1818.patch > > > See umbrella jira. -- This message was sent by Atlassian JIRA (v7.6.3#76005)
[GitHub] zookeeper pull request #703: [ZOOKEEPER-1818] Correctly handle potential inc...
GitHub user lvfangmin opened a pull request: https://github.com/apache/zookeeper/pull/703 [ZOOKEEPER-1818] Correctly handle potential inconsistent zxid/electionEpoch and peerEpoch during leader election This is similar to the 3.4 implementation in Jira ZOOKEEPER-1817, main differences with that: 1. removed bcVote, in Vote.equals it will skip compare peerEpoch when one of the version is 0x0. 2. added detailed scenarios which we tried to solve with peerEpoch update and the change in Vote.equals. 3. removed ooePredicate with inlined one, since master code is tracking voteSet.. 4. improved the tests to make it cleaner. You can merge this pull request into a Git repository by running: $ git pull https://github.com/lvfangmin/zookeeper ZOOKEEPER-1818 Alternatively you can review and apply these changes as the patch at: https://github.com/apache/zookeeper/pull/703.patch To close this pull request, make a commit to your master/trunk branch with (at least) the following in the commit message: This closes #703 commit ac2aa6147e5433567a4be433089c35a30a3d Author: Fangmin Lyu Date: 2018-11-15T17:46:51Z Correctly handle potential inconsitent zxid/electionEpoch and peerEpoch during leader election ---
[GitHub] zookeeper issue #702: ZOOKEEPER-3190: Spell check on the Zookeeper server fi...
Github user dineshappavoo commented on the issue: https://github.com/apache/zookeeper/pull/702 Thank you @eolivelli for the review. Addressed your comments. ---
[GitHub] zookeeper pull request #680: ZOOKEEPER-3174: Quorum TLS - support reloading ...
Github user ivmaykov closed the pull request at: https://github.com/apache/zookeeper/pull/680 ---
[GitHub] zookeeper pull request #681: ZOOKEEPER-3176: Quorum TLS - add SSL config opt...
GitHub user ivmaykov reopened a pull request: https://github.com/apache/zookeeper/pull/681 ZOOKEEPER-3176: Quorum TLS - add SSL config options Add SSL config options for enabled protocols and client auth mode. Improve handling of SSL config options for protocols and cipher suites - previously these came from system properties, now they can come from ZKConfig which means they are easier to isolate in tests, and now we don't need to parse system properties every time we create a secure socket. Note that this is stacked on top of #678, #679, and #680 and thus includes them. Please only consider the ZOOKEEPER-3176 commit when reviewing. Once the other PRs are merged upstream, I will rebase this so it only contains one commit. ## Added more options for ssl settings to X509Util and encapsulate them better - previously, some SSL settings came from a `ZKConfig` and others came from global `System.getProperties()`. This made it hard to isolate certain settings in tests. - now all SSL-related settings come from the `ZKConfig` object used to create the SSL context - new settings added: - `zookeeper.ssl(.quorum).enabledProtocols` - list of enabled protocols. If not set, defaults to a single-entry list with the value of `zookeeper.ssl(.quorum).protocol`. - `zookeeper.ssl(.quorum).clientAuth` - can be "NONE", "WANT", or "NEED". This controls whether the server doesn't want / allows / requires the client to present an X509 certificate. - `zookeeper.ssl(.quorum).handshakeDetectionTimeoutMillis` - timeout for the first read of 5 bytes to detect the transport mode (TLS or plaintext) of a client connection made to a `UnifiedServerSocket` You can merge this pull request into a Git repository by running: $ git pull https://github.com/ivmaykov/zookeeper ZOOKEEPER-3176 Alternatively you can review and apply these changes as the patch at: https://github.com/apache/zookeeper/pull/681.patch To close this pull request, make a commit to your master/trunk branch with (at least) the following in the commit message: This closes #681 commit 367bef0980193e2761c7008844c5e9fe029d8a66 Author: Ilya Maykov Date: 2018-10-25T01:22:24Z ZOOKEEPER-3172: Quorum TLS - fix port unification to allow rolling upgrades commit fd58fa45cdd76c6b4c1bb2f529ee8f6d7fff553d Author: Ilya Maykov Date: 2018-10-25T01:54:06Z ZOOKEEPER-3174: Quorum TLS - support reloading trust/key store commit d232235519e2c6e252dcac700dcc05146cea5dbc Author: Ilya Maykov Date: 2018-10-25T02:12:04Z ZOOKEEPER-3176: Quorum TLS - add SSL config options ---
[GitHub] zookeeper pull request #681: ZOOKEEPER-3176: Quorum TLS - add SSL config opt...
Github user ivmaykov closed the pull request at: https://github.com/apache/zookeeper/pull/681 ---
ZooKeeper_branch35_jdk8 - Build # 1197 - Still Failing
See https://builds.apache.org/job/ZooKeeper_branch35_jdk8/1197/ ### ## LAST 60 LINES OF THE CONSOLE ### [...truncated 65.75 KB...] [junit] Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.883 sec, Thread: 3, Class: org.apache.zookeeper.test.SaslSuperUserTest [junit] Running org.apache.zookeeper.test.ServerCnxnTest in thread 3 [junit] Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 3.386 sec, Thread: 3, Class: org.apache.zookeeper.test.ServerCnxnTest [junit] Running org.apache.zookeeper.test.SessionInvalidationTest in thread 3 [junit] Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 37.975 sec, Thread: 4, Class: org.apache.zookeeper.test.RecoveryTest [junit] Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 1.026 sec, Thread: 3, Class: org.apache.zookeeper.test.SessionInvalidationTest [junit] Running org.apache.zookeeper.test.SessionTest in thread 4 [junit] Running org.apache.zookeeper.test.SessionTimeoutTest in thread 3 [junit] Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 29.208 sec, Thread: 1, Class: org.apache.zookeeper.test.RestoreCommittedLogTest [junit] Running org.apache.zookeeper.test.SessionTrackerCheckTest in thread 1 [junit] Tests run: 2, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.093 sec, Thread: 1, Class: org.apache.zookeeper.test.SessionTrackerCheckTest [junit] Tests run: 4, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 1.961 sec, Thread: 3, Class: org.apache.zookeeper.test.SessionTimeoutTest [junit] Running org.apache.zookeeper.test.SessionUpgradeTest in thread 1 [junit] Running org.apache.zookeeper.test.StandaloneTest in thread 3 [junit] Tests run: 4, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 2.728 sec, Thread: 3, Class: org.apache.zookeeper.test.StandaloneTest [junit] Running org.apache.zookeeper.test.StatTest in thread 3 [junit] Tests run: 4, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 1.623 sec, Thread: 3, Class: org.apache.zookeeper.test.StatTest [junit] Running org.apache.zookeeper.test.StaticHostProviderTest in thread 3 [junit] Tests run: 26, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 1.868 sec, Thread: 3, Class: org.apache.zookeeper.test.StaticHostProviderTest [junit] Running org.apache.zookeeper.test.StringUtilTest in thread 3 [junit] Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.08 sec, Thread: 3, Class: org.apache.zookeeper.test.StringUtilTest [junit] Running org.apache.zookeeper.test.SyncCallTest in thread 3 [junit] Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.817 sec, Thread: 3, Class: org.apache.zookeeper.test.SyncCallTest [junit] Tests run: 5, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 14.271 sec, Thread: 4, Class: org.apache.zookeeper.test.SessionTest [junit] Running org.apache.zookeeper.test.TruncateTest in thread 3 [junit] Running org.apache.zookeeper.test.WatchEventWhenAutoResetTest in thread 4 [junit] Tests run: 3, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 10.296 sec, Thread: 3, Class: org.apache.zookeeper.test.TruncateTest [junit] Running org.apache.zookeeper.test.WatchedEventTest in thread 3 [junit] Tests run: 4, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.078 sec, Thread: 3, Class: org.apache.zookeeper.test.WatchedEventTest [junit] Tests run: 4, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 23.029 sec, Thread: 1, Class: org.apache.zookeeper.test.SessionUpgradeTest [junit] Running org.apache.zookeeper.test.WatcherFuncTest in thread 3 [junit] Running org.apache.zookeeper.test.WatcherTest in thread 1 [junit] Tests run: 6, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 3.176 sec, Thread: 3, Class: org.apache.zookeeper.test.WatcherFuncTest [junit] Running org.apache.zookeeper.test.X509AuthTest in thread 3 [junit] Tests run: 3, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.089 sec, Thread: 3, Class: org.apache.zookeeper.test.X509AuthTest [junit] Running org.apache.zookeeper.test.ZkDatabaseCorruptionTest in thread 3 [junit] Tests run: 4, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 24.568 sec, Thread: 4, Class: org.apache.zookeeper.test.WatchEventWhenAutoResetTest [junit] Running org.apache.zookeeper.test.ZooKeeperQuotaTest in thread 4 [junit] Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 1.024 sec, Thread: 4, Class: org.apache.zookeeper.test.ZooKeeperQuotaTest [junit] Running org.apache.zookeeper.util.PemReaderTest in thread 4 [junit] Tests run: 2, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 11.979 sec, Thread: 3, Class: org.apache.zookeeper.test.ZkDatabaseCorruptionTest [junit] Running org.apache.jute.BinaryInputArchiveTest in thread 3
