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 failing migration v67 #5849

Merged
merged 6 commits into from
Jan 26, 2019
Merged

Fix failing migration v67 #5849

merged 6 commits into from
Jan 26, 2019

Conversation

KubqoA
Copy link
Contributor

@KubqoA KubqoA commented Jan 25, 2019

Fixes issue number #5848

@codecov-io
Copy link

codecov-io commented Jan 25, 2019

Codecov Report

Merging #5849 into master will increase coverage by 0.01%.
The diff coverage is 0%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master    #5849      +/-   ##
==========================================
+ Coverage   37.86%   37.88%   +0.01%     
==========================================
  Files         328      328              
  Lines       48318    48318              
==========================================
+ Hits        18294    18303       +9     
+ Misses      27393    27387       -6     
+ Partials     2631     2628       -3
Impacted Files Coverage Δ
models/migrations/v67.go 0% <0%> (ø) ⬆️
models/repo_indexer.go 48.3% <0%> (+3.81%) ⬆️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 8510ac2...5704b21. Read the comment docs.

@GiteaBot GiteaBot added the lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. label Jan 25, 2019
Copy link
Contributor

@zeripath zeripath left a comment

Choose a reason for hiding this comment

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

The accessLevel function should also probably make its requests within the session too - although shouldn't deadlock.

There's a few other places in that file where X is used to perform queries within the transaction. I think we should probably just move those over too.

@GiteaBot GiteaBot added lgtm/need 1 This PR needs approval from one additional maintainer to be merged. and removed lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. labels Jan 25, 2019
@lafriks lafriks added this to the 1.8.0 milestone Jan 25, 2019
@zeripath
Copy link
Contributor

@KubqoA
Copy link
Contributor Author

KubqoA commented Jan 26, 2019

@zeripath I changed line 133 and line 63, which contained x.get to sess.get

@KubqoA
Copy link
Contributor Author

KubqoA commented Jan 26, 2019

Changing line 63 broke the build, so I reverted the change on that line.

@zeripath
Copy link
Contributor

@KubqoA I took the liberty of fixing the remaining deadlocks. Unfortunately I guess that means that I can't really LGTM this anymore...

@GiteaBot GiteaBot added lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. and removed lgtm/need 1 This PR needs approval from one additional maintainer to be merged. labels Jan 26, 2019
@KubqoA
Copy link
Contributor Author

KubqoA commented Jan 26, 2019

Thanks, so now we need to wait for someone else to LGTM this?

@zeripath
Copy link
Contributor

Hmm. LGTM has set itself to done... So may be someone else has looked at it.

@KubqoA could you just check that this migration change actually works for you though.

@zeripath
Copy link
Contributor

@KubqoA does it work?

@KubqoA
Copy link
Contributor Author

KubqoA commented Jan 26, 2019

How would I check if it works? I am running the docker version. Does it mean I need to create a custom Docker image and check it?

@zeripath
Copy link
Contributor

OK I've just cherry-picked my migration test PR on top of this and it doesn't break the migration tests for v1.5.3 onwards so I'm going to say it works

@KubqoA
Copy link
Contributor Author

KubqoA commented Jan 26, 2019

Great! So soon I can upgrade to the latest build of the Docker image and it should work?

@KubqoA
Copy link
Contributor Author

KubqoA commented Jan 26, 2019

@zeripath can this get merged now?

@zeripath zeripath merged commit a757920 into go-gitea:master Jan 26, 2019
@KubqoA
Copy link
Contributor Author

KubqoA commented Jan 26, 2019

You are an awesome person @zeripath, thanks to you, my Gitea instance is again up and running without any problems so far. I am very happy for the power of open-source project communities. Keep on going!

bmackinney pushed a commit to bmackinney/gitea that referenced this pull request Jan 27, 2019
@go-gitea go-gitea locked and limited conversation to collaborators Nov 24, 2020
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. type/bug
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants