Merge pull request #379 from rhusar/CLOUD-4173

CLOUD-4173 Never truncate jboss.node.name - replace by tx specific JBOSS_TX_NODE_ID property.
wildfly · Aug 22, 2023 · e8e04a8 · e8e04a8
2 parents 7b652c8 + 4b01f40
commit e8e04a8
Show file tree

Hide file tree

Showing 10 changed files with 25 additions and 19 deletions.
diff --git a/...hift/added/src/main/resources/packages/wildfly.s2i.common/content/bin/openshift-launch.sh b/...hift/added/src/main/resources/packages/wildfly.s2i.common/content/bin/openshift-launch.sh
@@ -12,8 +12,8 @@ PRIVATE_IP_ADDRESS=${PUBLIC_IP_ADDRESS}
 MANAGEMENT_IP_ADDRESS=${WILDFLY_MANAGEMENT_BIND_ADDRESS:-${SERVER_MANAGEMENT_BIND_ADDRESS:-0.0.0.0}}
 ENABLE_STATISTICS=${WILDFLY_ENABLE_STATISTICS:-${SERVER_ENABLE_STATISTICS:-true}}
 
-# handle jboss node name truncation
+# Handle JBOSS_TX_NODE_ID computation from JBOSS_NODE_NAME
 # Do not rely on ha.sh launch script to set it. The ha logic will get removed at some point.
  init_node_name
 
-launchServer "$JBOSS_HOME/bin/standalone.sh -c $SERVER_CONFIG" "-Djboss.node.name=${JBOSS_NODE_NAME} -bprivate ${PUBLIC_IP_ADDRESS} -b ${PUBLIC_IP_ADDRESS} -bmanagement ${MANAGEMENT_IP_ADDRESS} -Dwildfly.statistics-enabled=${ENABLE_STATISTICS} ${SERVER_ARGS}"
+launchServer "$JBOSS_HOME/bin/standalone.sh -c $SERVER_CONFIG" "-Djboss.node.name=${JBOSS_NODE_NAME} -Djboss.tx.node.id=${JBOSS_TX_NODE_ID} -bprivate ${PUBLIC_IP_ADDRESS} -b ${PUBLIC_IP_ADDRESS} -bmanagement ${MANAGEMENT_IP_ADDRESS} -Dwildfly.statistics-enabled=${ENABLE_STATISTICS} ${SERVER_ARGS}"
diff --git a/...cloud-galleon-pack/layers/base/added/src/main/resources/feature_groups/os-tx-recovery.xml b/...cloud-galleon-pack/layers/base/added/src/main/resources/feature_groups/os-tx-recovery.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <feature-group-spec name="os-tx-recovery" xmlns="urn:jboss:galleon:feature-group:1.0">
     <feature spec="subsystem.transactions">
-        <param name="node-identifier" value="${jboss.node.name}"/>
+        <param name="node-identifier" value="${jboss.tx.node.id}"/>
         <param name="recovery-listener" value="true"/>
     </feature>
 </feature-group-spec>
diff --git a/...src/main/resources/packages/wildfly.s2i.ejb.tx.recovery/content/bin/launch/statefulset.sh b/...src/main/resources/packages/wildfly.s2i.ejb.tx.recovery/content/bin/launch/statefulset.sh
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/usr/bin/env bash
 
 function prepareEnv() {
   unset STATEFULSET_HEADLESS_SERVICE_NAME

diff --git a/jboss/container/wildfly/launch/jgroups/added/launch/ha.sh b/jboss/container/wildfly/launch/jgroups/added/launch/ha.sh
@@ -292,7 +292,7 @@ configure_ha_args() {
 
   init_node_name
 
-  JBOSS_HA_ARGS="${JBOSS_HA_ARGS} -Djboss.node.name=${JBOSS_NODE_NAME}"
+  JBOSS_HA_ARGS="${JBOSS_HA_ARGS} -Djboss.node.name=${JBOSS_NODE_NAME} -Djboss.tx.node.id=${JBOSS_TX_NODE_ID}"
 }
 
 configure_ha() {

diff --git a/jboss/container/wildfly/launch/os/node-name/added/launch/openshift-node-name.sh b/jboss/container/wildfly/launch/os/node-name/added/launch/openshift-node-name.sh
@@ -8,9 +8,7 @@ function init_node_name() {
       JBOSS_NODE_NAME="${HOSTNAME}"
     fi
 
-    # CLOUD-427: truncate to 23 characters max (from the end backwards)
-    if [ ${#JBOSS_NODE_NAME} -gt 23 ]; then
-      JBOSS_NODE_NAME=${JBOSS_NODE_NAME: -23}
-    fi
+    # CLOUD-427: truncate transaction node-id JBOSS_TX_NODE_ID to the last 23 characters of the JBOSS_NODE_NAME
+    JBOSS_TX_NODE_ID=${JBOSS_NODE_NAME: -23}
   fi
 }
diff --git a/jboss/container/wildfly/run/api/module.yaml b/jboss/container/wildfly/run/api/module.yaml
@@ -13,7 +13,9 @@ envs:
 - name: JAVA_OPTS_APPEND
   description: To append options to JAVA_OPTS env variable.
 - name: JBOSS_NODE_NAME
-  description: Set jboss.node.name property value. By default a truncated to 23 characters name based on the hostname is computed.
+  description: Set jboss.node.name property value.
+- name: JBOSS_TX_NODE_ID
+  description: Set transactions subsystem node-identifier property value. By default set as truncated to last 23 characters name based on the hostname is computed.
 - name: PORT_OFFSET
   description: Use this env variable to set the server port offset. This is advised practice instead of directly setting jboss.socket.binding.port-offset in the SERVER_ARGS. It allows the server shutdown logic to connect to the running server to do a clean CLI shutdown. 
 - name: SERVER_ARGS

diff --git a/jboss/container/wildfly/run/bash/artifacts/opt/jboss/container/wildfly/run/run b/jboss/container/wildfly/run/bash/artifacts/opt/jboss/container/wildfly/run/run
@@ -93,7 +93,7 @@ else
     #Ensure node name (FOR NOW NEEDED PERHAPS REVISIT FOR EAP8)
     run_init_node_name
 
-    SERVER_ARGS="${JAVA_PROXY_OPTIONS} -Djboss.node.name=${JBOSS_NODE_NAME} ${PORT_OFFSET_PROPERTY} -b ${PUBLIC_IP_ADDRESS} -bmanagement ${MANAGEMENT_IP_ADDRESS} -Dwildfly.statistics-enabled=${ENABLE_STATISTICS} ${SERVER_ARGS}"
+    SERVER_ARGS="${JAVA_PROXY_OPTIONS} -Djboss.node.name=${JBOSS_NODE_NAME} -Djboss.tx.node.id=${JBOSS_TX_NODE_ID} ${PORT_OFFSET_PROPERTY} -b ${PUBLIC_IP_ADDRESS} -bmanagement ${MANAGEMENT_IP_ADDRESS} -Dwildfly.statistics-enabled=${ENABLE_STATISTICS} ${SERVER_ARGS}"
 
     if [ -n "${CLI_LAUNCH_SCRIPT}" ]; then
       if [ ! -f "${CLI_LAUNCH_SCRIPT}" ]; then

diff --git a/jboss/container/wildfly/run/bash/artifacts/opt/jboss/container/wildfly/run/run-utils.sh b/jboss/container/wildfly/run/bash/artifacts/opt/jboss/container/wildfly/run/run-utils.sh
@@ -69,9 +69,7 @@ function run_init_node_name() {
       JBOSS_NODE_NAME="$(hostname)"
     fi
 
-    # CLOUD-427: truncate to 23 characters max (from the end backwards)
-    if [ ${#JBOSS_NODE_NAME} -gt 23 ]; then
-      JBOSS_NODE_NAME=${JBOSS_NODE_NAME: -23}
-    fi
+    # CLOUD-427: truncate transaction node-id JBOSS_TX_NODE_ID to the last 23 characters of the JBOSS_NODE_NAME
+    JBOSS_TX_NODE_ID=${JBOSS_NODE_NAME: -23}
   fi
 }
diff --git a/jboss/container/wildfly/run/bash/test/run.bats b/jboss/container/wildfly/run/bash/test/run.bats
@@ -43,12 +43,20 @@ setup() {
 @test "Node name set" {
   NODE_NAME=abcdefghijklmnopqrstuvwxyz
   run_init_node_name
-  [ "${JBOSS_NODE_NAME}" = "defghijklmnopqrstuvwxyz" ]
+
+  # 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 "Host name set" {
   HOSTNAME=abcdefghijklmnopqrstuvwxyz123
   run_init_node_name
-    echo $JBOSS_NODE_NAME
-  [ "${JBOSS_NODE_NAME}" = "ghijklmnopqrstuvwxyz123" ]
+  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" ]
 }
diff --git a/jboss/container/wildfly/s2i/1.0/bash/module.yaml b/jboss/container/wildfly/s2i/1.0/bash/module.yaml
@@ -40,7 +40,7 @@ envs:
   value: "4.2.8.Final"
 - name: GALLEON_WILDFLY_VERSION
   value: "5.2.11.Final"
-  description: "Set to true to explicitly add org.wildfly:wildfly-datasources-galleon-pack to provisoned galleon feature-packs."
+  description: "Set to true to explicitly add org.wildfly:wildfly-datasources-galleon-pack to provisioned galleon feature-packs."
 - name: GALLEON_S2I_PRODUCER_NAME
   description: Mandatory. Name of the built feature-pack producer.
 - name: S2I_FP_VERSION