Closed Bug 722256 Opened 13 years ago Closed 13 years ago

Can't merge from trunk to stage on subversion anymore for new files

Categories

(Infrastructure & Operations :: Infrastructure: Other, task)

task
Not set
blocker

Tracking

(Not tracked)

VERIFIED FIXED

People

(Reporter: pascalc, Assigned: jabba)

References

Details

Today, it is not possible to commit a merge from mozilla.org/trunk to mozilla.org/tags/stage if the merge contains the creation of new files (done with svn copy or svn merge) I know we had an update from subversion 1.6.x to 1.7.x over the week end so that may be related to this change. The error message is: svn commit -m "l10n: ru, Bookmarks-Speed-Happy pages" Envoi . Ajout firefox/bookmarks svn: E175002: Échec de la propagation (commit), détails : svn: E175002: Le serveur a envoyé une valeur inattendue (502 Bad Gateway) en réponse à la requête COPY pour '/!svn/rvr/100364/projects/mozilla.com/trunk/ru/firefox/bookmarks' Marking as blocker as this is blocking a lot of my wirk and preventing the push to production of new files while we have a lot of things to push today and tomorrow svn commit -m "l10n: ru, Bookmarks-Speed-Happy pages" Envoi . Ajout firefox/bookmarks svn: E175002: Échec de la propagation (commit), détails : svn: E175002: Le serveur a envoyé une valeur inattendue (502 Bad Gateway) en réponse à la requête COPY pour '/!svn/rvr/100364/projects/mozilla.com/trunk/ru/firefox/bookmarks' r mozilla.org (Firefox/Thunderbird 10 releases, new download pages for marketing campaigns related to Firefox 10 release...)
Blocks: 721056
Blocks: fx-l10n-km
Just to clarify, we're both now using https (due to bug 722268), the commands that don't seem to work are: hg copy .. .. hg commit hg merge hg commit (where merge includes a copy). A hg add followed by commit, seems fine. These are serious blockers to the release tomorrow.
In Comment 1, you mention using hg, but summary and comment 0 mention a problem with svn. Are these two issues related?
Assignee: server-ops-infra → bhourigan
(In reply to Justin Dow [:jabba] from comment #2) > In Comment 1, you mention using hg, but summary and comment 0 mention a > problem with svn. Are these two issues related? Sorry, in comment 1, wherever I said 'hg', please read 'svn'. I had a total brain-to-finger miscommunication when I wrote that.
Looks like we are hitting this type of problem: http://svn.haxx.se/users/archive-2006-03/0549.shtml I'm investigating a workaround right now.
This should be working now. It was an issue because of the way we are doing ssl offloading at the load balancer, and apache doesn't know about this, so while doing an svn COPY command, it was trying to internally copy to an https url, which it doesn't know about. I added a request header: RequestHeader edit Destination ^https http early Which rewrites the destination url to match the source URL (because after the load balancer decrypts the ssl, it sends the request on to apache as http).
Assignee: bhourigan → jdow
Status: NEW → RESOLVED
Closed: 13 years ago
Resolution: --- → FIXED
Thanks, that works with https now, just bug 722268 remains for me.
Status: RESOLVED → VERIFIED
Component: Server Operations: Infrastructure → Infrastructure: Other
Product: mozilla.org → Infrastructure & Operations
You need to log in before you can comment on or make changes to this bug.