Skip to content

Conversation

@zhuzhurk
Copy link
Contributor

What is the purpose of the change

This PR is to fix the NPE problem which can happen when a slot is offered before JM is connected to a RM.

Brief change log

See the commit.

Verifying this change

  • Added unit test for the case that a slot is offered before SlotPool is connected to a RM

Does this pull request potentially affect one of the following parts:

  • Dependencies (does it add or upgrade a dependency): (yes / no)
  • The public API, i.e., is any changed class annotated with @Public(Evolving): (yes / no)
  • The serializers: (yes / no / don't know)
  • The runtime per-record code paths (performance sensitive): (yes / no / don't know)
  • Anything that affects deployment or recovery: JobManager (and its components), Checkpointing, Kubernetes/Yarn/Mesos, ZooKeeper: (yes / no / don't know)
  • The S3 file system connector: (yes / no / don't know)

Documentation

  • Does this pull request introduce a new feature? (yes / no)
  • If yes, how is the feature documented? (not applicable / docs / JavaDocs / not documented)

@zhuzhurk
Copy link
Contributor Author

@azagrebin @tillrohrmann would you take a look at this fix when convenient?

@flinkbot
Copy link
Collaborator

Thanks a lot for your contribution to the Apache Flink project. I'm the @flinkbot. I help the community
to review your pull request. We will use this comment to track the progress of the review.

Automated Checks

Last check on commit 8e28cd7 (Sun Jun 21 09:00:30 UTC 2020)

Warnings:

  • No documentation files were touched! Remember to keep the Flink docs up to date!

Mention the bot in a comment to re-run the automated checks.

Review Progress

  • ❓ 1. The [description] looks good.
  • ❓ 2. There is [consensus] that the contribution should go into to Flink.
  • ❓ 3. Needs [attention] from.
  • ❓ 4. The change fits into the overall [architecture].
  • ❓ 5. Overall code [quality] is good.

Please see the Pull Request Review Guide for a full explanation of the review process.

Details
The Bot is tracking the review progress through labels. Labels are applied according to the order of the review items. For consensus, approval by a Flink committer of PMC member is required Bot commands
The @flinkbot bot supports the following commands:

  • @flinkbot approve description to approve one or more aspects (aspects: description, consensus, architecture and quality)
  • @flinkbot approve all to approve all aspects
  • @flinkbot approve-until architecture to approve everything until architecture
  • @flinkbot attention @username1 [@username2 ..] to require somebody's attention
  • @flinkbot disapprove architecture to remove an approval you gave earlier

@zhuzhurk zhuzhurk force-pushed the FLINK_18372_fix_SlotPoolImpl_NPE branch from 8e28cd7 to e7777af Compare June 21, 2020 09:04
@flinkbot
Copy link
Collaborator

flinkbot commented Jun 21, 2020

CI report:

Bot commands The @flinkbot bot supports the following commands:
  • @flinkbot run travis re-run the last Travis build
  • @flinkbot run azure re-run the last Azure build

Copy link
Contributor

@tillrohrmann tillrohrmann left a comment

Choose a reason for hiding this comment

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

Thanks for creating this PR @zhuzhurk. The changes look good to me. I had a comment concerning querying pendingRequests which might have resulted from wrong assumptions about the internal state of the component.

maybeRemapOrphanedAllocation(allocationIdOfRequest, allocatedSlot.getAllocationId());
// the allocation id can be null if the request was fulfilled by a slot directly offered
// by a reconnected TaskExecutor before the ResourceManager is connected
if (allocationIdOfRequest != null) {
Copy link
Contributor

Choose a reason for hiding this comment

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

I think you could directly ask pendingRequest.getAllocationId(). That way you would not need to query pendingRequests again.

Copy link
Contributor

Choose a reason for hiding this comment

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

Moreover, there is no invariant which states that pendingRequests contains the mapping. Hence, it would also make sense to directly ask pendingRequest here.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Agreed. done.

@zhuzhurk zhuzhurk force-pushed the FLINK_18372_fix_SlotPoolImpl_NPE branch 2 times, most recently from 16edfbe to 922cafd Compare June 22, 2020 11:09
@zhuzhurk zhuzhurk merged commit 6d52d04 into apache:master Jun 22, 2020
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.

4 participants