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.

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

Fix concurrent error in InMemoryMetricsRepository of the dashboard #488

Merged
merged 40 commits into from
Feb 22, 2019
Merged

Fix concurrent error in InMemoryMetricsRepository of the dashboard #488

merged 40 commits into from
Feb 22, 2019

Conversation

nick-tan
Copy link
Contributor

Describe what this PR does / why we need it

fix the ConcurrentModificationException of InMemoryMetricsRepository

Does this pull request fix one issue?

Fixes #433

Describe how you did it

replace LinkedHashMap with ConcurrentLinkedHashMap of google code

Describe how to verify it

run the test case of InMemoryMetricsRepository

Special notes for reviews

all4you and others added 30 commits February 10, 2019 16:05
…and fix edit rule issue when cancel (#370)

- Make fallbackToLocalWhenFail of cluster rules configurable in dashboard
- Fix edit rule when hit cancel button (object share problem solved by deep copy)
- Add metric table td header's title for friendly prompt info
- implement `SentinelPreFilter`, `SentinelPostFilter` and `SentinelErrorFilter`
- support fallback
…WarmUpRateLimiterController

Signed-off-by: Carpenter Lee <[email protected]>
… ClassNotFoundException thrown by Nacos client (#438)
…#465)

- reuse old map size to avoid rearrange and rehash the map
- Apply awaitility to core tests
- Cache maven local repo in Travis
sczyh30 and others added 10 commits February 10, 2019 16:05
* Extract getRule in BlockException and refine override methods in subclasses

Signed-off-by: Eric Zhao <[email protected]>
- The NPE will occur when multiple threads are trying to create the connection group for the same namespace

Signed-off-by: Eric Zhao <[email protected]>
同步远程仓库最近代码
fix ConcurrentModificationException of listResourcesOfApp method
@codecov-io
Copy link

Codecov Report

Merging #488 into master will increase coverage by 0.02%.
The diff coverage is n/a.

Impacted file tree graph

@@             Coverage Diff              @@
##             master     #488      +/-   ##
============================================
+ Coverage     40.72%   40.75%   +0.02%     
- Complexity     1095     1097       +2     
============================================
  Files           236      236              
  Lines          7570     7570              
  Branches       1050     1050              
============================================
+ Hits           3083     3085       +2     
+ Misses         4090     4088       -2     
  Partials        397      397
Impacted Files Coverage Δ Complexity Δ
...a/csp/sentinel/slots/statistic/base/LeapArray.java 69.62% <0%> (-2.54%) 25% <0%> (-1%)
...a/com/alibaba/csp/sentinel/node/StatisticNode.java 83.6% <0%> (+1.63%) 29% <0%> (+1%) ⬆️
...ibaba/csp/sentinel/eagleeye/StatLogController.java 68.13% <0%> (+2.19%) 6% <0%> (+1%) ⬆️
.../com/alibaba/csp/sentinel/eagleeye/StatLogger.java 69.23% <0%> (+2.56%) 12% <0%> (+1%) ⬆️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update ee4a0d4...2109367. Read the comment docs.

@sczyh30 sczyh30 added the to-review To review label Feb 18, 2019
@sczyh30 sczyh30 changed the title fix dashboard concurrent error Fix concurrent error in InMemoryMetricsRepository of the dashboard Feb 22, 2019
Copy link
Member

@sczyh30 sczyh30 left a comment

Choose a reason for hiding this comment

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

LGTM

@sczyh30 sczyh30 merged commit b309dbe into alibaba:master Feb 22, 2019
@sczyh30
Copy link
Member

sczyh30 commented Feb 22, 2019

Thanks for contributing!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1.4.0 dashboard, found concurrent errors