<div style="display: flex; flex-wrap: wrap; white-space: pre-wrap; align-items: center; "><img height="20" width="20" style="border-radius:50%; margin-right: 4px;" decoding="async" src="https://avatars.githubusercontent.com/u/5842757?s=20&v=4" /><strong>mmd-osm</strong> left a comment <a href="https://github.com/openstreetmap/openstreetmap-website/pull/6379#issuecomment-3259467563">(openstreetmap/openstreetmap-website#6379)</a></div>
<p dir="auto">Here's the kind of change I've been testing locally. It moves both changeset consistency checking as well as DiffReader inside the exclusive changeset lock.</p>
<div class="highlight highlight-source-ruby" dir="auto"><pre class="notranslate"><span class="pl-en">diff</span> --<span class="pl-en">git</span> <span class="pl-en">a</span>/<span class="pl-en">app</span>/<span class="pl-en">controllers</span>/<span class="pl-en">api</span>/<span class="pl-en">changesets</span>/<span class="pl-en">uploads_controller</span><span class="pl-kos">.</span><span class="pl-en">rb</span> <span class="pl-en">b</span>/<span class="pl-en">app</span>/<span class="pl-en">controllers</span>/<span class="pl-en">api</span>/<span class="pl-en">changesets</span>/<span class="pl-en">uploads_controller</span><span class="pl-kos">.</span><span class="pl-en">rb</span>
<span class="pl-en">index</span> <span class="pl-en">ee9406d91</span>..<span class="pl-c1">2</span><span class="pl-en">afdd5e63</span> <span class="pl-c1">100644</span>
--- <span class="pl-en">a</span>/<span class="pl-en">app</span>/<span class="pl-en">controllers</span>/<span class="pl-en">api</span>/<span class="pl-en">changesets</span>/<span class="pl-en">uploads_controller</span><span class="pl-kos">.</span><span class="pl-en">rb</span>
+++ <span class="pl-en">b</span>/<span class="pl-en">app</span>/<span class="pl-en">controllers</span>/<span class="pl-en">api</span>/<span class="pl-en">changesets</span>/<span class="pl-en">uploads_controller</span><span class="pl-kos">.</span><span class="pl-en">rb</span>
@@ -<span class="pl-c1">27</span><span class="pl-kos">,</span><span class="pl-c1">10</span> +<span class="pl-c1">27</span><span class="pl-kos">,</span><span class="pl-c1">10</span> @@ <span class="pl-k">module</span> <span class="pl-v">Api</span>
<span class="pl-c"># http://wiki.openstreetmap.org/wiki/OSM_Protocol_Version_0.6</span>
<span class="pl-k">def</span> <span class="pl-en">create</span>
<span class="pl-s1">changeset</span> <span class="pl-c1">=</span> <span class="pl-v">Changeset</span><span class="pl-kos">.</span><span class="pl-en">find</span><span class="pl-kos">(</span><span class="pl-en">params</span><span class="pl-kos">[</span><span class="pl-pds">:changeset_id</span><span class="pl-kos">]</span><span class="pl-kos">)</span>
- <span class="pl-en">check_changeset_consistency</span><span class="pl-kos">(</span><span class="pl-s1">changeset</span><span class="pl-kos">,</span> <span class="pl-en">current_user</span><span class="pl-kos">)</span>
+ <span class="pl-s1">changeset</span><span class="pl-kos">.</span><span class="pl-en">with_lock</span> <span class="pl-k">do</span>
+ <span class="pl-en">check_changeset_consistency</span><span class="pl-kos">(</span><span class="pl-s1">changeset</span><span class="pl-kos">,</span> <span class="pl-en">current_user</span><span class="pl-kos">)</span>
- <span class="pl-s1">diff_reader</span> <span class="pl-c1">=</span> <span class="pl-v">DiffReader</span><span class="pl-kos">.</span><span class="pl-en">new</span><span class="pl-kos">(</span><span class="pl-en">request</span><span class="pl-kos">.</span><span class="pl-en">raw_post</span><span class="pl-kos">,</span> <span class="pl-s1">changeset</span><span class="pl-kos">)</span>
- <span class="pl-v">Changeset</span><span class="pl-kos">.</span><span class="pl-en">transaction</span> <span class="pl-k">do</span>
+ <span class="pl-s1">diff_reader</span> <span class="pl-c1">=</span> <span class="pl-v">DiffReader</span><span class="pl-kos">.</span><span class="pl-en">new</span><span class="pl-kos">(</span><span class="pl-en">request</span><span class="pl-kos">.</span><span class="pl-en">raw_post</span><span class="pl-kos">,</span> <span class="pl-s1">changeset</span><span class="pl-kos">)</span>
<span class="pl-s1">result</span> <span class="pl-c1">=</span> <span class="pl-s1">diff_reader</span><span class="pl-kos">.</span><span class="pl-en">commit</span>
<span class="pl-c"># the number of changes in this changeset has already been</span>
<span class="pl-c"># updated and is visible in this transaction so we don't need</span></pre></div>
<p style="font-size:small;-webkit-text-size-adjust:none;color:#666;">—<br />Reply to this email directly, <a href="https://github.com/openstreetmap/openstreetmap-website/pull/6379#issuecomment-3259467563">view it on GitHub</a>, or <a href="https://github.com/notifications/unsubscribe-auth/AAK2OLIH73LVDH2NZE52BS33RHOJFAVCNFSM6AAAAACFUYOU5KVHI2DSMVQWIX3LMV43OSLTON2WKQ3PNVWWK3TUHMZTENJZGQ3DONJWGM">unsubscribe</a>.<br />You are receiving this because you are subscribed to this thread.<img src="https://github.com/notifications/beacon/AAK2OLK4EAOCSEP6M5HOR4L3RHOJFA5CNFSM6AAAAACFUYOU5KWGG33NNVSW45C7OR4XAZNMJFZXG5LFINXW23LFNZ2KUY3PNVWWK3TUL5UWJTWCI6DSW.gif" height="1" width="1" alt="" /><span style="color: transparent; font-size: 0; display: none; visibility: hidden; overflow: hidden; opacity: 0; width: 0; height: 0; max-width: 0; max-height: 0; mso-hide: all">Message ID: <span><openstreetmap/openstreetmap-website/pull/6379/c3259467563</span><span>@</span><span>github</span><span>.</span><span>com></span></span></p>
<script type="application/ld+json">[
{
"@context": "http://schema.org",
"@type": "EmailMessage",
"potentialAction": {
"@type": "ViewAction",
"target": "https://github.com/openstreetmap/openstreetmap-website/pull/6379#issuecomment-3259467563",
"url": "https://github.com/openstreetmap/openstreetmap-website/pull/6379#issuecomment-3259467563",
"name": "View Pull Request"
},
"description": "View this Pull Request on GitHub",
"publisher": {
"@type": "Organization",
"name": "GitHub",
"url": "https://github.com"
}
}
]</script>