You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by vb...@apache.org on 2015/06/12 12:54:06 UTC
ambari git commit: AMBARI-11872. Ambari Server need to check Java
version on upgrade.(vbrodetskyi)
Repository: ambari
Updated Branches:
refs/heads/trunk f1c17475f -> 6dbe315f9
AMBARI-11872. Ambari Server need to check Java version on upgrade.(vbrodetskyi)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/6dbe315f
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/6dbe315f
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/6dbe315f
Branch: refs/heads/trunk
Commit: 6dbe315f9ab47fead66eeff5daea61dbfe8dee88
Parents: f1c1747
Author: Vitaly Brodetskyi <vb...@hortonworks.com>
Authored: Fri Jun 12 05:31:21 2015 +0300
Committer: Vitaly Brodetskyi <vb...@hortonworks.com>
Committed: Fri Jun 12 05:31:21 2015 +0300
----------------------------------------------------------------------
.../server/configuration/Configuration.java | 24 ++++++------
.../server/upgrade/SchemaUpgradeHelper.java | 39 +++++++++++---------
2 files changed, 33 insertions(+), 30 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/6dbe315f/ambari-server/src/main/java/org/apache/ambari/server/configuration/Configuration.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/configuration/Configuration.java b/ambari-server/src/main/java/org/apache/ambari/server/configuration/Configuration.java
index dc6089a..519c416 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/configuration/Configuration.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/configuration/Configuration.java
@@ -17,16 +17,8 @@
*/
package org.apache.ambari.server.configuration;
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.EnumSet;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Map.Entry;
-import java.util.Properties;
-
+import com.google.inject.Inject;
+import com.google.inject.Singleton;
import org.apache.ambari.server.AmbariException;
import org.apache.ambari.server.orm.JPATableGenerationStrategy;
import org.apache.ambari.server.orm.PersistenceType;
@@ -41,8 +33,15 @@ import org.apache.commons.lang.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import com.google.inject.Inject;
-import com.google.inject.Singleton;
+import java.io.File;
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.EnumSet;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.Properties;
/**
@@ -112,6 +111,7 @@ public class Configuration {
public static final String JAVA_HOME_KEY = "java.home";
public static final String JDK_NAME_KEY = "jdk.name";
public static final String JCE_NAME_KEY = "jce.name";
+ public static final float JDK_MIN_VERSION = 1.7f;
public static final String CLIENT_SECURITY_KEY = "client.security";
public static final String CLIENT_API_PORT_KEY = "client.api.port";
public static final String CLIENT_API_SSL_PORT_KEY = "client.api.ssl.port";
http://git-wip-us.apache.org/repos/asf/ambari/blob/6dbe315f/ambari-server/src/main/java/org/apache/ambari/server/upgrade/SchemaUpgradeHelper.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/upgrade/SchemaUpgradeHelper.java b/ambari-server/src/main/java/org/apache/ambari/server/upgrade/SchemaUpgradeHelper.java
index f1ff33f..8430684 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/upgrade/SchemaUpgradeHelper.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/upgrade/SchemaUpgradeHelper.java
@@ -17,32 +17,26 @@
*/
package org.apache.ambari.server.upgrade;
-import java.io.File;
-import java.io.IOException;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-import java.util.Properties;
-import java.util.Set;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
+import com.google.inject.Guice;
+import com.google.inject.Inject;
+import com.google.inject.Injector;
+import com.google.inject.multibindings.Multibinder;
+import com.google.inject.persist.PersistService;
import org.apache.ambari.server.AmbariException;
import org.apache.ambari.server.configuration.Configuration;
import org.apache.ambari.server.controller.ControllerModule;
import org.apache.ambari.server.orm.DBAccessor;
import org.apache.ambari.server.utils.VersionUtils;
-import org.apache.commons.io.FileUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import com.google.inject.Guice;
-import com.google.inject.Inject;
-import com.google.inject.Injector;
-import com.google.inject.multibindings.Multibinder;
-import com.google.inject.persist.PersistService;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.Properties;
+import java.util.Set;
public class SchemaUpgradeHelper {
private static final Logger LOG = LoggerFactory.getLogger
@@ -253,6 +247,15 @@ public class SchemaUpgradeHelper {
*/
public static void main(String[] args) throws Exception {
try {
+ // check java version to be higher then 1.6
+ String[] splittedJavaVersion = System.getProperty("java.version").split("\\.");
+ float javaVersion = Float.parseFloat(splittedJavaVersion[0] + "." + splittedJavaVersion[1]);
+ if (javaVersion < Configuration.JDK_MIN_VERSION) {
+ LOG.error(String.format("Oracle JDK version is lower then %.1f It can cause problems during upgrade process. Please," +
+ " use 'ambari-server setup' command to upgrade JDK!", Configuration.JDK_MIN_VERSION));
+ System.exit(1);
+ }
+
Injector injector = Guice.createInjector(new UpgradeHelperModule());
SchemaUpgradeHelper schemaUpgradeHelper = injector.getInstance(SchemaUpgradeHelper.class);