Do not retry calls to close or dup2

Due to the details of how Linux implements closing file descriptors and
EINTR, retrying these calls is considered bad.

anaconda

@@ -969,7 +969,7 @@ if __name__ == "__main__":
         pidfile_created = True
         pid_string = "%s\n" % os.getpid()
         iutil.eintr_retry_call(os.write, pidfile, pid_string.encode("utf-8"))
-        iutil.eintr_retry_call(os.close, pidfile)
+        os.close(pidfile)
     except OSError as e:
         # If the failure was anything other than EEXIST during the open call,
         # just re-raise the exception

pyanaconda/anaconda.py

@@ -202,7 +202,7 @@ def dumpState(self):
         dump_text += threads
         dump_text = dump_text.encode("utf-8")
         iutil.eintr_retry_call(os.write, fd, dump_text)
-        iutil.eintr_retry_call(os.close, fd)
+        os.close(fd)
 
         # append to a given file
         with open("/tmp/anaconda-tb-all.log", "a+") as f:

pyanaconda/bootloader.py

@@ -61,7 +61,7 @@ def get_boot_block(device, seek_blocks=0):
     if seek_blocks:
         os.lseek(fd, seek_blocks * block_size, 0)
     block = iutil.eintr_retry_call(os.read, fd, 512)
-    iutil.eintr_retry_call(os.close, fd)
+    os.close(fd)
     if not status:
         try:
             device.teardown(recursive=True)
@@ -1347,11 +1347,11 @@ def install(self, args=None):
                       "stage2dev": self.grub_device_name(stage2dev)})
             (pread, pwrite) = os.pipe()
             iutil.eintr_retry_call(os.write, pwrite, cmd.encode("utf-8"))
-            iutil.eintr_retry_call(os.close, pwrite)
+            os.close(pwrite)
             args = ["--batch", "--no-floppy",
                     "--device-map=%s" % self.device_map_file]
             rc = iutil.execInSysroot("grub", args, stdin=pread)
-            iutil.eintr_retry_call(os.close, pread)
+            os.close(pread)
             if rc:
                 raise BootLoaderError("boot loader install failed")
 
@@ -1540,11 +1540,11 @@ def _encrypt_password(self):
         (pread, pwrite) = os.pipe()
         passwords = "%s\n%s\n" % (self.password, self.password)
         iutil.eintr_retry_call(os.write, pwrite, passwords.encode("utf-8"))
-        iutil.eintr_retry_call(os.close, pwrite)
+        os.close(pwrite)
         buf = iutil.execWithCapture("grub2-mkpasswd-pbkdf2", [],
                                     stdin=pread,
                                     root=iutil.getSysroot())
-        iutil.eintr_retry_call(os.close, pread)
+        os.close(pread)
         self.encrypted_password = buf.split()[-1].strip()
         if not self.encrypted_password.startswith("grub.pbkdf2."):
             raise BootLoaderError("failed to encrypt boot loader password")

pyanaconda/exception.py

@@ -196,11 +196,11 @@ def runDebug(self, exc_info):
             iutil.vtActivate(1)
 
         iutil.eintr_retry_call(os.open, "/dev/console", os.O_RDWR)   # reclaim stdin
-        iutil.eintr_retry_call(os.dup2, 0, 1)                        # reclaim stdout
-        iutil.eintr_retry_call(os.dup2, 0, 2)                        # reclaim stderr
-        #                          ^
-        #                          |
-        #                          +------ dup2 is magic, I tells ya!
+        os.dup2(0, 1)                        # reclaim stdout
+        os.dup2(0, 2)                        # reclaim stderr
+        #   ^
+        #   |
+        #   +------ dup2 is magic, I tells ya!
 
         # bring back the echo
         import termios

pyanaconda/iutil.py

@@ -1288,7 +1288,7 @@ def ipmi_report(event):
     # Event data 2 & 3 - always 0x0 for us
     event_string = "0x4 0x1F 0x0 0x6f %#x 0x0 0x0\n" % event
     eintr_retry_call(os.write, fd, event_string.encode("utf-8"))
-    eintr_retry_call(os.close, fd)
+    os.close(fd)
 
     execWithCapture("ipmitool", ["sel", "add", path])
 

pyanaconda/kickstart.py

@@ -104,7 +104,7 @@ def run(self, chroot):
         (fd, path) = tempfile.mkstemp("", "ks-script-", scriptRoot + "/tmp")
 
         iutil.eintr_retry_call(os.write, fd, self.script.encode("utf-8"))
-        iutil.eintr_retry_call(os.close, fd)
+        os.close(fd)
         iutil.eintr_retry_call(os.chmod, path, 0o700)
 
         # Always log stdout/stderr from scripts.  Using --log just lets you

pyanaconda/vnc.py

@@ -87,8 +87,8 @@ def setVNCPassword(self):
             rc = iutil.execWithRedirect("vncpasswd", ["-f"],
                     stdin=r, stdout=pw_file, binary_output=True, log_output=False)
 
-            iutil.eintr_retry_call(os.close, r)
-            iutil.eintr_retry_call(os.close, w)
+            os.close(r)
+            os.close(w)
 
         return rc
 

tests/gui/outside/__init__.py

@@ -29,17 +29,6 @@
 import tempfile
 import errno
 
-# Copied from python's subprocess.py
-def eintr_retry_call(func, *args):
-    """Retry an interruptible system call if interrupted."""
-    while True:
-        try:
-            return func(*args)
-        except (OSError, IOError) as e:
-            if e.errno == errno.EINTR:
-                continue
-            raise
-
 class Creator(object):
     """A Creator subclass defines all the parameters for making a VM to run a
        test against as well as handles creating and running that VM, inspecting
@@ -111,7 +100,7 @@ def makeDrives(self):
         """
         for (drive, size) in self.drives:
             (fd, diskimage) = tempfile.mkstemp(dir=self.tempdir)
-            eintr_retry_call(os.close, fd)
+            os.close(fd)
 
             # For now we are using qemu-img to create these files but specifying
             # sizes in blivet Size objects.  Unfortunately, qemu-img wants sizes