Updated Branches: refs/heads/trunk 8e836f1b8 -> 062069479
AMBARI-3636. databaseVersion might be confusing. (Arsen Babych via odiachenko) Project: http://git-wip-us.apache.org/repos/asf/incubator-ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ambari/commit/06206947 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ambari/tree/06206947 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ambari/diff/06206947 Branch: refs/heads/trunk Commit: 062069479c4a2c6bab447fb4abead4800a66571b Parents: 8e836f1 Author: Oleksandr Diachenko <[email protected]> Authored: Thu Oct 31 17:48:49 2013 +0200 Committer: Oleksandr Diachenko <[email protected]> Committed: Thu Oct 31 17:52:52 2013 +0200 ---------------------------------------------------------------------- .../java/org/apache/ambari/server/controller/AmbariServer.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/06206947/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariServer.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariServer.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariServer.java index 7ffc3a9..274647d 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariServer.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariServer.java @@ -400,13 +400,13 @@ public class AmbariServer { protected void checkDBVersion() throws AmbariException { LOG.info("Checking DB store version"); - String databaseVersion = metainfoDAO.findByKey(Configuration.SERVER_VERSION_KEY).getMetainfoValue(); + String schemaVersion = metainfoDAO.findByKey(Configuration.SERVER_VERSION_KEY).getMetainfoValue(); String serverVersion = ambariMetaInfo.getServerVersion(); - if (! databaseVersion.equals(serverVersion)) { + if (! schemaVersion.equals(serverVersion)) { String error = "Current database store version is not compatible with " + "current server version" + ", serverVersion=" + serverVersion - + ", databaseVersion=" + databaseVersion; + + ", schemaVersion=" + schemaVersion; LOG.warn(error); throw new AmbariException(error); }
