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: Prevent dispatcher merging if curTs is 0 #34562

Merged
merged 2 commits into from
Jul 10, 2024

Conversation

bigsheeper
Copy link
Contributor

When the main dispatcher has not yet consumed data, curTs is 0. During this time, merging dispatchers should not be allowed; otherwise, the data of the solo dispatcher will be skipped.

issue: #34255

Signed-off-by: bigsheeper <yihao.dai@zilliz.com>
@sre-ci-robot sre-ci-robot added the size/XS Denotes a PR that changes 0-9 lines. label Jul 10, 2024
@mergify mergify bot added dco-passed DCO check passed. kind/bug Issues or changes related a bug labels Jul 10, 2024
@czs007
Copy link
Contributor

czs007 commented Jul 10, 2024

/approve
/lgtm

@sre-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: bigsheeper, czs007

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

Signed-off-by: bigsheeper <yihao.dai@zilliz.com>
@sre-ci-robot sre-ci-robot added size/S Denotes a PR that changes 10-29 lines. and removed lgtm size/XS Denotes a PR that changes 0-9 lines. labels Jul 10, 2024
@mergify mergify bot added the ci-passed label Jul 10, 2024
Copy link

codecov bot commented Jul 10, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 84.37%. Comparing base (3c70463) to head (494a8e3).
Report is 6 commits behind head on master.

Additional details and impacted files

Impacted file tree graph

@@             Coverage Diff             @@
##           master   #34562       +/-   ##
===========================================
+ Coverage   71.48%   84.37%   +12.88%     
===========================================
  Files        1127      858      -269     
  Lines      139271   115155    -24116     
===========================================
- Hits        99556    97158     -2398     
+ Misses      35426    13706    -21720     
- Partials     4289     4291        +2     
Files Coverage Δ
pkg/mq/msgdispatcher/manager.go 95.78% <100.00%> (ø)

... and 292 files with indirect coverage changes

sre-ci-robot pushed a commit that referenced this pull request Jul 10, 2024
When the main dispatcher has not yet consumed data, curTs is 0. During
this time, merging dispatchers should not be allowed; otherwise, the
data of the solo dispatcher will be skipped.

issue: #34255

pr: #34562

---------

Signed-off-by: bigsheeper <yihao.dai@zilliz.com>
@czs007
Copy link
Contributor

czs007 commented Jul 10, 2024

/lgtm

@sre-ci-robot sre-ci-robot merged commit aef7664 into milvus-io:master Jul 10, 2024
12 checks passed
bigsheeper added a commit to bigsheeper/milvus that referenced this pull request Jul 12, 2024
When the main dispatcher has not yet consumed data, curTs is 0. During
this time, merging dispatchers should not be allowed; otherwise, the
data of the solo dispatcher will be skipped.

issue: milvus-io#34255

---------

Signed-off-by: bigsheeper <yihao.dai@zilliz.com>
bigsheeper added a commit to bigsheeper/milvus that referenced this pull request Jul 12, 2024
When the main dispatcher has not yet consumed data, curTs is 0. During
this time, merging dispatchers should not be allowed; otherwise, the
data of the solo dispatcher will be skipped.

issue: milvus-io#34255

---------

Signed-off-by: bigsheeper <yihao.dai@zilliz.com>
bigsheeper added a commit to bigsheeper/milvus that referenced this pull request Jul 12, 2024
…us-io#34563)

When the main dispatcher has not yet consumed data, curTs is 0. During
this time, merging dispatchers should not be allowed; otherwise, the
data of the solo dispatcher will be skipped.

issue: milvus-io#34255

pr: milvus-io#34562

---------

Signed-off-by: bigsheeper <yihao.dai@zilliz.com>
sre-ci-robot pushed a commit that referenced this pull request Jul 12, 2024
When the main dispatcher has not yet consumed data, curTs is 0. During
this time, merging dispatchers should not be allowed; otherwise, the
data of the solo dispatcher will be skipped.

issue: #34255

pr: #34562

Signed-off-by: bigsheeper <yihao.dai@zilliz.com>
bigsheeper added a commit to bigsheeper/milvus that referenced this pull request Jul 12, 2024
…us-io#34563)

When the main dispatcher has not yet consumed data, curTs is 0. During
this time, merging dispatchers should not be allowed; otherwise, the
data of the solo dispatcher will be skipped.

issue: milvus-io#34255

pr: milvus-io#34562

---------

Signed-off-by: bigsheeper <yihao.dai@zilliz.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved ci-passed dco-passed DCO check passed. kind/bug Issues or changes related a bug lgtm size/S Denotes a PR that changes 10-29 lines.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants