b=6286

r=adilger

Severity   : enhancement
Bugzilla   : 6296
Description: Default groups are now added by lconf
Details    : You can now run lconf --group <servicename> without having to
             manually add groups with lmc.

diff --git a/lustre/ChangeLog b/lustre/ChangeLog
index af7bb94..a4735f5 100644 (file)
--- a/lustre/ChangeLog
+++ b/lustre/ChangeLog
@@ -69,6 +69,12 @@ Details    : Failing over an mds, using lconf -d --failover, while a
              client was doing a readdir() call would cause the client to 
              LBUG after recovery completed and the readdir() was resent.
 
+Severity   : enhancement
+Bugzilla   : 6296
+Description: Default groups are now added by lconf
+Details    : You can now run lconf --group <servicename> without having to 
+             manually add groups with lmc.
+
 ------------------------------------------------------------------------------
 
 2005-05-05  Cluster File Systems, Inc. <info@clusterfs.com>

diff --git a/lustre/utils/Lustre/lustredb.py b/lustre/utils/Lustre/lustredb.py
index e05c18f..2938400 100644 (file)
--- a/lustre/utils/Lustre/lustredb.py
+++ b/lustre/utils/Lustre/lustredb.py
@@ -58,7 +58,7 @@ class LustreDB:
         if self.caching_enabled and self.lookup_class_cache.has_key(tag):
             v = self.lookup_val_cache[tag]
         else:
-            v =  self._get_val(tag)
+            v = self._get_val(tag)
             if self.caching_enabled:
                 self.lookup_val_cache[tag] = v
         if v:
@@ -196,11 +196,11 @@ class LustreDB:
             ret = []
             devs = self.lookup_class('mds')
             for tgt in devs:
-                if tgt.get_val('group', "") == group:
+                if tgt.get_val('group', tgt.get_value('name')) == group:
                     ret.append(tgt.getUUID())
             devs = self.lookup_class('ost')
             for tgt in devs:
-                if tgt.get_val('group', "") == group:
+                if tgt.get_val('group', tgt.get_value('name')) == group:
                     ret.append(tgt.getUUID())
             if self.caching_enabled:
                 self.lookup_group_cache[group] = ret

diff --git a/lustre/utils/lconf b/lustre/utils/lconf
index 0e9f9b9..d9a04bb 100755 (executable)
--- a/lustre/utils/lconf
+++ b/lustre/utils/lconf
@@ -1694,7 +1694,7 @@ class MDSDEV(Module):
             self.active = 1
         else:
             self.active = 0
-        if self.active and config.group and config.group != mds.get_val('group'):
+        if self.active and config.group and config.group != mds.get_val('group', mds.get_val('name')):
             self.active = 0
 
         self.inode_size = self.db.get_val_int('inodesize', 0)
@@ -1958,7 +1958,7 @@ class OSD(Module):
             self.active = 1
         else:
             self.active = 0
-        if self.active and config.group and config.group != ost.get_val('group'):
+        if self.active and config.group and config.group != ost.get_val('group', ost.get_val('name')):
             self.active = 0
 
         self.target_dev_uuid = self.uuid