big-data/hadoop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Made fixes for whitespace errors and checstyle warnings before merge.

Browse Source
This commit is contained in:
Varun Saxena 2017-08-30 01:17:40 +05:30
parent 512068a01f
commit 3d00c8f394
13 changed files with 38 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/test/java/org/apache/hadoop/mapreduce/v2/app/rm/TestRMContainerAllocator.java
View File

@ -142,7 +142,6 @@
import org.apache.hadoop.yarn.server.resourcemanager.scheduler.event.SchedulerEvent; import org.apache.hadoop.yarn.server.resourcemanager.scheduler.event.SchedulerEvent;
import org.apache.hadoop.yarn.server.resourcemanager.scheduler.fifo.FifoScheduler; import org.apache.hadoop.yarn.server.resourcemanager.scheduler.fifo.FifoScheduler;
import org.apache.hadoop.yarn.server.resourcemanager.security.AMRMTokenSecretManager; import org.apache.hadoop.yarn.server.resourcemanager.security.AMRMTokenSecretManager;
import org.apache.hadoop.yarn.server.timelineservice.security.TimelineV2DelegationTokenSecretManagerService.TimelineV2DelegationTokenSecretManager;
import org.apache.hadoop.yarn.server.utils.BuilderUtils; import org.apache.hadoop.yarn.server.utils.BuilderUtils;
import org.apache.hadoop.yarn.util.Clock; import org.apache.hadoop.yarn.util.Clock;
import org.apache.hadoop.yarn.util.ControlledClock; import org.apache.hadoop.yarn.util.ControlledClock;
@ -3585,15 +3584,15 @@ public void completeContainer(ContainerId containerId) {
} }
} }
private static class MockSchedulerForTimelineCollector private final static class MockSchedulerForTimelineCollector
implements ApplicationMasterProtocol { implements ApplicationMasterProtocol {
CollectorInfo collectorInfo; private CollectorInfo collectorInfo;
public MockSchedulerForTimelineCollector(CollectorInfo info) { private MockSchedulerForTimelineCollector(CollectorInfo info) {
this.collectorInfo = info; this.collectorInfo = info;
} }
void updateCollectorInfo(CollectorInfo info) { private void updateCollectorInfo(CollectorInfo info) {
collectorInfo = info; collectorInfo = info;
} }

1
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/client/api/TimelineV2Client.java
View File

@ -24,7 +24,6 @@
import org.apache.hadoop.service.CompositeService; import org.apache.hadoop.service.CompositeService;
import org.apache.hadoop.yarn.api.records.ApplicationId; import org.apache.hadoop.yarn.api.records.ApplicationId;
import org.apache.hadoop.yarn.api.records.CollectorInfo; import org.apache.hadoop.yarn.api.records.CollectorInfo;
import org.apache.hadoop.yarn.api.records.Token;
import org.apache.hadoop.yarn.api.records.timelineservice.TimelineEntity; import org.apache.hadoop.yarn.api.records.timelineservice.TimelineEntity;
import org.apache.hadoop.yarn.client.api.impl.TimelineV2ClientImpl; import org.apache.hadoop.yarn.client.api.impl.TimelineV2ClientImpl;
import org.apache.hadoop.yarn.exceptions.YarnException; import org.apache.hadoop.yarn.exceptions.YarnException;

11
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/timeline/security/TimelineAuthenticationFilterInitializer.java
View File

@ -53,7 +53,8 @@ public class TimelineAuthenticationFilterInitializer extends FilterInitializer {
/** /**
* The configuration prefix of timeline HTTP authentication. * The configuration prefix of timeline HTTP authentication.
*/ */
public static final String PREFIX = "yarn.timeline-service.http-authentication."; public static final String PREFIX =
"yarn.timeline-service.http-authentication.";
@VisibleForTesting @VisibleForTesting
Map<String, String> filterConfig; Map<String, String> filterConfig;
@ -104,15 +105,15 @@ protected Map<String, String> getFilterConfig() {
} }
/** /**
* Initializes {@link TimelineAuthenticationFilter} * Initializes {@link TimelineAuthenticationFilter}.
* <p> * <p>
* Propagates to {@link TimelineAuthenticationFilter} configuration all YARN * Propagates to {@link TimelineAuthenticationFilter} configuration all YARN
* configuration properties prefixed with {@value #PREFIX} * configuration properties prefixed with {@value #PREFIX}.
* *
* @param container * @param container
* The filter container * The filter container.
* @param conf * @param conf
* Configuration for run-time parameters * Configuration for run-time parameters.
*/ */
@Override @Override
public void initFilter(FilterContainer container, Configuration conf) { public void initFilter(FilterContainer container, Configuration conf) {

4
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/test/java/org/apache/hadoop/yarn/server/timeline/security/TestTimelineAuthenticationFilterInitializer.java
View File

@ -27,7 +27,9 @@
import org.junit.Test; import org.junit.Test;
import org.mockito.Mockito; import org.mockito.Mockito;
/**
* Tests {@link TimelineAuthenticationFilterInitializer}.
*/
public class TestTimelineAuthenticationFilterInitializer { public class TestTimelineAuthenticationFilterInitializer {
@Test @Test

12
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/security/authorize/NMPolicyProvider.java
View File

@ -33,12 +33,13 @@
@InterfaceStability.Unstable @InterfaceStability.Unstable
public class NMPolicyProvider extends PolicyProvider { public class NMPolicyProvider extends PolicyProvider {
private static final Service[] nodeManagerServices = private static final Service[] NODE_MANAGER_SERVICES =
new Service[] { new Service[] {
new Service( new Service(YarnConfiguration.
YarnConfiguration.YARN_SECURITY_SERVICE_AUTHORIZATION_CONTAINER_MANAGEMENT_PROTOCOL, YARN_SECURITY_SERVICE_AUTHORIZATION_CONTAINER_MANAGEMENT_PROTOCOL,
ContainerManagementProtocolPB.class), ContainerManagementProtocolPB.class),
new Service(YarnConfiguration.YARN_SECURITY_SERVICE_AUTHORIZATION_RESOURCE_LOCALIZER, new Service(YarnConfiguration.
YARN_SECURITY_SERVICE_AUTHORIZATION_RESOURCE_LOCALIZER,
LocalizationProtocolPB.class), LocalizationProtocolPB.class),
new Service(YarnConfiguration. new Service(YarnConfiguration.
YARN_SECURITY_SERVICE_AUTHORIZATION_COLLECTOR_NODEMANAGER_PROTOCOL, YARN_SECURITY_SERVICE_AUTHORIZATION_COLLECTOR_NODEMANAGER_PROTOCOL,
@ -47,7 +48,6 @@ public class NMPolicyProvider extends PolicyProvider {
@Override @Override
public Service[] getServices() { public Service[] getServices() {
return nodeManagerServices; return NODE_MANAGER_SERVICES;
} }
} }

2
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice-hbase/src/main/java/org/apache/hadoop/yarn/server/timelineservice/storage/apptoflow/AppToFlowColumnPrefix.java
View File

@ -58,7 +58,7 @@ public enum AppToFlowColumnPrefix implements ColumnPrefix<AppToFlowTable> {
private final String columnPrefix; private final String columnPrefix;
private final byte[] columnPrefixBytes; private final byte[] columnPrefixBytes;
private AppToFlowColumnPrefix(ColumnFamily<AppToFlowTable> columnFamily, AppToFlowColumnPrefix(ColumnFamily<AppToFlowTable> columnFamily,
String columnPrefix) { String columnPrefix) {
this.columnFamily = columnFamily; this.columnFamily = columnFamily;
this.columnPrefix = columnPrefix; this.columnPrefix = columnPrefix;

5
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice-hbase/src/main/java/org/apache/hadoop/yarn/server/timelineservice/storage/reader/EntityTypeReader.java
View File

@ -91,9 +91,8 @@ public Set<String> readEntityTypes(Configuration hbaseConf,
int counter = 0; int counter = 0;
while (true) { while (true) {
try (ResultScanner results try (ResultScanner results =
= getResult(hbaseConf, conn, typeFilterList, currRowKey, nextRowKey)) getResult(hbaseConf, conn, typeFilterList, currRowKey, nextRowKey)) {
{
TimelineEntity entity = parseEntityForType(results.next()); TimelineEntity entity = parseEntityForType(results.next());
if (entity == null) { if (entity == null) {
break; break;