[isc~source:32] Added tag v1.3.1 for changeset 9922b4a52baa

[gbrunett@kenai.com]

Project:    isc
Repository: source
Revision:   32
Author:     gbrunett
Date:       2009-12-01 16:08:43 UTC
Link:       

Log Message:
------------
v1.3.1 updated to include FSS and default CPU shares
Added tag v1.3.1 for changeset 9922b4a52baa


Revisions:
----------
31
32


Modified Paths:
---------------
etc/isc.conf
lib/zone_funcs.ksh
.hgtags


Diffs:
------
diff -r d6b3e34a470e -r 9922b4a52baa etc/isc.conf
--- a/etc/isc.conf      Mon Nov 30 11:03:09 2009 -0500
+++ b/etc/isc.conf      Tue Dec 01 11:08:07 2009 -0500
@@ -107,8 +107,18 @@
 # The default root password to be assigned to the zone.
 ISC_ROOT_PASSWORD=${ISC_ROOT_PASSWORD:-"gao7ZZ.uwgEsQ"}
 
-# The default maximum number of lightweight processes in a zone.
-ISC_MAX_LWPS=300
+#===========================================================================
+# Configuration Parameters: Resource Management
+#===========================================================================
+
+# The default number of CPU shares to allocate to the global zone.
+ISC_DOCK_CPU_SHARES=${ISC_DOCK_CPU_SHARES:-"100"}
+
+# The default number of CPU shares to allocate to each non-global zone.
+ISC_NODE_CPU_SHARES=${ISC_NODE_CPU_SHARES:-"100"}
+
+# The default maximum number of lightweight processes in a non-global zone.
+ISC_NODE_MAX_LWPS=${ISC_NODE_MAX_LWPS:-"300"}
 
 #===========================================================================
 # Functionality Check: ZFS Crypto

diff -r d6b3e34a470e -r 9922b4a52baa lib/zone_funcs.ksh
--- a/lib/zone_funcs.ksh        Mon Nov 30 11:03:09 2009 -0500
+++ b/lib/zone_funcs.ksh        Tue Dec 01 11:08:07 2009 -0500
@@ -38,13 +38,18 @@
               s|MY_NODE_ROOT|${my_base}/${ISC_HOST_NAME}/zone|g;
               s|MY_NODE_HOME|${my_base}/${ISC_HOST_NAME}/home|g" |\
          zonecfg -z ${ISC_HOST_NAME} 
-      if [ ! -z "${ISC_MAX_LWPS}" ]; then
-         zonecfg -z ${ISC_HOST_NAME} << EOF_RCTL
-            add rctl
-            set name=zone.max-lwps
-            add value (priv=privileged,limit=${ISC_MAX_LWPS},action=deny)
-            end
-EOF_RCTL
+
+      log_notice "NODE: Configuring Resource Management"
+
+      if [ ! -z "${ISC_NODE_MAX_LWPS}" ]; then
+         zonecfg -z ${ISC_HOST_NAME} " \
+            add rctl; \
+            set name=zone.max-lwps; \
+            add value 
(priv=privileged,limit=${ISC_NODE_MAX_LWPS},action=deny); \
+            end"
+      fi
+      if [ ! -z "${ISC_NODE_CPU_SHARES}" ]; then
+         zonecfg -z ${ISC_HOST_NAME} set cpu-shares=${ISC_NODE_CPU_SHARES}
       fi
    fi
 }
@@ -99,7 +104,12 @@
 
 setup_zone_dock()
 {
-   :
+   log_notice "DOCK: Configuring Resource Management"
+
+   if [ ! -z "${ISC_DOCK_CPU_SHARES}" ]; then
+      dispadmin -d FSS
+      zonecfg -z global set cpu-shares=${ISC_DOCK_CPU_SHARES}
+   fi
 }
 
 #===========================================================================
@@ -114,6 +124,6 @@
    log_notice "NODE: Installing Solaris Zone"
    install_zone_node
 
-   log_notice "NODE: Configuring Solaris Zone"
+   log_notice "NODE: Performing Solaris Zone System Configuration"
    install_sysidcfg_node
 }


diff -r 9922b4a52baa -r 8ab54a6f9147 .hgtags
--- a/.hgtags   Tue Dec 01 11:08:07 2009 -0500
+++ b/.hgtags   Tue Dec 01 11:08:43 2009 -0500
@@ -1,3 +1,4 @@
 2cafc2b120f645813b569374a9f94a5218f812a3 v1.1
 81892bdbcf5a3b2a3f386828ebc51c39709c91ce v1.2
 dcca81d82a9d3450d76d1c8e82e57de69c06a398 v1.3
+9922b4a52baa529b5a4a5a671b41d714a4706a37 v1.3.1