AMBARI-24692. Use jdk8 as default compiler version (#7)
* AMBARI-24692. Use jdk8 as default compiler version
* AMBARI-24692. Revert jvm gc settings
* AMBARI-24692. Implement TODO: java version check.
* AMBARI-24692. Extend jdk version to env variable in Makefile
diff --git a/Makefile b/Makefile
index 16d3782..6ad38e4 100644
--- a/Makefile
+++ b/Makefile
@@ -19,59 +19,41 @@
LOGSEARCH_BUILD_DOCKER_TAG = "latest"
endif
+ifeq ("$(LOGSEARCH_JDK_11)", "true")
+ LOGSEARCH_JAVA_VERSION = "11"
+else
+ LOGSEARCH_JAVA_VERSION = "1.8"
+endif
+
package:
- $(MAVEN_BINARY) clean package
+ $(MAVEN_BINARY) clean package -Djdk.version=$(LOGSEARCH_JAVA_VERSION)
install:
- $(MAVEN_BINARY) clean install -DskipTests
+ $(MAVEN_BINARY) clean install -DskipTests -Djdk.version=$(LOGSEARCH_JAVA_VERSION)
be:
- $(MAVEN_BINARY) clean package -Pbe
+ $(MAVEN_BINARY) clean package -Pbe -Djdk.version=$(LOGSEARCH_JAVA_VERSION)
fe:
- $(MAVEN_BINARY) clean package -Pfe
+ $(MAVEN_BINARY) clean package -Pfe -Djdk.version=$(LOGSEARCH_JAVA_VERSION)
test:
- $(MAVEN_BINARY) clean test
+ $(MAVEN_BINARY) clean test -Djdk.version=$(LOGSEARCH_JAVA_VERSION)
rpm:
- $(MAVEN_BINARY) clean package -Dbuild-rpm -DskipTests
+ $(MAVEN_BINARY) clean package -Dbuild-rpm -DskipTests -Djdk.version=$(LOGSEARCH_JAVA_VERSION)
deb:
- $(MAVEN_BINARY) clean package -Dbuild-deb -DskipTests
+ $(MAVEN_BINARY) clean package -Dbuild-deb -DskipTests -Djdk.version=$(LOGSEARCH_JAVA_VERSION)
update-version:
$(MAVEN_BINARY) versions:set -DnewVersion=$(new-version) -DgenerateBackupPoms=false
-package-jdk8:
- $(MAVEN_BINARY) clean package -Djdk.version=1.8
-
-install-jdk8:
- $(MAVEN_BINARY) clean install -DskipTests -Djdk.version=1.8
-
-be-jdk8:
- $(MAVEN_BINARY) clean package -Pbe -Djdk.version=1.8
-
-fe-jdk8:
- $(MAVEN_BINARY) clean package -Pfe -Djdk.version=1.8
-
-test-jdk8:
- $(MAVEN_BINARY) clean test -Djdk.version=1.8
-
-rpm-jdk8:
- $(MAVEN_BINARY) clean package -Dbuild-rpm -DskipTests -Djdk.version=1.8
-
-deb-jdk8:
- $(MAVEN_BINARY) clean package -Dbuild-deb -DskipTests -Djdk.version=1.8
-
-javadoc:
- $(MAVEN_BINARY) javadoc:javadoc
-
docker-build:
- $(MAVEN_BINARY) clean package docker:build -DskipTests -Dlogsearch.docker.tag=$(LOGSEARCH_BUILD_DOCKER_TAG)
+ $(MAVEN_BINARY) clean package docker:build -DskipTests -Dlogsearch.docker.tag=$(LOGSEARCH_BUILD_DOCKER_TAG) -Djdk.version=$(LOGSEARCH_JAVA_VERSION)
docker-push:
- $(MAVEN_BINARY) clean package docker:build docker:push -DskipTests -Dlogsearch.docker.tag=$(LOGSEARCH_BUILD_DOCKER_TAG)
+ $(MAVEN_BINARY) clean package docker:build docker:push -DskipTests -Dlogsearch.docker.tag=$(LOGSEARCH_BUILD_DOCKER_TAG) -Djdk.version=$(LOGSEARCH_JAVA_VERSION)
docker-dev-start:
cd docker && docker-compose up -d
diff --git a/ambari-logsearch-logfeeder/src/main/scripts/logfeeder.sh b/ambari-logsearch-logfeeder/src/main/scripts/logfeeder.sh
index b9141f0..37f5b00 100755
--- a/ambari-logsearch-logfeeder/src/main/scripts/logfeeder.sh
+++ b/ambari-logsearch-logfeeder/src/main/scripts/logfeeder.sh
@@ -80,7 +80,12 @@
LOGFEEDER_GC_LOGFILE="$LOG_PATH_WITHOUT_SLASH/$LOGFEEDER_GC_LOGFILE"
fi
-LOGFEEDER_GC_OPTS="-Xlog:gc*:file=$LOGFEEDER_GC_LOGFILE:time"
+java_version=$($JVM -version 2>&1 | grep 'java version' | cut -d'"' -f2 | cut -d'.' -f2)
+if [ $java_version == "8" ]; then
+ LOGFEEDER_GC_OPTS="-XX:+PrintGCDetails -XX:+PrintGCDateStamps -Xloggc:$LOGFEEDER_GC_LOGFILE"
+else
+ LOGFEEDER_GC_OPTS="-Xlog:gc*:file=$LOGFEEDER_GC_LOGFILE:time"
+fi
function print_usage() {
cat << EOF
diff --git a/ambari-logsearch-server/src/main/scripts/logsearch.sh b/ambari-logsearch-server/src/main/scripts/logsearch.sh
index 629e8f2..acd183b 100755
--- a/ambari-logsearch-server/src/main/scripts/logsearch.sh
+++ b/ambari-logsearch-server/src/main/scripts/logsearch.sh
@@ -78,7 +78,12 @@
LOGSEARCH_GC_LOGFILE="$LOG_PATH_WITHOUT_SLASH/$LOGSEARCH_GC_LOGFILE"
fi
-LOGSEARCH_GC_OPTS="-Xlog:gc*:file=$LOGSEARCH_GC_LOGFILE:time"
+java_version=$($JVM -version 2>&1 | grep 'java version' | cut -d'"' -f2 | cut -d'.' -f2)
+if [ $java_version == "8" ]; then
+ LOGSEARCH_GC_OPTS="-XX:+PrintGCDetails -XX:+PrintGCDateStamps -Xloggc:$LOGSEARCH_GC_LOGFILE"
+else
+ LOGSEARCH_GC_OPTS="-Xlog:gc*:file=$LOGSEARCH_GC_LOGFILE:time"
+fi
function print_usage() {
cat << EOF
diff --git a/pom.xml b/pom.xml
index 649cf3b..e40b81e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -76,7 +76,7 @@
</profile>
</profiles>
<properties>
- <jdk.version>11</jdk.version>
+ <jdk.version>1.8</jdk.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<python.ver>python >= 2.6</python.ver>
<deb.python.ver>python (>= 2.6)</deb.python.ver>
