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

HDFS-15298 Fix the findbugs warnings introduced in HDFS-15217 (#1979)

Browse Source
This commit is contained in:
Toshihiro Suzuki 2020-04-27 17:20:47 +09:00 committed by GitHub
parent f91e21ac10
commit 62c26b91fd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java
View File

@ -3210,6 +3210,7 @@ boolean renameTo(String src, String dst, boolean logRetryCache)
logAuditEvent(false, operationName, src, dst, null); logAuditEvent(false, operationName, src, dst, null);
throw e; throw e;
} }
assert ret != null;
boolean success = ret.success; boolean success = ret.success;
if (success) { if (success) {
getEditLog().logSync(); getEditLog().logSync();
@ -3244,7 +3245,7 @@ void renameTo(final String src, final String dst,
throw e; throw e;
} }
getEditLog().logSync(); getEditLog().logSync();
assert res != null;
BlocksMapUpdateInfo collectedBlocks = res.collectedBlocks; BlocksMapUpdateInfo collectedBlocks = res.collectedBlocks;
if (!collectedBlocks.getToDeleteList().isEmpty()) { if (!collectedBlocks.getToDeleteList().isEmpty()) {
removeBlocks(collectedBlocks); removeBlocks(collectedBlocks);
@ -7441,6 +7442,7 @@ long addCacheDirective(CacheDirectiveInfo directive,
throw ace; throw ace;
} }
getEditLog().logSync(); getEditLog().logSync();
assert effectiveDirective != null;
effectiveDirectiveStr = effectiveDirective.toString(); effectiveDirectiveStr = effectiveDirective.toString();
logAuditEvent(true, operationName, effectiveDirectiveStr); logAuditEvent(true, operationName, effectiveDirectiveStr);
return effectiveDirective.getId(); return effectiveDirective.getId();