SERVER-15986 prevent server from starting up when non-active storage engine files are detected

             added storage_engine_metadata to mongo/db/storage/SConscript
             fixed cleanbb.py so that cleanup() will remove directories as well.
             fixed unix_socket1.js so that it does not store socket file in data directory

1 files changed, 9 insertions, 0 deletions

diff --git a/buildscripts/cleanbb.py b/buildscripts/cleanbb.py
index fee7efdc0c1..b599dc80d01 100644
--- a/buildscripts/cleanbb.py
+++ b/buildscripts/cleanbb.py
@@ -3,6 +3,7 @@
 import re
 import sys
 import os, os.path
+import shutil
 import utils
 import time
 from optparse import OptionParser
@@ -93,6 +94,14 @@ def cleanup( root , nokill ):
                 if not tryToRemove(foo):
                     raise Exception("Couldn't remove file '%s' after 60 seconds" % foo)
 
+    # delete all directories under root.
+    for directoryEntry in os.listdir(root):
+        if directoryEntry == 'diskfulltest':
+            continue
+        path = root + '/' + directoryEntry
+        if os.path.isdir(path):
+           shutil.rmtree(path, ignore_errors=True)
+
 if __name__ == "__main__":
     parser = OptionParser(usage="read the script")
     parser.add_option("--nokill", dest='nokill', default=False, action='store_true')