diff options
Diffstat (limited to 'src/com.gluster.storage.management.server.scripts')
3 files changed, 25 insertions, 36 deletions
diff --git a/src/com.gluster.storage.management.server.scripts/src/common/Utils.py b/src/com.gluster.storage.management.server.scripts/src/common/Utils.py index c605eecd..601fd3dc 100644 --- a/src/com.gluster.storage.management.server.scripts/src/common/Utils.py +++ b/src/com.gluster.storage.management.server.scripts/src/common/Utils.py @@ -34,7 +34,7 @@ import urllib import Globals import Protocol - +from Common import * RUN_COMMAND_ERROR = -1024 LOG_SYSLOG = 1 @@ -117,39 +117,6 @@ def openLog(fileName=None): return False return True - -def log(priority, message=None): - global LOG_FILE_OBJ - global SYSLOG_REQUIRED - - stack = inspect.stack()[1] - if stack[3] == "<module>": - prefix = "%s:%s:%s" % (stack[1], stack[2], stack[3]) - else: - prefix = "%s:%s:%s()" % (stack[1], stack[2], stack[3]) - - if type(priority) == type("") or type(priority) == type(u""): - logPriority = syslog.LOG_INFO - logMessage = priority - else: - logPriority = priority - logMessage = message - - if SYSLOG_REQUIRED: - syslog.syslog(logPriority, "[%s]: %s" % (prefix, logMessage)) - return - - fp = sys.stderr - if LOG_FILE_OBJ: - fp = LOG_FILE_OBJ - - fp.write("[%s] %s [%s]: %s" % (str(datetime.now()), _getLogCode(logPriority), prefix, logMessage)) - if logMessage[-1] != '\n': - fp.write("\n") - fp.flush() - return - - def trace(message): if message: log(syslog.LOG_DEBUG, message) diff --git a/src/com.gluster.storage.management.server.scripts/src/nodes/clear_volume_directory.py b/src/com.gluster.storage.management.server.scripts/src/nodes/clear_volume_directory.py index e9f3ab43..a8a003a7 100755 --- a/src/com.gluster.storage.management.server.scripts/src/nodes/clear_volume_directory.py +++ b/src/com.gluster.storage.management.server.scripts/src/nodes/clear_volume_directory.py @@ -56,6 +56,12 @@ def clearVolumeDirectory(disk, volumeName): rs.appendTagRoute("status.message", message) return rs.toprettyxml() + if not rv["Status"]: + rv["Status"] = "0" + rs.appendTagRoute("status.code", rv["Status"]) + rs.appendTagRoute("status.message", message) + return rs.toprettyxml() + def main(): if len(sys.argv) != 3: print >> sys.stderr, "usage: %s <disk name> <volume name>" % sys.argv[0] @@ -66,4 +72,5 @@ def main(): print clearVolumeDirectory(disk, volumeName) sys.exit(0) -main() +if __name__ == "__main__": + main() diff --git a/src/com.gluster.storage.management.server.scripts/src/nodes/create_volume_directory.py b/src/com.gluster.storage.management.server.scripts/src/nodes/create_volume_directory.py index 1b994ab3..b8fb2166 100755 --- a/src/com.gluster.storage.management.server.scripts/src/nodes/create_volume_directory.py +++ b/src/com.gluster.storage.management.server.scripts/src/nodes/create_volume_directory.py @@ -45,6 +45,12 @@ def createDirectory(disk, volumeName): # creating volume directory under disk mount point volumeDirectory = "%s/%s" % (diskMountPoint, volumeName) + if os.path.exists(volumeDirectory): + Common.log(syslog.LOG_ERR, "Volume directory:%s already exists" % (volumeDirectory)) + rs.appendTagRoute("status.code", "-2") + rs.appendTagRoute("status.message", "Volume directory already exists!") + return rs.toprettyxml() + if not os.path.exists(volumeDirectory): command = ["sudo", "mkdir", volumeDirectory] rv = Utils.runCommandFG(command, stdout=True, root=True) @@ -53,6 +59,14 @@ def createDirectory(disk, volumeName): error = Common.stripEmptyLines(rv["Stderr"]) message += "Error: [%s]" % (error) Common.log(syslog.LOG_ERR, "failed to create volume directory %s, %s" % (volumeDirectory, error)) + rs.appendTagRoute("status.code", rv["Status"]) + rs.appendTagRoute("status.message", message) + return rs.toprettyxml() + + if not rv["Status"]: + rv["Status"] = "0" + if rv["Status"] == "0": + message = volumeDirectory rs.appendTagRoute("status.code", rv["Status"]) rs.appendTagRoute("status.message", message) return rs.toprettyxml() @@ -67,4 +81,5 @@ def main(): print createDirectory(disk, volumeName) sys.exit(0) -main() +if __name__ == "__main__": + main() |