JRE Memory Calculator

Previously the values for the applications memory regions were
calculated once during staging.  If the application was scaled such
that the amount of memory allocated to it changed, the application had
to be restaged in order to recalculate how the memory was allocated.
Customers claimed that this slowed down development cycles and the
behavior should be modified such that only a restart was required.

This change incorporates a native executable to calculate the memory
region allocation.  This executable is run during staging to ensure
that the initial memory size and heuristics are valid.  The executable
is then run as a subshell each time the application is started.  This
means that  when the memory size is changed and the application is
restarted, the memory allocations are adjusted accordingly.  If the
new memory size causes an illegal allocation of memory, startup will
fail.

[#93606820]

Author: nebhale

.idea/dictionaries/bhale.xml

@@ -12,9 +12,9 @@ GEM
     diff-lcs (1.2.5)
     docile (1.1.5)
     json (1.8.2)
-    parser (2.2.2.1)
+    parser (2.2.2.2)
       ast (>= 1.1, < 3.0)
-    powerpack (0.1.0)
+    powerpack (0.1.1)
     rainbow (2.0.0)
     rake (10.4.2)
     redcarpet (3.2.3)
@@ -31,7 +31,7 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.2.0)
     rspec-support (3.2.2)
-    rubocop (0.30.1)
+    rubocop (0.31.0)
       astrolabe (~> 1.3)
       parser (>= 2.2.2.1, < 3.0)
       powerpack (~> 0.1)

Gemfile.lock

@@ -16,14 +16,18 @@
 # Configuration for JRE repositories keyed by vendor
 # If Java 7 is required, permgen will be used instead of metaspace. Please see the documentation for more detail.
 ---
-repository_root: "{default.repository.root}/openjdk/{platform}/{architecture}"
-version: 1.8.0_+
-memory_sizes:
-  metaspace: 64m..
-  permgen: 64m..
-memory_heuristics:
-  heap: 75
-  metaspace: 10
-  permgen: 10
-  stack: 5
-  native: 10
+jre:
+  version: 1.8.0_+
+  repository_root: "{default.repository.root}/openjdk/{platform}/{architecture}"
+memory_calculator:
+  version: 1.+
+  repository_root: "{default.repository.root}/memory-calculator/{platform}/{architecture}"
+  memory_sizes:
+    metaspace: 64m..
+    permgen: 64m..
+  memory_heuristics:
+    heap: 75
+    metaspace: 10
+    permgen: 10
+    stack: 5
+    native: 10

config/open_jdk_jre.yml

@@ -19,14 +19,18 @@
 # You must specify a the repository root of an Oracle JRE repository. Please see the documentation for more detail.
 # e.g.  repository_root: "http://example.com/oracle-jre/{platform}/{architecture}"
 
-repository_root: ""
-version: 1.8.0_+
-memory_sizes:
-  metaspace: 64m..
-#  permgen: 64m..
-memory_heuristics:
-  heap: 75
-  metaspace: 10
-#  permgen: 10
-  stack: 5
-  native: 10
+jre:
+  version: 1.8.0_+
+  repository_root: ""
+memory_calculator:
+  version: 1.+
+  repository_root: "{default.repository.root}/memory-calculator/{platform}/{architecture}"
+  memory_sizes:
+    metaspace: 64m..
+    permgen: 64m..
+  memory_heuristics:
+    heap: 75
+    metaspace: 10
+    permgen: 10
+    stack: 5
+    native: 10

config/oracle_jre.yml

@@ -271,14 +271,14 @@
     <orderEntry type="library" scope="PROVIDED" name="addressable (v2.3.8, rbenv: 1.9.3-p551) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="ast (v2.0.0, rbenv: 1.9.3-p551) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="astrolabe (v1.3.0, rbenv: 1.9.3-p551) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="bundler (v1.9.4, rbenv: 1.9.3-p551) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="bundler (v1.9.5, rbenv: 1.9.3-p551) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="codeclimate-test-reporter (v0.4.7, rbenv: 1.9.3-p551) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="crack (v0.4.2, rbenv: 1.9.3-p551) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="diff-lcs (v1.2.5, rbenv: 1.9.3-p551) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="docile (v1.1.5, rbenv: 1.9.3-p551) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="json (v1.8.2, rbenv: 1.9.3-p551) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="parser (v2.2.2.1, rbenv: 1.9.3-p551) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="powerpack (v0.1.0, rbenv: 1.9.3-p551) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="parser (v2.2.2.2, rbenv: 1.9.3-p551) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="powerpack (v0.1.1, rbenv: 1.9.3-p551) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="rainbow (v2.0.0, rbenv: 1.9.3-p551) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="rake (v10.4.2, rbenv: 1.9.3-p551) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="redcarpet (v3.2.3, rbenv: 1.9.3-p551) [gem]" level="application" />
@@ -287,7 +287,7 @@
     <orderEntry type="library" scope="PROVIDED" name="rspec-expectations (v3.2.1, rbenv: 1.9.3-p551) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="rspec-mocks (v3.2.1, rbenv: 1.9.3-p551) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="rspec-support (v3.2.2, rbenv: 1.9.3-p551) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="rubocop (v0.30.1, rbenv: 1.9.3-p551) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="rubocop (v0.31.0, rbenv: 1.9.3-p551) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="rubocop-rspec (v1.3.0, rbenv: 1.9.3-p551) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="ruby-progressbar (v1.7.5, rbenv: 1.9.3-p551) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="rubyzip (v1.1.7, rbenv: 1.9.3-p551) [gem]" level="application" />

java-buildpack.iml

@@ -72,14 +72,15 @@ def release
       container = component_detection('container', @containers, true).first
       fail 'No container can run this application' unless container
 
-      component_detection('JRE', @jres, true).first.release
-      component_detection('framework', @frameworks, false).each(&:release)
-      command = container.release
+      commands = []
+      commands << component_detection('JRE', @jres, true).first.release
+      component_detection('framework', @frameworks, false).map(&:release)
+      commands << container.release
 
       payload = {
         'addons'                => [],
         'config_vars'           => {},
-        'default_process_types' => { 'web' => command }
+        'default_process_types' => { 'web' => commands.flatten.compact.join(' && ') }
       }.to_yaml
 
       @logger.debug { "Release Payload:\n#{payload}" }

lib/java_buildpack/buildpack.rb

@@ -69,8 +69,9 @@ def compile
       # Container components are also expected to create the command required to run the application.  These components
       # are expected to read the +context+ values and take them into account when creating the command.
       #
-      # @return [void, String] components other than containers are not expected to return any value.  Container
-      #                        components are expected to return the command required to run the application.
+      # @return [void, String] components other than containers and JREs are not expected to return any value.
+      #                        Container and JRE components are expected to return a command required to run the
+      #                        application.
       def release
         fail "Method 'release' must be defined"
       end

lib/java_buildpack/component/base_component.rb

@@ -42,12 +42,19 @@ def as_env_var
         "JAVA_HOME=#{root}"
       end
 
+      # Whether or not the version of Java is 8 or later
+      #
+      # @return [Boolean] +true+ iff the version is 1.8.0 or later
+      def java_8_or_later?
+        @delegate.java_8_or_later?
+      end
+
       # @return [String] the root of the droplet's +JAVA_HOME+ formatted as +$PWD/<value>+
       def root
         qualify_path @delegate.root
       end
 
-      # @return [String] the version of Java being used by the droplet
+      # @return # @return [JavaBuildpack::Util::TokenizedVersion] the tokenized droplet's +VERSION+
       def version
         @delegate.version
       end

lib/java_buildpack/component/immutable_java_home.rb

@@ -39,8 +39,7 @@ def initialize(droplet_root)
       # @param [Pathname] path the path to the +javaagent+ JAR
       # @return [JavaOpts]     +self+ for chaining
       def add_javaagent(path)
-        self << "-javaagent:#{qualify_path path}"
-        self
+        add_preformatted_options "-javaagent:#{qualify_path path}"
       end
 
       # Adds an +agentpath+ entry to the +JAVA_OPTS+. Prepends +$PWD+ to the path (relative to the droplet root) to
@@ -49,8 +48,7 @@ def add_javaagent(path)
       # @param [Pathname] path the path to the +native+ +agent+
       # @return [JavaOpts]     +self+ for chaining
       def add_agentpath(path)
-        self << "-agentpath:#{qualify_path path}"
-        self
+        add_preformatted_options "-agentpath:#{qualify_path path}"
       end
 
       # Adds a +bootclasspath/p+ entry to the +JAVA_OPTS+. Prepends +$PWD+ to the path (relative to the droplet root) to
@@ -59,8 +57,7 @@ def add_agentpath(path)
       # @param [Pathname] path the path to the +javaagent+ JAR
       # @return [JavaOpts]     +self+ for chaining
       def add_bootclasspath_p(path)
-        self << "-Xbootclasspath/p:#{qualify_path path}"
-        self
+        add_preformatted_options "-Xbootclasspath/p:#{qualify_path path}"
       end
 
       # Adds a system property to the +JAVA_OPTS+. Ensures that the key is prepended with +-D+.  If the value is a
@@ -71,19 +68,26 @@ def add_bootclasspath_p(path)
       # @param [Pathname, String] value the value of the system property
       # @return [JavaOpts]              +self+ for chaining
       def add_system_property(key, value)
-        self << "-D#{key}=#{qualify_value(value)}"
-        self
+        add_preformatted_options "-D#{key}=#{qualify_value(value)}"
       end
 
       # Adds an option to the +JAVA_OPTS+. Nothing is prepended to the key.  If the value is a +Pathname+, then
       # prepends +$PWD+ to the path (relative to the droplet root) to ensure that the path is always accurate.
       # Otherwise, uses the value as-is.
       #
       # @param [String] key             the key of the option
-      # @param [Pathname, String] value the value of the system property
+      # @param [Pathname, String] value the value of the option
       # @return [JavaOpts]              +self+ for chaining
       def add_option(key, value)
-        self << "#{key}=#{qualify_value(value)}"
+        add_preformatted_options "#{key}=#{qualify_value(value)}"
+      end
+
+      # Adds a preformatted option to the +JAVA_OPTS+
+      #
+      # @param [String] value the value of options
+      # @return [JavaOpts]    +self+ for chaining
+      def add_preformatted_options(value)
+        self << value
         self
       end
 

lib/java_buildpack/component/java_opts.rb

@@ -15,6 +15,7 @@
 # limitations under the License.
 
 require 'java_buildpack/component'
+require 'java_buildpack/util/tokenized_version'
 
 module JavaBuildpack
   module Component
@@ -30,9 +31,21 @@ class MutableJavaHome
       attr_accessor :root
 
       # @!attribute [rw] version
-      # @return [Array] the major, minor, micro and qualifier of the droplet's +VERSION+
+      # @return [JavaBuildpack::Util::TokenizedVersion] the tokenized droplet's +VERSION+
       attr_accessor :version
 
+      # Whether or not the version of Java is 8 or later
+      # @return [Boolean] +true+ iff the version is 1.8.0 or later
+      def java_8_or_later?
+        @version >= VERSION_8
+      end
+
+      private
+
+      VERSION_8 = JavaBuildpack::Util::TokenizedVersion.new('1.8.0').freeze
+
+      private_constant :VERSION_8
+
     end
 
   end