Changeset 5720

Timestamp:

11/05/09 21:34:18 (3 weeks ago)

Author:

goodell

Message:

Fix for mpd on FC12 (ticket #902).

mpdman closes all non-standard file descriptors, which causes problems
if the python standard (or FC-modified) distribution has any file
objects open under the hood, such as to /etc/abrt/pyhook.conf. Comment
out this closing for now until we can figure out a safer way to do this,
if there is one.

No reviewer.

Location:

mpich2/trunk/src/pm/mpd

Files:

• mpd.py (modified) (1 diff)
• mpdman.py (modified) (1 diff)

mpich2/trunk/src/pm/mpd/mpd.py

@@ -197 +197 @@
             print "mpd: your python version must be >= 2.2 ; current version is:", vinfo
             sys.exit(-1)
-        os.close(0)
+        sys.stdin.close()
         if self.parmdb['MPD_ECHO_PORT_FLAG']:    # do this before becoming a daemon
             # print self.parmdb['MPD_LISTEN_PORT']

mpich2/trunk/src/pm/mpd/mpdman.py

@@ -96 +96 @@
         try:     max_fds = os.sysconf('SC_OPEN_MAX')
         except:  max_fds = 1024
-        for fd in range(3,max_fds):
-            if fd == self.mpdSock.fileno()  or  fd == self.listenRingSock.fileno():
-                continue
-            try:    os.close(fd)
-            except: pass
+        # FIXME This snippet causes problems on Fedora Core 12.  FC12's python
+        # opens a file object to /etc/abrt/pyhook.conf.  Closing the fd out from
+        # under the higher level object causes problems at exit time when the
+        # higher level object is garbage collected.  See MPICH2 ticket #902 for
+        # more information.
+        #for fd in range(3,max_fds):
+        #    if fd == self.mpdSock.fileno()  or  fd == self.listenRingSock.fileno():
+        #        continue
+        #    try:    os.close(fd)
+        #    except: pass
         if syslog_module_available:
             syslog.openlog("mpdman",0,syslog.LOG_DAEMON)