Hello Noam Slomianko,
I'd like you to do a code review. Please visit
http://gerrit.ovirt.org/19967
to review the following change.
Change subject: core: Audit log failed external scheduler discovery
......................................................................
core: Audit log failed external scheduler discovery
When the external scheduler thread fails discovery no further
external operations occure.
Now we let the user know about it.
Change-Id: I198b4fd6300d903fcce55afc400a3075af1ea11c
Bug-Url: https://bugzilla.redhat.com/1001986
Signed-off-by: Noam Slomianko <[email protected]>
---
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/scheduling/external/ExternalSchedulerDiscoveryThread.java
M
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/AuditLogType.java
M
backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dal/dbbroker/auditloghandling/AuditLogDirector.java
M
backend/manager/modules/dal/src/main/resources/bundles/AuditLogMessages.properties
4 files changed, 11 insertions(+), 1 deletion(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/67/19967/1
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/scheduling/external/ExternalSchedulerDiscoveryThread.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/scheduling/external/ExternalSchedulerDiscoveryThread.java
index a85630f..e98a428 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/scheduling/external/ExternalSchedulerDiscoveryThread.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/scheduling/external/ExternalSchedulerDiscoveryThread.java
@@ -7,10 +7,13 @@
import org.apache.commons.lang.StringUtils;
import org.ovirt.engine.core.bll.scheduling.SchedulingManager;
+import org.ovirt.engine.core.common.AuditLogType;
import org.ovirt.engine.core.common.scheduling.PolicyUnit;
import org.ovirt.engine.core.common.scheduling.PolicyUnitType;
import org.ovirt.engine.core.compat.Guid;
import org.ovirt.engine.core.dal.dbbroker.DbFacade;
+import org.ovirt.engine.core.dal.dbbroker.auditloghandling.AuditLogDirector;
+import org.ovirt.engine.core.dal.dbbroker.auditloghandling.AuditLogableBase;
import org.ovirt.engine.core.dao.scheduling.PolicyUnitDao;
import org.ovirt.engine.core.utils.customprop.SimpleCustomPropertiesUtil;
import org.ovirt.engine.core.utils.log.Log;
@@ -27,7 +30,8 @@
updateDB(discoveryResult);
log.info("PolicyUnits updated");
} else {
- log.warn("Discovery returned empty result, not updating
policyunits");
+ AuditLogableBase loggable = new AuditLogableBase();
+ AuditLogDirector.log(loggable,
AuditLogType.FAILED_TO_CONNECT_TO_SCHEDULER_PROXY);
}
}
diff --git
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/AuditLogType.java
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/AuditLogType.java
index 6cc193c..789a87f 100644
---
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/AuditLogType.java
+++
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/AuditLogType.java
@@ -793,6 +793,9 @@
USER_REMOVE_CLUSTER_POLICY(9914),
USER_FAILED_TO_REMOVE_CLUSTER_POLICY(9915),
+ // external scheduler
+ FAILED_TO_CONNECT_TO_SCHEDULER_PROXY(9920),
+
//trusted service
VDS_UNTRUSTED(10000, AuditLogTimeInterval.MINUTE.getValue()),
USER_UPDATE_VM_FROM_TRUSTED_TO_UNTRUSTED(10001),
diff --git
a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dal/dbbroker/auditloghandling/AuditLogDirector.java
b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dal/dbbroker/auditloghandling/AuditLogDirector.java
index f40947c..b064bb2 100644
---
a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dal/dbbroker/auditloghandling/AuditLogDirector.java
+++
b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dal/dbbroker/auditloghandling/AuditLogDirector.java
@@ -845,6 +845,8 @@
severities.put(AuditLogType.USER_FAILED_TO_REMOVE_CLUSTER_POLICY,
AuditLogSeverity.ERROR);
severities.put(AuditLogType.USER_UPDATE_CLUSTER_POLICY,
AuditLogSeverity.NORMAL);
severities.put(AuditLogType.USER_FAILED_TO_UPDATE_CLUSTER_POLICY,
AuditLogSeverity.ERROR);
+
+ severities.put(AuditLogType.FAILED_TO_CONNECT_TO_SCHEDULER_PROXY,
AuditLogSeverity.ERROR);
}
private static void initMessages() {
diff --git
a/backend/manager/modules/dal/src/main/resources/bundles/AuditLogMessages.properties
b/backend/manager/modules/dal/src/main/resources/bundles/AuditLogMessages.properties
index 9f28bfd..c798e07 100644
---
a/backend/manager/modules/dal/src/main/resources/bundles/AuditLogMessages.properties
+++
b/backend/manager/modules/dal/src/main/resources/bundles/AuditLogMessages.properties
@@ -698,6 +698,7 @@
USER_FAILED_TO_UPDATE_CLUSTER_POLICY=Failed to update Clsuter Policy:
${ClusterPolicy}. (User: ${UserName})
USER_REMOVE_CLUSTER_POLICY=Clsuter Policy ${ClusterPolicy} was removed. (User:
${UserName})
USER_FAILED_TO_REMOVE_CLUSTER_POLICY=Failed to remove Clsuter Policy:
${ClusterPolicy}. (User: ${UserName})
+FAILED_TO_CONNECT_TO_SCHEDULER_PROXY=Failed to connect to external scheduler
proxy. External filters, scoring functions and load balancing will not be
performed.
EXTERNAL_EVENT_NORMAL=An external event with NORMAL severity has been added.
EXTERNAL_EVENT_WARNING=An external event with WARNING severity has been added.
EXTERNAL_EVENT_ERROR=An external event with ERROR severity has been added.
--
To view, visit http://gerrit.ovirt.org/19967
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I198b4fd6300d903fcce55afc400a3075af1ea11c
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: ovirt-engine-3.3
Gerrit-Owner: Gilad Chaplik <[email protected]>
Gerrit-Reviewer: Noam Slomianko <[email protected]>
_______________________________________________
Engine-patches mailing list
[email protected]
http://lists.ovirt.org/mailman/listinfo/engine-patches
