<!DOCTYPE html>
<html>
<head>
</head>
<body>
<dl style="line-height: 1.5; margin-left: 2em">
<dt style="clear: both; float: left; font-weight: bold; width: 8em">Author</dt>
<dd style="margin-left: 8.5em">Kouhei Sutou <kou****@clear*****></dd>
<dt style="clear: both; float: left; font-weight: bold; width: 8em">Date</dt>
<dd style="margin-left: 8.5em">2015-10-29 22:37:56 +0900 (Thu, 29 Oct 2015)</dd>
<dt style="clear: both; float: left; font-weight: bold; width: 8em">New Revision</dt>
<dd style="margin-left: 8.5em"><a href="https://github.com/mroonga/mroonga/commit/4892dfbee1639f607b28e4eb7968b4feb22e63d2">4892dfbee1639f607b28e4eb7968b4feb22e63d2</a></dd>
<dt style="clear: both; float: left; font-weight: bold; width: 8em">Message</dt>
<dd style="margin-left: 8.5em"><pre style="border: 1px solid #aaa; font-family: Consolas, Menlo, "Liberation Mono", Courier, monospace; line-height: 1.2; padding: 0.5em; width: auto">storage: fix a bug that auto repair may cause crash
The following sequence causes crash:
1. connection1: open indexes
2. connection2: open indexes
3. connection1: start operations log check and detects crash!
4. connection2: start operations log check and blocked.
5. connection1: finish auto repair by recreating indexes.
6. connection2: is unblocked and detects no crash but has opened indexes
that are recreated connection1.
7. connection2: use dropped index and is crashed.
TODO:
* The same problem exists in wrapper mode.
* Reduce lock scope. We can reduce lock scope by detecting "DISABLE
KEYS" mode without opening indexes.
[groonga-dev,03608]
Reported by Hiroshi Kagami. Thanks!!!</pre></dd>
<dt style="clear: both; float: left; font-weight: bold; width: 8em">Modified files</dt>
<dd style="margin-left: 8.5em">
<ul>
<li><a href="https://github.com/mroonga/mroonga/commit/4892dfbee1639f607b28e4eb7968b4feb22e63d2#diff-ba714ec217aa6836e39b3aea9da57ae2">ha_mroonga.cpp</a></li>
</ul>
</dd>
</dl>
<div class="diff-section" style="clear: both">
<table style="border-collapse: collapse; border: 1px solid #aaa">
<thead>
<tr class="diff-header" style="border: 1px solid #aaa">
<td colspan="3">
<pre style="border: 0; font-family: Consolas, Menlo, "Liberation Mono", Courier, monospace; line-height: 1.2; margin: 0; padding: 0.5em; white-space: normal; width: auto"><span class="diff-header" style="background-color: #eaf2f5; color: #999999; display: block; white-space: pre"> Modified: ha_mroonga.cpp (+3 -1)</span>
<span class="diff-header-mark" style="background-color: #eaf2f5; color: #999999; display: block; white-space: pre">===================================================================</span>
</pre>
</td>
</tr>
</thead>
<tbody>
<tr>
<th class="diff-line-number" style="border: 1px solid #aaa">
<pre style="border: 0; font-family: Consolas, Menlo, "Liberation Mono", Courier, monospace; line-height: 1.2; margin: 0; padding: 0.5em; white-space: normal; width: auto"><span class="diff-line-number-hunk-header" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/4892dfbee1639f607b28e4eb7968b4feb22e63d2#diff-ba714ec217aa6836e39b3aea9da57ae2L4291">...</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/4892dfbee1639f607b28e4eb7968b4feb22e63d2#diff-ba714ec217aa6836e39b3aea9da57ae2L4292">4292</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/4892dfbee1639f607b28e4eb7968b4feb22e63d2#diff-ba714ec217aa6836e39b3aea9da57ae2L4293">4293</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/4892dfbee1639f607b28e4eb7968b4feb22e63d2#diff-ba714ec217aa6836e39b3aea9da57ae2L4294">4294</a></span>
<span class="diff-line-number-nothing" style="display: block; white-space: pre"> </span>
<span class="diff-line-number-nothing" style="display: block; white-space: pre"> </span>
<span class="diff-line-number-nothing" style="display: block; white-space: pre"> </span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/4892dfbee1639f607b28e4eb7968b4feb22e63d2#diff-ba714ec217aa6836e39b3aea9da57ae2L4295">4295</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/4892dfbee1639f607b28e4eb7968b4feb22e63d2#diff-ba714ec217aa6836e39b3aea9da57ae2L4296">4296</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/4892dfbee1639f607b28e4eb7968b4feb22e63d2#diff-ba714ec217aa6836e39b3aea9da57ae2L4297">4297</a></span>
<span class="diff-line-number-hunk-header" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/4892dfbee1639f607b28e4eb7968b4feb22e63d2#diff-ba714ec217aa6836e39b3aea9da57ae2L4302">...</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/4892dfbee1639f607b28e4eb7968b4feb22e63d2#diff-ba714ec217aa6836e39b3aea9da57ae2L4303">4303</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/4892dfbee1639f607b28e4eb7968b4feb22e63d2#diff-ba714ec217aa6836e39b3aea9da57ae2L4304">4304</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/4892dfbee1639f607b28e4eb7968b4feb22e63d2#diff-ba714ec217aa6836e39b3aea9da57ae2L4305">4305</a></span>
<span class="diff-line-number-deleted" style="background-color: #ffdddd; color: #000000; display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/4892dfbee1639f607b28e4eb7968b4feb22e63d2#diff-ba714ec217aa6836e39b3aea9da57ae2L4306">4306</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/4892dfbee1639f607b28e4eb7968b4feb22e63d2#diff-ba714ec217aa6836e39b3aea9da57ae2L4307">4307</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/4892dfbee1639f607b28e4eb7968b4feb22e63d2#diff-ba714ec217aa6836e39b3aea9da57ae2L4308">4308</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/4892dfbee1639f607b28e4eb7968b4feb22e63d2#diff-ba714ec217aa6836e39b3aea9da57ae2L4309">4309</a></span>
</pre>
</th>
<th class="diff-line-number" style="border: 1px solid #aaa">
<pre style="border: 0; font-family: Consolas, Menlo, "Liberation Mono", Courier, monospace; line-height: 1.2; margin: 0; padding: 0.5em; white-space: normal; width: auto"><span class="diff-line-number-hunk-header" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/4892dfbee1639f607b28e4eb7968b4feb22e63d2#diff-ba714ec217aa6836e39b3aea9da57ae2R4291">...</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/4892dfbee1639f607b28e4eb7968b4feb22e63d2#diff-ba714ec217aa6836e39b3aea9da57ae2R4292">4292</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/4892dfbee1639f607b28e4eb7968b4feb22e63d2#diff-ba714ec217aa6836e39b3aea9da57ae2R4293">4293</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/4892dfbee1639f607b28e4eb7968b4feb22e63d2#diff-ba714ec217aa6836e39b3aea9da57ae2R4294">4294</a></span>
<span class="diff-line-number-added" style="background-color: #dbffdb; color: #000000; display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/4892dfbee1639f607b28e4eb7968b4feb22e63d2#diff-ba714ec217aa6836e39b3aea9da57ae2R4295">4295</a></span>
<span class="diff-line-number-added" style="background-color: #dbffdb; color: #000000; display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/4892dfbee1639f607b28e4eb7968b4feb22e63d2#diff-ba714ec217aa6836e39b3aea9da57ae2R4296">4296</a></span>
<span class="diff-line-number-added" style="background-color: #dbffdb; color: #000000; display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/4892dfbee1639f607b28e4eb7968b4feb22e63d2#diff-ba714ec217aa6836e39b3aea9da57ae2R4297">4297</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/4892dfbee1639f607b28e4eb7968b4feb22e63d2#diff-ba714ec217aa6836e39b3aea9da57ae2R4298">4298</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/4892dfbee1639f607b28e4eb7968b4feb22e63d2#diff-ba714ec217aa6836e39b3aea9da57ae2R4299">4299</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/4892dfbee1639f607b28e4eb7968b4feb22e63d2#diff-ba714ec217aa6836e39b3aea9da57ae2R4300">4300</a></span>
<span class="diff-line-number-hunk-header" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/4892dfbee1639f607b28e4eb7968b4feb22e63d2#diff-ba714ec217aa6836e39b3aea9da57ae2R4305">...</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/4892dfbee1639f607b28e4eb7968b4feb22e63d2#diff-ba714ec217aa6836e39b3aea9da57ae2R4306">4306</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/4892dfbee1639f607b28e4eb7968b4feb22e63d2#diff-ba714ec217aa6836e39b3aea9da57ae2R4307">4307</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/4892dfbee1639f607b28e4eb7968b4feb22e63d2#diff-ba714ec217aa6836e39b3aea9da57ae2R4308">4308</a></span>
<span class="diff-line-number-nothing" style="display: block; white-space: pre"> </span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/4892dfbee1639f607b28e4eb7968b4feb22e63d2#diff-ba714ec217aa6836e39b3aea9da57ae2R4309">4309</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/4892dfbee1639f607b28e4eb7968b4feb22e63d2#diff-ba714ec217aa6836e39b3aea9da57ae2R4310">4310</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/4892dfbee1639f607b28e4eb7968b4feb22e63d2#diff-ba714ec217aa6836e39b3aea9da57ae2R4311">4311</a></span>
</pre>
</th>
<td class="diff-content" style="border: 1px solid #aaa">
<pre style="border: 0; font-family: Consolas, Menlo, "Liberation Mono", Courier, monospace; line-height: 1.2; margin: 0; padding: 0.5em; white-space: normal; width: auto"><span class="diff-hunk-header" style="background-color: #eaf2f5; color: #999999; display: block; white-space: pre">@@ -4292,6 +4292,9 @@ <span class="diff-context" style="background-color: #ffffaa; color: #000000">int ha_mroonga::storage_open(const char *name, int mode, uint open_options)</span></span>
<span class="diff-not-changed" style="display: block; white-space: pre"> }</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> </span>
<span class="diff-not-changed" style="display: block; white-space: pre"> if (!(open_options & HA_OPEN_FOR_REPAIR)) {</span>
<span class="diff-added" style="background-color: #dbffdb; color: #000000; display: block; white-space: pre">+ // TODO: Reduce lock scope</span>
<span class="diff-added" style="background-color: #dbffdb; color: #000000; display: block; white-space: pre">+ mrn::Lock lock(&mrn_operations_mutex);</span>
<span class="diff-added" style="background-color: #dbffdb; color: #000000; display: block; white-space: pre">+</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> error = storage_open_indexes(name);</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> if (error) {</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> storage_close_columns();</span>
<span class="diff-hunk-header" style="background-color: #eaf2f5; color: #999999; display: block; white-space: pre">@@ -4303,7 +4306,6 @@ <span class="diff-context" style="background-color: #ffffaa; color: #000000">int ha_mroonga::storage_open(const char *name, int mode, uint open_options)</span></span>
<span class="diff-not-changed" style="display: block; white-space: pre"> storage_set_keys_in_use();</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> </span>
<span class="diff-not-changed" style="display: block; white-space: pre"> {</span>
<span class="diff-deleted" style="background-color: #ffdddd; color: #000000; display: block; white-space: pre">- mrn::Lock lock(&mrn_operations_mutex);</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> mrn::PathMapper mapper(name);</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> const char *table_name = mapper.table_name();</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> size_t table_name_size = strlen(table_name);</span>
</pre>
</td>
</tr>
</tbody>
</table>
</div>
</body>
</html>