Merge pull request #389 from jfdenise/cloud-4173-cont

Fix for CLOUD-4173 continuing

jboss/container/wildfly/launch/os/node-name/added/launch/openshift-node-name.sh

@@ -7,8 +7,11 @@ function init_node_name() {
     else
       JBOSS_NODE_NAME="${HOSTNAME}"
     fi
-
-    # CLOUD-427: truncate transaction node-id JBOSS_TX_NODE_ID to the last 23 characters of the JBOSS_NODE_NAME
+  fi
+  # CLOUD-427: truncate transaction node-id JBOSS_TX_NODE_ID to the last 23 characters of the JBOSS_NODE_NAME
+  if [ ${#JBOSS_NODE_NAME} -gt 23 ]; then
     JBOSS_TX_NODE_ID=${JBOSS_NODE_NAME: -23}
+  else
+    JBOSS_TX_NODE_ID=${JBOSS_NODE_NAME}
   fi
 }

jboss/container/wildfly/launch/os/node-name/test/node-name.bats

@@ -0,0 +1,63 @@
+#!/usr/bin/env bats
+
+# fake JBOSS_HOME
+export JBOSS_HOME=$BATS_TMPDIR/jboss_home
+rm -rf $JBOSS_HOME 2>/dev/null
+mkdir -p $JBOSS_HOME/bin/launch
+
+# copy scripts we are going to use
+cp $BATS_TEST_DIRNAME/../added/launch/openshift-node-name.sh $JBOSS_HOME/bin/launch
+
+
+# source the scripts needed
+source $JBOSS_HOME/bin/launch/openshift-node-name.sh
+
+
+@test "JBoss Node name set to a value smaller than 23" {
+  JBOSS_NODE_NAME=foo
+  init_node_name
+  [ "${JBOSS_NODE_NAME}" = "foo" ]
+  [ "${JBOSS_TX_NODE_ID}" = "foo" ]
+}
+
+@test "JBOSS_NODE_NAME set" {
+  JBOSS_NODE_NAME=abcdefghijklmnopqrstuvwxyz123
+  init_node_name
+  echo $JBOSS_NODE_NAME
+
+  # Verify that jboss.node.name is untouched
+  [ "${JBOSS_NODE_NAME}" = "abcdefghijklmnopqrstuvwxyz123" ]
+  # Verify that jboss.tx.node.id is truncated to last 23 characters
+  [ "${JBOSS_TX_NODE_ID}" = "ghijklmnopqrstuvwxyz123" ]
+}
+
+@test "Node name set" {
+  NODE_NAME=abcdefghijklmnopqrstuvwxyz
+  init_node_name
+
+  # Verify that jboss.node.name is untouched
+  [ "${JBOSS_NODE_NAME}" = "abcdefghijklmnopqrstuvwxyz" ]
+  # Verify that jboss.tx.node.id is truncated to last 23 characters
+  [ "${JBOSS_TX_NODE_ID}" = "defghijklmnopqrstuvwxyz" ]
+}
+
+@test "Node name set to value smaller than 23" {
+  NODE_NAME=abcdef
+  init_node_name
+
+  # Verify that jboss.node.name is untouched
+  [ "${JBOSS_NODE_NAME}" = "abcdef" ]
+  # Verify that jboss.tx.node.id is untouched
+  [ "${JBOSS_TX_NODE_ID}" = "abcdef" ]
+}
+
+@test "Host name set" {
+  HOSTNAME=abcdefghijklmnopqrstuvwxyz123
+  init_node_name
+  echo $JBOSS_NODE_NAME
+
+  # Verify that jboss.node.name is untouched
+  [ "${JBOSS_NODE_NAME}" = "abcdefghijklmnopqrstuvwxyz123" ]
+  # Verify that jboss.tx.node.id is truncated to last 23 characters
+  [ "${JBOSS_TX_NODE_ID}" = "ghijklmnopqrstuvwxyz123" ]
+}

jboss/container/wildfly/run/bash/artifacts/opt/jboss/container/wildfly/run/run-utils.sh

@@ -68,8 +68,11 @@ function run_init_node_name() {
     else
       JBOSS_NODE_NAME="$(hostname)"
     fi
-
-    # CLOUD-427: truncate transaction node-id JBOSS_TX_NODE_ID to the last 23 characters of the JBOSS_NODE_NAME
+  fi
+  # CLOUD-427: truncate transaction node-id JBOSS_TX_NODE_ID to the last 23 characters of the JBOSS_NODE_NAME
+  if [ ${#JBOSS_NODE_NAME} -gt 23 ]; then
     JBOSS_TX_NODE_ID=${JBOSS_NODE_NAME: -23}
+  else
+    JBOSS_TX_NODE_ID=${JBOSS_NODE_NAME}
   fi
-}
+}

jboss/container/wildfly/run/bash/test/run.bats

@@ -34,10 +34,22 @@ setup() {
   [ "$status" -eq 0 ]
 }
 
-@test "JBoss Node name set" {
+@test "JBoss Node name set to a value smaller than 23" {
   JBOSS_NODE_NAME=foo
   run_init_node_name
   [ "${JBOSS_NODE_NAME}" = "foo" ]
+  [ "${JBOSS_TX_NODE_ID}" = "foo" ]
+}
+
+@test "JBOSS_NODE_NAME set" {
+  JBOSS_NODE_NAME=abcdefghijklmnopqrstuvwxyz123
+  run_init_node_name
+  echo $JBOSS_NODE_NAME
+
+  # Verify that jboss.node.name is untouched
+  [ "${JBOSS_NODE_NAME}" = "abcdefghijklmnopqrstuvwxyz123" ]
+  # Verify that jboss.tx.node.id is truncated to last 23 characters
+  [ "${JBOSS_TX_NODE_ID}" = "ghijklmnopqrstuvwxyz123" ]
 }
 
 @test "Node name set" {
@@ -50,6 +62,16 @@ setup() {
   [ "${JBOSS_TX_NODE_ID}" = "defghijklmnopqrstuvwxyz" ]
 }
 
+@test "Node name set to value smaller than 23" {
+  NODE_NAME=abcdef
+  run_init_node_name
+
+  # Verify that jboss.node.name is untouched
+  [ "${JBOSS_NODE_NAME}" = "abcdef" ]
+  # Verify that jboss.tx.node.id is untouched
+  [ "${JBOSS_TX_NODE_ID}" = "abcdef" ]
+}
+
 @test "Host name set" {
   HOSTNAME=abcdefghijklmnopqrstuvwxyz123
   run_init_node_name