From 1a2fd8fa98e300ec6c95febaf537b88ce32babd1 Mon Sep 17 00:00:00 2001 From: Tim Date: Tue, 9 Aug 2011 19:03:53 +0530 Subject: Enhanced cifs functions to write errors into stderr. --- .../src/add_user_cifs.py | 5 +++++ .../src/create_volume_cifs.py | 2 ++ .../src/delete_user_cifs.py | 1 + .../src/delete_volume_cifs.py | 2 ++ .../src/modify_volume_cifs.py | 2 ++ .../src/setup_cifs_config.py | 8 ++++++++ .../src/start_volume_cifs.py | 5 +++++ .../src/stop_volume_cifs.py | 4 ++++ .../src/update_volume_cifs.py | 2 ++ 9 files changed, 31 insertions(+) (limited to 'src/com.gluster.storage.management.gateway.scripts') 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/create_volume_cifs.py b/src/com.gluster.storage.management.gateway.scripts/src/create_volume_cifs.py index 1ef8192e..9da715e6 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 write volume cifs configuration\n") sys.exit(2) 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/modify_volume_cifs.py b/src/com.gluster.storage.management.gateway.scripts/src/modify_volume_cifs.py index 0254e2ba..d56b1f59 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 write 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/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..64297a87 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") + sys.stderr.write("Failed to reload smb service\n") sys.exit(2) sys.exit(0) -- cgit