Changeset d3c8759 for fedd/federation/emulab_access.py

Timestamp:

May 25, 2010 11:15:55 AM (14 years ago)

Author:

Ted Faber <faber@…>

Branches:

axis_example, compt_changes, info-ops, master, version-3.01, version-3.02

Children:

f038da1

Parents:

da2208a

Message:

Wholesale change of IOError to EnvironmentError? for file operations. Lots of
uncaught EnvironmentErrors? were causing spurious error conditions, e.g. on disk
full.

File:

• fedd/federation/emulab_access.py (modified) (10 diffs)

fedd/federation/emulab_access.py

@@ -335 +335 @@
                 f = open(self.state_filename, 'w')
                 pickle.dump(self.state, f)
-            except IOError, e:
+            except EnvironmentError, e:
                 self.log.error("Can't write file %s: %s" % \
                         (self.state_filename, e))
@@ -362 +362 @@
                 self.log.debug("[read_state]: Read state from %s" % \
                         self.state_filename)
-            except IOError, e:
+            except EnvironmentError, e:
                 self.log.warning(("[read_state]: No saved state: " +\
                         "Can't open %s: %s") % (self.state_filename, e))
@@ -566 +566 @@
             cf = open(conffilename, "w")
             os.chmod(conffilename, stat.S_IRUSR | stat.S_IWUSR)
-        except IOError, e:
+        except EnvironmentError, e:
             raise service_error(service_error.internal, 
                     "Cannot create user configuration data")
@@ -572 +572 @@
         try:
             dev_null = open("/dev/null", "a")
-        except IOError, e:
+        except EnvironmentError, e:
             self.log.error("export_userconf: can't open /dev/null: %s" % e)
 
@@ -908 +908 @@
                 print >>f, alloc_cert
                 f.close()
-            except IOError, e:
+            except EnvironmentError, e:
                 raise service_error(service_error.internal, 
                         "Can't open %s/%s : %s" % (self.certdir, aid, e))
@@ -1186 +1186 @@
                         (lproj, leid, secretkey_base)
                 f.close()
-            except IOError, e:
+            except EnvironmentError, e:
                 raise service_error(service_error.internal,
                         "Can't write protal config %s: %s" % (cfn, e))
@@ -1212 +1212 @@
                 print >>f, "SEERBase: True"
             f.close()
-        except IOError, e:
+        except EnvironmentError, e:
             raise service_error(service_error.internal,
                     "Cannot write client.conf: %s" %s)
@@ -1364 +1364 @@
             print >>f, expfile
             f.close()
-        except IOError:
+        except EnvironmentError:
             raise service_error(service_error.internal,
                     "Cannot write experiment file %s: %s" % (expfn,e))
@@ -1482 +1482 @@
                         get_url(u, tn, tmpdir, "userconf")
                         self.log.debug("Got userconf info: %s" % u)
-                    except IOError, e:
+                    except EnvironmentError, e:
                         raise service_error(service.error.internal, 
                                 "Cannot create temp file for " + 
@@ -1603 +1603 @@
             softdir = "%s/software" % tmpdir
             os.mkdir(softdir)
-        except IOError:
+        except EnvironmentError:
             raise service_error(service_error.internal, "Cannot create tmp dir")