Validate index refreshing state before cancel job #2728
Closed
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Signed-off-by: Sean Kao <[email protected]>
Signed-off-by: Sean Kao <[email protected]>
Signed-off-by: Sean Kao <[email protected]>
Signed-off-by: Sean Kao <[email protected]>
Signed-off-by: Sean Kao <[email protected]>
seankao-az
commented
Jun 8, 2024
| @@ -70,7 +70,7 @@ public GetJobRunResult getJobRunResult(String applicationId, String jobId) { | |||
| MockFlintSparkJob flintIndexJob = | |||
| new MockFlintSparkJob( | |||
| flintIndexStateModelService, mockDS.getLatestId(), MYS3_DATASOURCE); | |||
| flintIndexJob.active(); | |||
| flintIndexJob.refreshing(); | |||
There was a problem hiding this comment.
Changing these because
- Auto refresh index's normal state is
REFRESHING. It shouldn't beACTIVE - This PR introduce a change where cancelStreamingJob will only be called if index state is initially
REFRESHING
Signed-off-by: Sean Kao <[email protected]>
seankao-az
commented
Jun 8, 2024
Comment on lines
-304
to
-311
| flintIndexJob.assertState(FlintIndexState.ACTIVE); | ||
| localEMRSClient.startJobRunCalled(1); | ||
| localEMRSClient.getJobRunResultCalled(1); | ||
| localEMRSClient.cancelJobRunCalled(0); | ||
| Map<String, Object> mappings = mockDS.getIndexMappings(); | ||
| Map<String, Object> meta = (HashMap<String, Object>) mappings.get("_meta"); | ||
| Map<String, Object> options = (Map<String, Object>) meta.get("options"); | ||
| Assertions.assertEquals("false", options.get("auto_refresh")); |
There was a problem hiding this comment.
auto_refresh and index state should be updated in EMR job, not remain unchanged
seankao-az
commented
Jun 8, 2024
| @@ -479,7 +479,7 @@ public GetJobRunResult getJobRunResult(String applicationId, String jobId) { | |||
| /** | |||
| * Index state is stable, Drop Index operation is retryable, expectation is | |||
| * | |||
| * <p>(1) call EMR-S (2) change index state to: DELETED | |||
| * <p>(1) not call EMR-S (2) change index state to: DELETED | |||
There was a problem hiding this comment.
This PR prevents cancelling job for active index
Signed-off-by: Sean Kao <[email protected]>
seankao-az
requested review from
ps48,
kavithacm,
derek-ho,
joshuali925,
dai-chen,
YANG-DB,
rupal-bq,
mengweieric,
vamsimanohar,
Swiddis,
penghuo,
MaxKsyunz,
Yury-Fridlyand,
anirudha and
forestmvey
as code owners
seankao-az
requested review from
acarbonetto,
GumpacG and
ykmr1224
as code owners
penghuo
reviewed
Jun 10, 2024
| @@ -143,6 +146,13 @@ private void commit(FlintIndexStateModel flintIndex) { | |||
| */ | |||
| public void cancelStreamingJob(FlintIndexStateModel flintIndexStateModel) | |||
| throws InterruptedException, TimeoutException { | |||
| // TODO: null handling | |||
| if (initialFlintIndexStateModel.getIndexState() != FlintIndexState.REFRESHING) { | |||
There was a problem hiding this comment.
the condition check should in validate(FlintIndexState state)?
There was a problem hiding this comment.
but validate for DROP and ALTER both allows for states other than REFRESHING. Need additional check for cancelStreamingJob itself
| // TODO: null handling | ||
| if (initialFlintIndexStateModel.getIndexState() != FlintIndexState.REFRESHING) { | ||
| // Only refreshing index will have a job to cancel. Adding this validation prevents cancelling | ||
| // the interactive job where a non-auto-refresh index is created. |
There was a problem hiding this comment.
add log.info is exist early.
|
Synced up with @seankao-az. Moving index jobs to FlintJob might be a cleaner solution..also ideally jobId should be correctly populated. |
|
drafting another PR for a different fix per discussion offline |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
Validate index state when cancelling job. Only cancel when index is refreshing.
Updated behavior of several test cases (please see comments in code)
Issues Resolved
Check List
By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.
For more information on following Developer Certificate of Origin and signing off your commits, please check here.