Changeset d3c8759 for fedd/federation/experiment_control.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/experiment_control.py (modified) (17 diffs)

fedd/federation/experiment_control.py

@@ -321 +321 @@
                 self.ssh_pubkey = f.read()
                 f.close()
-            except IOError:
+            except EnvironmentError:
                 raise service_error(service_error.internal,
                         "Cannot read sshpubkey")
@@ -402 +402 @@
             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))
@@ -452 +452 @@
             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))
@@ -528 +528 @@
                 self.log.warn("[experiment_control] Error parsing access " +\
                         "db %s at line %d" %  (accessdb_file, lineno))
-        except IOError:
+        except EnvironmentError:
             raise service_error(service_error.internal,
                     ("Error opening/reading %s as experiment " +\
@@ -560 +560 @@
                     self.log.warn("[read_mapdb] Ignored bad line (%d) in " +\
                             "map db: %s %s" % (lineno, line, e))
-        except IOError, e:
+        except EnvironmentError, e:
             self.log.warning("[read_mapdb]: No saved map database: Can't " +\
                     "open %s: %s" % (file, e))
@@ -571 +571 @@
             self.log.debug("[read_store]: Read store from %s" % \
                     self.store_filename)
-        except IOError, e:
+        except EnvironmentError, e:
             self.log.warning("[read_store]: No saved store: Can't open %s: %s"\
                     % (self.state_filename, e))
@@ -602 +602 @@
         try:
             self.synch_store.save(self.store_filename)
-        except IOError, e:
+        except EnvironmentError, e:
             self.log.error("Can't write file %s: %s" % \
                     (self.store_filename, e))
@@ -622 +622 @@
         try:
             trace = open("/dev/null", "w")
-        except IOError:
+        except EnvironmentError:
             raise service_error(service_error.internal,
                     "Cannot open /dev/null??");
@@ -748 +748 @@
             df, dotname = tempfile.mkstemp()
             dotfile = os.fdopen(df, 'w')
-        except IOError:
+        except EnvironmentError:
             raise service_error(service_error.internal,
                     "Failed to open file in genviz")
@@ -754 +754 @@
         try:
             dnull = open('/dev/null', 'w')
-        except IOError:
+        except EnvironmentError:
             service_error(service_error.internal,
                     "Failed to open /dev/null in genviz")
@@ -773 +773 @@
             raise service_error(service_error.internal,
                     "Single endpoint link in vtopo")
-        except IOError:
+        except EnvironmentError:
             raise service_error(service_error.internal, "Cannot write dot file")
 
@@ -1454 +1454 @@
         try:
             os.makedirs(softdir)
-        except IOError, e:
+        except EnvironmentError, e:
             raise service_error(
                     "Cannot create software directory: %s" % e)
@@ -1520 +1520 @@
         try:
             tmpdir = tempfile.mkdtemp(prefix="split-")
-        except IOError:
+        except EnvironmentError:
             raise service_error(service_error.internal, "Cannot create tmp dir")
 
@@ -1607 +1607 @@
             tmpdir = tempfile.mkdtemp(prefix="split-")
             os.mkdir(tmpdir+"/keys")
-        except IOError:
+        except EnvironmentError:
             raise service_error(service_error.internal, "Cannot create tmp dir")
 
@@ -1635 +1635 @@
                     f.write(file_content)
                     f.close()
-                except IOError:
+                except EnvironmentError:
                     raise service_error(service_error.internal,
                             "Cannot write temp experiment description")
@@ -1748 +1748 @@
                 f.write('\n'.join(hosts))
                 f.close()
-            except IOError, e:
+            except EnvironmentError, e:
                 raise service_error(service_error.internal, 
                         "Cannot write hosts file: %s" % e)
@@ -1756 +1756 @@
                 copy_file("%s" % gw_secretkey, "%s/%s" % \
                         (configdir, gw_secretkey_base))
-            except IOError, e:
+            except EnvironmentError, e:
                 raise service_error(service_error.internal, 
                         "Cannot copy keyfiles: %s" % e)