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

Commits on Feb 10, 2019

  1. Configuration menu
    Copy the full SHA
    faac56d View commit details
    Browse the repository at this point in the history
  2. dashboard: make fallbackToLocalWhenFail be configurable in dashboard …

    …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
    cdfive authored and nick-tan committed Feb 10, 2019
    Configuration menu
    Copy the full SHA
    4c4cb34 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    d3b3d65 View commit details
    Browse the repository at this point in the history
  4. dashboard: structure rearrangement and polish related code

    Signed-off-by: Eric Zhao <[email protected]>
    sczyh30 authored and nick-tan committed Feb 10, 2019
    Configuration menu
    Copy the full SHA
    471bdf7 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    883565a View commit details
    Browse the repository at this point in the history
  6. dashboard: frontend refinement of monitoring page and flow rule dialo…

    …g description
    
    Signed-off-by: Eric Zhao <[email protected]>
    sczyh30 authored and nick-tan committed Feb 10, 2019
    Configuration menu
    Copy the full SHA
    4118cae View commit details
    Browse the repository at this point in the history
  7. Add adapter support for Zuul 1.x (#188)

    - implement `SentinelPreFilter`, `SentinelPostFilter` and `SentinelErrorFilter`
    - support fallback
    tigerMoon authored and nick-tan committed Feb 10, 2019
    Configuration menu
    Copy the full SHA
    219877d View commit details
    Browse the repository at this point in the history
  8. Update document and pom for sentinel-zuul-adapter

    Signed-off-by: Eric Zhao <[email protected]>
    sczyh30 authored and nick-tan committed Feb 10, 2019
    Configuration menu
    Copy the full SHA
    95ca72c View commit details
    Browse the repository at this point in the history
  9. Update cluster demo README and remove unused demo

    Signed-off-by: Eric Zhao <[email protected]>
    sczyh30 authored and nick-tan committed Feb 10, 2019
    Configuration menu
    Copy the full SHA
    cca5849 View commit details
    Browse the repository at this point in the history
  10. Configuration menu
    Copy the full SHA
    5759397 View commit details
    Browse the repository at this point in the history
  11. Configuration menu
    Copy the full SHA
    f089afd View commit details
    Browse the repository at this point in the history
  12. dashboard: when click the first-level menu of sidebar, don't jump to …

    …the home page (#422)
    cdfive authored and nick-tan committed Feb 10, 2019
    Configuration menu
    Copy the full SHA
    d352f41 View commit details
    Browse the repository at this point in the history
  13. Bug fix: fix 420, fix negative waitTime in RateLimiterController and …

    …WarmUpRateLimiterController
    
    Signed-off-by: Carpenter Lee <[email protected]>
    CarpenterLee authored and nick-tan committed Feb 10, 2019
    Configuration menu
    Copy the full SHA
    aacb4d6 View commit details
    Browse the repository at this point in the history
  14. Improve cluster embedded demo

    Signed-off-by: Eric Zhao <[email protected]>
    sczyh30 authored and nick-tan committed Feb 10, 2019
    Configuration menu
    Copy the full SHA
    dd11dc3 View commit details
    Browse the repository at this point in the history
  15. Configuration menu
    Copy the full SHA
    9465fee View commit details
    Browse the repository at this point in the history
  16. Configuration menu
    Copy the full SHA
    636ba05 View commit details
    Browse the repository at this point in the history
  17. Rename dashboard package name from com.taobao to com.alibaba (#435)

    Signed-off-by: Carpenter Lee <[email protected]>
    CarpenterLee authored and nick-tan committed Feb 10, 2019
    Configuration menu
    Copy the full SHA
    829fde2 View commit details
    Browse the repository at this point in the history
  18. Add logback dependency in sentinel-demo-nacos-datasource to avoid log…

    … ClassNotFoundException thrown by Nacos client (#438)
    lltx authored and nick-tan committed Feb 10, 2019
    Configuration menu
    Copy the full SHA
    b760ad9 View commit details
    Browse the repository at this point in the history
  19. dashboard: update WebConfig and improve token server list page

    Signed-off-by: Eric Zhao <[email protected]>
    sczyh30 authored and nick-tan committed Feb 10, 2019
    Configuration menu
    Copy the full SHA
    1f8236a View commit details
    Browse the repository at this point in the history
  20. Add catch throwable logic in ClusterStateManager to detect fatal erro…

    …r when loading SPI
    
    Signed-off-by: Eric Zhao <[email protected]>
    sczyh30 authored and nick-tan committed Feb 10, 2019
    Configuration menu
    Copy the full SHA
    9e62b68 View commit details
    Browse the repository at this point in the history
  21. Fixes #453: Support tracing exception count for specific entry or con…

    …text in Tracer
    
    Signed-off-by: Eric Zhao <[email protected]>
    sczyh30 authored and nick-tan committed Feb 10, 2019
    Configuration menu
    Copy the full SHA
    b1238f8 View commit details
    Browse the repository at this point in the history
  22. Remove slf4j dependency in sentinel-annotation-aspectj

    Signed-off-by: Eric Zhao <[email protected]>
    sczyh30 authored and nick-tan committed Feb 10, 2019
    Configuration menu
    Copy the full SHA
    c1c9367 View commit details
    Browse the repository at this point in the history
  23. Configuration menu
    Copy the full SHA
    9e257f1 View commit details
    Browse the repository at this point in the history
  24. Configuration menu
    Copy the full SHA
    75eb58d View commit details
    Browse the repository at this point in the history
  25. Configuration menu
    Copy the full SHA
    8059408 View commit details
    Browse the repository at this point in the history
  26. HashMap init optimize when adding new ClusterNode to cluster node map (

    …#465)
    
    - reuse old map size to avoid rearrange and rehash the map
    luoxn28 authored and nick-tan committed Feb 10, 2019
    Configuration menu
    Copy the full SHA
    4364339 View commit details
    Browse the repository at this point in the history
  27. Code and javadoc refinement

    Signed-off-by: Eric Zhao <[email protected]>
    sczyh30 authored and nick-tan committed Feb 10, 2019
    Configuration menu
    Copy the full SHA
    146dee9 View commit details
    Browse the repository at this point in the history
  28. Update dependency version of fastjson and jacoco-maven-plugin

    Signed-off-by: Eric Zhao <[email protected]>
    sczyh30 authored and nick-tan committed Feb 10, 2019
    Configuration menu
    Copy the full SHA
    abad82a View commit details
    Browse the repository at this point in the history
  29. Make build faster by reducing fixed waiting time in tests (#449)

    - Apply awaitility to core tests
    - Cache maven local repo in Travis
    aalmiray authored and nick-tan committed Feb 10, 2019
    Configuration menu
    Copy the full SHA
    45b4f97 View commit details
    Browse the repository at this point in the history
  30. Configuration menu
    Copy the full SHA
    da5e1cd View commit details
    Browse the repository at this point in the history
  31. Refinement for test cases

    Signed-off-by: Eric Zhao <[email protected]>
    sczyh30 authored and nick-tan committed Feb 10, 2019
    Configuration menu
    Copy the full SHA
    7155634 View commit details
    Browse the repository at this point in the history
  32. Add back thread count metric type support for parameter flow control

    Signed-off-by: Eric Zhao <[email protected]>
    sczyh30 authored and nick-tan committed Feb 10, 2019
    Configuration menu
    Copy the full SHA
    cb2cb2f View commit details
    Browse the repository at this point in the history
  33. Configuration menu
    Copy the full SHA
    c0d9318 View commit details
    Browse the repository at this point in the history
  34. Improve ClusterServerConfigManager in sentinel-cluster-server-default…

    … and add basic test cases
    
    Signed-off-by: Eric Zhao <[email protected]>
    sczyh30 authored and nick-tan committed Feb 10, 2019
    Configuration menu
    Copy the full SHA
    5f98bf0 View commit details
    Browse the repository at this point in the history
  35. Configuration menu
    Copy the full SHA
    9ea2d7c View commit details
    Browse the repository at this point in the history
  36. Carry the triggered rule in subclasses of BlockException (#469)

    * Extract getRule in BlockException and refine override methods in subclasses
    
    Signed-off-by: Eric Zhao <[email protected]>
    sczyh30 authored and nick-tan committed Feb 10, 2019
    Configuration menu
    Copy the full SHA
    0095762 View commit details
    Browse the repository at this point in the history
  37. Fix NPE bug when creating connection group in ConnectionManager

    - 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]>
    sczyh30 authored and nick-tan committed Feb 10, 2019
    Configuration menu
    Copy the full SHA
    7fb4ebf View commit details
    Browse the repository at this point in the history
  38. Improve and fix bugs for ConnectionManager and add test cases

    Signed-off-by: Eric Zhao <[email protected]>
    sczyh30 authored and nick-tan committed Feb 10, 2019
    Configuration menu
    Copy the full SHA
    9b9c502 View commit details
    Browse the repository at this point in the history

Commits on Feb 17, 2019

  1. Merge pull request #2 from alibaba/master

    同步远程仓库最近代码
    nick-tan authored Feb 17, 2019
    Configuration menu
    Copy the full SHA
    04fc367 View commit details
    Browse the repository at this point in the history
  2. fix dashboard listResourcesOfApp concurrent error

    fix ConcurrentModificationException of listResourcesOfApp method
    nick-tan committed Feb 17, 2019
    Configuration menu
    Copy the full SHA
    2109367 View commit details
    Browse the repository at this point in the history