merge -r 1346064:1346065 from trunk. FIXES: MAPREDUCE-3350

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1346068 13f79535-47bb-0310-9956-ffa450edef68

hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/dao/AppAttemptInfo.java

@@ -0,0 +1,81 @@
+/**
+ * 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.server.resourcemanager.webapp.dao;
+
+import static org.apache.hadoop.yarn.util.StringHelper.join;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlRootElement;
+
+import org.apache.hadoop.yarn.api.records.Container;
+import org.apache.hadoop.yarn.server.resourcemanager.rmapp.attempt.RMAppAttempt;
+import org.apache.hadoop.yarn.util.ConverterUtils;
+
+@XmlRootElement(name = "appAttempt")
+@XmlAccessorType(XmlAccessType.FIELD)
+public class AppAttemptInfo {
+
+  protected int id;
+  protected long startTime;
+  protected String containerId;
+  protected String nodeHttpAddress;
+  protected String nodeId;
+  protected String logsLink;
+
+  public AppAttemptInfo() {
+  }
+
+  public AppAttemptInfo(RMAppAttempt attempt) {
+    this.startTime = 0;
+    this.containerId = "";
+    this.nodeHttpAddress = "";
+    this.nodeId = "";
+    this.logsLink = "";
+    if (attempt != null) {
+      this.id = attempt.getAppAttemptId().getAttemptId();
+      this.startTime = attempt.getStartTime();
+      Container masterContainer = attempt.getMasterContainer();
+      if (masterContainer != null) {
+        this.containerId = masterContainer.getId().toString();
+        this.nodeHttpAddress = masterContainer.getNodeHttpAddress();
+        this.nodeId = masterContainer.getNodeId().toString();
+        this.logsLink = join("http://", masterContainer.getNodeHttpAddress(),
+            "/node", "/containerlogs/",
+            ConverterUtils.toString(masterContainer.getId()),
+            "/", attempt.getSubmissionContext().getUser());
+      }
+    }
+  }
+
+  public int getAttemptId() {
+    return this.id;
+  }
+
+  public long getStartTime() {
+    return this.startTime;
+  }
+
+  public String getNodeHttpAddress() {
+    return this.nodeHttpAddress;
+  }
+
+  public String getLogsLink() {
+    return this.logsLink;
+  }
+}

hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/dao/AppAttemptsInfo.java

@@ -0,0 +1,46 @@
+/**
+ * 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 joblicable 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.server.resourcemanager.webapp.dao;
+
+import java.util.ArrayList;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlRootElement;
+
+@XmlRootElement(name = "appAttempts")
+@XmlAccessorType(XmlAccessType.FIELD)
+public class AppAttemptsInfo {
+
+  @XmlElement(name = "appAttempt")
+  protected ArrayList<AppAttemptInfo> attempt = new ArrayList<AppAttemptInfo>();
+
+  public AppAttemptsInfo() {
+  } // JAXB needs this
+
+  public void add(AppAttemptInfo info) {
+    this.attempt.add(info);
+  }
+
+  public ArrayList<AppAttemptInfo> getAttempts() {
+    return this.attempt;
+  }
+
+}
+