asterixdb-notifications mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From "Ian Maxon (Code Review)" <do-not-re...@asterixdb.incubator.apache.org>
Subject Change in asterixdb[master]: Fix ClusterLifecycleIT
Date Thu, 21 Jan 2016 21:00:14 GMT
Ian Maxon has uploaded a new change for review.

  https://asterix-gerrit.ics.uci.edu/593

Change subject: Fix ClusterLifecycleIT
......................................................................

Fix ClusterLifecycleIT

Change-Id: I4e8db26a820afd1fbaa52ceeb3efd0c8328ab071
---
M asterix-events/src/main/resources/events/cc_failure/cc_failure.sh
M asterix-installer/src/main/resources/scripts/verify.sh
M asterix-installer/src/test/java/org/apache/asterix/installer/test/AsterixClusterLifeCycleIT.java
3 files changed, 7 insertions(+), 7 deletions(-)


  git pull ssh://asterix-gerrit.ics.uci.edu:29418/asterixdb refs/changes/93/593/1

diff --git a/asterix-events/src/main/resources/events/cc_failure/cc_failure.sh b/asterix-events/src/main/resources/events/cc_failure/cc_failure.sh
index 4663bba..4358288 100644
--- a/asterix-events/src/main/resources/events/cc_failure/cc_failure.sh
+++ b/asterix-events/src/main/resources/events/cc_failure/cc_failure.sh
@@ -17,7 +17,7 @@
 # specific language governing permissions and limitations
 # under the License.
 
-CC_PARENT_ID_INFO=`ps -ef  | grep asterix | grep cc_start | grep -v ssh`
+CC_PARENT_ID_INFO=`ps -ef  | grep cc_start | grep -v grep | grep -v ssh`
 CC_PARENT_ID=`echo $CC_PARENT_ID_INFO | tr -s " " | cut -d " " -f2`
 CC_ID_INFO=`ps -ef | grep asterix | grep $CC_PARENT_ID | grep -v bash`
 CC_ID=`echo $CC_ID_INFO |  tr -s " " | cut -d " " -f2`
diff --git a/asterix-installer/src/main/resources/scripts/verify.sh b/asterix-installer/src/main/resources/scripts/verify.sh
index 5df92f7..bbec12e 100644
--- a/asterix-installer/src/main/resources/scripts/verify.sh
+++ b/asterix-installer/src/main/resources/scripts/verify.sh
@@ -32,7 +32,7 @@
  shift 2
 done
 
-CC_PARENT_ID_INFO=$(ssh $MASTER_NODE "ps -ef  | grep asterix | grep cc_start | grep -v ssh")
+CC_PARENT_ID_INFO=$(ssh $MASTER_NODE "ps -ef  | grep cc_start | grep -v grep| grep -v ssh")
 CC_PARENT_ID=`echo $CC_PARENT_ID_INFO | tr -s " " | cut -d " " -f2` 
 CC_ID_INFO=$(ssh $MASTER_NODE "ps -ef | grep asterix | grep $CC_PARENT_ID | grep -v bash")
 CC_ID=`echo $CC_ID_INFO |  tr -s " " | cut -d " " -f2`
diff --git a/asterix-installer/src/test/java/org/apache/asterix/installer/test/AsterixClusterLifeCycleIT.java
b/asterix-installer/src/test/java/org/apache/asterix/installer/test/AsterixClusterLifeCycleIT.java
index df31788..cd3a023 100644
--- a/asterix-installer/src/test/java/org/apache/asterix/installer/test/AsterixClusterLifeCycleIT.java
+++ b/asterix-installer/src/test/java/org/apache/asterix/installer/test/AsterixClusterLifeCycleIT.java
@@ -78,7 +78,7 @@
         logOutput(managixInvoke("configure").getInputStream());
         logOutput(managixInvoke("validate").getInputStream());
 
-        Process p = managixInvoke("create -n vagrant-ssh -c /vagrant/cluster.xml");
+        Process p = managixInvoke("create -n vagrant -c /vagrant/cluster.xml");
         String pout = processOut(p);
         LOGGER.info(pout);
         Assert.assertTrue(checkOutput(pout, "ACTIVE"));
@@ -86,14 +86,14 @@
         // from being reliable
         LOGGER.info("Test start active cluster instance PASSED");
 
-        Process stop = managixInvoke("stop -n vagrant-ssh");
+        Process stop = managixInvoke("stop -n vagrant");
         Assert.assertTrue(checkOutput(stop.getInputStream(), "Stopped Asterix instance"));
         LOGGER.info("Test stop active cluster instance PASSED");
     }
 
     @AfterClass
     public static void tearDown() throws Exception {
-        Process p = managixInvoke("delete -n vagrant-ssh");
+        Process p = managixInvoke("delete -n vagrant");
         Assert.assertTrue(checkOutput(p.getInputStream(), "Deleted Asterix instance"));
         remoteInvoke("rm -rf /vagrant/managix-working");
         LOGGER.info("Test delete active instance PASSED");
@@ -162,9 +162,9 @@
         // TODO: is the instance actually live?
         // TODO: is ZK still running?
         try {
-            Process start = managixInvoke("start -n vagrant-ssh");
+            Process start = managixInvoke("start -n vagrant");
             Assert.assertTrue(checkOutput(start.getInputStream(), "ACTIVE"));
-            Process stop = managixInvoke("stop -n vagrant-ssh");
+            Process stop = managixInvoke("stop -n vagrant");
             Assert.assertTrue(checkOutput(stop.getInputStream(), "Stopped Asterix instance"));
             LOGGER.info("Test start/stop active cluster instance PASSED");
         } catch (Exception e) {

-- 
To view, visit https://asterix-gerrit.ics.uci.edu/593
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I4e8db26a820afd1fbaa52ceeb3efd0c8328ab071
Gerrit-PatchSet: 1
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: Ian Maxon <imaxon@apache.org>

Mime
View raw message