You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafodion.apache.org by db...@apache.org on 2018/01/06 20:06:36 UTC
[08/25] trafodion-site git commit: Merge PR 1370 and 1373 (JIRAs
TRAFODION-2861, 2869, 2868)
http://git-wip-us.apache.org/repos/asf/trafodion-site/blob/cb79fd18/docs/dcs_reference/xref/org/trafodion/dcs/master/ServerManager.html
----------------------------------------------------------------------
diff --git a/docs/dcs_reference/xref/org/trafodion/dcs/master/ServerManager.html b/docs/dcs_reference/xref/org/trafodion/dcs/master/ServerManager.html
index b83d071..e607d4e 100644
--- a/docs/dcs_reference/xref/org/trafodion/dcs/master/ServerManager.html
+++ b/docs/dcs_reference/xref/org/trafodion/dcs/master/ServerManager.html
@@ -186,8 +186,8 @@
<a class="jxr_linenumber" name="176" href="#176">176</a> <em class="jxr_comment">// But, if we are DcsMaster follower that is taking over from</em>
<a class="jxr_linenumber" name="177" href="#177">177</a> <em class="jxr_comment">// failed one then ignore timestamp issues described above.</em>
<a class="jxr_linenumber" name="178" href="#178">178</a> <em class="jxr_comment">// See MasterLeaderElection.elect()</em>
-<a class="jxr_linenumber" name="179" href="#179">179</a> <strong class="jxr_keyword">if</strong> ((master.isFollower() == false)
-<a class="jxr_linenumber" name="180" href="#180">180</a> && (serverStartTimestamp > startupTimestamp)) {
+<a class="jxr_linenumber" name="179" href="#179">179</a> <strong class="jxr_keyword">if</strong> ((master.isFollower() == false && serverStartTimestamp > startupTimestamp)
+<a class="jxr_linenumber" name="180" href="#180">180</a> || (master.isFollower() && runningServers.size() < configuredServers.size())) {
<a class="jxr_linenumber" name="181" href="#181">181</a> scriptContext.setHostName(hostName);
<a class="jxr_linenumber" name="182" href="#182">182</a> scriptContext
<a class="jxr_linenumber" name="183" href="#183">183</a> .setScriptName(Constants.SYS_SHELL_SCRIPT_NAME);
@@ -250,559 +250,561 @@
<a class="jxr_linenumber" name="240" href="#240">240</a> }
<a class="jxr_linenumber" name="241" href="#241">241</a> }
<a class="jxr_linenumber" name="242" href="#242">242</a> } <strong class="jxr_keyword">else</strong> {
-<a class="jxr_linenumber" name="243" href="#243">243</a> <strong class="jxr_keyword">if</strong> (LOG.isDebugEnabled())
-<a class="jxr_linenumber" name="244" href="#244">244</a> LOG.debug(<span class="jxr_string">"No restart for "</span>
-<a class="jxr_linenumber" name="245" href="#245">245</a> + znodePath
-<a class="jxr_linenumber" name="246" href="#246">246</a> + <span class="jxr_string">"\nbecause DcsServer start time ["</span>
-<a class="jxr_linenumber" name="247" href="#247">247</a> + DateFormat.getDateTimeInstance().format(
-<a class="jxr_linenumber" name="248" href="#248">248</a> <strong class="jxr_keyword">new</strong> Date(serverStartTimestamp))
-<a class="jxr_linenumber" name="249" href="#249">249</a> + <span class="jxr_string">"] was before DcsMaster start time ["</span>
-<a class="jxr_linenumber" name="250" href="#250">250</a> + DateFormat.getDateTimeInstance().format(
-<a class="jxr_linenumber" name="251" href="#251">251</a> <strong class="jxr_keyword">new</strong> Date(startupTimestamp)) + <span class="jxr_string">"]"</span>);
-<a class="jxr_linenumber" name="252" href="#252">252</a> }
-<a class="jxr_linenumber" name="253" href="#253">253</a> } <strong class="jxr_keyword">catch</strong> (Exception e) {
-<a class="jxr_linenumber" name="254" href="#254">254</a> e.printStackTrace();
-<a class="jxr_linenumber" name="255" href="#255">255</a> <strong class="jxr_keyword">if</strong> (LOG.isErrorEnabled())
-<a class="jxr_linenumber" name="256" href="#256">256</a> LOG.error(e);
-<a class="jxr_linenumber" name="257" href="#257">257</a> }
-<a class="jxr_linenumber" name="258" href="#258">258</a>
-<a class="jxr_linenumber" name="259" href="#259">259</a> <strong class="jxr_keyword">return</strong> scriptContext;
-<a class="jxr_linenumber" name="260" href="#260">260</a> }
-<a class="jxr_linenumber" name="261" href="#261">261</a> }
-<a class="jxr_linenumber" name="262" href="#262">262</a>
-<a class="jxr_linenumber" name="263" href="#263">263</a> <strong class="jxr_keyword">class</strong> <a href="../../../../org/trafodion/dcs/master/ServerManager.html">RunningWatcher</a> <strong class="jxr_keyword">implements</strong> Watcher {
-<a class="jxr_linenumber" name="264" href="#264">264</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> process(WatchedEvent event) {
-<a class="jxr_linenumber" name="265" href="#265">265</a> <strong class="jxr_keyword">if</strong> (event.getType() == Event.EventType.NodeChildrenChanged) {
-<a class="jxr_linenumber" name="266" href="#266">266</a> <strong class="jxr_keyword">if</strong> (LOG.isDebugEnabled())
-<a class="jxr_linenumber" name="267" href="#267">267</a> LOG.debug(<span class="jxr_string">"Running children changed ["</span> + event.getPath()
-<a class="jxr_linenumber" name="268" href="#268">268</a> + <span class="jxr_string">"]"</span>);
-<a class="jxr_linenumber" name="269" href="#269">269</a> <strong class="jxr_keyword">try</strong> {
-<a class="jxr_linenumber" name="270" href="#270">270</a> getZkRunning();
-<a class="jxr_linenumber" name="271" href="#271">271</a> } <strong class="jxr_keyword">catch</strong> (Exception e) {
-<a class="jxr_linenumber" name="272" href="#272">272</a> e.printStackTrace();
-<a class="jxr_linenumber" name="273" href="#273">273</a> <strong class="jxr_keyword">if</strong> (LOG.isErrorEnabled())
-<a class="jxr_linenumber" name="274" href="#274">274</a> LOG.error(e);
-<a class="jxr_linenumber" name="275" href="#275">275</a> }
-<a class="jxr_linenumber" name="276" href="#276">276</a> } <strong class="jxr_keyword">else</strong> <strong class="jxr_keyword">if</strong> (event.getType() == Event.EventType.NodeDeleted) {
-<a class="jxr_linenumber" name="277" href="#277">277</a> String znodePath = event.getPath();
-<a class="jxr_linenumber" name="278" href="#278">278</a> <strong class="jxr_keyword">if</strong> (LOG.isDebugEnabled())
-<a class="jxr_linenumber" name="279" href="#279">279</a> LOG.debug(<span class="jxr_string">"Running znode deleted ["</span> + znodePath + <span class="jxr_string">"]"</span>);
-<a class="jxr_linenumber" name="280" href="#280">280</a> <strong class="jxr_keyword">try</strong> {
-<a class="jxr_linenumber" name="281" href="#281">281</a> restartServer(znodePath);
-<a class="jxr_linenumber" name="282" href="#282">282</a> } <strong class="jxr_keyword">catch</strong> (Exception e) {
-<a class="jxr_linenumber" name="283" href="#283">283</a> e.printStackTrace();
-<a class="jxr_linenumber" name="284" href="#284">284</a> <strong class="jxr_keyword">if</strong> (LOG.isErrorEnabled())
-<a class="jxr_linenumber" name="285" href="#285">285</a> LOG.error(e);
-<a class="jxr_linenumber" name="286" href="#286">286</a> }
-<a class="jxr_linenumber" name="287" href="#287">287</a> }
-<a class="jxr_linenumber" name="288" href="#288">288</a> }
-<a class="jxr_linenumber" name="289" href="#289">289</a> }
-<a class="jxr_linenumber" name="290" href="#290">290</a>
-<a class="jxr_linenumber" name="291" href="#291">291</a> <strong class="jxr_keyword">class</strong> <a href="../../../../org/trafodion/dcs/master/ServerManager.html">RegisteredWatcher</a> <strong class="jxr_keyword">implements</strong> Watcher {
-<a class="jxr_linenumber" name="292" href="#292">292</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> process(WatchedEvent event) {
-<a class="jxr_linenumber" name="293" href="#293">293</a> <strong class="jxr_keyword">if</strong> (event.getType() == Event.EventType.NodeChildrenChanged) {
-<a class="jxr_linenumber" name="294" href="#294">294</a> <strong class="jxr_keyword">if</strong> (LOG.isDebugEnabled())
-<a class="jxr_linenumber" name="295" href="#295">295</a> LOG.debug(<span class="jxr_string">"Registered children changed ["</span> + event.getPath()
-<a class="jxr_linenumber" name="296" href="#296">296</a> + <span class="jxr_string">"]"</span>);
-<a class="jxr_linenumber" name="297" href="#297">297</a> <strong class="jxr_keyword">try</strong> {
-<a class="jxr_linenumber" name="298" href="#298">298</a> getZkRegistered();
-<a class="jxr_linenumber" name="299" href="#299">299</a> } <strong class="jxr_keyword">catch</strong> (Exception e) {
-<a class="jxr_linenumber" name="300" href="#300">300</a> e.printStackTrace();
-<a class="jxr_linenumber" name="301" href="#301">301</a> <strong class="jxr_keyword">if</strong> (LOG.isErrorEnabled())
-<a class="jxr_linenumber" name="302" href="#302">302</a> LOG.error(e);
-<a class="jxr_linenumber" name="303" href="#303">303</a> }
-<a class="jxr_linenumber" name="304" href="#304">304</a> }
-<a class="jxr_linenumber" name="305" href="#305">305</a> }
-<a class="jxr_linenumber" name="306" href="#306">306</a> }
-<a class="jxr_linenumber" name="307" href="#307">307</a>
-<a class="jxr_linenumber" name="308" href="#308">308</a> @Override
-<a class="jxr_linenumber" name="309" href="#309">309</a> <strong class="jxr_keyword">public</strong> Boolean call() <strong class="jxr_keyword">throws</strong> Exception {
-<a class="jxr_linenumber" name="310" href="#310">310</a>
-<a class="jxr_linenumber" name="311" href="#311">311</a> <strong class="jxr_keyword">long</strong> timeoutMillis = 5000;
+<a class="jxr_linenumber" name="243" href="#243">243</a> StringBuffer sb = <strong class="jxr_keyword">new</strong> StringBuffer();
+<a class="jxr_linenumber" name="244" href="#244">244</a> sb.append(<span class="jxr_string">"No restart for "</span>).append(znodePath).append(System.getProperty(<span class="jxr_string">"line.separator"</span>));
+<a class="jxr_linenumber" name="245" href="#245">245</a> sb.append(<span class="jxr_string">"DCS Master isFollower ["</span>).append(master.isFollower()).append(<span class="jxr_string">"], "</span>);
+<a class="jxr_linenumber" name="246" href="#246">246</a> sb.append(<span class="jxr_string">"DCS Master start time ["</span>)
+<a class="jxr_linenumber" name="247" href="#247">247</a> .append(DateFormat.getDateTimeInstance().format(<strong class="jxr_keyword">new</strong> Date(startupTimestamp))).append(<span class="jxr_string">"], "</span>);
+<a class="jxr_linenumber" name="248" href="#248">248</a> sb.append(<span class="jxr_string">"DCS Server start time ["</span>)
+<a class="jxr_linenumber" name="249" href="#249">249</a> .append(DateFormat.getDateTimeInstance().format(<strong class="jxr_keyword">new</strong> Date(serverStartTimestamp))).append(<span class="jxr_string">"], "</span>);
+<a class="jxr_linenumber" name="250" href="#250">250</a> sb.append(<span class="jxr_string">"running DCS Server num is ["</span>).append(runningServers.size())
+<a class="jxr_linenumber" name="251" href="#251">251</a> .append(<span class="jxr_string">"], registered DCS Server num is ["</span>).append(registeredServers.size()).append(<span class="jxr_string">"]."</span>);
+<a class="jxr_linenumber" name="252" href="#252">252</a>
+<a class="jxr_linenumber" name="253" href="#253">253</a> LOG.info(sb.toString());
+<a class="jxr_linenumber" name="254" href="#254">254</a> }
+<a class="jxr_linenumber" name="255" href="#255">255</a> } <strong class="jxr_keyword">catch</strong> (Exception e) {
+<a class="jxr_linenumber" name="256" href="#256">256</a> e.printStackTrace();
+<a class="jxr_linenumber" name="257" href="#257">257</a> <strong class="jxr_keyword">if</strong> (LOG.isErrorEnabled())
+<a class="jxr_linenumber" name="258" href="#258">258</a> LOG.error(e);
+<a class="jxr_linenumber" name="259" href="#259">259</a> }
+<a class="jxr_linenumber" name="260" href="#260">260</a>
+<a class="jxr_linenumber" name="261" href="#261">261</a> <strong class="jxr_keyword">return</strong> scriptContext;
+<a class="jxr_linenumber" name="262" href="#262">262</a> }
+<a class="jxr_linenumber" name="263" href="#263">263</a> }
+<a class="jxr_linenumber" name="264" href="#264">264</a>
+<a class="jxr_linenumber" name="265" href="#265">265</a> <strong class="jxr_keyword">class</strong> <a href="../../../../org/trafodion/dcs/master/ServerManager.html">RunningWatcher</a> <strong class="jxr_keyword">implements</strong> Watcher {
+<a class="jxr_linenumber" name="266" href="#266">266</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> process(WatchedEvent event) {
+<a class="jxr_linenumber" name="267" href="#267">267</a> <strong class="jxr_keyword">if</strong> (event.getType() == Event.EventType.NodeChildrenChanged) {
+<a class="jxr_linenumber" name="268" href="#268">268</a> <strong class="jxr_keyword">if</strong> (LOG.isDebugEnabled())
+<a class="jxr_linenumber" name="269" href="#269">269</a> LOG.debug(<span class="jxr_string">"Running children changed ["</span> + event.getPath()
+<a class="jxr_linenumber" name="270" href="#270">270</a> + <span class="jxr_string">"]"</span>);
+<a class="jxr_linenumber" name="271" href="#271">271</a> <strong class="jxr_keyword">try</strong> {
+<a class="jxr_linenumber" name="272" href="#272">272</a> getZkRunning();
+<a class="jxr_linenumber" name="273" href="#273">273</a> } <strong class="jxr_keyword">catch</strong> (Exception e) {
+<a class="jxr_linenumber" name="274" href="#274">274</a> e.printStackTrace();
+<a class="jxr_linenumber" name="275" href="#275">275</a> <strong class="jxr_keyword">if</strong> (LOG.isErrorEnabled())
+<a class="jxr_linenumber" name="276" href="#276">276</a> LOG.error(e);
+<a class="jxr_linenumber" name="277" href="#277">277</a> }
+<a class="jxr_linenumber" name="278" href="#278">278</a> } <strong class="jxr_keyword">else</strong> <strong class="jxr_keyword">if</strong> (event.getType() == Event.EventType.NodeDeleted) {
+<a class="jxr_linenumber" name="279" href="#279">279</a> String znodePath = event.getPath();
+<a class="jxr_linenumber" name="280" href="#280">280</a> <strong class="jxr_keyword">if</strong> (LOG.isDebugEnabled())
+<a class="jxr_linenumber" name="281" href="#281">281</a> LOG.debug(<span class="jxr_string">"Running znode deleted ["</span> + znodePath + <span class="jxr_string">"]"</span>);
+<a class="jxr_linenumber" name="282" href="#282">282</a> <strong class="jxr_keyword">try</strong> {
+<a class="jxr_linenumber" name="283" href="#283">283</a> restartServer(znodePath);
+<a class="jxr_linenumber" name="284" href="#284">284</a> } <strong class="jxr_keyword">catch</strong> (Exception e) {
+<a class="jxr_linenumber" name="285" href="#285">285</a> e.printStackTrace();
+<a class="jxr_linenumber" name="286" href="#286">286</a> <strong class="jxr_keyword">if</strong> (LOG.isErrorEnabled())
+<a class="jxr_linenumber" name="287" href="#287">287</a> LOG.error(e);
+<a class="jxr_linenumber" name="288" href="#288">288</a> }
+<a class="jxr_linenumber" name="289" href="#289">289</a> }
+<a class="jxr_linenumber" name="290" href="#290">290</a> }
+<a class="jxr_linenumber" name="291" href="#291">291</a> }
+<a class="jxr_linenumber" name="292" href="#292">292</a>
+<a class="jxr_linenumber" name="293" href="#293">293</a> <strong class="jxr_keyword">class</strong> <a href="../../../../org/trafodion/dcs/master/ServerManager.html">RegisteredWatcher</a> <strong class="jxr_keyword">implements</strong> Watcher {
+<a class="jxr_linenumber" name="294" href="#294">294</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> process(WatchedEvent event) {
+<a class="jxr_linenumber" name="295" href="#295">295</a> <strong class="jxr_keyword">if</strong> (event.getType() == Event.EventType.NodeChildrenChanged) {
+<a class="jxr_linenumber" name="296" href="#296">296</a> <strong class="jxr_keyword">if</strong> (LOG.isDebugEnabled())
+<a class="jxr_linenumber" name="297" href="#297">297</a> LOG.debug(<span class="jxr_string">"Registered children changed ["</span> + event.getPath()
+<a class="jxr_linenumber" name="298" href="#298">298</a> + <span class="jxr_string">"]"</span>);
+<a class="jxr_linenumber" name="299" href="#299">299</a> <strong class="jxr_keyword">try</strong> {
+<a class="jxr_linenumber" name="300" href="#300">300</a> getZkRegistered();
+<a class="jxr_linenumber" name="301" href="#301">301</a> } <strong class="jxr_keyword">catch</strong> (Exception e) {
+<a class="jxr_linenumber" name="302" href="#302">302</a> e.printStackTrace();
+<a class="jxr_linenumber" name="303" href="#303">303</a> <strong class="jxr_keyword">if</strong> (LOG.isErrorEnabled())
+<a class="jxr_linenumber" name="304" href="#304">304</a> LOG.error(e);
+<a class="jxr_linenumber" name="305" href="#305">305</a> }
+<a class="jxr_linenumber" name="306" href="#306">306</a> }
+<a class="jxr_linenumber" name="307" href="#307">307</a> }
+<a class="jxr_linenumber" name="308" href="#308">308</a> }
+<a class="jxr_linenumber" name="309" href="#309">309</a>
+<a class="jxr_linenumber" name="310" href="#310">310</a> @Override
+<a class="jxr_linenumber" name="311" href="#311">311</a> <strong class="jxr_keyword">public</strong> Boolean call() <strong class="jxr_keyword">throws</strong> Exception {
<a class="jxr_linenumber" name="312" href="#312">312</a>
-<a class="jxr_linenumber" name="313" href="#313">313</a> <strong class="jxr_keyword">try</strong> {
-<a class="jxr_linenumber" name="314" href="#314">314</a> getServersFile();
-<a class="jxr_linenumber" name="315" href="#315">315</a> createServersPortMap();
-<a class="jxr_linenumber" name="316" href="#316">316</a> getZkRunning();
-<a class="jxr_linenumber" name="317" href="#317">317</a> getZkRegistered();
-<a class="jxr_linenumber" name="318" href="#318">318</a>
-<a class="jxr_linenumber" name="319" href="#319">319</a> <strong class="jxr_keyword">while</strong> (<strong class="jxr_keyword">true</strong>) {
-<a class="jxr_linenumber" name="320" href="#320">320</a> <strong class="jxr_keyword">while</strong> (!restartQueue.isEmpty()) {
-<a class="jxr_linenumber" name="321" href="#321">321</a> <strong class="jxr_keyword">if</strong> (LOG.isDebugEnabled())
-<a class="jxr_linenumber" name="322" href="#322">322</a> LOG.debug(<span class="jxr_string">"Restart queue size ["</span> + restartQueue.size()
-<a class="jxr_linenumber" name="323" href="#323">323</a> + <span class="jxr_string">"]"</span>);
-<a class="jxr_linenumber" name="324" href="#324">324</a> <a href="../../../../org/trafodion/dcs/master/ServerManager.html">RestartHandler</a> handler = restartQueue.poll();
-<a class="jxr_linenumber" name="325" href="#325">325</a> Future<ScriptContext> runner = pool.submit(handler);
-<a class="jxr_linenumber" name="326" href="#326">326</a> <a href="../../../../org/trafodion/dcs/script/ScriptContext.html">ScriptContext</a> scriptContext = runner.get();<em class="jxr_comment">// blocking call</em>
-<a class="jxr_linenumber" name="327" href="#327">327</a> <strong class="jxr_keyword">if</strong> (scriptContext.getExitCode() != 0)
-<a class="jxr_linenumber" name="328" href="#328">328</a> restartQueue.add(handler);
-<a class="jxr_linenumber" name="329" href="#329">329</a> }
-<a class="jxr_linenumber" name="330" href="#330">330</a>
-<a class="jxr_linenumber" name="331" href="#331">331</a> <strong class="jxr_keyword">try</strong> {
-<a class="jxr_linenumber" name="332" href="#332">332</a> Thread.sleep(timeoutMillis);
-<a class="jxr_linenumber" name="333" href="#333">333</a> } <strong class="jxr_keyword">catch</strong> (InterruptedException e) {
-<a class="jxr_linenumber" name="334" href="#334">334</a> }
-<a class="jxr_linenumber" name="335" href="#335">335</a> }
-<a class="jxr_linenumber" name="336" href="#336">336</a>
-<a class="jxr_linenumber" name="337" href="#337">337</a> } <strong class="jxr_keyword">catch</strong> (Exception e) {
-<a class="jxr_linenumber" name="338" href="#338">338</a> e.printStackTrace();
-<a class="jxr_linenumber" name="339" href="#339">339</a> <strong class="jxr_keyword">if</strong> (LOG.isErrorEnabled())
-<a class="jxr_linenumber" name="340" href="#340">340</a> LOG.error(e);
-<a class="jxr_linenumber" name="341" href="#341">341</a> pool.shutdown();
-<a class="jxr_linenumber" name="342" href="#342">342</a> <strong class="jxr_keyword">throw</strong> e;
-<a class="jxr_linenumber" name="343" href="#343">343</a> }
-<a class="jxr_linenumber" name="344" href="#344">344</a> }
-<a class="jxr_linenumber" name="345" href="#345">345</a>
-<a class="jxr_linenumber" name="346" href="#346">346</a> <strong class="jxr_keyword">private</strong> List<String> getChildren(String znode, Watcher watcher)
-<a class="jxr_linenumber" name="347" href="#347">347</a> <strong class="jxr_keyword">throws</strong> Exception {
-<a class="jxr_linenumber" name="348" href="#348">348</a> List<String> children = <strong class="jxr_keyword">null</strong>;
-<a class="jxr_linenumber" name="349" href="#349">349</a> children = zkc.getChildren(znode, watcher);
-<a class="jxr_linenumber" name="350" href="#350">350</a> <strong class="jxr_keyword">if</strong> (!children.isEmpty())
-<a class="jxr_linenumber" name="351" href="#351">351</a> Collections.sort(children);
-<a class="jxr_linenumber" name="352" href="#352">352</a> <strong class="jxr_keyword">return</strong> children;
-<a class="jxr_linenumber" name="353" href="#353">353</a> }
-<a class="jxr_linenumber" name="354" href="#354">354</a>
-<a class="jxr_linenumber" name="355" href="#355">355</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">void</strong> getServersFile() <strong class="jxr_keyword">throws</strong> Exception {
-<a class="jxr_linenumber" name="356" href="#356">356</a> InputStream is = <strong class="jxr_keyword">this</strong>.getClass().getResourceAsStream(<span class="jxr_string">"/servers"</span>);
-<a class="jxr_linenumber" name="357" href="#357">357</a> <strong class="jxr_keyword">if</strong> (is == <strong class="jxr_keyword">null</strong>)
-<a class="jxr_linenumber" name="358" href="#358">358</a> <strong class="jxr_keyword">throw</strong> <strong class="jxr_keyword">new</strong> IOException(<span class="jxr_string">"Cannot find servers file"</span>);
-<a class="jxr_linenumber" name="359" href="#359">359</a>
-<a class="jxr_linenumber" name="360" href="#360">360</a> BufferedReader br = <strong class="jxr_keyword">new</strong> BufferedReader(<strong class="jxr_keyword">new</strong> InputStreamReader(is));
-<a class="jxr_linenumber" name="361" href="#361">361</a> configuredServers.clear();
-<a class="jxr_linenumber" name="362" href="#362">362</a> String line;
-<a class="jxr_linenumber" name="363" href="#363">363</a> <strong class="jxr_keyword">int</strong> lineNum = 1;
-<a class="jxr_linenumber" name="364" href="#364">364</a> <strong class="jxr_keyword">while</strong> ((line = br.readLine()) != <strong class="jxr_keyword">null</strong>) {
-<a class="jxr_linenumber" name="365" href="#365">365</a> Scanner scn = <strong class="jxr_keyword">new</strong> Scanner(line);
-<a class="jxr_linenumber" name="366" href="#366">366</a> scn.useDelimiter(<span class="jxr_string">" "</span>);
-<a class="jxr_linenumber" name="367" href="#367">367</a> String hostName = <strong class="jxr_keyword">null</strong>;
-<a class="jxr_linenumber" name="368" href="#368">368</a> String serverCount = <strong class="jxr_keyword">null</strong>;
-<a class="jxr_linenumber" name="369" href="#369">369</a> <strong class="jxr_keyword">if</strong> (scn.hasNext())
-<a class="jxr_linenumber" name="370" href="#370">370</a> hostName = scn.next();<em class="jxr_comment">// host name</em>
-<a class="jxr_linenumber" name="371" href="#371">371</a> <strong class="jxr_keyword">else</strong>
-<a class="jxr_linenumber" name="372" href="#372">372</a> hostName = <strong class="jxr_keyword">new</strong> String(<span class="jxr_string">"localhost"</span>);
-<a class="jxr_linenumber" name="373" href="#373">373</a> <strong class="jxr_keyword">if</strong> (scn.hasNext())
-<a class="jxr_linenumber" name="374" href="#374">374</a> serverCount = scn.next();<em class="jxr_comment">// optional</em>
-<a class="jxr_linenumber" name="375" href="#375">375</a> <strong class="jxr_keyword">else</strong>
-<a class="jxr_linenumber" name="376" href="#376">376</a> serverCount = <span class="jxr_string">"1"</span>;
-<a class="jxr_linenumber" name="377" href="#377">377</a> scn.close();
-<a class="jxr_linenumber" name="378" href="#378">378</a> <strong class="jxr_keyword">if</strong> (hostName.equalsIgnoreCase(<span class="jxr_string">"localhost"</span>)) {
-<a class="jxr_linenumber" name="379" href="#379">379</a> hostName = netConf.getHostName();
-<a class="jxr_linenumber" name="380" href="#380">380</a> }
-<a class="jxr_linenumber" name="381" href="#381">381</a> <strong class="jxr_keyword">if</strong> (LOG.isDebugEnabled())
-<a class="jxr_linenumber" name="382" href="#382">382</a> LOG.debug(<span class="jxr_string">"Adding to configured servers ["</span> + hostName + <span class="jxr_string">":"</span>
-<a class="jxr_linenumber" name="383" href="#383">383</a> + lineNum + <span class="jxr_string">":"</span> + serverCount + <span class="jxr_string">"]"</span>);
-<a class="jxr_linenumber" name="384" href="#384">384</a> configuredServers.add(hostName + <span class="jxr_string">":"</span> + lineNum + <span class="jxr_string">":"</span> + serverCount);
-<a class="jxr_linenumber" name="385" href="#385">385</a> lineNum++;
-<a class="jxr_linenumber" name="386" href="#386">386</a> }
-<a class="jxr_linenumber" name="387" href="#387">387</a>
-<a class="jxr_linenumber" name="388" href="#388">388</a> Collections.sort(configuredServers);
+<a class="jxr_linenumber" name="313" href="#313">313</a> <strong class="jxr_keyword">long</strong> timeoutMillis = 5000;
+<a class="jxr_linenumber" name="314" href="#314">314</a>
+<a class="jxr_linenumber" name="315" href="#315">315</a> <strong class="jxr_keyword">try</strong> {
+<a class="jxr_linenumber" name="316" href="#316">316</a> getServersFile();
+<a class="jxr_linenumber" name="317" href="#317">317</a> createServersPortMap();
+<a class="jxr_linenumber" name="318" href="#318">318</a> getZkRunning();
+<a class="jxr_linenumber" name="319" href="#319">319</a> getZkRegistered();
+<a class="jxr_linenumber" name="320" href="#320">320</a>
+<a class="jxr_linenumber" name="321" href="#321">321</a> <strong class="jxr_keyword">while</strong> (<strong class="jxr_keyword">true</strong>) {
+<a class="jxr_linenumber" name="322" href="#322">322</a> <strong class="jxr_keyword">while</strong> (!restartQueue.isEmpty()) {
+<a class="jxr_linenumber" name="323" href="#323">323</a> <strong class="jxr_keyword">if</strong> (LOG.isDebugEnabled())
+<a class="jxr_linenumber" name="324" href="#324">324</a> LOG.debug(<span class="jxr_string">"Restart queue size ["</span> + restartQueue.size()
+<a class="jxr_linenumber" name="325" href="#325">325</a> + <span class="jxr_string">"]"</span>);
+<a class="jxr_linenumber" name="326" href="#326">326</a> <a href="../../../../org/trafodion/dcs/master/ServerManager.html">RestartHandler</a> handler = restartQueue.poll();
+<a class="jxr_linenumber" name="327" href="#327">327</a> Future<ScriptContext> runner = pool.submit(handler);
+<a class="jxr_linenumber" name="328" href="#328">328</a> <a href="../../../../org/trafodion/dcs/script/ScriptContext.html">ScriptContext</a> scriptContext = runner.get();<em class="jxr_comment">// blocking call</em>
+<a class="jxr_linenumber" name="329" href="#329">329</a> <strong class="jxr_keyword">if</strong> (scriptContext.getExitCode() != 0)
+<a class="jxr_linenumber" name="330" href="#330">330</a> restartQueue.add(handler);
+<a class="jxr_linenumber" name="331" href="#331">331</a> }
+<a class="jxr_linenumber" name="332" href="#332">332</a>
+<a class="jxr_linenumber" name="333" href="#333">333</a> <strong class="jxr_keyword">try</strong> {
+<a class="jxr_linenumber" name="334" href="#334">334</a> Thread.sleep(timeoutMillis);
+<a class="jxr_linenumber" name="335" href="#335">335</a> } <strong class="jxr_keyword">catch</strong> (InterruptedException e) {
+<a class="jxr_linenumber" name="336" href="#336">336</a> }
+<a class="jxr_linenumber" name="337" href="#337">337</a> }
+<a class="jxr_linenumber" name="338" href="#338">338</a>
+<a class="jxr_linenumber" name="339" href="#339">339</a> } <strong class="jxr_keyword">catch</strong> (Exception e) {
+<a class="jxr_linenumber" name="340" href="#340">340</a> e.printStackTrace();
+<a class="jxr_linenumber" name="341" href="#341">341</a> <strong class="jxr_keyword">if</strong> (LOG.isErrorEnabled())
+<a class="jxr_linenumber" name="342" href="#342">342</a> LOG.error(e);
+<a class="jxr_linenumber" name="343" href="#343">343</a> pool.shutdown();
+<a class="jxr_linenumber" name="344" href="#344">344</a> <strong class="jxr_keyword">throw</strong> e;
+<a class="jxr_linenumber" name="345" href="#345">345</a> }
+<a class="jxr_linenumber" name="346" href="#346">346</a> }
+<a class="jxr_linenumber" name="347" href="#347">347</a>
+<a class="jxr_linenumber" name="348" href="#348">348</a> <strong class="jxr_keyword">private</strong> List<String> getChildren(String znode, Watcher watcher)
+<a class="jxr_linenumber" name="349" href="#349">349</a> <strong class="jxr_keyword">throws</strong> Exception {
+<a class="jxr_linenumber" name="350" href="#350">350</a> List<String> children = <strong class="jxr_keyword">null</strong>;
+<a class="jxr_linenumber" name="351" href="#351">351</a> children = zkc.getChildren(znode, watcher);
+<a class="jxr_linenumber" name="352" href="#352">352</a> <strong class="jxr_keyword">if</strong> (!children.isEmpty())
+<a class="jxr_linenumber" name="353" href="#353">353</a> Collections.sort(children);
+<a class="jxr_linenumber" name="354" href="#354">354</a> <strong class="jxr_keyword">return</strong> children;
+<a class="jxr_linenumber" name="355" href="#355">355</a> }
+<a class="jxr_linenumber" name="356" href="#356">356</a>
+<a class="jxr_linenumber" name="357" href="#357">357</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">void</strong> getServersFile() <strong class="jxr_keyword">throws</strong> Exception {
+<a class="jxr_linenumber" name="358" href="#358">358</a> InputStream is = <strong class="jxr_keyword">this</strong>.getClass().getResourceAsStream(<span class="jxr_string">"/servers"</span>);
+<a class="jxr_linenumber" name="359" href="#359">359</a> <strong class="jxr_keyword">if</strong> (is == <strong class="jxr_keyword">null</strong>)
+<a class="jxr_linenumber" name="360" href="#360">360</a> <strong class="jxr_keyword">throw</strong> <strong class="jxr_keyword">new</strong> IOException(<span class="jxr_string">"Cannot find servers file"</span>);
+<a class="jxr_linenumber" name="361" href="#361">361</a>
+<a class="jxr_linenumber" name="362" href="#362">362</a> BufferedReader br = <strong class="jxr_keyword">new</strong> BufferedReader(<strong class="jxr_keyword">new</strong> InputStreamReader(is));
+<a class="jxr_linenumber" name="363" href="#363">363</a> configuredServers.clear();
+<a class="jxr_linenumber" name="364" href="#364">364</a> String line;
+<a class="jxr_linenumber" name="365" href="#365">365</a> <strong class="jxr_keyword">int</strong> lineNum = 1;
+<a class="jxr_linenumber" name="366" href="#366">366</a> <strong class="jxr_keyword">while</strong> ((line = br.readLine()) != <strong class="jxr_keyword">null</strong>) {
+<a class="jxr_linenumber" name="367" href="#367">367</a> Scanner scn = <strong class="jxr_keyword">new</strong> Scanner(line);
+<a class="jxr_linenumber" name="368" href="#368">368</a> scn.useDelimiter(<span class="jxr_string">" "</span>);
+<a class="jxr_linenumber" name="369" href="#369">369</a> String hostName = <strong class="jxr_keyword">null</strong>;
+<a class="jxr_linenumber" name="370" href="#370">370</a> String serverCount = <strong class="jxr_keyword">null</strong>;
+<a class="jxr_linenumber" name="371" href="#371">371</a> <strong class="jxr_keyword">if</strong> (scn.hasNext())
+<a class="jxr_linenumber" name="372" href="#372">372</a> hostName = scn.next();<em class="jxr_comment">// host name</em>
+<a class="jxr_linenumber" name="373" href="#373">373</a> <strong class="jxr_keyword">else</strong>
+<a class="jxr_linenumber" name="374" href="#374">374</a> hostName = <strong class="jxr_keyword">new</strong> String(<span class="jxr_string">"localhost"</span>);
+<a class="jxr_linenumber" name="375" href="#375">375</a> <strong class="jxr_keyword">if</strong> (scn.hasNext())
+<a class="jxr_linenumber" name="376" href="#376">376</a> serverCount = scn.next();<em class="jxr_comment">// optional</em>
+<a class="jxr_linenumber" name="377" href="#377">377</a> <strong class="jxr_keyword">else</strong>
+<a class="jxr_linenumber" name="378" href="#378">378</a> serverCount = <span class="jxr_string">"1"</span>;
+<a class="jxr_linenumber" name="379" href="#379">379</a> scn.close();
+<a class="jxr_linenumber" name="380" href="#380">380</a> <strong class="jxr_keyword">if</strong> (hostName.equalsIgnoreCase(<span class="jxr_string">"localhost"</span>)) {
+<a class="jxr_linenumber" name="381" href="#381">381</a> hostName = netConf.getHostName();
+<a class="jxr_linenumber" name="382" href="#382">382</a> }
+<a class="jxr_linenumber" name="383" href="#383">383</a> <strong class="jxr_keyword">if</strong> (LOG.isDebugEnabled())
+<a class="jxr_linenumber" name="384" href="#384">384</a> LOG.debug(<span class="jxr_string">"Adding to configured servers ["</span> + hostName + <span class="jxr_string">":"</span>
+<a class="jxr_linenumber" name="385" href="#385">385</a> + lineNum + <span class="jxr_string">":"</span> + serverCount + <span class="jxr_string">"]"</span>);
+<a class="jxr_linenumber" name="386" href="#386">386</a> configuredServers.add(hostName + <span class="jxr_string">":"</span> + lineNum + <span class="jxr_string">":"</span> + serverCount);
+<a class="jxr_linenumber" name="387" href="#387">387</a> lineNum++;
+<a class="jxr_linenumber" name="388" href="#388">388</a> }
<a class="jxr_linenumber" name="389" href="#389">389</a>
-<a class="jxr_linenumber" name="390" href="#390">390</a> <strong class="jxr_keyword">if</strong> (configuredServers.size() < 1)
-<a class="jxr_linenumber" name="391" href="#391">391</a> <strong class="jxr_keyword">throw</strong> <strong class="jxr_keyword">new</strong> IOException(<span class="jxr_string">"No entries found in servers file"</span>);
-<a class="jxr_linenumber" name="392" href="#392">392</a>
-<a class="jxr_linenumber" name="393" href="#393">393</a> <strong class="jxr_keyword">int</strong> lnum = 1;
-<a class="jxr_linenumber" name="394" href="#394">394</a> <strong class="jxr_keyword">for</strong> (<strong class="jxr_keyword">int</strong> i = 0; i < configuredServers.size(); i++) {
-<a class="jxr_linenumber" name="395" href="#395">395</a> <strong class="jxr_keyword">if</strong> (LOG.isDebugEnabled())
-<a class="jxr_linenumber" name="396" href="#396">396</a> LOG.debug(<span class="jxr_string">"servers file line "</span> + lnum + <span class="jxr_string">" ["</span>
-<a class="jxr_linenumber" name="397" href="#397">397</a> + configuredServers.get(i) + <span class="jxr_string">"]"</span>);
-<a class="jxr_linenumber" name="398" href="#398">398</a> lnum++;
-<a class="jxr_linenumber" name="399" href="#399">399</a> }
-<a class="jxr_linenumber" name="400" href="#400">400</a> }
-<a class="jxr_linenumber" name="401" href="#401">401</a>
-<a class="jxr_linenumber" name="402" href="#402">402</a> <strong class="jxr_keyword">class</strong> <a href="../../../../org/trafodion/dcs/master/ServerManager.html">ServerPortMap</a> {
-<a class="jxr_linenumber" name="403" href="#403">403</a> <strong class="jxr_keyword">int</strong> begPortNum = conf.getInt(Constants.DCS_MASTER_PORT,
-<a class="jxr_linenumber" name="404" href="#404">404</a> Constants.DEFAULT_DCS_MASTER_PORT) + 1;
-<a class="jxr_linenumber" name="405" href="#405">405</a> <strong class="jxr_keyword">int</strong> endPortNum = begPortNum;
-<a class="jxr_linenumber" name="406" href="#406">406</a> StringBuilder sb = <strong class="jxr_keyword">new</strong> StringBuilder();
-<a class="jxr_linenumber" name="407" href="#407">407</a>
-<a class="jxr_linenumber" name="408" href="#408">408</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> add(<strong class="jxr_keyword">int</strong> instance, <strong class="jxr_keyword">int</strong> childCount) {
-<a class="jxr_linenumber" name="409" href="#409">409</a> <strong class="jxr_keyword">for</strong> (<strong class="jxr_keyword">int</strong> i = 1; i <= childCount; i++) {
-<a class="jxr_linenumber" name="410" href="#410">410</a> <strong class="jxr_keyword">if</strong> (endPortNum > begPortNum)
-<a class="jxr_linenumber" name="411" href="#411">411</a> sb.append(<span class="jxr_string">":"</span>);
-<a class="jxr_linenumber" name="412" href="#412">412</a> sb.append(instance + <span class="jxr_string">":"</span> + i + <span class="jxr_string">":"</span> + endPortNum);
-<a class="jxr_linenumber" name="413" href="#413">413</a> endPortNum++;
-<a class="jxr_linenumber" name="414" href="#414">414</a> }
-<a class="jxr_linenumber" name="415" href="#415">415</a> }
-<a class="jxr_linenumber" name="416" href="#416">416</a>
-<a class="jxr_linenumber" name="417" href="#417">417</a> <strong class="jxr_keyword">public</strong> String toString() {
-<a class="jxr_linenumber" name="418" href="#418">418</a> <strong class="jxr_keyword">return</strong> sb.toString();
-<a class="jxr_linenumber" name="419" href="#419">419</a> }
-<a class="jxr_linenumber" name="420" href="#420">420</a> }
-<a class="jxr_linenumber" name="421" href="#421">421</a>
-<a class="jxr_linenumber" name="422" href="#422">422</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">void</strong> createServersPortMap() <strong class="jxr_keyword">throws</strong> Exception {
-<a class="jxr_linenumber" name="423" href="#423">423</a> serverPortMap.clear();
-<a class="jxr_linenumber" name="424" href="#424">424</a>
-<a class="jxr_linenumber" name="425" href="#425">425</a> <strong class="jxr_keyword">for</strong> (String aServer : configuredServers) {
-<a class="jxr_linenumber" name="426" href="#426">426</a> Scanner scn = <strong class="jxr_keyword">new</strong> Scanner(aServer);
-<a class="jxr_linenumber" name="427" href="#427">427</a> scn.useDelimiter(<span class="jxr_string">":"</span>);
-<a class="jxr_linenumber" name="428" href="#428">428</a> String hostName = scn.next();
-<a class="jxr_linenumber" name="429" href="#429">429</a> <strong class="jxr_keyword">int</strong> instance = Integer.parseInt(scn.next());
-<a class="jxr_linenumber" name="430" href="#430">430</a> <strong class="jxr_keyword">int</strong> childCount = Integer.parseInt(scn.next());
-<a class="jxr_linenumber" name="431" href="#431">431</a> scn.close();
-<a class="jxr_linenumber" name="432" href="#432">432</a>
-<a class="jxr_linenumber" name="433" href="#433">433</a> <a href="../../../../org/trafodion/dcs/master/ServerManager.html">ServerPortMap</a> spm = serverPortMap.get(hostName);
-<a class="jxr_linenumber" name="434" href="#434">434</a> <strong class="jxr_keyword">if</strong> (spm == <strong class="jxr_keyword">null</strong>)
-<a class="jxr_linenumber" name="435" href="#435">435</a> spm = <strong class="jxr_keyword">new</strong> <a href="../../../../org/trafodion/dcs/master/ServerManager.html">ServerPortMap</a>();
-<a class="jxr_linenumber" name="436" href="#436">436</a> spm.add(instance, childCount);
-<a class="jxr_linenumber" name="437" href="#437">437</a> serverPortMap.put(hostName, spm);
-<a class="jxr_linenumber" name="438" href="#438">438</a> }
-<a class="jxr_linenumber" name="439" href="#439">439</a>
-<a class="jxr_linenumber" name="440" href="#440">440</a> StringBuilder sb = <strong class="jxr_keyword">new</strong> StringBuilder();
-<a class="jxr_linenumber" name="441" href="#441">441</a> <strong class="jxr_keyword">for</strong> (Map.Entry<String, ServerPortMap> entry : serverPortMap.entrySet()) {
-<a class="jxr_linenumber" name="442" href="#442">442</a> LOG.debug((<span class="jxr_string">"Key = "</span> + entry.getKey() + <span class="jxr_string">", Value = "</span> + entry
-<a class="jxr_linenumber" name="443" href="#443">443</a> .getValue()));
-<a class="jxr_linenumber" name="444" href="#444">444</a> sb.append(entry.getValue());
-<a class="jxr_linenumber" name="445" href="#445">445</a> sb.append(<span class="jxr_string">":"</span>);
-<a class="jxr_linenumber" name="446" href="#446">446</a> }
-<a class="jxr_linenumber" name="447" href="#447">447</a>
-<a class="jxr_linenumber" name="448" href="#448">448</a> LOG.debug(<span class="jxr_string">"Setting "</span> + parentZnode
-<a class="jxr_linenumber" name="449" href="#449">449</a> + Constants.DEFAULT_ZOOKEEPER_ZNODE_SERVERS_REGISTERED
-<a class="jxr_linenumber" name="450" href="#450">450</a> + <span class="jxr_string">" data ["</span> + sb.toString() + <span class="jxr_string">"]"</span>);
-<a class="jxr_linenumber" name="451" href="#451">451</a> byte[] data = Bytes.toBytes(sb.toString());
-<a class="jxr_linenumber" name="452" href="#452">452</a> zkc.setData(parentZnode
-<a class="jxr_linenumber" name="453" href="#453">453</a> + Constants.DEFAULT_ZOOKEEPER_ZNODE_SERVERS_REGISTERED, data,
-<a class="jxr_linenumber" name="454" href="#454">454</a> -1);
-<a class="jxr_linenumber" name="455" href="#455">455</a> }
-<a class="jxr_linenumber" name="456" href="#456">456</a>
-<a class="jxr_linenumber" name="457" href="#457">457</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">synchronized</strong> <strong class="jxr_keyword">void</strong> getZkRunning() <strong class="jxr_keyword">throws</strong> Exception {
-<a class="jxr_linenumber" name="458" href="#458">458</a> <strong class="jxr_keyword">if</strong> (LOG.isDebugEnabled())
-<a class="jxr_linenumber" name="459" href="#459">459</a> LOG.debug(<span class="jxr_string">"Reading "</span> + parentZnode
-<a class="jxr_linenumber" name="460" href="#460">460</a> + Constants.DEFAULT_ZOOKEEPER_ZNODE_SERVERS_RUNNING);
-<a class="jxr_linenumber" name="461" href="#461">461</a> List<String> children = getChildren(parentZnode
-<a class="jxr_linenumber" name="462" href="#462">462</a> + Constants.DEFAULT_ZOOKEEPER_ZNODE_SERVERS_RUNNING,
-<a class="jxr_linenumber" name="463" href="#463">463</a> <strong class="jxr_keyword">new</strong> <a href="../../../../org/trafodion/dcs/master/ServerManager.html">RunningWatcher</a>());
-<a class="jxr_linenumber" name="464" href="#464">464</a>
-<a class="jxr_linenumber" name="465" href="#465">465</a> <strong class="jxr_keyword">if</strong> (!children.isEmpty()) {
-<a class="jxr_linenumber" name="466" href="#466">466</a> <strong class="jxr_keyword">for</strong> (String child : children) {
-<a class="jxr_linenumber" name="467" href="#467">467</a> <em class="jxr_comment">// If stop-dcs.sh is executed and DCS_MANAGES_ZK then zookeeper</em>
-<a class="jxr_linenumber" name="468" href="#468">468</a> <em class="jxr_comment">// is stopped abruptly.</em>
-<a class="jxr_linenumber" name="469" href="#469">469</a> <em class="jxr_comment">// Second scenario is when ZooKeeper fails for some reason</em>
-<a class="jxr_linenumber" name="470" href="#470">470</a> <em class="jxr_comment">// regardless of whether DCS</em>
-<a class="jxr_linenumber" name="471" href="#471">471</a> <em class="jxr_comment">// manages it. When either happens the DcsServer running znodes</em>
-<a class="jxr_linenumber" name="472" href="#472">472</a> <em class="jxr_comment">// still exist in ZooKeeper</em>
-<a class="jxr_linenumber" name="473" href="#473">473</a> <em class="jxr_comment">// and we see them at next startup. When they eventually timeout</em>
-<a class="jxr_linenumber" name="474" href="#474">474</a> <em class="jxr_comment">// we get node deleted events for a server that no longer</em>
-<a class="jxr_linenumber" name="475" href="#475">475</a> <em class="jxr_comment">// exists. So, only recognize</em>
-<a class="jxr_linenumber" name="476" href="#476">476</a> <em class="jxr_comment">// DcsServer running znodes that have timestamps after last</em>
-<a class="jxr_linenumber" name="477" href="#477">477</a> <em class="jxr_comment">// DcsMaster startup.</em>
-<a class="jxr_linenumber" name="478" href="#478">478</a> Scanner scn = <strong class="jxr_keyword">new</strong> Scanner(child);
-<a class="jxr_linenumber" name="479" href="#479">479</a> scn.useDelimiter(<span class="jxr_string">":"</span>);
-<a class="jxr_linenumber" name="480" href="#480">480</a> String hostName = scn.next();
-<a class="jxr_linenumber" name="481" href="#481">481</a> String instance = scn.next();
-<a class="jxr_linenumber" name="482" href="#482">482</a> <strong class="jxr_keyword">int</strong> infoPort = Integer.parseInt(scn.next());
-<a class="jxr_linenumber" name="483" href="#483">483</a> <strong class="jxr_keyword">long</strong> serverStartTimestamp = Long.parseLong(scn.next());
-<a class="jxr_linenumber" name="484" href="#484">484</a> scn.close();
-<a class="jxr_linenumber" name="485" href="#485">485</a>
-<a class="jxr_linenumber" name="486" href="#486">486</a> <em class="jxr_comment">// If we are DcsMaster follower that is taking over from failed</em>
-<a class="jxr_linenumber" name="487" href="#487">487</a> <em class="jxr_comment">// one then ignore timestamp issues described above.</em>
-<a class="jxr_linenumber" name="488" href="#488">488</a> <em class="jxr_comment">// See MasterLeaderElection.elect()</em>
-<a class="jxr_linenumber" name="489" href="#489">489</a> <strong class="jxr_keyword">if</strong> (master.isFollower() == false) {
-<a class="jxr_linenumber" name="490" href="#490">490</a> <strong class="jxr_keyword">if</strong> (serverStartTimestamp < startupTimestamp)
-<a class="jxr_linenumber" name="491" href="#491">491</a> <strong class="jxr_keyword">continue</strong>;
-<a class="jxr_linenumber" name="492" href="#492">492</a> }
-<a class="jxr_linenumber" name="493" href="#493">493</a>
-<a class="jxr_linenumber" name="494" href="#494">494</a> <strong class="jxr_keyword">if</strong> (!runningServers.contains(child)) {
-<a class="jxr_linenumber" name="495" href="#495">495</a> <strong class="jxr_keyword">if</strong> (LOG.isDebugEnabled())
-<a class="jxr_linenumber" name="496" href="#496">496</a> LOG.debug(<span class="jxr_string">"Watching running ["</span> + child + <span class="jxr_string">"]"</span>);
-<a class="jxr_linenumber" name="497" href="#497">497</a> zkc.exists(parentZnode
-<a class="jxr_linenumber" name="498" href="#498">498</a> + Constants.DEFAULT_ZOOKEEPER_ZNODE_SERVERS_RUNNING
-<a class="jxr_linenumber" name="499" href="#499">499</a> + <span class="jxr_string">"/"</span> + child, <strong class="jxr_keyword">new</strong> <a href="../../../../org/trafodion/dcs/master/ServerManager.html">RunningWatcher</a>());
-<a class="jxr_linenumber" name="500" href="#500">500</a> runningServers.add(child);
-<a class="jxr_linenumber" name="501" href="#501">501</a> }
-<a class="jxr_linenumber" name="502" href="#502">502</a> }
-<a class="jxr_linenumber" name="503" href="#503">503</a> metrics.setTotalRunning(runningServers.size());
-<a class="jxr_linenumber" name="504" href="#504">504</a> } <strong class="jxr_keyword">else</strong> {
-<a class="jxr_linenumber" name="505" href="#505">505</a> metrics.setTotalRunning(0);
-<a class="jxr_linenumber" name="506" href="#506">506</a> }
-<a class="jxr_linenumber" name="507" href="#507">507</a> }
-<a class="jxr_linenumber" name="508" href="#508">508</a>
-<a class="jxr_linenumber" name="509" href="#509">509</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">synchronized</strong> <strong class="jxr_keyword">void</strong> restartServer(String znodePath) <strong class="jxr_keyword">throws</strong> Exception {
-<a class="jxr_linenumber" name="510" href="#510">510</a> String child = znodePath.replace(parentZnode
-<a class="jxr_linenumber" name="511" href="#511">511</a> + Constants.DEFAULT_ZOOKEEPER_ZNODE_SERVERS_RUNNING + <span class="jxr_string">"/"</span>, <span class="jxr_string">""</span>);
-<a class="jxr_linenumber" name="512" href="#512">512</a> Scanner scn = <strong class="jxr_keyword">new</strong> Scanner(child);
-<a class="jxr_linenumber" name="513" href="#513">513</a> scn.useDelimiter(<span class="jxr_string">":"</span>);
-<a class="jxr_linenumber" name="514" href="#514">514</a> String hostName = scn.next();
-<a class="jxr_linenumber" name="515" href="#515">515</a> String instance = scn.next();
-<a class="jxr_linenumber" name="516" href="#516">516</a> <strong class="jxr_keyword">int</strong> infoPort = Integer.parseInt(scn.next());
-<a class="jxr_linenumber" name="517" href="#517">517</a> <strong class="jxr_keyword">long</strong> serverStartTimestamp = Long.parseLong(scn.next());
-<a class="jxr_linenumber" name="518" href="#518">518</a> scn.close();
-<a class="jxr_linenumber" name="519" href="#519">519</a>
-<a class="jxr_linenumber" name="520" href="#520">520</a> <strong class="jxr_keyword">if</strong> (LOG.isErrorEnabled())
-<a class="jxr_linenumber" name="521" href="#521">521</a> LOG.error(<span class="jxr_string">"DcsServer ["</span> + hostName + <span class="jxr_string">":"</span> + instance + <span class="jxr_string">"] failed."</span>);
-<a class="jxr_linenumber" name="522" href="#522">522</a>
-<a class="jxr_linenumber" name="523" href="#523">523</a> <strong class="jxr_keyword">if</strong> (runningServers.contains(child)) {
-<a class="jxr_linenumber" name="524" href="#524">524</a> LOG.debug(<span class="jxr_string">"Found ["</span> + child
-<a class="jxr_linenumber" name="525" href="#525">525</a> + <span class="jxr_string">"], deleting from running servers list"</span>);
-<a class="jxr_linenumber" name="526" href="#526">526</a> runningServers.remove(child);
-<a class="jxr_linenumber" name="527" href="#527">527</a> metrics.setTotalRunning(runningServers.size());
-<a class="jxr_linenumber" name="528" href="#528">528</a> }
-<a class="jxr_linenumber" name="529" href="#529">529</a>
-<a class="jxr_linenumber" name="530" href="#530">530</a> <em class="jxr_comment">// Extract the server count for the restarting instance</em>
-<a class="jxr_linenumber" name="531" href="#531">531</a> <strong class="jxr_keyword">int</strong> count = 1;
-<a class="jxr_linenumber" name="532" href="#532">532</a> <strong class="jxr_keyword">boolean</strong> found = false;
-<a class="jxr_linenumber" name="533" href="#533">533</a> <strong class="jxr_keyword">for</strong> (String aServer : configuredServers) {
-<a class="jxr_linenumber" name="534" href="#534">534</a> scn = <strong class="jxr_keyword">new</strong> Scanner(aServer);
-<a class="jxr_linenumber" name="535" href="#535">535</a> scn.useDelimiter(<span class="jxr_string">":"</span>);
-<a class="jxr_linenumber" name="536" href="#536">536</a> String srvrHostName = scn.next();
-<a class="jxr_linenumber" name="537" href="#537">537</a> String srvrInstance = scn.next();
-<a class="jxr_linenumber" name="538" href="#538">538</a> <strong class="jxr_keyword">int</strong> srvrCount = <strong class="jxr_keyword">new</strong> Integer(scn.next()).intValue();
-<a class="jxr_linenumber" name="539" href="#539">539</a> scn.close();
-<a class="jxr_linenumber" name="540" href="#540">540</a> <strong class="jxr_keyword">if</strong> (srvrHostName.equals(hostName) && srvrInstance.equals(instance)) {
-<a class="jxr_linenumber" name="541" href="#541">541</a> LOG.debug(<span class="jxr_string">"Found ["</span> + srvrHostName + <span class="jxr_string">":"</span> + srvrInstance + <span class="jxr_string">":"</span>
-<a class="jxr_linenumber" name="542" href="#542">542</a> + srvrCount + <span class="jxr_string">"] in configured servers"</span>);
-<a class="jxr_linenumber" name="543" href="#543">543</a> found = <strong class="jxr_keyword">true</strong>;
-<a class="jxr_linenumber" name="544" href="#544">544</a> <strong class="jxr_keyword">if</strong> (srvrCount > 0)
-<a class="jxr_linenumber" name="545" href="#545">545</a> count = srvrCount;
-<a class="jxr_linenumber" name="546" href="#546">546</a> <strong class="jxr_keyword">break</strong>;
-<a class="jxr_linenumber" name="547" href="#547">547</a> }
-<a class="jxr_linenumber" name="548" href="#548">548</a> }
-<a class="jxr_linenumber" name="549" href="#549">549</a>
-<a class="jxr_linenumber" name="550" href="#550">550</a> <em class="jxr_comment">// For local-servers.sh don't restart anything that's not in the servers</em>
-<a class="jxr_linenumber" name="551" href="#551">551</a> <em class="jxr_comment">// file</em>
-<a class="jxr_linenumber" name="552" href="#552">552</a> <strong class="jxr_keyword">if</strong> (!found) {
-<a class="jxr_linenumber" name="553" href="#553">553</a> LOG.info(<span class="jxr_string">"DcsServer ["</span> + hostName + <span class="jxr_string">":"</span> + instance
-<a class="jxr_linenumber" name="554" href="#554">554</a> + <span class="jxr_string">"] not in servers file. Not restarting"</span>);
-<a class="jxr_linenumber" name="555" href="#555">555</a> <strong class="jxr_keyword">return</strong>;
-<a class="jxr_linenumber" name="556" href="#556">556</a> }
-<a class="jxr_linenumber" name="557" href="#557">557</a>
-<a class="jxr_linenumber" name="558" href="#558">558</a> <a href="../../../../org/trafodion/dcs/master/ServerManager.html">RestartHandler</a> handler = <strong class="jxr_keyword">new</strong> <a href="../../../../org/trafodion/dcs/master/ServerManager.html">RestartHandler</a>(child, count);
-<a class="jxr_linenumber" name="559" href="#559">559</a> restartQueue.add(handler);
-<a class="jxr_linenumber" name="560" href="#560">560</a>
-<a class="jxr_linenumber" name="561" href="#561">561</a> }
+<a class="jxr_linenumber" name="390" href="#390">390</a> Collections.sort(configuredServers);
+<a class="jxr_linenumber" name="391" href="#391">391</a>
+<a class="jxr_linenumber" name="392" href="#392">392</a> <strong class="jxr_keyword">if</strong> (configuredServers.size() < 1)
+<a class="jxr_linenumber" name="393" href="#393">393</a> <strong class="jxr_keyword">throw</strong> <strong class="jxr_keyword">new</strong> IOException(<span class="jxr_string">"No entries found in servers file"</span>);
+<a class="jxr_linenumber" name="394" href="#394">394</a>
+<a class="jxr_linenumber" name="395" href="#395">395</a> <strong class="jxr_keyword">int</strong> lnum = 1;
+<a class="jxr_linenumber" name="396" href="#396">396</a> <strong class="jxr_keyword">for</strong> (<strong class="jxr_keyword">int</strong> i = 0; i < configuredServers.size(); i++) {
+<a class="jxr_linenumber" name="397" href="#397">397</a> <strong class="jxr_keyword">if</strong> (LOG.isDebugEnabled())
+<a class="jxr_linenumber" name="398" href="#398">398</a> LOG.debug(<span class="jxr_string">"servers file line "</span> + lnum + <span class="jxr_string">" ["</span>
+<a class="jxr_linenumber" name="399" href="#399">399</a> + configuredServers.get(i) + <span class="jxr_string">"]"</span>);
+<a class="jxr_linenumber" name="400" href="#400">400</a> lnum++;
+<a class="jxr_linenumber" name="401" href="#401">401</a> }
+<a class="jxr_linenumber" name="402" href="#402">402</a> }
+<a class="jxr_linenumber" name="403" href="#403">403</a>
+<a class="jxr_linenumber" name="404" href="#404">404</a> <strong class="jxr_keyword">class</strong> <a href="../../../../org/trafodion/dcs/master/ServerManager.html">ServerPortMap</a> {
+<a class="jxr_linenumber" name="405" href="#405">405</a> <strong class="jxr_keyword">int</strong> begPortNum = conf.getInt(Constants.DCS_MASTER_PORT,
+<a class="jxr_linenumber" name="406" href="#406">406</a> Constants.DEFAULT_DCS_MASTER_PORT) + 1;
+<a class="jxr_linenumber" name="407" href="#407">407</a> <strong class="jxr_keyword">int</strong> endPortNum = begPortNum;
+<a class="jxr_linenumber" name="408" href="#408">408</a> StringBuilder sb = <strong class="jxr_keyword">new</strong> StringBuilder();
+<a class="jxr_linenumber" name="409" href="#409">409</a>
+<a class="jxr_linenumber" name="410" href="#410">410</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> add(<strong class="jxr_keyword">int</strong> instance, <strong class="jxr_keyword">int</strong> childCount) {
+<a class="jxr_linenumber" name="411" href="#411">411</a> <strong class="jxr_keyword">for</strong> (<strong class="jxr_keyword">int</strong> i = 1; i <= childCount; i++) {
+<a class="jxr_linenumber" name="412" href="#412">412</a> <strong class="jxr_keyword">if</strong> (endPortNum > begPortNum)
+<a class="jxr_linenumber" name="413" href="#413">413</a> sb.append(<span class="jxr_string">":"</span>);
+<a class="jxr_linenumber" name="414" href="#414">414</a> sb.append(instance + <span class="jxr_string">":"</span> + i + <span class="jxr_string">":"</span> + endPortNum);
+<a class="jxr_linenumber" name="415" href="#415">415</a> endPortNum++;
+<a class="jxr_linenumber" name="416" href="#416">416</a> }
+<a class="jxr_linenumber" name="417" href="#417">417</a> }
+<a class="jxr_linenumber" name="418" href="#418">418</a>
+<a class="jxr_linenumber" name="419" href="#419">419</a> <strong class="jxr_keyword">public</strong> String toString() {
+<a class="jxr_linenumber" name="420" href="#420">420</a> <strong class="jxr_keyword">return</strong> sb.toString();
+<a class="jxr_linenumber" name="421" href="#421">421</a> }
+<a class="jxr_linenumber" name="422" href="#422">422</a> }
+<a class="jxr_linenumber" name="423" href="#423">423</a>
+<a class="jxr_linenumber" name="424" href="#424">424</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">void</strong> createServersPortMap() <strong class="jxr_keyword">throws</strong> Exception {
+<a class="jxr_linenumber" name="425" href="#425">425</a> serverPortMap.clear();
+<a class="jxr_linenumber" name="426" href="#426">426</a>
+<a class="jxr_linenumber" name="427" href="#427">427</a> <strong class="jxr_keyword">for</strong> (String aServer : configuredServers) {
+<a class="jxr_linenumber" name="428" href="#428">428</a> Scanner scn = <strong class="jxr_keyword">new</strong> Scanner(aServer);
+<a class="jxr_linenumber" name="429" href="#429">429</a> scn.useDelimiter(<span class="jxr_string">":"</span>);
+<a class="jxr_linenumber" name="430" href="#430">430</a> String hostName = scn.next();
+<a class="jxr_linenumber" name="431" href="#431">431</a> <strong class="jxr_keyword">int</strong> instance = Integer.parseInt(scn.next());
+<a class="jxr_linenumber" name="432" href="#432">432</a> <strong class="jxr_keyword">int</strong> childCount = Integer.parseInt(scn.next());
+<a class="jxr_linenumber" name="433" href="#433">433</a> scn.close();
+<a class="jxr_linenumber" name="434" href="#434">434</a>
+<a class="jxr_linenumber" name="435" href="#435">435</a> <a href="../../../../org/trafodion/dcs/master/ServerManager.html">ServerPortMap</a> spm = serverPortMap.get(hostName);
+<a class="jxr_linenumber" name="436" href="#436">436</a> <strong class="jxr_keyword">if</strong> (spm == <strong class="jxr_keyword">null</strong>)
+<a class="jxr_linenumber" name="437" href="#437">437</a> spm = <strong class="jxr_keyword">new</strong> <a href="../../../../org/trafodion/dcs/master/ServerManager.html">ServerPortMap</a>();
+<a class="jxr_linenumber" name="438" href="#438">438</a> spm.add(instance, childCount);
+<a class="jxr_linenumber" name="439" href="#439">439</a> serverPortMap.put(hostName, spm);
+<a class="jxr_linenumber" name="440" href="#440">440</a> }
+<a class="jxr_linenumber" name="441" href="#441">441</a>
+<a class="jxr_linenumber" name="442" href="#442">442</a> StringBuilder sb = <strong class="jxr_keyword">new</strong> StringBuilder();
+<a class="jxr_linenumber" name="443" href="#443">443</a> <strong class="jxr_keyword">for</strong> (Map.Entry<String, ServerPortMap> entry : serverPortMap.entrySet()) {
+<a class="jxr_linenumber" name="444" href="#444">444</a> LOG.debug((<span class="jxr_string">"Key = "</span> + entry.getKey() + <span class="jxr_string">", Value = "</span> + entry
+<a class="jxr_linenumber" name="445" href="#445">445</a> .getValue()));
+<a class="jxr_linenumber" name="446" href="#446">446</a> sb.append(entry.getValue());
+<a class="jxr_linenumber" name="447" href="#447">447</a> sb.append(<span class="jxr_string">":"</span>);
+<a class="jxr_linenumber" name="448" href="#448">448</a> }
+<a class="jxr_linenumber" name="449" href="#449">449</a>
+<a class="jxr_linenumber" name="450" href="#450">450</a> LOG.debug(<span class="jxr_string">"Setting "</span> + parentZnode
+<a class="jxr_linenumber" name="451" href="#451">451</a> + Constants.DEFAULT_ZOOKEEPER_ZNODE_SERVERS_REGISTERED
+<a class="jxr_linenumber" name="452" href="#452">452</a> + <span class="jxr_string">" data ["</span> + sb.toString() + <span class="jxr_string">"]"</span>);
+<a class="jxr_linenumber" name="453" href="#453">453</a> byte[] data = Bytes.toBytes(sb.toString());
+<a class="jxr_linenumber" name="454" href="#454">454</a> zkc.setData(parentZnode
+<a class="jxr_linenumber" name="455" href="#455">455</a> + Constants.DEFAULT_ZOOKEEPER_ZNODE_SERVERS_REGISTERED, data,
+<a class="jxr_linenumber" name="456" href="#456">456</a> -1);
+<a class="jxr_linenumber" name="457" href="#457">457</a> }
+<a class="jxr_linenumber" name="458" href="#458">458</a>
+<a class="jxr_linenumber" name="459" href="#459">459</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">synchronized</strong> <strong class="jxr_keyword">void</strong> getZkRunning() <strong class="jxr_keyword">throws</strong> Exception {
+<a class="jxr_linenumber" name="460" href="#460">460</a> <strong class="jxr_keyword">if</strong> (LOG.isDebugEnabled())
+<a class="jxr_linenumber" name="461" href="#461">461</a> LOG.debug(<span class="jxr_string">"Reading "</span> + parentZnode
+<a class="jxr_linenumber" name="462" href="#462">462</a> + Constants.DEFAULT_ZOOKEEPER_ZNODE_SERVERS_RUNNING);
+<a class="jxr_linenumber" name="463" href="#463">463</a> List<String> children = getChildren(parentZnode
+<a class="jxr_linenumber" name="464" href="#464">464</a> + Constants.DEFAULT_ZOOKEEPER_ZNODE_SERVERS_RUNNING,
+<a class="jxr_linenumber" name="465" href="#465">465</a> <strong class="jxr_keyword">new</strong> <a href="../../../../org/trafodion/dcs/master/ServerManager.html">RunningWatcher</a>());
+<a class="jxr_linenumber" name="466" href="#466">466</a>
+<a class="jxr_linenumber" name="467" href="#467">467</a> <strong class="jxr_keyword">if</strong> (!children.isEmpty()) {
+<a class="jxr_linenumber" name="468" href="#468">468</a> <strong class="jxr_keyword">for</strong> (String child : children) {
+<a class="jxr_linenumber" name="469" href="#469">469</a> <em class="jxr_comment">// If stop-dcs.sh is executed and DCS_MANAGES_ZK then zookeeper</em>
+<a class="jxr_linenumber" name="470" href="#470">470</a> <em class="jxr_comment">// is stopped abruptly.</em>
+<a class="jxr_linenumber" name="471" href="#471">471</a> <em class="jxr_comment">// Second scenario is when ZooKeeper fails for some reason</em>
+<a class="jxr_linenumber" name="472" href="#472">472</a> <em class="jxr_comment">// regardless of whether DCS</em>
+<a class="jxr_linenumber" name="473" href="#473">473</a> <em class="jxr_comment">// manages it. When either happens the DcsServer running znodes</em>
+<a class="jxr_linenumber" name="474" href="#474">474</a> <em class="jxr_comment">// still exist in ZooKeeper</em>
+<a class="jxr_linenumber" name="475" href="#475">475</a> <em class="jxr_comment">// and we see them at next startup. When they eventually timeout</em>
+<a class="jxr_linenumber" name="476" href="#476">476</a> <em class="jxr_comment">// we get node deleted events for a server that no longer</em>
+<a class="jxr_linenumber" name="477" href="#477">477</a> <em class="jxr_comment">// exists. So, only recognize</em>
+<a class="jxr_linenumber" name="478" href="#478">478</a> <em class="jxr_comment">// DcsServer running znodes that have timestamps after last</em>
+<a class="jxr_linenumber" name="479" href="#479">479</a> <em class="jxr_comment">// DcsMaster startup.</em>
+<a class="jxr_linenumber" name="480" href="#480">480</a> Scanner scn = <strong class="jxr_keyword">new</strong> Scanner(child);
+<a class="jxr_linenumber" name="481" href="#481">481</a> scn.useDelimiter(<span class="jxr_string">":"</span>);
+<a class="jxr_linenumber" name="482" href="#482">482</a> String hostName = scn.next();
+<a class="jxr_linenumber" name="483" href="#483">483</a> String instance = scn.next();
+<a class="jxr_linenumber" name="484" href="#484">484</a> <strong class="jxr_keyword">int</strong> infoPort = Integer.parseInt(scn.next());
+<a class="jxr_linenumber" name="485" href="#485">485</a> <strong class="jxr_keyword">long</strong> serverStartTimestamp = Long.parseLong(scn.next());
+<a class="jxr_linenumber" name="486" href="#486">486</a> scn.close();
+<a class="jxr_linenumber" name="487" href="#487">487</a>
+<a class="jxr_linenumber" name="488" href="#488">488</a> <em class="jxr_comment">// If we are DcsMaster follower that is taking over from failed</em>
+<a class="jxr_linenumber" name="489" href="#489">489</a> <em class="jxr_comment">// one then ignore timestamp issues described above.</em>
+<a class="jxr_linenumber" name="490" href="#490">490</a> <em class="jxr_comment">// See MasterLeaderElection.elect()</em>
+<a class="jxr_linenumber" name="491" href="#491">491</a> <strong class="jxr_keyword">if</strong> (master.isFollower() == false) {
+<a class="jxr_linenumber" name="492" href="#492">492</a> <strong class="jxr_keyword">if</strong> (serverStartTimestamp < startupTimestamp)
+<a class="jxr_linenumber" name="493" href="#493">493</a> <strong class="jxr_keyword">continue</strong>;
+<a class="jxr_linenumber" name="494" href="#494">494</a> }
+<a class="jxr_linenumber" name="495" href="#495">495</a>
+<a class="jxr_linenumber" name="496" href="#496">496</a> <strong class="jxr_keyword">if</strong> (!runningServers.contains(child)) {
+<a class="jxr_linenumber" name="497" href="#497">497</a> <strong class="jxr_keyword">if</strong> (LOG.isDebugEnabled())
+<a class="jxr_linenumber" name="498" href="#498">498</a> LOG.debug(<span class="jxr_string">"Watching running ["</span> + child + <span class="jxr_string">"]"</span>);
+<a class="jxr_linenumber" name="499" href="#499">499</a> zkc.exists(parentZnode
+<a class="jxr_linenumber" name="500" href="#500">500</a> + Constants.DEFAULT_ZOOKEEPER_ZNODE_SERVERS_RUNNING
+<a class="jxr_linenumber" name="501" href="#501">501</a> + <span class="jxr_string">"/"</span> + child, <strong class="jxr_keyword">new</strong> <a href="../../../../org/trafodion/dcs/master/ServerManager.html">RunningWatcher</a>());
+<a class="jxr_linenumber" name="502" href="#502">502</a> runningServers.add(child);
+<a class="jxr_linenumber" name="503" href="#503">503</a> }
+<a class="jxr_linenumber" name="504" href="#504">504</a> }
+<a class="jxr_linenumber" name="505" href="#505">505</a> metrics.setTotalRunning(runningServers.size());
+<a class="jxr_linenumber" name="506" href="#506">506</a> } <strong class="jxr_keyword">else</strong> {
+<a class="jxr_linenumber" name="507" href="#507">507</a> metrics.setTotalRunning(0);
+<a class="jxr_linenumber" name="508" href="#508">508</a> }
+<a class="jxr_linenumber" name="509" href="#509">509</a> }
+<a class="jxr_linenumber" name="510" href="#510">510</a>
+<a class="jxr_linenumber" name="511" href="#511">511</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">synchronized</strong> <strong class="jxr_keyword">void</strong> restartServer(String znodePath) <strong class="jxr_keyword">throws</strong> Exception {
+<a class="jxr_linenumber" name="512" href="#512">512</a> String child = znodePath.replace(parentZnode
+<a class="jxr_linenumber" name="513" href="#513">513</a> + Constants.DEFAULT_ZOOKEEPER_ZNODE_SERVERS_RUNNING + <span class="jxr_string">"/"</span>, <span class="jxr_string">""</span>);
+<a class="jxr_linenumber" name="514" href="#514">514</a> Scanner scn = <strong class="jxr_keyword">new</strong> Scanner(child);
+<a class="jxr_linenumber" name="515" href="#515">515</a> scn.useDelimiter(<span class="jxr_string">":"</span>);
+<a class="jxr_linenumber" name="516" href="#516">516</a> String hostName = scn.next();
+<a class="jxr_linenumber" name="517" href="#517">517</a> String instance = scn.next();
+<a class="jxr_linenumber" name="518" href="#518">518</a> <strong class="jxr_keyword">int</strong> infoPort = Integer.parseInt(scn.next());
+<a class="jxr_linenumber" name="519" href="#519">519</a> <strong class="jxr_keyword">long</strong> serverStartTimestamp = Long.parseLong(scn.next());
+<a class="jxr_linenumber" name="520" href="#520">520</a> scn.close();
+<a class="jxr_linenumber" name="521" href="#521">521</a>
+<a class="jxr_linenumber" name="522" href="#522">522</a> <strong class="jxr_keyword">if</strong> (LOG.isErrorEnabled())
+<a class="jxr_linenumber" name="523" href="#523">523</a> LOG.error(<span class="jxr_string">"DcsServer ["</span> + hostName + <span class="jxr_string">":"</span> + instance + <span class="jxr_string">"] failed."</span>);
+<a class="jxr_linenumber" name="524" href="#524">524</a>
+<a class="jxr_linenumber" name="525" href="#525">525</a> <strong class="jxr_keyword">if</strong> (runningServers.contains(child)) {
+<a class="jxr_linenumber" name="526" href="#526">526</a> LOG.debug(<span class="jxr_string">"Found ["</span> + child
+<a class="jxr_linenumber" name="527" href="#527">527</a> + <span class="jxr_string">"], deleting from running servers list"</span>);
+<a class="jxr_linenumber" name="528" href="#528">528</a> runningServers.remove(child);
+<a class="jxr_linenumber" name="529" href="#529">529</a> metrics.setTotalRunning(runningServers.size());
+<a class="jxr_linenumber" name="530" href="#530">530</a> }
+<a class="jxr_linenumber" name="531" href="#531">531</a>
+<a class="jxr_linenumber" name="532" href="#532">532</a> <em class="jxr_comment">// Extract the server count for the restarting instance</em>
+<a class="jxr_linenumber" name="533" href="#533">533</a> <strong class="jxr_keyword">int</strong> count = 1;
+<a class="jxr_linenumber" name="534" href="#534">534</a> <strong class="jxr_keyword">boolean</strong> found = false;
+<a class="jxr_linenumber" name="535" href="#535">535</a> <strong class="jxr_keyword">for</strong> (String aServer : configuredServers) {
+<a class="jxr_linenumber" name="536" href="#536">536</a> scn = <strong class="jxr_keyword">new</strong> Scanner(aServer);
+<a class="jxr_linenumber" name="537" href="#537">537</a> scn.useDelimiter(<span class="jxr_string">":"</span>);
+<a class="jxr_linenumber" name="538" href="#538">538</a> String srvrHostName = scn.next();
+<a class="jxr_linenumber" name="539" href="#539">539</a> String srvrInstance = scn.next();
+<a class="jxr_linenumber" name="540" href="#540">540</a> <strong class="jxr_keyword">int</strong> srvrCount = <strong class="jxr_keyword">new</strong> Integer(scn.next()).intValue();
+<a class="jxr_linenumber" name="541" href="#541">541</a> scn.close();
+<a class="jxr_linenumber" name="542" href="#542">542</a> <strong class="jxr_keyword">if</strong> (srvrHostName.equals(hostName) && srvrInstance.equals(instance)) {
+<a class="jxr_linenumber" name="543" href="#543">543</a> LOG.debug(<span class="jxr_string">"Found ["</span> + srvrHostName + <span class="jxr_string">":"</span> + srvrInstance + <span class="jxr_string">":"</span>
+<a class="jxr_linenumber" name="544" href="#544">544</a> + srvrCount + <span class="jxr_string">"] in configured servers"</span>);
+<a class="jxr_linenumber" name="545" href="#545">545</a> found = <strong class="jxr_keyword">true</strong>;
+<a class="jxr_linenumber" name="546" href="#546">546</a> <strong class="jxr_keyword">if</strong> (srvrCount > 0)
+<a class="jxr_linenumber" name="547" href="#547">547</a> count = srvrCount;
+<a class="jxr_linenumber" name="548" href="#548">548</a> <strong class="jxr_keyword">break</strong>;
+<a class="jxr_linenumber" name="549" href="#549">549</a> }
+<a class="jxr_linenumber" name="550" href="#550">550</a> }
+<a class="jxr_linenumber" name="551" href="#551">551</a>
+<a class="jxr_linenumber" name="552" href="#552">552</a> <em class="jxr_comment">// For local-servers.sh don't restart anything that's not in the servers</em>
+<a class="jxr_linenumber" name="553" href="#553">553</a> <em class="jxr_comment">// file</em>
+<a class="jxr_linenumber" name="554" href="#554">554</a> <strong class="jxr_keyword">if</strong> (!found) {
+<a class="jxr_linenumber" name="555" href="#555">555</a> LOG.info(<span class="jxr_string">"DcsServer ["</span> + hostName + <span class="jxr_string">":"</span> + instance
+<a class="jxr_linenumber" name="556" href="#556">556</a> + <span class="jxr_string">"] not in servers file. Not restarting"</span>);
+<a class="jxr_linenumber" name="557" href="#557">557</a> <strong class="jxr_keyword">return</strong>;
+<a class="jxr_linenumber" name="558" href="#558">558</a> }
+<a class="jxr_linenumber" name="559" href="#559">559</a>
+<a class="jxr_linenumber" name="560" href="#560">560</a> <a href="../../../../org/trafodion/dcs/master/ServerManager.html">RestartHandler</a> handler = <strong class="jxr_keyword">new</strong> <a href="../../../../org/trafodion/dcs/master/ServerManager.html">RestartHandler</a>(child, count);
+<a class="jxr_linenumber" name="561" href="#561">561</a> restartQueue.add(handler);
<a class="jxr_linenumber" name="562" href="#562">562</a>
-<a class="jxr_linenumber" name="563" href="#563">563</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">synchronized</strong> <strong class="jxr_keyword">void</strong> getZkRegistered() <strong class="jxr_keyword">throws</strong> Exception {
-<a class="jxr_linenumber" name="564" href="#564">564</a> <strong class="jxr_keyword">if</strong> (LOG.isDebugEnabled())
-<a class="jxr_linenumber" name="565" href="#565">565</a> LOG.debug(<span class="jxr_string">"Reading "</span> + parentZnode
-<a class="jxr_linenumber" name="566" href="#566">566</a> + Constants.DEFAULT_ZOOKEEPER_ZNODE_SERVERS_REGISTERED);
-<a class="jxr_linenumber" name="567" href="#567">567</a> List<String> children = getChildren(parentZnode
-<a class="jxr_linenumber" name="568" href="#568">568</a> + Constants.DEFAULT_ZOOKEEPER_ZNODE_SERVERS_REGISTERED,
-<a class="jxr_linenumber" name="569" href="#569">569</a> <strong class="jxr_keyword">new</strong> <a href="../../../../org/trafodion/dcs/master/ServerManager.html">RegisteredWatcher</a>());
-<a class="jxr_linenumber" name="570" href="#570">570</a>
-<a class="jxr_linenumber" name="571" href="#571">571</a> <strong class="jxr_keyword">if</strong> (!children.isEmpty()) {
-<a class="jxr_linenumber" name="572" href="#572">572</a> registeredServers.clear();
-<a class="jxr_linenumber" name="573" href="#573">573</a> <strong class="jxr_keyword">for</strong> (String child : children) {
-<a class="jxr_linenumber" name="574" href="#574">574</a> <strong class="jxr_keyword">if</strong> (LOG.isDebugEnabled())
-<a class="jxr_linenumber" name="575" href="#575">575</a> LOG.debug(<span class="jxr_string">"Registered ["</span> + child + <span class="jxr_string">"]"</span>);
-<a class="jxr_linenumber" name="576" href="#576">576</a> registeredServers.add(child);
-<a class="jxr_linenumber" name="577" href="#577">577</a> }
-<a class="jxr_linenumber" name="578" href="#578">578</a> metrics.setTotalRegistered(registeredServers.size());
-<a class="jxr_linenumber" name="579" href="#579">579</a> } <strong class="jxr_keyword">else</strong> {
-<a class="jxr_linenumber" name="580" href="#580">580</a> metrics.setTotalRegistered(0);
-<a class="jxr_linenumber" name="581" href="#581">581</a> }
-<a class="jxr_linenumber" name="582" href="#582">582</a> }
-<a class="jxr_linenumber" name="583" href="#583">583</a>
-<a class="jxr_linenumber" name="584" href="#584">584</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">synchronized</strong> List<RunningServer> getServersList() {
-<a class="jxr_linenumber" name="585" href="#585">585</a> ArrayList<RunningServer> serverList = <strong class="jxr_keyword">new</strong> ArrayList<RunningServer>();
-<a class="jxr_linenumber" name="586" href="#586">586</a> Stat stat = <strong class="jxr_keyword">null</strong>;
-<a class="jxr_linenumber" name="587" href="#587">587</a> byte[] data = <strong class="jxr_keyword">null</strong>;
-<a class="jxr_linenumber" name="588" href="#588">588</a>
-<a class="jxr_linenumber" name="589" href="#589">589</a> <strong class="jxr_keyword">int</strong> totalAvailable = 0;
-<a class="jxr_linenumber" name="590" href="#590">590</a> <strong class="jxr_keyword">int</strong> totalConnecting = 0;
-<a class="jxr_linenumber" name="591" href="#591">591</a> <strong class="jxr_keyword">int</strong> totalConnected = 0;
-<a class="jxr_linenumber" name="592" href="#592">592</a>
-<a class="jxr_linenumber" name="593" href="#593">593</a> <strong class="jxr_keyword">if</strong> (LOG.isDebugEnabled())
-<a class="jxr_linenumber" name="594" href="#594">594</a> LOG.debug(<span class="jxr_string">"Begin getServersList()"</span>);
-<a class="jxr_linenumber" name="595" href="#595">595</a>
-<a class="jxr_linenumber" name="596" href="#596">596</a> <strong class="jxr_keyword">if</strong> (!runningServers.isEmpty()) {
-<a class="jxr_linenumber" name="597" href="#597">597</a> <strong class="jxr_keyword">for</strong> (String aRunningServer : runningServers) {
-<a class="jxr_linenumber" name="598" href="#598">598</a> <a href="../../../../org/trafodion/dcs/master/RunningServer.html">RunningServer</a> runningServer = <strong class="jxr_keyword">new</strong> <a href="../../../../org/trafodion/dcs/master/RunningServer.html">RunningServer</a>();
-<a class="jxr_linenumber" name="599" href="#599">599</a> Scanner scn = <strong class="jxr_keyword">new</strong> Scanner(aRunningServer);
-<a class="jxr_linenumber" name="600" href="#600">600</a> scn.useDelimiter(<span class="jxr_string">":"</span>);
-<a class="jxr_linenumber" name="601" href="#601">601</a> runningServer.setHostname(scn.next());
-<a class="jxr_linenumber" name="602" href="#602">602</a> runningServer.setInstance(scn.next());
-<a class="jxr_linenumber" name="603" href="#603">603</a> runningServer.setInfoPort(Integer.parseInt(scn.next()));
-<a class="jxr_linenumber" name="604" href="#604">604</a> runningServer.setStartTime(Long.parseLong(scn.next()));
-<a class="jxr_linenumber" name="605" href="#605">605</a> scn.close();
-<a class="jxr_linenumber" name="606" href="#606">606</a>
-<a class="jxr_linenumber" name="607" href="#607">607</a> <strong class="jxr_keyword">if</strong> (!registeredServers.isEmpty()) {
-<a class="jxr_linenumber" name="608" href="#608">608</a> <strong class="jxr_keyword">for</strong> (String aRegisteredServer : registeredServers) {
-<a class="jxr_linenumber" name="609" href="#609">609</a> <strong class="jxr_keyword">if</strong> (aRegisteredServer.contains(runningServer
-<a class="jxr_linenumber" name="610" href="#610">610</a> .getHostname()
-<a class="jxr_linenumber" name="611" href="#611">611</a> + <span class="jxr_string">":"</span>
-<a class="jxr_linenumber" name="612" href="#612">612</a> + runningServer.getInstance() + <span class="jxr_string">":"</span>)) {
-<a class="jxr_linenumber" name="613" href="#613">613</a> <strong class="jxr_keyword">try</strong> {
-<a class="jxr_linenumber" name="614" href="#614">614</a> <a href="../../../../org/trafodion/dcs/master/RegisteredServer.html">RegisteredServer</a> registeredServer = <strong class="jxr_keyword">new</strong> <a href="../../../../org/trafodion/dcs/master/RegisteredServer.html">RegisteredServer</a>();
-<a class="jxr_linenumber" name="615" href="#615">615</a> stat = zkc
-<a class="jxr_linenumber" name="616" href="#616">616</a> .exists(parentZnode
-<a class="jxr_linenumber" name="617" href="#617">617</a> + Constants.DEFAULT_ZOOKEEPER_ZNODE_SERVERS_REGISTERED
-<a class="jxr_linenumber" name="618" href="#618">618</a> + <span class="jxr_string">"/"</span> + aRegisteredServer,
-<a class="jxr_linenumber" name="619" href="#619">619</a> false);
-<a class="jxr_linenumber" name="620" href="#620">620</a> <strong class="jxr_keyword">if</strong> (stat != <strong class="jxr_keyword">null</strong>) {
-<a class="jxr_linenumber" name="621" href="#621">621</a> data = zkc
-<a class="jxr_linenumber" name="622" href="#622">622</a> .getData(
-<a class="jxr_linenumber" name="623" href="#623">623</a> parentZnode
-<a class="jxr_linenumber" name="624" href="#624"
<TRUNCATED>