Repository: ambari Updated Branches: refs/heads/trunk a8a723557 -> 12d19c9f8
AMBARI-15669. Upgrade to trunk fails due AuditLogger (Daniel Gergely via alejandro) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/12d19c9f Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/12d19c9f Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/12d19c9f Branch: refs/heads/trunk Commit: 12d19c9f82f66c2db19b72199d29a6691ae398a8 Parents: a8a7235 Author: Alejandro Fernandez <afernan...@hortonworks.com> Authored: Fri Apr 1 11:32:12 2016 -0700 Committer: Alejandro Fernandez <afernan...@hortonworks.com> Committed: Fri Apr 1 11:32:12 2016 -0700 ---------------------------------------------------------------------- .../org/apache/ambari/server/upgrade/SchemaUpgradeHelper.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/12d19c9f/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 1a1bacf..de1c932 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 @@ -23,6 +23,7 @@ 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.audit.AuditLoggerModule; import org.apache.ambari.server.audit.AuditLogger; import org.apache.ambari.server.audit.event.AuditEvent; import org.apache.ambari.server.configuration.Configuration; @@ -295,7 +296,7 @@ public class SchemaUpgradeHelper { System.exit(1); } - Injector injector = Guice.createInjector(new UpgradeHelperModule()); + Injector injector = Guice.createInjector(new UpgradeHelperModule(), new AuditLoggerModule()); SchemaUpgradeHelper schemaUpgradeHelper = injector.getInstance(SchemaUpgradeHelper.class); String targetVersion = schemaUpgradeHelper.getAmbariServerVersion();
