Greg Padgett has uploaded a new change for review. Change subject: core: Alert text for deprecated NFS mount options in vdsm.conf (#826921) ......................................................................
core: Alert text for deprecated NFS mount options in vdsm.conf (#826921) https://bugzilla.redhat.com/826921 The option 'nfs_mount_options' in vdsm.conf is deprecated. VDSM will send an alert to the engine if this option is used. Change-Id: I35bb6504454ce32078ed367ff0c4930f5718417f Signed-off-by: Greg Padgett <[email protected]> --- M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/AuditLogType.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/errors/VdcBllErrors.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 M backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/irsbroker/IrsBrokerCommand.java 5 files changed, 7 insertions(+), 0 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/58/7658/1 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 47ac8cf..89329cb 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 @@ -585,6 +585,7 @@ STORAGE_ALERT_SMALL_VG_METADATA(1000, AuditLogTimeInterval.MINUTE.getValue() * 10), USER_ATTACH_STORAGE_DOMAINS_TO_POOL(1002), USER_ATTACH_STORAGE_DOMAINS_TO_POOL_FAILED(1003), + STORAGE_ALERT_DEPRECATED_NFS_OPTIONS(1004, AuditLogTimeInterval.HOUR.getValue() * 12), RELOAD_CONFIGURATIONS_SUCCESS(1010), RELOAD_CONFIGURATIONS_FAILURE(1011), diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/errors/VdcBllErrors.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/errors/VdcBllErrors.java index 895a7f5..3231a6b 100644 --- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/errors/VdcBllErrors.java +++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/errors/VdcBllErrors.java @@ -175,6 +175,7 @@ PoolUpgradeInProgress(396), NoSpaceLeftOnDomain(397), MixedSDVersionError(398), + DEPRECATED_NFS_OPTIONS(399), InvalidTask(400), UnknownTask(401), TaskClearError(402), 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 fc20760..cbee1be 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 @@ -356,6 +356,7 @@ mSeverities.put(AuditLogType.REFRESH_REPOSITORY_FILE_LIST_FAILED, AuditLogSeverity.ERROR); mSeverities.put(AuditLogType.STORAGE_ALERT_VG_METADATA_CRITICALLY_FULL, AuditLogSeverity.ERROR); mSeverities.put(AuditLogType.STORAGE_ALERT_SMALL_VG_METADATA, AuditLogSeverity.WARNING); + mSeverities.put(AuditLogType.STORAGE_ALERT_DEPRECATED_NFS_OPTIONS, AuditLogSeverity.WARNING); mSeverities.put(AuditLogType.STORAGE_ACTIVATE_ASYNC, AuditLogSeverity.NORMAL); mSeverities.put(AuditLogType.SYSTEM_CHANGE_STORAGE_POOL_STATUS_RESET_IRS, AuditLogSeverity.NORMAL); mSeverities.put(AuditLogType.USER_ACTIVATED_STORAGE_DOMAIN_ASYNC, AuditLogSeverity.NORMAL); 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 3aca230..0422dcf 100644 --- a/backend/manager/modules/dal/src/main/resources/bundles/AuditLogMessages.properties +++ b/backend/manager/modules/dal/src/main/resources/bundles/AuditLogMessages.properties @@ -511,6 +511,7 @@ CANNOT_HIBERNATE_RUNNING_VMS_AFTER_CLUSTER_CPU_UPGRADE=Hibernation of VMs after CPU upgrade of Cluster ${VdsGroup} is not supported. Please stop and restart those VMs in case you wish to hibernate them STORAGE_ALERT_VG_METADATA_CRITICALLY_FULL=The system has reached the 80% watermark on the VG metadata area size on ${StorageDomainName}.\nThis is due to a high number of Vdisks or large Vdisks size allocated on this specific VG. STORAGE_ALERT_SMALL_VG_METADATA=The allocated VG metadata area size is smaller than 50MB on ${StorageDomainName},\nwhich might limit its capacity (the number of Vdisks and/or their size).\nPlease refer to the GSS knowledge base to understand the issue and how to resolve it. +STORAGE_ALERT_DEPRECATED_NFS_OPTIONS=Using deprecated nfs_mount_options parameter from vdsm.conf on ${StorageDomainName}.\nThis parameter will continue to be supported in versions 3.x, but will be removed\nin version 4.0 of oVirt. Please upgrade domains to V3 or greater and set the\nparameters from the GUI to ensure compatibility with future versions. RELOAD_CONFIGURATIONS_SUCCESS=System Configurations reloaded successfully. RELOAD_CONFIGURATIONS_FAILURE=System Configurations failed to reload. USER_ACCOUNT_DISABLED_OR_LOCKED=User ${UserName} cannot login, as it got disabled or locked. Please contact the system administrator. 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 6f88e59..78bc3e7 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 @@ -438,6 +438,9 @@ case SMALL_VG_METADATA : AuditLogDirector.log(logable, AuditLogType.STORAGE_ALERT_SMALL_VG_METADATA); break; + case DEPRECATED_NFS_OPTIONS: + AuditLogDirector.log(logable, AuditLogType.STORAGE_ALERT_DEPRECATED_NFS_OPTIONS); + break; default: log.errorFormat("Unrecognized alert for domain {0}(id = {1}): {2}", data.getstorage_name(), -- To view, visit http://gerrit.ovirt.org/7658 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I35bb6504454ce32078ed367ff0c4930f5718417f Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Greg Padgett <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
