Add distribution type to startup scripts

This commit adds the distribution type to the startup scripts so that we
can discern from log output and the main response the type of the
distribution (deb/rpm/tar/zip).

Author: jasontedor

client/rest-high-level/src/test/java/org/elasticsearch/client/PingAndInfoIT.java

@@ -42,6 +42,8 @@ public void testInfo() throws IOException {
         // only check node name existence, might be a different one from what was hit by low level client in multi-node cluster
         assertNotNull(info.getNodeName());
         Map<String, Object> versionMap = (Map<String, Object>) infoAsMap.get("version");
+        assertEquals(versionMap.get("build_flavor"), info.getBuild().flavor().displayName());
+        assertEquals(versionMap.get("build_type"), info.getBuild().type().displayName());
         assertEquals(versionMap.get("build_hash"), info.getBuild().shortHash());
         assertEquals(versionMap.get("build_date"), info.getBuild().date());
         assertEquals(versionMap.get("build_snapshot"), info.getBuild().isSnapshot());

distribution/archives/build.gradle

@@ -42,23 +42,23 @@ task createPluginsDir(type: EmptyDirTask) {
   dirMode 0755
 }
 
-CopySpec archiveFiles(CopySpec modulesFiles, boolean oss) {
+CopySpec archiveFiles(CopySpec modulesFiles, String distributionType, boolean oss) {
   return copySpec {
     into("elasticsearch-${version}") {
       with libFiles
       into('config') {
         dirMode 0750
         fileMode 0660
-        with configFiles('def', oss)
+        with configFiles(distributionType, oss)
       }
       into('bin') {
-        with binFiles('def', oss)
+        with binFiles(distributionType, oss)
         with copySpec {
           from('../src/bin') {
             include '*.bat'
             filter(FixCrLfFilter, eol: FixCrLfFilter.CrLf.newInstance('crlf'))
           }
-          MavenFilteringHack.filter(it, expansionsForDistribution('def', oss))
+          MavenFilteringHack.filter(it, expansionsForDistribution(distributionType, oss))
         }
       }
       into('') {
@@ -101,15 +101,15 @@ tasks.withType(AbstractArchiveTask) {
 }
 
 task buildIntegTestZip(type: Zip) {
-  with archiveFiles(transportModulesFiles, false)
+  with archiveFiles(transportModulesFiles, 'zip', false)
 }
 
 task buildZip(type: Zip) {
-  with archiveFiles(modulesFiles(false), false)
+  with archiveFiles(modulesFiles(false), 'zip', false)
 }
 
 task buildOssZip(type: Zip) {
-  with archiveFiles(modulesFiles(true), true)
+  with archiveFiles(modulesFiles(true), 'zip', true)
 }
 
 Closure commonTarConfig = {
@@ -121,12 +121,12 @@ Closure commonTarConfig = {
 
 task buildTar(type: Tar) {
   configure(commonTarConfig)
-  with archiveFiles(modulesFiles(false), false)
+  with archiveFiles(modulesFiles(false), 'tar', false)
 }
 
 task buildOssTar(type: Tar) {
   configure(commonTarConfig)
-  with archiveFiles(modulesFiles(true), true)
+  with archiveFiles(modulesFiles(true), 'tar', true)
 }
 
 // This configures the default artifact for the distribution specific

distribution/build.gradle

@@ -434,6 +434,14 @@ subprojects {
         'def': oss ? 'oss' : 'default'
       ],
 
+
+      'es.distribution.type': [
+        'deb': 'deb',
+        'rpm': 'rpm',
+        'tar': 'tar',
+        'zip': 'zip'
+      ],
+
       'license.name': [
         'deb': oss ? 'ASL-2.0' : 'Elastic-License'
       ],

distribution/src/bin/elasticsearch

@@ -29,6 +29,7 @@ if ! echo $* | grep -E '(^-d |-d$| -d |--daemonize$|--daemonize )' > /dev/null;
     -Des.path.home="$ES_HOME" \
     -Des.path.conf="$ES_PATH_CONF" \
     -Des.distribution.flavor="$ES_DISTRIBUTION_FLAVOR" \
+    -Des.distribution.type="$ES_DISTRIBUTION_TYPE" \
     -cp "$ES_CLASSPATH" \
     org.elasticsearch.bootstrap.Elasticsearch \
     "$@"
@@ -39,6 +40,7 @@ else
     -Des.path.home="$ES_HOME" \
     -Des.path.conf="$ES_PATH_CONF" \
     -Des.distribution.flavor="$ES_DISTRIBUTION_FLAVOR" \
+    -Des.distribution.type="$ES_DISTRIBUTION_TYPE" \
     -cp "$ES_CLASSPATH" \
     org.elasticsearch.bootstrap.Elasticsearch \
     "$@" \

distribution/src/bin/elasticsearch-env

@@ -78,6 +78,7 @@ fi
 ES_PATH_CONF=`cd "$ES_PATH_CONF"; pwd`
 
 ES_DISTRIBUTION_FLAVOR=${es.distribution.flavor}
+ES_DISTRIBUTION_TYPE=${es.distribution.type}
 
 if [ -z "$ES_TMPDIR" ]; then
   set +e

distribution/src/bin/elasticsearch-env.bat

@@ -54,6 +54,7 @@ rem now make ES_PATH_CONF absolute
 for %%I in ("%ES_PATH_CONF%..") do set ES_PATH_CONF=%%~dpfI
 
 set ES_DISTRIBUTION_FLAVOR=${es.distribution.flavor}
+set ES_DISTRIBUTION_TYPE=${es.distribution.type}
 
 if not defined ES_TMPDIR (
   set ES_TMPDIR=!TMP!\elasticsearch

distribution/src/bin/elasticsearch-keystore

@@ -8,6 +8,7 @@ exec \
   -Des.path.home="$ES_HOME" \
   -Des.path.conf="$ES_PATH_CONF" \
   -Des.distribution.flavor="$ES_DISTRIBUTION_FLAVOR" \
+  -Des.distribution.type="$ES_DISTRIBUTION_TYPE" \
   -cp "$ES_CLASSPATH" \
   org.elasticsearch.common.settings.KeyStoreCli \
   "$@"

distribution/src/bin/elasticsearch-keystore.bat

@@ -10,6 +10,7 @@ call "%~dp0elasticsearch-env.bat" || exit /b 1
   -Des.path.home="%ES_HOME%" ^
   -Des.path.conf="%ES_PATH_CONF%" ^
   -Des.distribution.flavor="%ES_DISTRIBUTION_FLAVOR%" ^
+  -Des.distribution.type="%ES_DISTRIBUTION_TYPE%" ^
   -cp "%ES_CLASSPATH%" ^
   org.elasticsearch.common.settings.KeyStoreCli ^
   %*

distribution/src/bin/elasticsearch-plugin

@@ -8,6 +8,7 @@ exec \
   -Des.path.home="$ES_HOME" \
   -Des.path.conf="$ES_PATH_CONF" \
   -Des.distribution.flavor="$ES_DISTRIBUTION_FLAVOR" \
+  -Des.distribution.type="$ES_DISTRIBUTION_TYPE" \
   -cp "$ES_CLASSPATH" \
   org.elasticsearch.plugins.PluginCli \
   "$@"

distribution/src/bin/elasticsearch-plugin.bat

@@ -10,6 +10,7 @@ call "%~dp0elasticsearch-env.bat" || exit /b 1
   -Des.path.home="%ES_HOME%" ^
   -Des.path.conf="%ES_PATH_CONF%" ^
   -Des.distribution.flavor="%ES_DISTRIBUTION_FLAVOR%" ^
+  -Des.distribution.type="%ES_DISTRIBUTION_TYPE%" ^
   -cp "%ES_CLASSPATH%" ^
   org.elasticsearch.plugins.PluginCli ^
   %*