From 85575ed19b0e76b4067636f007a14ef86adc906f Mon Sep 17 00:00:00 2001 From: Tim Date: Thu, 9 Jun 2011 16:20:58 +0530 Subject: Bug fixed in vmware-discover-servers.py. Added timestamp to check recent response. --- .../src/multicast_response.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'src/com.gluster.storage.management.server.scripts') diff --git a/src/com.gluster.storage.management.server.scripts/src/multicast_response.py b/src/com.gluster.storage.management.server.scripts/src/multicast_response.py index baa3f830..3d8125d8 100644 --- a/src/com.gluster.storage.management.server.scripts/src/multicast_response.py +++ b/src/com.gluster.storage.management.server.scripts/src/multicast_response.py @@ -52,7 +52,8 @@ def response(multiCastGroup, port): if isinpeer(): time.sleep(5) continue - socketSend.sendto(socket.gethostname(), (multiCastGroup, port)) + socketSend.sendto("%s" % (socket.gethostname(), time.time()), + (multiCastGroup, port)) request = None def main(): -- cgit From e7438d4a3e5990c69820f37c80bd4c9a53247ef8 Mon Sep 17 00:00:00 2001 From: Tim Date: Thu, 9 Jun 2011 17:33:01 +0530 Subject: Updated clear_volume_directory.py based on requirement changes Updated function to clear volume directory using disk mount point and volume name --- .../src/DiskUtils.py | 16 +++++++++++ .../src/clear_volume_directory.py | 31 ++++++++++------------ 2 files changed, 30 insertions(+), 17 deletions(-) (limited to 'src/com.gluster.storage.management.server.scripts') diff --git a/src/com.gluster.storage.management.server.scripts/src/DiskUtils.py b/src/com.gluster.storage.management.server.scripts/src/DiskUtils.py index 0e42bba2..69417f88 100644 --- a/src/com.gluster.storage.management.server.scripts/src/DiskUtils.py +++ b/src/com.gluster.storage.management.server.scripts/src/DiskUtils.py @@ -210,6 +210,22 @@ def readFsTab(fsTabFile=Globals.FSTAB_FILE): return fsTabEntryList +def checkDiskMountPoint(diskMountPoint): + try: + fstabEntries = open(Globals.FSTAB_FILE).readlines() + except IOError: + fstabEntries = [] + found = False + for entry in fstabEntries: + entry = entry.strip() + if not entry: + continue + entries = entry.split() + if entries and len(entries) > 1 and entries[0].startswith("UUID=") and entries[1].upper() == diskMountPoint.upper(): + return True + return False + + def getMountPointByUuid(partitionUuid): # check uuid in etc/fstab try: diff --git a/src/com.gluster.storage.management.server.scripts/src/clear_volume_directory.py b/src/com.gluster.storage.management.server.scripts/src/clear_volume_directory.py index 3bd0ab6f..6cf2ef38 100755 --- a/src/com.gluster.storage.management.server.scripts/src/clear_volume_directory.py +++ b/src/com.gluster.storage.management.server.scripts/src/clear_volume_directory.py @@ -25,28 +25,26 @@ import Utils import Common from optparse import OptionParser -def clearVolumeDirectory(disk, volumeName, todelete): - - # Retrieving disk uuid - diskUuid = DiskUtils.getUuidByDiskPartition(DiskUtils.getDevice(disk)) - +def clearVolumeDirectory(diskMountPoint, volumeName, todelete): rs = ResponseXml() - if not diskUuid: - Common.log(syslog.LOG_ERR, "failed to find disk:%s uuid" % disk) + if not DiskUtils.checkDiskMountPoint(diskMountPoint): + Common.log(syslog.LOG_ERR, "failed to find disk mount point %s" % diskMountPoint) rs.appendTagRoute("status.code", "-1") - rs.appendTagRoute("status.message", "Error: Unable to find disk uuid") + rs.appendTagRoute("status.message", "Error: Mount point does not exists") return rs.toprettyxml() - # Retrieving disk mount point using disk uuid - diskMountPoint = DiskUtils.getMountPointByUuid(diskUuid) if not os.path.exists(diskMountPoint): - Common.log(syslog.LOG_ERR, "failed to retrieve disk:%s mount point" % disk) - rs.appendTagRoute("status.code", "-1") - rs.appendTagRoute("status.message", "Error: Failed to retrieve disk details") + rs.appendTagRoute("status.code", "-2") + rs.appendTagRoute("status.message", "Error: Mount point path does not exists") return rs.toprettyxml() # clear volume directory from the disk volumeDirectory = "%s/%s" % (diskMountPoint, volumeName) + if not os.path.exists(volumeDirectory): + rs.appendTagRoute("status.code", "-3") + rs.appendTagRoute("status.message", "Error: Volume directory does not exists") + return rs.toprettyxml() + newVolumeDirectoryName = "%s_%s" % (volumeDirectory, time.time()) command = ["sudo", "mv", "-f", volumeDirectory, newVolumeDirectoryName] rv = Utils.runCommandFG(command, stdout=True, root=True) @@ -88,14 +86,13 @@ def main(): (options, args) = parser.parse_args() if len(args) != 2: - print >> sys.stderr, "usage: %s [-d/--delete]" % sys.argv[0] + print >> sys.stderr, "usage: %s [-d/--delete]" % sys.argv[0] sys.exit(-1) - disk = args[0] + diskMountPoint = args[0] volumeName = args[1] - print clearVolumeDirectory(disk, volumeName, options.deletedir) + print clearVolumeDirectory(diskMountPoint, volumeName, options.deletedir) sys.exit(0) if __name__ == "__main__": main() - -- cgit From 673f029fc0bdb4e783a8d6a1752678c6585f1b61 Mon Sep 17 00:00:00 2001 From: Shireesh Anjal Date: Thu, 9 Jun 2011 19:46:40 +0530 Subject: SSL communication between console and gateway --- src/com.gluster.storage.management.server.scripts/src/Globals.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/com.gluster.storage.management.server.scripts') diff --git a/src/com.gluster.storage.management.server.scripts/src/Globals.py b/src/com.gluster.storage.management.server.scripts/src/Globals.py index 9ae53491..877c6c68 100644 --- a/src/com.gluster.storage.management.server.scripts/src/Globals.py +++ b/src/com.gluster.storage.management.server.scripts/src/Globals.py @@ -64,7 +64,7 @@ WEBDAV_DOCUMENT_ROOT_DIR = "/var/www/html" UPDATES_DIR = "/UPDATES" TRANSPORT_HOME_DIR = "/transport" GLUSTERFS_LOG_DIR = "/var/log/glusterfs" -LOG_DIR = "/var/log/glustermc" +LOG_DIR = "/var/log/glustermg" GLUSTER_UPDATES_FILE = "updates.xml" INSTALLER_STATUS_FILE = "/var/log/install-server-status.log" -- cgit