Merge pull request #481 from bsc-dd/fix-launch-kafka

Fix launch_kafka.sh script
bsc-dd · Mar 6, 2024 · 11e89fe · 11e89fe
2 parents 2cfb3ea + fb53745
commit 11e89fe
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/cassandra4slurm/scripts/job.sh b/cassandra4slurm/scripts/job.sh
@@ -281,7 +281,7 @@ sleep 5
 if [ "X$STREAMING" != "X" ]; then
     if [ ${STREAMING,,} == "true" ]; then
         source $HECUBA_ROOT/bin/cassandra4slurm/launch_kafka.sh
-        launch_kafka $CASSANDRA_NODELIST $UNIQ_ID $N_NODES
+        launch_kafka $CASSFILE $UNIQ_ID $N_NODES
     fi
 fi
 

diff --git a/cassandra4slurm/scripts/launch_kafka.sh b/cassandra4slurm/scripts/launch_kafka.sh
@@ -39,12 +39,13 @@ get_kafka_path () {
 }
 
 launch_kafka () {
-    local CASSANDRA_NODELIST="$1"
+    local CASSFILE="$1"
     local UNIQ_ID="$2"
     local N_NODES="$3"
 
-    local ZKNODE=$( get_first_node $CASSANDRA_NODELIST )
-    local ZKNODEIP=$( get_first_node $CASSANDRA_NODELIST.ips )
+    local ZKNODE=$( head -n 1 $CASSFILE )
+    local ZKNODEIP=$( head -n 1 $CASSFILE.ips )
+    local CASSANDRA_NODELIST=$(cat $CASSFILE | sed -e 's+ +,+g')
 
     KAFKA_PATH=$(get_kafka_path)