Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

HDDS-1870. ConcurrentModification at PrometheusMetricsSink #1179

Merged
merged 3 commits into from
Aug 4, 2019
Merged

HDDS-1870. ConcurrentModification at PrometheusMetricsSink #1179

merged 3 commits into from
Aug 4, 2019

Conversation

adoroszlai
Copy link
Contributor

What changes were proposed in this pull request?

  1. Fix ConcurrentModification due to plain HashMap
  2. Improve string building a bit

https://issues.apache.org/jira/browse/HDDS-1870

How was this patch tested?

Ran freon in ozoneperf env. Checked /prom endpoints. Verified that no CME appears in logs.

@adoroszlai
Copy link
Contributor Author

/label ozone

@elek elek added the ozone label Jul 29, 2019
@hadoop-yetus
Copy link

💔 -1 overall

Vote Subsystem Runtime Comment
0 reexec 42 Docker mode activated.
_ Prechecks _
+1 dupname 0 No case conflicting files found.
+1 @author 0 The patch does not contain any @author tags.
-1 test4tests 0 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.
_ trunk Compile Tests _
+1 mvninstall 598 trunk passed
+1 compile 366 trunk passed
+1 checkstyle 78 trunk passed
+1 mvnsite 0 trunk passed
+1 shadedclient 881 branch has no errors when building and testing our client artifacts.
+1 javadoc 164 trunk passed
0 spotbugs 418 Used deprecated FindBugs config; considering switching to SpotBugs.
+1 findbugs 613 trunk passed
_ Patch Compile Tests _
+1 mvninstall 549 the patch passed
+1 compile 377 the patch passed
+1 javac 377 the patch passed
+1 checkstyle 82 the patch passed
+1 mvnsite 0 the patch passed
+1 whitespace 0 The patch has no whitespace issues.
+1 shadedclient 695 patch has no errors when building and testing our client artifacts.
+1 javadoc 149 the patch passed
+1 findbugs 654 the patch passed
_ Other Tests _
-1 unit 193 hadoop-hdds in the patch failed.
-1 unit 1682 hadoop-ozone in the patch failed.
+1 asflicense 39 The patch does not generate ASF License warnings.
7325
Reason Tests
Failed junit tests hadoop.ozone.container.ozoneimpl.TestOzoneContainer
hadoop.ozone.client.rpc.TestOzoneAtRestEncryption
hadoop.ozone.client.rpc.TestBlockOutputStreamWithFailures
hadoop.ozone.client.rpc.TestOzoneRpcClientWithRatis
hadoop.ozone.client.rpc.TestOzoneRpcClient
hadoop.ozone.om.TestScmSafeMode
hadoop.ozone.client.rpc.TestMultiBlockWritesWithDnFailures
hadoop.ozone.client.rpc.TestSecureOzoneRpcClient
Subsystem Report/Notes
Docker Client=19.03.1 Server=19.03.1 base: https://builds.apache.org/job/hadoop-multibranch/job/PR-1179/1/artifact/out/Dockerfile
GITHUB PR #1179
Optional Tests dupname asflicense compile javac javadoc mvninstall mvnsite unit shadedclient findbugs checkstyle
uname Linux dc3489c316f0 4.4.0-138-generic #164-Ubuntu SMP Tue Oct 2 17:16:02 UTC 2018 x86_64 x86_64 x86_64 GNU/Linux
Build tool maven
Personality personality/hadoop.sh
git revision trunk / b039f75
Default Java 1.8.0_212
unit https://builds.apache.org/job/hadoop-multibranch/job/PR-1179/1/artifact/out/patch-unit-hadoop-hdds.txt
unit https://builds.apache.org/job/hadoop-multibranch/job/PR-1179/1/artifact/out/patch-unit-hadoop-ozone.txt
Test Results https://builds.apache.org/job/hadoop-multibranch/job/PR-1179/1/testReport/
Max. process+thread count 4632 (vs. ulimit of 5500)
modules C: hadoop-hdds/framework U: hadoop-hdds/framework
Console output https://builds.apache.org/job/hadoop-multibranch/job/PR-1179/1/console
versions git=2.7.4 maven=3.3.9 findbugs=3.1.0-RC1
Powered by Apache Yetus 0.10.0 http://yetus.apache.org

This message was automatically generated.

@adoroszlai
Copy link
Contributor Author

@elek please review

@avijayanhwx
Copy link
Contributor

LGTM +1 (non binding)

@hadoop-yetus
Copy link

💔 -1 overall

Vote Subsystem Runtime Comment
0 reexec 71 Docker mode activated.
_ Prechecks _
+1 dupname 0 No case conflicting files found.
+1 @author 0 The patch does not contain any @author tags.
-1 test4tests 0 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.
_ trunk Compile Tests _
+1 mvninstall 634 trunk passed
+1 compile 406 trunk passed
+1 checkstyle 76 trunk passed
+1 mvnsite 0 trunk passed
+1 shadedclient 964 branch has no errors when building and testing our client artifacts.
+1 javadoc 173 trunk passed
0 spotbugs 444 Used deprecated FindBugs config; considering switching to SpotBugs.
+1 findbugs 655 trunk passed
_ Patch Compile Tests _
+1 mvninstall 613 the patch passed
+1 compile 398 the patch passed
+1 javac 398 the patch passed
+1 checkstyle 85 the patch passed
+1 mvnsite 0 the patch passed
+1 whitespace 0 The patch has no whitespace issues.
+1 shadedclient 809 patch has no errors when building and testing our client artifacts.
-1 javadoc 97 hadoop-ozone in the patch failed.
+1 findbugs 747 the patch passed
_ Other Tests _
+1 unit 364 hadoop-hdds in the patch passed.
-1 unit 2481 hadoop-ozone in the patch failed.
+1 asflicense 42 The patch does not generate ASF License warnings.
8853
Reason Tests
Failed junit tests hadoop.ozone.client.rpc.TestOzoneRpcClient
hadoop.ozone.client.rpc.TestOzoneRpcClientWithRatis
hadoop.ozone.client.rpc.TestMultiBlockWritesWithDnFailures
hadoop.ozone.client.rpc.TestBlockOutputStreamWithFailures
hadoop.ozone.client.rpc.TestOzoneAtRestEncryption
hadoop.ozone.client.rpc.TestOzoneClientRetriesOnException
hadoop.ozone.container.common.statemachine.commandhandler.TestBlockDeletion
hadoop.ozone.client.rpc.TestSecureOzoneRpcClient
hadoop.hdds.scm.pipeline.TestSCMPipelineManager
hadoop.ozone.om.TestScmSafeMode
hadoop.hdds.scm.pipeline.TestRatisPipelineProvider
hadoop.ozone.client.rpc.TestCommitWatcher
hadoop.hdds.scm.pipeline.TestRatisPipelineCreateAndDestory
Subsystem Report/Notes
Docker Client=19.03.1 Server=19.03.1 base: https://builds.apache.org/job/hadoop-multibranch/job/PR-1179/2/artifact/out/Dockerfile
GITHUB PR #1179
Optional Tests dupname asflicense compile javac javadoc mvninstall mvnsite unit shadedclient findbugs checkstyle
uname Linux 875180c00d89 4.15.0-54-generic #58-Ubuntu SMP Mon Jun 24 10:55:24 UTC 2019 x86_64 x86_64 x86_64 GNU/Linux
Build tool maven
Personality personality/hadoop.sh
git revision trunk / f86de6f
Default Java 1.8.0_222
javadoc https://builds.apache.org/job/hadoop-multibranch/job/PR-1179/2/artifact/out/patch-javadoc-hadoop-ozone.txt
unit https://builds.apache.org/job/hadoop-multibranch/job/PR-1179/2/artifact/out/patch-unit-hadoop-ozone.txt
Test Results https://builds.apache.org/job/hadoop-multibranch/job/PR-1179/2/testReport/
Max. process+thread count 4813 (vs. ulimit of 5500)
modules C: hadoop-hdds/framework U: hadoop-hdds/framework
Console output https://builds.apache.org/job/hadoop-multibranch/job/PR-1179/2/console
versions git=2.7.4 maven=3.3.9 findbugs=3.1.0-RC1
Powered by Apache Yetus 0.10.0 http://yetus.apache.org

This message was automatically generated.

bharatviswa504
bharatviswa504 approved these changes Aug 4, 2019
View reviewed changes
Copy link
Contributor

@bharatviswa504 bharatviswa504 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

+1 LGTM.

@bharatviswa504
Copy link
Contributor

Thank You @adoroszlai for the contribution.
I have committed this to the trunk.

@bharatviswa504 bharatviswa504 merged commit f4df97f into apache:trunk Aug 4, 2019
@adoroszlai
Copy link
Contributor Author

Thank you @bharatviswa504 for reviewing and merging it.

@adoroszlai adoroszlai deleted the HDDS-1870 branch August 5, 2019 09:10
@aajisaka aajisaka mentioned this pull request Aug 20, 2019
Closed
amahussein pushed a commit to amahussein/hadoop that referenced this pull request Oct 29, 2019
@adoroszlai
HDDS-1870. ConcurrentModification at PrometheusMetricsSink (apache#1179)
e9da2b0
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@bharatviswa504 bharatviswa504 bharatviswa504 approved these changes

Assignees
No one assigned
Labels
ozone
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@adoroszlai @hadoop-yetus @avijayanhwx @bharatviswa504 @elek