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 check_reconfigured ae_result to prevent retry loop and failure. #548

Merged
merged 1 commit into from
Jul 8, 2019

Conversation

tinaafitz
Copy link
Member

@tinaafitz tinaafitz commented Jul 5, 2019

Reset ae_reason and ae_result in check_refreshed when refresh_may_have_completed is true.

The update_result and update_reason state_vars contained the
previous values. The state_var update_result
value was still set to retry from the previous execution which caused
the state machine to retry instead of proceeding to the next state.
It had an additional side affect in that the retry was set with no retry
interval which caused the state machine to retry immediately instead of
waiting the usual 1 minute time interval.

Resetting those values enabled the state machine to progress to the next
state and complete successfully.

Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1720212

@coveralls
Copy link

coveralls commented Jul 5, 2019

Pull Request Test Coverage Report for Build 3297

  • 4 of 4 (100.0%) changed or added relevant lines in 1 file are covered.
  • No unchanged relevant lines lost coverage.
  • Overall coverage decreased (-0.01%) to 96.924%

Totals Coverage Status
Change from base Build 3235: -0.01%
Covered Lines: 2930
Relevant Lines: 3023

💛 - Coveralls

@tinaafitz tinaafitz force-pushed the fix_reconfigure branch 2 times, most recently from 23edc94 to d1f803b Compare July 7, 2019 11:19
refresh_may_have_completed is true.

The update_result and update_reason state_vars contained the
previous values.  The state_var update_result
value was still set to retry from the previous execution which caused
the state machine to retry instead of proceeding to the next state.
It had another side affect in that the retry was set with no retry
interval which caused the state machine to retry immediately instead of
waiting the usual time interval.

Resetting those values caused the state machine to progress to the next
state and complete successfully.

Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1720212
@miq-bot
Copy link
Member

miq-bot commented Jul 8, 2019

Checked commit tinaafitz@737b093 with ruby 2.4.6, rubocop 0.69.0, haml-lint 0.20.0, and yamllint 1.10.0
2 files checked, 0 offenses detected
Everything looks fine. 🏆

@d-m-u
Copy link
Contributor

d-m-u commented Jul 8, 2019

👍

@billfitzgerald0120
Copy link
Contributor

looks good

@gmcculloug gmcculloug merged commit 84d55fe into ManageIQ:master Jul 8, 2019
@gmcculloug gmcculloug self-assigned this Jul 8, 2019
@gmcculloug gmcculloug added this to the Sprint 115 Ending Jul 8, 2019 milestone Jul 8, 2019
@simaishi
Copy link
Contributor

simaishi commented Jul 8, 2019

@tinaafitz hammer/yes ?

@tinaafitz
Copy link
Member Author

@simaishi Yes, sorry about that.
@miq-bot add_label hammer/yes

simaishi pushed a commit that referenced this pull request Jul 8, 2019
Fix check_reconfigured ae_result to prevent retry loop and failure.

(cherry picked from commit 84d55fe)

Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1727970
@simaishi
Copy link
Contributor

simaishi commented Jul 8, 2019

Hammer backport details:

$ git log -1
commit 203e44ba405b2031177e1011cc1005d051685e89
Author: Greg McCullough <gmccullo@redhat.com>
Date:   Mon Jul 8 12:52:40 2019 -0400

    Merge pull request #548 from tinaafitz/fix_reconfigure
    
    Fix check_reconfigured ae_result to prevent retry loop and failure.
    
    (cherry picked from commit 84d55fe93b09114a8ece0c1bb06caeec0a387b61)
    
    Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1727970

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.

None yet

8 participants