Fix incremental loader cleanup when no run statements are defined#875
Merged
k8s-ci-robot merged 1 commit intobazelbuild:masterfrom Jun 11, 2019
Merged
Conversation
clintharrison
requested review from
alex1545,
nlopezgi,
smukherj1 and
xingao267
as code owners
xingao267
reviewed
Jun 11, 2019
| if [ "a$*" != "a--norun" ]; then | ||
| # This is not executed if the single argument --norun is passed or | ||
| # no run_statements are generated (in which case, 'run' is 'False'). | ||
| if [[ "a$*" != "a--norun" && "%{run}" == "True" ]]; then |
Contributor
There was a problem hiding this comment.
You can probably reuse run_statements and check if that's not an empty string here.
Contributor
Author
There was a problem hiding this comment.
I was hesitant to do that -- run_statements can be modified by the consumer's docker_run_flags attribute, and this might contain double quotes.
clintharrison
force-pushed
the
incr-loader-no-run-statements
branch
from
d6170ce to
7ceb289
Compare
xingao267
approved these changes
Jun 11, 2019
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: clintharrison, xingao267 The full list of commands accepted by this bot can be found here. The pull request process is described here DetailsNeeds approval from an approver in each of these files:
Approvers can indicate their approval by writing |
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
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.
This fixes the bug mentioned in #793. When we don't generate any run statements (that is,
runinincremental_load()is false), we don'texec docker, and the cleanup runs twice.