Details
-
Improvement
-
Status: Resolved
-
Trivial
-
Resolution: Fixed
-
2.9.0
-
None
-
Reviewed
Description
of ZKRMStateStore contains a plethora whitespace issues as well as some icky bits, like unused variables. This JIRA is to clean that up. It should have no functional impact.
Attachments
Attachments
- YARN-5400.addendum.patch
- 1 kB
- Robert Kanter
- YARN-5400.003.patch
- 33 kB
- Daniel Templeton
- YARN-5400.002.patch
- 33 kB
- Daniel Templeton
- YARN-5400.001.patch
- 33 kB
- Daniel Templeton
Activity
-1 overall |
Vote | Subsystem | Runtime | Comment |
---|---|---|---|
0 | reexec | 0m 15s | Docker mode activated. |
+1 | @author | 0m 0s | The patch does not contain any @author tags. |
-1 | test4tests | 0m 0s | The patch doesn't appear to include any new or modified tests. Please justify why no new tests are needed for this patch. Also please list what manual steps were performed to verify this patch. |
+1 | mvninstall | 7m 23s | trunk passed |
+1 | compile | 0m 38s | trunk passed |
+1 | checkstyle | 0m 23s | trunk passed |
+1 | mvnsite | 0m 39s | trunk passed |
+1 | mvneclipse | 0m 19s | trunk passed |
+1 | findbugs | 1m 2s | trunk passed |
+1 | javadoc | 0m 22s | trunk passed |
+1 | mvninstall | 0m 33s | the patch passed |
+1 | compile | 0m 31s | the patch passed |
+1 | javac | 0m 31s | the patch passed |
+1 | checkstyle | 0m 20s | hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager: The patch generated 0 new + 54 unchanged - 8 fixed = 54 total (was 62) |
+1 | mvnsite | 0m 40s | the patch passed |
+1 | mvneclipse | 0m 14s | the patch passed |
+1 | whitespace | 0m 0s | The patch has no whitespace issues. |
+1 | findbugs | 1m 8s | the patch passed |
-1 | javadoc | 0m 19s | hadoop-yarn-project_hadoop-yarn_hadoop-yarn-server_hadoop-yarn-server-resourcemanager generated 2 new + 935 unchanged - 6 fixed = 937 total (was 941) |
-1 | unit | 35m 29s | hadoop-yarn-server-resourcemanager in the patch failed. |
+1 | asflicense | 0m 18s | The patch does not generate ASF License warnings. |
51m 13s |
Reason | Tests |
---|---|
Failed junit tests | hadoop.yarn.server.resourcemanager.security.TestDelegationTokenRenewer |
This message was automatically generated.
-1 overall |
Vote | Subsystem | Runtime | Comment |
---|---|---|---|
0 | reexec | 0m 13s | Docker mode activated. |
+1 | @author | 0m 0s | The patch does not contain any @author tags. |
-1 | test4tests | 0m 0s | The patch doesn't appear to include any new or modified tests. Please justify why no new tests are needed for this patch. Also please list what manual steps were performed to verify this patch. |
+1 | mvninstall | 7m 41s | trunk passed |
+1 | compile | 0m 34s | trunk passed |
+1 | checkstyle | 0m 22s | trunk passed |
+1 | mvnsite | 0m 43s | trunk passed |
+1 | mvneclipse | 0m 17s | trunk passed |
+1 | findbugs | 1m 4s | trunk passed |
+1 | javadoc | 0m 22s | trunk passed |
+1 | mvninstall | 0m 33s | the patch passed |
+1 | compile | 0m 31s | the patch passed |
+1 | javac | 0m 31s | the patch passed |
+1 | checkstyle | 0m 19s | hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager: The patch generated 0 new + 52 unchanged - 10 fixed = 52 total (was 62) |
+1 | mvnsite | 0m 39s | the patch passed |
+1 | mvneclipse | 0m 17s | the patch passed |
+1 | whitespace | 0m 0s | The patch has no whitespace issues. |
+1 | findbugs | 1m 15s | the patch passed |
+1 | javadoc | 0m 21s | hadoop-yarn-project_hadoop-yarn_hadoop-yarn-server_hadoop-yarn-server-resourcemanager generated 0 new + 935 unchanged - 6 fixed = 935 total (was 941) |
+1 | unit | 35m 39s | hadoop-yarn-server-resourcemanager in the patch passed. |
+1 | asflicense | 0m 16s | The patch does not generate ASF License warnings. |
51m 46s |
Subsystem | Report/Notes |
---|---|
Docker | Image:yetus/hadoop:9560f25 |
JIRA Patch URL | https://issues.apache.org/jira/secure/attachment/12829980/YARN-5400.002.patch |
JIRA Issue | |
Optional Tests | asflicense compile javac javadoc mvninstall mvnsite unit findbugs checkstyle |
uname | Linux ccb367e53a6f 3.13.0-93-generic #140-Ubuntu SMP Mon Jul 18 21:21:05 UTC 2016 x86_64 x86_64 x86_64 GNU/Linux |
Build tool | maven |
Personality | /testptch/hadoop/patchprocess/precommit/personality/provided.sh |
git revision | trunk / d85d9b2 |
Default Java | 1.8.0_101 |
findbugs | v3.0.0 |
Test Results | https://builds.apache.org/job/PreCommit-YARN-Build/13196/testReport/ |
modules | C: hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager U: hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager |
Console output | https://builds.apache.org/job/PreCommit-YARN-Build/13196/console |
Powered by | Apache Yetus 0.3.0 http://yetus.apache.org |
This message was automatically generated.
Hmm, it doesn't apply cleanly now:
>> [27] 12:51 : hadoop-git (trunk) :: patch -p0 < ~/Downloads/YARN-5400.002.patch patching file hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/RMZKUtils.java patching file hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/ResourceManager.java patching file hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/recovery/ZKRMStateStore.java Hunk #34 FAILED at 764. Hunk #35 succeeded at 801 (offset -3 lines). Hunk #36 succeeded at 827 (offset -3 lines). Hunk #37 succeeded at 860 (offset -3 lines). Hunk #38 succeeded at 881 (offset -3 lines). Hunk #39 succeeded at 910 (offset -3 lines). Hunk #40 succeeded at 987 (offset -3 lines). Hunk #41 succeeded at 1024 (offset -3 lines). 1 out of 41 hunks FAILED -- saving rejects to file hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/recovery/ZKRMStateStore.java.rej
-1 overall |
Vote | Subsystem | Runtime | Comment |
---|---|---|---|
0 | reexec | 0m 10s | Docker mode activated. |
+1 | @author | 0m 0s | The patch does not contain any @author tags. |
-1 | test4tests | 0m 0s | The patch doesn't appear to include any new or modified tests. Please justify why no new tests are needed for this patch. Also please list what manual steps were performed to verify this patch. |
+1 | mvninstall | 7m 25s | trunk passed |
+1 | compile | 0m 34s | trunk passed |
+1 | checkstyle | 0m 22s | trunk passed |
+1 | mvnsite | 0m 46s | trunk passed |
+1 | mvneclipse | 0m 16s | trunk passed |
+1 | findbugs | 1m 4s | trunk passed |
+1 | javadoc | 0m 21s | trunk passed |
+1 | mvninstall | 0m 33s | the patch passed |
+1 | compile | 0m 33s | the patch passed |
+1 | javac | 0m 33s | the patch passed |
+1 | checkstyle | 0m 20s | hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager: The patch generated 0 new + 52 unchanged - 10 fixed = 52 total (was 62) |
+1 | mvnsite | 0m 39s | the patch passed |
+1 | mvneclipse | 0m 14s | the patch passed |
+1 | whitespace | 0m 0s | The patch has no whitespace issues. |
+1 | findbugs | 1m 11s | the patch passed |
+1 | javadoc | 0m 20s | hadoop-yarn-project_hadoop-yarn_hadoop-yarn-server_hadoop-yarn-server-resourcemanager generated 0 new + 935 unchanged - 6 fixed = 935 total (was 941) |
+1 | unit | 37m 42s | hadoop-yarn-server-resourcemanager in the patch passed. |
+1 | asflicense | 0m 17s | The patch does not generate ASF License warnings. |
53m 23s |
Subsystem | Report/Notes |
---|---|
Docker | Image:yetus/hadoop:9560f25 |
JIRA Patch URL | https://issues.apache.org/jira/secure/attachment/12830776/YARN-5400.003.patch |
JIRA Issue | |
Optional Tests | asflicense compile javac javadoc mvninstall mvnsite unit findbugs checkstyle |
uname | Linux 2fc163e7875a 3.13.0-95-generic #142-Ubuntu SMP Fri Aug 12 17:00:09 UTC 2016 x86_64 x86_64 x86_64 GNU/Linux |
Build tool | maven |
Personality | /testptch/hadoop/patchprocess/precommit/personality/provided.sh |
git revision | trunk / c3b235e |
Default Java | 1.8.0_101 |
findbugs | v3.0.0 |
Test Results | https://builds.apache.org/job/PreCommit-YARN-Build/13241/testReport/ |
modules | C: hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager U: hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager |
Console output | https://builds.apache.org/job/PreCommit-YARN-Build/13241/console |
Powered by | Apache Yetus 0.3.0 http://yetus.apache.org |
This message was automatically generated.
Looks like this commit broke the build for branch-2. rkanter can you please take a look?
[ERROR] COMPILATION ERROR : [ERROR] /Users/aagarwal/src/commit/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/recovery/ZKRMStateStore.java:[415,40] method put in interface java.util.Map<K,V> cannot be applied to given types; required: java.lang.String,java.util.Map<org.apache.hadoop.yarn.api.records.ReservationId,org.apache.hadoop.yarn.proto.YarnProtos.ReservationAllocationStateProto> found: java.lang.String,java.util.HashMap<java.lang.Object,java.lang.Object> reason: actual argument java.util.HashMap<java.lang.Object,java.lang.Object> cannot be converted to java.util.Map<org.apache.hadoop.yarn.api.records.ReservationId,org.apache.hadoop.yarn.proto.YarnProtos.ReservationAllocationStateProto> by method invocation conversion
Yup. I was just talking to templedf about that. It's a problem with the JDK 7 compiler not being able to infer the diamond operator types as well as the JDK 8 compiler does. I'll push an addendum patch with the explicit types shortly.
Ok, it should be fixed now. Sorry about that.
I've attached the addendum patch for reference.
SUCCESS: Integrated in Jenkins build Hadoop-trunk-Commit #10509 (See https://builds.apache.org/job/Hadoop-trunk-Commit/10509/)
YARN-5400. Light cleanup in ZKRMStateStore (templedf via rkanter) (rkanter: rev bcb2528a51c33e4caff8d744c5e14c1accfc47d0)
- (edit) hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/RMZKUtils.java
- (edit) hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/recovery/ZKRMStateStore.java
- (edit) hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/ResourceManager.java
No problem and thank you for the quick fix Robert. I verified that your latest commit fixed branch-2.
This patch addresses the whitespace (trailing whitespace, odd indents, odd line breaks, lack of new lines for readability), removes a dead variable, cleans up an odd loop, converts several try-finally-close blocks into try-with-resources blocks, and narrows the exception scope of a few methods.