Merge remote-tracking branch 'upstream/master' into issue_4047

Author: RobCherry

CONTRIBUTING.md

@@ -74,6 +74,8 @@ Contributing to the Elasticsearch codebase
 
 Make sure you have [Maven](http://maven.apache.org) installed, as Elasticsearch uses it as its build system. Integration with IntelliJ and Eclipse should work out of the box. Eclipse users can automatically configure their IDE by running `mvn eclipse:eclipse` and then importing the project into their workspace: `File > Import > Existing project into workspace`.
 
+Elasticsearch also works perfectly with Eclipse's [http://www.eclipse.org/m2e/](m2e).  Once you've installed m2e you can import Elasticsearch as an `Existing Maven Project`.
+
 Please follow these formatting guidelines:
 
 * Java indent is 4 spaces

bin/service.bat

@@ -125,10 +125,9 @@ if NOT "%ES_HEAP_SIZE%" == "" set ES_MAX_MEM=%ES_HEAP_SIZE%
 call:convertxm %ES_MIN_MEM% JVM_XMS
 call:convertxm %ES_MAX_MEM% JVM_XMX
 
-set JAVA_OPTS=%JAVA_OPTS% -XX:+UseParNewGC
-
-rem JAVA_OPTS might be empty so remove the spaces that might trip commons daemon
-set JAVA_OPTS=%JAVA_OPTS: =%
+rem java_opts might be empty - init to avoid tripping commons daemon (if the command starts with ;)
+if not "%JAVA_OPTS%" == "" set JAVA_OPTS=%JAVA_OPTS% -XX:+UseParNewGC
+if "%JAVA_OPTS%" == "" set JAVA_OPTS=-XX:+UseParNewGC
 
 if NOT "%ES_HEAP_NEWSIZE%" == "" set JAVA_OPTS=%JAVA_OPTS% -Xmn%ES_HEAP_NEWSIZE%
 
@@ -174,10 +173,8 @@ set ES_PARAMS=-Delasticsearch;-Des.path.home="%ES_HOME%";-Des.default.config="%C
 
 set JVM_OPTS=%JAVA_OPTS: =;%
 
-if not "%ES_JAVA_OPTS%" == "" (
-set JVM_ES_JAVA_OPTS=%ES_JAVA_OPTS: =#%
-set JVM_OPTS=%JVM_OPTS%;%JVM_ES_JAVA_OPTS%
-)
+if not "%ES_JAVA_OPTS%" == "" set JVM_ES_JAVA_OPTS=%ES_JAVA_OPTS: =#%
+if not "%ES_JAVA_OPTS%" == "" set JVM_OPTS=%JVM_OPTS%;%JVM_ES_JAVA_OPTS%
 
 if "%ES_START_TYPE%" == "" set ES_START_TYPE=manual
 if "%ES_STOP_TIMEOUT%" == "" set ES_STOP_TIMEOUT=0

dev-tools/ElasticSearch.launch

@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<launchConfiguration type="org.eclipse.jdt.launching.localJavaApplication">
+<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
+<listEntry value="/elasticsearch/src/main/java/org/elasticsearch/bootstrap/ElasticSearch.java"/>
+</listAttribute>
+<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
+<listEntry value="1"/>
+</listAttribute>
+<mapAttribute key="org.eclipse.debug.core.environmentVariables">
+<mapEntry key="ES_HOME" value="${target_home}"/>
+</mapAttribute>
+<stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="org.eclipse.m2e.launchconfig.classpathProvider"/>
+<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.elasticsearch.bootstrap.ElasticSearch"/>
+<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="elasticsearch"/>
+<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.m2e.launchconfig.sourcepathProvider"/>
+<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Xms256m -Xmx1g -Xss256k -Djava.awt.headless=true -XX:+UseParNewGC -XX:+UseConcMarkSweepGC -XX:CMSInitiatingOccupancyFraction=75 -XX:+UseCMSInitiatingOccupancyOnly -XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath=logs/heapdump.hprof -Delasticsearch -Des.foreground=yes -Djava.library.path=lib/sigar -ea"/>
+</launchConfiguration>

dev-tools/build_randomization.rb

@@ -0,0 +1,75 @@
+#!/usr/bin/env ruby
+# Licensed to  ElasticSearch and Shay Banon under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the 'License'); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an 'AS IS' BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License
+#
+# generate property file for the jdk randomization test
+# 
+#
+require 'yaml'
+
+class JDKSelector
+  attr_reader :directory, :jdk_list
+
+  def initialize(directory)
+    @directory = directory
+  end
+
+  # get selection of available jdks from jenkins automatic install directory
+  def get_jdk
+    @jdk_list = Dir.entries(directory).select do |x| 
+      x.chars.first == 'J' 
+    end.map do |y|
+      File.join(directory, y)
+    end
+    self
+  end
+
+  # do ranomize selection from a given array
+  def select_one(selection_array = nil)
+    selection_array ||= @jdk_list
+    selection_array[rand(selection_array.size)]
+  end
+end
+
+# given a jdk directory selection, generate revelant environment variables
+def get_env_matrix(data_array)
+  [*data_array].map do |x|
+    {
+      'PATH' => File.join(x,'bin') + ':' + ENV['PATH'],
+      'JAVA_HOME' => x,
+      'BUILD_DESC' => File.basename(x)
+    }
+  end
+end
+
+# pick first element out of array of hashes, generate write java property file
+def generate_property_file(directory, data)
+  #array transformation
+  content = data.first.map do |key, value|
+    "%s=%s"%[key, value]
+  end
+  file_name = (ENV['BUILD_ID'] + ENV['BUILD_NUMBER']) || 'prop'
+  file_name = file_name.split(File::SEPARATOR).first + '.txt'
+  File.open(File.join(directory, file_name), 'w') do |file| 
+              file.write(content.join("\n")) 
+  end
+end
+
+# jenkins sets pwd prior to execution
+jdk_selector = JDKSelector.new(File.join(ENV['PWD'],'tools','hudson.model.JDK'))
+environment_matrix = get_env_matrix(jdk_selector.get_jdk.select_one)
+
+working_directory = ENV['WORKSPACE'] || '/var/tmp'
+generate_property_file(working_directory, environment_matrix)