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

合并master分支到develop并解决冲突,为后续develop合并回master做准备 #364

Open
wants to merge 32 commits into
base: develop
Choose a base branch
from

Conversation

dbl-x
Copy link

@dbl-x dbl-x commented Feb 5, 2025

Motivation:

Explain the context, and why you're making that change.
To make others understand what is the problem you're trying to solve.

Modification:

Describe the idea and modifications you've done.

Result:

Fixes #.

If there is no issue then describe the changes introduced by this PR.

linxin and others added 30 commits February 13, 2023 21:44
1. remove WriteDataProcessor: avoid creating unnecessary objects
2. standardize the use of generic types to avoid code warnings
1. remove WriteDataProcessor: avoid creating unnecessary objects
2. standardize the use of generic types to avoid code warnings
* fit test case

* fix sql

* add keyed thread pool metrics

* recent datum delay

* only log when slottable change

* [bugfix] no notification events when slot-table epoch not changed

* fix cleaner

* fix lock

* fix npe

* meta leader listeners

* fix NullPointException

* change list to set

* client manager reduce

* client manager reduce

* client manager reduce

* client manager reduce

* config with datanotify

* [bugfix] fix provide data data_center

* [bugfix] fix provide data data_center

* export protection mode

* no slot-stats update while warming up

* fix balanced api

* cleaner resource test

* [bugfix]dataserver init fail when meta is in protect-mode, as dataserver will receive INIT slottable

* remove unused codes

* more info about slot-table error

* stop push not break meta server

* [bugfix]npe bug fixed due to no slot-table

* check for null slot

* remove pending lock

* debug informer

* [bugfix] informer unordered id

* hack async log

* fix cycle dependency

* [opt] push empty skip

* push fail circuit breaker

* [bugfix] circle reference

* scan with callback, avoid slow dataNode block the scan

* getReleaseProps with arg=file

* fix spring ref

* open push after init

* client manager address informer

* support minute-level statistics

* remove cross-dc supported, avoid the circular dependency

* push data count

* scanVersion checkeck stopPush

* start watchdog after context refreshed

* shutdown without hook when boot failed to avoid shutdown deadlock

* fix NPE

* fix NPE

* change log

* fix trigger session

* change sql log level

* fix ut

* add scan circuit breaker

* - check push.task.reg when buffer
 - add concurrencyLevel

* add abstract func needRetry

* large datum push circuit breaker

* - add log
 - add metrics
 - onChange when clean lease

* safe logger

* fix: pubsize npe

* perf clean

* perf clean

* remove task listener

* thread local string builder

* data info string builder

* pub size metric

* fix npe

* buffer sub.reg and batch process

* - remove lock
 - add dataInfoIdCount

* overflow with retry

* overflow with retry

* - fix sub group by scope
 - fix push trace when commit error

* - break watch when stoppush
 - fix test

* safe logging zero allocate

* add session scan data slo

* - add group/instance for pub/sub log
 - fix notify when migrating finish

* add meta leader heartbeat slo

* app discovery replace dataid

* clone publisher util

* config thread size

* add client manager cleaner

* print apprevision register size && print informer revision size

* meta cleaner override

* fix appname

* data trace time

* fix null point exception & add log

* fix publisher.intern

* url word cache

* url remove addresssting

* url remove addresssting

* url word cache

* intern attributes

* - add scan log
 - puthandler not return map as result

* change dev&sit db config

* app revision cleaner switch

* - scan subs to get versions and pushempty
 - sub.pushctx use singtonmap

* set DML timeout config

* session and data check slot table status

* clientoff executor to single thread worker

* optimize map memory

* push empty version

* upgrade pom version

* fix metrics group

* fix watermark

* reduce retry timeout

* persistence client off

* client off load delay metric

* mark push empty

* fix scan push empty version

* code format

* scan client open fail

* scan client open fail

* query pub and sub dataInfoId by ips

* - fix watermark
 - add log

* skip update version on same value

* change server box equals

* fix cycle dependency

* fix get slot table status

* fix reg delay

* upgrade version to 6.1.0

* fix push trace

* auto block

* connect index

* sub client off

* bolt channel attribute

* sub ips handler

* fix oom

* fix boltchannel attribute

* ut

* bugfix drm api

* unpub not change data.version if data not exist

* upgrate version 6.1.1

* sub clientoff

* sub clientoff

* sub clientoff

* set slotFollowerSyncLeaderIntervalSecs

* sub clientoff

* data notify change to 2000ms

* fix testcase

* fix testcase

* sub clientoff

* compress

* get data compress

* set pushCircuitBreakerThreshold=10

* fix test

* fix testcase

* fix  databox NPE

* fix testcase

* perf calc size

* - use pushrecord to replace pushtask, pushtask is memory overhead after pushed

* max buffer size && hessian throwable

* fix NPE

* recover cluster config

* stop session server switch

* fix some comment

* persistence reduce not deal with disconnect

* add testcase

* datum pub count summary api

* emergency api on session

* fix provide data getAll

* empty

* revision count alarm

* upgrade pom version

* support docker

* localhost address

* distribute lock sql

* docker compose

* kube

* shutdown hook

* add testcase

* upgrade version

* env key

* deploy config

* cleanup

* add GitHub action (sofastack#182)

* Migrate from TravisCI to Github Actions (sofastack#155)

* Create maven.yml

* Update maven.yml

* Update README.md

* Update README.md

* Update README.md

remove personal NickNYU

* Update maven.yml

Update README.md

* split executor in session and data (sofastack#152)

* default disable drop connections

* lint

* start check client version cron

* don't use bolt-default-executor (sofastack#151)

Update README.md

Update README.md

remove personal NickNYU

Co-authored-by: dzdx <[email protected]>
Co-authored-by: 忘禅 <[email protected]>

* Create feature_request.md

* github action

Co-authored-by: Chen <[email protected]>
Co-authored-by: 忘禅 <[email protected]>

* Update README.md (sofastack#183)

Update JDK recommendation on README.md (sofastack#165)

Co-authored-by: wilsonvolker <[email protected]>

* codecov (sofastack#184)

* update badge

* add cover ignore

* update image repositry (sofastack#185)

* remove tracer

* upgrade log4j2

* persistence client off on session and check

* address circuit breaker

* distribute lock renew

* distribute lock use unix timestamp

* node operate intercept

* not circuit breake on sub.register

* skip distribution module package

* password decrypt

* connection mapper

* remove clientoff check

* Revert "remove clientoff check"

This reverts commit 776bdc5.

* Revert "connection mapper"

This reverts commit ccf7dc9.

* Revert "password decrypt"

This reverts commit 72e5503.

* fix internation client off

* ats client

* fix session scan slo

* fix session scan slo

* add circuit breaker log

* support multi datacenter

support multi datacenter

* fix testcase

* release 6.1.7

* metadata register async

* support multi datacenter

* support multi datacenter

* support multi datacenter

* fix aci

* merge pom.xml

* fix compile error

* support multi datacenter

* 1.fix revision heartbeat; 2.rename git.properties

* support multi datacenter

* support multi datacenter

* support multi datacenter

* support multi datacenter

* support multi datacenter

* support multi datacenter

* support multi datacenter

* support multi datacenter

* fix push datum version

* support multi datacenter

* support multi datacenter

* support multi datacenter

* support multi datacenter

* support multi datacenter

* set version to 6.2.0

* fix pmd

* fix pmd

* fix pmd

* fix app revision clean bug

* PullRequest: 526 multi datacenter

* logger data change

* fix data change notify remote data

* upgrade version to 6.2.1-SNAPSHOT

* change syncDataCenters to pushDataCenters when scan

* use pushEnable insteadof stoppush while push remote datacenter

* add multi test case

* fix pmd

* Add security policy (sofastack#275)

LGTM

* resolve version conflict

* change SessionCacheDigestTask timer to ScheduledExecutorService

* format code

* format code

---------

Co-authored-by: 昱恒 <[email protected]>
Co-authored-by: 向旭 <[email protected]>
Co-authored-by: yuzhi.lyz <[email protected]>
Co-authored-by: 忘禅 <[email protected]>
Co-authored-by: myscm <[email protected]>
Co-authored-by: dzdx <[email protected]>
Co-authored-by: Chen <[email protected]>
Co-authored-by: 忘禅 <[email protected]>
Co-authored-by: wilsonvolker <[email protected]>
Co-authored-by: 江村 <[email protected]>
Co-authored-by: jiangcun.hlc <[email protected]>
Co-authored-by: 昱恒 <[email protected]>
Co-authored-by: Jason Song <[email protected]>
* increase remoteSyncSlotLeaderExecutorQueueSize and remoteSyncSlotLeaderExecutorThreadSize

* fix completeSyncRemoteDataIdTask

* fix sync delta and add metric

* fix sync delta and add metric

---------

Co-authored-by: 昱恒 <[email protected]>
* increase remoteSyncSlotLeaderExecutorQueueSize and remoteSyncSlotLeaderExecutorThreadSize

* fix sync delta and add metric

* multi sub session metric

* fix unit test yaml

---------

Co-authored-by: 昱恒 <[email protected]>
* skip maven-surefire-plugin default-test execute

* metric sync_delta and sync_all with datacenter label

* metric push delay with datacenter label

* metric push delay with datacenter label

---------

Co-authored-by: 昱恒 <[email protected]>
sofastack#300)

* get remote slottable from local meta leader fail when meta leader not warmup

* format code

* format code

* format code

* fix unit test case

---------

Co-authored-by: 昱恒 <[email protected]>
* push delay time config

* fix review

---------

Co-authored-by: 江村 <[email protected]>
6.3.0version release

Co-authored-by: 江村 <[email protected]>
* perf: remove redundant volatile

* fix: leaderInfo should be use volatile

* fix: recover these variables are use volatile that the get method is not protect by synchronized.

* fix: the get method of pushedVersion and attributes is not protect by synchronized when in print log.
* Remove unproper usage of StringUtil

Using apache common-langs StringUtils instead of sofa-common-util's StringUtil under profile package, sofa-common-utils's StringUtil under profile package is removed from newer sofa-common-util version.

* Reformat

---------

Co-authored-by: 鲁直 <[email protected]>
* ensure session startup period listLoop executed in front of watchLoop, otherwise session start is very slowly

* fix app revision query log bug

* app revision not exist fix

* fix ut

* renaming RevisionNotExistError

* stopPush API add Basic Auth

Adjust the revision exception

* 修改版本

* Issue of high CPU usage by the meta leader, replace Jackson with Gson

* fix auth response status

* api auth support multiple tokens & Add BenchMark for jsonRead black

---------

Co-authored-by: 江村 <[email protected]>
* 提供API查询session链接数

* fix node forbidden bug

* support top sub/pub query api

* interface app cleaner

* sessionNode renew add weight

* default push opened

* connection load balance support p2c

* update version & fix & add ut

* fix ut & git uint test add dump

* set unit test timeout

* registry-client compatible old version server

* fix p2c client bug

* fix log & update version
Copy link

coderabbitai bot commented Feb 5, 2025

Important

Review skipped

Auto reviews are disabled on base/target branches other than the default branch.

Please check the settings in the CodeRabbit UI or the .coderabbit.yaml file in this repository. To trigger a single review, invoke the @coderabbitai review command.

You can disable this status message by setting the reviews.review_status to false in the CodeRabbit configuration file.


Thank you for using CodeRabbit. We offer it for free to the OSS community and would appreciate your support in helping us grow. If you find it useful, would you consider giving us a shout-out on your favorite social media?

❤️ Share
🪧 Tips

Chat

There are 3 ways to chat with CodeRabbit:

  • Review comments: Directly reply to a review comment made by CodeRabbit. Example:
    • I pushed a fix in commit <commit_id>, please review it.
    • Generate unit testing code for this file.
    • Open a follow-up GitHub issue for this discussion.
  • Files and specific lines of code (under the "Files changed" tab): Tag @coderabbitai in a new review comment at the desired location with your query. Examples:
    • @coderabbitai generate unit testing code for this file.
    • @coderabbitai modularize this function.
  • PR comments: Tag @coderabbitai in a new PR comment to ask questions about the PR branch. For the best results, please provide a very specific query, as very limited context is provided in this mode. Examples:
    • @coderabbitai gather interesting stats about this repository and render them as a table. Additionally, render a pie chart showing the language distribution in the codebase.
    • @coderabbitai read src/utils.ts and generate unit testing code.
    • @coderabbitai read the files in the src/scheduler package and generate a class diagram using mermaid and a README in the markdown format.
    • @coderabbitai help me debug CodeRabbit configuration file.

Note: Be mindful of the bot's finite context window. It's strongly recommended to break down tasks such as reading entire modules into smaller chunks. For a focused discussion, use review comments to chat about specific files and their changes, instead of using the PR comments.

CodeRabbit Commands (Invoked using PR comments)

  • @coderabbitai pause to pause the reviews on a PR.
  • @coderabbitai resume to resume the paused reviews.
  • @coderabbitai review to trigger an incremental review. This is useful when automatic reviews are disabled for the repository.
  • @coderabbitai full review to do a full review from scratch and review all the files again.
  • @coderabbitai summary to regenerate the summary of the PR.
  • @coderabbitai generate docstrings to generate docstrings for this PR. (Beta)
  • @coderabbitai resolve resolve all the CodeRabbit review comments.
  • @coderabbitai configuration to show the current CodeRabbit configuration for the repository.
  • @coderabbitai help to get help.

Other keywords and placeholders

  • Add @coderabbitai ignore anywhere in the PR description to prevent this PR from being reviewed.
  • Add @coderabbitai summary to generate the high-level summary at a specific location in the PR description.
  • Add @coderabbitai anywhere in the PR title to generate the title automatically.

CodeRabbit Configuration File (.coderabbit.yaml)

  • You can programmatically configure CodeRabbit by adding a .coderabbit.yaml file to the root of your repository.
  • Please see the configuration documentation for more information.
  • If your editor has YAML language server enabled, you can add the path at the top of this file to enable auto-completion and validation: # yaml-language-server: $schema=https://coderabbit.ai/integrations/schema.v2.json

Documentation and Community

  • Visit our Documentation for detailed information on how to use CodeRabbit.
  • Join our Discord Community to get help, request features, and share feedback.
  • Follow us on X/Twitter for updates and announcements.

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

Successfully merging this pull request may close these issues.

6 participants