- Added config parameter for enabling Rest Service. Rest Service will…

… run

on port 8085 but will not be enabled by default. Set rest.enable=true to
bring up RestService.
- Bringing back HttpService on it port 8081.
- Changing the Rest Service unit tests to use port 8085

config/single_node_rest_server/config/server.properties

@@ -7,6 +7,7 @@ max.threads=100
 
 http.enable=true
 socket.enable=true
+rest.enable=true
 
 # BDB
 bdb.write.transactions=false

contrib/restclient/src/java/voldemort/restclient/RestServerAPITest.java

@@ -62,7 +62,7 @@ public static void oneTimeSetUp() {
         logger.info("********************Starting REST Server********************");
 
         restClientConfig = new RESTClientConfig();
-        restClientConfig.setHttpBootstrapURL("http://localhost:8081")
+        restClientConfig.setHttpBootstrapURL("http://localhost:8085")
                         .setTimeoutMs(1500, TimeUnit.MILLISECONDS)
                         .setMaxR2ConnectionPoolSize(100);
         clientFactory = new HttpClientFactory();

src/java/voldemort/server/VoldemortConfig.java

@@ -36,6 +36,7 @@
 import voldemort.server.http.HttpService;
 import voldemort.server.niosocket.NioSocketService;
 import voldemort.server.protocol.admin.AsyncOperation;
+import voldemort.server.rest.RestService;
 import voldemort.server.scheduler.DataCleanupJob;
 import voldemort.server.scheduler.slop.BlockingSlopPusherJob;
 import voldemort.server.scheduler.slop.StreamingSlopPusherJob;
@@ -229,6 +230,7 @@ public class VoldemortConfig implements Serializable {
     // Should be removed once the proxy put implementation is stable.
     private boolean proxyPutsDuringRebalance;
 
+    private boolean enableRestService;
     private int numRestServiceNettyBossThreads;
     private int numRestServiceNettyWorkerThreads;
     private int numRestServiceStorageThreads;
@@ -507,6 +509,7 @@ public VoldemortConfig(Props props) {
         this.enableNetworkClassLoader = props.getBoolean("enable.network.classloader", false);
 
         // TODO: REST-Server decide on the numbers
+        this.enableRestService = props.getBoolean("rest.enable", false);
         this.numRestServiceNettyBossThreads = props.getInt("num.rest.service.netty.boss.threads", 1);
         this.numRestServiceNettyWorkerThreads = props.getInt("num.rest.service.netty.worker.threads",
                                                              10);
@@ -2812,6 +2815,22 @@ public void setGossipInterval(int gossipIntervalMs) {
         this.gossipIntervalMs = gossipIntervalMs;
     }
 
+    public boolean isRestServiceEnabled() {
+        return enableRestService;
+    }
+
+    /**
+     * Whether or not the {@link RestService} is enabled
+     * <ul>
+     * <li>Property :"rest.enable"</li>
+     * <li>Default :false</li>
+     * </ul>
+     * 
+     */
+    public void setEnableRestService(boolean enableRestService) {
+        this.enableRestService = enableRestService;
+    }
+
     public int getNumRestServiceNettyBossThreads() {
         return numRestServiceNettyBossThreads;
     }
@@ -2872,4 +2891,5 @@ public int getRestServiceStorageThreadPoolQueueSize() {
     public void setRestServiceStorageThreadPoolQueueSize(int restServiceStorageThreadPoolQueueSize) {
         this.restServiceStorageThreadPoolQueueSize = restServiceStorageThreadPoolQueueSize;
     }
+
 }

src/java/voldemort/server/VoldemortServer.java

@@ -29,6 +29,7 @@
 
 import voldemort.VoldemortException;
 import voldemort.annotations.jmx.JmxOperation;
+import voldemort.client.protocol.RequestFormatType;
 import voldemort.client.protocol.admin.AdminClient;
 import voldemort.cluster.Cluster;
 import voldemort.cluster.Node;
@@ -37,6 +38,7 @@
 import voldemort.common.service.ServiceType;
 import voldemort.common.service.VoldemortService;
 import voldemort.server.gossip.GossipService;
+import voldemort.server.http.HttpService;
 import voldemort.server.jmx.JmxService;
 import voldemort.server.niosocket.NioSocketService;
 import voldemort.server.protocol.RequestHandlerFactory;
@@ -190,18 +192,23 @@ private List<VoldemortService> createServices() {
 
         if(voldemortConfig.isHttpServerEnabled()) {
             /*
-             * TODO REST-Server 1. Need to decide on replacing HttpService 2.
-             * Need to decide on the number of threads. This needs to be
-             * configurable
+             * TODO REST-Server 1. Need to decide on replacing HttpService
              */
+            services.add(new HttpService(this,
+                                         storageService,
+                                         storeRepository,
+                                         RequestFormatType.VOLDEMORT_V1,
+                                         voldemortConfig.getMaxThreads(),
+                                         identityNode.getHttpPort()));
+
+        }
+        if(voldemortConfig.isRestServiceEnabled()) {
             /*
-             * services.add(new HttpService(this, storageService,
-             * storeRepository, RequestFormatType.VOLDEMORT_V1,
-             * voldemortConfig.getMaxThreads(), identityNode.getHttpPort()));
+             * TODO REST-Server 1. Need to decide on the number of threads. This
+             * needs to be configurable 2. Need to configure the Rest Service
+             * port instead of hard coding
              */
-            services.add(new RestService(voldemortConfig,
-                                         identityNode.getHttpPort(),
-                                         storeRepository));
+            services.add(new RestService(voldemortConfig, 8085, storeRepository));
         }
         if(voldemortConfig.isSocketServerEnabled()) {
             RequestHandlerFactory socketRequestHandlerFactory = new SocketRequestHandlerFactory(storageService,

test/unit/voldemort/server/rest/RestServerProtocolTests.java

@@ -44,7 +44,7 @@ public class RestServerProtocolTests {
     @BeforeClass
     public static void oneTimeSetUp() {
         storeNameStr = "test";
-        urlStr = "http://localhost:8081/";
+        urlStr = "http://localhost:8085/";
         config = VoldemortConfig.loadFromVoldemortHome("config/single_node_rest_server/");
         key1 = "The longest key ";
         vectorClock = new VectorClock();