Repository: hadoop Updated Branches: refs/heads/branch-2 af1e2993c -> f4b234850
HDFS-8961. Investigate lock issue in o.a.h.hdfs.shortcircuit.DfsClientShmManager.EndpointShmManager. Contributed by Mingliang Liu. Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/f4b23485 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/f4b23485 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/f4b23485 Branch: refs/heads/branch-2 Commit: f4b2348503b1844a62adb359723407318cbed993 Parents: af1e299 Author: Haohui Mai <[email protected]> Authored: Thu Aug 27 09:13:20 2015 -0700 Committer: Haohui Mai <[email protected]> Committed: Thu Aug 27 09:13:37 2015 -0700 ---------------------------------------------------------------------- .../dev-support/findbugsExcludeFile.xml | 10 ++++++++++ hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt | 3 +++ .../hadoop-hdfs/dev-support/findbugsExcludeFile.xml | 10 ---------- 3 files changed, 13 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/f4b23485/hadoop-hdfs-project/hadoop-hdfs-client/dev-support/findbugsExcludeFile.xml ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs-client/dev-support/findbugsExcludeFile.xml b/hadoop-hdfs-project/hadoop-hdfs-client/dev-support/findbugsExcludeFile.xml index ba6453d..036ac09 100644 --- a/hadoop-hdfs-project/hadoop-hdfs-client/dev-support/findbugsExcludeFile.xml +++ b/hadoop-hdfs-project/hadoop-hdfs-client/dev-support/findbugsExcludeFile.xml @@ -21,4 +21,14 @@ <Package name="org.apache.hadoop.hdfs.protocol.proto" /> <Bug pattern="SE_BAD_FIELD,MS_SHOULD_BE_FINAL,UCF_USELESS_CONTROL_FLOW" /> </Match> + <Match> + <Class name="org.apache.hadoop.hdfs.shortcircuit.DfsClientShmManager$EndpointShmManager" /> + <Method name="allocSlot" /> + <Bug pattern="UL_UNRELEASED_LOCK_EXCEPTION_PATH" /> + </Match> + <Match> + <Class name="org.apache.hadoop.hdfs.shortcircuit.DfsClientShmManager$EndpointShmManager" /> + <Method name="allocSlot" /> + <Bug pattern="UL_UNRELEASED_LOCK" /> + </Match> </FindBugsFilter> http://git-wip-us.apache.org/repos/asf/hadoop/blob/f4b23485/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt index 933aa1a..e91b956 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt +++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt @@ -893,6 +893,9 @@ Release 2.8.0 - UNRELEASED HDFS-8682. Should not remove decommissioned node,while calculating the number of live/dead decommissioned node. (J. Andreina via vinayakumarb) + HDFS-8961. Investigate lock issue in o.a.h.hdfs.shortcircuit. + DfsClientShmManager.EndpointShmManager. (Mingliang Liu via wheat9) + Release 2.7.2 - UNRELEASED INCOMPATIBLE CHANGES http://git-wip-us.apache.org/repos/asf/hadoop/blob/f4b23485/hadoop-hdfs-project/hadoop-hdfs/dev-support/findbugsExcludeFile.xml ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/dev-support/findbugsExcludeFile.xml b/hadoop-hdfs-project/hadoop-hdfs/dev-support/findbugsExcludeFile.xml index 224d2fb..60029e0 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/dev-support/findbugsExcludeFile.xml +++ b/hadoop-hdfs-project/hadoop-hdfs/dev-support/findbugsExcludeFile.xml @@ -176,16 +176,6 @@ <Method name="setDirInternal" /> <Bug pattern="DM_STRING_CTOR" /> </Match> - <Match> - <Class name="org.apache.hadoop.hdfs.shortcircuit.DfsClientShmManager$EndpointShmManager" /> - <Method name="allocSlot" /> - <Bug pattern="UL_UNRELEASED_LOCK_EXCEPTION_PATH" /> - </Match> - <Match> - <Class name="org.apache.hadoop.hdfs.shortcircuit.DfsClientShmManager$EndpointShmManager" /> - <Method name="allocSlot" /> - <Bug pattern="UL_UNRELEASED_LOCK" /> - </Match> <!-- Manually verified to be okay, we want to throw away the top bit here --> <Match> <Class name="org.apache.hadoop.hdfs.server.namenode.CachedBlock" />
