Repository: incubator-ignite Updated Branches: refs/heads/ignite-676 4f87859cf -> 19cd11f37
ignite-676: logging Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/19cd11f3 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/19cd11f3 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/19cd11f3 Branch: refs/heads/ignite-676 Commit: 19cd11f3755b990b492676850b69da43063aa5e1 Parents: 4f87859 Author: Artem Shutak <ashu...@gridgain.com> Authored: Wed Apr 8 18:06:21 2015 +0300 Committer: Artem Shutak <ashu...@gridgain.com> Committed: Wed Apr 8 18:06:21 2015 +0300 ---------------------------------------------------------------------- .../util/nodestart/IgniteNodeCallableImpl.java | 21 +------- ...gniteProjectionStartStopRestartSelfTest.java | 52 +++++++++++++------- .../IgniteStartStopRestartTestSuite.java | 2 +- 3 files changed, 38 insertions(+), 37 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/19cd11f3/modules/ssh/src/main/java/org/apache/ignite/internal/util/nodestart/IgniteNodeCallableImpl.java ---------------------------------------------------------------------- diff --git a/modules/ssh/src/main/java/org/apache/ignite/internal/util/nodestart/IgniteNodeCallableImpl.java b/modules/ssh/src/main/java/org/apache/ignite/internal/util/nodestart/IgniteNodeCallableImpl.java index 7029daf..0b7517f 100644 --- a/modules/ssh/src/main/java/org/apache/ignite/internal/util/nodestart/IgniteNodeCallableImpl.java +++ b/modules/ssh/src/main/java/org/apache/ignite/internal/util/nodestart/IgniteNodeCallableImpl.java @@ -57,6 +57,8 @@ public class IgniteNodeCallableImpl implements IgniteNodeCallable { @LoggerResource private IgniteLogger log; + public static String fName; + /** * Required by Externalizable. */ @@ -124,8 +126,6 @@ public class IgniteNodeCallableImpl implements IgniteNodeCallable { String scriptOutputFileName = FILE_NAME_DATE_FORMAT.format(new Date()) + '-' + UUID.randomUUID().toString().substring(0, 8) + ".log"; - String fName = ""; - if (win) throw new UnsupportedOperationException("Apache Ignite cannot be auto-started on Windows from IgniteCluster.startNodes(â¦) API."); else { // Assume Unix. @@ -162,23 +162,6 @@ public class IgniteNodeCallableImpl implements IgniteNodeCallable { shell(ses, startNodeCmd); log.info(">>>>> Shelled"); - - - log.info(">>>>> File name=" + fName); - - try { - BufferedReader reader = new BufferedReader(new FileReader(fName)); - - String st = ""; - - for (String line; (line = reader.readLine()) != null;) - st += line; - - log.info(">>>>> File content:\n" + st); - } - catch (Throwable e) { - e.printStackTrace(); - } return new GridTuple3<>(spec.host(), true, null); } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/19cd11f3/modules/ssh/src/test/java/org/apache/ignite/internal/IgniteProjectionStartStopRestartSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/ssh/src/test/java/org/apache/ignite/internal/IgniteProjectionStartStopRestartSelfTest.java b/modules/ssh/src/test/java/org/apache/ignite/internal/IgniteProjectionStartStopRestartSelfTest.java index d4c5fc5..636f9c7 100644 --- a/modules/ssh/src/test/java/org/apache/ignite/internal/IgniteProjectionStartStopRestartSelfTest.java +++ b/modules/ssh/src/test/java/org/apache/ignite/internal/IgniteProjectionStartStopRestartSelfTest.java @@ -205,7 +205,7 @@ public class IgniteProjectionStartStopRestartSelfTest extends GridCommonAbstract /** * @throws Exception If failed. */ - public void testStartThreeNodes() throws Exception { + public void _testStartThreeNodes() throws Exception { joinedLatch = new CountDownLatch(3); Collection<GridTuple3<String, Boolean, String>> res = @@ -235,7 +235,7 @@ public class IgniteProjectionStartStopRestartSelfTest extends GridCommonAbstract /** * @throws Exception If failed. */ - public void testStartThreeNodesAndDoEmptyCall() throws Exception { + public void _testStartThreeNodesAndDoEmptyCall() throws Exception { joinedLatch = new CountDownLatch(3); Collection<GridTuple3<String, Boolean, String>> res = @@ -276,7 +276,7 @@ public class IgniteProjectionStartStopRestartSelfTest extends GridCommonAbstract /** * @throws Exception If failed. */ - public void testStartThreeNodesAndTryToStartOneNode() throws Exception { + public void _testStartThreeNodesAndTryToStartOneNode() throws Exception { joinedLatch = new CountDownLatch(3); Collection<GridTuple3<String, Boolean, String>> res = @@ -317,7 +317,7 @@ public class IgniteProjectionStartStopRestartSelfTest extends GridCommonAbstract /** * @throws Exception If failed. */ - public void testStartFiveNodesInTwoCalls() throws Exception { + public void _testStartFiveNodesInTwoCalls() throws Exception { joinedLatch = new CountDownLatch(3); Collection<GridTuple3<String, Boolean, String>> res = @@ -371,7 +371,7 @@ public class IgniteProjectionStartStopRestartSelfTest extends GridCommonAbstract /** * @throws Exception If failed. */ - public void testStartFiveWithTwoSpecs() throws Exception { + public void _testStartFiveWithTwoSpecs() throws Exception { joinedLatch = new CountDownLatch(5); Collection<GridTuple3<String, Boolean, String>> res = @@ -402,7 +402,7 @@ public class IgniteProjectionStartStopRestartSelfTest extends GridCommonAbstract /** * @throws Exception If failed. */ - public void testStartThreeNodesAndRestart() throws Exception { + public void _testStartThreeNodesAndRestart() throws Exception { joinedLatch = new CountDownLatch(3); Collection<GridTuple3<String, Boolean, String>> res = @@ -458,7 +458,7 @@ public class IgniteProjectionStartStopRestartSelfTest extends GridCommonAbstract /** * @throws Exception If failed. */ - public void testCustomScript() throws Exception { + public void _testCustomScript() throws Exception { joinedLatch = new CountDownLatch(1); String script = U.isWindows() ? CUSTOM_SCRIPT_WIN : CUSTOM_SCRIPT_LINUX; @@ -481,6 +481,24 @@ public class IgniteProjectionStartStopRestartSelfTest extends GridCommonAbstract } }); + joinedLatch.await(WAIT_TIMEOUT, MILLISECONDS); + + log.info(">>>>> File name=" + IgniteNodeCallableImpl.fName); + + try { + BufferedReader reader = new BufferedReader(new FileReader(IgniteNodeCallableImpl.fName)); + + String st = ""; + + for (String line; (line = reader.readLine()) != null;) + st += line; + + log.info(">>>>> File content:\n" + st); + } + catch (Throwable e) { + e.printStackTrace(); + } + assert joinedLatch.await(WAIT_TIMEOUT, MILLISECONDS); assert joinedCnt.get() == 1; @@ -494,7 +512,7 @@ public class IgniteProjectionStartStopRestartSelfTest extends GridCommonAbstract /** * @throws Exception If failed. */ - public void testStopNodes() throws Exception { + public void _testStopNodes() throws Exception { joinedLatch = new CountDownLatch(3); Collection<GridTuple3<String, Boolean, String>> res = @@ -529,7 +547,7 @@ public class IgniteProjectionStartStopRestartSelfTest extends GridCommonAbstract /** * @throws Exception If failed. */ - public void testStopNodesFiltered() throws Exception { + public void _testStopNodesFiltered() throws Exception { joinedLatch = new CountDownLatch(2); Collection<GridTuple3<String, Boolean, String>> res = @@ -592,7 +610,7 @@ public class IgniteProjectionStartStopRestartSelfTest extends GridCommonAbstract /** * @throws Exception If failed. */ - public void testStopNodeById() throws Exception { + public void _testStopNodeById() throws Exception { joinedLatch = new CountDownLatch(3); Collection<GridTuple3<String, Boolean, String>> res = @@ -627,7 +645,7 @@ public class IgniteProjectionStartStopRestartSelfTest extends GridCommonAbstract /** * @throws Exception If failed. */ - public void testStopNodesByIds() throws Exception { + public void _testStopNodesByIds() throws Exception { joinedLatch = new CountDownLatch(3); Collection<GridTuple3<String, Boolean, String>> res = @@ -669,7 +687,7 @@ public class IgniteProjectionStartStopRestartSelfTest extends GridCommonAbstract /** * @throws Exception If failed. */ - public void testStopNodesByIdsC() throws Exception { + public void _testStopNodesByIdsC() throws Exception { joinedLatch = new CountDownLatch(3); Collection<GridTuple3<String, Boolean, String>> res = @@ -706,7 +724,7 @@ public class IgniteProjectionStartStopRestartSelfTest extends GridCommonAbstract /** * @throws Exception If failed. */ - public void testRestartNodes() throws Exception { + public void _testRestartNodes() throws Exception { joinedLatch = new CountDownLatch(3); Collection<GridTuple3<String, Boolean, String>> res = @@ -743,7 +761,7 @@ public class IgniteProjectionStartStopRestartSelfTest extends GridCommonAbstract /** * @throws Exception If failed. */ - public void testRestartNodesFiltered() throws Exception { + public void _testRestartNodesFiltered() throws Exception { joinedLatch = new CountDownLatch(2); Collection<GridTuple3<String, Boolean, String>> res = @@ -809,7 +827,7 @@ public class IgniteProjectionStartStopRestartSelfTest extends GridCommonAbstract /** * @throws Exception If failed. */ - public void testRestartNodeById() throws Exception { + public void _testRestartNodeById() throws Exception { joinedLatch = new CountDownLatch(3); Collection<GridTuple3<String, Boolean, String>> res = @@ -846,7 +864,7 @@ public class IgniteProjectionStartStopRestartSelfTest extends GridCommonAbstract /** * @throws Exception If failed. */ - public void testRestartNodesByIds() throws Exception { + public void _testRestartNodesByIds() throws Exception { joinedLatch = new CountDownLatch(3); Collection<GridTuple3<String, Boolean, String>> res = @@ -885,7 +903,7 @@ public class IgniteProjectionStartStopRestartSelfTest extends GridCommonAbstract /** * @throws Exception If failed. */ - public void testRestartNodesByIdsC() throws Exception { + public void _testRestartNodesByIdsC() throws Exception { joinedLatch = new CountDownLatch(3); Collection<GridTuple3<String, Boolean, String>> res = http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/19cd11f3/modules/ssh/src/test/java/org/apache/ignite/internal/IgniteStartStopRestartTestSuite.java ---------------------------------------------------------------------- diff --git a/modules/ssh/src/test/java/org/apache/ignite/internal/IgniteStartStopRestartTestSuite.java b/modules/ssh/src/test/java/org/apache/ignite/internal/IgniteStartStopRestartTestSuite.java index 65fcb44..8de06f6 100644 --- a/modules/ssh/src/test/java/org/apache/ignite/internal/IgniteStartStopRestartTestSuite.java +++ b/modules/ssh/src/test/java/org/apache/ignite/internal/IgniteStartStopRestartTestSuite.java @@ -30,7 +30,7 @@ public class IgniteStartStopRestartTestSuite { public static TestSuite suite() throws Exception { TestSuite suite = new TestSuite("Start Nodes Test Suite"); - suite.addTestSuite(IgniteNodeStartUtilsSelfTest.class); +// suite.addTestSuite(IgniteNodeStartUtilsSelfTest.class); suite.addTestSuite(IgniteProjectionStartStopRestartSelfTest.class);
