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

Bugfix/lock state spam #6022

Merged
merged 1 commit into from
Sep 5, 2023
Merged

Bugfix/lock state spam #6022

merged 1 commit into from
Sep 5, 2023

Conversation

allexzander
Copy link
Contributor

No description provided.

@codecov
Copy link

codecov bot commented Sep 4, 2023

Codecov Report

Merging #6022 (d0a80c7) into master (54d9905) will increase coverage by 0.15%.
Report is 2 commits behind head on master.
The diff coverage is 85.00%.

❗ Current head d0a80c7 differs from pull request most recent head 3815919. Consider uploading reports for the commit 3815919 to get more accurate results

Additional details and impacted files
@@            Coverage Diff             @@
##           master    #6022      +/-   ##
==========================================
+ Coverage   60.10%   60.25%   +0.15%     
==========================================
  Files         145      145              
  Lines       18838    18865      +27     
==========================================
+ Hits        11322    11367      +45     
+ Misses       7516     7498      -18     
Files Changed Coverage Δ
src/libsync/account.h 42.85% <ø> (ø)
src/libsync/lockfilejobs.h 75.00% <ø> (ø)
src/libsync/syncfileitem.h 43.54% <ø> (ø)
src/libsync/account.cpp 44.22% <83.33%> (+1.00%) ⬆️
src/libsync/lockfilejobs.cpp 97.58% <87.50%> (-0.76%) ⬇️

... and 6 files with indirect coverage changes

@allexzander allexzander force-pushed the bugfix/lock-state-spam branch 3 times, most recently from fbe29aa to d26caef Compare September 5, 2023 08:42
@allexzander allexzander marked this pull request as ready for review September 5, 2023 09:10
@allexzander allexzander force-pushed the bugfix/lock-state-spam branch from d26caef to b2b9016 Compare September 5, 2023 09:44
src/gui/folder.cpp Show resolved Hide resolved
src/gui/folderwatcher.cpp Outdated Show resolved Hide resolved
src/libsync/account.cpp Show resolved Hide resolved
@allexzander allexzander requested a review from mgallien September 5, 2023 13:50
…ary spam to the lock state change from folder watcher logic.

Signed-off-by: alex-z <[email protected]>
@allexzander allexzander force-pushed the bugfix/lock-state-spam branch from b2b9016 to 3815919 Compare September 5, 2023 13:52
@sonarcloud
Copy link

sonarcloud bot commented Sep 5, 2023

SonarCloud Quality Gate failed.    Quality Gate failed

Bug A 0 Bugs
Vulnerability A 0 Vulnerabilities
Security Hotspot A 0 Security Hotspots
Code Smell A 9 Code Smells

36.7% 36.7% Coverage
0.0% 0.0% Duplication

idea Catch issues before they fail your Quality Gate with our IDE extension sonarlint SonarLint

@nextcloud-desktop-bot
Copy link

AppImage file: nextcloud-PR-6022-3815919aa53270eb4f33aae3455bc82556fdce6f-x86_64.AppImage

To test this change/fix you can simply download above AppImage file and test it.

Please make sure to quit your existing Nextcloud app and backup your data.

@mgallien
Copy link
Collaborator

mgallien commented Sep 5, 2023

/backport to stable-3.10

@mgallien
Copy link
Collaborator

mgallien commented Sep 5, 2023

/backport to stable-3.9

@mgallien mgallien enabled auto-merge September 5, 2023 17:16
@mgallien mgallien merged commit 142f604 into master Sep 5, 2023
11 of 12 checks passed
@mgallien mgallien deleted the bugfix/lock-state-spam branch September 5, 2023 17:16
@backportbot-nextcloud
Copy link

The backport to stable-3.9 failed. Please do this backport manually.

# Switch to the target branch and update it
git checkout stable-3.9
git pull origin stable-3.9

# Create the new backport branch
git checkout -b fix/foo-stable-3.9

# Cherry pick the change from the commit sha1 of the change against the default branch
# This might cause conflicts. Resolve them.
git cherry-pick abc123

# Push the cherry pick commit to the remote repository and open a pull request
git push origin fix/foo-stable-3.9

More info at https://docs.nextcloud.com/server/latest/developer_manual/getting_started/development_process.html#manual-backport

@mgallien mgallien added this to the 3.11.0 milestone Sep 7, 2023
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.

3 participants