Tal Nisan has uploaded a new change for review. Change subject: core: Added log for storage connection error (#854210) ......................................................................
core: Added log for storage connection error (#854210) Added a log entry when a VDS connect to storage domains is unsuccessful which contains the failed storage domains names Change-Id: If9b452741860e97de0725334e53e3c2de53b795c Bug-Url: https://bugzilla.redhat.com/854210 Signed-off-by: Tal Nisan <[email protected]> --- M backend/manager/modules/dal/src/main/resources/bundles/AuditLogMessages.properties M backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/irsbroker/IrsBrokerCommand.java M backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/ConnectStoragePoolVDSCommand.java 3 files changed, 20 insertions(+), 1 deletion(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/99/9399/1 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 9c357de..23ed5fe 100644 --- a/backend/manager/modules/dal/src/main/resources/bundles/AuditLogMessages.properties +++ b/backend/manager/modules/dal/src/main/resources/bundles/AuditLogMessages.properties @@ -362,7 +362,7 @@ VDS_CPU_RETRIEVE_FAILED=Failed to determine Host ${VdsName} CPU level - could not retrieve CPU flags. VDS_STORAGE_CONNECTION_FAILED_BUT_LAST_VDS=Failed to connect Host ${VdsName} to Data Center, due to connectivity errors with the Storage. Host ${VdsName} will remain in Up state (but inactive), as it is the last Host in the Data Center, to enable manual intervention by the Administrator. VDS_STORAGE_VDS_STATS_FAILED=Host ${VdsName} reports about one of the Active Storage Domains as Problematic. -VDS_STORAGES_CONNECTION_FAILED=Failed to connect Host ${VdsName} to the Storage Domains ${failedStorageDomains}. +VDS_STORAGES_CONNECTION_FAILED=Failed to connect Host ${VdsName} to the Storage Domain(s) ${failedStorageDomains}. VDS_SET_NONOPERATIONAL=Host ${VdsName} moved to Non-Operational state. VDS_SET_NONOPERATIONAL_FAILED=Failed to move Host ${VdsName} to Non-Operational state. VDS_FENCE_STATUS=Host ${VdsName} power management was verified successfully. diff --git a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/irsbroker/IrsBrokerCommand.java b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/irsbroker/IrsBrokerCommand.java index a42b4b9..dce1eca 100644 --- a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/irsbroker/IrsBrokerCommand.java +++ b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/irsbroker/IrsBrokerCommand.java @@ -1319,6 +1319,11 @@ "vds {0} reported domain {1} as in problem, moving the vds to status NonOperational", vds.getvds_name(), domainIdTuple); + + AuditLogableBase logable = new AuditLogableBase(vdsId); + logable.AddCustomValue("failedStorageDomains", storageDomain.getstorage_name()); + AuditLogDirector.log(logable, AuditLogType.VDS_STORAGES_CONNECTION_FAILED); + ResourceManager .getInstance() .getEventListener() diff --git a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/ConnectStoragePoolVDSCommand.java b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/ConnectStoragePoolVDSCommand.java index e61b4d5..05dd309 100644 --- a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/ConnectStoragePoolVDSCommand.java +++ b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/ConnectStoragePoolVDSCommand.java @@ -1,7 +1,12 @@ package org.ovirt.engine.core.vdsbroker.vdsbroker; +import org.ovirt.engine.core.common.AuditLogType; +import org.ovirt.engine.core.common.businessentities.storage_domains; import org.ovirt.engine.core.common.errors.VdcBllErrors; import org.ovirt.engine.core.common.vdscommands.ConnectStoragePoolVDSCommandParameters; +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; public class ConnectStoragePoolVDSCommand<P extends ConnectStoragePoolVDSCommandParameters> extends VdsBrokerCommand<P> { @@ -27,6 +32,7 @@ case StoragePoolMasterNotFound: case StoragePoolTooManyMasters: case StoragePoolWrongMaster: + logFaultInConnectionToMasterDomain(); super.ProceedProxyReturnValue(); break; default: @@ -35,4 +41,12 @@ break; } } + + private void logFaultInConnectionToMasterDomain() { + AuditLogableBase logable = new AuditLogableBase(getParameters().getVdsId()); + storage_domains masterStorage = + DbFacade.getInstance().getStorageDomainDao().get(getParameters().getMasterDomainId()); + logable.AddCustomValue("failedStorageDomains", masterStorage.getstorage_name()); + AuditLogDirector.log(logable, AuditLogType.VDS_STORAGES_CONNECTION_FAILED); + } } -- To view, visit http://gerrit.ovirt.org/9399 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: If9b452741860e97de0725334e53e3c2de53b795c Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Tal Nisan <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
