You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@zookeeper.apache.org by GitBox <gi...@apache.org> on 2019/07/02 18:42:24 UTC
[GitHub] [zookeeper] enixon commented on a change in pull request #905:
ZOOKEEPER-3359: Batch commits in the CommitProcessor
enixon commented on a change in pull request #905: ZOOKEEPER-3359: Batch commits in the CommitProcessor
URL: https://github.com/apache/zookeeper/pull/905#discussion_r299629901
##########
File path: zookeeper-server/src/main/java/org/apache/zookeeper/server/quorum/CommitProcessor.java
##########
@@ -248,91 +283,111 @@ public void run() {
break;
}
}
+ ServerMetrics.getMetrics().READS_ISSUED_IN_COMMIT_PROC.add(readsQueued);
+
+ if (!commitIsWaiting) {
+ commitIsWaiting = !committedRequests.isEmpty();
+ }
- // Handle a single committed request
- if (commitIsWaiting && !stopped){
+ /*
+ * Handle commits, if any.
+ */
+ if (commitIsWaiting && !stopped) {
+ /*
+ * Drain outstanding reads
+ */
waitForEmptyPool();
- if (stopped){
+ if (stopped) {
return;
}
- // Process committed head
- if ((request = committedRequests.poll()) == null) {
- throw new IOException("Error: committed head is null");
- }
+ int commitsToProcess = maxCommitBatchSize;
/*
- * Check if request is pending, if so, update it with the committed info
+ * Loop through all the commits, and try to drain them.
*/
- Deque<Request> sessionQueue = pendingRequests
- .get(request.sessionId);
- ServerMetrics.getMetrics().PENDING_SESSION_QUEUE_SIZE.add(pendingRequests.size());
- if (sessionQueue != null) {
- ServerMetrics.getMetrics().REQUESTS_IN_SESSION_QUEUE.add(sessionQueue.size());
- // If session queue != null, then it is also not empty.
- Request topPending = sessionQueue.poll();
- if (request.cxid != topPending.cxid) {
Review comment:
This check was moved to slightly earlier - see `blockedRequestQueue.peek().cxid == request.cxid`.
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
With regards,
Apache Git Services