diff options
27 files changed, 83 insertions, 67 deletions
diff --git a/src/com.gluster.storage.management.gateway.scripts/src/Utils.py b/src/com.gluster.storage.management.gateway.scripts/src/Utils.py index 82f8b7b6..bcc6f177 100644 --- a/src/com.gluster.storage.management.gateway.scripts/src/Utils.py +++ b/src/com.gluster.storage.management.gateway.scripts/src/Utils.py @@ -1059,6 +1059,8 @@ def log(priority, message=None): def stripEmptyLines(content): + if not content: + return "" ret = "" for line in content.split("\n"): if line.strip() != "": diff --git a/src/com.gluster.storage.management.gateway.scripts/src/add_user_cifs.py b/src/com.gluster.storage.management.gateway.scripts/src/add_user_cifs.py index 2bff2a06..b2bf045a 100755 --- a/src/com.gluster.storage.management.gateway.scripts/src/add_user_cifs.py +++ b/src/com.gluster.storage.management.gateway.scripts/src/add_user_cifs.py @@ -33,25 +33,30 @@ def main(): groupInfo = grp.getgrnam(userName) if uid != groupInfo.gr_gid: Utils.log("group %s exists with different gid %s\n" % (userName, groupInfo.gr_gid)) + sys.stderr.write("Group %s exists with different gid %s\n" % (userName, groupInfo.gr_gid)) sys.exit(1) except KeyError, e: if Utils.runCommand("groupadd -g %s %s" % (uid, userName)) != 0: Utils.log("failed to add group %s gid %s\n" % (username, uid)) + sys.stderr.write("Failed to add group %s gid %s\n" % (username, uid)) sys.exit(2) try: userInfo = pwd.getpwnam(userName) if uid != userInfo.pw_uid: Utils.log("user %s exists with different uid %s\n" % (userName, userInfo.pw_uid)) + sys.stderr.write("User %s exists with different uid %s\n" % (userName, userInfo.pw_uid)) sys.exit(3) except KeyError, e: command = ["useradd", "-c", Globals.VOLUME_USER_DESCRIPTION, "-M", "-d", "/", "-s", "/sbin/nologin", "-u", str(uid), "-g", str(uid), userName] if Utils.runCommand(command) != 0: Utils.log("failed to add user %s uid %s\n" % (userName, uid)) + sys.stderr.write("Failed to add user %s uid %s\n" % (userName, uid)) sys.exit(4) if Utils.runCommand("smbpasswd -s -a %s" % userName, input="%s\n%s\n" % (password, password)) != 0: Utils.log("failed to set smbpassword of user %s\n" % userName) + sys.stderr.write("Failed to set smbpassword of user %s\n" % userName) sys.exit(5) sys.exit(0) diff --git a/src/com.gluster.storage.management.gateway.scripts/src/clear_volume_directory.py b/src/com.gluster.storage.management.gateway.scripts/src/clear_volume_directory.py index 029787e5..c9323f24 100755 --- a/src/com.gluster.storage.management.gateway.scripts/src/clear_volume_directory.py +++ b/src/com.gluster.storage.management.gateway.scripts/src/clear_volume_directory.py @@ -29,21 +29,21 @@ def main(): volumeDirectory = args[0] if not os.path.exists(volumeDirectory): - sys.stderr.write("Given volume directory path:%s does not exists" % volumeDirectory) + sys.stderr.write("Given volume directory path:%s does not exists\n" % volumeDirectory) sys.exit(1) newVolumeDirectoryName = "%s_%s" % (volumeDirectory, time.time()) rv = Utils.runCommand("mv -f %s %s" % (volumeDirectory, newVolumeDirectoryName), output=True, root=True) - if rv["Stderr"]: - sys.stderr.write(Utils.stripEmptyLines(rv["Stderr"])) + if rv["Status"] != 0: + sys.stderr.write("%s %s\n" % (Utils.stripEmptyLines(rv["Stderr"]), Utils.stripEmptyLines(rv["Stdout"])) sys.exit(2) if not options.todelete: sys.exit(0) rv = Utils.runCommand("rm -fr %s" % newVolumeDirectoryName, output=True, root=True) - if rv["Stderr"]: - sys.stderr.write(Utils.stripEmptyLines(rv["Stderr"])) + if rv["Status"] != 0: + sys.stderr.write("%s %s\n" % (Utils.stripEmptyLines(rv["Stderr"]), Utils.stripEmptyLines(rv["Stdout"])) sys.exit(3) sys.exit(0) diff --git a/src/com.gluster.storage.management.gateway.scripts/src/create_volume_cifs.py b/src/com.gluster.storage.management.gateway.scripts/src/create_volume_cifs.py index 1ef8192e..a0443637 100755 --- a/src/com.gluster.storage.management.gateway.scripts/src/create_volume_cifs.py +++ b/src/com.gluster.storage.management.gateway.scripts/src/create_volume_cifs.py @@ -28,10 +28,12 @@ def main(): os.mkdir(volumeMountDirName) except OSError, e: Utils.log("failed creating %s: %s\n" % (volumeMountDirName, str(e))) + sys.stderr.write("Failed creating %s: %s\n" % (volumeMountDirName, str(e))) sys.exit(1) if VolumeUtils.writeVolumeCifsConfiguration(volumeName, userList): sys.exit(0) + sys.stderr.write("Unable to update volume cifs configuration\n") sys.exit(2) diff --git a/src/com.gluster.storage.management.gateway.scripts/src/create_volume_directory.py b/src/com.gluster.storage.management.gateway.scripts/src/create_volume_directory.py index e295f249..b3ea11d8 100755 --- a/src/com.gluster.storage.management.gateway.scripts/src/create_volume_directory.py +++ b/src/com.gluster.storage.management.gateway.scripts/src/create_volume_directory.py @@ -53,26 +53,18 @@ def createDirectory(disk, volumeName): 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) - message = Utils.stripEmptyLines(rv["Stdout"]) - if rv["Stderr"]: - error = Utils.stripEmptyLines(rv["Stderr"]) - message += "Error: [%s]" % (error) - Utils.log("failed to create volume directory %s, %s" % (volumeDirectory, error)) + rv = Utils.runCommand("mkdir %s" % volumeDirectory, output=True, root=True) + if rv["Status"] != 0: rs.appendTagRoute("status.code", rv["Status"]) - rs.appendTagRoute("status.message", message) + rs.appendTagRoute("status.message", "%s %s\n" % (Utils.stripEmptyLines(rv["Stderr"]), Utils.stripEmptyLines(rv["Stdout"]))) 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) + + rs.appendTagRoute("status.code", 0) + rs.appendTagRoute("status.message", volumeDirectory) return rs.toprettyxml() + # return nothing if the path already exists def main(): if len(sys.argv) != 3: diff --git a/src/com.gluster.storage.management.gateway.scripts/src/delete_user_cifs.py b/src/com.gluster.storage.management.gateway.scripts/src/delete_user_cifs.py index 76eb55d9..aeda989f 100755 --- a/src/com.gluster.storage.management.gateway.scripts/src/delete_user_cifs.py +++ b/src/com.gluster.storage.management.gateway.scripts/src/delete_user_cifs.py @@ -22,6 +22,7 @@ def main(): if Utils.runCommand("userdel %s" % userName) != 0: Utils.log("failed to remove user name:%s\n" % userName) + sys.stderr.write("Failed to remove user name:%s\n" % userName) sys.exit(1) sys.exit(0) diff --git a/src/com.gluster.storage.management.gateway.scripts/src/delete_volume_cifs.py b/src/com.gluster.storage.management.gateway.scripts/src/delete_volume_cifs.py index 8bd9e7c2..572d819c 100755 --- a/src/com.gluster.storage.management.gateway.scripts/src/delete_volume_cifs.py +++ b/src/com.gluster.storage.management.gateway.scripts/src/delete_volume_cifs.py @@ -27,10 +27,12 @@ def main(): os.rmdir(volumeMountDirName) except OSError, e: Utils.log("failed deleting %s: %s\n" % (volumeMountDirName, str(e))) + sys.stderr.write("Failed deleting %s: %s\n" % (volumeMountDirName, str(e))) sys.exit(1) if VolumeUtils.removeVolumeCifsConfiguration(volumeName): sys.exit(0) + sys.stderr.write("Unable to remove volume cifs configuration\n") sys.exit(2) diff --git a/src/com.gluster.storage.management.gateway.scripts/src/get_rrd_cpu_details.py b/src/com.gluster.storage.management.gateway.scripts/src/get_rrd_cpu_details.py index e60d7199..78cb4988 100755 --- a/src/com.gluster.storage.management.gateway.scripts/src/get_rrd_cpu_details.py +++ b/src/com.gluster.storage.management.gateway.scripts/src/get_rrd_cpu_details.py @@ -32,13 +32,10 @@ def getCpuData(period): XPORT:totalpct:totalpct" % (period, cpuRrdFile, cpuRrdFile, cpuRrdFile) rv = Utils.runCommand(command, output=True, root=True) - message = Utils.stripEmptyLines(rv["Stdout"]) - if rv["Stderr"]: - error = Utils.stripEmptyLines(rv["Stderr"]) - message += "Error: [%s]" % (error) + if rv["Status"] != 0: Utils.log("failed to create RRD file for cpu usages %s" % file) rs.appendTagRoute("status.code", rv["Status"]) - rs.appendTagRoute("status.message", message) + rs.appendTagRoute("status.message", "Error: [%s] %s" % (Utils.stripEmptyLines(rv["Stderr"]), Utils.stripEmptyLines(rv["Stdout"]))) return rs.toxml() return rv["Stdout"] diff --git a/src/com.gluster.storage.management.gateway.scripts/src/get_rrd_memory_details.py b/src/com.gluster.storage.management.gateway.scripts/src/get_rrd_memory_details.py index a6dd4987..2edc775e 100755 --- a/src/com.gluster.storage.management.gateway.scripts/src/get_rrd_memory_details.py +++ b/src/com.gluster.storage.management.gateway.scripts/src/get_rrd_memory_details.py @@ -72,13 +72,10 @@ def getMemData(period): XPORT:total:totalMemory" % (period, memRrdFile, memRrdFile, memRrdFile, memRrdFile) rv = Utils.runCommand(command, output=True, root=True) - message = Utils.stripEmptyLines(rv["Stdout"]) - if rv["Stderr"]: - error = Utils.stripEmptyLines(rv["Stderr"]) - message += "Error: [%s]" % (error) + if status["Status"] != 0: Utils.log("failed to create RRD file for memory usages %s" % file) rs.appendTagRoute("status.code", rv["Status"]) - rs.appendTagRoute("status.message", message) + rs.appendTagRoute("status.message", "Error: [%s] %s" % (Utils.stripEmptyLines(rv["Stderr"]), Utils.stripEmptyLines(rv["Stdout"]))) return rs.toxml() return rv["Stdout"] diff --git a/src/com.gluster.storage.management.gateway.scripts/src/get_rrd_net_details.py b/src/com.gluster.storage.management.gateway.scripts/src/get_rrd_net_details.py index c319c888..9984fb4a 100755 --- a/src/com.gluster.storage.management.gateway.scripts/src/get_rrd_net_details.py +++ b/src/com.gluster.storage.management.gateway.scripts/src/get_rrd_net_details.py @@ -43,13 +43,10 @@ def main(): XPORT:transmitted:transmitted \ XPORT:total:total" % (period, device, device) rv = Utils.runCommand(command, output=True, root=True) - message = Utils.stripEmptyLines(rv["Stdout"]) - if rv["Stderr"]: - error = Utils.stripEmptyLines(rv["Stderr"]) - message += "Error: [%s]" % (error) + if rv["Status"] != 0: Utils.log("failed to get RRD information of device %s" % file) rs.appendTagRoute("status.code", rv["Status"]) - rs.appendTagRoute("status.message", message) + rs.appendTagRoute("status.message", "Error: [%s] %s" % (Utils.stripEmptyLines(rv["Stderr"]), Utils.stripEmptyLines(rv["Stdout"]))) print rs.toxml() print rv["Stdout"] sys.exit(0) diff --git a/src/com.gluster.storage.management.gateway.scripts/src/get_server_details.py b/src/com.gluster.storage.management.gateway.scripts/src/get_server_details.py index 30ffac58..4ea191e5 100755 --- a/src/com.gluster.storage.management.gateway.scripts/src/get_server_details.py +++ b/src/com.gluster.storage.management.gateway.scripts/src/get_server_details.py @@ -102,7 +102,7 @@ def getServerDetails(listall): diskDom = DiskUtils.getDiskDom() if not diskDom: - sys.stderr.write("No disk found!") + sys.stderr.write("No disk found!\n") Utils.log("Failed to get disk details") sys.exit(1) diff --git a/src/com.gluster.storage.management.gateway.scripts/src/modify_volume_cifs.py b/src/com.gluster.storage.management.gateway.scripts/src/modify_volume_cifs.py index 0254e2ba..e67ef837 100755 --- a/src/com.gluster.storage.management.gateway.scripts/src/modify_volume_cifs.py +++ b/src/com.gluster.storage.management.gateway.scripts/src/modify_volume_cifs.py @@ -23,9 +23,11 @@ def main(): userList = sys.argv[2:] if not VolumeUtils.writeVolumeCifsConfiguration(volumeName, userList): + sys.stderr.write("Unable to update cifs configuration\n") sys.exit(1) if Utils.runCommand("service smb reload") != 0: Utils.log("Failed to reload smb service") + sys.stderr.write("Failed to reload smb service\n") sys.exit(2) sys.exit(0) diff --git a/src/com.gluster.storage.management.gateway.scripts/src/rrd_update_cpu_details.py b/src/com.gluster.storage.management.gateway.scripts/src/rrd_update_cpu_details.py index 6ec6a1e3..b7c56f01 100755 --- a/src/com.gluster.storage.management.gateway.scripts/src/rrd_update_cpu_details.py +++ b/src/com.gluster.storage.management.gateway.scripts/src/rrd_update_cpu_details.py @@ -38,13 +38,10 @@ def createMemData(file, step): "RRA:AVERAGE:0.5:144:1460"] rv = Utils.runCommand(command, output=True, root=True) - message = Utils.stripEmptyLines(rv["Stdout"]) - if rv["Stderr"]: - error = Utils.stripEmptyLines(rv["Stderr"]) - message += "Error: [%s]" % (error) + if rv["Status"] != 0: Utils.log("failed to create RRD file for cpu usages %s" % file) rs.appendTagRoute("status.code", rv["Status"]) - rs.appendTagRoute("status.message", message) + rs.appendTagRoute("status.message", "Error: [%s] %s" % (Utils.stripEmptyLines(rv["Stderr"]), Utils.stripEmptyLines(rv["Stdout"]))) return rs.toxml() return None @@ -71,12 +68,10 @@ def updateMemData(file): command = ["rrdtool", "update", file, "-t", "user:system:idle", "N:%s:%s:%s" % (user, system, idle)] rv = Utils.runCommand(command, output=True, root=True) - if rv["Stderr"]: - error = Utils.stripEmptyLines(rv["Stderr"]) - message = "Error: [%s]" % (error) + if rv["Status"] != 0: Utils.log("failed to update cpu usage into rrd file %s" % file) rs.appendTagRoute("status.code", rv["Status"]) - rs.appendTagRoute("status.message", message) + rs.appendTagRoute("status.message", "Error: [%s] %s" % (Utils.stripEmptyLines(rv["Stderr"]), Utils.stripEmptyLines(rv["Stdout"]))) return rs.toxml() return None diff --git a/src/com.gluster.storage.management.gateway.scripts/src/rrd_update_memory_details.py b/src/com.gluster.storage.management.gateway.scripts/src/rrd_update_memory_details.py index 0a30d248..915ffcb6 100755 --- a/src/com.gluster.storage.management.gateway.scripts/src/rrd_update_memory_details.py +++ b/src/com.gluster.storage.management.gateway.scripts/src/rrd_update_memory_details.py @@ -40,13 +40,10 @@ def createMemData(file, step): "RRA:AVERAGE:0.5:144:1460"] rv = Utils.runCommand(command, output=True, root=True) - message = Utils.stripEmptyLines(rv["Stdout"]) - if rv["Stderr"]: - error = Utils.stripEmptyLines(rv["Stderr"]) - message += "Error: [%s]" % (error) + if rv["Status"] != 0: Utils.log("failed to create RRD file for memory usages %s" % file) rs.appendTagRoute("status.code", rv["Status"]) - rs.appendTagRoute("status.message", message) + rs.appendTagRoute("status.message", "Error: [%s] %s" % (Utils.stripEmptyLines(rv["Stderr"]), Utils.stripEmptyLines(rv["Stdout"]))) return rs.toxml() return None @@ -54,24 +51,19 @@ def updateMemData(file): rs = ResponseXml() command = ["free", "-b", "-o"] rv = Utils.runCommand(command, output=True, root=True) - if rv["Stderr"]: - error = Utils.stripEmptyLines(rv["Stderr"]) - message += "Error: [%s]" % (error) + if rv["Status"] != 0: Utils.log("failed to retrieve memory details") rs.appendTagRoute("status.code", rv["Status"]) - rs.appendTagRoute("status.message", message) + rs.appendTagRoute("status.message", "Error: [%s] %s" % (Utils.stripEmptyLines(rv["Stderr"]), Utils.stripEmptyLines(rv["Stdout"]))) return rs.toxml() - message = rv["Stdout"].split() command = ["rrdtool", "update", file, "-t", "memused:memfree:memcache:swapused:swapfree", "N:%s:%s:%s:%s:%s" % (message[8], message[9], message[12], message[14], message[15])] rv = Utils.runCommand(command, output=True, root=True) - if rv["Stderr"]: - error = Utils.stripEmptyLines(rv["Stderr"]) - message += "Error: [%s]" % (error) - Utils.log(syslog.LOG_ERR, "failed to update memory usage into rrd file %s" % file) + if rv["Status"] != 0: + Utils.log("failed to update memory usage into rrd file %s" % file) rs.appendTagRoute("status.code", rv["Status"]) - rs.appendTagRoute("status.message", message) + rs.appendTagRoute("status.message", "Error: [%s] %s" % (Utils.stripEmptyLines(rv["Stderr"]), Utils.stripEmptyLines(rv["Stdout"]))) return rs.toxml() return None diff --git a/src/com.gluster.storage.management.gateway.scripts/src/setup_cifs_config.py b/src/com.gluster.storage.management.gateway.scripts/src/setup_cifs_config.py index bb9a47fe..67ce962e 100755 --- a/src/com.gluster.storage.management.gateway.scripts/src/setup_cifs_config.py +++ b/src/com.gluster.storage.management.gateway.scripts/src/setup_cifs_config.py @@ -27,6 +27,7 @@ def main(): os.mkdir(Globals.REEXPORT_DIR) except OSError, e: Utils.log("failed to create directory: %s" % str(e)) + sys.stderr.write("Failed to create directory: %s\n" % str(e)) sys.exit(1) try: if not os.path.exists(Globals.VOLUME_SMBCONF_FILE): @@ -34,12 +35,14 @@ def main(): fp.close() except IOError, e: Utils.log("Failed to create file %s: %s" % (Globals.VOLUME_SMBCONF_FILE, str(e))) + sys.stderr.write("Failed to create file %s: %s\n" % (Globals.VOLUME_SMBCONF_FILE, str(e))) sys.exit(2) try: backupFile = "%s.%s" % (Globals.SAMBA_CONF_FILE, time.time()) os.rename(Globals.SAMBA_CONF_FILE, backupFile) except IOError, e: Utils.log("Ignoring rename %s to %s: %s" % (Globals.SAMBA_CONF_FILE, backupFile)) + sys.stderr.write("Ignoring rename %s to %s: %s\n" % (Globals.SAMBA_CONF_FILE, backupFile)) try: fp = open(Globals.SAMBA_CONF_FILE, "w") fp.write("##\n") @@ -53,6 +56,7 @@ def main(): fp.close() except IOError, e: Utils.log("Failed to create samba configuration file %s: %s" % (Globals.SAMBA_CONF_FILE, str(e))) + sys.stderr.write("Failed to create samba configuration file %s: %s\n" % (Globals.SAMBA_CONF_FILE, str(e))) sys.exit(3) try: if not os.path.exists(Globals.REAL_SAMBA_CONF_FILE): @@ -78,19 +82,23 @@ def main(): fp.close() except IOError, e: Utils.log("Failed to create samba configuration file %s: %s" % (Globals.REAL_SAMBA_CONF_FILE, str(e))) + sys.stderr.write("Failed to create samba configuration file %s: %s\n" % (Globals.REAL_SAMBA_CONF_FILE, str(e))) sys.exit(4) if Utils.runCommand("setsebool -P samba_share_fusefs on") != 0: Utils.log("failed to set SELinux samba_share_fusefs") + sys.stderr.write("failed to set SELinux samba_share_fusefs\n") sys.exit(5) if Utils.runCommand("service smb status") != 0: if Utils.runCommand("service smb start") != 0: Utils.log("failed to start smb service") + sys.stderr.write("Failed to start smb service\n") sys.exit(6) if Utils.runCommand("service smb reload") != 0: Utils.log("failed to reload smb configuration") + sys.stderr.write("Failed to reload smb configuration\n") sys.exit(7) sys.exit(0) diff --git a/src/com.gluster.storage.management.gateway.scripts/src/start_volume_cifs.py b/src/com.gluster.storage.management.gateway.scripts/src/start_volume_cifs.py index d05c9644..0d09b5eb 100755 --- a/src/com.gluster.storage.management.gateway.scripts/src/start_volume_cifs.py +++ b/src/com.gluster.storage.management.gateway.scripts/src/start_volume_cifs.py @@ -27,18 +27,23 @@ def main(): if Utils.runCommand("mount -t glusterfs 127.0.0.1:%s %s" % (volumeName, volumeMountDirName)) != 0: Utils.log("Failed to mount volume %s" % (volumeName)) + sys.stderr.write("Failed to mount volume %s\n" % (volumeName)) sys.exit(1) if Utils.runCommand("ln -fTs %s %s" % (volumeMountDirName, cifsDirName)) != 0: Utils.log("Failed to create reexport link %s" % cifsDirName) + sys.stderr.write("Failed to create reexport link %s\n" % cifsDirName) sys.exit(2) if Utils.runCommand("chcon -t samba_share_t %s -h" % cifsDirName) != 0: Utils.log("Failed to change security context for the link %s" % cifsDirName) + sys.stderr.write("Failed to change security context for the link %s\n" % cifsDirName) sys.exit(2) if not VolumeUtils.includeVolume(volumeName): Utils.log("Failed to include volume for CIFS reexport") + sys.stderr.write("Failed to include volume for CIFS reexport\n") sys.exit(3) if Utils.runCommand("service smb reload") != 0: Utils.log("Failed to reload smb service") + sys.stderr.write("Failed to reload smb service\n") sys.exit(4) sys.exit(0) diff --git a/src/com.gluster.storage.management.gateway.scripts/src/stop_volume_cifs.py b/src/com.gluster.storage.management.gateway.scripts/src/stop_volume_cifs.py index d6e17e3f..d67d9061 100755 --- a/src/com.gluster.storage.management.gateway.scripts/src/stop_volume_cifs.py +++ b/src/com.gluster.storage.management.gateway.scripts/src/stop_volume_cifs.py @@ -27,15 +27,19 @@ def main(): if not Utils.removeFile(cifsDirName): Utils.log("Failed to remove reexport link %s" % cifsDirName) + sys.stderr.write("Failed to remove reexport link %s\n" % cifsDirName) sys.exit(1) if not VolumeUtils.excludeVolume(volumeName): Utils.log("Failed to exclude volume for CIFS reexport") + sys.stderr.write("Failed to exclude volume for CIFS reexport\n") sys.exit(2) if Utils.runCommand("service smb reload") != 0: Utils.log("Failed to reload smb service") + sys.stderr.write("Failed to reload smb service\n") sys.exit(3) if Utils.runCommand("umount %s" % (volumeMountDirName)) != 0: Utils.log("Failed to unmount volume %s" % (volumeName)) + sys.stderr.write("Failed to unmount volume %s\n" % (volumeName)) sys.exit(4) sys.exit(0) diff --git a/src/com.gluster.storage.management.gateway.scripts/src/update_volume_cifs.py b/src/com.gluster.storage.management.gateway.scripts/src/update_volume_cifs.py index d1d0f85f..680b6177 100755 --- a/src/com.gluster.storage.management.gateway.scripts/src/update_volume_cifs.py +++ b/src/com.gluster.storage.management.gateway.scripts/src/update_volume_cifs.py @@ -24,9 +24,11 @@ def main(): userList = sys.argv[2:] if not VolumeUtils.writeVolumeCifsConfiguration(volumeName, userList): + sys.stderr.write("Failed to update volume cifs configuration\n") sys.exit(1) if Utils.runCommand("service smb reload") != 0: - Utils.log("Failed to reload smb service") + Utils.log("Failed to reload smb service\n") + sys.stderr.write("Failed to reload smb service\n") sys.exit(2) sys.exit(0) diff --git a/src/com.gluster.storage.management.gateway/WebContent/scripts/Utils.py b/src/com.gluster.storage.management.gateway/WebContent/scripts/Utils.py index 82f8b7b6..bcc6f177 100644 --- a/src/com.gluster.storage.management.gateway/WebContent/scripts/Utils.py +++ b/src/com.gluster.storage.management.gateway/WebContent/scripts/Utils.py @@ -1059,6 +1059,8 @@ def log(priority, message=None): def stripEmptyLines(content): + if not content: + return "" ret = "" for line in content.split("\n"): if line.strip() != "": diff --git a/src/com.gluster.storage.management.gateway/WebContent/scripts/add_user_cifs_all.py b/src/com.gluster.storage.management.gateway/WebContent/scripts/add_user_cifs_all.py index f1e899ec..b9fcaf6d 100755 --- a/src/com.gluster.storage.management.gateway/WebContent/scripts/add_user_cifs_all.py +++ b/src/com.gluster.storage.management.gateway/WebContent/scripts/add_user_cifs_all.py @@ -87,6 +87,7 @@ def main(): if rv == 0: if not setUid(uid, userName): + sys.stderr.write("Failed to update user uid\n") sys.exit(11) sys.exit(rv) diff --git a/src/com.gluster.storage.management.gateway/WebContent/scripts/create_volume_cifs_all.py b/src/com.gluster.storage.management.gateway/WebContent/scripts/create_volume_cifs_all.py index 80b6da7c..b327580c 100755 --- a/src/com.gluster.storage.management.gateway/WebContent/scripts/create_volume_cifs_all.py +++ b/src/com.gluster.storage.management.gateway/WebContent/scripts/create_volume_cifs_all.py @@ -51,6 +51,7 @@ def main(): rv = Utils.runCommand(["grun.py", serverFile, "create_volume_cifs.py", volumeName] + userList) if rv == 0: if not addVolumeCifsConf(volumeName, userList): + sys.stderr.write("Unable to update volume cifs configuration\n") sys.exit(11) sys.exit(rv) diff --git a/src/com.gluster.storage.management.gateway/WebContent/scripts/delete_user_cifs_all.py b/src/com.gluster.storage.management.gateway/WebContent/scripts/delete_user_cifs_all.py index d414fc2c..a6bf15dc 100755 --- a/src/com.gluster.storage.management.gateway/WebContent/scripts/delete_user_cifs_all.py +++ b/src/com.gluster.storage.management.gateway/WebContent/scripts/delete_user_cifs_all.py @@ -51,6 +51,7 @@ def main(): rv = Utils.runCommand("grun.py %s delete_user_cifs.py %s" % (serverList, userName)) if rv == 0: if not removeUser(userName): + sys.stderr.write("Failed to remove user\n") sys.exit(10) sys.exit(rv) diff --git a/src/com.gluster.storage.management.gateway/WebContent/scripts/delete_volume_cifs_all.py b/src/com.gluster.storage.management.gateway/WebContent/scripts/delete_volume_cifs_all.py index b41e3d65..2e2b8db3 100755 --- a/src/com.gluster.storage.management.gateway/WebContent/scripts/delete_volume_cifs_all.py +++ b/src/com.gluster.storage.management.gateway/WebContent/scripts/delete_volume_cifs_all.py @@ -49,6 +49,7 @@ def main(): rv = Utils.runCommand(["grun.py", serverFile, "delete_volume_cifs.py", volumeName]) if rv == 0: if not removeVolumeCifsConf(volumeName): + sys.stderr.write("Failed to remove volume cifs config file\n") sys.exit(11) sys.exit(rv) diff --git a/src/com.gluster.storage.management.gateway/WebContent/scripts/get_volume_user_cifs.py b/src/com.gluster.storage.management.gateway/WebContent/scripts/get_volume_user_cifs.py index 55821b60..33de3bf1 100755 --- a/src/com.gluster.storage.management.gateway/WebContent/scripts/get_volume_user_cifs.py +++ b/src/com.gluster.storage.management.gateway/WebContent/scripts/get_volume_user_cifs.py @@ -40,6 +40,7 @@ def main(): sys.exit(0) except IOError, e: Utils.log("failed to read file %s: %s" % (cifsVolumeFile, str(e))) + sys.stderr.write("Failed to read cifs-volume-file %s: %s\n" % (cifsVolumeFile, str(e))) sys.exit(2) diff --git a/src/com.gluster.storage.management.gateway/WebContent/scripts/grun.py b/src/com.gluster.storage.management.gateway/WebContent/scripts/grun.py index e09ef5bc..cc00f466 100755 --- a/src/com.gluster.storage.management.gateway/WebContent/scripts/grun.py +++ b/src/com.gluster.storage.management.gateway/WebContent/scripts/grun.py @@ -33,13 +33,15 @@ def main(): fp.close() except IOError, e: Utils.log("Failed to read server file %s: %s\n" % (serverFile, str(e))) + sys.stderr.write("Failed to read server file %s: %s\n" % (serverFile, str(e))) sys.exit(1) status = True for serverName in serverNameList: - rv = Utils.runCommand(sshCommandPrefix + [serverName.strip()] + command) - print "%s: %s" % (serverName, rv) - if rv != 0: + rv = Utils.runCommand(sshCommandPrefix + [serverName.strip()] + command, output=True) + if rv["Status"] != 0: + sys.stderr.write("%s: %s\nStdout:\n%s\nStderr:%s\n---\n" \ + % (serverName, rv["Status"], rv["Stdout"], rv["Stderr"])) status = False if status: diff --git a/src/com.gluster.storage.management.gateway/WebContent/scripts/setup_cifs_config_all.py b/src/com.gluster.storage.management.gateway/WebContent/scripts/setup_cifs_config_all.py index 8dd59c8c..657f05f7 100755 --- a/src/com.gluster.storage.management.gateway/WebContent/scripts/setup_cifs_config_all.py +++ b/src/com.gluster.storage.management.gateway/WebContent/scripts/setup_cifs_config_all.py @@ -21,8 +21,11 @@ def main(): serverFile = sys.argv[1] - rv = Utils.runCommand(["grun.py", serverFile, "setup_cifs_config.py"]) - sys.exit(rv) + rv = Utils.runCommand(["grun.py", serverFile, "setup_cifs_config.py"], output=True) + if status["Status"] != 0: + sys.stderr.write("%s %s\n" % (Utils.stripEmptyLines(rv["Stderr"]), Utils.stripEmptyLines(rv["Stdout"]))) + sys.exit(-1) + sys.exit(0) if __name__ == "__main__": diff --git a/src/com.gluster.storage.management.gateway/WebContent/scripts/update_volume_cifs_all.py b/src/com.gluster.storage.management.gateway/WebContent/scripts/update_volume_cifs_all.py index a4d424b3..e2ea9ac2 100755 --- a/src/com.gluster.storage.management.gateway/WebContent/scripts/update_volume_cifs_all.py +++ b/src/com.gluster.storage.management.gateway/WebContent/scripts/update_volume_cifs_all.py @@ -52,6 +52,7 @@ def main(): rv = Utils.runCommand(["grun.py", serverFile, "update_volume_cifs.py", volumeName] + userList) if rv == 0: if not updateVolumeCifsConf(volumeName, userList): + sys.stderr.write("Unable to update volume cifs configuration\n") sys.exit(11) sys.exit(rv) |