<!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">YUKI Hiroshi &lt;shimo****@clear*****&gt;</dd>
      <dt style="clear: both; float: left; font-weight: bold; width: 8em">Date</dt>
      <dd style="margin-left: 8.5em">2015-01-15 17:20:36 +0900 (Thu, 15 Jan 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/droonga/droonga-engine/commit/929edbfa6b6840dee05209e2d3328af53f2eb924">929edbfa6b6840dee05209e2d3328af53f2eb924</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, &quot;Liberation Mono&quot;, Courier, monospace; line-height: 1.2; padding: 0.5em; width: auto">Make method name more meaningful</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/droonga/droonga-engine/commit/929edbfa6b6840dee05209e2d3328af53f2eb924#diff-0">bin/droonga-engine-join</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, &quot;Liberation Mono&quot;, 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: bin/droonga-engine-join (+2 -2)</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, &quot;Liberation Mono&quot;, 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/droonga/droonga-engine/commit/929edbfa6b6840dee05209e2d3328af53f2eb924#L0L44">...</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/droonga/droonga-engine/commit/929edbfa6b6840dee05209e2d3328af53f2eb924#L0L45">45</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/droonga/droonga-engine/commit/929edbfa6b6840dee05209e2d3328af53f2eb924#L0L46">46</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/droonga/droonga-engine/commit/929edbfa6b6840dee05209e2d3328af53f2eb924#L0L47">47</a></span>
<span class="diff-line-number-deleted" style="background-color: #ffaaaa; color: #000000; display: block; white-space: pre"><a href="https://github.com/droonga/droonga-engine/commit/929edbfa6b6840dee05209e2d3328af53f2eb924#L0L48">48</a></span>
<span class="diff-line-number-nothing" style="display: block; white-space: pre">&nbsp;</span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/droonga/droonga-engine/commit/929edbfa6b6840dee05209e2d3328af53f2eb924#L0L49">49</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/droonga/droonga-engine/commit/929edbfa6b6840dee05209e2d3328af53f2eb924#L0L50">50</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/droonga/droonga-engine/commit/929edbfa6b6840dee05209e2d3328af53f2eb924#L0L51">51</a></span>
<span class="diff-line-number-hunk-header" style="display: block; white-space: pre"><a href="https://github.com/droonga/droonga-engine/commit/929edbfa6b6840dee05209e2d3328af53f2eb924#L0L179">...</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/droonga/droonga-engine/commit/929edbfa6b6840dee05209e2d3328af53f2eb924#L0L180">180</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/droonga/droonga-engine/commit/929edbfa6b6840dee05209e2d3328af53f2eb924#L0L181">181</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/droonga/droonga-engine/commit/929edbfa6b6840dee05209e2d3328af53f2eb924#L0L182">182</a></span>
<span class="diff-line-number-deleted" style="background-color: #ffaaaa; color: #000000; display: block; white-space: pre"><a href="https://github.com/droonga/droonga-engine/commit/929edbfa6b6840dee05209e2d3328af53f2eb924#L0L183">183</a></span>
<span class="diff-line-number-nothing" style="display: block; white-space: pre">&nbsp;</span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/droonga/droonga-engine/commit/929edbfa6b6840dee05209e2d3328af53f2eb924#L0L184">184</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/droonga/droonga-engine/commit/929edbfa6b6840dee05209e2d3328af53f2eb924#L0L185">185</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/droonga/droonga-engine/commit/929edbfa6b6840dee05209e2d3328af53f2eb924#L0L186">186</a></span>
</pre>
            </th>
            <th class="diff-line-number" style="border: 1px solid #aaa">
<pre style="border: 0; font-family: Consolas, Menlo, &quot;Liberation Mono&quot;, 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/droonga/droonga-engine/commit/929edbfa6b6840dee05209e2d3328af53f2eb924#L0R44">...</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/droonga/droonga-engine/commit/929edbfa6b6840dee05209e2d3328af53f2eb924#L0R45">45</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/droonga/droonga-engine/commit/929edbfa6b6840dee05209e2d3328af53f2eb924#L0R46">46</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/droonga/droonga-engine/commit/929edbfa6b6840dee05209e2d3328af53f2eb924#L0R47">47</a></span>
<span class="diff-line-number-nothing" style="display: block; white-space: pre">&nbsp;</span>
<span class="diff-line-number-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre"><a href="https://github.com/droonga/droonga-engine/commit/929edbfa6b6840dee05209e2d3328af53f2eb924#L0R48">48</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/droonga/droonga-engine/commit/929edbfa6b6840dee05209e2d3328af53f2eb924#L0R49">49</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/droonga/droonga-engine/commit/929edbfa6b6840dee05209e2d3328af53f2eb924#L0R50">50</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/droonga/droonga-engine/commit/929edbfa6b6840dee05209e2d3328af53f2eb924#L0R51">51</a></span>
<span class="diff-line-number-hunk-header" style="display: block; white-space: pre"><a href="https://github.com/droonga/droonga-engine/commit/929edbfa6b6840dee05209e2d3328af53f2eb924#L0R179">...</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/droonga/droonga-engine/commit/929edbfa6b6840dee05209e2d3328af53f2eb924#L0R180">180</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/droonga/droonga-engine/commit/929edbfa6b6840dee05209e2d3328af53f2eb924#L0R181">181</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/droonga/droonga-engine/commit/929edbfa6b6840dee05209e2d3328af53f2eb924#L0R182">182</a></span>
<span class="diff-line-number-nothing" style="display: block; white-space: pre">&nbsp;</span>
<span class="diff-line-number-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre"><a href="https://github.com/droonga/droonga-engine/commit/929edbfa6b6840dee05209e2d3328af53f2eb924#L0R183">183</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/droonga/droonga-engine/commit/929edbfa6b6840dee05209e2d3328af53f2eb924#L0R184">184</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/droonga/droonga-engine/commit/929edbfa6b6840dee05209e2d3328af53f2eb924#L0R185">185</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/droonga/droonga-engine/commit/929edbfa6b6840dee05209e2d3328af53f2eb924#L0R186">186</a></span>
</pre>
            </th>
            <td class="diff-content" style="border: 1px solid #aaa">
<pre style="border: 0; font-family: Consolas, Menlo, &quot;Liberation Mono&quot;, 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">@@ -45,7 +45,7 @@ <span class="diff-context" style="background-color: #ffffaa; color: #000000">class JoinCommand</span></span>
<span class="diff-not-changed" style="display: block; white-space: pre">     set_node_role</span>
<span class="diff-not-changed" style="display: block; white-space: pre">     do_join</span>
<span class="diff-not-changed" style="display: block; white-space: pre">     sleep(5) #TODO: wait for restarting of the joining node. this should be done more safely.</span>
<span class="diff-deleted" style="background-color: #ffaaaa; color: #000000; display: block; white-space: pre">-    do_copy unless @options[&quot;no-copy&quot;]</span>
<span class="diff-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre">+    monitor_copying_state unless @options[&quot;no-copy&quot;]</span>
<span class="diff-not-changed" style="display: block; white-space: pre">     set_effective_message_timestamp</span>
<span class="diff-not-changed" style="display: block; white-space: pre">     update_other_nodes</span>
<span class="diff-not-changed" style="display: block; white-space: pre">     reset_node_role</span>
<span class="diff-hunk-header" style="background-color: #eaf2f5; color: #999999; display: block; white-space: pre">@@ -180,7 +180,7 @@ <span class="diff-context" style="background-color: #ffffaa; color: #000000">class JoinCommand</span></span>
<span class="diff-not-changed" style="display: block; white-space: pre">                        &quot;copy&quot;    =&gt; !@options[&quot;no-copy&quot;])</span>
<span class="diff-not-changed" style="display: block; white-space: pre">   end</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> </span>
<span class="diff-deleted" style="background-color: #ffaaaa; color: #000000; display: block; white-space: pre">-  def do_copy</span>
<span class="diff-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre">+  def monitor_copying_state</span>
<span class="diff-not-changed" style="display: block; white-space: pre">     @start_time_in_seconds = Time.new.to_i</span>
<span class="diff-not-changed" style="display: block; white-space: pre">     puts(&quot;Copying data from the source node...&quot;)</span>
<span class="diff-not-changed" style="display: block; white-space: pre">     last_progress = &quot;&quot;</span>
</pre>
            </td>
          </tr>
        </tbody>
      </table>
    </div>
  </body>
</html>