summaryrefslogtreecommitdiff
path: root/same/src/main/java/com/orbekk/paxos/MasterProposer.java
diff options
context:
space:
mode:
authorKjetil Ørbekk <kjetil.orbekk@gmail.com>2012-01-24 11:11:45 +0100
committerKjetil Ørbekk <kjetil.orbekk@gmail.com>2012-01-24 11:11:45 +0100
commit263f3a0b4425287ef234d0dbf039e0027c4ad6c1 (patch)
tree20f06878f41654007d9ae243eda25cd6e3a6e5a7 /same/src/main/java/com/orbekk/paxos/MasterProposer.java
parent3e50334e2233b7180b9895d106074aad914ca412 (diff)
Paxos: Remove roundId parameter.
Diffstat (limited to 'same/src/main/java/com/orbekk/paxos/MasterProposer.java')
-rw-r--r--same/src/main/java/com/orbekk/paxos/MasterProposer.java14
1 files changed, 7 insertions, 7 deletions
diff --git a/same/src/main/java/com/orbekk/paxos/MasterProposer.java b/same/src/main/java/com/orbekk/paxos/MasterProposer.java
index 3a451d0..912de7e 100644
--- a/same/src/main/java/com/orbekk/paxos/MasterProposer.java
+++ b/same/src/main/java/com/orbekk/paxos/MasterProposer.java
@@ -17,11 +17,11 @@ public class MasterProposer {
this.connections = connections;
}
- private boolean internalPropose(int roundId, int proposalNumber) {
+ private boolean internalPropose(int proposalNumber) {
int promises = 0;
for (String url : paxosUrls) {
PaxosService paxos = connections.getPaxos(url);
- boolean success = paxos.propose(myUrl, roundId, proposalNumber);
+ boolean success = paxos.propose(myUrl, proposalNumber);
if (success) {
promises += 1;
}
@@ -29,11 +29,11 @@ public class MasterProposer {
return promises > paxosUrls.size() / 2;
}
- private boolean internalAcceptRequest(int roundId, int proposalNumber) {
+ private boolean internalAcceptRequest(int proposalNumber) {
int accepts = 0;
for (String url : paxosUrls) {
PaxosService paxos = connections.getPaxos(url);
- boolean success = paxos.acceptRequest(myUrl, roundId, proposalNumber);
+ boolean success = paxos.acceptRequest(myUrl, proposalNumber);
if (success) {
accepts += 1;
}
@@ -41,11 +41,11 @@ public class MasterProposer {
return accepts > paxosUrls.size() / 2;
}
- public boolean propose(int roundId, int proposalNumber) {
+ public boolean propose(int proposalNumber) {
boolean success = false;
- success = internalPropose(roundId, proposalNumber);
+ success = internalPropose(proposalNumber);
if (success) {
- success = internalAcceptRequest(roundId, proposalNumber);
+ success = internalAcceptRequest(proposalNumber);
}
if (success) {
return true;