Revert "Fix JVM monitoring scripts"

[integration/test.git] / csit / scripts / set_jvm_common_attribute.sh

diff --git a/csit/scripts/set_jvm_common_attribute.sh b/csit/scripts/set_jvm_common_attribute.sh
index 44426c74d0f8cbe71d1705d291918f8240d97bdc..408910d943cac7e8e7b908fae71d7eb4bb06dc94 100644 (file)
--- a/csit/scripts/set_jvm_common_attribute.sh
+++ b/csit/scripts/set_jvm_common_attribute.sh
@@ -1,13 +1,5 @@
 #!/bin/bash
 
-cat > ${WORKSPACE}/elasticsearch_startup.sh <<EOF
-cd /tmp/elasticsearch
-echo "Starting Elasticsearch node"
-sudo /tmp/elasticsearch/elasticsearch-1.7.5/bin/elasticsearch > /dev/null 2>&1 &
-ls -al /tmp/elasticsearch/elasticsearch-1.7.5/bin/elasticsearch
-
-EOF
-
 cat > ${WORKSPACE}/org.apache.karaf.decanter.collector.jmx-local.cfg <<EOF
 type=jmx-local
 url=local
@@ -26,19 +18,40 @@ EOF
 for i in `seq 1 ${NUM_ODL_SYSTEM}`
 do
     CONTROLLERIP=ODL_SYSTEM_${i}_IP
+    CLUSTERNAME=`head /dev/urandom | tr -dc A-Za-z0-9 | head -c 12`
 
     cat > ${WORKSPACE}/elasticsearch.yml <<EOF
-    cluster.name: elasticsearch
+    cluster.name: ${CLUSTERNAME}
     network.host: ${!CONTROLLERIP}
+    discovery.zen.ping.multicast.enabled: false
 
 EOF
     cat > ${WORKSPACE}/org.apache.karaf.decanter.appender.elasticsearch.cfg <<EOF
     host=${!CONTROLLERIP}
     port=9300
-    clusterName=elasticsearch
+    clusterName=${CLUSTERNAME}
 
 EOF
 
+    cat > ${WORKSPACE}/elasticsearch_startup.sh <<EOF
+    cd /tmp/elasticsearch/elasticsearch-1.7.5
+    ls -al
+
+    if [ -d "data" ]; then
+        echo "data directory exists, deleting...."
+        rm -r data
+    else
+        echo "data directory does not exist"
+    fi
+
+    cd /tmp/elasticsearch
+    ls -al
+
+    echo "Starting Elasticsearch node"
+    sudo /tmp/elasticsearch/elasticsearch-1.7.5/bin/elasticsearch > /dev/null 2>&1 &
+    ls -al /tmp/elasticsearch/elasticsearch-1.7.5/bin/elasticsearch
+
+EOF
     echo "Setup ODL_SYSTEM_IP specific config files for ${!CONTROLLERIP} "
 
     cat ${WORKSPACE}/org.apache.karaf.decanter.appender.elasticsearch.cfg
@@ -52,6 +65,9 @@ EOF
     scp ${WORKSPACE}/org.apache.karaf.decanter.collector.jmx-others.cfg ${!CONTROLLERIP}:/tmp/${BUNDLEFOLDER}/etc/
 
     scp ${WORKSPACE}/elasticsearch.yml ${!CONTROLLERIP}:/tmp/
+
+    ssh ${!CONTROLLERIP} "sudo ls -al /tmp/elasticsearch/"
+
     ssh ${!CONTROLLERIP} "sudo mv /tmp/elasticsearch.yml /tmp/elasticsearch/elasticsearch-1.7.5/config/"
     ssh ${!CONTROLLERIP} "cat /tmp/elasticsearch/elasticsearch-1.7.5/config/elasticsearch.yml"
 
@@ -60,5 +76,4 @@ EOF
     scp ${WORKSPACE}/elasticsearch_startup.sh ${!CONTROLLERIP}:/tmp
     ssh ${!CONTROLLERIP} 'bash /tmp/elasticsearch_startup.sh'
     ssh ${!CONTROLLERIP} 'ps aux | grep elasticsearch'
-
 done