-
Notifications
You must be signed in to change notification settings - Fork 0
Merge bitcoin/bitcoin#28946: init: don't delete PID file if it was not generated #626
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
base: backport-0.27-batch-540
Are you sure you want to change the base?
Merge bitcoin/bitcoin#28946: init: don't delete PID file if it was not generated #626
Conversation
8f6ab31 init: don't delete PID file if it was not generated (willcl-ark) Pull request description: In a similar vein to bitcoin#28784, if a second `bitcoind` is started using the same datadir it will fail to start up, but during shutdown remove the PID file from the first `bitcoind` instance. ACKs for top commit: achow101: ACK 8f6ab31 andrewtoth: ACK 8f6ab31 romanz: ACK bitcoin@8f6ab31 Tree-SHA512: c9af703cbfa179d33ef9580a51e86c1b0acbd28daa18c8d2e5e5ff796ab4d3e2009a962a47e6046a0e5ece936f8a06ee8af5fdf8ff4ae1e52cbcdbec4b942271
WalkthroughA static flag and a dedicated function were added in the initialization code to track and manage PID file creation and removal, ensuring the PID file is only removed if created by the process. The shutdown logic was updated to use this centralized removal. The functional test was enhanced to verify PID and cookie file persistence after a failed startup attempt. Changes
Estimated code review effort🎯 2 (Simple) | ⏱️ ~8 minutes 📜 Recent review detailsConfiguration used: CodeRabbit UI 📒 Files selected for processing (2)
🧰 Additional context used📓 Path-based instructions (3)test/functional/**/*.py📄 CodeRabbit Inference Engine (CLAUDE.md)
Files:
**⚙️ CodeRabbit Configuration File
Files:
src/**/*.{cpp,h,cc,cxx,hpp}📄 CodeRabbit Inference Engine (CLAUDE.md)
Files:
🧠 Learnings (2)📓 Common learningstest/functional/feature_filelock.py (3)Learnt from: DashCoreAutoGuix Learnt from: DashCoreAutoGuix Learnt from: DashCoreAutoGuix ⏰ Context from checks skipped due to timeout of 90000ms. You can increase the timeout in your CodeRabbit configuration to a maximum of 15 minutes (900000ms). (1)
🔇 Additional comments (6)
✨ Finishing Touches
🧪 Generate unit tests
Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out. 🪧 TipsChatThere are 3 ways to chat with CodeRabbit:
SupportNeed help? Create a ticket on our support page for assistance with any issues or questions. Note: Be mindful of the bot's finite context window. It's strongly recommended to break down tasks such as reading entire modules into smaller chunks. For a focused discussion, use review comments to chat about specific files and their changes, instead of using the PR comments. CodeRabbit Commands (Invoked using PR comments)
Other keywords and placeholders
CodeRabbit Configuration File (
|
- Fix shebang line (remove backslash escape) - Remove stray 'EOF < /dev/null' at end of file Resolves lint validation issues while preserving Bitcoin intent from bitcoin#28946.
✅ Backport Verification - Issues FixedI found and fixed 1 issue:
Original Bitcoin commit: ✅ Validation Summary
This PR is now ready for merge after the lint fixes. ✅ |
✅ Backport Verification SuccessfulNo issues found! This backport is complete and faithful to the original Bitcoin change. Original Bitcoin commit: ✅ Range-diff1: 8f6ab31863 < -: ---------- init: don't delete PID file if it was not generated
-: ---------- > 1: 005c9ccba7 fix: resolve lint failures in test/functional/feature_filelock.pyTo reproduce, run: git range-diff afdc4c3a30^..afdc4c3a30 HEAD~1..HEADThis PR is ready for merge. ✅ |
|
✅ Validation PASSED: Backport is faithful and complete Validation Results:
Analysis Summary:Bitcoin commit: afdc4c3 The backport correctly implements the Bitcoin change: "don't delete PID file if it was not generated" |
…627, #711, #658, #813, #825, #626, #831, #835 (qt backports: part 5) 20763f1 merge bitcoin-core/gui#835: Fix crash when closing wallet (Kittywhiskers Van Gogh) b47b1f6 merge bitcoin-core/gui#831: GUIUtil::bringToFront workaround for Wayland (Kittywhiskers Van Gogh) 493768c merge bitcoin-core/gui#626: Showing Local Addresses in Node Window (Kittywhiskers Van Gogh) 4e1b06b merge bitcoin-core/gui#825: Show maximum mempool size in information window (Kittywhiskers Van Gogh) 568753a merge bitcoin-core/gui#813: Don't permit port in proxy IP option (Kittywhiskers Van Gogh) dc3771e merge bitcoin-core/gui#658: Never change the prune checkbox after the user has touched it (Kittywhiskers Van Gogh) 9f103fb fix: hide the entire transaction widget if discreet mode is enabled (Kittywhiskers Van Gogh) e9b347f merge bitcoin-core/gui#711: Disable unused special members functions in `UnlockContext` (Kittywhiskers Van Gogh) 8829549 merge bitcoin-core/gui#627: Apply translator comments to reset options confirmation dialog (Kittywhiskers Van Gogh) d496df0 merge bitcoin-core/gui#612: Drop unused `QFrame`s in `SendCoinsEntry` (Kittywhiskers Van Gogh) 9e4ee65 merge bitcoin-core/gui#617: Reset options, notify user about backup creation (Kittywhiskers Van Gogh) cc2df46 merge bitcoin-core/gui#594: replace deprecated Q_OS_MAC with Q_OS_MACOS (Kittywhiskers Van Gogh) Pull request description: ## Additional Information | `develop` (e23a658) | This PR | | ------------------------------------------------------------ | ------------------------------------------------------------ | |  |  | |  |  | |  |  | ## Breaking Changes None expected. ## Checklist - [x] I have performed a self-review of my own code - [x] I have commented my code, particularly in hard-to-understand areas **(note: N/A)** - [x] I have added or updated relevant unit/integration/functional/e2e tests - [x] I have made corresponding changes to the documentation **(note: N/A)** - [x] I have assigned this pull request to a milestone _(for repository code-owners and collaborators only)_ ACKs for top commit: UdjinM6: utACK 20763f1 Tree-SHA512: 6e047d42685f9f710cd966b838ba354f57628e31314f73fc3f6f9b48bbf8fadac1940a48d19b8cfcf9cee47ec00a16a6f21d43c905d1683fba20e42633054606
Backports bitcoin#28946
Original commit: afdc4c3
Backported from Bitcoin Core v0.27
Summary by CodeRabbit
Bug Fixes
Tests