Sahina Bose has uploaded a new change for review.
Change subject: engine: Fixed geo-rep auditlog issue
......................................................................
engine: Fixed geo-rep auditlog issue
Fixed a startup error logged due to missing
AuditLogType and AuditLogMessages
Change-Id: I7f6a110fd4d06d83bd16fcae9bff51201ca8140c
Signed-off-by: Sahina Bose <sab...@redhat.com>
---
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/DeleteGeoRepSessionCommand.java
M
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/AuditLogType.java
M
backend/manager/modules/dal/src/main/resources/bundles/AuditLogMessages.properties
M
frontend/webadmin/modules/uicompat/src/main/java/org/ovirt/engine/ui/uicompat/LocalizedEnums.java
M
frontend/webadmin/modules/uicompat/src/main/resources/org/ovirt/engine/ui/uicompat/LocalizedEnums.properties
5 files changed, 12 insertions(+), 5 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/77/39677/1
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/DeleteGeoRepSessionCommand.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/DeleteGeoRepSessionCommand.java
index cedd56d..573335a 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/DeleteGeoRepSessionCommand.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/DeleteGeoRepSessionCommand.java
@@ -52,7 +52,7 @@
@Override
public AuditLogType getAuditLogTypeValue() {
if (getSucceeded()) {
- return AuditLogType.GEOREP_SESSION_DELETE;
+ return AuditLogType.GEOREP_SESSION_DELETED;
} else {
return errorType == null ?
AuditLogType.GEOREP_SESSION_DELETE_FAILED : errorType;
}
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 50fac2a..70a7981 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
@@ -394,7 +394,7 @@
GLUSTER_GEOREP_SESSION_REFRESH_FAILED(4100, AuditLogSeverity.ERROR),
GEOREP_SESSION_STOP(4101),
GEOREP_SESSION_STOP_FAILED(4102, AuditLogSeverity.ERROR),
- GEOREP_SESSION_DELETE(4103),
+ GEOREP_SESSION_DELETED(4103),
GEOREP_SESSION_DELETE_FAILED(4104, AuditLogSeverity.ERROR),
GLUSTER_GEOREP_CONFIG_SET(4105),
GLUSTER_GEOREP_CONFIG_SET_FAILED(4106, AuditLogSeverity.ERROR),
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 a85b512..7f2b178 100644
---
a/backend/manager/modules/dal/src/main/resources/bundles/AuditLogMessages.properties
+++
b/backend/manager/modules/dal/src/main/resources/bundles/AuditLogMessages.properties
@@ -822,6 +822,8 @@
GLUSTER_GEOREP_CONFIG_SET_FAILED=Failed to set the configuration ${key} to
${value} on geo-rep session ${geoRepSessionKey}.
GLUSTER_GEOREP_CONFIG_SET_DEFAULT=Configuration of ${key} of session
${geoRepSessionKey} reset to its default value .
GLUSTER_GEOREP_CONFIG_SET_DEFAULT_FAILED=Failed to set ${key} of session
${geoRepSessionKey} to its default value.
+GLUSTER_GEOREP_CONFIG_LIST=Refreshed configuration options for geo-replication
session ${geoRepSessionKey}
+GLUSTER_GEOREP_CONFIG_LIST_FAILED=Failed to refresh configuration options for
geo-replication session ${geoRepSessionKey}
GLUSTER_VOLUME_SNAPSHOT_DELETED=Gluster volume snapshot ${snapname} deleted.
GLUSTER_VOLUME_SNAPSHOT_DELETE_FAILED=Failed to delete gluster volume snapshot
${snapname}.
GLUSTER_VOLUME_ALL_SNAPSHOTS_DELETED=Deleted all the gluster volume snapshots
for the volume ${glusterVolumeName}.
diff --git
a/frontend/webadmin/modules/uicompat/src/main/java/org/ovirt/engine/ui/uicompat/LocalizedEnums.java
b/frontend/webadmin/modules/uicompat/src/main/java/org/ovirt/engine/ui/uicompat/LocalizedEnums.java
index b56dc2b..68718d1 100644
---
a/frontend/webadmin/modules/uicompat/src/main/java/org/ovirt/engine/ui/uicompat/LocalizedEnums.java
+++
b/frontend/webadmin/modules/uicompat/src/main/java/org/ovirt/engine/ui/uicompat/LocalizedEnums.java
@@ -445,7 +445,7 @@
String AuditLogType___GEOREP_SESSION_STOP_FAILED();
- String AuditLogType___GEOREP_SESSION_DELETE();
+ String AuditLogType___GEOREP_SESSION_DELETED();
String AuditLogType___GEOREP_SESSION_DELETE_FAILED();
@@ -461,6 +461,10 @@
String AuditLogType___GLUSTER_GEOREP_CONFIG_SET_DEFAULT_FAILED();
+ String AuditLogType___GLUSTER_GEOREP_CONFIG_LIST();
+
+ String AuditLogType___GLUSTER_GEOREP_CONFIG_LIST_FAILED();
+
String AuditLogType___GLUSTER_VOLUME_SNAPSHOT_DELETED();
String AuditLogType___GLUSTER_VOLUME_SNAPSHOT_DELETE_FAILED();
diff --git
a/frontend/webadmin/modules/uicompat/src/main/resources/org/ovirt/engine/ui/uicompat/LocalizedEnums.properties
b/frontend/webadmin/modules/uicompat/src/main/resources/org/ovirt/engine/ui/uicompat/LocalizedEnums.properties
index c8f981f..4c11a9f 100644
---
a/frontend/webadmin/modules/uicompat/src/main/resources/org/ovirt/engine/ui/uicompat/LocalizedEnums.properties
+++
b/frontend/webadmin/modules/uicompat/src/main/resources/org/ovirt/engine/ui/uicompat/LocalizedEnums.properties
@@ -218,7 +218,7 @@
AuditLogType___GLUSTER_GEOREP_SESSION_REFRESH_FAILED=Failed to refresh
geo-replication sessions for volume.
AuditLogType___GEOREP_SESSION_STOP=Geo-replication session stopped on volume
AuditLogType___GEOREP_SESSION_STOP_FAILED=Failed to stop geo-replication
session on volume
-AuditLogType___GEOREP_SESSION_DELETE=Geo-replication session deleted on volume
+AuditLogType___GEOREP_SESSION_DELETED=Geo-replication session deleted on volume
AuditLogType___GEOREP_SESSION_DELETE_FAILED=Failed to delete geo-replication
session on volume
AuditLogType___GEOREP_SESSION_START=Geo-replication session started on volume
AuditLogType___GEOREP_SESSION_START_FAILED=Failed to start geo-replication
session on volume
@@ -228,7 +228,8 @@
AuditLogType___GLUSTER_GEOREP_CONFIG_SET_FAILED=Failed to set the
configuration on geo-rep session.
AuditLogType___GLUSTER_GEOREP_CONFIG_SET_DEFAULT=Configuration has been reset
to its default value.
AuditLogType___GLUSTER_GEOREP_CONFIG_SET_DEFAULT_FAILED=Failed to reset the
configuration to its default value.
-
+AuditLogType___GLUSTER_GEOREP_CONFIG_LIST=Refreshed configuration options for
geo-replication session.
+AuditLogType___GLUSTER_GEOREP_CONFIG_LIST_FAILED=Failed to refresh
configuration options for geo-replication session.
AuditLogType___GLUSTER_VOLUME_SNAPSHOT_DELETED=Snapshot deleted on volume
AuditLogType___GLUSTER_VOLUME_SNAPSHOT_DELETE_FAILED=Failed to delete snapshot
on volume
AuditLogType___GLUSTER_VOLUME_ALL_SNAPSHOTS_DELETED=All the snapshots deleted
on the volume
--
To view, visit https://gerrit.ovirt.org/39677
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I7f6a110fd4d06d83bd16fcae9bff51201ca8140c
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: ovirt-engine-3.5-gluster
Gerrit-Owner: Sahina Bose <sab...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches
