ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sboi...@apache.org
Subject incubator-ignite git commit: nohup
Date Fri, 10 Apr 2015 11:08:38 GMT
Repository: incubator-ignite
Updated Branches:
  refs/heads/ignite-676 2de2972e3 -> c1e07eb5b


nohup


Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/c1e07eb5
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/c1e07eb5
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/c1e07eb5

Branch: refs/heads/ignite-676
Commit: c1e07eb5bbb27bbdc35a511077ce054b1d7d4810
Parents: 2de2972
Author: Artem Shutak <ashutak@gridgain.com>
Authored: Fri Apr 10 14:08:27 2015 +0300
Committer: Artem Shutak <ashutak@gridgain.com>
Committed: Fri Apr 10 14:08:27 2015 +0300

----------------------------------------------------------------------
 .../util/nodestart/StartNodeCallableImpl.java   |  4 +++-
 ...gniteProjectionStartStopRestartSelfTest.java | 21 ++++++++++++--------
 2 files changed, 16 insertions(+), 9 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c1e07eb5/modules/ssh/src/main/java/org/apache/ignite/internal/util/nodestart/StartNodeCallableImpl.java
----------------------------------------------------------------------
diff --git a/modules/ssh/src/main/java/org/apache/ignite/internal/util/nodestart/StartNodeCallableImpl.java
b/modules/ssh/src/main/java/org/apache/ignite/internal/util/nodestart/StartNodeCallableImpl.java
index 4a5564d..cb2f4ab 100644
--- a/modules/ssh/src/main/java/org/apache/ignite/internal/util/nodestart/StartNodeCallableImpl.java
+++ b/modules/ssh/src/main/java/org/apache/ignite/internal/util/nodestart/StartNodeCallableImpl.java
@@ -58,6 +58,7 @@ public class StartNodeCallableImpl implements StartNodeCallable {
     @LoggerResource
     private IgniteLogger log;
 
+    public static String nohupHelpName;
     public static String fName;
 
     /**
@@ -148,6 +149,7 @@ public class StartNodeCallableImpl implements StartNodeCallable {
                 }
                 
                 fName = igniteHome + "/log1.txt";
+                nohupHelpName = igniteHome + "/log_nohup_help.txt";
 
                 startNodeCmd = new SB().
                     // Console output is consumed, started nodes must use Ignite file appenders
for log.
@@ -160,7 +162,7 @@ public class StartNodeCallableImpl implements StartNodeCallable {
 
             info("Starting remote node with SSH command: " + startNodeCmd, spec.logger(),
log);
 
-            shell(ses, "nohup --help  > " + igniteHome + "/log_nohup_help.txt" + " 2>&
1 &");
+            shell(ses, "nohup --help  > " + nohupHelpName + " 2>& 1 &");
 
             shell(ses, startNodeCmd);
             

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c1e07eb5/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 05ec4e8..c419967 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
@@ -195,7 +195,19 @@ public class IgniteProjectionStartStopRestartSelfTest extends GridCommonAbstract
 
         joinedLatch.await(WAIT_TIMEOUT, MILLISECONDS);
 
-        log.info(">>>>> File name=" + StartNodeCallableImpl.fName);
+        printFile(StartNodeCallableImpl.nohupHelpName);
+        printFile(StartNodeCallableImpl.fName);
+
+        assert joinedLatch.await(WAIT_TIMEOUT, MILLISECONDS);
+
+        assert joinedCnt.get() == 1;
+        assert leftCnt.get() == 0;
+
+        assert ignite.cluster().nodes().size() == 1;
+    }
+
+    private void printFile(String fName) {
+        log.info(">>>>> File name=" + fName);
 
         try {
             BufferedReader reader = new BufferedReader(new FileReader(StartNodeCallableImpl.fName));
@@ -210,13 +222,6 @@ public class IgniteProjectionStartStopRestartSelfTest extends GridCommonAbstract
         catch (Throwable e) {
             log.error(">>>>> Error:", e);
         }
-
-        assert joinedLatch.await(WAIT_TIMEOUT, MILLISECONDS);
-
-        assert joinedCnt.get() == 1;
-        assert leftCnt.get() == 0;
-
-        assert ignite.cluster().nodes().size() == 1;
     }
 
     /**


Mime
View raw message