Apache
/
hadoop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

merge YARN-383 from trunk. AMRMClientImpl should handle null rmClient in stop(). Contributed by Hitesh Shah. 

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1443700 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Siddharth Seth 2013-02-07 20:22:34 +00:00
parent 047b94baeb
commit 035d367933
6 changed files with 18 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
hadoop-yarn-project/CHANGES.txt
View File

@ -12,6 +12,9 @@ Release 2.0.4-beta - UNRELEASED
BUG FIXES
YARN-383. AMRMClientImpl should handle null rmClient in stop()
(Hitesh Shah via sseth)
Release 2.0.3-alpha - 2013-02-06
INCOMPATIBLE CHANGES

7
hadoop-yarn-project/hadoop-yarn/dev-support/findbugs-exclude.xml
View File

@ -249,4 +249,11 @@
<Bug pattern="DMI_HARDCODED_ABSOLUTE_FILENAME" />
</Match>
<!-- rmClient can be ignored as only code blocks outside of rpc calls need to be synchronized -->
<Match>
<Class name="org.apache.hadoop.yarn.client.AMRMClientImpl" />
<Field name="rmClient" />
<Bug pattern="IS2_INCONSISTENT_SYNC" />
</Match>
</FindBugsFilter>

19
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/dev-support/findbugs-exclude.xml
View File

@ -1,19 +0,0 @@
<!--
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.
-->
<FindBugsFilter>
</FindBugsFilter>

5
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/pom.xml
View File

@ -24,6 +24,11 @@
<version>2.0.4-SNAPSHOT</version>
<name>hadoop-yarn-client</name>
<properties>
<!-- Needed for generating FindBugs warnings using parent pom -->
<yarn.basedir>${project.parent.basedir}</yarn.basedir>
</properties>
<dependencies>
<dependency>
<groupId>org.apache.hadoop</groupId>

4
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/main/java/org/apache/hadoop/yarn/client/AMRMClientImpl.java
View File

@ -147,7 +147,9 @@ public class AMRMClientImpl extends AbstractService implements AMRMClient {
@Override
public synchronized void stop() {
RPC.stopProxy(this.rmClient);
if (this.rmClient != null) {
RPC.stopProxy(this.rmClient);
}
super.stop();
}

11
hadoop-yarn-project/pom.xml
View File

@ -33,7 +33,6 @@
<test.logs>true</test.logs>
<test.timeout>600000</test.timeout>
<fork.mode>once</fork.mode>
<mr.basedir>${basedir}</mr.basedir>
<hadoop.component>yarn</hadoop.component>
<is.hadoop.component>true</is.hadoop.component>
</properties>
@ -200,16 +199,6 @@
</executions>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>findbugs-maven-plugin</artifactId>
<configuration>
<findbugsXmlOutput>true</findbugsXmlOutput>
<xmlOutput>true</xmlOutput>
<excludeFilterFile>${mr.basedir}/dev-support/findbugs-exclude.xml</excludeFilterFile>
<effort>Max</effort>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.rat</groupId>
<artifactId>apache-rat-plugin</artifactId>
<configuration>