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

Overview generation: fix multi-threaded bug, resulting in locks/crashes with GeoPackage in particular #10246

Merged
merged 1 commit into from
Jun 20, 2024

Conversation

rouault
Copy link
Member

@rouault rouault commented Jun 19, 2024

Fixes #10245

@coveralls
Copy link
Collaborator

Coverage Status

coverage: 69.246% (+1.3%) from 67.922%
when pulling 727a00d on rouault:fix_10245
into 5d4c2d3 on OSGeo:master.

gcore/overview.cpp Outdated Show resolved Hide resolved
gcore/overview.cpp Outdated Show resolved Hide resolved
gcore/overview.cpp Outdated Show resolved Hide resolved
@rouault rouault merged commit f36edcd into OSGeo:master Jun 20, 2024
35 checks passed
@rouault
Copy link
Member Author

rouault commented Jun 20, 2024

The backport to release/3.9 failed:

The process '/usr/bin/git' failed with exit code 1
stderr
error: could not apply 366606f99f... Overview generation: fix multi-threaded bug, resulting in locks/crashes with GeoPackage in particular
hint: After resolving the conflicts, mark them with
hint: "git add/rm <pathspec>", then run
hint: "git cherry-pick --continue".
hint: You can instead skip this commit with "git cherry-pick --skip".
hint: To abort and get back to the state before "git cherry-pick",
hint: run "git cherry-pick --abort".
hint: Disable this message with "git config advice.mergeConflict false"

stdout
Auto-merging gcore/gdal_priv.h
CONFLICT (content): Merge conflict in gcore/gdal_priv.h
Auto-merging gcore/overview.cpp
Auto-merging gcore/rasterio.cpp

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add .worktrees/backport-release/3.9 release/3.9
# Navigate to the new working tree
cd .worktrees/backport-release/3.9
# Create a new branch
git switch --create backport-10246-to-release/3.9
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick 366606f99f15962a0dc17974e6bcf721834441be
# Push it to GitHub
git push --set-upstream origin backport-10246-to-release/3.9
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-release/3.9

Then, create a pull request where the base branch is release/3.9 and the compare/head branch is backport-10246-to-release/3.9.

@rouault
Copy link
Member Author

rouault commented Jun 20, 2024

3.9 backport in #10255

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Sporadic error with multi-threaded overview generation
3 participants