git commit: [HELIX-397] REST GET for resources should include tag information

[ka...@apache.org]

Repository: helix
Updated Branches:
  refs/heads/master 3399aadb9 -> cacc6b201


[HELIX-397] REST GET for resources should include tag information


Project: http://git-wip-us.apache.org/repos/asf/helix/repo
Commit: http://git-wip-us.apache.org/repos/asf/helix/commit/cacc6b20
Tree: http://git-wip-us.apache.org/repos/asf/helix/tree/cacc6b20
Diff: http://git-wip-us.apache.org/repos/asf/helix/diff/cacc6b20

Branch: refs/heads/master
Commit: cacc6b201559995f0c5407aded1ab27cb9c82004
Parents: 3399aad
Author: Kanak Biscuitwala <ka...@apache.org>
Authored: Wed Mar 5 14:00:58 2014 -0800
Committer: Kanak Biscuitwala <ka...@apache.org>
Committed: Wed Mar 5 14:44:54 2014 -0800

----------------------------------------------------------------------
 .../resources/ResourceGroupsResource.java       |  34 ++++-
 .../apache/helix/webapp/TestTagAwareness.java   | 141 +++++++++++++++++++
 2 files changed, 170 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/helix/blob/cacc6b20/helix-admin-webapp/src/main/java/org/apache/helix/webapp/resources/ResourceGroupsResource.java
----------------------------------------------------------------------
diff --git a/helix-admin-webapp/src/main/java/org/apache/helix/webapp/resources/ResourceGroupsResource.java b/helix-admin-webapp/src/main/java/org/apache/helix/webapp/resources/ResourceGroupsResource.java
index 01ea37a..ad4e934 100644
--- a/helix-admin-webapp/src/main/java/org/apache/helix/webapp/resources/ResourceGroupsResource.java
+++ b/helix-admin-webapp/src/main/java/org/apache/helix/webapp/resources/ResourceGroupsResource.java
@@ -21,10 +21,14 @@ package org.apache.helix.webapp.resources;
 
 import java.io.IOException;
 import java.util.List;
+import java.util.Map;
 
+import org.apache.helix.HelixDataAccessor;
 import org.apache.helix.HelixException;
+import org.apache.helix.PropertyKey;
 import org.apache.helix.ZNRecord;
 import org.apache.helix.manager.zk.ZkClient;
+import org.apache.helix.model.IdealState;
 import org.apache.helix.model.IdealState.RebalanceMode;
 import org.apache.helix.tools.ClusterSetup;
 import org.apache.helix.webapp.RestAdminApplication;
@@ -38,6 +42,9 @@ import org.restlet.representation.StringRepresentation;
 import org.restlet.representation.Variant;
 import org.restlet.resource.ServerResource;
 
+import com.google.common.collect.Lists;
+import com.google.common.collect.Maps;
+
 public class ResourceGroupsResource extends ServerResource {
   private final static Logger LOG = Logger.getLogger(ResourceGroupsResource.class);
 
@@ -66,14 +73,31 @@ public class ResourceGroupsResource extends ServerResource {
 
   StringRepresentation getHostedEntitiesRepresentation(String clusterName)
       throws JsonGenerationException, JsonMappingException, IOException {
+    // Get all resources
     ZkClient zkClient = (ZkClient) getContext().getAttributes().get(RestAdminApplication.ZKCLIENT);
-    ;
-    ClusterSetup setupTool = new ClusterSetup(zkClient);
-    List<String> hostedEntities =
-        setupTool.getClusterManagementTool().getResourcesInCluster(clusterName);
+    HelixDataAccessor accessor =
+        ClusterRepresentationUtil.getClusterDataAccessor(zkClient, clusterName);
+    PropertyKey.Builder keyBuilder = accessor.keyBuilder();
+    Map<String, IdealState> idealStateMap = accessor.getChildValuesMap(keyBuilder.idealStates());
 
+    // Create the result
     ZNRecord hostedEntitiesRecord = new ZNRecord("ResourceGroups");
-    hostedEntitiesRecord.setListField("ResourceGroups", hostedEntities);
+
+    // Figure out which tags are present on which resources
+    Map<String, String> tagMap = Maps.newHashMap();
+    for (IdealState idealState : idealStateMap.values()) {
+      String tag = idealState.getInstanceGroupTag();
+      if (tag != null) {
+        tagMap.put(idealState.getId(), tag);
+      }
+    }
+
+    // Populate the result
+    List<String> allResources = Lists.newArrayList(idealStateMap.keySet());
+    hostedEntitiesRecord.setListField("ResourceGroups", allResources);
+    if (!tagMap.isEmpty()) {
+      hostedEntitiesRecord.setMapField("ResourceTags", tagMap);
+    }
 
     StringRepresentation representation =
         new StringRepresentation(ClusterRepresentationUtil.ZNRecordToJson(hostedEntitiesRecord),

http://git-wip-us.apache.org/repos/asf/helix/blob/cacc6b20/helix-admin-webapp/src/test/java/org/apache/helix/webapp/TestTagAwareness.java
----------------------------------------------------------------------
diff --git a/helix-admin-webapp/src/test/java/org/apache/helix/webapp/TestTagAwareness.java b/helix-admin-webapp/src/test/java/org/apache/helix/webapp/TestTagAwareness.java
new file mode 100644
index 0000000..f8bb6cd
--- /dev/null
+++ b/helix-admin-webapp/src/test/java/org/apache/helix/webapp/TestTagAwareness.java
@@ -0,0 +1,141 @@
+package org.apache.helix.webapp;
+
+/*
+ * 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.
+ */
+
+import java.io.IOException;
+import java.util.List;
+import java.util.Map;
+
+import org.apache.helix.HelixAdmin;
+import org.apache.helix.ZNRecord;
+import org.apache.helix.model.IdealState;
+import org.apache.helix.model.InstanceConfig;
+import org.apache.helix.tools.AdminTestBase;
+import org.apache.helix.webapp.resources.ClusterRepresentationUtil;
+import org.apache.helix.webapp.resources.InstancesResource.ListInstancesWrapper;
+import org.junit.Assert;
+import org.restlet.Client;
+import org.restlet.Request;
+import org.restlet.Response;
+import org.restlet.data.Method;
+import org.restlet.data.Protocol;
+import org.restlet.data.Reference;
+import org.testng.annotations.AfterClass;
+import org.testng.annotations.BeforeClass;
+import org.testng.annotations.Test;
+
+/**
+ * Ensure that REST calls for participants and resources return information about tags
+ */
+public class TestTagAwareness extends AdminTestBase {
+  private String _clusterName;
+  private HelixAdmin _admin;
+
+  @BeforeClass
+  public void beforeClass() {
+    _clusterName = TestTagAwareness.class.getCanonicalName() + "_cluster";
+    _gSetupTool.addCluster(_clusterName, true);
+    _admin = _gSetupTool.getClusterManagementTool();
+  }
+
+  @Test
+  public void testGetResources() throws IOException {
+    final String TAG = "tag";
+    final String URL_BASE =
+        "http://localhost:" + ADMIN_PORT + "/clusters/" + _clusterName + "/resourceGroups";
+
+    // Add a tagged resource
+    IdealState taggedResource = new IdealState("taggedResource");
+    taggedResource.setInstanceGroupTag(TAG);
+    taggedResource.setStateModelDefRef("OnlineOffline");
+    _admin.addResource(_clusterName, taggedResource.getId(), taggedResource);
+
+    // Add an untagged resource
+    IdealState untaggedResource = new IdealState("untaggedResource");
+    untaggedResource.setStateModelDefRef("OnlineOffline");
+    _admin.addResource(_clusterName, untaggedResource.getId(), untaggedResource);
+
+    // Now make a REST call for all resources
+    Reference resourceRef = new Reference(URL_BASE);
+    Request request = new Request(Method.GET, resourceRef);
+    Client client = new Client(Protocol.HTTP);
+    Response response = client.handle(request);
+    ZNRecord responseRecord =
+        ClusterRepresentationUtil.JsonToObject(ZNRecord.class, response.getEntityAsText());
+
+    // Ensure that the tagged resource has information and the untagged one doesn't
+    Assert.assertNotNull(responseRecord.getMapField("ResourceTags"));
+    Assert
+        .assertEquals(TAG, responseRecord.getMapField("ResourceTags").get(taggedResource.getId()));
+    Assert.assertFalse(responseRecord.getMapField("ResourceTags").containsKey(
+        untaggedResource.getId()));
+  }
+
+  @Test
+  public void testGetInstances() throws IOException {
+    final String[] TAGS = {
+        "tag1", "tag2"
+    };
+    final String URL_BASE =
+        "http://localhost:" + ADMIN_PORT + "/clusters/" + _clusterName + "/instances";
+
+    // Add 4 participants, each with differint tag characteristics
+    InstanceConfig instance1 = new InstanceConfig("localhost_1");
+    instance1.addTag(TAGS[0]);
+    _admin.addInstance(_clusterName, instance1);
+    InstanceConfig instance2 = new InstanceConfig("localhost_2");
+    instance2.addTag(TAGS[1]);
+    _admin.addInstance(_clusterName, instance2);
+    InstanceConfig instance3 = new InstanceConfig("localhost_3");
+    instance3.addTag(TAGS[0]);
+    instance3.addTag(TAGS[1]);
+    _admin.addInstance(_clusterName, instance3);
+    InstanceConfig instance4 = new InstanceConfig("localhost_4");
+    _admin.addInstance(_clusterName, instance4);
+
+    // Now make a REST call for all resources
+    Reference resourceRef = new Reference(URL_BASE);
+    Request request = new Request(Method.GET, resourceRef);
+    Client client = new Client(Protocol.HTTP);
+    Response response = client.handle(request);
+    ListInstancesWrapper responseWrapper =
+        ClusterRepresentationUtil.JsonToObject(ListInstancesWrapper.class,
+            response.getEntityAsText());
+    Map<String, List<String>> tagInfo = responseWrapper.tagInfo;
+
+    // Ensure tag ownership is reported correctly
+    Assert.assertTrue(tagInfo.containsKey(TAGS[0]));
+    Assert.assertTrue(tagInfo.containsKey(TAGS[1]));
+    Assert.assertTrue(tagInfo.get(TAGS[0]).contains("localhost_1"));
+    Assert.assertFalse(tagInfo.get(TAGS[0]).contains("localhost_2"));
+    Assert.assertTrue(tagInfo.get(TAGS[0]).contains("localhost_3"));
+    Assert.assertFalse(tagInfo.get(TAGS[0]).contains("localhost_4"));
+    Assert.assertFalse(tagInfo.get(TAGS[1]).contains("localhost_1"));
+    Assert.assertTrue(tagInfo.get(TAGS[1]).contains("localhost_2"));
+    Assert.assertTrue(tagInfo.get(TAGS[1]).contains("localhost_3"));
+    Assert.assertFalse(tagInfo.get(TAGS[1]).contains("localhost_4"));
+  }
+
+  @AfterClass
+  public void afterClass() {
+    _admin.dropCluster(_clusterName);
+  }
+
+}