You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@zookeeper.apache.org by upangit <gi...@git.apache.org> on 2017/04/11 19:10:02 UTC

[GitHub] zookeeper pull request #223: ZOOKEEPER-2316: comment does not match code log...

GitHub user upangit opened a pull request:

    https://github.com/apache/zookeeper/pull/223

    ZOOKEEPER-2316: comment does not match code logic

    Fixing ZOOKEEPER-2316.

You can merge this pull request into a Git repository by running:

    $ git pull https://github.com/upangit/zookeeper ZOOKEEPER-2316

Alternatively you can review and apply these changes as the patch at:

    https://github.com/apache/zookeeper/pull/223.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 #223
    
----
commit 7705e24a42dcca45291cdf272107d248ee28f356
Author: Umesh Panchaksharaiah <up...@yahoo.com>
Date:   2017-04-11T19:05:35Z

    ZOOKEEPER-2316: comment does not match code logic

----


---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---

[GitHub] zookeeper pull request #223: ZOOKEEPER-2316: comment does not match code log...

Posted by hanm <gi...@git.apache.org>.
Github user hanm commented on a diff in the pull request:

    https://github.com/apache/zookeeper/pull/223#discussion_r113050394
  
    --- Diff: src/java/main/org/apache/zookeeper/server/quorum/Leader.java ---
    @@ -724,6 +724,8 @@ synchronized public boolean tryToCommit(Proposal p, long zxid, SocketAddress fol
            // concurrent reconfigs are allowed, this can happen.
            if (outstandingProposals.containsKey(zxid - 1)) return false;
            
    +       // in order to be committed, a proposal must be accepted by a quorum
    +       //
    --- End diff --
    
    This blank line can be removed.


---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---

[GitHub] zookeeper pull request #223: ZOOKEEPER-2316: comment does not match code log...

Posted by afine <gi...@git.apache.org>.
Github user afine commented on a diff in the pull request:

    https://github.com/apache/zookeeper/pull/223#discussion_r113068086
  
    --- Diff: src/java/main/org/apache/zookeeper/server/quorum/Leader.java ---
    @@ -724,6 +724,8 @@ synchronized public boolean tryToCommit(Proposal p, long zxid, SocketAddress fol
            // concurrent reconfigs are allowed, this can happen.
            if (outstandingProposals.containsKey(zxid - 1)) return false;
            
    +       // in order to be committed, a proposal must be accepted by a quorum
    +       //
    --- End diff --
    
    @hanm I think the blank line may be fine, it provides separation from the idea on the next line so it doesn't read as a single sentence. 


---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---

[GitHub] zookeeper pull request #223: ZOOKEEPER-2316: comment does not match code log...

Posted by asfgit <gi...@git.apache.org>.
Github user asfgit closed the pull request at:

    https://github.com/apache/zookeeper/pull/223


---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---

[GitHub] zookeeper pull request #223: ZOOKEEPER-2316: comment does not match code log...

Posted by hanm <gi...@git.apache.org>.
Github user hanm commented on a diff in the pull request:

    https://github.com/apache/zookeeper/pull/223#discussion_r113069120
  
    --- Diff: src/java/main/org/apache/zookeeper/server/quorum/Leader.java ---
    @@ -724,6 +724,8 @@ synchronized public boolean tryToCommit(Proposal p, long zxid, SocketAddress fol
            // concurrent reconfigs are allowed, this can happen.
            if (outstandingProposals.containsKey(zxid - 1)) return false;
            
    +       // in order to be committed, a proposal must be accepted by a quorum
    +       //
    --- End diff --
    
    I would just use a period to do the separation. 


---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---