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 2016/04/05 11:48:47 UTC
ambari git commit: AMBARI-15707. Dev Deploy: Unexpected error,
database check failed.(vbrodetskyi)
Repository: ambari
Updated Branches:
refs/heads/trunk bf04d16b1 -> 074fe227b
AMBARI-15707. Dev Deploy: Unexpected error, database check failed.(vbrodetskyi)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/074fe227
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/074fe227
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/074fe227
Branch: refs/heads/trunk
Commit: 074fe227b7fb53c5d565278c83411d02cd7f1e1b
Parents: bf04d16
Author: Vitaly Brodetskyi <vb...@hortonworks.com>
Authored: Tue Apr 5 12:46:19 2016 +0300
Committer: Vitaly Brodetskyi <vb...@hortonworks.com>
Committed: Tue Apr 5 12:46:19 2016 +0300
----------------------------------------------------------------------
.../server/checks/CheckDatabaseHelper.java | 22 +++++++++++++++++---
1 file changed, 19 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/074fe227/ambari-server/src/main/java/org/apache/ambari/server/checks/CheckDatabaseHelper.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/checks/CheckDatabaseHelper.java b/ambari-server/src/main/java/org/apache/ambari/server/checks/CheckDatabaseHelper.java
index 2719b89..6ed0c08 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/checks/CheckDatabaseHelper.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/checks/CheckDatabaseHelper.java
@@ -29,6 +29,7 @@ import java.util.Set;
import org.apache.ambari.server.AmbariException;
import org.apache.ambari.server.api.services.AmbariMetaInfo;
+import org.apache.ambari.server.audit.AuditLoggerModule;
import org.apache.ambari.server.controller.ControllerModule;
import org.apache.ambari.server.orm.DBAccessor;
import org.apache.ambari.server.state.ServiceInfo;
@@ -74,9 +75,9 @@ public class CheckDatabaseHelper {
/**
* Extension of main controller module
*/
- public static class CheckHelperModule extends ControllerModule {
+ public static class CheckHelperControllerModule extends ControllerModule {
- public CheckHelperModule() throws Exception {
+ public CheckHelperControllerModule() throws Exception {
}
@Override
@@ -86,6 +87,21 @@ public class CheckDatabaseHelper {
}
}
+ /**
+ * Extension of audit logger module
+ */
+ public static class CheckHelperAuditModule extends AuditLoggerModule {
+
+ public CheckHelperAuditModule() throws Exception {
+ }
+
+ @Override
+ protected void configure() {
+ super.configure();
+ }
+
+ }
+
/*
* init method to create connection
* */
@@ -520,7 +536,7 @@ public class CheckDatabaseHelper {
try {
LOG.info("******************************* Check database started *******************************");
- Injector injector = Guice.createInjector(new CheckHelperModule());
+ Injector injector = Guice.createInjector(new CheckHelperControllerModule(), new CheckHelperAuditModule());
checkDatabaseHelper = injector.getInstance(CheckDatabaseHelper.class);
checkDatabaseHelper.startPersistenceService();