From f21ed62520fe8a8fec4f6180ebaab070b2a24598 Mon Sep 17 00:00:00 2001 From: Dhandapani Date: Mon, 6 Jun 2011 14:56:31 +0530 Subject: UI Changes - Disk to brick label changes --- .../server/resources/AlertsResource.java | 2 +- .../server/resources/RunningTaskResource.java | 4 +-- .../server/resources/VolumesResource.java | 33 +++++++++++----------- 3 files changed, 20 insertions(+), 19 deletions(-) (limited to 'src/com.gluster.storage.management.server') diff --git a/src/com.gluster.storage.management.server/src/com/gluster/storage/management/server/resources/AlertsResource.java b/src/com.gluster.storage.management.server/src/com/gluster/storage/management/server/resources/AlertsResource.java index 4283b5d6..060ce60c 100644 --- a/src/com.gluster.storage.management.server/src/com/gluster/storage/management/server/resources/AlertsResource.java +++ b/src/com.gluster.storage.management.server/src/com/gluster/storage/management/server/resources/AlertsResource.java @@ -54,7 +54,7 @@ public class AlertsResource { alert = new Alert(); alert.setId("0004"); alert.setReference("Volume3:server2:sda1"); // volume:[Disk name] - alert.setType(Alert.ALERT_TYPES.OFFLINE_VOLUME_DISKS_ALERT); + alert.setType(Alert.ALERT_TYPES.OFFLINE_VOLUME_BRICKS_ALERT); alert.setMessage(alert.getAlertType(alert.getType()) + " in volume [" + alert.getReference().split(":")[0] + "] disk [" + alert.getReference().split(":")[1] + ":" + alert.getReference().split(":")[2] + "]"); alerts.add(alert); diff --git a/src/com.gluster.storage.management.server/src/com/gluster/storage/management/server/resources/RunningTaskResource.java b/src/com.gluster.storage.management.server/src/com/gluster/storage/management/server/resources/RunningTaskResource.java index 10ce5da3..c9eb0ecd 100644 --- a/src/com.gluster.storage.management.server/src/com/gluster/storage/management/server/resources/RunningTaskResource.java +++ b/src/com.gluster.storage.management.server/src/com/gluster/storage/management/server/resources/RunningTaskResource.java @@ -76,10 +76,10 @@ public class RunningTaskResource { // MigrateDisk task = new RunningTask(); task.setId("0003"); - task.setType(RunningTask.TASK_TYPES.DISK_MIGRATE); + task.setType(RunningTask.TASK_TYPES.BRICK_MIGRATE); task.setReference("Volume3:server1:sda1"); // Disk reference task.setTaskInfo(task.getTaskType(task.getType()) + " for volume [" + task.getReference().split(":")[0] - + "] disk [" + task.getReference().split(":")[1] + ":" + task.getReference().split(":")[2] + "]"); + + "] brick [" + task.getReference().split(":")[1] + ":" + task.getReference().split(":")[2] + "]"); task.setStatus(taskStatus); runningTasks.add(task); diff --git a/src/com.gluster.storage.management.server/src/com/gluster/storage/management/server/resources/VolumesResource.java b/src/com.gluster.storage.management.server/src/com/gluster/storage/management/server/resources/VolumesResource.java index d16f7678..92a4e0cf 100644 --- a/src/com.gluster.storage.management.server/src/com/gluster/storage/management/server/resources/VolumesResource.java +++ b/src/com.gluster.storage.management.server/src/com/gluster/storage/management/server/resources/VolumesResource.java @@ -75,9 +75,9 @@ import com.gluster.storage.management.core.exceptions.ConnectionException; import com.gluster.storage.management.core.exceptions.GlusterRuntimeException; import com.gluster.storage.management.core.model.Brick; import com.gluster.storage.management.core.model.GlusterServer; -import com.gluster.storage.management.core.model.LogMessage; import com.gluster.storage.management.core.model.Status; import com.gluster.storage.management.core.model.Volume; +import com.gluster.storage.management.core.model.VolumeLogMessage; import com.gluster.storage.management.core.response.GenericResponse; import com.gluster.storage.management.core.response.LogMessageListResponse; import com.gluster.storage.management.core.response.VolumeListResponse; @@ -385,7 +385,7 @@ public class VolumesResource { return new Status(Status.STATUS_CODE_SUCCESS, "Directories cleaned up successfully!"); } - private List getBrickLogs(Volume volume, Brick brick, Integer lineCount) + private List getBrickLogs(Volume volume, Brick brick, Integer lineCount) throws GlusterRuntimeException { String logDir = glusterUtil.getLogLocation(volume.getName(), brick.getQualifiedName(), brick.getServerName()); String logFileName = glusterUtil.getLogFileNameForBrickDir(brick.getBrickDirectory()); @@ -408,9 +408,10 @@ public class VolumesResource { } // populate disk and trim other fields - List logMessages = response.getLogMessages(); - for (LogMessage logMessage : logMessages) { + List logMessages = response.getLogMessages(); + for (VolumeLogMessage logMessage : logMessages) { logMessage.setDisk(brick.getDiskName()); + logMessage.setBrickDirectory(brick.getBrickDirectory()); logMessage.setMessage(logMessage.getMessage().trim()); logMessage.setSeverity(logMessage.getSeverity().trim()); } @@ -473,7 +474,7 @@ public class VolumesResource { @QueryParam(QUERY_PARAM_TO_TIMESTAMP) String toTimestamp, @QueryParam(QUERY_PARAM_LINE_COUNT) Integer lineCount, @QueryParam(QUERY_PARAM_DOWNLOAD) Boolean download) { - List logMessages = null; + List logMessages = null; try { // TODO: Fetch logs from brick(s) of given cluster only @@ -498,7 +499,7 @@ public class VolumesResource { return new LogMessageListResponse(Status.STATUS_SUCCESS, logMessages); } - private void filterLogsByTime(List logMessages, String fromTimestamp, String toTimestamp) { + private void filterLogsByTime(List logMessages, String fromTimestamp, String toTimestamp) { Date fromTime = null, toTime = null; if (fromTimestamp != null && !fromTimestamp.isEmpty()) { @@ -509,8 +510,8 @@ public class VolumesResource { toTime = DateUtil.stringToDate(toTimestamp); } - List messagesToRemove = new ArrayList(); - for (LogMessage logMessage : logMessages) { + List messagesToRemove = new ArrayList(); + for (VolumeLogMessage logMessage : logMessages) { Date logTimestamp = logMessage.getTimestamp(); if (fromTime != null && logTimestamp.before(fromTime)) { messagesToRemove.add(logMessage); @@ -524,13 +525,13 @@ public class VolumesResource { logMessages.removeAll(messagesToRemove); } - private void filterLogsBySeverity(List logMessages, String severity) { + private void filterLogsBySeverity(List logMessages, String severity) { if (severity == null || severity.isEmpty()) { return; } - List messagesToRemove = new ArrayList(); - for (LogMessage logMessage : logMessages) { + List messagesToRemove = new ArrayList(); + for (VolumeLogMessage logMessage : logMessages) { if (!logMessage.getSeverity().equals(severity)) { messagesToRemove.add(logMessage); } @@ -538,18 +539,18 @@ public class VolumesResource { logMessages.removeAll(messagesToRemove); } - private List getLogsForAllBricks(Volume volume, Integer lineCount) { - List logMessages; - logMessages = new ArrayList(); + private List getLogsForAllBricks(Volume volume, Integer lineCount) { + List logMessages; + logMessages = new ArrayList(); // fetch logs for every brick of the volume for (Brick brick : volume.getBricks()) { logMessages.addAll(getBrickLogs(volume, brick, lineCount)); } // Sort the log messages based on log timestamp - Collections.sort(logMessages, new Comparator() { + Collections.sort(logMessages, new Comparator() { @Override - public int compare(LogMessage message1, LogMessage message2) { + public int compare(VolumeLogMessage message1, VolumeLogMessage message2) { return message1.getTimestamp().compareTo(message2.getTimestamp()); } }); -- cgit