Branch b1_4

Fix .netmatch method to work with older Pythons.
Only reduce OST inode counts for larger OSTs.
b=5044

diff --git a/lustre/utils/lconf b/lustre/utils/lconf
index 48904ec..0e9f9b9 100755 (executable)
--- a/lustre/utils/lconf
+++ b/lustre/utils/lconf
@@ -523,7 +523,7 @@ class LCTLInterface:
                 if localnet.hostaddr[0] and srv.hostaddr[0]:
                     for lnet in localnet.hostaddr:
                         for pnet in srv.hostaddr:
-                            if srv.netmatch(lnet, pnet):
+                            if srv.netmatch(lnet, pnet) != 0:
                                 hostaddr = string.split(pnet, '/')[0]
                                 #find one is enough, should break the top-most loop
                                 break
@@ -1419,10 +1419,10 @@ class Network(Module):
         i = 0
         for n in split:
             try:
-                naddr += int(n) * (256 ** (3-i))
+                naddr = naddr + int(n) * (256 ** (3-i))
             except:
                 raise ValueError, "Invalid IPv4 address %s" % net
-            i += 1
+            i = i + 1
         return naddr
 
     def tointAddr(self, net):
@@ -1457,11 +1457,11 @@ class Network(Module):
             addr1, mask1 = self.tointAddr(net1)
             addr2, mask2 = self.tointAddr(net2)
         except:
-            return False
+            return 0
 
         if addr1 & mask1 == addr2 & mask2:
-            return True
-        return False
+            return 1
+        return 0
 
 def bitmap_32(n):
     """n should be in [1, 32]"""
@@ -1845,7 +1845,7 @@ class MDSDEV(Module):
                         noexec_opt = ('', '-n')
                         ret, out = run (sys.argv[0],
                                         noexec_opt[old_noexec == 1],
-                                        " -v --record --nomod",
+                                        " --record --nomod",
                                         "--record_log", client_name,
                                         "--record_device", self.name,
                                         "--node", client_name,
@@ -1934,7 +1934,11 @@ class OSD(Module):
         self.size = self.db.get_val_int('devsize', 0)
         self.journal_size = self.db.get_val_int('journalsize', 0)
         self.inode_size = self.db.get_val_int('inodesize', 0)
-        self.mkfsoptions = '-i 16384 ' + self.db.get_val('mkfsoptions', '')
+        self.mkfsoptions = self.db.get_val('mkfsoptions', '')
+        # Allocate fewer inodes on large OST devices.  Most filesystems
+        # can be much more aggressive than this, but by default we can't.
+        if self.size > 1000000:
+                self.mkfsoptions = '-i 16384 ' + self.mkfsoptions
         self.mountfsoptions = self.db.get_val('mountfsoptions', '')
         self.fstype = self.db.get_val('fstype', '')
         self.nspath = self.db.get_val('nspath', '')