GitReloadAPIView:: Couldn't entertain reload request for the branch (master), expected branch is ...

[sentry-io]

Perhaps this should be logged, but it shouldn't generate an exception that goes to sentry.

We should check, but this probably happens when a commit is merged to a repo with gitreload webhooks.

Sentry Issue: OPENEDX-RESIDENTIAL-4Z6

GitReloadAPIView:: Couldn't entertain reload request for the branch (master), expected branch is (live) 

[pdpinch]

The first thing to do here is to clarify the error message so we can tell why this is error is raised and differentiate between an expected behavior and an actual problem.

[arslanashraf7]

@pdpinch and I discussed fixing errors like these as part of mitodl/open-edx-plugins#482. But now that It's highly likely that we might be shifting towards another solution for course re-sync e.g. mitodl/open-edx-plugins#492. So, it might be a good idea to fix this error and others like it (https://github.com/mitodl/hq/issues/7435) separately instead of mitodl/open-edx-plugins#482.

@marslanabdulrauf could you take a look at these?

[marslanabdulrauf]

The error indicates that the code/commit was pushed to the live branch, but the SYSADMIN_DEFAULT_BRANCH setting is currently set to master.
By design, we only reload a course if it's updated in the branch specified by SYSADMIN_DEFAULT_BRANCH.

I’ve checked the ol-infrastructure repo, and it appears this is correctly set to live.

Can someone from @mitodl/devops please confirm that this is also the case on the MITx Residential edX production instance?

[blarghmatey]

So, there are 2 deployments of residential edX. There is mitx-staging and mitx. The mitx-staging environment loads from the master branch for teams who are authoring their courses directly in XML and pushing to GitHub. Once they merge to live the mitx environment will load the content. The GitHub webhooks will fire to both environments on every push to the repository regardless of branch, which is why we keep getting these errors, because any time the master branch gets a commit that will fire a hook to the mitx deployment which responds with an error, and any time the live branch gets a commit then the mitx-staging environment will also receive a hook which responds in an error.

[blarghmatey]

And yes, the branch setting for the mitx environment is correctly set to live

[marslanabdulrauf]

Thanks @blarghmatey for the detailed information. I will update the message and shift it to warning instead of error if possible.

[marslanabdulrauf]

This should be fixed in the next release.