Fix infra 785 - FD issue (#19)

* Update Mongodump.py

* Update MongodumpThread.py

* Update VERSION

Author: avinashtanniru

VERSION

@@ -1 +1 @@
-1.4.8
+1.4.9

mongodb_consistent_backup/Backup/Mongodump/Mongodump.py

@@ -131,12 +131,12 @@ def run(self):
                 secondary = self.replsets[shard].find_secondary()
                 mongo_uri = secondary['uri']
                 self.states[shard] = OplogState(self.manager, mongo_uri)
-                
-                # Check if mongo_uri passes the check_or_cfg function
-                oplog = self.oplog_enabled
-                if self.check_or_cfg(mongo_uri.str()):
-                    oplog = False
-                    logging.info("No Oplog for %s as it belongs to objectrocket.com" % (mongo_uri.str()))
+
+                if tuple(map(int, "4.4.20".split("."))) < tuple(map(int, self.version.split("."))):
+                    # Check if mongo_uri passes the check_or_cfg function
+                    if self.check_or_cfg(mongo_uri.str()):
+                        self.oplog_enabled = False
+                        logging.info("No Oplog for %s as it belongs to objectrocket.com" % (mongo_uri.str()))
 
                 thread = MongodumpThread(
                     self.states[shard],
@@ -147,7 +147,7 @@ def run(self):
                     self.version,
                     self.threads(),
                     self.do_gzip(),
-                    oplog
+                    self.oplog_enabled
                 )
                 self.dump_threads.append(thread)
             except Exception, e:

mongodb_consistent_backup/Backup/Mongodump/MongodumpThread.py

@@ -122,21 +122,30 @@ def handle_failure(self, line):
 
     def wait(self):
         try:
-            while self._process.stderr:
-                poll = select([self._process.stderr.fileno()], [], [])
-                if len(poll) >= 1:
-                    for fd in poll[0]:
+            while self._process.stderr and not self._process.stderr.closed:
+                read = None
+                fd = self._process.stderr.fileno()
+                if fd >= 1024:
+                    read = self._process.stderr.readline()
+                else:
+                    poll = select([fd], [], [])
+                    if poll[0]:
                         read = self._process.stderr.readline()
-                        line = self.parse_mongodump_line(read)
-                        if not line:
-                            continue
-                        elif self.is_password_prompt(read):
-                            self.handle_password_prompt()
-                        elif self.is_failed_line(read):
-                            self.handle_failure(read)
-                            break
-                        else:
-                            logging.info(line)
+
+                if read is not None:
+                    if not read:
+                        break
+                    line = self.parse_mongodump_line(read)
+                    if not line:
+                        continue
+                    elif self.is_password_prompt(read):
+                        self.handle_password_prompt()
+                    elif self.is_failed_line(read):
+                        self.handle_failure(read)
+                        break
+                    else:
+                        logging.info(line)
+
                 if self._process.poll() is not None:
                     break
         except Exception, e: