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.

Sign up for GitHub

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

Jump to bottom

add concurrent student sync, instructor sync, assignment sync. sync students and instructors simultaneously #77

Open
wants to merge 17 commits into
base: develop
Choose a base branch
from
Open

add concurrent student sync, instructor sync, assignment sync. sync students and instructors simultaneously #77

wants to merge 17 commits into from

Conversation

frostyfan109
Copy link
Collaborator

No description provided.

@frostyfan109 frostyfan109 requested review from Hoid and ptlharit2 August 27, 2024 15:21
@ptlharit2
Copy link
Contributor

minor merge conflict merging develop into your branch with imports in lms_sync_service - just resolved it here while I was reviewing the PR

@frostyfan109
Copy link
Collaborator Author

frostyfan109 commented Aug 27, 2024 •
edited
Loading

Locking issue occurs when trying to concurrently commit. Probably problematic in other areas as well...

PushRejected Error: exit status 1 - remote: * Checking 1 references        
remote: Checked 1 references in total        
remote: error: cannot lock ref 'refs/heads/main': is at 3aa5591dad0c73aac749626ed3c43afbca3b009e but expected 681fd19ebb8bb9537b422392da852aac4551a8b1        
To /data/git/gitea-repositories/eduhelx_spring_2024-dev-instructors/eduhelx_spring_2024-dev-class-master-repo.git
 ! [remote rejected] e87bd1bafa82b74df42f25b36e6aec35667fc598 -> main (failed to update ref)
error: failed to push some refs to '/data/git/gitea-repositories/eduhelx_spring_2024-dev-instructors/eduhelx_spring_2024-dev-class-master-repo.git'
 - remote: * Checking 1 references        
remote: Checked 1 references in total        
remote: error: cannot lock ref 'refs/heads/main': is at 3aa5591dad0c73aac749626ed3c43afbca3b009e but expected 681fd19ebb8bb9537b422392da852aac4551a8b1        
To /data/git/gitea-repositories/eduhelx_spring_2024-dev-instructors/eduhelx_spring_2024-dev-class-master-repo.git
 ! [remote rejected] e87bd1bafa82b74df42f25b36e6aec35667fc598 -> main (failed to update ref)
error: failed to push some refs to '/data/git/gitea-repositories/eduhelx_spring_2024-dev-instructors/eduhelx_spring_2024-dev-class-master-repo.git'
: remote: * Checking 1 references        
remote: Checked 1 references in total        
remote: error: cannot lock ref 'refs/heads/main': is at 3aa5591dad0c73aac749626ed3c43afbca3b009e but expected 681fd19ebb8bb9537b422392da852aac4551a8b1        
To /data/git/gitea-repositories/eduhelx_spring_2024-dev-instructors/eduhelx_spring_2024-dev-class-master-repo.git
 ! [remote rejected] e87bd1bafa82b74df42f25b36e6aec35667fc598 -> main (failed to update ref)
error: failed to push some refs to '/data/git/gitea-repositories/eduhelx_spring_2024-dev-instructors/eduhelx_spring_2024-dev-class-master-repo.git'

@frostyfan109 frostyfan109 requested review from Hoid and ptlharit2 August 29, 2024 21:37
Hoid
Hoid reviewed Aug 30, 2024
View reviewed changes
app/core/exceptions/user.py Outdated Show resolved Hide resolved
@ptlharit2
Copy link
Contributor

Locking issue occurs when trying to concurrently commit. Probably problematic in other areas as well...

PushRejected Error: exit status 1 - remote: * Checking 1 references        
remote: Checked 1 references in total        
remote: error: cannot lock ref 'refs/heads/main': is at 3aa5591dad0c73aac749626ed3c43afbca3b009e but expected 681fd19ebb8bb9537b422392da852aac4551a8b1        
To /data/git/gitea-repositories/eduhelx_spring_2024-dev-instructors/eduhelx_spring_2024-dev-class-master-repo.git
 ! [remote rejected] e87bd1bafa82b74df42f25b36e6aec35667fc598 -> main (failed to update ref)
error: failed to push some refs to '/data/git/gitea-repositories/eduhelx_spring_2024-dev-instructors/eduhelx_spring_2024-dev-class-master-repo.git'
 - remote: * Checking 1 references        
remote: Checked 1 references in total        
remote: error: cannot lock ref 'refs/heads/main': is at 3aa5591dad0c73aac749626ed3c43afbca3b009e but expected 681fd19ebb8bb9537b422392da852aac4551a8b1        
To /data/git/gitea-repositories/eduhelx_spring_2024-dev-instructors/eduhelx_spring_2024-dev-class-master-repo.git
 ! [remote rejected] e87bd1bafa82b74df42f25b36e6aec35667fc598 -> main (failed to update ref)
error: failed to push some refs to '/data/git/gitea-repositories/eduhelx_spring_2024-dev-instructors/eduhelx_spring_2024-dev-class-master-repo.git'
: remote: * Checking 1 references        
remote: Checked 1 references in total        
remote: error: cannot lock ref 'refs/heads/main': is at 3aa5591dad0c73aac749626ed3c43afbca3b009e but expected 681fd19ebb8bb9537b422392da852aac4551a8b1        
To /data/git/gitea-repositories/eduhelx_spring_2024-dev-instructors/eduhelx_spring_2024-dev-class-master-repo.git
 ! [remote rejected] e87bd1bafa82b74df42f25b36e6aec35667fc598 -> main (failed to update ref)
error: failed to push some refs to '/data/git/gitea-repositories/eduhelx_spring_2024-dev-instructors/eduhelx_spring_2024-dev-class-master-repo.git'

Is this locking issue still happening?

@frostyfan109
Copy link
Collaborator Author

Is this locking issue still happening?

Since we're batching our repo modifications into a single commit there should be no locking anymore.

Hoid
Hoid approved these changes Sep 24, 2024
View reviewed changes
Copy link
Contributor

@Hoid Hoid left a comment

Choose a reason for hiding this comment

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

You'll need to fix the merge conflicts, but other than that I think this is good

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

@Hoid Hoid Hoid approved these changes

@ptlharit2 ptlharit2 Awaiting requested review from ptlharit2

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@frostyfan109 @ptlharit2 @Hoid