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

Move creating live instance after carryover current state #2889

Merged
merged 1 commit into from
Aug 28, 2024
Merged

Move creating live instance after carryover current state #2889

merged 1 commit into from
Aug 28, 2024

Conversation

frankmu
Copy link
Contributor

@frankmu frankmu commented Aug 23, 2024 •
edited
Loading

Issues

  • My PR addresses the following Helix issues and references them in the PR description:

resolves #2822

Description

  • Here are some details about my PR, including screenshots of any UI changes:

When implementing the stickiness assignment strategy, noticed a race condition: for some cases in the cache in CurrentStateComputationStage, the number of live instances doesn't match with the number of instances in current state. See screenshots:
Screenshot 2024-08-23 at 9 19 41 AM
Screenshot 2024-08-23 at 9 19 27 AM

Tests

  • The following tests are written for this issue:

(List the names of added unit/integration tests)

  • The following is the result of the "mvn test" command on the appropriate module:
INFO] Results:
[INFO] 
[ERROR] Failures: 
[ERROR]   TestAssignableNode.testIncompleteInstanceCapacity » Test 
The exception was th...
[ERROR]   TestDelayedAutoRebalanceWithDisabledInstance.testMinimalActiveReplicaMaintainWithOneOffline:159 expected:<true> but was:<false>
[ERROR]   TestInstanceOperation.testSwapEvacuateAdd:1075->verifier:1637 expected:<true> but was:<false>
[ERROR]   TestJobTimeoutTaskNotStarted.testTaskNotStarted:154 » Helix Workflow timeoutWo...
[ERROR]   TestTaskCurrentStateNull.testCurrentStateNull:118 » Helix Workflow testCurrent...
[ERROR]   TestTaskRebalancerStopResume.stopDeleteJobAndResumeNamedQueue:247 » Helix Work...
[INFO] 
[ERROR] Tests run: 1427, Failures: 6, Errors: 0, Skipped: 11

The following tests passed after rerun individually:

mvn test -o -Dtest=TestDelayedAutoRebalanceWithDisabledInstance -pl=helix-core
mvn test -o -Dtest=TestInstanceOperation -pl=helix-core
mvn test -o -Dtest=TestJobTimeoutTaskNotStarted -pl=helix-core
mvn test -o -Dtest=TestTaskCurrentStateNull -pl=helix-core
mvn test -o -Dtest=TestTaskRebalancerStopResume -pl=helix-core

This unit test is trying to compare the map values as string which is not stable

mvn test -o -Dtest=TestAssignableNode -pl=helix-core
...
[ERROR] Tests run: 7, Failures: 1, Errors: 0, Skipped: 0, Time elapsed: 1.286 s <<< FAILURE! - in org.apache.helix.controller.rebalancer.waged.model.TestAssignableNode
[ERROR] testIncompleteInstanceCapacity(org.apache.helix.controller.rebalancer.waged.model.TestAssignableNode)  Time elapsed: 0.004 s  <<< FAILURE!
org.testng.TestException: 

The exception was thrown with the wrong message: expected "The required capacity keys: \[item2, item1, item3, AdditionalCapacityKey\] are not fully configured in the instance: testInstanceId, capacity map: \{item2=40, item1=20, item3=30\}." but got "The required capacity keys: [item2, item1, item3, AdditionalCapacityKey] are not fully configured in the instance: testInstanceId, capacity map: {item3=30, item2=40, item1=20}."
	at org.apache.helix.controller.rebalancer.waged.model.TestAssignableNode.testIncompleteInstanceCapacity(TestAssignableNode.java:300)

Changes that Break Backward Compatibility (Optional)

  • My PR contains changes that break backward compatibility or previous assumptions for certain methods or API. They include:

(Consider including all behavior changes for public methods or API. Also include these changes in merge description so that other developers are aware of these changes. This allows them to make relevant code changes in feature branches accounting for the new method/API behavior.)

Documentation (Optional)

  • In case of new functionality, my PR adds documentation in the following wiki page:

(Link the GitHub wiki you added)

Commits

  • My commits all reference appropriate Apache Helix GitHub issues in their subject lines. In addition, my commits follow the guidelines from "How to write a good git commit message":
    1. Subject is separated from body by a blank line
    2. Subject is limited to 50 characters (not including Jira issue reference)
    3. Subject does not end with a period
    4. Subject uses the imperative mood ("add", not "adding")
    5. Body wraps at 72 characters
    6. Body explains "what" and "why", not "how"

Code Quality

  • My diff has been formatted using helix-style.xml
    (helix-style-intellij.xml if IntelliJ IDE is used)

@frankmu frankmu marked this pull request as ready for review August 27, 2024 17:31
@junkaixue
Copy link
Contributor

Started the CI, let's see.

junkaixue
junkaixue approved these changes Aug 28, 2024
View reviewed changes
Copy link
Contributor

@junkaixue junkaixue left a comment

Choose a reason for hiding this comment

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

Seemed to be a safe change. Let's have it in.

If we found anything incompatible future, let's revert it and figure it out.

@junkaixue junkaixue merged commit f8a30cd into apache:master Aug 28, 2024
3 checks passed
@frankmu frankmu mentioned this pull request Aug 29, 2024
Merged
3 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@junkaixue junkaixue junkaixue approved these changes

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

Successfully merging this pull request may close these issues.

New Assignment / Rebalancer
3 participants
@frankmu @junkaixue @tengfmu