You are viewing a plain text version of this content. The canonical link for it is here.
Posted to yarn-commits@hadoop.apache.org by zj...@apache.org on 2014/01/17 04:26:55 UTC
svn commit: r1559004 [3/4] - in
/hadoop/common/branches/YARN-321/hadoop-yarn-project: ./
hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/
hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/
hadoop-...
Modified: hadoop/common/branches/YARN-321/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/records/ApplicationFinishData.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/YARN-321/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/records/ApplicationFinishData.java?rev=1559004&r1=1559003&r2=1559004&view=diff
==============================================================================
--- hadoop/common/branches/YARN-321/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/records/ApplicationFinishData.java (original)
+++ hadoop/common/branches/YARN-321/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/records/ApplicationFinishData.java Fri Jan 17 03:26:53 2014
@@ -26,8 +26,8 @@ import org.apache.hadoop.yarn.api.record
import org.apache.hadoop.yarn.util.Records;
/**
- * The class contains the fields that can be determined when
- * <code>RMApp</code> finishes, and that need to be stored persistently.
+ * The class contains the fields that can be determined when <code>RMApp</code>
+ * finishes, and that need to be stored persistently.
*/
@Public
@Unstable
Modified: hadoop/common/branches/YARN-321/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/records/ApplicationHistoryData.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/YARN-321/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/records/ApplicationHistoryData.java?rev=1559004&r1=1559003&r2=1559004&view=diff
==============================================================================
--- hadoop/common/branches/YARN-321/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/records/ApplicationHistoryData.java (original)
+++ hadoop/common/branches/YARN-321/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/records/ApplicationHistoryData.java Fri Jan 17 03:26:53 2014
@@ -205,8 +205,8 @@ public class ApplicationHistoryData {
@Public
@Unstable
- public void setYarnApplicationState(
- YarnApplicationState yarnApplicationState) {
+ public void
+ setYarnApplicationState(YarnApplicationState yarnApplicationState) {
this.yarnApplicationState = yarnApplicationState;
}
Modified: hadoop/common/branches/YARN-321/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/records/ApplicationStartData.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/YARN-321/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/records/ApplicationStartData.java?rev=1559004&r1=1559003&r2=1559004&view=diff
==============================================================================
--- hadoop/common/branches/YARN-321/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/records/ApplicationStartData.java (original)
+++ hadoop/common/branches/YARN-321/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/records/ApplicationStartData.java Fri Jan 17 03:26:53 2014
@@ -24,8 +24,8 @@ import org.apache.hadoop.yarn.api.record
import org.apache.hadoop.yarn.util.Records;
/**
- * The class contains the fields that can be determined when
- * <code>RMApp</code> starts, and that need to be stored persistently.
+ * The class contains the fields that can be determined when <code>RMApp</code>
+ * starts, and that need to be stored persistently.
*/
@Public
@Unstable
@@ -33,12 +33,10 @@ public abstract class ApplicationStartDa
@Public
@Unstable
- public static ApplicationStartData newInstance(
- ApplicationId applicationId, String applicationName,
- String applicationType, String queue, String user,
- long submitTime, long startTime) {
- ApplicationStartData appSD =
- Records.newRecord(ApplicationStartData.class);
+ public static ApplicationStartData newInstance(ApplicationId applicationId,
+ String applicationName, String applicationType, String queue,
+ String user, long submitTime, long startTime) {
+ ApplicationStartData appSD = Records.newRecord(ApplicationStartData.class);
appSD.setApplicationId(applicationId);
appSD.setApplicationName(applicationName);
appSD.setApplicationType(applicationType);
Modified: hadoop/common/branches/YARN-321/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/records/impl/pb/ApplicationAttemptFinishDataPBImpl.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/YARN-321/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/records/impl/pb/ApplicationAttemptFinishDataPBImpl.java?rev=1559004&r1=1559003&r2=1559004&view=diff
==============================================================================
--- hadoop/common/branches/YARN-321/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/records/impl/pb/ApplicationAttemptFinishDataPBImpl.java (original)
+++ hadoop/common/branches/YARN-321/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/records/impl/pb/ApplicationAttemptFinishDataPBImpl.java Fri Jan 17 03:26:53 2014
@@ -32,11 +32,11 @@ import org.apache.hadoop.yarn.server.app
import com.google.protobuf.TextFormat;
-public class ApplicationAttemptFinishDataPBImpl
- extends ApplicationAttemptFinishData {
+public class ApplicationAttemptFinishDataPBImpl extends
+ ApplicationAttemptFinishData {
- ApplicationAttemptFinishDataProto proto =
- ApplicationAttemptFinishDataProto.getDefaultInstance();
+ ApplicationAttemptFinishDataProto proto = ApplicationAttemptFinishDataProto
+ .getDefaultInstance();
ApplicationAttemptFinishDataProto.Builder builder = null;
boolean viaProto = false;
@@ -131,8 +131,8 @@ public class ApplicationAttemptFinishDat
builder.clearFinalApplicationStatus();
return;
}
- builder.setFinalApplicationStatus(
- convertToProtoFormat(finalApplicationStatus));
+ builder
+ .setFinalApplicationStatus(convertToProtoFormat(finalApplicationStatus));
}
@Override
@@ -182,11 +182,11 @@ public class ApplicationAttemptFinishDat
}
private void mergeLocalToBuilder() {
- if (this.applicationAttemptId != null && !((ApplicationAttemptIdPBImpl)
- this.applicationAttemptId).getProto().equals(
- builder.getApplicationAttemptId())) {
- builder.setApplicationAttemptId(
- convertToProtoFormat(this.applicationAttemptId));
+ if (this.applicationAttemptId != null
+ && !((ApplicationAttemptIdPBImpl) this.applicationAttemptId).getProto()
+ .equals(builder.getApplicationAttemptId())) {
+ builder
+ .setApplicationAttemptId(convertToProtoFormat(this.applicationAttemptId));
}
}
Modified: hadoop/common/branches/YARN-321/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/records/impl/pb/ApplicationAttemptStartDataPBImpl.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/YARN-321/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/records/impl/pb/ApplicationAttemptStartDataPBImpl.java?rev=1559004&r1=1559003&r2=1559004&view=diff
==============================================================================
--- hadoop/common/branches/YARN-321/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/records/impl/pb/ApplicationAttemptStartDataPBImpl.java (original)
+++ hadoop/common/branches/YARN-321/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/records/impl/pb/ApplicationAttemptStartDataPBImpl.java Fri Jan 17 03:26:53 2014
@@ -30,12 +30,11 @@ import org.apache.hadoop.yarn.server.app
import com.google.protobuf.TextFormat;
+public class ApplicationAttemptStartDataPBImpl extends
+ ApplicationAttemptStartData {
-public class ApplicationAttemptStartDataPBImpl
- extends ApplicationAttemptStartData {
-
- ApplicationAttemptStartDataProto proto =
- ApplicationAttemptStartDataProto.getDefaultInstance();
+ ApplicationAttemptStartDataProto proto = ApplicationAttemptStartDataProto
+ .getDefaultInstance();
ApplicationAttemptStartDataProto.Builder builder = null;
boolean viaProto = false;
@@ -116,8 +115,7 @@ public class ApplicationAttemptStartData
if (!p.hasApplicationAttemptId()) {
return null;
}
- this.masterContainerId =
- convertFromProtoFormat(p.getMasterContainerId());
+ this.masterContainerId = convertFromProtoFormat(p.getMasterContainerId());
return this.masterContainerId;
}
@@ -158,17 +156,17 @@ public class ApplicationAttemptStartData
}
private void mergeLocalToBuilder() {
- if (this.applicationAttemptId != null && !((ApplicationAttemptIdPBImpl)
- this.applicationAttemptId).getProto().equals(
- builder.getApplicationAttemptId())) {
- builder.setApplicationAttemptId(
- convertToProtoFormat(this.applicationAttemptId));
- }
- if (this.masterContainerId != null && !((ContainerIdPBImpl)
- this.masterContainerId).getProto().equals(
- builder.getMasterContainerId())) {
- builder.setMasterContainerId(
- convertToProtoFormat(this.masterContainerId));
+ if (this.applicationAttemptId != null
+ && !((ApplicationAttemptIdPBImpl) this.applicationAttemptId).getProto()
+ .equals(builder.getApplicationAttemptId())) {
+ builder
+ .setApplicationAttemptId(convertToProtoFormat(this.applicationAttemptId));
+ }
+ if (this.masterContainerId != null
+ && !((ContainerIdPBImpl) this.masterContainerId).getProto().equals(
+ builder.getMasterContainerId())) {
+ builder
+ .setMasterContainerId(convertToProtoFormat(this.masterContainerId));
}
}
@@ -198,13 +196,12 @@ public class ApplicationAttemptStartData
return ((ApplicationAttemptIdPBImpl) applicationAttemptId).getProto();
}
- private ContainerIdPBImpl convertFromProtoFormat(
- ContainerIdProto containerId) {
+ private ContainerIdPBImpl
+ convertFromProtoFormat(ContainerIdProto containerId) {
return new ContainerIdPBImpl(containerId);
}
- private ContainerIdProto convertToProtoFormat(
- ContainerId masterContainerId) {
+ private ContainerIdProto convertToProtoFormat(ContainerId masterContainerId) {
return ((ContainerIdPBImpl) masterContainerId).getProto();
}
Modified: hadoop/common/branches/YARN-321/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/records/impl/pb/ApplicationFinishDataPBImpl.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/YARN-321/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/records/impl/pb/ApplicationFinishDataPBImpl.java?rev=1559004&r1=1559003&r2=1559004&view=diff
==============================================================================
--- hadoop/common/branches/YARN-321/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/records/impl/pb/ApplicationFinishDataPBImpl.java (original)
+++ hadoop/common/branches/YARN-321/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/records/impl/pb/ApplicationFinishDataPBImpl.java Fri Jan 17 03:26:53 2014
@@ -32,12 +32,10 @@ import org.apache.hadoop.yarn.server.app
import com.google.protobuf.TextFormat;
+public class ApplicationFinishDataPBImpl extends ApplicationFinishData {
-public class ApplicationFinishDataPBImpl
- extends ApplicationFinishData {
-
- ApplicationFinishDataProto proto =
- ApplicationFinishDataProto.getDefaultInstance();
+ ApplicationFinishDataProto proto = ApplicationFinishDataProto
+ .getDefaultInstance();
ApplicationFinishDataProto.Builder builder = null;
boolean viaProto = false;
@@ -122,8 +120,8 @@ public class ApplicationFinishDataPBImpl
builder.clearFinalApplicationStatus();
return;
}
- builder.setFinalApplicationStatus(
- convertToProtoFormat(finalApplicationStatus));
+ builder
+ .setFinalApplicationStatus(convertToProtoFormat(finalApplicationStatus));
}
@Override
@@ -173,8 +171,9 @@ public class ApplicationFinishDataPBImpl
}
private void mergeLocalToBuilder() {
- if (this.applicationId != null && !((ApplicationIdPBImpl)
- this.applicationId).getProto().equals(builder.getApplicationId())) {
+ if (this.applicationId != null
+ && !((ApplicationIdPBImpl) this.applicationId).getProto().equals(
+ builder.getApplicationId())) {
builder.setApplicationId(convertToProtoFormat(this.applicationId));
}
}
@@ -195,8 +194,7 @@ public class ApplicationFinishDataPBImpl
viaProto = false;
}
- private ApplicationIdProto convertToProtoFormat(
- ApplicationId applicationId) {
+ private ApplicationIdProto convertToProtoFormat(ApplicationId applicationId) {
return ((ApplicationIdPBImpl) applicationId).getProto();
}
Modified: hadoop/common/branches/YARN-321/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/records/impl/pb/ApplicationStartDataPBImpl.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/YARN-321/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/records/impl/pb/ApplicationStartDataPBImpl.java?rev=1559004&r1=1559003&r2=1559004&view=diff
==============================================================================
--- hadoop/common/branches/YARN-321/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/records/impl/pb/ApplicationStartDataPBImpl.java (original)
+++ hadoop/common/branches/YARN-321/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/records/impl/pb/ApplicationStartDataPBImpl.java Fri Jan 17 03:26:53 2014
@@ -27,12 +27,10 @@ import org.apache.hadoop.yarn.server.app
import com.google.protobuf.TextFormat;
+public class ApplicationStartDataPBImpl extends ApplicationStartData {
-public class ApplicationStartDataPBImpl
- extends ApplicationStartData {
-
- ApplicationStartDataProto proto =
- ApplicationStartDataProto.getDefaultInstance();
+ ApplicationStartDataProto proto = ApplicationStartDataProto
+ .getDefaultInstance();
ApplicationStartDataProto.Builder builder = null;
boolean viaProto = false;
@@ -197,8 +195,9 @@ public class ApplicationStartDataPBImpl
}
private void mergeLocalToBuilder() {
- if (this.applicationId != null && !((ApplicationIdPBImpl)
- this.applicationId).getProto().equals(builder.getApplicationId())) {
+ if (this.applicationId != null
+ && !((ApplicationIdPBImpl) this.applicationId).getProto().equals(
+ builder.getApplicationId())) {
builder.setApplicationId(convertToProtoFormat(this.applicationId));
}
}
@@ -219,8 +218,7 @@ public class ApplicationStartDataPBImpl
viaProto = false;
}
- private ApplicationIdProto convertToProtoFormat(
- ApplicationId applicationId) {
+ private ApplicationIdProto convertToProtoFormat(ApplicationId applicationId) {
return ((ApplicationIdPBImpl) applicationId).getProto();
}
Modified: hadoop/common/branches/YARN-321/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/records/impl/pb/ContainerFinishDataPBImpl.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/YARN-321/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/records/impl/pb/ContainerFinishDataPBImpl.java?rev=1559004&r1=1559003&r2=1559004&view=diff
==============================================================================
--- hadoop/common/branches/YARN-321/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/records/impl/pb/ContainerFinishDataPBImpl.java (original)
+++ hadoop/common/branches/YARN-321/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/records/impl/pb/ContainerFinishDataPBImpl.java Fri Jan 17 03:26:53 2014
@@ -30,12 +30,10 @@ import org.apache.hadoop.yarn.server.app
import com.google.protobuf.TextFormat;
+public class ContainerFinishDataPBImpl extends ContainerFinishData {
-public class ContainerFinishDataPBImpl
- extends ContainerFinishData {
-
- ContainerFinishDataProto proto =
- ContainerFinishDataProto.getDefaultInstance();
+ ContainerFinishDataProto proto = ContainerFinishDataProto
+ .getDefaultInstance();
ContainerFinishDataProto.Builder builder = null;
boolean viaProto = false;
@@ -181,8 +179,9 @@ public class ContainerFinishDataPBImpl
}
private void mergeLocalToBuilder() {
- if (this.containerId != null && !((ContainerIdPBImpl)
- this.containerId).getProto().equals(builder.getContainerId())) {
+ if (this.containerId != null
+ && !((ContainerIdPBImpl) this.containerId).getProto().equals(
+ builder.getContainerId())) {
builder.setContainerId(convertToProtoFormat(this.containerId));
}
}
@@ -203,18 +202,16 @@ public class ContainerFinishDataPBImpl
viaProto = false;
}
- private ContainerIdProto convertToProtoFormat(
- ContainerId containerId) {
+ private ContainerIdProto convertToProtoFormat(ContainerId containerId) {
return ((ContainerIdPBImpl) containerId).getProto();
}
- private ContainerIdPBImpl convertFromProtoFormat(
- ContainerIdProto containerId) {
+ private ContainerIdPBImpl
+ convertFromProtoFormat(ContainerIdProto containerId) {
return new ContainerIdPBImpl(containerId);
}
- private ContainerStateProto convertToProtoFormat(
- ContainerState state) {
+ private ContainerStateProto convertToProtoFormat(ContainerState state) {
return ProtoUtils.convertToProtoFormat(state);
}
Modified: hadoop/common/branches/YARN-321/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/records/impl/pb/ContainerStartDataPBImpl.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/YARN-321/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/records/impl/pb/ContainerStartDataPBImpl.java?rev=1559004&r1=1559003&r2=1559004&view=diff
==============================================================================
--- hadoop/common/branches/YARN-321/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/records/impl/pb/ContainerStartDataPBImpl.java (original)
+++ hadoop/common/branches/YARN-321/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/records/impl/pb/ContainerStartDataPBImpl.java Fri Jan 17 03:26:53 2014
@@ -36,12 +36,9 @@ import org.apache.hadoop.yarn.server.app
import com.google.protobuf.TextFormat;
+public class ContainerStartDataPBImpl extends ContainerStartData {
-public class ContainerStartDataPBImpl
- extends ContainerStartData {
-
- ContainerStartDataProto proto =
- ContainerStartDataProto.getDefaultInstance();
+ ContainerStartDataProto proto = ContainerStartDataProto.getDefaultInstance();
ContainerStartDataProto.Builder builder = null;
boolean viaProto = false;
@@ -187,20 +184,24 @@ public class ContainerStartDataPBImpl
}
private void mergeLocalToBuilder() {
- if (this.containerId != null && !((ContainerIdPBImpl)
- this.containerId).getProto().equals(builder.getContainerId())) {
+ if (this.containerId != null
+ && !((ContainerIdPBImpl) this.containerId).getProto().equals(
+ builder.getContainerId())) {
builder.setContainerId(convertToProtoFormat(this.containerId));
}
- if (this.resource != null && !((ResourcePBImpl)
- this.resource).getProto().equals(builder.getAllocatedResource())) {
+ if (this.resource != null
+ && !((ResourcePBImpl) this.resource).getProto().equals(
+ builder.getAllocatedResource())) {
builder.setAllocatedResource(convertToProtoFormat(this.resource));
}
- if (this.nodeId != null && !((NodeIdPBImpl)
- this.nodeId).getProto().equals(builder.getAssignedNodeId())) {
+ if (this.nodeId != null
+ && !((NodeIdPBImpl) this.nodeId).getProto().equals(
+ builder.getAssignedNodeId())) {
builder.setAssignedNodeId(convertToProtoFormat(this.nodeId));
}
- if (this.priority != null && !((PriorityPBImpl)
- this.priority).getProto().equals(builder.getPriority())) {
+ if (this.priority != null
+ && !((PriorityPBImpl) this.priority).getProto().equals(
+ builder.getPriority())) {
builder.setPriority(convertToProtoFormat(this.priority));
}
}
@@ -221,13 +222,12 @@ public class ContainerStartDataPBImpl
viaProto = false;
}
- private ContainerIdProto convertToProtoFormat(
- ContainerId containerId) {
+ private ContainerIdProto convertToProtoFormat(ContainerId containerId) {
return ((ContainerIdPBImpl) containerId).getProto();
}
- private ContainerIdPBImpl convertFromProtoFormat(
- ContainerIdProto containerId) {
+ private ContainerIdPBImpl
+ convertFromProtoFormat(ContainerIdProto containerId) {
return new ContainerIdPBImpl(containerId);
}
Modified: hadoop/common/branches/YARN-321/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/webapp/AHSController.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/YARN-321/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/webapp/AHSController.java?rev=1559004&r1=1559003&r2=1559004&view=diff
==============================================================================
--- hadoop/common/branches/YARN-321/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/webapp/AHSController.java (original)
+++ hadoop/common/branches/YARN-321/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/webapp/AHSController.java Fri Jan 17 03:26:53 2014
@@ -22,7 +22,6 @@ import org.apache.hadoop.yarn.webapp.Con
import com.google.inject.Inject;
-
public class AHSController extends Controller {
@Inject
Modified: hadoop/common/branches/YARN-321/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/webapp/AHSView.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/YARN-321/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/webapp/AHSView.java?rev=1559004&r1=1559003&r2=1559004&view=diff
==============================================================================
--- hadoop/common/branches/YARN-321/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/webapp/AHSView.java (original)
+++ hadoop/common/branches/YARN-321/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/webapp/AHSView.java Fri Jan 17 03:26:53 2014
@@ -1,20 +1,20 @@
/**
-* 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.
-*/
+ * 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.applicationhistoryservice.webapp;
@@ -34,8 +34,8 @@ import org.apache.hadoop.yarn.webapp.vie
// Do NOT rename/refactor this to AHSView as it will wreak havoc
// on Mac OS HFS
public class AHSView extends TwoColumnLayout {
- static final int MAX_DISPLAY_ROWS = 100; // direct table rendering
- static final int MAX_FAST_ROWS = 1000; // inline js array
+ static final int MAX_DISPLAY_ROWS = 100; // direct table rendering
+ static final int MAX_FAST_ROWS = 1000; // inline js array
@Override
protected void preHead(Page.HTML<_> html) {
@@ -67,13 +67,10 @@ public class AHSView extends TwoColumnLa
private String appsTableInit() {
// id, user, name, queue, starttime, finishtime, state, status, progress, ui
- return tableInit()
- .append(", 'aaData': appsTableData")
- .append(", bDeferRender: true")
- .append(", bProcessing: true")
+ return tableInit().append(", 'aaData': appsTableData")
+ .append(", bDeferRender: true").append(", bProcessing: true")
- .append("\n, aoColumnDefs: ")
- .append(getAppsTableColumnDefs())
+ .append("\n, aoColumnDefs: ").append(getAppsTableColumnDefs())
// Sort by id upon page load
.append(", aaSorting: [[0, 'desc']]}").toString();
@@ -81,9 +78,7 @@ public class AHSView extends TwoColumnLa
protected String getAppsTableColumnDefs() {
StringBuilder sb = new StringBuilder();
- return sb
- .append("[\n")
- .append("{'sType':'numeric', 'aTargets': [0]")
+ return sb.append("[\n").append("{'sType':'numeric', 'aTargets': [0]")
.append(", 'mRender': parseHadoopID }")
.append("\n, {'sType':'numeric', 'aTargets': [5, 6]")
Modified: hadoop/common/branches/YARN-321/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/webapp/AHSWebApp.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/YARN-321/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/webapp/AHSWebApp.java?rev=1559004&r1=1559003&r2=1559004&view=diff
==============================================================================
--- hadoop/common/branches/YARN-321/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/webapp/AHSWebApp.java (original)
+++ hadoop/common/branches/YARN-321/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/webapp/AHSWebApp.java Fri Jan 17 03:26:53 2014
@@ -43,9 +43,10 @@ public class AHSWebApp extends WebApp im
route(pajoin("/apps", APP_STATE), AHSController.class);
route(pajoin("/app", APPLICATION_ID), AHSController.class, "app");
route(pajoin("/appattempt", APPLICATION_ATTEMPT_ID), AHSController.class,
- "appattempt");
+ "appattempt");
route(pajoin("/container", CONTAINER_ID), AHSController.class, "container");
- route(pajoin("/logs", NM_NODENAME, CONTAINER_ID, ENTITY_STRING, APP_OWNER,
+ route(
+ pajoin("/logs", NM_NODENAME, CONTAINER_ID, ENTITY_STRING, APP_OWNER,
CONTAINER_LOG_TYPE), AHSController.class, "logs");
}
}
\ No newline at end of file
Modified: hadoop/common/branches/YARN-321/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/webapp/AHSWebServices.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/YARN-321/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/webapp/AHSWebServices.java?rev=1559004&r1=1559003&r2=1559004&view=diff
==============================================================================
--- hadoop/common/branches/YARN-321/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/webapp/AHSWebServices.java (original)
+++ hadoop/common/branches/YARN-321/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/webapp/AHSWebServices.java Fri Jan 17 03:26:53 2014
@@ -56,21 +56,18 @@ public class AHSWebServices extends WebS
@GET
@Produces({ MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML })
- public AppsInfo get(
- @Context HttpServletRequest req,
+ public AppsInfo get(@Context HttpServletRequest req,
@Context HttpServletResponse res) {
return getApps(req, res, null, Collections.<String> emptySet(), null, null,
- null, null, null, null, null, null, Collections.<String> emptySet());
+ null, null, null, null, null, null, Collections.<String> emptySet());
}
@GET
@Path("/apps")
@Produces({ MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML })
@Override
- public AppsInfo getApps(
- @Context HttpServletRequest req,
- @Context HttpServletResponse res,
- @QueryParam("state") String stateQuery,
+ public AppsInfo getApps(@Context HttpServletRequest req,
+ @Context HttpServletResponse res, @QueryParam("state") String stateQuery,
@QueryParam("states") Set<String> statesQuery,
@QueryParam("finalStatus") String finalStatusQuery,
@QueryParam("user") String userQuery,
@@ -84,18 +81,16 @@ public class AHSWebServices extends WebS
init(res);
validateStates(stateQuery, statesQuery);
return super.getApps(req, res, stateQuery, statesQuery, finalStatusQuery,
- userQuery, queueQuery, count, startedBegin, startedEnd, finishBegin,
- finishEnd, applicationTypes);
+ userQuery, queueQuery, count, startedBegin, startedEnd, finishBegin,
+ finishEnd, applicationTypes);
}
@GET
@Path("/apps/{appid}")
@Produces({ MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML })
@Override
- public AppInfo getApp(
- @Context HttpServletRequest req,
- @Context HttpServletResponse res,
- @PathParam("appid") String appId) {
+ public AppInfo getApp(@Context HttpServletRequest req,
+ @Context HttpServletResponse res, @PathParam("appid") String appId) {
init(res);
return super.getApp(req, res, appId);
}
@@ -104,10 +99,8 @@ public class AHSWebServices extends WebS
@Path("/apps/{appid}/appattempts")
@Produces({ MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML })
@Override
- public AppAttemptsInfo getAppAttempts(
- @Context HttpServletRequest req,
- @Context HttpServletResponse res,
- @PathParam("appid") String appId) {
+ public AppAttemptsInfo getAppAttempts(@Context HttpServletRequest req,
+ @Context HttpServletResponse res, @PathParam("appid") String appId) {
init(res);
return super.getAppAttempts(req, res, appId);
}
@@ -116,10 +109,8 @@ public class AHSWebServices extends WebS
@Path("/apps/{appid}/appattempts/{appattemptid}")
@Produces({ MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML })
@Override
- public AppAttemptInfo getAppAttempt(
- @Context HttpServletRequest req,
- @Context HttpServletResponse res,
- @PathParam("appid") String appId,
+ public AppAttemptInfo getAppAttempt(@Context HttpServletRequest req,
+ @Context HttpServletResponse res, @PathParam("appid") String appId,
@PathParam("appattemptid") String appAttemptId) {
init(res);
return super.getAppAttempt(req, res, appId, appAttemptId);
@@ -129,10 +120,8 @@ public class AHSWebServices extends WebS
@Path("/apps/{appid}/appattempts/{appattemptid}/containers")
@Produces({ MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML })
@Override
- public ContainersInfo getContainers(
- @Context HttpServletRequest req,
- @Context HttpServletResponse res,
- @PathParam("appid") String appId,
+ public ContainersInfo getContainers(@Context HttpServletRequest req,
+ @Context HttpServletResponse res, @PathParam("appid") String appId,
@PathParam("appattemptid") String appAttemptId) {
init(res);
return super.getContainers(req, res, appId, appAttemptId);
@@ -142,18 +131,16 @@ public class AHSWebServices extends WebS
@Path("/apps/{appid}/appattempts/{appattemptid}/containers/{containerid}")
@Produces({ MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML })
@Override
- public ContainerInfo getContainer(
- @Context HttpServletRequest req,
- @Context HttpServletResponse res,
- @PathParam("appid") String appId,
+ public ContainerInfo getContainer(@Context HttpServletRequest req,
+ @Context HttpServletResponse res, @PathParam("appid") String appId,
@PathParam("appattemptid") String appAttemptId,
@PathParam("containerid") String containerId) {
init(res);
return super.getContainer(req, res, appId, appAttemptId, containerId);
}
- private static void validateStates(
- String stateQuery, Set<String> statesQuery) {
+ private static void
+ validateStates(String stateQuery, Set<String> statesQuery) {
// stateQuery is deprecated.
if (stateQuery != null && !stateQuery.isEmpty()) {
statesQuery.add(stateQuery);
@@ -166,9 +153,8 @@ public class AHSWebServices extends WebS
case KILLED:
continue;
default:
- throw new BadRequestException(
- "Invalid application-state " + appState
- + " specified. It should be a final state");
+ throw new BadRequestException("Invalid application-state " + appState
+ + " specified. It should be a final state");
}
}
}
Modified: hadoop/common/branches/YARN-321/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/webapp/AppAttemptPage.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/YARN-321/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/webapp/AppAttemptPage.java?rev=1559004&r1=1559003&r2=1559004&view=diff
==============================================================================
--- hadoop/common/branches/YARN-321/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/webapp/AppAttemptPage.java (original)
+++ hadoop/common/branches/YARN-321/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/webapp/AppAttemptPage.java Fri Jan 17 03:26:53 2014
@@ -34,9 +34,11 @@ public class AppAttemptPage extends AHSV
commonPreHead(html);
String appAttemptId = $(YarnWebParams.APPLICATION_ATTEMPT_ID);
- set(TITLE, appAttemptId.isEmpty() ?
- "Bad request: missing application attempt ID" : join(
- "Application Attempt ", $(YarnWebParams.APPLICATION_ATTEMPT_ID)));
+ set(
+ TITLE,
+ appAttemptId.isEmpty() ? "Bad request: missing application attempt ID"
+ : join("Application Attempt ",
+ $(YarnWebParams.APPLICATION_ATTEMPT_ID)));
set(DATATABLES_ID, "containers");
set(initID(DATATABLES, "containers"), containersTableInit());
@@ -49,13 +51,10 @@ public class AppAttemptPage extends AHSV
}
private String containersTableInit() {
- return tableInit()
- .append(", 'aaData': containersTableData")
- .append(", bDeferRender: true")
- .append(", bProcessing: true")
+ return tableInit().append(", 'aaData': containersTableData")
+ .append(", bDeferRender: true").append(", bProcessing: true")
- .append("\n, aoColumnDefs: ")
- .append(getContainersTableColumnDefs())
+ .append("\n, aoColumnDefs: ").append(getContainersTableColumnDefs())
// Sort by id upon page load
.append(", aaSorting: [[0, 'desc']]}").toString();
@@ -63,9 +62,7 @@ public class AppAttemptPage extends AHSV
protected String getContainersTableColumnDefs() {
StringBuilder sb = new StringBuilder();
- return sb
- .append("[\n")
- .append("{'sType':'numeric', 'aTargets': [0]")
+ return sb.append("[\n").append("{'sType':'numeric', 'aTargets': [0]")
.append(", 'mRender': parseHadoopID }]").toString();
}
Modified: hadoop/common/branches/YARN-321/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/webapp/AppPage.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/YARN-321/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/webapp/AppPage.java?rev=1559004&r1=1559003&r2=1559004&view=diff
==============================================================================
--- hadoop/common/branches/YARN-321/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/webapp/AppPage.java (original)
+++ hadoop/common/branches/YARN-321/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/webapp/AppPage.java Fri Jan 17 03:26:53 2014
@@ -1,20 +1,20 @@
/**
-* 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.
-*/
+ * 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.applicationhistoryservice.webapp;
@@ -30,31 +30,31 @@ import org.apache.hadoop.yarn.webapp.Yar
public class AppPage extends AHSView {
- @Override protected void preHead(Page.HTML<_> html) {
+ @Override
+ protected void preHead(Page.HTML<_> html) {
commonPreHead(html);
String appId = $(YarnWebParams.APPLICATION_ID);
- set(TITLE, appId.isEmpty() ?
- "Bad request: missing application ID" : join(
+ set(
+ TITLE,
+ appId.isEmpty() ? "Bad request: missing application ID" : join(
"Application ", $(YarnWebParams.APPLICATION_ID)));
-
+
set(DATATABLES_ID, "attempts");
set(initID(DATATABLES, "attempts"), attemptsTableInit());
setTableStyles(html, "attempts", ".queue {width:6em}", ".ui {width:8em}");
}
- @Override protected Class<? extends SubView> content() {
+ @Override
+ protected Class<? extends SubView> content() {
return AppBlock.class;
}
private String attemptsTableInit() {
- return tableInit()
- .append(", 'aaData': attemptsTableData")
- .append(", bDeferRender: true")
- .append(", bProcessing: true")
+ return tableInit().append(", 'aaData': attemptsTableData")
+ .append(", bDeferRender: true").append(", bProcessing: true")
- .append("\n, aoColumnDefs: ")
- .append(getAttemptsTableColumnDefs())
+ .append("\n, aoColumnDefs: ").append(getAttemptsTableColumnDefs())
// Sort by id upon page load
.append(", aaSorting: [[0, 'desc']]}").toString();
@@ -62,9 +62,7 @@ public class AppPage extends AHSView {
protected String getAttemptsTableColumnDefs() {
StringBuilder sb = new StringBuilder();
- return sb
- .append("[\n")
- .append("{'sType':'numeric', 'aTargets': [0]")
+ return sb.append("[\n").append("{'sType':'numeric', 'aTargets': [0]")
.append(", 'mRender': parseHadoopID }")
.append("\n, {'sType':'numeric', 'aTargets': [1]")
Modified: hadoop/common/branches/YARN-321/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/webapp/ContainerPage.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/YARN-321/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/webapp/ContainerPage.java?rev=1559004&r1=1559003&r2=1559004&view=diff
==============================================================================
--- hadoop/common/branches/YARN-321/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/webapp/ContainerPage.java (original)
+++ hadoop/common/branches/YARN-321/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/webapp/ContainerPage.java Fri Jan 17 03:26:53 2014
@@ -30,12 +30,12 @@ public class ContainerPage extends AHSVi
commonPreHead(html);
String containerId = $(YarnWebParams.CONTAINER_ID);
- set(TITLE, containerId.isEmpty() ?
- "Bad request: missing container ID" : join(
- "Container ", $(YarnWebParams.CONTAINER_ID)));
+ set(TITLE, containerId.isEmpty() ? "Bad request: missing container ID"
+ : join("Container ", $(YarnWebParams.CONTAINER_ID)));
}
@Override
protected Class<? extends SubView> content() {
return ContainerBlock.class;
- }}
\ No newline at end of file
+ }
+}
\ No newline at end of file
Modified: hadoop/common/branches/YARN-321/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/webapp/JAXBContextResolver.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/YARN-321/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/webapp/JAXBContextResolver.java?rev=1559004&r1=1559003&r2=1559004&view=diff
==============================================================================
--- hadoop/common/branches/YARN-321/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/webapp/JAXBContextResolver.java (original)
+++ hadoop/common/branches/YARN-321/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/webapp/JAXBContextResolver.java Fri Jan 17 03:26:53 2014
@@ -52,8 +52,9 @@ public class JAXBContextResolver impleme
public JAXBContextResolver() throws Exception {
this.types = new HashSet<Class>(Arrays.asList(cTypes));
- this.context = new JSONJAXBContext(JSONConfiguration.natural()
- .rootUnwrapping(false).build(), cTypes);
+ this.context =
+ new JSONJAXBContext(JSONConfiguration.natural().rootUnwrapping(false)
+ .build(), cTypes);
}
@Override
Modified: hadoop/common/branches/YARN-321/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/test/java/org/apache/hadoop/yarn/server/applicationhistoryservice/ApplicationHistoryStoreTestUtils.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/YARN-321/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/test/java/org/apache/hadoop/yarn/server/applicationhistoryservice/ApplicationHistoryStoreTestUtils.java?rev=1559004&r1=1559003&r2=1559004&view=diff
==============================================================================
--- hadoop/common/branches/YARN-321/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/test/java/org/apache/hadoop/yarn/server/applicationhistoryservice/ApplicationHistoryStoreTestUtils.java (original)
+++ hadoop/common/branches/YARN-321/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/test/java/org/apache/hadoop/yarn/server/applicationhistoryservice/ApplicationHistoryStoreTestUtils.java Fri Jan 17 03:26:53 2014
@@ -43,50 +43,43 @@ public class ApplicationHistoryStoreTest
protected void writeApplicationStartData(ApplicationId appId)
throws IOException {
- store.applicationStarted(
- ApplicationStartData.newInstance(appId, appId.toString(), "test type",
- "test queue",
- "test user", 0, 0));
+ store.applicationStarted(ApplicationStartData.newInstance(appId,
+ appId.toString(), "test type", "test queue", "test user", 0, 0));
}
protected void writeApplicationFinishData(ApplicationId appId)
throws IOException {
- store.applicationFinished(
- ApplicationFinishData.newInstance(
- appId, 0, appId.toString(), FinalApplicationStatus.UNDEFINED,
- YarnApplicationState.FINISHED));
+ store.applicationFinished(ApplicationFinishData.newInstance(appId, 0,
+ appId.toString(), FinalApplicationStatus.UNDEFINED,
+ YarnApplicationState.FINISHED));
}
protected void writeApplicationAttemptStartData(
ApplicationAttemptId appAttemptId) throws IOException {
- store.applicationAttemptStarted(
- ApplicationAttemptStartData.newInstance(
- appAttemptId, appAttemptId.toString(), 0,
- ContainerId.newInstance(appAttemptId, 1)));
+ store.applicationAttemptStarted(ApplicationAttemptStartData.newInstance(
+ appAttemptId, appAttemptId.toString(), 0,
+ ContainerId.newInstance(appAttemptId, 1)));
}
protected void writeApplicationAttemptFinishData(
ApplicationAttemptId appAttemptId) throws IOException {
- store.applicationAttemptFinished(
- ApplicationAttemptFinishData.newInstance(appAttemptId,
- appAttemptId.toString(), "test tracking url",
- FinalApplicationStatus.UNDEFINED,
- YarnApplicationAttemptState.FINISHED));
+ store.applicationAttemptFinished(ApplicationAttemptFinishData.newInstance(
+ appAttemptId, appAttemptId.toString(), "test tracking url",
+ FinalApplicationStatus.UNDEFINED, YarnApplicationAttemptState.FINISHED));
}
protected void writeContainerStartData(ContainerId containerId)
throws IOException {
- store.containerStarted(
- ContainerStartData.newInstance(containerId, Resource.newInstance(0, 0),
- NodeId.newInstance("localhost", 0),
- Priority.newInstance(containerId.getId()), 0));
+ store.containerStarted(ContainerStartData.newInstance(containerId,
+ Resource.newInstance(0, 0), NodeId.newInstance("localhost", 0),
+ Priority.newInstance(containerId.getId()), 0));
}
protected void writeContainerFinishData(ContainerId containerId)
throws IOException {
- store.containerFinished(
- ContainerFinishData.newInstance(containerId, 0, containerId.toString(),
- "http://localhost:0/log", 0, ContainerState.COMPLETE));
+ store.containerFinished(ContainerFinishData.newInstance(containerId, 0,
+ containerId.toString(), "http://localhost:0/log", 0,
+ ContainerState.COMPLETE));
}
}
Modified: hadoop/common/branches/YARN-321/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/test/java/org/apache/hadoop/yarn/server/applicationhistoryservice/TestApplicationHistoryClientService.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/YARN-321/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/test/java/org/apache/hadoop/yarn/server/applicationhistoryservice/TestApplicationHistoryClientService.java?rev=1559004&r1=1559003&r2=1559004&view=diff
==============================================================================
--- hadoop/common/branches/YARN-321/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/test/java/org/apache/hadoop/yarn/server/applicationhistoryservice/TestApplicationHistoryClientService.java (original)
+++ hadoop/common/branches/YARN-321/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/test/java/org/apache/hadoop/yarn/server/applicationhistoryservice/TestApplicationHistoryClientService.java Fri Jan 17 03:26:53 2014
@@ -58,11 +58,12 @@ public class TestApplicationHistoryClien
historyServer = new ApplicationHistoryServer();
Configuration config = new YarnConfiguration();
config.setClass(YarnConfiguration.AHS_STORE,
- MemoryApplicationHistoryStore.class, ApplicationHistoryStore.class);
+ MemoryApplicationHistoryStore.class, ApplicationHistoryStore.class);
historyServer.init(config);
historyServer.start();
- store = ((ApplicationHistoryManagerImpl) historyServer
- .getApplicationHistory()).getHistoryStore();
+ store =
+ ((ApplicationHistoryManagerImpl) historyServer.getApplicationHistory())
+ .getHistoryStore();
}
@After
@@ -76,14 +77,15 @@ public class TestApplicationHistoryClien
appId = ApplicationId.newInstance(0, 1);
writeApplicationStartData(appId);
writeApplicationFinishData(appId);
- GetApplicationReportRequest request = GetApplicationReportRequest
- .newInstance(appId);
- GetApplicationReportResponse response = historyServer.getClientService()
- .getClientHandler().getApplicationReport(request);
+ GetApplicationReportRequest request =
+ GetApplicationReportRequest.newInstance(appId);
+ GetApplicationReportResponse response =
+ historyServer.getClientService().getClientHandler()
+ .getApplicationReport(request);
ApplicationReport appReport = response.getApplicationReport();
Assert.assertNotNull(appReport);
Assert.assertEquals("application_0_0001", appReport.getApplicationId()
- .toString());
+ .toString());
Assert.assertEquals("test type", appReport.getApplicationType().toString());
Assert.assertEquals("test queue", appReport.getQueue().toString());
}
@@ -98,8 +100,9 @@ public class TestApplicationHistoryClien
writeApplicationStartData(appId1);
writeApplicationFinishData(appId1);
GetApplicationsRequest request = GetApplicationsRequest.newInstance();
- GetApplicationsResponse response = historyServer.getClientService()
- .getClientHandler().getApplications(request);
+ GetApplicationsResponse response =
+ historyServer.getClientService().getClientHandler()
+ .getApplications(request);
List<ApplicationReport> appReport = response.getApplicationList();
Assert.assertNotNull(appReport);
Assert.assertEquals(appId, appReport.get(0).getApplicationId());
@@ -109,58 +112,60 @@ public class TestApplicationHistoryClien
@Test
public void testApplicationAttemptReport() throws IOException, YarnException {
ApplicationId appId = ApplicationId.newInstance(0, 1);
- ApplicationAttemptId appAttemptId = ApplicationAttemptId.newInstance(appId,
- 1);
+ ApplicationAttemptId appAttemptId =
+ ApplicationAttemptId.newInstance(appId, 1);
writeApplicationAttemptStartData(appAttemptId);
writeApplicationAttemptFinishData(appAttemptId);
- GetApplicationAttemptReportRequest request = GetApplicationAttemptReportRequest
- .newInstance(appAttemptId);
- GetApplicationAttemptReportResponse response = historyServer
- .getClientService().getClientHandler().getApplicationAttemptReport(
- request);
- ApplicationAttemptReport attemptReport = response
- .getApplicationAttemptReport();
+ GetApplicationAttemptReportRequest request =
+ GetApplicationAttemptReportRequest.newInstance(appAttemptId);
+ GetApplicationAttemptReportResponse response =
+ historyServer.getClientService().getClientHandler()
+ .getApplicationAttemptReport(request);
+ ApplicationAttemptReport attemptReport =
+ response.getApplicationAttemptReport();
Assert.assertNotNull(attemptReport);
Assert.assertEquals("appattempt_0_0001_000001", attemptReport
- .getApplicationAttemptId().toString());
+ .getApplicationAttemptId().toString());
}
@Test
public void testApplicationAttempts() throws IOException, YarnException {
ApplicationId appId = ApplicationId.newInstance(0, 1);
- ApplicationAttemptId appAttemptId = ApplicationAttemptId.newInstance(appId,
- 1);
- ApplicationAttemptId appAttemptId1 = ApplicationAttemptId.newInstance(
- appId, 2);
+ ApplicationAttemptId appAttemptId =
+ ApplicationAttemptId.newInstance(appId, 1);
+ ApplicationAttemptId appAttemptId1 =
+ ApplicationAttemptId.newInstance(appId, 2);
writeApplicationAttemptStartData(appAttemptId);
writeApplicationAttemptFinishData(appAttemptId);
writeApplicationAttemptStartData(appAttemptId1);
writeApplicationAttemptFinishData(appAttemptId1);
- GetApplicationAttemptsRequest request = GetApplicationAttemptsRequest
- .newInstance(appId);
- GetApplicationAttemptsResponse response = historyServer.getClientService()
- .getClientHandler().getApplicationAttempts(request);
- List<ApplicationAttemptReport> attemptReports = response
- .getApplicationAttemptList();
+ GetApplicationAttemptsRequest request =
+ GetApplicationAttemptsRequest.newInstance(appId);
+ GetApplicationAttemptsResponse response =
+ historyServer.getClientService().getClientHandler()
+ .getApplicationAttempts(request);
+ List<ApplicationAttemptReport> attemptReports =
+ response.getApplicationAttemptList();
Assert.assertNotNull(attemptReports);
Assert.assertEquals(appAttemptId, attemptReports.get(0)
- .getApplicationAttemptId());
+ .getApplicationAttemptId());
Assert.assertEquals(appAttemptId1, attemptReports.get(1)
- .getApplicationAttemptId());
+ .getApplicationAttemptId());
}
@Test
public void testContainerReport() throws IOException, YarnException {
ApplicationId appId = ApplicationId.newInstance(0, 1);
- ApplicationAttemptId appAttemptId = ApplicationAttemptId.newInstance(appId,
- 1);
+ ApplicationAttemptId appAttemptId =
+ ApplicationAttemptId.newInstance(appId, 1);
ContainerId containerId = ContainerId.newInstance(appAttemptId, 1);
writeContainerStartData(containerId);
writeContainerFinishData(containerId);
- GetContainerReportRequest request = GetContainerReportRequest
- .newInstance(containerId);
- GetContainerReportResponse response = historyServer.getClientService()
- .getClientHandler().getContainerReport(request);
+ GetContainerReportRequest request =
+ GetContainerReportRequest.newInstance(containerId);
+ GetContainerReportResponse response =
+ historyServer.getClientService().getClientHandler()
+ .getContainerReport(request);
ContainerReport container = response.getContainerReport();
Assert.assertNotNull(container);
Assert.assertEquals(containerId, container.getContainerId());
@@ -169,18 +174,19 @@ public class TestApplicationHistoryClien
@Test
public void testContainers() throws IOException, YarnException {
ApplicationId appId = ApplicationId.newInstance(0, 1);
- ApplicationAttemptId appAttemptId = ApplicationAttemptId.newInstance(appId,
- 1);
+ ApplicationAttemptId appAttemptId =
+ ApplicationAttemptId.newInstance(appId, 1);
ContainerId containerId = ContainerId.newInstance(appAttemptId, 1);
ContainerId containerId1 = ContainerId.newInstance(appAttemptId, 2);
writeContainerStartData(containerId);
writeContainerFinishData(containerId);
writeContainerStartData(containerId1);
writeContainerFinishData(containerId1);
- GetContainersRequest request = GetContainersRequest
- .newInstance(appAttemptId);
- GetContainersResponse response = historyServer.getClientService()
- .getClientHandler().getContainers(request);
+ GetContainersRequest request =
+ GetContainersRequest.newInstance(appAttemptId);
+ GetContainersResponse response =
+ historyServer.getClientService().getClientHandler()
+ .getContainers(request);
List<ContainerReport> containers = response.getContainerList();
Assert.assertNotNull(containers);
Assert.assertEquals(containerId, containers.get(1).getContainerId());
Modified: hadoop/common/branches/YARN-321/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/test/java/org/apache/hadoop/yarn/server/applicationhistoryservice/TestApplicationHistoryManagerImpl.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/YARN-321/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/test/java/org/apache/hadoop/yarn/server/applicationhistoryservice/TestApplicationHistoryManagerImpl.java?rev=1559004&r1=1559003&r2=1559004&view=diff
==============================================================================
--- hadoop/common/branches/YARN-321/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/test/java/org/apache/hadoop/yarn/server/applicationhistoryservice/TestApplicationHistoryManagerImpl.java (original)
+++ hadoop/common/branches/YARN-321/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/test/java/org/apache/hadoop/yarn/server/applicationhistoryservice/TestApplicationHistoryManagerImpl.java Fri Jan 17 03:26:53 2014
@@ -39,7 +39,7 @@ public class TestApplicationHistoryManag
public void setup() throws Exception {
Configuration config = new Configuration();
config.setClass(YarnConfiguration.AHS_STORE,
- MemoryApplicationHistoryStore.class, ApplicationHistoryStore.class);
+ MemoryApplicationHistoryStore.class, ApplicationHistoryStore.class);
applicationHistoryManagerImpl = new ApplicationHistoryManagerImpl();
applicationHistoryManagerImpl.init(config);
applicationHistoryManagerImpl.start();
@@ -57,16 +57,16 @@ public class TestApplicationHistoryManag
appId = ApplicationId.newInstance(0, 1);
writeApplicationStartData(appId);
writeApplicationFinishData(appId);
- ApplicationAttemptId appAttemptId = ApplicationAttemptId.newInstance(appId,
- 1);
+ ApplicationAttemptId appAttemptId =
+ ApplicationAttemptId.newInstance(appId, 1);
writeApplicationAttemptStartData(appAttemptId);
writeApplicationAttemptFinishData(appAttemptId);
- ApplicationReport appReport = applicationHistoryManagerImpl
- .getApplication(appId);
+ ApplicationReport appReport =
+ applicationHistoryManagerImpl.getApplication(appId);
Assert.assertNotNull(appReport);
Assert.assertEquals(appId, appReport.getApplicationId());
- Assert.assertEquals(appAttemptId, appReport
- .getCurrentApplicationAttemptId());
+ Assert.assertEquals(appAttemptId,
+ appReport.getCurrentApplicationAttemptId());
Assert.assertEquals(appAttemptId.toString(), appReport.getHost());
Assert.assertEquals("test type", appReport.getApplicationType().toString());
Assert.assertEquals("test queue", appReport.getQueue().toString());
Modified: hadoop/common/branches/YARN-321/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/test/java/org/apache/hadoop/yarn/server/applicationhistoryservice/TestApplicationHistoryServer.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/YARN-321/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/test/java/org/apache/hadoop/yarn/server/applicationhistoryservice/TestApplicationHistoryServer.java?rev=1559004&r1=1559003&r2=1559004&view=diff
==============================================================================
--- hadoop/common/branches/YARN-321/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/test/java/org/apache/hadoop/yarn/server/applicationhistoryservice/TestApplicationHistoryServer.java (original)
+++ hadoop/common/branches/YARN-321/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/test/java/org/apache/hadoop/yarn/server/applicationhistoryservice/TestApplicationHistoryServer.java Fri Jan 17 03:26:53 2014
@@ -41,8 +41,8 @@ public class TestApplicationHistoryServe
historyServer.init(config);
assertEquals(STATE.INITED, historyServer.getServiceState());
assertEquals(2, historyServer.getServices().size());
- ApplicationHistoryClientService historyService = historyServer
- .getClientService();
+ ApplicationHistoryClientService historyService =
+ historyServer.getClientService();
assertNotNull(historyServer.getClientService());
assertEquals(STATE.INITED, historyService.getServiceState());
@@ -59,8 +59,8 @@ public class TestApplicationHistoryServe
ExitUtil.disableSystemExit();
try {
- historyServer = ApplicationHistoryServer
- .launchAppHistoryServer(new String[0]);
+ historyServer =
+ ApplicationHistoryServer.launchAppHistoryServer(new String[0]);
} catch (ExitUtil.ExitException e) {
assertEquals(0, e.status);
ExitUtil.resetFirstExitException();
Modified: hadoop/common/branches/YARN-321/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/test/java/org/apache/hadoop/yarn/server/applicationhistoryservice/TestFileSystemApplicationHistoryStore.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/YARN-321/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/test/java/org/apache/hadoop/yarn/server/applicationhistoryservice/TestFileSystemApplicationHistoryStore.java?rev=1559004&r1=1559003&r2=1559004&view=diff
==============================================================================
--- hadoop/common/branches/YARN-321/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/test/java/org/apache/hadoop/yarn/server/applicationhistoryservice/TestFileSystemApplicationHistoryStore.java (original)
+++ hadoop/common/branches/YARN-321/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/test/java/org/apache/hadoop/yarn/server/applicationhistoryservice/TestFileSystemApplicationHistoryStore.java Fri Jan 17 03:26:53 2014
@@ -108,8 +108,7 @@ public class TestFileSystemApplicationHi
Assert.assertEquals(appId.toString(), appData.getDiagnosticsInfo());
// read application attempt history data
- Assert.assertEquals(
- num, store.getApplicationAttempts(appId).size());
+ Assert.assertEquals(num, store.getApplicationAttempts(appId).size());
for (int j = 1; j <= num; ++j) {
ApplicationAttemptId appAttemptId =
ApplicationAttemptId.newInstance(appId, j);
@@ -118,25 +117,24 @@ public class TestFileSystemApplicationHi
Assert.assertNotNull(attemptData);
Assert.assertEquals(appAttemptId.toString(), attemptData.getHost());
Assert.assertEquals(appAttemptId.toString(),
- attemptData.getDiagnosticsInfo());
+ attemptData.getDiagnosticsInfo());
// read container history data
- Assert.assertEquals(
- num, store.getContainers(appAttemptId).size());
+ Assert.assertEquals(num, store.getContainers(appAttemptId).size());
for (int k = 1; k <= num; ++k) {
ContainerId containerId = ContainerId.newInstance(appAttemptId, k);
ContainerHistoryData containerData = store.getContainer(containerId);
Assert.assertNotNull(containerData);
Assert.assertEquals(Priority.newInstance(containerId.getId()),
- containerData.getPriority());
+ containerData.getPriority());
Assert.assertEquals(containerId.toString(),
- containerData.getDiagnosticsInfo());
+ containerData.getDiagnosticsInfo());
}
ContainerHistoryData masterContainer =
store.getAMContainer(appAttemptId);
Assert.assertNotNull(masterContainer);
Assert.assertEquals(ContainerId.newInstance(appAttemptId, 1),
- masterContainer.getContainerId());
+ masterContainer.getContainerId());
}
}
}
Modified: hadoop/common/branches/YARN-321/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/test/java/org/apache/hadoop/yarn/server/applicationhistoryservice/TestMemoryApplicationHistoryStore.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/YARN-321/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/test/java/org/apache/hadoop/yarn/server/applicationhistoryservice/TestMemoryApplicationHistoryStore.java?rev=1559004&r1=1559003&r2=1559004&view=diff
==============================================================================
--- hadoop/common/branches/YARN-321/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/test/java/org/apache/hadoop/yarn/server/applicationhistoryservice/TestMemoryApplicationHistoryStore.java (original)
+++ hadoop/common/branches/YARN-321/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/test/java/org/apache/hadoop/yarn/server/applicationhistoryservice/TestMemoryApplicationHistoryStore.java Fri Jan 17 03:26:53 2014
@@ -49,7 +49,7 @@ public class TestMemoryApplicationHistor
Assert.fail();
} catch (IOException e) {
Assert.assertTrue(e.getMessage().contains(
- "is stored before the start information"));
+ "is stored before the start information"));
}
// Normal
int numApps = 5;
@@ -93,22 +93,20 @@ public class TestMemoryApplicationHistor
Assert.fail();
} catch (IOException e) {
Assert.assertTrue(e.getMessage().contains(
- "is stored before the start information"));
+ "is stored before the start information"));
}
// Normal
int numAppAttempts = 5;
writeApplicationStartData(appId);
for (int i = 1; i <= numAppAttempts; ++i) {
- appAttemptId =
- ApplicationAttemptId.newInstance(appId, i);
+ appAttemptId = ApplicationAttemptId.newInstance(appId, i);
writeApplicationAttemptStartData(appAttemptId);
writeApplicationAttemptFinishData(appAttemptId);
}
- Assert.assertEquals(
- numAppAttempts, store.getApplicationAttempts(appId).size());
+ Assert.assertEquals(numAppAttempts, store.getApplicationAttempts(appId)
+ .size());
for (int i = 1; i <= numAppAttempts; ++i) {
- appAttemptId =
- ApplicationAttemptId.newInstance(appId, i);
+ appAttemptId = ApplicationAttemptId.newInstance(appId, i);
ApplicationAttemptHistoryData data =
store.getApplicationAttempt(appAttemptId);
Assert.assertNotNull(data);
@@ -117,8 +115,7 @@ public class TestMemoryApplicationHistor
}
writeApplicationFinishData(appId);
// Write again
- appAttemptId =
- ApplicationAttemptId.newInstance(appId, 1);
+ appAttemptId = ApplicationAttemptId.newInstance(appId, 1);
try {
writeApplicationAttemptStartData(appAttemptId);
Assert.fail();
@@ -145,7 +142,7 @@ public class TestMemoryApplicationHistor
Assert.fail();
} catch (IOException e) {
Assert.assertTrue(e.getMessage().contains(
- "is stored before the start information"));
+ "is stored before the start information"));
}
// Normal
writeApplicationAttemptStartData(appAttemptId);
@@ -155,20 +152,20 @@ public class TestMemoryApplicationHistor
writeContainerStartData(containerId);
writeContainerFinishData(containerId);
}
- Assert.assertEquals(
- numContainers, store.getContainers(appAttemptId).size());
+ Assert
+ .assertEquals(numContainers, store.getContainers(appAttemptId).size());
for (int i = 1; i <= numContainers; ++i) {
containerId = ContainerId.newInstance(appAttemptId, i);
ContainerHistoryData data = store.getContainer(containerId);
Assert.assertNotNull(data);
Assert.assertEquals(Priority.newInstance(containerId.getId()),
- data.getPriority());
+ data.getPriority());
Assert.assertEquals(containerId.toString(), data.getDiagnosticsInfo());
}
ContainerHistoryData masterContainer = store.getAMContainer(appAttemptId);
Assert.assertNotNull(masterContainer);
Assert.assertEquals(ContainerId.newInstance(appAttemptId, 1),
- masterContainer.getContainerId());
+ masterContainer.getContainerId());
writeApplicationAttemptFinishData(appAttemptId);
// Write again
containerId = ContainerId.newInstance(appAttemptId, 1);
Modified: hadoop/common/branches/YARN-321/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/test/java/org/apache/hadoop/yarn/server/applicationhistoryservice/webapp/TestAHSWebApp.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/YARN-321/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/test/java/org/apache/hadoop/yarn/server/applicationhistoryservice/webapp/TestAHSWebApp.java?rev=1559004&r1=1559003&r2=1559004&view=diff
==============================================================================
--- hadoop/common/branches/YARN-321/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/test/java/org/apache/hadoop/yarn/server/applicationhistoryservice/webapp/TestAHSWebApp.java (original)
+++ hadoop/common/branches/YARN-321/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/test/java/org/apache/hadoop/yarn/server/applicationhistoryservice/webapp/TestAHSWebApp.java Fri Jan 17 03:26:53 2014
@@ -47,7 +47,7 @@ public class TestAHSWebApp extends Appli
public void setApplicationHistoryStore(ApplicationHistoryStore store) {
this.store = store;
}
-
+
@Before
public void setup() {
store = new MemoryApplicationHistoryStore();
@@ -58,31 +58,30 @@ public class TestAHSWebApp extends Appli
ApplicationHistoryManager ahManager = mock(ApplicationHistoryManager.class);
Injector injector =
WebAppTests.createMockInjector(ApplicationHistoryManager.class,
- ahManager);
- AHSController controller =
- injector.getInstance(AHSController.class);
+ ahManager);
+ AHSController controller = injector.getInstance(AHSController.class);
controller.index();
Assert
- .assertEquals("Application History", controller.get(TITLE, "unknown"));
+ .assertEquals("Application History", controller.get(TITLE, "unknown"));
}
@Test
public void testView() throws Exception {
Injector injector =
WebAppTests.createMockInjector(ApplicationContext.class,
- mockApplicationHistoryManager(5, 1, 1));
+ mockApplicationHistoryManager(5, 1, 1));
AHSView ahsViewInstance = injector.getInstance(AHSView.class);
ahsViewInstance.render();
WebAppTests.flushOutput(injector);
ahsViewInstance.set(YarnWebParams.APP_STATE,
- YarnApplicationState.FAILED.toString());
+ YarnApplicationState.FAILED.toString());
ahsViewInstance.render();
WebAppTests.flushOutput(injector);
ahsViewInstance.set(YarnWebParams.APP_STATE, StringHelper.cjoin(
- YarnApplicationState.FAILED.toString(), YarnApplicationState.KILLED));
+ YarnApplicationState.FAILED.toString(), YarnApplicationState.KILLED));
ahsViewInstance.render();
WebAppTests.flushOutput(injector);
}
@@ -91,14 +90,14 @@ public class TestAHSWebApp extends Appli
public void testAppPage() throws Exception {
Injector injector =
WebAppTests.createMockInjector(ApplicationContext.class,
- mockApplicationHistoryManager(1, 5, 1));
+ mockApplicationHistoryManager(1, 5, 1));
AppPage appPageInstance = injector.getInstance(AppPage.class);
appPageInstance.render();
WebAppTests.flushOutput(injector);
- appPageInstance.set(YarnWebParams.APPLICATION_ID,
- ApplicationId.newInstance(0, 1).toString());
+ appPageInstance.set(YarnWebParams.APPLICATION_ID, ApplicationId
+ .newInstance(0, 1).toString());
appPageInstance.render();
WebAppTests.flushOutput(injector);
}
@@ -107,7 +106,7 @@ public class TestAHSWebApp extends Appli
public void testAppAttemptPage() throws Exception {
Injector injector =
WebAppTests.createMockInjector(ApplicationContext.class,
- mockApplicationHistoryManager(1, 1, 5));
+ mockApplicationHistoryManager(1, 1, 5));
AppAttemptPage appAttemptPageInstance =
injector.getInstance(AppAttemptPage.class);
@@ -115,8 +114,8 @@ public class TestAHSWebApp extends Appli
WebAppTests.flushOutput(injector);
appAttemptPageInstance.set(YarnWebParams.APPLICATION_ATTEMPT_ID,
- ApplicationAttemptId.newInstance(ApplicationId.newInstance(0, 1), 1)
- .toString());
+ ApplicationAttemptId.newInstance(ApplicationId.newInstance(0, 1), 1)
+ .toString());
appAttemptPageInstance.render();
WebAppTests.flushOutput(injector);
}
@@ -125,7 +124,7 @@ public class TestAHSWebApp extends Appli
public void testContainerPage() throws Exception {
Injector injector =
WebAppTests.createMockInjector(ApplicationContext.class,
- mockApplicationHistoryManager(1, 1, 1));
+ mockApplicationHistoryManager(1, 1, 1));
ContainerPage containerPageInstance =
injector.getInstance(ContainerPage.class);
@@ -133,17 +132,17 @@ public class TestAHSWebApp extends Appli
WebAppTests.flushOutput(injector);
containerPageInstance.set(
- YarnWebParams.CONTAINER_ID,
- ContainerId
- .newInstance(
- ApplicationAttemptId.newInstance(
- ApplicationId.newInstance(0, 1), 1), 1).toString());
+ YarnWebParams.CONTAINER_ID,
+ ContainerId
+ .newInstance(
+ ApplicationAttemptId.newInstance(ApplicationId.newInstance(0, 1), 1),
+ 1).toString());
containerPageInstance.render();
WebAppTests.flushOutput(injector);
}
- ApplicationHistoryManager mockApplicationHistoryManager(
- int numApps, int numAppAttempts, int numContainers) throws Exception {
+ ApplicationHistoryManager mockApplicationHistoryManager(int numApps,
+ int numAppAttempts, int numContainers) throws Exception {
ApplicationHistoryManager ahManager =
new MockApplicationHistoryManagerImpl(store);
for (int i = 1; i <= numApps; ++i) {
@@ -165,8 +164,7 @@ public class TestAHSWebApp extends Appli
return ahManager;
}
- class MockApplicationHistoryManagerImpl extends
- ApplicationHistoryManagerImpl {
+ class MockApplicationHistoryManagerImpl extends ApplicationHistoryManagerImpl {
public MockApplicationHistoryManagerImpl(ApplicationHistoryStore store) {
super();