Helix monitoring

.gitignore

@@ -1,3 +1,21 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
 cscope.*
 .classpath
 .project

deploySite.sh

@@ -21,4 +21,4 @@
 read -s -p "Enter Apache Username: " myusername
 echo ""
 read -s -p "Enter Apache Password: " mypassword
-mvn clean site-deploy scm-publish:publish-scm -Dusername=$myusername -Dpassword=$mypassword -DskipTests $@
+mvn clean site-deploy scm-publish:publish-scm -Dusername="$myusername" -Dpassword="$mypassword" -DskipTests $@

helix-admin-webapp/pom.xml

@@ -21,7 +21,7 @@ under the License.
   <parent>
     <groupId>org.apache.helix</groupId>
     <artifactId>helix</artifactId>
-    <version>0.6.2-incubating-SNAPSHOT</version>
+    <version>0.7.1-incubating-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
@@ -47,13 +47,8 @@ under the License.
       <artifactId>helix-core</artifactId>
     </dependency>
     <dependency>
-      <groupId>com.noelios.restlet</groupId>
-      <artifactId>com.noelios.restlet</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>com.thoughtworks.xstream</groupId>
-      <artifactId>xstream</artifactId>
-      <version>1.3.1</version>
+      <groupId>org.restlet.jse</groupId>
+      <artifactId>org.restlet</artifactId>
     </dependency>
     <dependency>
       <groupId>org.codehaus.jackson</groupId>

helix-admin-webapp/src/main/java/org/apache/helix/webapp/RestAdminApplication.java

@@ -19,6 +19,8 @@
  * under the License.
  */
 
+import java.util.logging.Level;
+
 import org.apache.commons.cli.CommandLine;
 import org.apache.commons.cli.CommandLineParser;
 import org.apache.commons.cli.GnuParser;
@@ -52,13 +54,13 @@
 import org.apache.helix.webapp.resources.ZkPathResource;
 import org.restlet.Application;
 import org.restlet.Context;
+import org.restlet.Request;
+import org.restlet.Response;
 import org.restlet.Restlet;
-import org.restlet.Router;
 import org.restlet.data.MediaType;
-import org.restlet.data.Request;
-import org.restlet.data.Response;
-import org.restlet.resource.StringRepresentation;
-import org.restlet.util.Template;
+import org.restlet.representation.StringRepresentation;
+import org.restlet.routing.Router;
+import org.restlet.routing.Template;
 
 public class RestAdminApplication extends Application {
   public static final String HELP = "help";
@@ -67,6 +69,10 @@ public class RestAdminApplication extends Application {
   public static final String ZKCLIENT = "zkClient";
   public static final int DEFAULT_PORT = 8100;
 
+  static {
+    org.restlet.engine.Engine.setLogLevel(Level.SEVERE);
+  }
+
   public RestAdminApplication() {
     super();
   }
@@ -76,7 +82,7 @@ public RestAdminApplication(Context context) {
   }
 
   @Override
-  public Restlet createRoot() {
+  public Restlet createInboundRoot() {
     Router router = new Router(getContext());
     router.setDefaultMatchingMode(Template.MODE_EQUALS);
     router.attach("/clusters", ClustersResource.class);

helix-admin-webapp/src/main/java/org/apache/helix/webapp/resources/ClusterRepresentationUtil.java

@@ -31,9 +31,9 @@
 import org.apache.helix.HelixDataAccessor;
 import org.apache.helix.HelixProperty;
 import org.apache.helix.PropertyKey;
+import org.apache.helix.PropertyKey.Builder;
 import org.apache.helix.PropertyType;
 import org.apache.helix.ZNRecord;
-import org.apache.helix.PropertyKey.Builder;
 import org.apache.helix.manager.zk.ZKHelixDataAccessor;
 import org.apache.helix.manager.zk.ZNRecordSerializer;
 import org.apache.helix.manager.zk.ZkBaseDataAccessor;

helix-admin-webapp/src/main/java/org/apache/helix/webapp/resources/ClusterResource.java

@@ -20,57 +20,39 @@
  */
 
 import java.io.IOException;
+import java.util.HashSet;
 import java.util.List;
+import java.util.Set;
 
 import org.apache.helix.HelixDataAccessor;
 import org.apache.helix.HelixException;
-import org.apache.helix.ZNRecord;
 import org.apache.helix.PropertyKey.Builder;
+import org.apache.helix.ZNRecord;
 import org.apache.helix.manager.zk.ZkClient;
+import org.apache.helix.model.Leader;
 import org.apache.helix.model.LiveInstance;
 import org.apache.helix.tools.ClusterSetup;
 import org.apache.helix.webapp.RestAdminApplication;
 import org.codehaus.jackson.JsonGenerationException;
 import org.codehaus.jackson.map.JsonMappingException;
-import org.restlet.Context;
 import org.restlet.data.MediaType;
-import org.restlet.data.Request;
-import org.restlet.data.Response;
+import org.restlet.data.Method;
 import org.restlet.data.Status;
-import org.restlet.resource.Representation;
-import org.restlet.resource.Resource;
-import org.restlet.resource.StringRepresentation;
-import org.restlet.resource.Variant;
-
-public class ClusterResource extends Resource {
-  public ClusterResource(Context context, Request request, Response response) {
-    super(context, request, response);
+import org.restlet.representation.Representation;
+import org.restlet.representation.StringRepresentation;
+import org.restlet.representation.Variant;
+import org.restlet.resource.ServerResource;
+
+public class ClusterResource extends ServerResource {
+    
+  public ClusterResource() {
     getVariants().add(new Variant(MediaType.TEXT_PLAIN));
     getVariants().add(new Variant(MediaType.APPLICATION_JSON));
+    setNegotiated(false);
   }
 
   @Override
-  public boolean allowGet() {
-    return true;
-  }
-
-  @Override
-  public boolean allowPost() {
-    return true;
-  }
-
-  @Override
-  public boolean allowPut() {
-    return false;
-  }
-
-  @Override
-  public boolean allowDelete() {
-    return true;
-  }
-
-  @Override
-  public Representation represent(Variant variant) {
+  public Representation get() {
     StringRepresentation presentation = null;
     try {
       String clusterName = (String) getRequest().getAttributes().get("clusterName");
@@ -80,7 +62,6 @@ public Representation represent(Variant variant) {
     catch (Exception e) {
       String error = ClusterRepresentationUtil.getErrorAsJsonStringFromException(e);
       presentation = new StringRepresentation(error, MediaType.APPLICATION_JSON);
-
       e.printStackTrace();
     }
     return presentation;
@@ -107,7 +88,7 @@ StringRepresentation getClusterRepresentation(String clusterName) throws JsonGen
         ClusterRepresentationUtil.getClusterDataAccessor(zkClient, clusterName);
     Builder keyBuilder = accessor.keyBuilder();
 
-    LiveInstance leader = accessor.getProperty(keyBuilder.controllerLeader());
+    Leader leader = accessor.getProperty(keyBuilder.controllerLeader());
     if (leader != null) {
       clusterSummayRecord.setSimpleField("LEADER", leader.getInstanceName());
     } else {
@@ -121,7 +102,7 @@ StringRepresentation getClusterRepresentation(String clusterName) throws JsonGen
   }
 
   @Override
-  public void acceptRepresentation(Representation entity) {
+  public Representation post(Representation entity) {
     try {
       String clusterName = (String) getRequest().getAttributes().get("clusterName");
       ZkClient zkClient =
@@ -160,10 +141,11 @@ public void acceptRepresentation(Representation entity) {
           MediaType.APPLICATION_JSON);
       getResponse().setStatus(Status.SUCCESS_OK);
     }
+    return getResponseEntity();
   }
 
   @Override
-  public void removeRepresentations() {
+  public Representation delete() {
     try {
       String clusterName = (String) getRequest().getAttributes().get("clusterName");
       ZkClient zkClient =
@@ -176,5 +158,6 @@ public void removeRepresentations() {
           MediaType.APPLICATION_JSON);
       getResponse().setStatus(Status.SUCCESS_OK);
     }
+    return null;
   }
 }

helix-admin-webapp/src/main/java/org/apache/helix/webapp/resources/ClustersResource.java

@@ -30,43 +30,25 @@
 import org.apache.log4j.Logger;
 import org.codehaus.jackson.JsonGenerationException;
 import org.codehaus.jackson.map.JsonMappingException;
-import org.restlet.Context;
 import org.restlet.data.MediaType;
-import org.restlet.data.Request;
-import org.restlet.data.Response;
 import org.restlet.data.Status;
-import org.restlet.resource.Representation;
-import org.restlet.resource.Resource;
-import org.restlet.resource.StringRepresentation;
-import org.restlet.resource.Variant;
+import org.restlet.representation.Representation;
+import org.restlet.representation.StringRepresentation;
+import org.restlet.representation.Variant;
+import org.restlet.resource.ServerResource;
 
-public class ClustersResource extends Resource {
+public class ClustersResource extends ServerResource {
   private final static Logger LOG = Logger.getLogger(ClustersResource.class);
 
-  public ClustersResource(Context context, Request request, Response response) {
-    super(context, request, response);
+  public ClustersResource() {
     getVariants().add(new Variant(MediaType.TEXT_PLAIN));
     getVariants().add(new Variant(MediaType.APPLICATION_JSON));
+    setNegotiated(false);
     // handle(request,response);
   }
 
   @Override
-  public boolean allowPost() {
-    return true;
-  }
-
-  @Override
-  public boolean allowPut() {
-    return false;
-  }
-
-  @Override
-  public boolean allowDelete() {
-    return true;
-  }
-
-  @Override
-  public Representation represent(Variant variant) {
+  public Representation get() {
     StringRepresentation presentation = null;
     try {
       presentation = getClustersRepresentation();
@@ -96,7 +78,7 @@ StringRepresentation getClustersRepresentation() throws JsonGenerationException,
   }
 
   @Override
-  public void acceptRepresentation(Representation entity) {
+  public Representation post(Representation entity) {
     try {
       JsonParameters jsonParameters = new JsonParameters(entity);
       String command = jsonParameters.getCommand();
@@ -124,10 +106,11 @@ public void acceptRepresentation(Representation entity) {
       getResponse().setStatus(Status.SUCCESS_OK);
       LOG.error("Error in posting " + entity, e);
     }
+    return null;
   }
 
   @Override
-  public void removeRepresentations() {
-
+  public Representation delete() {
+      return null;
   }
 }

helix-admin-webapp/src/main/java/org/apache/helix/webapp/resources/ConfigResource.java

@@ -20,40 +20,36 @@
  */
 
 import java.util.Arrays;
-import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 
 import org.apache.helix.HelixAdmin;
 import org.apache.helix.HelixException;
 import org.apache.helix.ZNRecord;
 import org.apache.helix.manager.zk.ZkClient;
-import org.apache.helix.model.ConfigScope;
 import org.apache.helix.model.HelixConfigScope;
 import org.apache.helix.model.HelixConfigScope.ConfigScopeProperty;
-import org.apache.helix.model.builder.ConfigScopeBuilder;
 import org.apache.helix.model.builder.HelixConfigScopeBuilder;
 import org.apache.helix.tools.ClusterSetup;
 import org.apache.helix.webapp.RestAdminApplication;
 import org.apache.log4j.Logger;
 import org.restlet.Context;
+import org.restlet.Request;
+import org.restlet.Response;
 import org.restlet.data.MediaType;
-import org.restlet.data.Request;
-import org.restlet.data.Response;
 import org.restlet.data.Status;
-import org.restlet.resource.Representation;
-import org.restlet.resource.Resource;
-import org.restlet.resource.StringRepresentation;
-import org.restlet.resource.Variant;
+import org.restlet.representation.Representation;
+import org.restlet.representation.StringRepresentation;
+import org.restlet.representation.Variant;
+import org.restlet.resource.ServerResource;
 
-public class ConfigResource extends Resource {
+public class ConfigResource extends ServerResource {
   private final static Logger LOG = Logger.getLogger(ConfigResource.class);
 
-  public ConfigResource(Context context, Request request, Response response) {
-    super(context, request, response);
+  public ConfigResource() {
     getVariants().add(new Variant(MediaType.TEXT_PLAIN));
     getVariants().add(new Variant(MediaType.APPLICATION_JSON));
-    setModifiable(true);
+    setNegotiated(false);
   }
 
   String getValue(String key) {
@@ -122,7 +118,7 @@ StringRepresentation getConfigs(// ConfigScope scope,
   }
 
   @Override
-  public Representation represent(Variant variant) {
+  public Representation get() {
     StringRepresentation representation = null;
 
     String clusterName = getValue("clusterName");
@@ -221,12 +217,13 @@ void setConfigs(Representation entity, ConfigScopeProperty type, String scopeArg
 
     }
 
-    getResponse().setEntity(represent());
+    getResponse().setEntity(get());
     getResponse().setStatus(Status.SUCCESS_OK);
   }
 
-  @Override
-  public void acceptRepresentation(Representation entity) {
+
+@Override
+  public Representation post(Representation entity) {
     String clusterName = getValue("clusterName");
 
     String scopeStr = getValue("scope").toUpperCase();
@@ -268,5 +265,6 @@ public void acceptRepresentation(Representation entity) {
           MediaType.APPLICATION_JSON);
       getResponse().setStatus(Status.SUCCESS_OK);
     }
+    return null;
   }
 }