Fixed server threads

Author: alevy

ruby/irb_client.rb

@@ -7,7 +7,7 @@
 
 ARGV.push("--simple-prompt")
 
-@_client = Donut::HashClient.new
+@_client = Donut::HashClient.new("localhost", 8081)
 
 def get(x)
   @_client.get(x)

src/edu/washington/cs/cse490h/donut/server/DonutClient.java

@@ -108,15 +108,13 @@ public void stabalize() {
         try {
             TNode x = null;
             if (!node.getTNode().equals(node.getSuccessor())) {
-                System.out.println(node.getSuccessor());
                 Iface successorClient = clientFactory.get(node.getSuccessor());
                 x = successorClient.getPredecessor();
-                System.out.println(x);
                 successorClient.notify(node.getTNode());
             } else {
                 x = node.getPredecessor();
             }
-            if (x != null && x.isNil()
+            if (x != null && !x.isNil()
                     || KeyIdUtil.isAfterXButBeforeY(x.getNodeId(), node.getNodeId(), node.getSuccessor()
                             .getNodeId())) {
                 node.setSuccessor(x);

src/edu/washington/cs/cse490h/donut/server/DonutModule.java

@@ -6,7 +6,7 @@
 
 import org.apache.thrift.TProcessor;
 import org.apache.thrift.server.TServer;
-import org.apache.thrift.server.TSimpleServer;
+import org.apache.thrift.server.TThreadPoolServer;
 import org.apache.thrift.transport.TServerSocket;
 import org.apache.thrift.transport.TServerTransport;
 import org.apache.thrift.transport.TTransportException;
@@ -100,7 +100,7 @@ private TServerProvider(TProcessor proc, TServerTransport transport) {
         }
 
         public TServer get() {
-            return new TSimpleServer(proc, transport);
+            return new TThreadPoolServer(proc, transport);
         }
     }
 

src/edu/washington/cs/cse490h/donut/service/NodeLocator.java

@@ -85,7 +85,6 @@ public void ping() throws TException {
     }
 
     public TNode getPredecessor() throws TException {
-        LOGGER.info("Getting Predecessor");
         TNode predecessor = node.getPredecessor();
         if (predecessor == null) {
             predecessor = new TNode();
@@ -95,7 +94,6 @@ public TNode getPredecessor() throws TException {
     }
 
     public void notify(TNode n) throws TException {
-        LOGGER.info("");
         if (node.getPredecessor() == null
                 || KeyIdUtil.isAfterXButBeforeY(n.getNodeId(), node.getPredecessor().getNodeId(),
                         node.getNodeId())) {