hadoop-yarn-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From vino...@apache.org
Subject svn commit: r1493654 - in /hadoop/common/trunk/hadoop-yarn-project: ./ hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/state/ hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/util/ hadoop-yarn/hadoop-yarn-server/h...
Date Mon, 17 Jun 2013 06:51:52 GMT
Author: vinodkv
Date: Mon Jun 17 06:51:51 2013
New Revision: 1493654

URL: http://svn.apache.org/r1493654
Log:
YARN-833. Moved Graph and VisualizeStateMachine into yarn.state package. Contributed by Zhijie
Shen.

Added:
    hadoop/common/trunk/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/state/Graph.java
    hadoop/common/trunk/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/state/VisualizeStateMachine.java
Removed:
    hadoop/common/trunk/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/util/Graph.java
    hadoop/common/trunk/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/util/VisualizeStateMachine.java
Modified:
    hadoop/common/trunk/hadoop-yarn-project/CHANGES.txt
    hadoop/common/trunk/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/state/StateMachineFactory.java
    hadoop/common/trunk/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/pom.xml
    hadoop/common/trunk/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/pom.xml

Modified: hadoop/common/trunk/hadoop-yarn-project/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-yarn-project/CHANGES.txt?rev=1493654&r1=1493653&r2=1493654&view=diff
==============================================================================
--- hadoop/common/trunk/hadoop-yarn-project/CHANGES.txt (original)
+++ hadoop/common/trunk/hadoop-yarn-project/CHANGES.txt Mon Jun 17 06:51:51 2013
@@ -392,6 +392,9 @@ Release 2.1.0-beta - UNRELEASED
 
     YARN-825. Fixed javadoc and annotations for yarn-common module. (vinodkv)
 
+    YARN-833. Moved Graph and VisualizeStateMachine into yarn.state package.
+    (Zhijie Shen via vinodkv)
+
   OPTIMIZATIONS
 
     YARN-512. Log aggregation root directory check is more expensive than it

Added: hadoop/common/trunk/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/state/Graph.java
URL: http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/state/Graph.java?rev=1493654&view=auto
==============================================================================
--- hadoop/common/trunk/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/state/Graph.java
(added)
+++ hadoop/common/trunk/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/state/Graph.java
Mon Jun 17 06:51:51 2013
@@ -0,0 +1,212 @@
+/*
+ * 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.
+ */
+package org.apache.hadoop.yarn.state;
+
+import java.io.FileWriter;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
+import org.apache.commons.lang.StringEscapeUtils;
+import org.apache.hadoop.classification.InterfaceAudience.Private;
+
+@Private
+public class Graph {
+  public class Edge {
+    Node from;
+    Node to;
+    String label;
+
+    public Edge(Node from, Node to, String info) {
+      this.from = from;
+      this.to = to;
+      this.label = info;
+    }
+
+    public boolean sameAs(Edge rhs) {
+      if (this.from == rhs.from &&
+          this.to == rhs.to) {
+        return true;
+      }
+      return false;
+    }
+
+    public Edge combine(Edge rhs) {
+      String newlabel = this.label + "," + rhs.label;
+      return new Edge(this.from, this.to, newlabel);
+    }
+  }
+
+  public class Node {
+    Graph parent;
+    String id;
+    List<Edge> ins;
+    List<Edge> outs;
+
+    public Node(String id) {
+      this.id = id;
+      this.parent = Graph.this;
+      this.ins = new ArrayList<Graph.Edge>();
+      this.outs = new ArrayList<Graph.Edge>();
+    }
+
+    public Graph getParent() {
+      return parent;
+    }
+
+    public Node addEdge(Node to, String info) {
+      Edge e = new Edge(this, to, info);
+      outs.add(e);
+      to.ins.add(e);
+      return this;
+    }
+
+    public String getUniqueId() {
+      return Graph.this.name + "." + id;
+    }
+  }
+
+  private String name;
+  private Graph parent;
+  private Set<Graph.Node> nodes = new HashSet<Graph.Node>();
+  private Set<Graph> subgraphs = new HashSet<Graph>();
+
+  public Graph(String name, Graph parent) {
+    this.name = name;
+    this.parent = parent;
+  }
+
+  public Graph(String name) {
+    this(name, null);
+  }
+
+  public Graph() {
+    this("graph", null);
+  }
+
+  public String getName() {
+    return name;
+  }
+
+  public Graph getParent() {
+    return parent;
+  }
+
+  private Node newNode(String id) {
+    Node ret = new Node(id);
+    nodes.add(ret);
+    return ret;
+  }
+
+  public Node getNode(String id) {
+    for (Node node : nodes) {
+      if (node.id.equals(id)) {
+        return node;
+      }
+    }
+    return newNode(id);
+  }
+
+  public Graph newSubGraph(String name) {
+    Graph ret = new Graph(name, this);
+    subgraphs.add(ret);
+    return ret;
+  }
+
+  public void addSubGraph(Graph graph) {
+    subgraphs.add(graph);
+    graph.parent = this;
+  }
+
+  private static String wrapSafeString(String label) {
+    if (label.indexOf(',') >= 0) {
+      if (label.length()>14) {
+        label = label.replaceAll(",", ",\n");
+      }
+    }
+    label = "\"" + StringEscapeUtils.escapeJava(label) + "\"";
+    return label;
+  }
+
+  public String generateGraphViz(String indent) {
+    StringBuilder sb = new StringBuilder();
+    if (this.parent == null) {
+      sb.append("digraph " + name + " {\n");
+      sb.append(String.format("graph [ label=%s, fontsize=24, fontname=Helvetica];\n",
+          wrapSafeString(name)));
+      sb.append("node [fontsize=12, fontname=Helvetica];\n");
+      sb.append("edge [fontsize=9, fontcolor=blue, fontname=Arial];\n");
+    } else {
+      sb.append("subgraph cluster_" + name + " {\nlabel=\"" + name + "\"\n");
+    }
+    for (Graph g : subgraphs) {
+      String ginfo = g.generateGraphViz(indent+"  ");
+      sb.append(ginfo);
+      sb.append("\n");
+    }
+    for (Node n : nodes) {
+      sb.append(String.format(
+          "%s%s [ label = %s ];\n",
+          indent,
+          wrapSafeString(n.getUniqueId()),
+          n.id));
+      List<Edge> combinedOuts = combineEdges(n.outs);
+      for (Edge e : combinedOuts) {
+        sb.append(String.format(
+            "%s%s -> %s [ label = %s ];\n",
+            indent,
+            wrapSafeString(e.from.getUniqueId()),
+            wrapSafeString(e.to.getUniqueId()),
+            wrapSafeString(e.label)));
+      }
+    }
+    sb.append("}\n");
+    return sb.toString();
+  }
+
+  public String generateGraphViz() {
+    return generateGraphViz("");
+  }
+
+  public void save(String filepath) throws IOException {
+    FileWriter fout = new FileWriter(filepath);
+    fout.write(generateGraphViz());
+    fout.close();
+  }
+
+  public static List<Edge> combineEdges(List<Edge> edges) {
+    List<Edge> ret = new ArrayList<Edge>();
+    for (Edge edge : edges) {
+      boolean found = false;
+      for (int i = 0; i < ret.size(); i++) {
+        Edge current = ret.get(i);
+        if (edge.sameAs(current)) {
+          ret.set(i, current.combine(edge));
+          found = true;
+          break;
+        }
+      }
+      if (!found) {
+        ret.add(edge);
+      }
+    }
+    return ret;
+  }
+}

Modified: hadoop/common/trunk/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/state/StateMachineFactory.java
URL: http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/state/StateMachineFactory.java?rev=1493654&r1=1493653&r2=1493654&view=diff
==============================================================================
--- hadoop/common/trunk/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/state/StateMachineFactory.java
(original)
+++ hadoop/common/trunk/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/state/StateMachineFactory.java
Mon Jun 17 06:51:51 2013
@@ -28,7 +28,6 @@ import java.util.Stack;
 
 import org.apache.hadoop.classification.InterfaceAudience.Public;
 import org.apache.hadoop.classification.InterfaceStability.Evolving;
-import org.apache.hadoop.yarn.util.Graph;
 
 /**
  * State machine topology.

Added: hadoop/common/trunk/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/state/VisualizeStateMachine.java
URL: http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/state/VisualizeStateMachine.java?rev=1493654&view=auto
==============================================================================
--- hadoop/common/trunk/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/state/VisualizeStateMachine.java
(added)
+++ hadoop/common/trunk/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/state/VisualizeStateMachine.java
Mon Jun 17 06:51:51 2013
@@ -0,0 +1,74 @@
+/*
+ * 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.
+ */
+package org.apache.hadoop.yarn.state;
+
+import java.lang.reflect.Field;
+import java.util.ArrayList;
+import java.util.List;
+
+import org.apache.hadoop.classification.InterfaceAudience.Private;
+
+@Private
+public class VisualizeStateMachine {
+
+  /**
+   * @param classes list of classes which have static field
+   *                stateMachineFactory of type StateMachineFactory
+   * @return graph represent this StateMachine
+   */
+  public static Graph getGraphFromClasses(String graphName, List<String> classes)
+      throws Exception {
+    Graph ret = null;
+    if (classes.size() != 1) {
+      ret = new Graph(graphName);
+    }
+    for (String className : classes) {
+      Class clz = Class.forName(className);
+      Field factoryField = clz.getDeclaredField("stateMachineFactory");
+      factoryField.setAccessible(true);
+      StateMachineFactory factory = (StateMachineFactory) factoryField.get(null);
+      if (classes.size() == 1) {
+        return factory.generateStateGraph(graphName);
+      }
+      String gname = clz.getSimpleName();
+      if (gname.endsWith("Impl")) {
+        gname = gname.substring(0, gname.length()-4);
+      }
+      ret.addSubGraph(factory.generateStateGraph(gname));
+    }
+    return ret;
+  }
+
+  public static void main(String [] args) throws Exception {
+    if (args.length < 3) {
+      System.err.printf("Usage: %s <GraphName> <class[,class[,...]]> <OutputFile>\n",
+          VisualizeStateMachine.class.getName());
+      System.exit(1);
+    }
+    String [] classes = args[1].split(",");
+    ArrayList<String> validClasses = new ArrayList<String>();
+    for (String c : classes) {
+      String vc = c.trim();
+      if (vc.length()>0) {
+        validClasses.add(vc);
+      }
+    }
+    Graph g = getGraphFromClasses(args[0], validClasses);
+    g.save(args[2]);
+  }
+}

Modified: hadoop/common/trunk/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/pom.xml
URL: http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/pom.xml?rev=1493654&r1=1493653&r2=1493654&view=diff
==============================================================================
--- hadoop/common/trunk/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/pom.xml
(original)
+++ hadoop/common/trunk/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/pom.xml
Mon Jun 17 06:51:51 2013
@@ -111,7 +111,7 @@
                   <goal>java</goal>
                 </goals>
                 <configuration>
-                  <mainClass>org.apache.hadoop.yarn.util.VisualizeStateMachine</mainClass>
+                  <mainClass>org.apache.hadoop.yarn.state.VisualizeStateMachine</mainClass>
 		  <classpathScope>compile</classpathScope>
                   <arguments>
                     <argument>NodeManager</argument>

Modified: hadoop/common/trunk/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/pom.xml
URL: http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/pom.xml?rev=1493654&r1=1493653&r2=1493654&view=diff
==============================================================================
--- hadoop/common/trunk/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/pom.xml
(original)
+++ hadoop/common/trunk/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/pom.xml
Mon Jun 17 06:51:51 2013
@@ -99,7 +99,7 @@
                   <goal>java</goal>
                 </goals>
                 <configuration>
-                  <mainClass>org.apache.hadoop.yarn.util.VisualizeStateMachine</mainClass>
+                  <mainClass>org.apache.hadoop.yarn.state.VisualizeStateMachine</mainClass>
 		  <classpathScope>compile</classpathScope>
                   <arguments>
                     <argument>ResourceManager</argument>



Mime
View raw message