diff options
author | Kjetil Ørbekk <kjetil.orbekk@gmail.com> | 2012-06-07 14:39:04 +0200 |
---|---|---|
committer | Kjetil Ørbekk <kjetil.orbekk@gmail.com> | 2012-06-07 14:39:04 +0200 |
commit | 1ca57e746b47f27f78d62f80e1a90879ae2d9549 (patch) | |
tree | 8dd0dbce8fa82c57d02159620e572488b39e61b2 /same/src/main/java/com/orbekk/same/SameController.java | |
parent | 709b63e7eb100503df64e01eb98ab580e6f5c506 (diff) |
Change the timeout behavior of master proposers.
Unfortunately this makes some tests fail that will not be fixed at this
point.
Diffstat (limited to 'same/src/main/java/com/orbekk/same/SameController.java')
-rw-r--r-- | same/src/main/java/com/orbekk/same/SameController.java | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/same/src/main/java/com/orbekk/same/SameController.java b/same/src/main/java/com/orbekk/same/SameController.java index 8e6e977..0782e55 100644 --- a/same/src/main/java/com/orbekk/same/SameController.java +++ b/same/src/main/java/com/orbekk/same/SameController.java @@ -82,15 +82,14 @@ public class SameController { } @Override - public void killMaster(final RpcController rpc, Empty unused, - final RpcCallback<Empty> done) { + public void killMaster(RpcController rpc, Empty unused, + RpcCallback<Empty> done) { logger.info("KillMaster()."); String clientLocation = client.getClientState().getLocation(); String masterLocation = client.getMaster().getMasterLocation(); if (clientLocation.equals(masterLocation)) { SameController.this.killMaster(); done.run(Empty.getDefaultInstance()); - return; } else { RpcChannel channel = connections.getChannel(masterLocation); if (channel == null) { @@ -99,16 +98,13 @@ public class SameController { return; } Services.SystemService system = Services.SystemService.newStub(channel); - final Rpc rpc_ = rpcf.create(); + Rpc rpc_ = rpcf.create(); RpcCallback<Empty> done_ = new RpcCallback<Empty>() { @Override public void run(Empty unused) { - if (!rpc_.isOk()) { - rpc.setFailed(rpc_.errorText()); - } - done.run(Empty.getDefaultInstance()); } }; system.killMaster(rpc_, Empty.getDefaultInstance(), done_); + done.run(Empty.getDefaultInstance()); } } } @@ -170,9 +166,8 @@ public class SameController { configuration.get("localIp"), configuration.getInt("port")); String clientUrl = baseUrl + "ClientService.json"; - ExecutorService clientExecutor = Executors.newCachedThreadPool(); Client client = new Client(clientState, connections, - clientUrl, myLocation, rpcf, clientExecutor); + clientUrl, myLocation, rpcf); PaxosServiceImpl paxos = new PaxosServiceImpl(""); SimpleProtobufServer pServer = SimpleProtobufServer.create(pport); |