-
Type:
Bug
-
Resolution: Handled by Support
-
Priority:
Low
-
None
-
Affects Version/s: None
-
Component/s: None
-
None
We have /var/lib/stash/tmp as tmpfs mount. All be fine, until some of our plugin not filling this mount point entirely.
After that Stash can't create merge commit and fail in PR with 'Hey you have conflicts', but no conflicts actually:
Caused by: com.atlassian.stash.exception.CommandFailedException: '/usr/bin/git merge -m Merge pull request #58074 in PROJECT/repo from ~PHANTOMAS/repo:top/secret/branch/3 to some-other-branch --no-ff --log e60ecd64154d54cf6cddacd4810e7b3e7b28bddc' exited with code 128 saying: fatal: unable to write .git/index
After this error PR is frozen in 'Always have conflicts but no conflicts actually' state.
Follow tryings NOT help:
1. Restart Stash (it cleanup caches on start)
2. Stop Stash, remove anythin in /tmp, /caches, Start Stash
3. Delete references in repository in stash-refs and refs namespaces
4. Numeriuos Decline/Reopen
Only one thing, that help in this situation: git fsck --full in repo on server. Cos:
Checking objects: 100% (14408825/14408825), done. error: stash-refs/pull-requests/57498/merge: invalid reflog entry 3120b486fedda28a4228a3e3daf94aacd928b30f error: stash-refs/pull-requests/57516/merge: invalid reflog entry b9d598cc27b7950142f633772c55639123a30670 error: stash-refs/pull-requests/56677/merge: invalid reflog entry e7bfc2c33727d737dfa844f1660a548dfe49a3ce error: stash-refs/pull-requests/57780/merge: invalid reflog entry 54211d0f77f3b170d33df4b7a209c0b48ebe4a07 error: stash-refs/pull-requests/58002/merge: invalid reflog entry c4e757041e04e94b516aabb4da98c4333f5ec722 error: stash-refs/pull-requests/57110/merge: invalid reflog entry df462852d25b642410d82829ac0fcccf48f46be5 error: stash-refs/pull-requests/54816/merge: invalid reflog entry cf7069f2f73169bdb08bb86edf8cec389c039864 error: stash-refs/pull-requests/58105/merge: invalid reflog entry e06ee9a67b69b1a2adcdf388cdacd88ae1f2c007 error: stash-refs/pull-requests/58105/merge: invalid reflog entry e06ee9a67b69b1a2adcdf388cdacd88ae1f2c007 error: stash-refs/pull-requests/58085/merge: invalid reflog entry 50cc958b48593f32cc603bd090123f72ac439055 error: stash-refs/pull-requests/52597/merge: invalid reflog entry e8d46cc83014d2133b32c856a6ab83c49625c73a error: stash-refs/pull-requests/57853/merge: invalid reflog entry effbfe8f2bfa32843018ca518f6fd73aaff6ae7c error: stash-refs/pull-requests/57835/merge: invalid reflog entry 0c21a80f9ea94d51fd150a6d689e92751140c9b7 error: stash-refs/pull-requests/57845/merge: invalid reflog entry 42219911a8cb0ead052977ff62a8f50f4a30bcc9 error: stash-refs/pull-requests/56031/merge: invalid reflog entry d1b24f7b9f435c148bfd6c44493ff3cba3585456 error: stash-refs/pull-requests/57752/merge: invalid reflog entry 4737e4cab91e5a69bd3257608b8ea729ecd4378f error: stash-refs/pull-requests/57997/merge: invalid reflog entry 84714be29de148972799b24fcad8c7c7e4fbdc64 error: stash-refs/pull-requests/55529/merge: invalid reflog entry 05078cea0739fb01b6127625141a03dbd4c306a5 error: stash-refs/pull-requests/56900/merge: invalid reflog entry 500fda6dd620d448916ff39221312e7e26c803d6 error: stash-refs/pull-requests/58065/merge: invalid reflog entry 869d768607e73c8b3964cf98828338c441a69a6a error: stash-refs/pull-requests/57607/merge: invalid reflog entry 08bacaae2a3dc01b1d418088d8e9e0fff818672a error: stash-refs/pull-requests/58090/merge: invalid reflog entry 9cdae7f87e247185e80de1725cb3210eae8db320 error: stash-refs/pull-requests/58034/merge: invalid reflog entry d5ac236bb74761a5622db98155ee6c6f264e2227 error: stash-refs/pull-requests/57611/merge: invalid reflog entry 96af7674dc4313c3e5193ecf44ef0672c48d604f Checking connectivity: 14107674, done.
:tada:
- relates to
-
-
- Closed
-
