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

Added permit_concurrent_loads #6861

Merged
merged 1 commit into from
Feb 26, 2016
Merged

Conversation

mkanoor
Copy link
Contributor

@mkanoor mkanoor commented Feb 22, 2016

Fixes #6814

The Automate methods were hanging when loading constants, which
trigger require processing.

@@ -4,7 +4,8 @@ eval_gemfile(File.expand_path("gems/pending/Gemfile", __dir__))
# VMDB specific gems
#

gem "rails", "~>5.0.x"
gem "rails", :github => "rails/rails", :branch => "master"
Copy link
Member

Choose a reason for hiding this comment

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

I don't think we actually want to hang off of Rails master. cc @matthewd

Copy link
Contributor

Choose a reason for hiding this comment

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

I'm fine with this, until rc1 is cut (which will also be when 5-0-stable is branched)

@mkanoor
Copy link
Contributor Author

mkanoor commented Feb 23, 2016

The travis builds are failing while switching to rails master. Seems to be a rails issue related to validations.

@mkanoor
Copy link
Contributor Author

mkanoor commented Feb 23, 2016

@matthewd @kbrock
Please Review

@@ -300,6 +300,7 @@ def validate_only_one_root
end

def create_tenant_group
reload
Copy link
Member

Choose a reason for hiding this comment

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

@mkanoor tested this with an after_commit :create_tenant_group, :on => :create and it worked

@matthewd I'd prefer that solution - thoughts?

Copy link
Contributor

Choose a reason for hiding this comment

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

Seems slightly neater to keep it all in one transaction to me... and this gives us a sensible place to hang the "see rails/rails#12345" comment

@Ladas
Copy link
Contributor

Ladas commented Feb 24, 2016

👍 👍 fixes provisioning for me, so looks good to me :-)

@Ladas
Copy link
Contributor

Ladas commented Feb 24, 2016

@mkanoor @matthewd damn, fixes one bug, but brings another :-) #6909

any idea how to fix that?

@miq-bot
Copy link
Member

miq-bot commented Feb 24, 2016

<pr_mergeability_checker />This pull request is not mergeable. Please rebase and repush.

@himdel
Copy link
Contributor

himdel commented Feb 25, 2016

Also fixes a hang while trying to add a new catalog item and choosing a type..

Fixes ManageIQ#6814

The Automate methods were hanging when loading constants, which
trigger require processing.
@jrafanie
Copy link
Member

❤️ Let's merge when green. 🎉

@miq-bot
Copy link
Member

miq-bot commented Feb 25, 2016

Checked commit mkanoor@4c86bbd with ruby 2.2.3, rubocop 0.37.2, and haml-lint 0.16.1
1 file checked, 0 offenses detected
Everything looks good. 👍

chessbyte added a commit that referenced this pull request Feb 26, 2016
@chessbyte chessbyte merged commit 5e7f49c into ManageIQ:master Feb 26, 2016
@chessbyte chessbyte added this to the Sprint 37 Ending Mar 7, 2016 milestone Feb 26, 2016
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.

9 participants