Enhanced cifs functions to write errors into stderr.

7 files changed, 14 insertions, 4 deletions

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..8e25ea5a 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 add the user\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..61eaaa97 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("Failed to add volume and user-list in cifs volume 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..a07eeae4 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,7 +51,8 @@ def main():
     rv = Utils.runCommand("grun.py %s delete_user_cifs.py %s" % (serverList, userName))
     if rv == 0:
         if not removeUser(userName):
-            sys.exit(10)
+            Utils.log(("Failed to remove the user:%s on gateway server\n" % userName)
+            sys.exit(0)
     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..26c654da 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 and user-list in cifs volume configuration\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..47477ce8 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,17 @@ 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\n" % (serverName, rv["Status"]))
+            sys.stderr.write("Stdout:\n%s\n" % rv["Stdout"]))
+            sys.stderr.write("Stderr:\n%s\n" % rv["Stderr"]))
+            sys.stderr.write("---\n")
             status = False
 
     if status:
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..184e30b6 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("Failed to update volume and user-list in cifs volume configuration\n")
             sys.exit(11)
     sys.exit(rv)