Shubhendu Tripathi has uploaded a new change for review. Change subject: gluster: Corrected event log msg for add brick ......................................................................
gluster: Corrected event log msg for add brick Corrected event logging during add bricks to a volume. Earlier it was nto showing the details of the bricks being added. Now details of individual bricks being added are displayed and finally a summary of total added bricks is displayed in the event audit logs. Change-Id: I05054de122a916d25c14adc05efdc484a0c133f1 Bug-Url: https://bugzilla.redhat.com/957003 Signed-off-by: Shubhendu Tripathi <shtri...@redhat.com> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/AddBricksToGlusterVolumeCommand.java 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/constants/gluster/GlusterConstants.java M backend/manager/modules/dal/src/main/resources/bundles/AuditLogMessages.properties 4 files changed, 41 insertions(+), 1 deletion(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/64/15664/1 diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/AddBricksToGlusterVolumeCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/AddBricksToGlusterVolumeCommand.java index 33406d5..ce58f5b 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/AddBricksToGlusterVolumeCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/AddBricksToGlusterVolumeCommand.java @@ -1,7 +1,9 @@ package org.ovirt.engine.core.bll.gluster; import java.util.ArrayList; +import java.util.HashMap; import java.util.List; +import java.util.Map; import org.ovirt.engine.core.bll.Backend; import org.ovirt.engine.core.bll.LockIdNameAttribute; @@ -12,11 +14,13 @@ import org.ovirt.engine.core.common.businessentities.gluster.GlusterStatus; import org.ovirt.engine.core.common.businessentities.gluster.GlusterVolumeEntity; import org.ovirt.engine.core.common.businessentities.gluster.GlusterVolumeType; +import org.ovirt.engine.core.common.constants.gluster.GlusterConstants; import org.ovirt.engine.core.common.errors.VdcBllMessages; import org.ovirt.engine.core.common.vdscommands.VDSCommandType; import org.ovirt.engine.core.common.vdscommands.VDSReturnValue; import org.ovirt.engine.core.common.vdscommands.gluster.GlusterVolumeBricksActionVDSParameters; import org.ovirt.engine.core.compat.Guid; +import org.ovirt.engine.core.dal.dbbroker.auditloghandling.gluster.GlusterAuditLogUtil; @NonTransactiveCommandAttribute @LockIdNameAttribute(isWait = true) @@ -24,6 +28,18 @@ public AddBricksToGlusterVolumeCommand(GlusterVolumeBricksActionParameters params) { super(params); + } + + @Override + public Map<String, String> getCustomValues() { + int noOfBricks = 0; + + if (getParameters().getBricks() != null) { + noOfBricks = getParameters().getBricks().size(); + } + + addCustomValue(GlusterConstants.NO_OF_BRICKS, String.valueOf(noOfBricks)); + return super.getCustomValues(); } @Override @@ -79,6 +95,7 @@ if (getSucceeded()) { addGlusterVolumeBricksInDb(getParameters().getBricks()); + logAuditMessages(getParameters().getBricks()); getReturnValue().setActionReturnValue(getBrickIds(getParameters().getBricks())); } else { handleVdsError(AuditLogType.GLUSTER_VOLUME_ADD_BRICK_FAILED, returnValue.getVdsError().getMessage()); @@ -86,6 +103,23 @@ } } + private void logAuditMessages(List<GlusterBrickEntity> bricks) { + GlusterAuditLogUtil logUtil = GlusterAuditLogUtil.getInstance(); + for (final GlusterBrickEntity brick : bricks) { + logUtil.logAuditMessage(null, + null, + null, + AuditLogType.GLUSTER_VOLUME_BRICK_ADDED, + new HashMap<String, String>() { + { + put(GlusterConstants.BRICK_PATH, brick.getBrickDirectory()); + put(GlusterConstants.SERVERE_NAME, brick.getServerName()); + put(GlusterConstants.VOLUME_NAME, getGlusterVolumeName()); + } + }); + } + } + private List<Guid> getBrickIds(List<GlusterBrickEntity> bricks) { List<Guid> brickIds = new ArrayList<Guid>(); for (GlusterBrickEntity brick : bricks) { 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 6a6efba..00f4f0c 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 @@ -271,6 +271,7 @@ GLUSTER_SERVICES_LIST_NOT_FETCHED(4071), GLUSTER_SERVICE_RESTARTED(4072), GLUSTER_SERVICE_RESTART_FAILED(4073), + GLUSTER_VOLUME_BRICK_ADDED(4074), USER_VDS_RESTART(41), USER_FAILED_VDS_RESTART(107), diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/constants/gluster/GlusterConstants.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/constants/gluster/GlusterConstants.java index 2c29aad..45a9ed1 100644 --- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/constants/gluster/GlusterConstants.java +++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/constants/gluster/GlusterConstants.java @@ -12,6 +12,10 @@ public static final int DEFAULT_REPLICA_COUNT = 2; public static final int DEFAULT_STRIPE_COUNT = 4; + public static final String NO_OF_BRICKS = "NoOfBricks"; + public static final String BRICK_PATH = "brickpath"; + public static final String SERVERE_NAME = "servername"; + public static final String VOLUME_NAME = "glustervolumename"; // Variables used in audit messages. // Keep the values lowercase to avoid call to String#toLowerCase() 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 772ea2e..39cfa37 100644 --- a/backend/manager/modules/dal/src/main/resources/bundles/AuditLogMessages.properties +++ b/backend/manager/modules/dal/src/main/resources/bundles/AuditLogMessages.properties @@ -571,7 +571,7 @@ GLUSTER_VOLUME_DELETE_FAILED=Could not delete Gluster Volume ${glusterVolumeName}. GLUSTER_VOLUME_REMOVE_BRICKS=Gluster Volume ${glusterVolumeName} Bricks removed. GLUSTER_VOLUME_REMOVE_BRICKS_FAILED=Could not remove Gluster Volume ${glusterVolumeName} Bricks. -GLUSTER_VOLUME_ADD_BRICK=Volume brick(s) added to volume ${glusterVolumeName}. +GLUSTER_VOLUME_ADD_BRICK= ${NoOfBricks} volume brick(s) added to volume ${glusterVolumeName}. GLUSTER_VOLUME_ADD_BRICK_FAILED=Gluster Volume ${glusterVolumeName} add brick failed. GLUSTER_VOLUME_REBALANCE_START=Gluster Volume ${glusterVolumeName} rebalance started. GLUSTER_VOLUME_REBALANCE_START_FAILED=Could not start Gluster Volume ${glusterVolumeName} rebalance. @@ -633,3 +633,4 @@ GLUSTER_SERVICES_LIST_NOT_FETCHED=Could not fetch list of services from ${ServiceGroupType} named ${ServiceGroupName}. GLUSTER_SERVICE_RESTARTED=SWIFT services re-started on ${ServiceGroupType} ${ServiceGroupName}. GLUSTER_SERVICE_RESTART_FAILED=Could not re-start SWIF services on ${ServiceGroupType} ${ServiceGroupName}. +GLUSTER_VOLUME_BRICK_ADDED=Brick [${brickpath}] on host [${servername}] added to volume [${glusterVolumeName}] \ No newline at end of file -- To view, visit http://gerrit.ovirt.org/15664 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I05054de122a916d25c14adc05efdc484a0c133f1 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Shubhendu Tripathi <shtri...@redhat.com> _______________________________________________ Engine-patches mailing list Engine-patches@ovirt.org http://lists.ovirt.org/mailman/listinfo/engine-patches
