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 regression from #3842 #3892

Merged
merged 2 commits into from Jun 22, 2017

Conversation

Projects
None yet
2 participants
@Gargron
Member

Gargron commented Jun 21, 2017

Simplify the query by omitting all direct statuses. Private statuses
are allowed because they are from accounts we are following (so
by definition)

Resolves #3887 (alternative)

Fix regression from #3842
Simplify the query by omitting all direct statuses. Private statuses
are allowed because they are from accounts we are following (so
by definition)

Resolves #3887 (alternative)

@Gargron Gargron added the performance label Jun 21, 2017

@nightpool

This comment has been minimized.

Show comment
Hide comment
@nightpool

nightpool Jun 21, 2017

Collaborator

Do we think this is related to the 500 errors on mastodon.social? I thought this code path was only for users that didn't have a redis timeline already, so it doesn't explain the problems established/active users are having

Collaborator

nightpool commented Jun 21, 2017

Do we think this is related to the 500 errors on mastodon.social? I thought this code path was only for users that didn't have a redis timeline already, so it doesn't explain the problems established/active users are having

@Gargron

This comment has been minimized.

Show comment
Hide comment
@Gargron

Gargron Jun 21, 2017

Member

@nightpool The long running queries that do happen take up resources that other requests cannot get.

Member

Gargron commented Jun 21, 2017

@nightpool The long running queries that do happen take up resources that other requests cannot get.

@Gargron

This comment has been minimized.

Show comment
Hide comment
@Gargron

Gargron Jun 21, 2017

Member

@nightpool I am currently deploying this PR to mastodon.social to see if that resolves the problem.

Member

Gargron commented Jun 21, 2017

@nightpool I am currently deploying this PR to mastodon.social to see if that resolves the problem.

@nightpool

This comment has been minimized.

Show comment
Hide comment
@nightpool

nightpool Jun 21, 2017

Collaborator

@Gargron +1 just wanted to make sure we were addressing the right issue

Collaborator

nightpool commented Jun 21, 2017

@Gargron +1 just wanted to make sure we were addressing the right issue

@nightpool

nightpool approved these changes Jun 22, 2017 edited

this seems preferable to #3887—it's subtly incorrect, but not in a way that's super noticeable, and doesn't affect UX

@Gargron Gargron merged commit 0190aac into master Jun 22, 2017

2 of 3 checks passed

continuous-integration/travis-ci/push The Travis CI build is in progress
Details
codeclimate no new or fixed issues
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details

@Gargron Gargron deleted the fix-regression-3842 branch Jun 22, 2017

koteitan added a commit to koteitan/mastodon that referenced this pull request Jun 25, 2017

Fix regression from tootsuite#3842 (tootsuite#3892)
* Fix regression from tootsuite#3842

Simplify the query by omitting all direct statuses. Private statuses
are allowed because they are from accounts we are following (so
by definition)

Resolves tootsuite#3887 (alternative)

* Adjust test

YaQ00 added a commit to YaQ00/mastodon that referenced this pull request Sep 5, 2017

Fix regression from tootsuite#3842 (tootsuite#3892)
* Fix regression from tootsuite#3842

Simplify the query by omitting all direct statuses. Private statuses
are allowed because they are from accounts we are following (so
by definition)

Resolves tootsuite#3887 (alternative)

* Adjust test
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment