Merge pull request #276 from jhuttana/remove_cpu_core_tunning_procedure

Removed cpu_core_tunning procedure.

Author: jmtd

modules/jvm/api/module.yaml

@@ -30,9 +30,6 @@ envs:
 - name: JAVA_DEBUG_PORT
   description: Port used for remote debugging. Defaults to *5005*.
   example: "8787"
-- name: CONTAINER_CORE_LIMIT
-  description: A calculated core limit as described in https://www.kernel.org/doc/Documentation/scheduler/sched-bwc.txt.
-  example: "2"
 - name: CONTAINER_MAX_MEMORY
   description: Memory limit given to the container.
   example: "1024"

modules/jvm/bash/artifacts/opt/jboss/container/java/jvm/container-limits

@@ -8,34 +8,6 @@
 #
 # This script is meant to be sourced.
 
-ceiling() {
-  awk -vnumber="$1" -vdiv="$2" '
-    function ceiling(x){
-      return x%1 ? int(x)+1 : x
-    }
-    BEGIN{
-      print ceiling(number/div)
-    }
-  '
-}
-
-# Based on the cgroup limits, figure out the max number of core we should utilize
-core_limit() {
-  local cpu_period_file="/sys/fs/cgroup/cpu/cpu.cfs_period_us"
-  local cpu_quota_file="/sys/fs/cgroup/cpu/cpu.cfs_quota_us"
-  if [ -r "${cpu_period_file}" ]; then
-    local cpu_period="$(cat ${cpu_period_file})"
-
-    if [ -r "${cpu_quota_file}" ]; then
-      local cpu_quota="$(cat ${cpu_quota_file})"
-      # cfs_quota_us == -1 --> no restrictions
-      if [ "x$cpu_quota" != "x-1" ]; then
-        ceiling "$cpu_quota" "$cpu_period"
-      fi
-    fi
-  fi
-}
-
 max_unbounded() {
   cat /proc/meminfo | grep 'MemTotal:' | awk '{print $2*1024}'
 }
@@ -57,11 +29,6 @@ min() {
   printf "%s\n" "$@" | sort -g | head -n1
 }
 
-local limit="$(core_limit)"
-if [ x$limit != x ]; then
-   export CONTAINER_CORE_LIMIT="$limit"
-fi
-
 local max_mem="$(container_memory)"
 if [ x$max_mem != x ]; then
   export CONTAINER_MAX_MEMORY="$max_mem"

modules/jvm/bash/artifacts/opt/jboss/container/java/jvm/java-default-options

@@ -114,21 +114,6 @@ diagnostics() {
   fi
 }
 
-cpu_core_tunning() {
-  # If none are set, just return.
-  local core_limit=${CONTAINER_CORE_LIMIT}
-  if [ "x$core_limit" = "x0" -o "x$core_limit" = "x" ]; then
-    return
-    else
-        if [ "x$CONTAINER_CORE_LIMIT" != "x" ] && [ $core_limit -gt $CONTAINER_CORE_LIMIT ]; then
-                core_limit=$CONTAINER_CORE_LIMIT
-        fi
-         echo "-XX:ParallelGCThreads=${core_limit} " \
-              "-Djava.util.concurrent.ForkJoinPool.common.parallelism=${core_limit} "\
-              "-XX:CICompilerCount=2"
-  fi
-}
-
 gc_config() {
   local minHeapFreeRatio=${GC_MIN_HEAP_FREE_RATIO:-10}
   local maxHeapFreeRatio=${GC_MAX_HEAP_FREE_RATIO:-20}
@@ -175,4 +160,4 @@ error_handling() {
 initialize_container_limits > /dev/null
 
 ## Echo options, trimming trailing and multiple spaces
-echo "$(initial_memory) $(max_memory) $(gc_config) $(diagnostics) $(cpu_core_tunning) $(error_handling)" | awk '$1=$1'
+echo "$(initial_memory) $(max_memory) $(gc_config) $(diagnostics) $(error_handling)" | awk '$1=$1'