Added Exception handler for change_owner function

bugzilla: 1658245 tendrl-bug-id: Tendrl#589 Signed-off-by: GowthamShanmugasundaram <gshanmug@redhat.com>
GowthamShanmugam · Jan 14, 2019 · ebf6c34 · ebf6c34
1 parent 3b903f8
commit ebf6c34
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 5 deletions.
diff --git a/tendrl/monitoring_integration/upgrades/delete_dashboards.py b/tendrl/monitoring_integration/upgrades/delete_dashboards.py
@@ -79,12 +79,14 @@ def main():
         print ("\n Allow apache to access graphite.db file \n")
         utils.change_owner(
             "/var/lib/graphite-web/graphite.db",
+            "apache",
             "apache"
         )
         print ("\n Allow apache to log messages in graphite-web \n")
         utils.change_owner(
             "/var/log/graphite-web",
             "apache",
+            "apache",
             True
         )
         print ("\n Starting carbon-cache service \n")

diff --git a/tendrl/monitoring_integration/upgrades/utils.py b/tendrl/monitoring_integration/upgrades/utils.py
@@ -19,13 +19,21 @@ def remove_file(path):
     try:
         os.remove("/var/lib/graphite-web/graphite.db")
     except OSError as ex:
-        print (ex)
+        print (
+            "\n Unable to remove graphiteDB. Error: %s \n" % ex
+        )
 
 
-def change_owner(path, owner, recursive=False):
-    uid = pwd.getpwnam(owner).pw_uid
-    gid = grp.getgrnam(owner).gr_gid
-    _chown(path, uid, gid, recursive)
+def change_owner(path, uname, gname, recursive=False):
+    try:
+        uid = pwd.getpwnam(uname).pw_uid
+        gid = grp.getgrnam(gname).gr_gid
+        _chown(path, uid, gid, recursive)
+    except KeyError as ex:
+        print (
+            "\n Unable to modify ownership of file/directory. "
+            "Error: %s \n" % ex
+        )
 
 
 def _chown(path, uid, gid, recursive):